From 27f5a01fd75c7019f220bdc44083766c27cf4180 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 22:00:02 +0200 Subject: shelved ItemServer for next release --- src/main/java/kekztech/KekzCore.java | 10 +++++----- src/main/java/kekztech/MultiItemHandler.java | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'src/main/java/kekztech') 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 debugPrint() { + if(items == null) { + return new ArrayList(); + } + final ArrayList 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]; -- cgit