Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bring formatting of rank in line with others

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-05-31 23:05:27 -04:00
parent 3ee9d8cd94
commit 4ab69d18f4
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/src/main/java/at/petrak/hexcasting/interop/patchouli/BrainsweepProcessor.java
View file

@ -82,9 +82,11 @@ public class BrainsweepProcessor implements IComponentProcessor {
} }
case "minLevel" -> { case "minLevel" -> {
var minLevel = this.recipe.villagerIn().minLevel(); var minLevel = this.recipe.villagerIn().minLevel();
if (minLevel == 5) if (minLevel >= 5)
return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.level", return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.level",
I18n.get("merchant.level." + minLevel))); I18n.get("merchant.level." + minLevel)));
else if (minLevel <= 1)
return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.level.any"));
else else
return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.min_level", return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.min_level",
I18n.get("merchant.level." + minLevel))); I18n.get("merchant.level." + minLevel)));

9
Common/src/main/resources/assets/hexcasting/lang/en_us.json
View file

@ -123,11 +123,12 @@
"hexcasting.tooltip.lens.akashic.record.count": "%s iotas stored", "hexcasting.tooltip.lens.akashic.record.count": "%s iotas stored",
"hexcasting.tooltip.lens.akashic.record.count.single": "%s iota stored", "hexcasting.tooltip.lens.akashic.record.count.single": "%s iota stored",
"hexcasting.tooltip.brainsweep.profession": "Profession: %s", "hexcasting.tooltip.brainsweep.profession": "Profession: %s",
"hexcasting.tooltip.brainsweep.profession.any": "Any Profession", "hexcasting.tooltip.brainsweep.profession.any": "Any profession",
"hexcasting.tooltip.brainsweep.biome": "Biome: %s", "hexcasting.tooltip.brainsweep.biome": "Biome: %s",
"hexcasting.tooltip.brainsweep.biome.any": "Any Biome", "hexcasting.tooltip.brainsweep.biome.any": "Any biome",
"hexcasting.tooltip.brainsweep.min_level": "%s rank or higher", "hexcasting.tooltip.brainsweep.min_level": "Rank: %s or higher",
"hexcasting.tooltip.brainsweep.level": "%s rank", "hexcasting.tooltip.brainsweep.level": "Rank: %s",
"hexcasting.tooltip.brainsweep.level.any": "Any rank",
"hexcasting.spelldata.onitem": "Contains: %s", "hexcasting.spelldata.onitem": "Contains: %s",
"hexcasting.spelldata.anything": "Anything", "hexcasting.spelldata.anything": "Anything",
"hexcasting.spelldata.entity.whoknows": "An Entity (this should only show up if this was stored before the 0.5.0 update, use Scribe's Reflection, Scribe's Gambit to fix)", "hexcasting.spelldata.entity.whoknows": "An Entity (this should only show up if this was stored before the 0.5.0 update, use Scribe's Reflection, Scribe's Gambit to fix)",

4
Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/VillagerWidget.java
View file

@ -97,9 +97,11 @@ public class VillagerWidget extends Widget {
} }
var minLevel = villager.minLevel(); var minLevel = villager.minLevel();
if (minLevel == 5) if (minLevel >= 5)
tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level", tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level",
new TranslatableComponent("merchant.level." + minLevel))); new TranslatableComponent("merchant.level." + minLevel)));
else if (minLevel <= 1)
tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level.any"));
else else
tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level", tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level",
new TranslatableComponent("merchant.level." + minLevel))); new TranslatableComponent("merchant.level." + minLevel)));

4
Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java
View file

@ -95,9 +95,11 @@ public class BrainsweepRecipeCategory implements IRecipeCategory<BrainsweepRecip
} }
var minLevel = recipe.villagerIn().minLevel(); var minLevel = recipe.villagerIn().minLevel();
if (minLevel == 5) if (minLevel >= 5)
tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level", tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level",
new TranslatableComponent("merchant.level." + minLevel))); new TranslatableComponent("merchant.level." + minLevel)));
else if (minLevel <= 1)
tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level.any"));
else else
tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level", tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level",
new TranslatableComponent("merchant.level." + minLevel))); new TranslatableComponent("merchant.level." + minLevel)));