+ More Trade Table work.

1 files changed, 1 insertions, 46 deletions

diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
index 911fb7b40e..c8998b5bab 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
@@ -3,43 +3,27 @@ package gtPlusPlus.core.tileentities.machines;
 import java.util.List;
 import java.util.Vector;
 
-import gtPlusPlus.core.container.Container_ProjectTable;
 import gtPlusPlus.core.container.Container_TradeTable;
-import gtPlusPlus.core.inventories.*;
-import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
-import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput;
 import gtPlusPlus.core.inventories.tradetable.InventoryTradeMain;
 import gtPlusPlus.core.inventories.tradetable.InventoryTradeOutput;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.nbt.NBTUtils;
 import ic2.api.network.INetworkDataProvider;
 import ic2.api.network.INetworkUpdateListener;
 import ic2.api.tile.IWrenchable;
 import ic2.core.IC2;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCraftResult;
-import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 
 public class TileEntityTradeTable extends TileEntity implements INetworkDataProvider, INetworkUpdateListener, IWrenchable{
 	
 	public InventoryTradeMain inventoryGrid;
 	public InventoryTradeOutput inventoryOutputs;
-	
-	/** The crafting matrix inventory (3x3). */
-    public InventoryCrafting craftMatrix;
-    public IInventory craftResult;
     private Container_TradeTable container;
 
 	public TileEntityTradeTable(){
 		this.inventoryGrid = new InventoryTradeMain();//number of slots - without product slot
 		this.inventoryOutputs = new InventoryTradeOutput();//number of slots - without product slot
-		this.canUpdate();
 	}
 	
 	public void setContainer(Container_TradeTable container_TradeTable){
@@ -74,7 +58,7 @@ public class TileEntityTradeTable extends TileEntity implements INetworkDataProv
 
 	@Override
 	public List<String> getNetworkedFields(){
-		final List<String> ret = new Vector(2);
+		final List<String> ret = new Vector<String>(2);
 		ret.add("facing");
 		return ret;
 	}
@@ -126,35 +110,6 @@ public class TileEntityTradeTable extends TileEntity implements INetworkDataProv
 
 	@Override
 	public void updateEntity() {
-		
-		//Data stick
-		ItemStack dataStick = this.inventoryOutputs.getStackInSlot(0);
-		if (dataStick != null && this.container != null){
-			Utils.LOG_WARNING("Found Data Stick and valid container.");
-			
-			
-			ItemStack outputComponent = container.getOutputContent();
-			ItemStack[] craftInputComponent = container.getInputComponents();
-			
-			
-			ItemStack newStick = NBTUtils.writeItemsToNBT(dataStick, new ItemStack[]{outputComponent}, "Output");
-			newStick = NBTUtils.writeItemsToNBT(newStick, craftInputComponent);
-			NBTUtils.setBookTitle(newStick, "Encrypted Project Data");
-			int slotm=0;
-			Utils.LOG_WARNING("Uploading to Data Stick.");
-			for (ItemStack is : NBTUtils.readItemsFromNBT(newStick)){
-				if (is != null){
-					Utils.LOG_WARNING("Uploaded "+is.getDisplayName()+" into memory slot "+slotm+".");
-				}
-				else {					
-					Utils.LOG_WARNING("Left memory slot "+slotm+" blank.");
-				}
-				slotm++;
-			}
-			Utils.LOG_WARNING("Encrypting Data Stick.");
-			this.inventoryOutputs.setInventorySlotContents(1, newStick);
-			this.inventoryOutputs.setInventorySlotContents(0, null);
-		}		
 		super.updateEntity();
 	}