From d31f702518fa5100e631d639cb5b771d2a57f78e Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 12 Aug 2017 15:15:48 +1000 Subject: + Added the ability for the Fish Trap to support ISidedInventory. --- .../tileentities/general/TileEntityFishTrap.java | 87 +++++++++++++++++++++- 1 file changed, 84 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index 3f6f2676a0..aec4048582 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java @@ -7,13 +7,15 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -public class TileEntityFishTrap extends TileEntity { +public class TileEntityFishTrap extends TileEntity implements ISidedInventory { private int tickCount = 0; private boolean isInWater = false; @@ -99,8 +101,7 @@ public class TileEntityFishTrap extends TileEntity { this.markDirty(); return true; } - else if (contents.getItem() == loot.getItem() - && contents.stackSize <= contents.getMaxStackSize() - 1) { + else if (contents.getItem() == loot.getItem() && contents.stackSize <= contents.getMaxStackSize() - 1) { if (contents.stackSize < contents.getMaxStackSize()) { contents.stackSize++; this.markDirty(); @@ -257,4 +258,84 @@ public class TileEntityFishTrap extends TileEntity { } } + @Override + public int getSizeInventory() { + return this.getInventory().getSizeInventory(); + } + + @Override + public ItemStack getStackInSlot(int slot) { + return this.getInventory().getStackInSlot(slot); + } + + @Override + public ItemStack decrStackSize(int slot, int count) { + return this.getInventory().decrStackSize(slot, count); + } + + @Override + public ItemStack getStackInSlotOnClosing(int slot) { + return this.getInventory().getStackInSlotOnClosing(slot); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + this.getInventory().setInventorySlotContents(slot, stack); + } + + @Override + public String getInventoryName() { + return this.getInventory().getInventoryName(); + } + + @Override + public boolean hasCustomInventoryName() { + return this.getInventory().hasCustomInventoryName(); + } + + @Override + public int getInventoryStackLimit() { + return this.getInventory().getInventoryStackLimit(); + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return this.getInventory().isUseableByPlayer(entityplayer); + } + + @Override + public void openInventory() { + this.getInventory().openInventory(); + } + + @Override + public void closeInventory() { + this.getInventory().closeInventory(); + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) { + return this.getInventory().isItemValidForSlot(slot, itemstack); + } + + @Override + public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + int[] accessibleSides = new int[this.getSizeInventory()]; + for (int r=0; r