dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move tile settings to other package, remove unneeded IInventory impls

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-01-31 15:16:41 +01:00
parent dcab5a6819
commit 9d2e6ed16f
24 changed files with 58 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/storagecraft/container/ContainerConstructor.java
View File

@@ -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);
}

2
src/main/java/storagecraft/container/ContainerDetector.java
View File

@@ -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);
}

2
src/main/java/storagecraft/container/ContainerExporter.java
View File

@@ -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);

2
src/main/java/storagecraft/container/ContainerImporter.java
View File

@@ -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);

2
src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java
View File

@@ -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

2
src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java
View File

@@ -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
{

2
src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java
View File

@@ -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
{

2
src/main/java/storagecraft/network/MessageCompareUpdate.java
View File

@@ -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<MessageCompareUpdate> implements IMessage
{

2
src/main/java/storagecraft/network/MessageModeToggle.java
View File

@@ -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<MessageModeToggle> implements IMessage
{

2
src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java
View File

@@ -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<MessageRedstoneModeUpdate> implements IMessage
{

6
src/main/java/storagecraft/storage/IStorageGui.java
View File

@@ -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
{

132
src/main/java/storagecraft/tile/TileConstructor.java
View File

@@ -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;
}
}

2
src/main/java/storagecraft/tile/TileController.java
View File

@@ -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

132
src/main/java/storagecraft/tile/TileDetector.java
View File

@@ -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;
}
}

131
src/main/java/storagecraft/tile/TileExporter.java
View File

@@ -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;
}
}

3
src/main/java/storagecraft/tile/TileExternalStorage.java
View File

@@ -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;

132
src/main/java/storagecraft/tile/TileImporter.java
View File

@@ -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;
}
}

2
src/main/java/storagecraft/tile/TileMachine.java
View File

@@ -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;

14
src/main/java/storagecraft/tile/TileSolderer.java
View File

@@ -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

3
src/main/java/storagecraft/tile/TileStorage.java
View File

@@ -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;

2
src/main/java/storagecraft/tile/ICompareSetting.java → src/main/java/storagecraft/tile/settings/ICompareSetting.java
View File

@@ -1,4 +1,4 @@
package storagecraft.tile;
package storagecraft.tile.settings;
import net.minecraft.util.BlockPos;

2
src/main/java/storagecraft/tile/IModeSetting.java → src/main/java/storagecraft/tile/settings/IModeSetting.java
View File

@@ -1,4 +1,4 @@
package storagecraft.tile;
package storagecraft.tile.settings;
import net.minecraft.util.BlockPos;

2
src/main/java/storagecraft/tile/IRedstoneModeSetting.java → src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java
View File

@@ -1,4 +1,4 @@
package storagecraft.tile;
package storagecraft.tile.settings;
import net.minecraft.util.BlockPos;

2
src/main/java/storagecraft/tile/RedstoneMode.java → src/main/java/storagecraft/tile/settings/RedstoneMode.java
View File

@@ -1,4 +1,4 @@
package storagecraft.tile;
package storagecraft.tile.settings;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;