diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java b/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java index 62447c8..b5740e1 100644 --- a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java +++ b/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java @@ -4,6 +4,8 @@ import java.util.List; import codechicken.lib.lang.LangUtil; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.FluidStack; import mcp.mobius.waila.WailaExceptionHandler; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -25,22 +27,29 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider { @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (config.getConfig("thermalexpansion.fluidtype")){ + if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip; - try { - FluidStack fluid = (FluidStack)ThermalExpansionModule.TileConduitFluid_getRenderFluid.invoke(accessor.getTileEntity()); - - try{ - currenttip.add(fluid.getFluid().getLocalizedName()); - } catch (NullPointerException f){ - currenttip.add(LangUtil.translateG("hud.msg.empty")); - } - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } + boolean found = false; + FluidStack fluid = null; + + if (!accessor.getNBTData().hasKey("parts")) return currenttip; + NBTTagList parts = accessor.getNBTData().getTagList("parts"); + for (int i = 0; i < parts.tagCount(); i++){ + NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i); + String id = subtag.getString("id"); - } + if (id.contains("ConduitFluid")){ + found = true; + NBTTagCompound fluidTag = subtag.getCompoundTag("ConnFluid"); + fluid = FluidStack.loadFluidStackFromNBT(fluidTag); + } + } + + if (fluid != null) + currenttip.add(fluid.getFluid().getLocalizedName()); + else + currenttip.add(LangUtil.translateG("hud.msg.empty")); + return currenttip; } diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java b/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java index eca2aa8..48104d6 100644 --- a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java +++ b/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java @@ -3,6 +3,8 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -22,18 +24,35 @@ public class HUDHandlerConduitItem implements IWailaDataProvider { @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getNBTData().hasKey("Mode") && accessor.getNBTInteger(accessor.getNBTData(), "Mode") != 0){ - int mode = accessor.getNBTInteger(accessor.getNBTData(), "Mode"); + if (!config.getConfig("thermalexpansion.conditemmode")) return currenttip; + + boolean found = false; + int mode = -1; + + if (!accessor.getNBTData().hasKey("parts")) return currenttip; + NBTTagList parts = accessor.getNBTData().getTagList("parts"); + for (int i = 0; i < parts.tagCount(); i++){ + NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i); + String id = subtag.getString("id"); - if (mode == 1) - currenttip.add("Mode : \u00a7fDense"); - else if (mode == 2) - currenttip.add("Mode : \u00a7fVacuum"); - else if (mode == 3) - currenttip.add("Mode : \u00a7fRound-Robin"); - else - currenttip.add("Mode : "); - } + if (id.contains("ConduitItem")){ + mode = accessor.getNBTInteger(subtag, "Mode"); + found = true; + } + } + + if (!found) return currenttip; + + if (mode == 0){} + else if (mode == 1) + currenttip.add("Mode : \u00a7fDense"); + else if (mode == 2) + currenttip.add("Mode : \u00a7fVacuum"); + else if (mode == 3) + currenttip.add("Mode : \u00a7fRound-Robin"); + else + currenttip.add("Mode : "); + return currenttip; } diff --git a/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index 20dd309..25e31b9 100644 --- a/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -20,16 +20,18 @@ public class ThermalExpansionModule { public static Method TileTank_getTankCapacity = null; public static Field TileTank_mode = null; - public static Class TileConduitFluid = null; - public static Method TileConduitFluid_getRenderFluid = null; - public static Method TileConduitFluid_getRenderFluidLevel = null; + //public static Class TileConduitFluid = null; + //public static Method TileConduitFluid_getRenderFluid = null; + //public static Method TileConduitFluid_getRenderFluidLevel = null; - public static Class TileConduitItems = null; + //public static Class TileConduitItems = null; public static Class TileTesseract = null; public static Class ISecureTile = null; + public static Class BlockMultipart = null; + //public static Field TileTesseract_modItem = null; //public static Field TileTesseract_modFluid = null; //public static Field TileTesseract_modEnergy = null; @@ -59,16 +61,17 @@ public class ThermalExpansionModule { TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity"); TileTank_mode = TileTank.getField("mode"); - TileConduitFluid = Class.forName("thermalexpansion.block.conduit.fluid.TileConduitFluid"); - TileConduitFluid_getRenderFluid = TileConduitFluid.getMethod("getRenderFluid"); - TileConduitFluid_getRenderFluidLevel = TileConduitFluid.getMethod("getRenderFluidLevel"); - - TileConduitItems = Class.forName("thermalexpansion.block.conduit.item.TileConduitItem"); + //TileConduitFluid = Class.forName("thermalexpansion.block.conduit.fluid.TileConduitFluid"); + //TileConduitFluid_getRenderFluid = TileConduitFluid.getMethod("getRenderFluid"); + //TileConduitFluid_getRenderFluidLevel = TileConduitFluid.getMethod("getRenderFluidLevel"); + //TileConduitItems = Class.forName("thermalexpansion.block.conduit.item.TileConduitItem"); TileTesseract = Class.forName("thermalexpansion.block.tesseract.TileTesseract"); ISecureTile = Class.forName("cofh.api.tileentity.ISecureTile"); + BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); + //TileTesseract_modItem = TileTesseract.getField("modItem"); //TileTesseract_modFluid = TileTesseract.getField("modFluid"); //TileTesseract_modEnergy = TileTesseract.getField("modEnergy"); @@ -96,7 +99,7 @@ public class ThermalExpansionModule { ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell"); - ExternalModulesHandler.instance().addConfig("Thermal Expansion", "thermalexpansion.fluidtype"); + ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype"); ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount"); ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.conditemmode"); ExternalModulesHandler.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode"); @@ -105,19 +108,17 @@ public class ThermalExpansionModule { ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner"); ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyHandler); - //ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), TileEnergyCell); ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell); ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerTank(), TileTank); ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTank(), TileTank); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitFluid(), TileConduitFluid); ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitItem(), TileConduitItems); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile); - - //ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitBase(), TileConduitBase); + + ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitFluid(), BlockMultipart); + ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitItem(), BlockMultipart); + } diff --git a/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index ce8bc46..9b24b05 100644 --- a/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -4,6 +4,7 @@ import java.util.List; import codechicken.lib.lang.LangUtil; import net.minecraft.block.Block; +import net.minecraft.block.BlockSilverfish; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; @@ -31,11 +32,29 @@ public class HUDHandlerVanilla implements IWailaDataProvider { static int jukebox = Block.jukebox.blockID; static int cocoa = Block.cocoaPlant.blockID; static int netherwart = Block.netherStalk.blockID; + static int silverfish = Block.silverfish.blockID; @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + int blockID = accessor.getBlockID(); + + if (blockID == silverfish){ + int metadata = accessor.getMetadata(); + switch(metadata){ + case 0: + return new ItemStack(Block.stone); + case 1: + return new ItemStack(Block.cobblestone); + case 2: + return new ItemStack(Block.stoneBrick); + default: + return null; + } + } + return null; + } @Override @@ -149,23 +168,27 @@ public class HUDHandlerVanilla implements IWailaDataProvider { ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.repeater"); ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.comparator"); ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.redstone"); - ExternalModulesHandler.instance().addConfigRemote("VanillaMC", "vanilla.jukebox"); - ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerVanilla(), mobSpawnerID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), cropsID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), melonStemID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), pumpkinStemID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), carrotID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), potatoID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), leverID); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), repeaterIdle); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), repeaterActv); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), comparatorIdl); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), comparatorAct); - ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerVanilla(), redstone); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), redstone); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), jukebox); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), cocoa); - ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), netherwart); + ExternalModulesHandler.instance().addConfigRemote("VanillaMC", "vanilla.jukebox"); + + IWailaDataProvider provider = new HUDHandlerVanilla(); + + ExternalModulesHandler.instance().registerStackProvider(provider, silverfish); + ExternalModulesHandler.instance().registerHeadProvider(provider, mobSpawnerID); + ExternalModulesHandler.instance().registerBodyProvider(provider, cropsID); + ExternalModulesHandler.instance().registerBodyProvider(provider, melonStemID); + ExternalModulesHandler.instance().registerBodyProvider(provider, pumpkinStemID); + ExternalModulesHandler.instance().registerBodyProvider(provider, carrotID); + ExternalModulesHandler.instance().registerBodyProvider(provider, potatoID); + ExternalModulesHandler.instance().registerBodyProvider(provider, leverID); + ExternalModulesHandler.instance().registerBodyProvider(provider, repeaterIdle); + ExternalModulesHandler.instance().registerBodyProvider(provider, repeaterActv); + ExternalModulesHandler.instance().registerBodyProvider(provider, comparatorIdl); + ExternalModulesHandler.instance().registerBodyProvider(provider, comparatorAct); + ExternalModulesHandler.instance().registerHeadProvider(provider, redstone); + ExternalModulesHandler.instance().registerBodyProvider(provider, redstone); + ExternalModulesHandler.instance().registerBodyProvider(provider, jukebox); + ExternalModulesHandler.instance().registerBodyProvider(provider, cocoa); + ExternalModulesHandler.instance().registerBodyProvider(provider, netherwart); ExternalModulesHandler.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");