Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: tier displays for armor #1553

Merged
merged 2 commits into from
Jan 1, 2025
Merged

fix: tier displays for armor #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef83e48
fix: tier displays for armor
Vonr Dec 29, 2024
f765f09
Merge branch 'main' into pr/1553
baileyholl Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/generated/resources/assets/ars_nouveau/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,7 @@
"ars_nouveau.spell_parchment.no_spell": "Set your spell book to a spell.",
"ars_nouveau.spell_schools": "Spell Schools",
"ars_nouveau.spell_set": "Spell set.",
"ars_nouveau.spell_tier": "Tier: %s",
"ars_nouveau.spell_tier.1": "ONE",
"ars_nouveau.spell_tier.2": "TWO",
"ars_nouveau.spell_tier.3": "THREE",
Expand Down Expand Up @@ -1216,7 +1217,7 @@
"ars_nouveau.thread_layout": "Thread Tiers",
"ars_nouveau.thread_of": "Thread of %s",
"ars_nouveau.threads": "Thread Slots",
"ars_nouveau.tier": "Tier",
"ars_nouveau.tier": "Tier %s",
"ars_nouveau.tier_1_spells": "Tier 1 Glyphs",
"ars_nouveau.tier_1_spells_desc": "Glyphs that may be cast using a Novice Spellbook.",
"ars_nouveau.tier_2_spells": "Tier 2 Glyphs",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hollingsworth/arsnouveau/client/patchouli/GlyphProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public IVariable process(Level level, String s) {
return null;
var recipe = holder.value();
if (s.equals("tier")) {
return IVariable.wrap(Component.translatable("ars_nouveau.tier").getString() + ": " + Component.translatable("ars_nouveau.spell_tier." + recipe.getSpellPart().getConfigTier().value).getString());
return IVariable.wrap(Component.translatable("ars_nouveau.spell_tier", Component.translatable("ars_nouveau.spell_tier." + recipe.getSpellPart().getConfigTier().value)).getString());
}
if (s.equals("schools")) {
AbstractSpellPart part = ((Glyph) recipe.output.getItem()).spellPart;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/hollingsworth/arsnouveau/common/datagen/LangDatagen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ protected void addTranslations() {
add("ars_nouveau.thread_of", "Thread of %s");
add("ars_nouveau.book.name", "Worn Notebook");
add("ars_nouveau.book.landing_text", "Ars Nouveau provides spell crafting, magical devices, powerful trinkets, and magical entity automation. To help development or report issues, join the community: https://discord.gg/y7TMXZu Thank you for playing.");
add("ars_nouveau.spell_tier", "Tier: %s");
add("ars_nouveau.spell_tier.1", "ONE");
add("ars_nouveau.spell_tier.2", "TWO");
add("ars_nouveau.spell_tier.3", "THREE");
Expand Down Expand Up @@ -640,7 +641,7 @@ protected void addTranslations() {
add("ars_nouveau.page.weald_walker", "Weald Walkers");
add("ars_nouveau.spell_schools", "Spell Schools");
add("ars_nouveau.casting_cost", "Casting Cost");
add("ars_nouveau.tier", "Tier");
add("ars_nouveau.tier", "Tier %s");
add("ars_nouveau.page.agronomic_sourcelink", "The Agronomic Sourcelink generates source from crop and tree growth within 15 blocks. Bonus source is generated for magical plants such as Mageblooms, Source Berry Bushes, and Archwood Saplings. Source will be output from the Sourcelink to nearby jars within 5 blocks. Note: Bonemealing crops will not grant Source.");
add("ars_nouveau.page.source_jar", "Source Jars store source gathered from nearby Sourcelinks. Source is used in glyphs and rituals by powering devices like the Imbuement Chamber and Enchanting Apparatus. Source may be moved using a Source Relay or by breaking and moving it. To use Source in a jar, simply place the jar near your desired device. Source Jars will provide a signal to Redstone Comparators based on their fill level.");
add("ars_nouveau.page1.volcanic_sourcelink", "The Volcanic Sourcelink generates Source by consuming burnable items. Archwood logs will generate bonus Source, with Blazing Archwood generating the most. As the Volcanic Sourcelink produces Source, it also produces $(item)heat$(), used for spawning Lava Lilies and converting stone into lava. The Volcanic Sourcelink automatically outputs to nearby jars, starting with the one closest to it.");
Expand Down