diff --git a/build.gradle b/build.gradle index c8bc706..617666d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,8 @@ buildscript { configurations { deployerJars + //packed + //compile.extendsFrom packed } //add dependency repositories @@ -91,9 +93,25 @@ processResources } } +//def commonManifest = { +// attributes 'FMLCorePlugin': 'mcp.mobius.wailacore.asm.CoreDescription' +// attributes 'FMLCorePluginContainsFMLMod': 'mcp.mobius.waila.Waila' +//} + jar { -exclude "**/client/gui/inventory/GuiContainer.class" -exclude "**/client/gui/inventory/GuiContainer.java" + exclude "**/client/gui/inventory/GuiContainer.class" + exclude "**/client/gui/inventory/GuiContainer.java" + +// manifest commonManifest + +// from { +// configurations.packed.collect { +// it.isDirectory() ? it : zipTree(it).matching { +// exclude "META-INF", "META-INF/**", "*META-INF*", "meta-inf" +// exclude "**.jar", "**/*.jar", "*.jar" +// } +// } +// } } task sourceJar(type: Jar) { diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java index 6b13f0f..f7582b1 100644 --- a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.agriculture; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -43,7 +44,7 @@ public class HUDHandlerCrop implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java index 34fcf33..45f632f 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java @@ -6,6 +6,7 @@ import java.util.List; + import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; @@ -13,6 +14,7 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ConfigHandler; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -74,7 +76,7 @@ public class HUDHandlerBCTanks implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java index fd04167..b907ef8 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.carpenters; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -56,7 +57,7 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java index 58ab632..f33c4b8 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.enderio; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -66,7 +67,7 @@ public class HUDHandlerCapacitor implements IWailaDataProvider{ } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java index 2673c90..d507ca3 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.enderio; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -69,7 +70,7 @@ public class HUDHandlerTesseract implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java index ef82106..f00c1ea 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.enderstorage; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -74,7 +75,7 @@ public class HUDHandlerStorage implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java index abbe434..48ad8b5 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.etb; import java.util.Arrays; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -105,7 +106,7 @@ public class HUDHandlerSocket implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java index 9cb3d67..fc051ad 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.exu; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -53,7 +54,7 @@ public class HUDHandlerDrum implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java index 06600c5..41352c7 100644 --- a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.gravestone; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -33,7 +34,7 @@ public class HUDHandlerGravestone implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java index f2317bc..ed9fcfc 100644 --- a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.harvestcraft; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -45,7 +46,7 @@ public class HUDHandlerPamCrop implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java index a2ae7bd..c44d80a 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.ic2; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -60,7 +61,7 @@ public class HUDHandlerTEGenerator implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try{ double storage = -1; diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java index 0683449..e5c3fa0 100644 --- a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.magicalcrops; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -43,7 +44,7 @@ public class HUDHandlerMagicalCrops implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java index 05915b8..9996788 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.openblocks; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -70,7 +71,7 @@ public class HUDHandlerTank implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java index 6cead60..45bcaf7 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java @@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -75,7 +76,7 @@ public class HUDHandlerTank implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java index 38a2276..0558b5d 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.secretrooms; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -92,7 +93,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java index 3696930..d4ea5d9 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.statues; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -68,7 +69,7 @@ public class HUDHandlerStatues implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java index 624d556..257f055 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import codechicken.lib.math.MathHelper; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -150,7 +151,7 @@ public class HUDCargoManager implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java index 847ffb4..ed3a1e4 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java @@ -4,6 +4,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -85,7 +86,7 @@ public class HUDCartAssembler implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java index 3bc05f3..2352a63 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.stevescarts; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -126,7 +127,7 @@ public class HUDLiquidManager implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; 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 e22d19a..906fb85 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -1,22 +1,21 @@ package mcp.mobius.waila.addons.thaumcraft; +import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StringUtils; import net.minecraft.world.World; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.NBTUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; -import static mcp.mobius.waila.api.SpecialChars.*; -public class HUDHandlerIAspectContainer implements IWailaDataProvider { +public class HUDHandlerIAspectContainer implements IWailaDataProvider{ + @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; @@ -29,87 +28,50 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider { @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("thaumcraft.aspects")) return currenttip; - - ItemStack headSlot = accessor.getPlayer().inventory.armorInventory[3]; - if (headSlot == null) return currenttip; - - boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem()); - - if (!hasReveal) return currenttip; - - NBTTagCompound tag = accessor.getNBTData(); - - if (tag.hasKey("Aspect") && tag.hasKey("Amount") && !tag.getString("Aspect").equals("")){ - String aspect = Character.toUpperCase(tag.getString("Aspect").charAt(0)) + tag.getString("Aspect").substring(1); - currenttip.add(this.getAspectString(tag, "Aspect", "Amount", accessor)); - } - - if (tag.hasKey("aspect") && tag.hasKey("amount") && !tag.getString("aspect").equals("")){ - String aspect = Character.toUpperCase(tag.getString("aspect").charAt(0)) + tag.getString("aspect").substring(1); - currenttip.add(this.getAspectString(tag, "aspect", "amount", accessor)); - } - - if (tag.hasKey("Aspects")){ - NBTTagList taglist = tag.getTagList("Aspects", 10); - for (int i = 0; i < taglist.tagCount(); i++){ - NBTTagCompound subtag = taglist.getCompoundTagAt(i); - if (subtag.hasKey("amount") && subtag.hasKey("key") && !subtag.getString("key").equals("")){ - currenttip.add(this.getAspectString(subtag, "key", "amount", accessor)); - } - } - } return currenttip; } @Override public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; - } - - private String getAspectString(NBTTagCompound tag, String keyAspect, String keyAmount, IWailaDataAccessor accessor){ - String aspect = tag.getString(keyAspect); - aspect = knowAspect(aspect, accessor) ? aspect : "????"; - aspect = Character.toUpperCase(aspect.charAt(0)) + aspect.substring(1); - - String amount = String.valueOf(NBTUtil.getNBTInteger(tag, keyAmount)); - - - - return String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount); } - - private boolean knowAspect(String name, IWailaDataAccessor accessor){ - try{ - Object proxy = ThaumcraftModule.TC_proxy.get(null); - Object known = ThaumcraftModule.getKnownAspects.invoke(proxy, (Object[])null); - Object listAspc = ((Map)known).get(accessor.getPlayer().getDisplayName()); - //Object research = ThaumcraftModule.playerResearch.get(proxy); - //Object aspect = ThaumcraftModule.getAspect.invoke(null, name); - //Object knownaspects = ThaumcraftModule.aspectsDiscovered.get(research); - //Boolean known = (Boolean)ThaumcraftModule.hasDiscoveredAspect.invoke(research, accessor.getPlayer().username, aspect); - - Object[] aspects = (Object[])ThaumcraftModule.list_getAspects.invoke(listAspc); - for (Object o : aspects){ - if (ThaumcraftModule.aspect_tag.get(o).equals(name)){ - return true; - } - } - return false; - - } catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); - return false; - } - //return false; - } - @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te != null) - te.writeToNBT(tag); - return tag; - } + 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)); + + 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")); + } + + } + */ + + /* + 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); + } + + return tag; + } + } diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java.bak b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java.bak new file mode 100644 index 0000000..e22d19a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java.bak @@ -0,0 +1,115 @@ +package mcp.mobius.waila.addons.thaumcraft; + +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StringUtils; +import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerIAspectContainer implements IWailaDataProvider { + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("thaumcraft.aspects")) return currenttip; + + ItemStack headSlot = accessor.getPlayer().inventory.armorInventory[3]; + if (headSlot == null) return currenttip; + + boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem()); + + if (!hasReveal) return currenttip; + + NBTTagCompound tag = accessor.getNBTData(); + + if (tag.hasKey("Aspect") && tag.hasKey("Amount") && !tag.getString("Aspect").equals("")){ + String aspect = Character.toUpperCase(tag.getString("Aspect").charAt(0)) + tag.getString("Aspect").substring(1); + currenttip.add(this.getAspectString(tag, "Aspect", "Amount", accessor)); + } + + if (tag.hasKey("aspect") && tag.hasKey("amount") && !tag.getString("aspect").equals("")){ + String aspect = Character.toUpperCase(tag.getString("aspect").charAt(0)) + tag.getString("aspect").substring(1); + currenttip.add(this.getAspectString(tag, "aspect", "amount", accessor)); + } + + if (tag.hasKey("Aspects")){ + NBTTagList taglist = tag.getTagList("Aspects", 10); + for (int i = 0; i < taglist.tagCount(); i++){ + NBTTagCompound subtag = taglist.getCompoundTagAt(i); + if (subtag.hasKey("amount") && subtag.hasKey("key") && !subtag.getString("key").equals("")){ + currenttip.add(this.getAspectString(subtag, "key", "amount", accessor)); + } + } + } + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + private String getAspectString(NBTTagCompound tag, String keyAspect, String keyAmount, IWailaDataAccessor accessor){ + String aspect = tag.getString(keyAspect); + aspect = knowAspect(aspect, accessor) ? aspect : "????"; + aspect = Character.toUpperCase(aspect.charAt(0)) + aspect.substring(1); + + String amount = String.valueOf(NBTUtil.getNBTInteger(tag, keyAmount)); + + + + return String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount); + } + + private boolean knowAspect(String name, IWailaDataAccessor accessor){ + try{ + Object proxy = ThaumcraftModule.TC_proxy.get(null); + Object known = ThaumcraftModule.getKnownAspects.invoke(proxy, (Object[])null); + Object listAspc = ((Map)known).get(accessor.getPlayer().getDisplayName()); + //Object research = ThaumcraftModule.playerResearch.get(proxy); + //Object aspect = ThaumcraftModule.getAspect.invoke(null, name); + //Object knownaspects = ThaumcraftModule.aspectsDiscovered.get(research); + //Boolean known = (Boolean)ThaumcraftModule.hasDiscoveredAspect.invoke(research, accessor.getPlayer().username, aspect); + + Object[] aspects = (Object[])ThaumcraftModule.list_getAspects.invoke(listAspc); + for (Object o : aspects){ + if (ThaumcraftModule.aspect_tag.get(o).equals(name)){ + return true; + } + } + + return false; + + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + return false; + } + //return false; + } + + @Override + public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + if (te != null) + te.writeToNBT(tag); + return tag; + } + +} 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 7e25ed2..c5539c6 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -3,53 +3,52 @@ package mcp.mobius.waila.addons.thaumcraft; import java.lang.reflect.Field; import java.lang.reflect.Method; +import net.minecraft.nbt.NBTTagCompound; + import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; public class ThaumcraftModule { - - public static Class IAspectContainer = null; - public static Class TileAlchemyFurnace = null; - public static Class IGoggles = null; - public static Class Thaumcraft = null; - public static Class TCClientProxy = null; - public static Class TCCommonProxy = null; - public static Class Aspect = null; - public static Class AspectList = null; + public static Class Thaumcraft = null; + public static Field Thaumcraft_proxy = null; - public static Field TC_proxy = null; //Thaumcraft.proxy - public static Field aspect_tag = null; //Aspect.tag + public static Class IAspectContainer = null; + public static Method IAspectContainer_getAspects = null; - public static Method getKnownAspects = null; //CommonProxy.getKnownAspects - public static Method list_getAspects = null; //AspectList.getAspects + public static Class AspectList = null; + public static Method AspectList_writeToNBT = null; + + public static Class CommonProxy = null; + public static Method CommonProxy_getKnownAspects = null; + + //public static Class TileAlchemyFurnace = null; + //public static Class IGoggles = null; public static void register(){ try{ - Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft"); - Waila.log.log(Level.INFO, "Thaumcraft mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found."); - return; - } + Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft"); + Thaumcraft_proxy = Thaumcraft.getDeclaredField("proxy"); + + IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer"); + IAspectContainer_getAspects = IAspectContainer.getDeclaredMethod("getAspects"); + + AspectList = Class.forName("thaumcraft.api.aspects.AspectList"); + AspectList_writeToNBT = AspectList.getDeclaredMethod("writeToNBT", NBTTagCompound.class); + + CommonProxy = Class.forName("thaumcraft.common.CommonProxy"); + CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects"); + + //TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); + //IGoggles = Class.forName("thaumcraft.api.IGoggles"); - try{ - IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer"); - TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); - IGoggles = Class.forName("thaumcraft.api.IGoggles"); - TCClientProxy = Class.forName("thaumcraft.client.ClientProxy"); - TCCommonProxy = Class.forName("thaumcraft.common.CommonProxy"); - Aspect = Class.forName("thaumcraft.api.aspects.Aspect"); - AspectList = Class.forName("thaumcraft.api.aspects.AspectList"); - - TC_proxy = Thaumcraft.getDeclaredField("proxy"); - aspect_tag = Aspect.getDeclaredField("tag"); - aspect_tag.setAccessible(true); - - getKnownAspects = TCCommonProxy.getDeclaredMethod("getKnownAspects"); - list_getAspects = AspectList.getDeclaredMethod("getAspects"); + ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer); + //ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer); + //ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace); } catch (ClassNotFoundException e){ Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e); @@ -57,13 +56,10 @@ public class ThaumcraftModule { } catch (Exception e){ Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e); return; - } + } + + - ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace); } } diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java.bak b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java.bak new file mode 100644 index 0000000..7e25ed2 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java.bak @@ -0,0 +1,69 @@ +package mcp.mobius.waila.addons.thaumcraft; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import org.apache.logging.log4j.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class ThaumcraftModule { + + public static Class IAspectContainer = null; + public static Class TileAlchemyFurnace = null; + public static Class IGoggles = null; + + public static Class Thaumcraft = null; + public static Class TCClientProxy = null; + public static Class TCCommonProxy = null; + public static Class Aspect = null; + public static Class AspectList = null; + + public static Field TC_proxy = null; //Thaumcraft.proxy + public static Field aspect_tag = null; //Aspect.tag + + public static Method getKnownAspects = null; //CommonProxy.getKnownAspects + public static Method list_getAspects = null; //AspectList.getAspects + + public static void register(){ + try{ + Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft"); + Waila.log.log(Level.INFO, "Thaumcraft mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found."); + return; + } + + try{ + IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer"); + TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); + IGoggles = Class.forName("thaumcraft.api.IGoggles"); + TCClientProxy = Class.forName("thaumcraft.client.ClientProxy"); + TCCommonProxy = Class.forName("thaumcraft.common.CommonProxy"); + Aspect = Class.forName("thaumcraft.api.aspects.Aspect"); + AspectList = Class.forName("thaumcraft.api.aspects.AspectList"); + + TC_proxy = Thaumcraft.getDeclaredField("proxy"); + aspect_tag = Aspect.getDeclaredField("tag"); + aspect_tag.setAccessible(true); + + getKnownAspects = TCCommonProxy.getDeclaredMethod("getKnownAspects"); + list_getAspects = AspectList.getDeclaredMethod("getAspects"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java index e78b392..a63ebf4 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -42,7 +43,7 @@ public class HUDHandlerEnergyCell implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try { int recv = ThermalExpansionModule.TileEnergyCell_Recv.getInt(te); int send = ThermalExpansionModule.TileEnergyCell_Send.getInt(te); diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java index b0ebed7..719509a 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.lang.reflect.InvocationTargetException; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -49,7 +50,7 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try{ int energy = (Integer) ThermalExpansionModule.IEnergyHandler_getCurStorage.invoke(te, ForgeDirection.UNKNOWN); tag.setInteger("Energy", energy); diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java index 4031349..a3d2540 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -61,7 +62,7 @@ public class HUDHandlerISecureTile implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try { String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te); int access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal(); diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java index e0349f3..2db6ba0 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java @@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -83,7 +84,7 @@ public class HUDHandlerTank implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try { int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te); tag.setInteger("Amount", amount); diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java index f747da7..187bfd6 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -92,7 +93,7 @@ public class HUDHandlerTesseract implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { try { byte modeItem = ThermalExpansionModule.TileTesseract_Item.getByte(te); byte modeFluid = ThermalExpansionModule.TileTesseract_Fluid.getByte(te); diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java index 6490966..0af9a47 100644 --- a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.twilightforest; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -33,7 +34,7 @@ public class TwilightForestGenericOverride implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index 30bc5ae..319e815 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneOre; import net.minecraft.block.BlockSilverfish; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -206,7 +207,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java index 9b2dd18..991c921 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.api; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -39,5 +40,5 @@ public interface IWailaDataProvider{ * NBTTagCompound tag argument is the current NBT tag passed along by the various providers (first provider will be empty). * You HAVE TO return it if you registered as a provider, even if you are not doing anything to it (similar to the tooltip lists). * */ - NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z); + NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z); } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index da0078b..51731c3 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -10,6 +10,7 @@ import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.ModIdentification; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -86,7 +87,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java index 7d92fa2..6970735 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.logging.log4j.Level; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -80,7 +81,7 @@ public class HUDHandlerFMP implements IWailaDataProvider { } @Override - public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index e13a52e..465f4a8 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -6,12 +6,15 @@ import java.util.HashMap; import java.util.HashSet; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.NetworkRegistry; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.NBTUtil; import mcp.mobius.waila.utils.WailaExceptionHandler; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -107,17 +110,34 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler data) { + if(data.containsKey("coremodLocation")) + location = (File) data.get("coremodLocation"); + } + + public static File location; + + @Override + public String getAccessTransformerClass() { + return "mcp.mobius.wailacore.asm.CoreAccessTransformer"; + } +} diff --git a/src/main/java/mcp/mobius/wailacore/asm/CoreTransformer.java b/src/main/java/mcp/mobius/wailacore/asm/CoreTransformer.java new file mode 100644 index 0000000..2d314f6 --- /dev/null +++ b/src/main/java/mcp/mobius/wailacore/asm/CoreTransformer.java @@ -0,0 +1,73 @@ +package mcp.mobius.wailacore.asm; + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import net.minecraft.launchwrapper.IClassTransformer; + +public class CoreTransformer implements IClassTransformer { + + public CoreTransformer(){ + super(); + } + + @Override + public byte[] transform(String name, String srgname, byte[] bytes) { + + /* + boolean changed = false; + ClassNode classNode = new ClassNode(); + ClassReader classReader = new ClassReader(bytes); + + classReader.accept(classNode, 0); + + for (MethodNode methodNode : classNode.methods){ + + if (methodNode.name.equals("getNBTData") + && methodNode.desc.equals("(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;")) + { + methodNode.desc = "(Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;"; + changed = true; + CoreDescription.log.info(String.format("Class %s implements outdated getNBTData signature. Updating signature to most recent API.", name)); + } + } + + if (changed){ + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + classNode.accept(writer); + return writer.toByteArray(); + } + */ + + /* + if (classNode.interfaces.contains("mcp/mobius/waila/api/IWailaDataProvider")){ + + CoreDescription.log.info(String.format("Identified Waila plugin class : %s", name)); + for (MethodNode methodNode : classNode.methods){ + CoreDescription.log.info(String.format(" %s - %s | %s | %s | %s", name, methodNode.access, methodNode.name, methodNode.desc, methodNode.signature)); + + + if (methodNode.name.equals("getNBTData") + && methodNode.desc.equals("(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;")) + { + methodNode.desc = "(Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;"; + CoreDescription.log.info(String.format("Class %s implements outdated getNBTData signature. Updating signature to most recent API.", name)); + } + } + + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + classNode.accept(writer); + + return writer.toByteArray(); + } + */ + + return bytes; + } + + +}