From 9d2e6ed16f5439ff99a616ada4943a2995183038 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 31 Jan 2016 15:16:41 +0100 Subject: [PATCH] move tile settings to other package, remove unneeded IInventory impls --- .../container/ContainerConstructor.java | 2 +- .../container/ContainerDetector.java | 2 +- .../container/ContainerExporter.java | 2 +- .../container/ContainerImporter.java | 2 +- .../gui/sidebutton/SideButtonCompare.java | 2 +- .../gui/sidebutton/SideButtonMode.java | 2 +- .../sidebutton/SideButtonRedstoneMode.java | 2 +- .../network/MessageCompareUpdate.java | 2 +- .../network/MessageModeToggle.java | 2 +- .../network/MessageRedstoneModeUpdate.java | 2 +- .../storagecraft/storage/IStorageGui.java | 6 +- .../storagecraft/tile/TileConstructor.java | 132 +----------------- .../storagecraft/tile/TileController.java | 2 + .../java/storagecraft/tile/TileDetector.java | 132 +----------------- .../java/storagecraft/tile/TileExporter.java | 131 +---------------- .../tile/TileExternalStorage.java | 3 + .../java/storagecraft/tile/TileImporter.java | 132 +----------------- .../java/storagecraft/tile/TileMachine.java | 2 + .../java/storagecraft/tile/TileSolderer.java | 14 +- .../java/storagecraft/tile/TileStorage.java | 3 + .../tile/{ => settings}/ICompareSetting.java | 2 +- .../tile/{ => settings}/IModeSetting.java | 2 +- .../{ => settings}/IRedstoneModeSetting.java | 2 +- .../tile/{ => settings}/RedstoneMode.java | 2 +- 24 files changed, 58 insertions(+), 527 deletions(-) rename src/main/java/storagecraft/tile/{ => settings}/ICompareSetting.java (82%) rename src/main/java/storagecraft/tile/{ => settings}/IModeSetting.java (81%) rename src/main/java/storagecraft/tile/{ => settings}/IRedstoneModeSetting.java (85%) rename src/main/java/storagecraft/tile/{ => settings}/RedstoneMode.java (95%) diff --git a/src/main/java/storagecraft/container/ContainerConstructor.java b/src/main/java/storagecraft/container/ContainerConstructor.java index 2a4c51ca8..d5463d695 100644 --- a/src/main/java/storagecraft/container/ContainerConstructor.java +++ b/src/main/java/storagecraft/container/ContainerConstructor.java @@ -27,7 +27,7 @@ public class ContainerConstructor extends ContainerBase { super(player); - addSlotToContainer(new SlotConstructor(constructor, 0, 80, 20)); + addSlotToContainer(new SlotConstructor(constructor.getInventory(), 0, 80, 20)); addPlayerInventory(8, 55); } diff --git a/src/main/java/storagecraft/container/ContainerDetector.java b/src/main/java/storagecraft/container/ContainerDetector.java index b1c32e86b..b48eb528e 100644 --- a/src/main/java/storagecraft/container/ContainerDetector.java +++ b/src/main/java/storagecraft/container/ContainerDetector.java @@ -10,7 +10,7 @@ public class ContainerDetector extends ContainerBase { super(player); - addSlotToContainer(new SlotSpecimen(detector, 0, 107, 20)); + addSlotToContainer(new SlotSpecimen(detector.getInventory(), 0, 107, 20)); addPlayerInventory(8, 55); } diff --git a/src/main/java/storagecraft/container/ContainerExporter.java b/src/main/java/storagecraft/container/ContainerExporter.java index 0ce2707aa..94e86ca8d 100644 --- a/src/main/java/storagecraft/container/ContainerExporter.java +++ b/src/main/java/storagecraft/container/ContainerExporter.java @@ -12,7 +12,7 @@ public class ContainerExporter extends ContainerBase for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimen(exporter, i, 8 + (18 * i), 20)); + addSlotToContainer(new SlotSpecimen(exporter.getInventory(), i, 8 + (18 * i), 20)); } addPlayerInventory(8, 55); diff --git a/src/main/java/storagecraft/container/ContainerImporter.java b/src/main/java/storagecraft/container/ContainerImporter.java index af3df0ebe..f6eab1b6d 100644 --- a/src/main/java/storagecraft/container/ContainerImporter.java +++ b/src/main/java/storagecraft/container/ContainerImporter.java @@ -12,7 +12,7 @@ public class ContainerImporter extends ContainerBase for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimen(importer, i, 8 + (18 * i), 20)); + addSlotToContainer(new SlotSpecimen(importer.getInventory(), i, 8 + (18 * i), 20)); } addPlayerInventory(8, 55); diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java index d4012b748..7cd2e0bf3 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java @@ -4,7 +4,7 @@ import net.minecraft.util.EnumChatFormatting; import storagecraft.StorageCraft; import storagecraft.gui.GuiBase; import storagecraft.network.MessageCompareUpdate; -import storagecraft.tile.ICompareSetting; +import storagecraft.tile.settings.ICompareSetting; import storagecraft.util.InventoryUtils; public class SideButtonCompare extends SideButton diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java index be1f01e12..fc6991241 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java @@ -4,7 +4,7 @@ import net.minecraft.util.EnumChatFormatting; import storagecraft.StorageCraft; import storagecraft.gui.GuiBase; import storagecraft.network.MessageModeToggle; -import storagecraft.tile.IModeSetting; +import storagecraft.tile.settings.IModeSetting; public class SideButtonMode extends SideButton { diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java index 74adb6f6c..5c549d671 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java @@ -4,7 +4,7 @@ import net.minecraft.util.EnumChatFormatting; import storagecraft.StorageCraft; import storagecraft.gui.GuiBase; import storagecraft.network.MessageRedstoneModeUpdate; -import storagecraft.tile.IRedstoneModeSetting; +import storagecraft.tile.settings.IRedstoneModeSetting; public class SideButtonRedstoneMode extends SideButton { diff --git a/src/main/java/storagecraft/network/MessageCompareUpdate.java b/src/main/java/storagecraft/network/MessageCompareUpdate.java index 28d871a0d..27f671065 100644 --- a/src/main/java/storagecraft/network/MessageCompareUpdate.java +++ b/src/main/java/storagecraft/network/MessageCompareUpdate.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.ICompareSetting; +import storagecraft.tile.settings.ICompareSetting; public class MessageCompareUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageModeToggle.java b/src/main/java/storagecraft/network/MessageModeToggle.java index 1004a2edb..1fe44c1e8 100644 --- a/src/main/java/storagecraft/network/MessageModeToggle.java +++ b/src/main/java/storagecraft/network/MessageModeToggle.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.IModeSetting; +import storagecraft.tile.settings.IModeSetting; public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java b/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java index 64518391b..0a1cc8894 100644 --- a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java +++ b/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.IRedstoneModeSetting; +import storagecraft.tile.settings.IRedstoneModeSetting; public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/storage/IStorageGui.java b/src/main/java/storagecraft/storage/IStorageGui.java index 2e1b3e038..beb11cdba 100644 --- a/src/main/java/storagecraft/storage/IStorageGui.java +++ b/src/main/java/storagecraft/storage/IStorageGui.java @@ -1,9 +1,9 @@ package storagecraft.storage; import net.minecraft.inventory.IInventory; -import storagecraft.tile.ICompareSetting; -import storagecraft.tile.IRedstoneModeSetting; -import storagecraft.tile.IModeSetting; +import storagecraft.tile.settings.ICompareSetting; +import storagecraft.tile.settings.IRedstoneModeSetting; +import storagecraft.tile.settings.IModeSetting; public interface IStorageGui { diff --git a/src/main/java/storagecraft/tile/TileConstructor.java b/src/main/java/storagecraft/tile/TileConstructor.java index e30b8f0d4..49b8be1d3 100644 --- a/src/main/java/storagecraft/tile/TileConstructor.java +++ b/src/main/java/storagecraft/tile/TileConstructor.java @@ -1,19 +1,16 @@ package storagecraft.tile; +import storagecraft.tile.settings.ICompareSetting; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import storagecraft.inventory.InventorySimple; import storagecraft.util.InventoryUtils; -public class TileConstructor extends TileMachine implements IInventory, ISidedInventory, ICompareSetting +public class TileConstructor extends TileMachine implements ICompareSetting { public static final String NBT_COMPARE = "Compare"; @@ -70,7 +67,7 @@ public class TileConstructor extends TileMachine implements IInventory, ISidedIn compare = nbt.getInteger(NBT_COMPARE); } - InventoryUtils.restoreInventory(this, nbt); + InventoryUtils.restoreInventory(inventory, nbt); } @Override @@ -80,7 +77,7 @@ public class TileConstructor extends TileMachine implements IInventory, ISidedIn nbt.setInteger(NBT_COMPARE, compare); - InventoryUtils.saveInventory(this, nbt); + InventoryUtils.saveInventory(inventory, nbt); } @Override @@ -99,125 +96,8 @@ public class TileConstructor extends TileMachine implements IInventory, ISidedIn buf.writeInt(compare); } - @Override - public int getSizeInventory() + public IInventory getInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) - { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } - - @Override - public void clear() - { - inventory.clear(); - } - - @Override - public String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public IChatComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int[] getSlotsForFace(EnumFacing side) - { - return new int[] - { - }; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) - { - return false; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) - { - return false; + return inventory; } } diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/storagecraft/tile/TileController.java index c14b6f21c..40fb86e38 100644 --- a/src/main/java/storagecraft/tile/TileController.java +++ b/src/main/java/storagecraft/tile/TileController.java @@ -17,6 +17,8 @@ import storagecraft.block.EnumControllerType; import storagecraft.storage.IStorage; import storagecraft.storage.IStorageProvider; import storagecraft.storage.StorageItem; +import storagecraft.tile.settings.IRedstoneModeSetting; +import storagecraft.tile.settings.RedstoneMode; import storagecraft.util.InventoryUtils; public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting diff --git a/src/main/java/storagecraft/tile/TileDetector.java b/src/main/java/storagecraft/tile/TileDetector.java index a51167cf1..9c7847dd3 100644 --- a/src/main/java/storagecraft/tile/TileDetector.java +++ b/src/main/java/storagecraft/tile/TileDetector.java @@ -1,19 +1,16 @@ package storagecraft.tile; +import storagecraft.tile.settings.ICompareSetting; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import storagecraft.StorageCraftBlocks; import storagecraft.inventory.InventorySimple; import storagecraft.storage.StorageItem; import storagecraft.util.InventoryUtils; -public class TileDetector extends TileMachine implements IInventory, ISidedInventory, ICompareSetting +public class TileDetector extends TileMachine implements ICompareSetting { public static final int MODE_UNDER = 0; public static final int MODE_EQUAL = 1; @@ -175,7 +172,7 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven amount = nbt.getInteger(NBT_AMOUNT); } - InventoryUtils.restoreInventory(this, nbt); + InventoryUtils.restoreInventory(inventory, nbt); } @Override @@ -187,7 +184,7 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven nbt.setInteger(NBT_MODE, mode); nbt.setInteger(NBT_AMOUNT, amount); - InventoryUtils.saveInventory(this, nbt); + InventoryUtils.saveInventory(inventory, nbt); } @Override @@ -220,125 +217,8 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven buf.writeBoolean(powered); } - @Override - public int getSizeInventory() + public IInventory getInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) - { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } - - @Override - public void clear() - { - inventory.clear(); - } - - @Override - public String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public IChatComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int[] getSlotsForFace(EnumFacing side) - { - return new int[] - { - }; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) - { - return false; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) - { - return false; + return inventory; } } diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/storagecraft/tile/TileExporter.java index 89dc9e4b8..bbcadc57d 100644 --- a/src/main/java/storagecraft/tile/TileExporter.java +++ b/src/main/java/storagecraft/tile/TileExporter.java @@ -1,18 +1,16 @@ package storagecraft.tile; +import storagecraft.tile.settings.ICompareSetting; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; 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.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import storagecraft.inventory.InventorySimple; import storagecraft.util.InventoryUtils; -public class TileExporter extends TileMachine implements IInventory, ISidedInventory, ICompareSetting +public class TileExporter extends TileMachine implements ICompareSetting { public static final String NBT_COMPARE = "Compare"; @@ -113,7 +111,7 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven compare = nbt.getInteger(NBT_COMPARE); } - InventoryUtils.restoreInventory(this, nbt); + InventoryUtils.restoreInventory(inventory, nbt); } @Override @@ -123,7 +121,7 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven nbt.setInteger(NBT_COMPARE, compare); - InventoryUtils.saveInventory(this, nbt); + InventoryUtils.saveInventory(inventory, nbt); } @Override @@ -142,125 +140,8 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven buf.writeInt(compare); } - @Override - public int getSizeInventory() + public IInventory getInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) - { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } - - @Override - public void clear() - { - inventory.clear(); - } - - @Override - public String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public IChatComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int[] getSlotsForFace(EnumFacing side) - { - return new int[] - { - }; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) - { - return false; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) - { - return false; + return inventory; } } diff --git a/src/main/java/storagecraft/tile/TileExternalStorage.java b/src/main/java/storagecraft/tile/TileExternalStorage.java index ebd59d324..1cd22e9de 100644 --- a/src/main/java/storagecraft/tile/TileExternalStorage.java +++ b/src/main/java/storagecraft/tile/TileExternalStorage.java @@ -1,5 +1,8 @@ package storagecraft.tile; +import storagecraft.tile.settings.IRedstoneModeSetting; +import storagecraft.tile.settings.IModeSetting; +import storagecraft.tile.settings.ICompareSetting; import io.netty.buffer.ByteBuf; import java.util.List; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java index c13bb7cff..f1b988215 100644 --- a/src/main/java/storagecraft/tile/TileImporter.java +++ b/src/main/java/storagecraft/tile/TileImporter.java @@ -1,18 +1,17 @@ package storagecraft.tile; +import storagecraft.tile.settings.IModeSetting; +import storagecraft.tile.settings.ICompareSetting; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; 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.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import storagecraft.inventory.InventorySimple; import storagecraft.util.InventoryUtils; -public class TileImporter extends TileMachine implements IInventory, ISidedInventory, ICompareSetting, IModeSetting +public class TileImporter extends TileMachine implements ICompareSetting, IModeSetting { public static final String NBT_COMPARE = "Compare"; public static final String NBT_MODE = "Mode"; @@ -172,7 +171,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven mode = nbt.getInteger(NBT_MODE); } - InventoryUtils.restoreInventory(this, nbt); + InventoryUtils.restoreInventory(inventory, nbt); } @Override @@ -183,7 +182,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven nbt.setInteger(NBT_COMPARE, compare); nbt.setInteger(NBT_MODE, mode); - InventoryUtils.saveInventory(this, nbt); + InventoryUtils.saveInventory(inventory, nbt); } @Override @@ -204,125 +203,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven buf.writeInt(mode); } - @Override - public int getSizeInventory() + public IInventory getInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) - { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } - - @Override - public void clear() - { - inventory.clear(); - } - - @Override - public String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public IChatComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int[] getSlotsForFace(EnumFacing side) - { - return new int[] - { - }; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) - { - return false; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) - { - return false; + return inventory; } } diff --git a/src/main/java/storagecraft/tile/TileMachine.java b/src/main/java/storagecraft/tile/TileMachine.java index 6ebda76c9..d3129b9e9 100644 --- a/src/main/java/storagecraft/tile/TileMachine.java +++ b/src/main/java/storagecraft/tile/TileMachine.java @@ -1,5 +1,7 @@ package storagecraft.tile; +import storagecraft.tile.settings.RedstoneMode; +import storagecraft.tile.settings.IRedstoneModeSetting; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; diff --git a/src/main/java/storagecraft/tile/TileSolderer.java b/src/main/java/storagecraft/tile/TileSolderer.java index d334e7aaa..4e0831608 100644 --- a/src/main/java/storagecraft/tile/TileSolderer.java +++ b/src/main/java/storagecraft/tile/TileSolderer.java @@ -272,20 +272,18 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven @Override public int[] getSlotsForFace(EnumFacing side) { - // On all sides, but not the bottom we can reach the slots if (side != EnumFacing.DOWN) { return new int[] - { - 0, 1, 2 - }; + { + 0, 1, 2 + }; } - // On the bottom we can only reach the output slot return new int[] - { - 3 - }; + { + 3 + }; } @Override diff --git a/src/main/java/storagecraft/tile/TileStorage.java b/src/main/java/storagecraft/tile/TileStorage.java index 924423ce5..d1ddad802 100644 --- a/src/main/java/storagecraft/tile/TileStorage.java +++ b/src/main/java/storagecraft/tile/TileStorage.java @@ -1,5 +1,8 @@ package storagecraft.tile; +import storagecraft.tile.settings.IRedstoneModeSetting; +import storagecraft.tile.settings.IModeSetting; +import storagecraft.tile.settings.ICompareSetting; import io.netty.buffer.ByteBuf; import java.util.List; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/storagecraft/tile/ICompareSetting.java b/src/main/java/storagecraft/tile/settings/ICompareSetting.java similarity index 82% rename from src/main/java/storagecraft/tile/ICompareSetting.java rename to src/main/java/storagecraft/tile/settings/ICompareSetting.java index 4ec06df4a..dbb772616 100644 --- a/src/main/java/storagecraft/tile/ICompareSetting.java +++ b/src/main/java/storagecraft/tile/settings/ICompareSetting.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package storagecraft.tile.settings; import net.minecraft.util.BlockPos; diff --git a/src/main/java/storagecraft/tile/IModeSetting.java b/src/main/java/storagecraft/tile/settings/IModeSetting.java similarity index 81% rename from src/main/java/storagecraft/tile/IModeSetting.java rename to src/main/java/storagecraft/tile/settings/IModeSetting.java index c91d22af4..9941d0fc3 100644 --- a/src/main/java/storagecraft/tile/IModeSetting.java +++ b/src/main/java/storagecraft/tile/settings/IModeSetting.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package storagecraft.tile.settings; import net.minecraft.util.BlockPos; diff --git a/src/main/java/storagecraft/tile/IRedstoneModeSetting.java b/src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java similarity index 85% rename from src/main/java/storagecraft/tile/IRedstoneModeSetting.java rename to src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java index 87eda5fad..576518f16 100644 --- a/src/main/java/storagecraft/tile/IRedstoneModeSetting.java +++ b/src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package storagecraft.tile.settings; import net.minecraft.util.BlockPos; diff --git a/src/main/java/storagecraft/tile/RedstoneMode.java b/src/main/java/storagecraft/tile/settings/RedstoneMode.java similarity index 95% rename from src/main/java/storagecraft/tile/RedstoneMode.java rename to src/main/java/storagecraft/tile/settings/RedstoneMode.java index 049ef5eb1..35e6b4e2f 100644 --- a/src/main/java/storagecraft/tile/RedstoneMode.java +++ b/src/main/java/storagecraft/tile/settings/RedstoneMode.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package storagecraft.tile.settings; import net.minecraft.util.BlockPos; import net.minecraft.world.World;