Remove ClassMap and EntityNetData

This commit is contained in:
mezz committed 2014-12-14 18:28:38 -08:00
1 parent 344e842764
commit 84da3cc939
14 files changed
+118 -436

No files matched your search

+19 -4
View File
@@ -10,15 +10,12 @@
******************************************************************************/
package forestry.core.gadgets;
import forestry.core.network.EntityNetData;
import forestry.core.network.PacketPayload;
public abstract class Mill extends TileBase {
@EntityNetData
public int charge = 0;
@EntityNetData
public float speed;
@EntityNetData
public int stage = 0;
public float progress;
@@ -36,6 +33,24 @@ public abstract class Mill extends TileBase {
update(true);
}
@Override
public PacketPayload getPacketPayload() {
PacketPayload payload = new PacketPayload(2, 1, 0);
payload.intPayload[0] = charge;
payload.intPayload[1] = stage;
payload.floatPayload[0] = speed;
return payload;
}
@Override
public void fromPacketPayload(PacketPayload payload) {
charge = payload.intPayload[0];
stage = payload.intPayload[1];
speed = payload.floatPayload[0];
}
private void update(boolean isSimulating) {
// Stop gracefully if discharged.
@@ -15,6 +15,7 @@ import java.util.Stack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -25,25 +26,23 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.ForestryAPI;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IIndividual;
import forestry.api.core.EnumErrorCode;
import forestry.core.fluids.TankManager;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryItem;
import forestry.core.fluids.FluidHelper;
import forestry.core.fluids.Fluids;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.fluids.TankManager;
import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.inventory.InvTools;
import forestry.core.inventory.wrappers.IInvSlot;
import forestry.core.inventory.wrappers.InventoryIterator;
import forestry.core.inventory.wrappers.InventoryMapper;
import forestry.core.network.GuiId;
import forestry.core.utils.InventoryAdapter;
import net.minecraft.inventory.IInventory;
public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankContainer {
@@ -61,7 +60,6 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
private int analyzeTime;
@EntityNetData
public final FilteredTank resourceTank;
private final TankManager tankManager;
@@ -10,15 +10,14 @@
******************************************************************************/
package forestry.core.gadgets;
import net.minecraft.entity.player.EntityPlayer;
import forestry.core.interfaces.IHintSource;
import forestry.core.network.ClassMap;
import forestry.core.network.IndexInPayload;
import forestry.core.network.PacketPayload;
import forestry.core.proxy.Proxies;
import forestry.core.utils.EnumAccess;
import forestry.core.utils.PlayerUtil;
import forestry.core.utils.Utils;
import net.minecraft.entity.player.EntityPlayer;
public abstract class TileBase extends TileForestry implements IHintSource {
@@ -52,37 +51,11 @@ public abstract class TileBase extends TileForestry implements IHintSource {
/* NETWORK */
@Override
public PacketPayload getPacketPayload() {
if (!ClassMap.classMappers.containsKey(this.getClass()))
ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass()));
ClassMap classmap = ClassMap.classMappers.get(this.getClass());
PacketPayload payload = new PacketPayload(classmap.intSize, classmap.floatSize, classmap.stringSize);
try {
classmap.setData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0));
} catch (IllegalAccessException e) {
e.printStackTrace();
}
return payload;
return null;
}
@Override
public void fromPacketPayload(PacketPayload payload) {
if (payload.isEmpty())
return;
if (!ClassMap.classMappers.containsKey(this.getClass()))
ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass()));
ClassMap classmap = ClassMap.classMappers.get(this.getClass());
try {
classmap.fromData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0));
} catch (Exception ex) {
ex.printStackTrace();
}
}
/* INTERACTION */
@@ -10,62 +10,25 @@
******************************************************************************/
package forestry.core.gadgets;
import buildcraft.api.tiles.IHasWork;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.Optional;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.interfaces.IPowerHandler;
import forestry.core.interfaces.IRenderableMachine;
import forestry.core.network.ClassMap;
import forestry.core.network.IndexInPayload;
import forestry.core.network.PacketPayload;
import forestry.core.proxy.Proxies;
import forestry.core.utils.EnumTankLevel;
import forestry.energy.EnergyManager;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import buildcraft.api.tiles.IHasWork;
@Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles")
public abstract class TilePowered extends TileBase implements IRenderableMachine, IPowerHandler, IHasWork {
public static final int WORK_CYCLES = 4;
@Override
public PacketPayload getPacketPayload() {
if (!ClassMap.classMappers.containsKey(this.getClass()))
ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass()));
ClassMap classmap = ClassMap.classMappers.get(this.getClass());
PacketPayload payload = new PacketPayload(classmap.intSize, classmap.floatSize, classmap.stringSize);
try {
classmap.setData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0));
} catch (Exception ex) {
ex.printStackTrace();
}
return payload;
}
@Override
public void fromPacketPayload(PacketPayload payload) {
if (payload.isEmpty())
return;
if (!ClassMap.classMappers.containsKey(this.getClass()))
ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass()));
ClassMap classmap = ClassMap.classMappers.get(this.getClass());
try {
classmap.fromData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0));
} catch (Exception ex) {
ex.printStackTrace();
}
}
protected final EnergyManager energyManager;
public TilePowered(int maxTransfer, int energyPerWork, int capacity) {
@@ -1,232 +0,0 @@
/*******************************************************************************
* Copyright (c) 2011-2014 SirSengir.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser Public License v3
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/lgpl-3.0.txt
*
* Various Contributors including, but not limited to:
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
******************************************************************************/
package forestry.core.network;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.UUID;
import com.mojang.authlib.GameProfile;
import forestry.core.gadgets.TileForestry;
public class ClassMap {
@SuppressWarnings("rawtypes")
public static final HashMap<Class, ClassMap> classMappers = new HashMap<Class, ClassMap>();
private final LinkedList<Field> intMember = new LinkedList<Field>();
private final LinkedList<Field> floatMember = new LinkedList<Field>();
private final LinkedList<Field> booleanMember = new LinkedList<Field>();
private final LinkedList<Field> stringMember = new LinkedList<Field>();
private final LinkedList<Field> enumMember = new LinkedList<Field>();
private final LinkedList<Field> gameProfileMember = new LinkedList<Field>();
private final LinkedList<ClassMap> objectMember = new LinkedList<ClassMap>();
public int intSize;
public int floatSize;
public int stringSize;
private Field field;
/**
* Writes the actual data to the packet payload
*
* @param obj
* {@link TileForestry} to write to packet
* @param intPayload
* @param floatPayload
* @param stringPayload
* @param index
*/
@SuppressWarnings("rawtypes")
public void setData(Object obj, int[] intPayload, float[] floatPayload, String[] stringPayload, IndexInPayload index) throws IllegalAccessException {
for (Field member : intMember) {
intPayload[index.intIndex] = member.getInt(obj);
index.intIndex++;
}
for (Field member : floatMember) {
floatPayload[index.floatIndex] = member.getFloat(obj);
index.floatIndex++;
}
for (Field member : booleanMember) {
if (member.getBoolean(obj))
floatPayload[index.intIndex] = 1;
else
floatPayload[index.intIndex] = 0;
index.intIndex++;
}
for (Field member : stringMember) {
stringPayload[index.stringIndex] = (String) member.get(obj);
index.stringIndex++;
}
for (Field member : enumMember) {
intPayload[index.intIndex] = ((Enum) member.get(obj)).ordinal();
index.intIndex++;
}
for (Field member : gameProfileMember) {
GameProfile profile = (GameProfile) member.get(obj);
UUID profileID = profile.getId();
if (profileID == null)
profileID = new UUID(0,0);
intPayload[index.intIndex] = (int) (profileID.getMostSignificantBits() >>> 32);
intPayload[index.intIndex + 1] = (int) profileID.getMostSignificantBits();
intPayload[index.intIndex + 2] = (int) (profileID.getLeastSignificantBits() >>> 32);
intPayload[index.intIndex + 3] = (int) profileID.getLeastSignificantBits();
index.intIndex += 4;
stringPayload[index.stringIndex] = profile.getName();
index.stringIndex++;
}
// Handle subobjects
for (ClassMap submap : objectMember) {
Object source = submap.field.get(obj);
if (source == null) {
intPayload[index.intIndex] = 0;
index.intIndex++;
index.intIndex += submap.intSize;
index.floatIndex += submap.floatSize;
index.stringIndex += submap.stringSize;
} else {
intPayload[index.intIndex] = 1;
index.intIndex++;
submap.setData(source, intPayload, floatPayload, stringPayload, index);
}
}
}
/**
* Updates the given object with the data from the passed payload arrays
*
* @param obj
* @param intPayload
* @param floatPayload
* @param stringPayload
* @param index
* @throws IllegalAccessException
*/
@SuppressWarnings("rawtypes")
public void fromData(Object obj, int[] intPayload, float[] floatPayload, String[] stringPayload, IndexInPayload index) throws IllegalAccessException {
for (Field member : intMember) {
member.setInt(obj, intPayload[index.intIndex]);
index.intIndex++;
}
for (Field member : booleanMember) {
member.setBoolean(obj, intPayload[index.intIndex] == 1);
index.intIndex++;
}
for (Field member : enumMember) {
member.set(obj, ((Class) member.getGenericType()).getEnumConstants()[intPayload[index.intIndex]]);
index.intIndex++;
}
for (Field member : floatMember) {
member.setFloat(obj, floatPayload[index.floatIndex]);
index.floatIndex++;
}
for (Field member : stringMember) {
member.set(obj, stringPayload[index.stringIndex]);
index.stringIndex++;
}
for (Field member : gameProfileMember) {
GameProfile profile = new GameProfile(new UUID((long) intPayload[index.intIndex] << 32 | intPayload[index.intIndex + 1],
(long) intPayload[index.intIndex + 2] << 32 | intPayload[index.intIndex + 3]),
stringPayload[index.stringIndex]);
index.intIndex += 4;
index.stringIndex++;
member.set(obj, profile);
}
for (ClassMap map : objectMember) {
boolean isNull = intPayload[index.intIndex] == 0;
index.intIndex++;
if (isNull) {
index.intIndex += map.intSize;
index.floatIndex += map.floatSize;
index.stringIndex += map.stringSize;
} else {
map.field.get(obj);
map.fromData(map.field.get(obj), intPayload, floatPayload, stringPayload, index);
}
}
}
@SuppressWarnings("rawtypes")
public ClassMap(final Class targetClass) {
Field[] fields = targetClass.getDeclaredFields();
try {
for (Field field : fields) {
// We only handle fields marked with EntityNetData
if (!isNetworkedMember(field))
continue;
field.setAccessible(true);
Type type = field.getGenericType();
if (type instanceof Class && !((Class) type).isArray()) {
Class memberClass = (Class) type;
if (memberClass.equals(int.class)) {
intSize++;
intMember.add(field);
} else if (memberClass.equals(float.class)) {
floatSize++;
floatMember.add(field);
} else if (memberClass.equals(boolean.class)) {
intSize++;
booleanMember.add(field);
} else if (memberClass.equals(String.class)) {
stringSize++;
stringMember.add(field);
} else if (Enum.class.isAssignableFrom(memberClass)) {
intSize++;
enumMember.add(field);
} else if (GameProfile.class.isAssignableFrom(memberClass)) {
intSize += 4;
stringSize++;
gameProfileMember.add(field);
} else {
// If we are none of the above we assume to be another
// mapable object
// Might not be true and fail!
ClassMap mapper = new ClassMap(memberClass);
mapper.field = field;
objectMember.add(mapper);
intSize++;
intSize += mapper.intSize;
floatSize += mapper.floatSize;
stringSize += mapper.stringSize;
}
} else if (type instanceof Class && ((Class) type).isArray())
// We don't handle arrays currently. Throw exception
throw new RuntimeException("Tried to map class " + targetClass.toString() + " but it requested mapping of an array. Not handled!");
}
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
}
private boolean isNetworkedMember(Field member) {
return member.getAnnotation(EntityNetData.class) != null;
}
}
@@ -1,23 +0,0 @@
/*******************************************************************************
* Copyright (c) 2011-2014 SirSengir.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser Public License v3
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/lgpl-3.0.txt
*
* Various Contributors including, but not limited to:
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
******************************************************************************/
package forestry.core.network;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* Simple annotation to mark a field for synchronization in SMP.
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface EntityNetData {
// Needs to be set for arrays
int staticSize() default -1;
}
@@ -19,29 +19,28 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import ic2.api.energy.prefab.BasicSource;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.ForestryAPI;
import forestry.api.core.ISpecialInventory;
import forestry.api.fuels.FuelManager;
import forestry.api.fuels.GeneratorFuel;
import forestry.api.core.EnumErrorCode;
import forestry.core.config.Config;
import forestry.core.config.Defaults;
import forestry.core.fluids.FluidHelper;
import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.fluids.TankManager;
import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.gadgets.TileBase;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.interfaces.IRenderableMachine;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.InventoryAdapter;
import forestry.core.utils.Utils;
import forestry.plugins.PluginIC2;
import net.minecraftforge.fluids.FluidTankInfo;
import ic2.api.energy.prefab.BasicSource;
public class MachineGenerator extends TileBase implements ISpecialInventory, ILiquidTankContainer, IRenderableMachine {
@@ -49,7 +48,6 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi
public static final short SLOT_CAN = 0;
public static final int maxEnergy = 30000;
@EntityNetData
public final FilteredTank resourceTank;
private final TankManager tankManager;
private int tickCount = 0;
@@ -10,8 +10,31 @@
******************************************************************************/
package forestry.factory.gadgets;
import buildcraft.api.statements.ITriggerExternal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Stack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import cpw.mods.fml.common.Optional;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.ForestryAPI;
import forestry.api.recipes.ICraftingProvider;
@@ -23,36 +46,13 @@ import forestry.core.fluids.tanks.StandardTank;
import forestry.core.gadgets.TileBase;
import forestry.core.gadgets.TilePowered;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.InventoryAdapter;
import forestry.core.utils.LiquidHelper;
import forestry.core.utils.StackUtils;
import forestry.core.utils.Utils;
import forestry.factory.triggers.FactoryTriggers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Stack;
import buildcraft.api.statements.ITriggerExternal;
public class MachineBottler extends TilePowered implements ISidedInventory, ILiquidTankContainer {
@@ -140,7 +140,6 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq
}
}
@EntityNetData
public final StandardTank resourceTank;
private final TankManager tankManager;
@@ -29,7 +29,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
@@ -46,7 +45,6 @@ import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.gadgets.TileBase;
import forestry.core.gadgets.TilePowered;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.utils.EnumTankLevel;
@@ -211,7 +209,6 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL
}
/* MEMBER */
@EntityNetData
public final FilteredTank resourceTank;
private final TankManager tankManager;
private final TileInventoryAdapter craftingInventory;
@@ -27,7 +27,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
@@ -48,7 +47,6 @@ import forestry.core.fluids.tanks.StandardTank;
import forestry.core.gadgets.TileBase;
import forestry.core.gadgets.TilePowered;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.InventoryAdapter;
@@ -185,9 +183,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL
return recipeList;
}
}
@EntityNetData
public final FilteredTank resourceTank;
@EntityNetData
public final FilteredTank productTank;
private final TankManager tankManager;
@@ -10,6 +10,23 @@
******************************************************************************/
package forestry.factory.gadgets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.ForestryAPI;
import forestry.api.core.ISpecialInventory;
@@ -24,27 +41,11 @@ import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.gadgets.TileBase;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.interfaces.IRenderableMachine;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.InventoryAdapter;
import forestry.core.utils.StackUtils;
import forestry.core.utils.Utils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public class MachineMoistener extends TileBase implements ISpecialInventory, ISidedInventory, ILiquidTankContainer, IRenderableMachine {
@@ -119,7 +120,6 @@ public class MachineMoistener extends TileBase implements ISpecialInventory, ISi
}
}
@EntityNetData
public final FilteredTank resourceTank;
private final TankManager tankManager;
private final InventoryAdapter inventory = new InventoryAdapter(12, "Items");
@@ -10,10 +10,30 @@
******************************************************************************/
package forestry.factory.gadgets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Stack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.ForestryAPI;
import forestry.api.core.ISpecialInventory;
import forestry.api.recipes.ISqueezerManager;
import forestry.api.core.EnumErrorCode;
import forestry.core.config.Config;
import forestry.core.config.Defaults;
import forestry.core.fluids.FluidHelper;
@@ -23,33 +43,12 @@ import forestry.core.fluids.tanks.StandardTank;
import forestry.core.gadgets.TileBase;
import forestry.core.gadgets.TilePowered;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.InventoryAdapter;
import forestry.core.utils.LiquidHelper;
import forestry.core.utils.StackUtils;
import forestry.core.utils.Utils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Stack;
public class MachineSqueezer extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer {
@@ -131,7 +130,6 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I
/* MEMBER */
private final TankManager tankManager;
@EntityNetData
public final FilteredTank productTank;
private final InventoryAdapter inventory = new InventoryAdapter(12, "Items");
@@ -40,7 +40,6 @@ import forestry.core.fluids.tanks.StandardTank;
import forestry.core.gadgets.TileBase;
import forestry.core.gadgets.TilePowered;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.InventoryAdapter;
@@ -118,9 +117,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid
}
/* MEMBER */
@EntityNetData
public final FilteredTank resourceTank;
@EntityNetData
public final FilteredTank productTank;
private final TankManager tankManager;
@@ -10,15 +10,27 @@
******************************************************************************/
package forestry.mail.gadgets;
import buildcraft.api.statements.ITriggerExternal;
import java.util.Collection;
import java.util.LinkedList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.Optional;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.ForestryAPI;
import forestry.api.mail.IMailAddress;
import forestry.api.mail.IStamps;
import forestry.api.mail.PostManager;
import forestry.api.core.EnumErrorCode;
import forestry.core.gadgets.TileBase;
import forestry.core.network.EntityNetData;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.utils.EnumAccess;
@@ -27,17 +39,8 @@ import forestry.core.utils.StackUtils;
import forestry.mail.MailAddress;
import forestry.mail.TradeStation;
import forestry.plugins.PluginMail;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.Collection;
import java.util.LinkedList;
import buildcraft.api.statements.ITriggerExternal;
public class MachineTrader extends TileBase implements ISidedInventory {