diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 13ab34160..761e7af47 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -15,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.common.registry.GameRegistry; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -24,7 +25,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, IInventory +public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, IInventoryProvider { public int tickTime; @@ -324,120 +325,7 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II } @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index 516285a10..41d752313 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.recipes.RecipeCrafter; @@ -16,7 +17,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public int tickTime; @@ -94,7 +95,6 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } @@ -108,54 +108,6 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, // } // } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -223,56 +175,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index a12b39ff5..9ff324475 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -15,7 +15,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider +public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory,IInventoryProvider, IRecipeCrafterProvider { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index 7c46b5e3e..5cdedd187 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -13,6 +13,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.misc.Location; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.powerSystem.TilePowerAcceptor; @@ -27,7 +28,7 @@ import techreborn.api.Reference; import techreborn.multiblocks.MultiBlockCasing; import ic2.api.tile.IWrenchable; -public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory, ITileRecipeHandler +public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory, ITileRecipeHandler { public static int euTick = 5; @@ -131,89 +132,6 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, return 0; } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int p_70301_1_) - { - return inventory.getStackInSlot(p_70301_1_); - } - - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) - { - return inventory.decrStackSize(p_70298_1_, p_70298_2_); - } - - @Override - public ItemStack removeStackFromSlot(int p_70304_1_) - { - return inventory.removeStackFromSlot(p_70304_1_); - } - - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) - { - inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return inventory.isUseableByPlayer(p_70300_1_); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); - } - - @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(); - } public Packet getDescriptionPacket() { @@ -234,7 +152,6 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); tickTime = tagCompound.getInteger("tickTime"); } @@ -242,7 +159,6 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); writeUpdateToNBT(tagCompound); } @@ -317,24 +233,6 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, return EnumPowerTier.HIGH; } - @Override - public String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - @Override public boolean canCraft(TileEntity tile, BlastFurnaceRecipe recipe) { if (tile instanceof TileBlastFurnace) { @@ -348,4 +246,9 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, public boolean onCraft(TileEntity tile, BlastFurnaceRecipe recipe) { return true; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index a496580f6..aa81a9290 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -10,6 +10,7 @@ import net.minecraft.util.text.ITextComponent; import reborncore.api.IListInfoProvider; import reborncore.api.power.EnumPowerTier; import reborncore.api.power.IEnergyItemInfo; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -21,7 +22,7 @@ import techreborn.api.Reference; import java.util.List; public class TileCentrifuge extends TilePowerAcceptor - implements IWrenchable, IInventory, IListInfoProvider + implements IWrenchable,IInventoryProvider, IListInfoProvider { public int tickTime; @@ -108,7 +109,6 @@ public class TileCentrifuge extends TilePowerAcceptor public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -116,7 +116,6 @@ public class TileCentrifuge extends TilePowerAcceptor public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } @@ -127,54 +126,6 @@ public class TileCentrifuge extends TilePowerAcceptor info.add("Round and round it goes"); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // // ISidedInventory // @Override // public int[] getSlotsForFace(EnumFacing side) @@ -242,56 +193,7 @@ public class TileCentrifuge extends TilePowerAcceptor } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index 11d175291..a9b2767b1 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -9,12 +9,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; import reborncore.api.power.IEnergyInterfaceItem; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileChargeBench extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public Inventory inventory = new Inventory(6, "TileChargeBench", 64, this); @@ -85,68 +86,6 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I return false; } - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -209,57 +148,9 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I return EnumPowerTier.MEDIUM; } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 413105816..5c47e9af9 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.recipes.RecipeCrafter; @@ -15,7 +16,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public int tickTime; @@ -81,7 +82,6 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -89,58 +89,9 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -218,56 +169,7 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 63e9f5aec..df0bf5bd2 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -6,12 +6,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, IInventory +public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable,IInventoryProvider { public Inventory inventory = new Inventory(1, "TileChunkLoader", 64, this); @@ -61,54 +62,6 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I return false; } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - @Override public double getMaxPower() { @@ -145,57 +98,9 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I return EnumPowerTier.MEDIUM; } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index fd5e23df1..ca5d176f8 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -12,13 +12,14 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.IListInfoProvider; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileDigitalChest extends TileMachineBase implements IInventory, IWrenchable, IListInfoProvider +public class TileDigitalChest extends TileMachineBase implements IInventoryProvider, IWrenchable, IListInfoProvider { // Slot 0 = Input @@ -113,7 +114,6 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, IWr public void readFromNBTWithoutCoords(NBTTagCompound tagCompound) { - inventory.readFromNBT(tagCompound); storedItem = null; @@ -137,7 +137,6 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, IWr public void writeToNBTWithoutCoords(NBTTagCompound tagCompound) { - inventory.writeToNBT(tagCompound); if (storedItem != null) { tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); @@ -146,54 +145,6 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, IWr tagCompound.setInteger("storedQuantity", 0); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slotId, int count) - { - return inventory.decrStackSize(slotId, 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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - @Override public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { @@ -254,57 +205,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, IWr } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); + public Inventory getInventory() { + return inventory; } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - } diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index 5605451a2..2ebd64019 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -10,6 +10,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.misc.Location; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -19,7 +20,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public int tickTime; @@ -114,7 +115,6 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -122,7 +122,6 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } @@ -136,107 +135,6 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc // } // } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } // ISidedInventory @Override @@ -303,4 +201,9 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc { return EnumPowerTier.LOW; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 6d1e84949..73de2e618 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.recipes.RecipeCrafter; @@ -15,7 +16,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public int tickTime; @@ -84,7 +85,6 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -92,7 +92,6 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } @@ -106,108 +105,6 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr // } // } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -273,4 +170,9 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr { return EnumPowerTier.LOW; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java index 8746ecafa..840bbfca2 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java @@ -15,6 +15,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -29,7 +30,7 @@ import techreborn.api.Reference; import ic2.api.tile.IWrenchable; public class TileIndustrialGrinder extends TilePowerAcceptor - implements IWrenchable, IFluidHandler, IInventory, ISidedInventory, ITileRecipeHandler + implements IWrenchable, IFluidHandler, IInventoryProvider, ISidedInventory, ITileRecipeHandler { public static final int TANK_CAPACITY = 16000; @@ -127,7 +128,6 @@ public class TileIndustrialGrinder extends TilePowerAcceptor public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); tank.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -136,7 +136,6 @@ public class TileIndustrialGrinder extends TilePowerAcceptor public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); tank.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } @@ -205,108 +204,6 @@ public class TileIndustrialGrinder extends TilePowerAcceptor return new FluidTankInfo[] { tank.getInfo() }; } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -417,4 +314,9 @@ public class TileIndustrialGrinder extends TilePowerAcceptor } return false; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index e4a574f96..9e1e7b068 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -16,6 +16,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.IListInfoProvider; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.misc.Location; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; @@ -31,7 +32,7 @@ import techreborn.api.Reference; import ic2.api.tile.IWrenchable; public class TileIndustrialSawmill extends TilePowerAcceptor - implements IWrenchable, IFluidHandler, IInventory, ISidedInventory, IListInfoProvider, ITileRecipeHandler + implements IWrenchable, IFluidHandler,IInventoryProvider, ISidedInventory, IListInfoProvider, ITileRecipeHandler { public static final int TANK_CAPACITY = 16000; @@ -134,7 +135,6 @@ public class TileIndustrialSawmill extends TilePowerAcceptor public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); tank.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -143,7 +143,6 @@ public class TileIndustrialSawmill extends TilePowerAcceptor public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); tank.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } @@ -200,108 +199,6 @@ public class TileIndustrialSawmill extends TilePowerAcceptor return new FluidTankInfo[] { tank.getInfo() }; } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -411,4 +308,9 @@ public class TileIndustrialSawmill extends TilePowerAcceptor } return false; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 34ef4b1ac..6432fbe0d 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -17,11 +17,12 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.common.registry.GameRegistry; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; -public class TileIronFurnace extends TileMachineBase implements IInventory +public class TileIronFurnace extends TileMachineBase implements IInventoryProvider { public int tickTime; @@ -229,120 +230,7 @@ public class TileIronFurnace extends TileMachineBase implements IInventory } @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 3f2988808..1bde0d77f 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -7,6 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -15,7 +16,7 @@ import techreborn.init.ModItems; import ic2.api.tile.IWrenchable; import techreborn.items.ItemParts; -public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory +public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable,IInventoryProvider { public static int fabricationRate = 2666656; @@ -65,122 +66,6 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab return false; } - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // // ISidedInventory // @Override // public int[] getSlotsForFace(EnumFacing side) @@ -347,4 +232,9 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab { return EnumPowerTier.EXTREME; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index df2f6e269..08aa6c1df 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -13,6 +13,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import reborncore.api.IListInfoProvider; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -20,7 +21,7 @@ import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; public class TileQuantumChest extends TileMachineBase - implements IInventory, IWrenchable, IDeepStorageUnit, IListInfoProvider + implements IInventoryProvider, IWrenchable, IDeepStorageUnit, IListInfoProvider { // Slot 0 = Input @@ -115,7 +116,6 @@ public class TileQuantumChest extends TileMachineBase public void readFromNBTWithoutCoords(NBTTagCompound tagCompound) { - inventory.readFromNBT(tagCompound); storedItem = null; @@ -139,7 +139,6 @@ public class TileQuantumChest extends TileMachineBase public void writeToNBTWithoutCoords(NBTTagCompound tagCompound) { - inventory.writeToNBT(tagCompound); if (storedItem != null) { tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); @@ -148,108 +147,6 @@ public class TileQuantumChest extends TileMachineBase tagCompound.setInteger("storedQuantity", 0); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slotId, int count) - { - return inventory.decrStackSize(slotId, 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 void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - @Override public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { @@ -338,4 +235,9 @@ public class TileQuantumChest extends TileMachineBase info.add(size + " " + name); } } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 0ebc2909f..5d138fdbf 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -16,6 +16,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.IListInfoProvider; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -24,7 +25,7 @@ import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; public class TileQuantumTank extends TileMachineBase - implements IFluidHandler, IInventory, IWrenchable, IListInfoProvider + implements IFluidHandler,IInventoryProvider, IWrenchable, IListInfoProvider { public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this); @@ -40,7 +41,6 @@ public class TileQuantumTank extends TileMachineBase public void readFromNBTWithoutCoords(NBTTagCompound tagCompound) { tank.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); } @Override @@ -53,7 +53,6 @@ public class TileQuantumTank extends TileMachineBase public void writeToNBTWithoutCoords(NBTTagCompound tagCompound) { tank.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); } public Packet getDescriptionPacket() @@ -133,112 +132,6 @@ public class TileQuantumTank extends TileMachineBase return new FluidTankInfo[] { tank.getInfo() }; } - // IInventory - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slotId, int count) - { - ItemStack stack = inventory.decrStackSize(slotId, count); - syncWithAll(); - return stack; - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - syncWithAll(); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - @Override public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { @@ -295,4 +188,9 @@ public class TileQuantumTank extends TileMachineBase info.add("Capacity " + tank.getCapacity() + " mb"); } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index c94b9e1c2..e006a85dd 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -17,7 +18,7 @@ import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; //TODO add tick and power bars. -public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable, IInventory +public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable,IInventoryProvider { public final InventoryCrafting craftMatrix = new InventoryCrafting(new RollingTileContainer(), 3, 3); @@ -178,7 +179,6 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); ItemUtils.readInvFromNBT(craftMatrix, "Crafting", tagCompound); isRunning = tagCompound.getBoolean("isRunning"); tickTime = tagCompound.getInteger("tickTime"); @@ -188,7 +188,6 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); ItemUtils.writeInvToNBT(craftMatrix, "Crafting", tagCompound); writeUpdateToNBT(tagCompound); } @@ -212,105 +211,8 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable } @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); + public Inventory getInventory() { + return inventory; } private static class RollingTileContainer extends Container diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index f7dc7a0b5..6a78c1e54 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -11,6 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -19,7 +20,7 @@ import techreborn.init.ModBlocks; import techreborn.init.ModItems; import ic2.api.tile.IWrenchable; -public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public Inventory inventory = new Inventory(6, "TileScrapboxinator", 64, this); @@ -160,68 +161,6 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable return false; } - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -286,57 +225,9 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable return EnumPowerTier.MEDIUM; } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/TileVacuumFreezer.java index 26b1a60bf..37aced1bf 100644 --- a/src/main/java/techreborn/tiles/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/TileVacuumFreezer.java @@ -10,6 +10,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.ITileRecipeHandler; @@ -20,7 +21,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, IInventory, ITileRecipeHandler +public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ITileRecipeHandler { public int tickTime; @@ -126,7 +127,6 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -134,112 +134,9 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - public int getProgressScaled(int scale) { if (crafter.currentTickTime != 0) @@ -302,4 +199,9 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, public boolean onCraft(TileEntity tile, VacuumFreezerRecipe recipe) { return true; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index 69d944ae8..09ce4a2ba 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -15,7 +16,7 @@ import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.init.ModBlocks; -public class TileEntityFusionController extends TilePowerAcceptor implements IInventory +public class TileEntityFusionController extends TilePowerAcceptor implements IInventoryProvider { public Inventory inventory = new Inventory(3, "TileEntityFusionController", 64, this); @@ -84,7 +85,6 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafingTickTime = tagCompound.getInteger("crafingTickTime"); finalTickTime = tagCompound.getInteger("finalTickTime"); neededPower = tagCompound.getInteger("neededPower"); @@ -95,7 +95,6 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); if (crafingTickTime == -1) { @@ -115,89 +114,6 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn tagCompound.setBoolean("hasStartedCrafting", hasStartedCrafting); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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(); - } public boolean checkCoils() { @@ -428,4 +344,9 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn { return null; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 14c4a8b37..40aba5f86 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -16,6 +16,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.fuel.FluidPowerManager; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -24,7 +25,7 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory +public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventoryProvider { public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput; @@ -117,7 +118,6 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl { super.readFromNBT(tagCompound); tank.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); } @Override @@ -125,7 +125,6 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl { super.writeToNBT(tagCompound); tank.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); } public Packet getDescriptionPacket() @@ -175,54 +174,6 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int p_70301_1_) - { - return inventory.getStackInSlot(p_70301_1_); - } - - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) - { - return inventory.decrStackSize(p_70298_1_, p_70298_2_); - } - - @Override - public ItemStack removeStackFromSlot(int p_70304_1_) - { - return inventory.removeStackFromSlot(p_70304_1_); - } - - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) - { - inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return inventory.isUseableByPlayer(p_70300_1_); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); - } - @Override public double getMaxPower() { @@ -260,56 +211,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index 1477b2dc3..b2cff4b23 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -9,13 +9,14 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventory +public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable,IInventoryProvider { public static final int euTick = ConfigTechReborn.DragonEggSiphonerOutput; @@ -76,122 +77,6 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha return false; } - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - @Override public double getMaxPower() { @@ -227,4 +112,9 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha { return EnumPowerTier.HIGH; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 62b1c58c5..dc76c0a94 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -19,6 +19,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -27,7 +28,7 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory +public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider { // TODO: run this off config @@ -131,7 +132,6 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF { super.readFromNBT(tagCompound); tank.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); } @Override @@ -139,7 +139,6 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF { super.writeToNBT(tagCompound); tank.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); } public Packet getDescriptionPacket() @@ -193,108 +192,6 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF } } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int p_70301_1_) - { - return inventory.getStackInSlot(p_70301_1_); - } - - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) - { - return inventory.decrStackSize(p_70298_1_, p_70298_2_); - } - - @Override - public ItemStack removeStackFromSlot(int p_70304_1_) - { - return inventory.removeStackFromSlot(p_70304_1_); - } - - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) - { - inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return inventory.isUseableByPlayer(p_70300_1_); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); - } - @Override public double getMaxPower() { @@ -330,4 +227,9 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF { return EnumPowerTier.MEDIUM; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 7926a032b..53f102bb4 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -9,13 +9,14 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IInventory +public class TileGenerator extends TilePowerAcceptor implements IWrenchable,IInventoryProvider { public static int outputAmount = 10; // This is in line with BC engines rf, public Inventory inventory = new Inventory(2, "TileGenerator", 64, this); @@ -115,54 +116,6 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn return 1.0F; } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int p_70301_1_) - { - return inventory.getStackInSlot(p_70301_1_); - } - - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) - { - return inventory.decrStackSize(p_70298_1_, p_70298_2_); - } - - @Override - public ItemStack removeStackFromSlot(int p_70304_1_) - { - return inventory.removeStackFromSlot(p_70304_1_); - } - - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) - { - inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return inventory.isUseableByPlayer(p_70300_1_); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); - } - @Override public double getMaxPower() { @@ -199,60 +152,6 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn return EnumPowerTier.LOW; } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - @Override public ItemStack getWrenchDrop(EntityPlayer p0) { @@ -260,16 +159,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn } @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index 05ed224e4..88f1edaba 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -19,6 +19,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -27,7 +28,7 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory +public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider { // TODO: run this off config @@ -137,7 +138,6 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench { super.readFromNBT(tagCompound); tank.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); } @Override @@ -145,7 +145,6 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench { super.writeToNBT(tagCompound); tank.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); } public Packet getDescriptionPacket() @@ -196,108 +195,6 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench } } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int p_70301_1_) - { - return inventory.getStackInSlot(p_70301_1_); - } - - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) - { - return inventory.decrStackSize(p_70298_1_, p_70298_2_); - } - - @Override - public ItemStack removeStackFromSlot(int p_70304_1_) - { - return inventory.removeStackFromSlot(p_70304_1_); - } - - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) - { - inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return inventory.isUseableByPlayer(p_70300_1_); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); - } - @Override public double getMaxPower() { @@ -333,4 +230,9 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench { return EnumPowerTier.LOW; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index ce74f1e83..5dca20ccc 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -18,6 +18,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; @@ -27,7 +28,7 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory +public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider { public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput; @@ -123,7 +124,6 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab { super.readFromNBT(tagCompound); tank.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); } @Override @@ -131,7 +131,6 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab { super.writeToNBT(tagCompound); tank.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); } public Packet getDescriptionPacket() @@ -198,108 +197,6 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab } } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int p_70301_1_) - { - return inventory.getStackInSlot(p_70301_1_); - } - - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) - { - return inventory.decrStackSize(p_70298_1_, p_70298_2_); - } - - @Override - public ItemStack removeStackFromSlot(int p_70304_1_) - { - return inventory.removeStackFromSlot(p_70304_1_); - } - - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) - { - inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); - } - - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return inventory.isUseableByPlayer(p_70300_1_); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); - } - @Override public double getMaxPower() { @@ -335,4 +232,9 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab { return EnumPowerTier.LOW; } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index d87040e74..1c8dbe603 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -11,6 +11,7 @@ import net.minecraft.util.ITickable; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; import reborncore.api.power.IEnergyItemInfo; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -19,7 +20,7 @@ import techreborn.blocks.storage.BlockEnergyStorage; /** * Created by Rushmead */ -public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, ITickable, IInventory +public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, ITickable, IInventoryProvider { public Inventory inventory; @@ -143,100 +144,8 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, return tier; } - @Override public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override public void readFromNBT(NBTTagCompound nbttagcompound) - { - super.readFromNBT(nbttagcompound); - inventory.readFromNBT(nbttagcompound); - } - - @Override public int getSizeInventory() - { - return 2; - } - - @Override public ItemStack getStackInSlot(int index) - { - return inventory.getStackInSlot(index); - } - - @Override public ItemStack decrStackSize(int index, int count) - { - return inventory.decrStackSize(index, count); - } - - @Override public ItemStack removeStackFromSlot(int index) - { - return inventory.removeStackFromSlot(index); - } - - @Override public void setInventorySlotContents(int index, ItemStack stack) - { - inventory.setInventorySlotContents(index, 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 index, ItemStack stack) - { - return inventory.isItemValidForSlot(index, 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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + @Override + public Inventory getInventory() { + return inventory; } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index ed6cddfd7..2c8fc2637 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -10,13 +10,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.init.ModBlocks; import ic2.api.tile.IWrenchable; -public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public Inventory inventory = new Inventory(6, "TileElectricFurnace", 64, this); @@ -182,68 +183,6 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl return false; } - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -302,56 +241,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index 602778214..b6007ef26 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.recipes.RecipeCrafter; @@ -15,7 +16,7 @@ import techreborn.init.ModBlocks; import techreborn.api.Reference; import ic2.api.tile.IWrenchable; -public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public Inventory inventory = new Inventory(6, "TileExtractor", 64, this); @@ -80,7 +81,6 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); crafter.readFromNBT(tagCompound); } @@ -88,58 +88,9 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -207,56 +158,7 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } } diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index 9f11b925d..922412b91 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -9,6 +9,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.IListInfoProvider; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.recipes.RecipeCrafter; @@ -18,7 +19,7 @@ import ic2.api.tile.IWrenchable; import java.util.List; -public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory, +public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory, IListInfoProvider { @@ -91,57 +92,9 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInve public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } // ISidedInventory @Override @@ -209,62 +162,13 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInve return EnumPowerTier.LOW; } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - @Override public void addInfo(List info, boolean isRealTile) { info.add("Macerator"); } + + @Override + public Inventory getInventory() { + return inventory; + } } diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 2e33fb347..a148aa99b 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import reborncore.api.power.EnumPowerTier; +import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -16,7 +17,7 @@ import techreborn.init.ModBlocks; import techreborn.items.ItemParts; import ic2.api.tile.IWrenchable; -public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory +public class TileRecycler extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory { public Inventory inventory = new Inventory(6, "TileRecycler", 64, this); @@ -179,68 +180,6 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv return false; } - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - return inventory.decrStackSize(slot, amount); - } - - @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 boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } - // ISidedInventory @Override public int[] getSlotsForFace(EnumFacing side) @@ -299,56 +238,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } - - @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 ITextComponent getDisplayName() - { - return inventory.getDisplayName(); + public Inventory getInventory() { + return inventory; } }