From da60ffef6722e66ff7eb3591fb21409b3aea96ad Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sun, 14 Dec 2014 03:31:40 +0100 Subject: [PATCH] Readded IC2 generators --- ...ava => HUDHandlerTEBaseGenerator.java.bak} | 0 ...ava => HUDHandlerTEElectricBlock.java.bak} | 0 .../addons/ic2/HUDHandlerTEGenerator.java | 109 +++++++++ ...a => HUDHandlerTEStandardMachine.java.bak} | 0 ...at.java => HUDHandlerTETradeOMat.java.bak} | 0 .../mobius/waila/addons/ic2/IC2Module.java | 223 +++++------------- .../waila/addons/ic2/IC2Module.java.bak | 186 +++++++++++++++ ...{IC2Upgrades.java => IC2Upgrades.java.bak} | 0 .../mcp/mobius/waila/server/ProxyServer.java | 3 +- 9 files changed, 362 insertions(+), 159 deletions(-) rename src/main/java/mcp/mobius/waila/addons/ic2/{HUDHandlerTEBaseGenerator.java => HUDHandlerTEBaseGenerator.java.bak} (100%) rename src/main/java/mcp/mobius/waila/addons/ic2/{HUDHandlerTEElectricBlock.java => HUDHandlerTEElectricBlock.java.bak} (100%) create mode 100644 src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java rename src/main/java/mcp/mobius/waila/addons/ic2/{HUDHandlerTEStandardMachine.java => HUDHandlerTEStandardMachine.java.bak} (100%) rename src/main/java/mcp/mobius/waila/addons/ic2/{HUDHandlerTETradeOMat.java => HUDHandlerTETradeOMat.java.bak} (100%) create mode 100644 src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java.bak rename src/main/java/mcp/mobius/waila/addons/ic2/{IC2Upgrades.java => IC2Upgrades.java.bak} (100%) diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java.bak similarity index 100% rename from src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java.bak diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java.bak similarity index 100% rename from src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java.bak diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java new file mode 100644 index 0000000..03b1931 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java @@ -0,0 +1,109 @@ +package mcp.mobius.waila.addons.ic2; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +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.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerTEGenerator 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) { + try{ + double storage = accessor.getNBTData().getDouble("storage"); + int production = accessor.getNBTData().getInteger("production"); + long maxStorage = accessor.getNBTData().getLong("maxStorage"); + + String storedStr = LangUtil.translateG("hud.msg.stored"); + String outputStr = LangUtil.translateG("hud.msg.output"); + + /* EU Storage */ + if (ConfigHandler.instance().getConfig("ic2.storage")){ + if (maxStorage > 0) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(storage,maxStorage)), maxStorage)); + } + + if (ConfigHandler.instance().getConfig("ic2.outputeu")){ + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production)); + } + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + + try{ + double storage = -1; + long production = -1; + long maxStorage = -1; + + if (IC2Module.TileBaseGenerator.isInstance(te)){ + storage = IC2Module.TileBaseGenerator_storage.getDouble(te); + production = (long)IC2Module.TileBaseGenerator_production.getInt(te); + maxStorage = (long)IC2Module.TileBaseGenerator_maxStorage.getShort(te); + } + + else if (IC2Module.TileGeoGenerator.isInstance(te)){ + storage = IC2Module.TileGeoGenerator_storage.getDouble(te); + production = (long)IC2Module.TileGeoGenerator_production.getInt(te); + maxStorage = (long)IC2Module.TileGeoGenerator_maxStorage.getShort(te); + } + + else if (IC2Module.TileKineticGenerator.isInstance(te)){ + storage = IC2Module.TileKineticGenerator_storage.getDouble(te); + production = MathHelper.floor_double_long(IC2Module.TileKineticGenerator_production.getDouble(te)); + maxStorage = (long)IC2Module.TileKineticGenerator_maxStorage.getInt(te); + } + + else if (IC2Module.TileSemifluidGenerator.isInstance(te)){ + storage = IC2Module.TileSemifluidGenerator_storage.getDouble(te); + production = MathHelper.floor_double_long(IC2Module.TileSemifluidGenerator_production.getDouble(te)); + maxStorage = (long)IC2Module.TileSemifluidGenerator_maxStorage.getShort(te); + } + + else if (IC2Module.TileStirlingGenerator.isInstance(te)){ + storage = IC2Module.TileStirlingGenerator_storage.getDouble(te); + production = MathHelper.floor_double_long(IC2Module.TileStirlingGenerator_production.getDouble(te)); + maxStorage = (long)IC2Module.TileStirlingGenerator_maxStorage.getShort(te); + } + + tag.setDouble ("storage", storage); + tag.setLong ("production", production); + tag.setLong ("maxStorage", maxStorage); + } catch (Exception e){ + throw new RuntimeException(e); + } + return tag; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java.bak similarity index 100% rename from src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java.bak diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java.bak similarity index 100% rename from src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java.bak diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java index 0a50589..74f9abe 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java @@ -1,186 +1,93 @@ package mcp.mobius.waila.addons.ic2; import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.List; -import java.util.logging.Level; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.AccessHelper; public class IC2Module { - public static Class TileEntityStandardMachine = null; - public static Field TESM_DefaultEnergyStorage = null; - public static Field TESM_DefaultEnergyConsume = null; - public static Field TESM_DefaultOperationLength = null; - public static Field TESM_MaxEnergy = null; + public static Class TileBaseGenerator = null; + public static Field TileBaseGenerator_storage = null; + public static Field TileBaseGenerator_maxStorage = null; + public static Field TileBaseGenerator_production = null; - public static Class TileEntityBaseGenerator = null; - public static Field TEBG_MaxStorage = null; - public static Field TEBG_Production = null; + public static Class TileGeoGenerator = null; + public static Field TileGeoGenerator_storage = null; + public static Field TileGeoGenerator_maxStorage = null; + public static Field TileGeoGenerator_production = null; + + public static Class TileKineticGenerator = null; + public static Field TileKineticGenerator_storage = null; + public static Field TileKineticGenerator_maxStorage = null; + public static Field TileKineticGenerator_production = null; - public static Class TileEntitySemifluidGenerator = null; - public static Field TESG_MaxStorage = null; - public static Field TESG_Production = null; + public static Class TileSemifluidGenerator = null; + public static Field TileSemifluidGenerator_storage = null; + public static Field TileSemifluidGenerator_maxStorage = null; + public static Field TileSemifluidGenerator_production = null; - public static Class TileEntityGeoGenerator = null; - public static Field TEGG_MaxStorage = null; - public static Field TEGG_Production = null; - - public static Class TileEntityElectricBlock = null; - public static Field TEEB_MaxStorage = null; - public static Field TEEB_Output = null; - - public static Class IEnergySink = null; - public static Method IES_GetMaxSafeInput = null; - - public static Class TileEntityTradeOMat = null; - - /* Some required items */ - public static Class IC2Items = null; - public static Field TransformerUpgrade = null; - public static ItemStack TransformerUpgradeStack = null; - public static Field EnergyStorageUpgrade = null; - public static ItemStack EnergyStorageUpgradeStack = null; - public static Field OverclockerUpgrade = null; - public static ItemStack OverclockerUpgradeStack = null; + public static Class TileStirlingGenerator = null; + public static Field TileStirlingGenerator_storage = null; + public static Field TileStirlingGenerator_maxStorage = null; + public static Field TileStirlingGenerator_production = null; public static void register(){ - /* - + // XXX : We register the Energy interface first try{ - TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine"); - TESM_DefaultEnergyStorage = TileEntityStandardMachine.getField("defaultEnergyStorage"); - TESM_DefaultEnergyConsume = TileEntityStandardMachine.getField("defaultEnergyConsume"); - TESM_DefaultOperationLength = TileEntityStandardMachine.getField("defaultOperationLength"); - TESM_MaxEnergy = TileEntityStandardMachine.getField("maxEnergy"); - - TileEntityBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator"); - TEBG_MaxStorage = TileEntityBaseGenerator.getField("maxStorage"); - TEBG_Production = TileEntityBaseGenerator.getField("production"); + TileBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator"); + TileBaseGenerator_storage = TileBaseGenerator.getDeclaredField("storage"); + TileBaseGenerator_maxStorage = TileBaseGenerator.getDeclaredField("maxStorage"); + TileBaseGenerator_production = TileBaseGenerator.getDeclaredField("production"); - TileEntitySemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator"); - TESG_MaxStorage = TileEntitySemifluidGenerator.getDeclaredField("maxStorage"); - TESG_Production = TileEntitySemifluidGenerator.getDeclaredField("production"); - TESG_MaxStorage.setAccessible(true); - TESG_Production.setAccessible(true); + TileGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator"); + TileGeoGenerator_storage = TileGeoGenerator.getDeclaredField("storage"); + TileGeoGenerator_maxStorage = TileGeoGenerator.getDeclaredField("maxStorage"); + TileGeoGenerator_production = TileGeoGenerator.getDeclaredField("production"); - TileEntityGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator"); - TEGG_MaxStorage = TileEntityGeoGenerator.getField("maxStorage"); - TEGG_Production = TileEntityGeoGenerator.getField("production"); + TileKineticGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityKineticGenerator"); + TileKineticGenerator_storage = TileKineticGenerator.getDeclaredField("EUstorage"); + TileKineticGenerator_maxStorage = TileKineticGenerator.getDeclaredField("maxEUStorage"); + TileKineticGenerator_production = TileKineticGenerator.getDeclaredField("production"); + TileKineticGenerator_storage.setAccessible(true); + TileKineticGenerator_maxStorage.setAccessible(true); + TileKineticGenerator_production.setAccessible(true); - TileEntityElectricBlock = Class.forName("ic2.core.block.wiring.TileEntityElectricBlock"); - TEEB_MaxStorage = TileEntityElectricBlock.getField("maxStorage"); - TEEB_Output = TileEntityElectricBlock.getField("output"); + TileSemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator"); + TileSemifluidGenerator_storage = TileSemifluidGenerator.getDeclaredField("storage"); + TileSemifluidGenerator_maxStorage = TileSemifluidGenerator.getDeclaredField("maxStorage"); + TileSemifluidGenerator_production = TileSemifluidGenerator.getDeclaredField("production"); + TileSemifluidGenerator_storage.setAccessible(true); + TileSemifluidGenerator_maxStorage.setAccessible(true); + TileSemifluidGenerator_production.setAccessible(true); - IEnergySink = Class.forName("ic2.api.energy.tile.IEnergySink"); - IES_GetMaxSafeInput = IEnergySink.getMethod("getMaxSafeInput"); + TileStirlingGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityStirlingGenerator"); + TileStirlingGenerator_storage = TileStirlingGenerator.getDeclaredField("EUstorage"); + TileStirlingGenerator_maxStorage = TileStirlingGenerator.getDeclaredField("maxEUStorage"); + TileStirlingGenerator_production = TileStirlingGenerator.getDeclaredField("production"); - IC2Items = Class.forName("ic2.core.Ic2Items"); - TransformerUpgrade = IC2Items.getField("transformerUpgrade"); - EnergyStorageUpgrade = IC2Items.getField("energyStorageUpgrade"); - OverclockerUpgrade = IC2Items.getField("overclockerUpgrade"); + //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileBaseGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileGeoGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileKineticGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator); - TransformerUpgradeStack = (ItemStack)TransformerUpgrade.get(null); - EnergyStorageUpgradeStack = (ItemStack)EnergyStorageUpgrade.get(null); - OverclockerUpgradeStack = (ItemStack)OverclockerUpgrade.get(null); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileBaseGenerator); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileGeoGenerator); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileKineticGenerator); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileSemifluidGenerator); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileStirlingGenerator); - TileEntityTradeOMat = Class.forName("ic2.core.block.personal.TileEntityTradeOMat"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.outputeu"); - } catch (ClassNotFoundException e){ - //e.printStackTrace(); - Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e); - return; - } catch (NoSuchMethodException e){ - //e.printStackTrace(); - Waila.log.log(Level.WARNING, "[IC2] Method not found." + e); - return; - } catch (NoSuchFieldException e){ - //e.printStackTrace(); - Waila.log.log(Level.WARNING, "[IC2] Field not found." + e); - return; } catch (Exception e){ - //e.printStackTrace(); - Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e); - return; - } + Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading TileEntityBaseGenerator hooks." + e); + } - - ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage"); - ModuleRegistrar.instance().addConfig("IndustrialCraft2", "ic2.outputeu"); - ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.inputeu"); - ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.consump"); - ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.tradeomat"); - - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEStandardMachine(), TileEntityStandardMachine); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityBaseGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntitySemifluidGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityGeoGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEElectricBlock(), TileEntityElectricBlock); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTETradeOMat(), TileEntityTradeOMat); - - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStandardMachine); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityBaseGenerator); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntitySemifluidGenerator); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityGeoGenerator); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityElectricBlock); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTradeOMat); - */ - } - - /* Retuns the current stored energy if available in the nbt and config is true */ - public static double getStoredEnergy(IWailaDataAccessor accessor){ - /* - if (ConfigHandler.instance().getConfig("ic2.storage")){ - if (accessor.getNBTData().hasKey("energy")) - return accessor.getNBTData().getDouble("energy"); - else if (accessor.getNBTData().hasKey("storage")) - return accessor.getNBTData().getDouble("storage"); - } - */ - return -1.0; - } - - public static IC2Upgrades getUpgrades(IWailaDataAccessor accessor){ - - NBTTagCompound nbt = accessor.getNBTData(); - IC2Upgrades upgrades = new IC2Upgrades(); - - /* - if (!nbt.hasKey("InvSlots")) return null; - - NBTTagCompound inventory = nbt.getCompoundTag("InvSlots"); - if (!inventory.hasKey("upgrade")) return null; - - NBTTagList nbtupgrades = inventory.getCompoundTag("upgrade").getTagList("Contents"); - - //List tagList = (List)AccessHelper.getField("net.minecraft.nbt.NBTTagList", "tagList", nbtupgrades); - List tagList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtupgrades, "field_74747_a"); - - for (Object subobj : tagList){ - NBTTagCompound subtag = (NBTTagCompound)subobj; - int id = subtag.getShort("id"); - int meta = subtag.getShort("Damage"); - int count = subtag.getByte("Count"); - - //ItemStack is = new ItemStack(id, 1, count); - if (TransformerUpgradeStack.getItemDamage() == meta && TransformerUpgradeStack.itemID == id) - upgrades.transform += count; - if (EnergyStorageUpgradeStack.getItemDamage() == meta && EnergyStorageUpgradeStack.itemID == id) - upgrades.storage += count; - if (OverclockerUpgradeStack.getItemDamage() == meta && OverclockerUpgradeStack.itemID == id) - upgrades.overclocker += count; - } - */ - return upgrades; } } diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java.bak b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java.bak new file mode 100644 index 0000000..0a50589 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java.bak @@ -0,0 +1,186 @@ +package mcp.mobius.waila.addons.ic2; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.List; +import java.util.logging.Level; + +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.AccessHelper; + +public class IC2Module { + + public static Class TileEntityStandardMachine = null; + public static Field TESM_DefaultEnergyStorage = null; + public static Field TESM_DefaultEnergyConsume = null; + public static Field TESM_DefaultOperationLength = null; + public static Field TESM_MaxEnergy = null; + + public static Class TileEntityBaseGenerator = null; + public static Field TEBG_MaxStorage = null; + public static Field TEBG_Production = null; + + public static Class TileEntitySemifluidGenerator = null; + public static Field TESG_MaxStorage = null; + public static Field TESG_Production = null; + + public static Class TileEntityGeoGenerator = null; + public static Field TEGG_MaxStorage = null; + public static Field TEGG_Production = null; + + public static Class TileEntityElectricBlock = null; + public static Field TEEB_MaxStorage = null; + public static Field TEEB_Output = null; + + public static Class IEnergySink = null; + public static Method IES_GetMaxSafeInput = null; + + public static Class TileEntityTradeOMat = null; + + /* Some required items */ + public static Class IC2Items = null; + public static Field TransformerUpgrade = null; + public static ItemStack TransformerUpgradeStack = null; + public static Field EnergyStorageUpgrade = null; + public static ItemStack EnergyStorageUpgradeStack = null; + public static Field OverclockerUpgrade = null; + public static ItemStack OverclockerUpgradeStack = null; + + public static void register(){ + /* + + try{ + TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine"); + TESM_DefaultEnergyStorage = TileEntityStandardMachine.getField("defaultEnergyStorage"); + TESM_DefaultEnergyConsume = TileEntityStandardMachine.getField("defaultEnergyConsume"); + TESM_DefaultOperationLength = TileEntityStandardMachine.getField("defaultOperationLength"); + TESM_MaxEnergy = TileEntityStandardMachine.getField("maxEnergy"); + + TileEntityBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator"); + TEBG_MaxStorage = TileEntityBaseGenerator.getField("maxStorage"); + TEBG_Production = TileEntityBaseGenerator.getField("production"); + + TileEntitySemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator"); + TESG_MaxStorage = TileEntitySemifluidGenerator.getDeclaredField("maxStorage"); + TESG_Production = TileEntitySemifluidGenerator.getDeclaredField("production"); + TESG_MaxStorage.setAccessible(true); + TESG_Production.setAccessible(true); + + TileEntityGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator"); + TEGG_MaxStorage = TileEntityGeoGenerator.getField("maxStorage"); + TEGG_Production = TileEntityGeoGenerator.getField("production"); + + TileEntityElectricBlock = Class.forName("ic2.core.block.wiring.TileEntityElectricBlock"); + TEEB_MaxStorage = TileEntityElectricBlock.getField("maxStorage"); + TEEB_Output = TileEntityElectricBlock.getField("output"); + + IEnergySink = Class.forName("ic2.api.energy.tile.IEnergySink"); + IES_GetMaxSafeInput = IEnergySink.getMethod("getMaxSafeInput"); + + IC2Items = Class.forName("ic2.core.Ic2Items"); + TransformerUpgrade = IC2Items.getField("transformerUpgrade"); + EnergyStorageUpgrade = IC2Items.getField("energyStorageUpgrade"); + OverclockerUpgrade = IC2Items.getField("overclockerUpgrade"); + + TransformerUpgradeStack = (ItemStack)TransformerUpgrade.get(null); + EnergyStorageUpgradeStack = (ItemStack)EnergyStorageUpgrade.get(null); + OverclockerUpgradeStack = (ItemStack)OverclockerUpgrade.get(null); + + TileEntityTradeOMat = Class.forName("ic2.core.block.personal.TileEntityTradeOMat"); + + } catch (ClassNotFoundException e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Method not found." + e); + return; + } catch (NoSuchFieldException e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Field not found." + e); + return; + } catch (Exception e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e); + return; + } + + + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage"); + ModuleRegistrar.instance().addConfig("IndustrialCraft2", "ic2.outputeu"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.inputeu"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.consump"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.tradeomat"); + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEStandardMachine(), TileEntityStandardMachine); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityBaseGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntitySemifluidGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityGeoGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEElectricBlock(), TileEntityElectricBlock); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTETradeOMat(), TileEntityTradeOMat); + + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStandardMachine); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityBaseGenerator); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntitySemifluidGenerator); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityGeoGenerator); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityElectricBlock); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTradeOMat); + */ + } + + /* Retuns the current stored energy if available in the nbt and config is true */ + public static double getStoredEnergy(IWailaDataAccessor accessor){ + /* + if (ConfigHandler.instance().getConfig("ic2.storage")){ + if (accessor.getNBTData().hasKey("energy")) + return accessor.getNBTData().getDouble("energy"); + else if (accessor.getNBTData().hasKey("storage")) + return accessor.getNBTData().getDouble("storage"); + } + */ + return -1.0; + } + + public static IC2Upgrades getUpgrades(IWailaDataAccessor accessor){ + + NBTTagCompound nbt = accessor.getNBTData(); + IC2Upgrades upgrades = new IC2Upgrades(); + + /* + if (!nbt.hasKey("InvSlots")) return null; + + NBTTagCompound inventory = nbt.getCompoundTag("InvSlots"); + if (!inventory.hasKey("upgrade")) return null; + + NBTTagList nbtupgrades = inventory.getCompoundTag("upgrade").getTagList("Contents"); + + //List tagList = (List)AccessHelper.getField("net.minecraft.nbt.NBTTagList", "tagList", nbtupgrades); + List tagList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtupgrades, "field_74747_a"); + + for (Object subobj : tagList){ + NBTTagCompound subtag = (NBTTagCompound)subobj; + int id = subtag.getShort("id"); + int meta = subtag.getShort("Damage"); + int count = subtag.getByte("Count"); + + //ItemStack is = new ItemStack(id, 1, count); + if (TransformerUpgradeStack.getItemDamage() == meta && TransformerUpgradeStack.itemID == id) + upgrades.transform += count; + if (EnergyStorageUpgradeStack.getItemDamage() == meta && EnergyStorageUpgradeStack.itemID == id) + upgrades.storage += count; + if (OverclockerUpgradeStack.getItemDamage() == meta && OverclockerUpgradeStack.itemID == id) + upgrades.overclocker += count; + } + */ + return upgrades; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java.bak similarity index 100% rename from src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java rename to src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java.bak diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index 4a1cccc..659d19e 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -15,6 +15,7 @@ import mcp.mobius.waila.addons.etb.ETBModule; import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule; import mcp.mobius.waila.addons.gravestone.GravestoneModule; import mcp.mobius.waila.addons.harvestcraft.HarvestcraftModule; +import mcp.mobius.waila.addons.ic2.IC2Module; import mcp.mobius.waila.addons.magicalcrops.MagicalCropsModule; import mcp.mobius.waila.addons.openblocks.OpenBlocksModule; import mcp.mobius.waila.addons.projectred.ProjectRedModule; @@ -45,7 +46,7 @@ public class ProxyServer { BCModule.register(); /* INDUSTRIALCRAFT2 */ - //IC2Module.register(); + IC2Module.register(); /*Thaumcraft*/ ThaumcraftModule.register();