From 31de298ef997a75d7a7d32babe2eef72532a5850 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 11 Mar 2020 23:14:42 +0100 Subject: [PATCH] I did it mom --- src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java | 3 +++ src/main/resources/assets/naturesaura/lang/en_us.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java index 819a89bd..355a2524 100644 --- a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java +++ b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java @@ -53,6 +53,7 @@ import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; import org.apache.commons.lang3.mutable.MutableInt; import org.lwjgl.opengl.GL11; @@ -77,6 +78,8 @@ public class ClientEvents { @SubscribeEvent public void onTooltip(ItemTooltipEvent event) { + if (ModList.get().isLoaded("enchdesc")) + return; ItemStack stack = event.getItemStack(); List tooltip = event.getToolTip(); for (Map.Entry entry : EnchantmentHelper.getEnchantments(stack).entrySet()) { diff --git a/src/main/resources/assets/naturesaura/lang/en_us.json b/src/main/resources/assets/naturesaura/lang/en_us.json index e034b082..f862dba6 100644 --- a/src/main/resources/assets/naturesaura/lang/en_us.json +++ b/src/main/resources/assets/naturesaura/lang/en_us.json @@ -186,6 +186,6 @@ "entity.naturesaura.effect_inhibitor": "Effect Powder", "entity.naturesaura.mover_cart": "Aura Attraction Cart", "enchantment.naturesaura.aura_mending": "Nature's Mend", - "enchantment.naturesaura.aura_mending.desc": "Nature's Aura Enchantment", - "naturesaura:aura_mending.enchant.desc": "Heals the Player Using Aura" + "enchantment.naturesaura.aura_mending.desc": "Repairs tools using Aura", + "naturesaura:aura_mending.enchant.desc": "Heals the player using Aura" } \ No newline at end of file