diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-03 18:08:43 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-03 18:08:43 +1000 |
| commit | bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a (patch) | |
| tree | d345344fe061e07bca20357b18457c0b9fdf475b /src/Java/gtPlusPlus/core/tileentities | |
| parent | e56e3fa33d84ca19a3fb0c5e72a60212f30660a7 (diff) | |
| download | GT5-Unofficial-bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a.tar.gz GT5-Unofficial-bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a.tar.bz2 GT5-Unofficial-bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a.zip | |
% Gotta Re-merge these Changes with those made on my laptop.
Diffstat (limited to 'src/Java/gtPlusPlus/core/tileentities')
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java index df06f92811..49ade0a10a 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.tileentities.machines; import gtPlusPlus.core.inventories.InventoryWorkbenchChest; -import gtPlusPlus.core.inventories.InventoryWorkbenchCrafting; import gtPlusPlus.core.inventories.InventoryWorkbenchTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -10,11 +9,9 @@ public class TileEntityWorkbench extends TileEntity { public InventoryWorkbenchChest inventoryChest; public InventoryWorkbenchTools inventoryTool; - public InventoryWorkbenchCrafting inventoryCrafting; - - + //public InventoryWorkbenchCrafting inventoryCrafting; + public TileEntityWorkbench(){ - this.inventoryCrafting = new InventoryWorkbenchCrafting();//number of slots - without product slot this.inventoryTool = new InventoryWorkbenchTools();//number of slots - without product slot this.inventoryChest = new InventoryWorkbenchChest();//number of slots - without product slot this.canUpdate(); @@ -36,7 +33,7 @@ public class TileEntityWorkbench extends TileEntity { super.writeToNBT(nbt); inventoryChest.writeToNBT(getTag(nbt, "ContentsChest")); inventoryTool.writeToNBT(getTag(nbt, "ContentsTools")); - inventoryCrafting.writeToNBT(getTag(nbt, "ContentsCrafting")); + //inventoryCrafting.writeToNBT(getTag(nbt, "ContentsCrafting")); } @@ -46,7 +43,7 @@ public class TileEntityWorkbench extends TileEntity { super.readFromNBT(nbt); inventoryChest.readFromNBT(nbt.getCompoundTag("ContentsChest")); inventoryTool.readFromNBT(nbt.getCompoundTag("ContentsTools")); - inventoryCrafting.readFromNBT(nbt.getCompoundTag("ContentsCrafting")); + //inventoryCrafting.readFromNBT(nbt.getCompoundTag("ContentsCrafting")); } }
\ No newline at end of file |