diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java index fa6b588..42f767c 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -97,7 +97,7 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider { ItemStack headSlot = player.inventory.armorInventory[3]; if (headSlot == null) return tag; - boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem()); + boolean hasReveal = ThaumcraftModule.isGoggles.apply(headSlot); if (!hasReveal) return tag; Map knownAspects = (Map) ThaumcraftModule.CommonProxy_getKnownAspects diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java index 5304175..f3550f3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -2,7 +2,9 @@ package mcp.mobius.waila.addons.thaumcraft; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.util.function.Function; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import org.apache.logging.log4j.Level; @@ -34,6 +36,8 @@ public class ThaumcraftModule { public static Class IGoggles = null; + public static Function isGoggles = stack -> IGoggles.isInstance(stack.getItem()); + public static void register() { try { Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft"); diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraftGadomancy/GadomancyModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraftGadomancy/GadomancyModule.java new file mode 100644 index 0000000..5a76dd7 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraftGadomancy/GadomancyModule.java @@ -0,0 +1,41 @@ +package mcp.mobius.waila.addons.thaumcraftGadomancy; + +import java.lang.reflect.Field; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; + +import org.apache.logging.log4j.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; + +public class GadomancyModule { + + public static Class RegisteredEnchantments = null; + public static Field RegisteredEnchantments_revealer = null; + + public static int revealerEffectId; + + public static void register() { + try { + RegisteredEnchantments = Class.forName("makeo.gadomancy.common.registration.RegisteredEnchantments"); + RegisteredEnchantments_revealer = RegisteredEnchantments.getDeclaredField("revealer"); + Object revealer = RegisteredEnchantments_revealer.get(null); + + revealerEffectId = ((Enchantment) revealer).effectId; + + ThaumcraftModule.isGoggles = stack -> ThaumcraftModule.IGoggles.isInstance(stack.getItem()) + || EnchantmentHelper.getEnchantmentLevel(revealerEffectId, stack) > 0; + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[Thaumcraft Gadomancy] Gadomancy mod not found."); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thaumcraft Gadomancy] Unhandled exception. {}", e); + return; + } + Waila.log.log(Level.INFO, "Gadomancy mod found."); + + } + +} diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index e12ab32..769768a 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -20,6 +20,7 @@ import mcp.mobius.waila.addons.railcraft.RailcraftModule; import mcp.mobius.waila.addons.statues.StatuesModule; import mcp.mobius.waila.addons.stevescarts.StevesCartsModule; import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; +import mcp.mobius.waila.addons.thaumcraftGadomancy.GadomancyModule; import mcp.mobius.waila.addons.thermaldynamics.ThermalDynamicsModule; import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule; import mcp.mobius.waila.addons.twilightforest.TwilightForestModule; @@ -50,6 +51,9 @@ public class ProxyServer { /* Thaumcraft */ ThaumcraftModule.register(); + /* Gadomancy */ + GadomancyModule.register(); + /* EnderStorage */ EnderStorageModule.register();