Updated TE module to handle new interfaces.

Readded the clear/remove part of TipList to make sure there is no lingering tags.
This commit is contained in:
Thomas Guimbretiere committed 2014-12-17 20:29:18 +01:00
1 parent 8d5d86705c
commit b7dda5d80b
3 files changed
+97 -51

No files matched your search

@@ -11,6 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.TipList;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
@@ -31,11 +32,14 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
if (!config.getConfig("thermalexpansion.energyhandler")) return currenttip;
if (!accessor.getNBTData().hasKey("Energy")) return currenttip;
int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage");
try {
Integer maxEnergy = (Integer)ThermalExpansionModule.IEnergyHandler_getMaxStorage.invoke(accessor.getTileEntity(), ForgeDirection.UNKNOWN);
if (maxEnergy != 0)
currenttip.add(String.format("%d / %d RF", energy, maxEnergy));
if ((maxEnergy != 0) && (((TipList)currenttip).getEntries("RFEnergyStorage").size() == 0)){
String s = String.format("%d / %d RF", energy, maxEnergy);
currenttip.add(s);
((TipList)currenttip).addTag(s, "RFEnergyStorage");
}
} catch (Exception e){
currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
}
@@ -51,10 +55,24 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
@Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try{
int energy = (Integer) ThermalExpansionModule.IEnergyHandler_getCurStorage.invoke(te, ForgeDirection.UNKNOWN);
tag.setInteger("Energy", energy);
Integer energy = -1;
Integer maxsto = -1;
if (ThermalExpansionModule.IEnergyInfo.isInstance(te)){
energy = (Integer) ThermalExpansionModule.IEnergyInfo_getCurStorage.invoke(te);
maxsto = (Integer) ThermalExpansionModule.IEnergyInfo_getMaxStorage.invoke(te);
} else if (ThermalExpansionModule.IEnergyProvider.isInstance(te)){
energy = (Integer) ThermalExpansionModule.IEnergyProvider_getCurStorage.invoke(te, ForgeDirection.UNKNOWN);
maxsto = (Integer) ThermalExpansionModule.IEnergyProvider_getMaxStorage.invoke(te, ForgeDirection.UNKNOWN);
} else if (ThermalExpansionModule.IEnergyReceiver.isInstance(te)){
energy = (Integer) ThermalExpansionModule.IEnergyReceiver_getCurStorage.invoke(te, ForgeDirection.UNKNOWN);
maxsto = (Integer) ThermalExpansionModule.IEnergyReceiver_getMaxStorage.invoke(te, ForgeDirection.UNKNOWN);
}
tag.setInteger("Energy", energy);
tag.setInteger("MaxStorage", maxsto);
} catch (Exception e){
e.printStackTrace();
throw new RuntimeException(e);
}
@@ -11,9 +11,17 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ThermalExpansionModule {
public static Class IEnergyHandler = null;
public static Method IEnergyHandler_getMaxStorage = null;
public static Method IEnergyHandler_getCurStorage = null;
public static Class IEnergyProvider = null;
public static Method IEnergyProvider_getMaxStorage = null;
public static Method IEnergyProvider_getCurStorage = null;
public static Class IEnergyReceiver = null;
public static Method IEnergyReceiver_getMaxStorage = null;
public static Method IEnergyReceiver_getCurStorage = null;
public static Class IEnergyInfo = null;
public static Method IEnergyInfo_getMaxStorage = null;
public static Method IEnergyInfo_getCurStorage = null;
public static Class TileEnergyCell = null;
public static Field TileEnergyCell_Recv = null;
@@ -39,13 +47,26 @@ public class ThermalExpansionModule {
public static void register(){
// XXX : We register the Energy interface first
try{
IEnergyHandler = Class.forName("cofh.api.energy.IEnergyHandler");
IEnergyHandler_getMaxStorage = IEnergyHandler.getMethod("getMaxEnergyStored", ForgeDirection.class);
IEnergyHandler_getCurStorage = IEnergyHandler.getMethod("getEnergyStored", ForgeDirection.class);
IEnergyProvider = Class.forName("cofh.api.energy.IEnergyProvider");
IEnergyProvider_getMaxStorage = IEnergyProvider.getMethod("getMaxEnergyStored", ForgeDirection.class);
IEnergyProvider_getCurStorage = IEnergyProvider.getMethod("getEnergyStored", ForgeDirection.class);
IEnergyReceiver = Class.forName("cofh.api.energy.IEnergyReceiver");
IEnergyReceiver_getMaxStorage = IEnergyReceiver.getMethod("getMaxEnergyStored", ForgeDirection.class);
IEnergyReceiver_getCurStorage = IEnergyReceiver.getMethod("getEnergyStored", ForgeDirection.class);
IEnergyInfo = Class.forName("cofh.api.tileentity.IEnergyInfo");
IEnergyInfo_getMaxStorage = IEnergyInfo.getMethod("getInfoMaxEnergyStored");
IEnergyInfo_getCurStorage = IEnergyInfo.getMethod("getInfoEnergyStored");
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyHandler);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyHandler);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyProvider);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyReceiver);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyInfo);
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e);
@@ -1,6 +1,7 @@
package mcp.mobius.waila.api.impl;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -65,6 +66,48 @@ public class TipList<E> extends ArrayList<E> {
return ret;
}
public void clear(){
tags.clear();
super.clear();
}
public E set(int index, E element){
tags.remove(this.get(index));
return super.set(index, element);
}
public E remove(int index){
tags.remove(this.get(index));
return super.remove(index);
}
public boolean remove(Object o){
tags.remove(o);
return super.remove(o);
}
public boolean removeAll(Collection<?> c){
for (Object o : c)
tags.remove(o);
return super.removeAll(c);
}
protected void removeRange(int fromIndex, int toIndex){
for (int i = fromIndex; i < toIndex; i++)
tags.remove(this.get(i));
super.removeRange(fromIndex, toIndex);
}
public boolean retainAll(Collection<?> c){
for (E e : tags.keySet())
if (!c.contains(e))
tags.remove(e);
return super.retainAll(c);
}
/*
public boolean add(E e){
this.setInitialTag(e);
@@ -109,43 +152,7 @@ public class TipList<E> extends ArrayList<E> {
return super.clone();
}
public E remove(int index){
tags.remove(this.get(index));
return super.remove(index);
}
public boolean remove(Object o){
tags.remove(o);
return super.remove(o);
}
public boolean removeAll(Collection<?> c){
for (Object o : c)
tags.remove(o);
return super.removeAll(c);
}
protected void removeRange(int fromIndex, int toIndex){
for (int i = fromIndex; i < toIndex; i++)
tags.remove(this.get(i));
super.removeRange(fromIndex, toIndex);
}
public boolean retainAll(Collection<?> c){
for (E e : tags.keySet())
if (!c.contains(e))
tags.remove(e);
return super.retainAll(c);
}
public E set(int index, E element){
tags.remove(this.get(index));
this.setInitialTag(element);
return super.set(index, element);
}
private void setInitialTag(E key){
tags.put(key, new ArrayList());