Cleanup in TE

getNBTData rethrowing the exceptions to be caught by the Waila Exception handler (IC2, TE).
Version bump
This commit is contained in:
Thomas Guimbretiere committed 2014-12-14 20:08:07 +01:00
1 parent 47cc1af622
commit c887c01e2e
10 files changed
+8 -147

No files matched your search

+1 -1
View File
@@ -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,)")
@@ -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);
}
@@ -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<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> 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<String> getWailaTail(ItemStack itemStack, List<String> 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;
}
}
@@ -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<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> 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 : <UNKNOWN>");
*/
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> 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;
}
}
@@ -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;
}
@@ -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);
}
@@ -70,7 +70,7 @@ public class HUDHandlerISecureTile implements IWailaDataProvider {
tag.setInteger("Access", access);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
return tag;
}
@@ -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;
}
@@ -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;
}