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 906fb85..05f7f00 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -1,6 +1,7 @@ package mcp.mobius.waila.addons.thaumcraft; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -14,6 +15,8 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; +import static mcp.mobius.waila.api.SpecialChars.*; + public class HUDHandlerIAspectContainer implements IWailaDataProvider{ @Override @@ -28,6 +31,20 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider{ @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + NBTTagCompound tag = accessor.getNBTData(); + if (tag.hasKey("Aspects")){ + NBTTagList taglist = tag.getTagList("Aspects", 10); + for (int i = 0; i < taglist.tagCount(); i++){ + NBTTagCompound subtag = taglist.getCompoundTagAt(i); + + String aspect = Character.toUpperCase(subtag.getString("key").charAt(0)) + subtag.getString("key").substring(1); + String amount = String.valueOf(subtag.getInteger("value")); + + currenttip.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount)); + } + } + return currenttip; } @@ -40,32 +57,43 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider{ public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try{ - /* - HashMap knownAspects = (HashMap)ThaumcraftModule.CommonProxy_getKnownAspects.invoke(ThaumcraftModule.Thaumcraft_proxy.get(null)); + tag.setTag("Aspects", new NBTTagList()); + NBTTagList aspects = tag.getTagList("Aspects", 10); - for (Object o : knownAspects.keySet()){ - NBTTagCompound knownAspectsNBT = new NBTTagCompound(); - ThaumcraftModule.AspectList_writeToNBT.invoke(knownAspects.get(o), knownAspectsNBT); - NBTTagList aspects = knownAspectsNBT.getTagList("Aspects", 10); - - for (int i = 0; i < aspects.tagCount(); i++){ - NBTTagCompound entry = aspects.getCompoundTagAt(i); - System.out.printf("%s %s %s\n",o ,entry.getString("key"), entry.getInteger("amount")); + ItemStack headSlot = player.inventory.armorInventory[3]; + if (headSlot == null) return tag; + boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem()); + if (!hasReveal) return tag; + + HashMap knownAspects = (HashMap) ThaumcraftModule.CommonProxy_getKnownAspects.invoke(ThaumcraftModule.Thaumcraft_proxy.get(null)); + LinkedHashMap playerAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(knownAspects.get(player.getCommandSenderName())); + LinkedHashMap tileAspects = new LinkedHashMap(); + + if (ThaumcraftModule.IAspectContainer.isInstance(te)){ + tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(ThaumcraftModule.IAspectContainer_getAspects.invoke(te)); + } else if (ThaumcraftModule.TileAlchemyFurnace.isInstance(te)){ + tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(ThaumcraftModule.TileAlchemyFurnace_aspects.get(te)); + } + + for (Object o : tileAspects.keySet()){ + if (playerAspects.containsKey(o)){ + NBTTagCompound cmptag = new NBTTagCompound(); + cmptag.setString ("key", (String)ThaumcraftModule.Aspect_tag.get(o)); + cmptag.setInteger("value", (Integer) tileAspects.get(o)); + aspects.appendTag(cmptag); + } else { + NBTTagCompound cmptag = new NBTTagCompound(); + cmptag.setString ("key", "???"); + cmptag.setInteger("value", (Integer) tileAspects.get(o)); + aspects.appendTag(cmptag); } - } - */ + + //for (int i = 0; i < aspects.tagCount(); i++){ + // System.out.printf("%s : %s\n", aspects.getCompoundTagAt(i).getString("key"), aspects.getCompoundTagAt(i).getString("value")); + //} + - /* - ThaumcraftModule.AspectList_writeToNBT.invoke(ThaumcraftModule.IAspectContainer_getAspects.invoke(te), tag); - - NBTTagList aspects = tag.getTagList("Aspects", 10); - - for (int i = 0; i < aspects.tagCount(); i++){ - NBTTagCompound entry = aspects.getCompoundTagAt(i); - System.out.printf("%s %s\n", entry.getString("key"), entry.getInteger("amount")); - } - */ } catch (Exception e) { throw new RuntimeException(e); 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 c5539c6..f6bc4e3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -20,12 +20,21 @@ public class ThaumcraftModule { public static Class AspectList = null; public static Method AspectList_writeToNBT = null; + public static Field AspectList_aspects = null; + + public static Class TileAlchemyFurnace = null; + public static Field TileAlchemyFurnace_aspects = null; + + public static Class Aspect = null; + public static Field Aspect_tag = null; public static Class CommonProxy = null; public static Method CommonProxy_getKnownAspects = null; - + + public static Class IGoggles = null; + //public static Class TileAlchemyFurnace = null; - //public static Class IGoggles = null; + public static void register(){ try{ @@ -37,18 +46,25 @@ public class ThaumcraftModule { AspectList = Class.forName("thaumcraft.api.aspects.AspectList"); AspectList_writeToNBT = AspectList.getDeclaredMethod("writeToNBT", NBTTagCompound.class); + AspectList_aspects = AspectList.getDeclaredField("aspects"); + + TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); + TileAlchemyFurnace_aspects = TileAlchemyFurnace.getDeclaredField("aspects"); + + Aspect = Class.forName("thaumcraft.api.aspects.Aspect"); + Aspect_tag = Aspect.getDeclaredField("tag"); + Aspect_tag.setAccessible(true); CommonProxy = Class.forName("thaumcraft.common.CommonProxy"); CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects"); - - //TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); - //IGoggles = Class.forName("thaumcraft.api.IGoggles"); + + IGoggles = Class.forName("thaumcraft.api.IGoggles"); ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects"); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer); - //ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace); ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer); - //ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace); } catch (ClassNotFoundException e){ Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e); diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index 465f4a8..f41fe7e 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -134,9 +134,6 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler