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 a1a29bf3..eea7c08b 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 @@ -82,9 +82,11 @@ public class BrainsweepProcessor implements IComponentProcessor { } case "minLevel" -> { var minLevel = this.recipe.villagerIn().minLevel(); - if (minLevel == 5) + if (minLevel >= 5) return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.level", I18n.get("merchant.level." + minLevel))); + else if (minLevel <= 1) + return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.level.any")); else return IVariable.wrap(I18n.get("hexcasting.tooltip.brainsweep.min_level", I18n.get("merchant.level." + minLevel))); 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 6a3dda7c..e17e444c 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.json +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.json @@ -123,11 +123,12 @@ "hexcasting.tooltip.lens.akashic.record.count": "%s iotas stored", "hexcasting.tooltip.lens.akashic.record.count.single": "%s iota stored", "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.any": "Any Biome", - "hexcasting.tooltip.brainsweep.min_level": "%s rank or higher", - "hexcasting.tooltip.brainsweep.level": "%s rank", + "hexcasting.tooltip.brainsweep.biome.any": "Any biome", + "hexcasting.tooltip.brainsweep.min_level": "Rank: %s or higher", + "hexcasting.tooltip.brainsweep.level": "Rank: %s", + "hexcasting.tooltip.brainsweep.level.any": "Any 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 36e3623d..712628ec 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 @@ -97,9 +97,11 @@ public class VillagerWidget extends Widget { } var minLevel = villager.minLevel(); - if (minLevel == 5) + if (minLevel >= 5) tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level", new TranslatableComponent("merchant.level." + minLevel))); + else if (minLevel <= 1) + tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level.any")); else tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level", new TranslatableComponent("merchant.level." + minLevel))); 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 89223ba2..30427edf 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 @@ -95,9 +95,11 @@ public class BrainsweepRecipeCategory implements IRecipeCategory= 5) tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level", new TranslatableComponent("merchant.level." + minLevel))); + else if (minLevel <= 1) + tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.level.any")); else tooltip.add(new TranslatableComponent("hexcasting.tooltip.brainsweep.min_level", new TranslatableComponent("merchant.level." + minLevel)));