shelved ItemServer for next release

5 files changed, 43 insertions, 22 deletions

diff --git a/src/main/java/common/tileentities/GTMTE_ItemServer.java b/src/main/java/common/tileentities/GTMTE_ItemServer.java
index ca1225c51b..2dabe19d3d 100644
--- a/src/main/java/common/tileentities/GTMTE_ItemServer.java
+++ b/src/main/java/common/tileentities/GTMTE_ItemServer.java
@@ -27,15 +27,15 @@ import util.Vector3ic;
 
 public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 	
-	private static final int BASE_SLICE_ENERGY_COST = 1;
+	private static final int BASE_SEGMENT_ENERGY_COST = 1;
 	private static final int BASE_PER_ITEM_CAPACITY = 1024;
-	private static final int BASE_ITEM_TYPES_PER_SLICE = 128;
+	private static final int BASE_ITEM_TYPES_PER_SEGMENT = 4;
 	
 	private final Block_ItemServerDrive DRIVE = Block_ItemServerDrive.getInstance();
 	private final Block_ItemServerRackCasing CASING = Block_ItemServerRackCasing.getInstance();
 	private final Block_ItemServerIOPort IO_PORT = Block_ItemServerIOPort.getInstance();
 	private final String ALU_FRAME_BOX_NAME = "gt.blockmachines";
-	private final int ALU_FRAME_BOX_META = 6;//4115;
+	private final int ALU_FRAME_BOX_META = 6;
 	private final int CASING_TEXTURE_ID = 176;
 	
 	private MultiItemHandler mih;
@@ -61,7 +61,7 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 		b.addInfo("[W.I.P - Probably doesn't work]")
 				.addInfo("High-Tech item storage!")
 				.addInfo("Variable length: Slices 2-4 can be repeated as long as the total length does not exceed 16 blocks.")
-				.addInfo("Each slice offers storage for 128 item types")
+				.addInfo("Each segment offers storage for 128 item types")
 				.addInfo("Storage capacity per item depends on the controller configuration.")
 				.addInfo("Insert an Integrated Circuit into the controller with your desired configuration.")
 				.addInfo("The base configuration (0) is 1024 items per type. For each higher level, the capacity quadruples.")
@@ -112,7 +112,7 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 				
 		this.mEfficiency = 10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000;
 		this.mEfficiencyIncrease = 10000;
-		this.mEUt = (int) -(BASE_SLICE_ENERGY_COST * sliceCount * Math.pow(2, config));
+		this.mEUt = (int) -(BASE_SEGMENT_ENERGY_COST * sliceCount * Math.pow(2, config));
 		super.mMaxProgresstime = 20;
 		
 		mih.setPerTypeCapacity((int) (BASE_PER_ITEM_CAPACITY * Math.pow(4, config)));
@@ -200,10 +200,6 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 			}
 		}
 		
-		if(formationChecklist) {
-			System.out.println("Item Server front slice approved");
-		}
-		
 		// Check slices
 		int segmentsFound = 0;
 		int zOffset = -1; // -1 is the first slice after the front one. It goes in negative direction.
@@ -240,7 +236,7 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 			
 			if(mih == null) {
 				mih = new MultiItemHandler();
-				mih.setItemTypeCapacity(segmentsFound * BASE_ITEM_TYPES_PER_SLICE);
+				mih.setItemTypeCapacity(segmentsFound * BASE_ITEM_TYPES_PER_SEGMENT);
 			}
 			System.out.println("Configuring " + ioPorts.size() + " ports");
 			for(TE_ItemServerIOPort port : ioPorts) {
@@ -290,10 +286,6 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 						else if(Y <= 3 && X == 0) {
 							if(!(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(ALU_FRAME_BOX_NAME))
 									|| !(thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == ALU_FRAME_BOX_META)) {
-								System.out.println("Rejected Frame box: " 
-										+ thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
-										+ ":"
-										+ thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()));
 								formationChecklist = false;
 							}
 						}
@@ -346,7 +338,7 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 		
 		ll.add(EnumChatFormatting.YELLOW + "Operational Data:" + EnumChatFormatting.RESET);
 		ll.add("Per-Item Capacity: " + mih.getPerTypeCapacity());
