diff --git a/Common/src/main/java/at/petrak/hexcasting/interop/patchouli/BrainsweepProcessor.java b/Common/src/main/java/at/petrak/hexcasting/interop/patchouli/BrainsweepProcessor.java index 93b7f66e..a1a29bf3 100644 --- a/Common/src/main/java/at/petrak/hexcasting/interop/patchouli/BrainsweepProcessor.java +++ b/Common/src/main/java/at/petrak/hexcasting/interop/patchouli/BrainsweepProcessor.java @@ -81,8 +81,13 @@ public class BrainsweepProcessor implements IComponentProcessor { return IVariable.wrap(out); } case "minLevel" -> { - return IVariable.wrap( - I18n.get("hexcasting.tooltip.brainsweep.min_level", this.recipe.villagerIn().minLevel())); + var minLevel = this.recipe.villagerIn().minLevel(); + if (minLevel == 5) + return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.level", + I18n.get("merchant.level." + minLevel))); + else + return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.min_level", + I18n.get("merchant.level." + minLevel))); } default -> { return null; diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.json b/Common/src/main/resources/assets/hexcasting/lang/en_us.json index d0b57eda..6a3dda7c 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.json +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.json @@ -126,7 +126,8 @@ "hexcasting.tooltip.brainsweep.profession.any": "Any Profession", "hexcasting.tooltip.brainsweep.biome": "Biome: %s", "hexcasting.tooltip.brainsweep.biome.any": "Any Biome", - "hexcasting.tooltip.brainsweep.min_level": "Level %d or higher", + "hexcasting.tooltip.brainsweep.min_level": "%s rank or higher", + "hexcasting.tooltip.brainsweep.level": "%s rank", "hexcasting.spelldata.onitem": "Contains: %s", "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)", diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/VillagerWidget.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/VillagerWidget.java index 74687c81..36e3623d 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/VillagerWidget.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/VillagerWidget.java @@ -96,8 +96,13 @@ public class VillagerWidget extends Widget { new TranslatableComponent(biomeKey))); } - tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level", - villager.minLevel())); + var minLevel = villager.minLevel(); + if (minLevel == 5) + tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level", + new TranslatableComponent("merchant.level." + minLevel))); + else + tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level", + new TranslatableComponent("merchant.level." + minLevel))); return Tooltip.create(mouse, tooltip); } diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java index 7eadf733..89223ba2 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java @@ -94,8 +94,13 @@ public class BrainsweepRecipeCategory implements IRecipeCategory