Added default NBT values server side (position/type)

Ported all ThermalExpansion to the new system.
This commit is contained in:
Thomas Guimbretiere committed 2014-12-13 22:18:35 +01:00
1 parent 298eafc0c0
commit 87986a6cfb
7 files changed
+88 -16

No files matched your search

@@ -43,6 +43,14 @@ public class HUDHandlerEnergyCell implements IWailaDataProvider {
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
int recv = ThermalExpansionModule.TileEnergyCell_Recv.getInt(te);
int send = ThermalExpansionModule.TileEnergyCell_Send.getInt(te);
tag.setInteger("Recv", recv);
tag.setInteger("Send", send);
} catch (Exception e) {
e.printStackTrace();
}
return tag;
}
@@ -50,6 +50,13 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
@Override
public NBTTagCompound getNBTData(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);
} catch (Exception e){
throw new RuntimeException(e);
}
return tag;
}
@@ -62,6 +62,16 @@ public class HUDHandlerISecureTile implements IWailaDataProvider {
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te);
int access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal();
tag.setString("Owner", owner);
tag.setInteger("Access", access);
} catch (Exception e) {
e.printStackTrace();
}
return tag;
}
@@ -84,6 +84,12 @@ public class HUDHandlerTank implements IWailaDataProvider {
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te);
tag.setInteger("Amount", amount);
} catch (Exception e) {
e.printStackTrace();
}
return tag;
}
@@ -93,6 +93,16 @@ public class HUDHandlerTesseract implements IWailaDataProvider {
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
byte modeItem = ThermalExpansionModule.TileTesseract_Item.getByte(te);
byte modeFluid = ThermalExpansionModule.TileTesseract_Fluid.getByte(te);
byte modeEnergy = ThermalExpansionModule.TileTesseract_Energy.getByte(te);
tag.setByte("Item.Mode", modeItem);
tag.setByte("Fluid.Mode", modeFluid);
tag.setByte("Energy.Mode", modeEnergy);
} catch (Exception e) {
e.printStackTrace();
}
return tag;
}
@@ -13,16 +13,27 @@ public class ThermalExpansionModule {
public static Class IEnergyHandler = null;
public static Method IEnergyHandler_getMaxStorage = null;
public static Method IEnergyHandler_getCurStorage = null;
public static Class TileEnergyCell = null;
public static Field TileEnergyCell_Recv = null;
public static Field TileEnergyCell_Send = null;
public static Class TileTank = null;
public static Method TileTank_getTankFluid = null;
public static Method TileTank_getTankCapacity = null;
public static Method TileTank_getTankAmount = null;
public static Field TileTank_mode = null;
public static Class TileTesseract = null;
public static Class TileTesseract = null;
public static Field TileTesseract_Item = null;
public static Field TileTesseract_Fluid = null;
public static Field TileTesseract_Energy = null;
public static Class ISecureTile = null;
public static Method ISecureTile_getAccess = null;
public static Method ISecureTile_getOwnerName = null;
public static Class BlockMultipart = null;
public static void register(){
@@ -30,11 +41,11 @@ public class ThermalExpansionModule {
try{
IEnergyHandler = Class.forName("cofh.api.energy.IEnergyHandler");
IEnergyHandler_getMaxStorage = IEnergyHandler.getMethod("getMaxEnergyStored", ForgeDirection.class);
IEnergyHandler_getCurStorage = IEnergyHandler.getMethod("getEnergyStored", ForgeDirection.class);
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyHandler);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyHandler);
//ModuleRegistrar.instance().registerSyncedNBTKey("Energy", IEnergyHandler);
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e);
@@ -43,12 +54,12 @@ public class ThermalExpansionModule {
// XXX : We register the energy cell
try{
TileEnergyCell = Class.forName("thermalexpansion.block.cell.TileCell");
TileEnergyCell_Recv = TileEnergyCell.getDeclaredField("energyReceive");
TileEnergyCell_Send = TileEnergyCell.getDeclaredField("energySend");
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerEnergyCell(), TileEnergyCell);
//ModuleRegistrar.instance().registerSyncedNBTKey("Recv", TileEnergyCell);
//ModuleRegistrar.instance().registerSyncedNBTKey("Send", TileEnergyCell);
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e);
@@ -59,6 +70,7 @@ public class ThermalExpansionModule {
TileTank = Class.forName("thermalexpansion.block.tank.TileTank");
TileTank_getTankFluid = TileTank.getMethod("getTankFluid");
TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount");
TileTank_mode = TileTank.getField("mode");
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
@@ -67,7 +79,6 @@ public class ThermalExpansionModule {
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileTank);
//ModuleRegistrar.instance().registerSyncedNBTKey("Amount", TileTank);
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e);
@@ -76,12 +87,14 @@ public class ThermalExpansionModule {
// XXX : We register the Tesseract interface
try{
TileTesseract = Class.forName("thermalexpansion.block.ender.TileTesseract");
TileTesseract_Item = TileTesseract.getDeclaredField("modeItem");
TileTesseract_Fluid = TileTesseract.getDeclaredField("modeFluid");
TileTesseract_Energy = TileTesseract.getDeclaredField("modeEnergy");
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tesssendrecv");
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tessfreq");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTesseract(), TileTesseract);
//ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
@@ -90,6 +103,8 @@ public class ThermalExpansionModule {
// XXX : We register the ISecureTile interface
try{
ISecureTile = Class.forName("cofh.api.tileentity.ISecurable");
ISecureTile_getAccess = ISecureTile.getDeclaredMethod("getAccess");
ISecureTile_getOwnerName = ISecureTile.getDeclaredMethod("getOwnerName");
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile);
@@ -1,5 +1,8 @@
package mcp.mobius.waila.network;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -20,6 +23,17 @@ import io.netty.channel.SimpleChannelInboundHandler;
public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x01TERequest> implements IWailaMessage {
private static Field classToNameMap = null;
static{
try{
classToNameMap = TileEntity.class.getDeclaredField("classToNameMap");
classToNameMap.setAccessible(true);
} catch (Exception e){
throw new RuntimeException(e);
}
}
public int dim;
public int posX;
public int posY;
@@ -79,22 +93,24 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x0
NBTTagCompound tag = new NBTTagCompound();
boolean hasNBTBlock = ModuleRegistrar.instance().hasNBTProviders(block);
boolean hasNBTEnt = ModuleRegistrar.instance().hasNBTProviders(entity);
if (hasNBTBlock){
if (hasNBTBlock || hasNBTEnt){
tag.setInteger("x", msg.posX);
tag.setInteger("y", msg.posY);
tag.setInteger("z", msg.posZ);
tag.setString ("id", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(block))
tag = provider.getNBTData(entity, tag, world, msg.posX, msg.posY, msg.posZ);
}
if (hasNBTEnt){
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(entity))
tag = provider.getNBTData(entity, tag, world, msg.posX, msg.posY, msg.posZ);
}
if (!hasNBTBlock && !hasNBTEnt) {
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(entity))
tag = provider.getNBTData(entity, tag, world, msg.posX, msg.posY, msg.posZ);
} else {
entity.writeToNBT(tag);
tag = NBTUtil.createTag(tag, msg.keys);
}
ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);