-		ll.add("Item-Type Capacity: " + BASE_ITEM_TYPES_PER_SLICE * sliceCount);
+		ll.add("Item-Type Capacity: " + BASE_ITEM_TYPES_PER_SEGMENT * sliceCount);
 		ll.add("Running Cost: "
 				// mEUt does not naturally reflect efficiency status. Do that here.
 				+ ((-super.mEUt) * 10000 / Math.max(1000, super.mEfficiency)) + "EU/t");
diff --git a/src/main/java/common/tileentities/TE_ItemServerIOPort.java b/src/main/java/common/tileentities/TE_ItemServerIOPort.java
index f1a1e62ad6..0e96ff75b9 100644
--- a/src/main/java/common/tileentities/TE_ItemServerIOPort.java
+++ b/src/main/java/common/tileentities/TE_ItemServerIOPort.java
@@ -10,9 +10,22 @@ public class TE_ItemServerIOPort extends TileEntity implements ISidedInventory {
 	
 	private MultiItemHandler mih;
 	
+	private int tickCounter = 0;
+	
 	public void setMultiItemHandler(MultiItemHandler mih) {
 		this.mih = mih;
-		System.out.println("MIH set");
+	}
+	
+	@Override
+	public void updateEntity() {
+		if(mih != null) {
+			
+			tickCounter++;
+			if(tickCounter >= 40) {
+				mih.debugPrint();
+				tickCounter = 0;
+			}
+		}
 	}
 	
 	@Override
diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
index 837898ab61..217ff2ad8f 100644
--- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
@@ -27,7 +27,6 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler {
 	private boolean autoOutput = false;
 	
 	public void setMultiFluidHandler(MultiFluidHandler mfh) {
-		System.out.println("Set MFH");
 		this.mfh = mfh;
 	}
 	
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 55291eeadc..ad5ab24242 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -108,9 +108,9 @@ public class KekzCore {
 		Block_ReactorChamber_OFF.getInstance().registerBlock();

 		Block_ReactorChamber_ON.getInstance().registerBlock();

 		Block_ControlRod.getInstance().registerBlock();

-		Block_ItemServerDrive.getInstance().registerBlock();

-		Block_ItemServerRackCasing.getInstance().registerBlock();

-		Block_ItemServerIOPort.getInstance().registerBlock();

+		//Block_ItemServerDrive.getInstance().registerBlock();

+		//Block_ItemServerRackCasing.getInstance().registerBlock();

+		//Block_ItemServerIOPort.getInstance().registerBlock();

 		Block_ItemProxyCable.getInstance().registerBlock();

 		Block_ItemProxySource.getInstance().registerBlock();

 		Block_ItemProxyEndpoint.getInstance().registerBlock();

@@ -120,7 +120,7 @@ public class KekzCore {
 		

 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

-		GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

+		//GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

 		GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");

 		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

 		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

@@ -139,7 +139,7 @@ public class KekzCore {
 		sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");

 		mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");

 		fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T");

-		is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");	

+		//is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");	

 		// Register renderer

 		ConduitRenderer.getInstance().registerRenderer();

 	}

diff --git a/src/main/java/kekztech/MultiItemHandler.java b/src/main/java/kekztech/MultiItemHandler.java
index 58dd0660e9..27d936efec 100644
--- a/src/main/java/kekztech/MultiItemHandler.java
+++ b/src/main/java/kekztech/MultiItemHandler.java
@@ -1,5 +1,8 @@
 package kekztech;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.minecraft.item.ItemStack;
 
 public class MultiItemHandler {
@@ -14,6 +17,19 @@ public class MultiItemHandler {
 		
 	}
 	
+	public List<String> debugPrint() {
+		if(items == null) {
+			return new ArrayList<String>();
+		}
+		final ArrayList<String> slots = new ArrayList<>();
+		
+		for(int i = 0; i < items.length; i++) {
+			slots.add("Slot " + i + " contains " + items[i].stackSize + " " + items[i].getDisplayName());
+		}
+		
+		return slots;
+	}
+	
 	/** 
 	 * Adapts the internal storage to structure changes.
 	 * In the event of structure down-sizing, all excess items
@@ -22,6 +38,7 @@ public class MultiItemHandler {
 	 * @param itemTypeCapacity
 	 */
 	public void setItemTypeCapacity(int itemTypeCapacity) {
+		System.out.println("Configuring type capacity");
 		if(items.length > itemTypeCapacity) {
 			// Generate new smaller backing array
 			final ItemStack[] newItems = new ItemStack[itemTypeCapacity];