From 7251015c3ad4eec344b1014fa84ac676aa63a88b Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Thu, 25 Dec 2014 19:40:33 +0100 Subject: [PATCH] Removed some debug stack printing in IEnergyHandler. Added a test IBlockInfo handler. Version bump Added enforcing dep on NEI --- build.gradle | 2 +- src/main/java/mcp/mobius/waila/Waila.java | 2 +- .../HUDHandlerIBlockInfo.java | 58 +++++++++++++++++++ .../HUDHandlerIEnergyHandler.java | 1 - .../ThermalExpansionModule.java | 22 +++++++ 5 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java diff --git a/build.gradle b/build.gradle index 952798b..0f1e55f 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.7a_1.7.10" +version = "1.5.7b_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index 0e01273..daebe77 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -44,7 +44,7 @@ import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.client.KeyEvent; import mcp.mobius.waila.commands.CommandDumpHandlers; -@Mod(modid="Waila", name="Waila", version="1.5.7", dependencies="required-after:NotEnoughItems", acceptableRemoteVersions="*") +@Mod(modid="Waila", name="Waila", version="1.5.7", dependencies="required-after:NotEnoughItems@(,1.0.3.78]", acceptableRemoteVersions="*") /* @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java new file mode 100644 index 0000000..21f6263 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java @@ -0,0 +1,58 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IChatComponent; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerIBlockInfo 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) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + try{ + List info = new ArrayList(); + Block block = world.getBlock(x, y, z); + ThermalExpansionModule.IBlockInfo_getBlockInfo.invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false); + + for (Object i : info){ + System.out.printf("%s\n", i); + } + + } catch (Exception e){ + throw new RuntimeException(e); + } + + return tag; + } + +} 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 c065ced..5e636e9 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -70,7 +70,6 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider { tag.setInteger("MaxStorage", maxsto); } catch (Exception e){ - e.printStackTrace(); throw new RuntimeException(e); } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index d630b44..38d3443 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -2,9 +2,12 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.util.List; import org.apache.logging.log4j.Level; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; @@ -44,6 +47,9 @@ public class ThermalExpansionModule { public static Class BlockMultipart = null; + public static Class IBlockInfo = null; + public static Method IBlockInfo_getBlockInfo = null; + public static void register(){ // XXX : We register the Energy interface first try{ @@ -136,6 +142,22 @@ public class ThermalExpansionModule { } catch (Exception e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e); } + + // XXX : We register the IBlockInfo interface + /* + try{ + IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); + IBlockInfo_getBlockInfo = IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); + + + //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); + ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); + + } catch (Exception e){ + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); + } + */ }