From c887c01e2ef912346487af38efffc2cdd3b3fa90 Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sun, 14 Dec 2014 20:08:07 +0100 Subject: [PATCH] Cleanup in TE getNBTData rethrowing the exceptions to be caught by the Waila Exception handler (IC2, TE). Version bump --- build.gradle | 2 +- src/main/java/mcp/mobius/waila/Waila.java | 2 +- .../addons/ic2/HUDHandlerTEGenerator.java | 1 + .../HUDHandlerConduitFluid.java | 70 ------------------ .../HUDHandlerConduitItem.java | 71 ------------------- .../HUDHandlerEnergyCell.java | 2 +- .../HUDHandlerIEnergyHandler.java | 1 + .../HUDHandlerISecureTile.java | 2 +- .../thermalexpansion/HUDHandlerTank.java | 2 +- .../thermalexpansion/HUDHandlerTesseract.java | 2 +- 10 files changed, 8 insertions(+), 147 deletions(-) delete mode 100644 src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java delete mode 100644 src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java diff --git a/build.gradle b/build.gradle index 524c531..79abd67 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.6_dev5_1.7.10" +version = "1.5.6_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 a3195fc..aba3594 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.5", dependencies="required-after:NotEnoughItems", acceptableRemoteVersions="*") +@Mod(modid="Waila", name="Waila", version="1.5.6", dependencies="required-after:NotEnoughItems", 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/ic2/HUDHandlerTEGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java index 03b1931..a2ae7bd 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java @@ -100,6 +100,7 @@ public class HUDHandlerTEGenerator implements IWailaDataProvider { tag.setDouble ("storage", storage); tag.setLong ("production", production); tag.setLong ("maxStorage", maxStorage); + } catch (Exception e){ throw new RuntimeException(e); } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java deleted file mode 100644 index d9ae409..0000000 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java +++ /dev/null @@ -1,70 +0,0 @@ -package mcp.mobius.waila.addons.thermalexpansion; - -import java.util.List; - -import mcp.mobius.waila.cbcore.LangUtil; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; - -public class HUDHandlerConduitFluid 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("thermalexpansion.fluidtype")) return 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 (!found) return currenttip; - - if (fluid != null) - currenttip.add(fluid.getFluid().getLocalizedName()); - else - currenttip.add(LangUtil.translateG("hud.msg.empty")); - */ - 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) { - return tag; - } - -} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java deleted file mode 100644 index 405738e..0000000 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java +++ /dev/null @@ -1,71 +0,0 @@ -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 net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; - -public class HUDHandlerConduitItem 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("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 (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; - } - - @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) { - return tag; - } - -} 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 6959500..e78b392 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java @@ -49,7 +49,7 @@ public class HUDHandlerEnergyCell implements IWailaDataProvider { tag.setInteger("Recv", recv); tag.setInteger("Send", send); } catch (Exception e) { - e.printStackTrace(); + 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 9ee0683..b0ebed7 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -53,6 +53,7 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider { try{ int energy = (Integer) ThermalExpansionModule.IEnergyHandler_getCurStorage.invoke(te, ForgeDirection.UNKNOWN); tag.setInteger("Energy", energy); + } catch (Exception e){ throw new RuntimeException(e); } 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 010a82e..4031349 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java @@ -70,7 +70,7 @@ public class HUDHandlerISecureTile implements IWailaDataProvider { tag.setInteger("Access", access); } catch (Exception e) { - e.printStackTrace(); + throw new RuntimeException(e); } return tag; } 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 7790994..e0349f3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java @@ -88,7 +88,7 @@ public class HUDHandlerTank implements IWailaDataProvider { int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te); tag.setInteger("Amount", amount); } catch (Exception e) { - e.printStackTrace(); + throw new RuntimeException(e); } return tag; } 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 fc35021..f747da7 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java @@ -101,7 +101,7 @@ public class HUDHandlerTesseract implements IWailaDataProvider { tag.setByte("Fluid.Mode", modeFluid); tag.setByte("Energy.Mode", modeEnergy); } catch (Exception e) { - e.printStackTrace(); + throw new RuntimeException(e); } return tag; }