From 683cde92fb4819f08e2839dde8827ab93a1a1fde Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 10 Feb 2014 20:10:31 -0500 Subject: [PATCH] Fixes #625 --- .../pahimar/ee3/tileentity/TileAlchemicalChest.java | 12 ++++++++++++ .../java/com/pahimar/ee3/tileentity/TileAludel.java | 12 ++++++++++++ .../com/pahimar/ee3/tileentity/TileCalcinator.java | 12 ++++++++++++ src/main/java/com/pahimar/ee3/tileentity/TileEE.java | 6 ------ .../com/pahimar/ee3/tileentity/TileGlassBell.java | 12 ++++++++++++ .../pahimar/ee3/tileentity/TileResearchStation.java | 12 ++++++++++++ 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java b/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java index c47e1169..683757f4 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java @@ -4,6 +4,7 @@ import com.pahimar.ee3.block.ModBlocks; import com.pahimar.ee3.inventory.ContainerAlchemicalChest; import com.pahimar.ee3.lib.Sounds; import com.pahimar.ee3.lib.Strings; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -138,6 +139,17 @@ public class TileAlchemicalChest extends TileEE implements IInventory return 64; } + /** + * Do not make give this method the name canInteractWith because it clashes with Container + * + * @param entityplayer + */ + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + /** * Called when a client event is received with the event number and argument, see World.sendClientEvent */ diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java b/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java index 8d485299..195a48c5 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java @@ -9,6 +9,7 @@ import com.pahimar.ee3.recipe.RecipesAludel; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -372,6 +373,17 @@ public class TileAludel extends TileEE implements IInventory } } + /** + * Do not make give this method the name canInteractWith because it clashes with Container + * + * @param entityplayer + */ + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + @Override public String toString() { diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java b/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java index 37c4aa4c..6a8582ac 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java @@ -6,6 +6,7 @@ import com.pahimar.ee3.network.packet.PacketTileCalcinator; import com.pahimar.ee3.recipe.CalcinationManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -120,6 +121,17 @@ public class TileCalcinator extends TileEE implements IInventory return 64; } + /** + * Do not make give this method the name canInteractWith because it clashes with Container + * + * @param entityplayer + */ + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + @Override public boolean receiveClientEvent(int eventId, int eventData) { diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileEE.java b/src/main/java/com/pahimar/ee3/tileentity/TileEE.java index 2bb7db6e..ab93ee38 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileEE.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileEE.java @@ -3,7 +3,6 @@ package com.pahimar.ee3.tileentity; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.network.PacketTypeHandler; import com.pahimar.ee3.network.packet.PacketTileUpdate; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; @@ -75,11 +74,6 @@ public class TileEE extends TileEntity this.customName = customName; } - public boolean isUseableByPlayer(EntityPlayer player) - { - return true; - } - @Override public void readFromNBT(NBTTagCompound nbtTagCompound) { diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileGlassBell.java b/src/main/java/com/pahimar/ee3/tileentity/TileGlassBell.java index ee253ffa..9eb98251 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileGlassBell.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileGlassBell.java @@ -5,6 +5,7 @@ import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.network.PacketTypeHandler; import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate; import cpw.mods.fml.common.network.PacketDispatcher; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -201,6 +202,17 @@ public class TileGlassBell extends TileEE implements IInventory worldObj.updateAllLightTypes(xCoord, yCoord, zCoord); } + /** + * Do not make give this method the name canInteractWith because it clashes with Container + * + * @param entityplayer + */ + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + @Override public String toString() { diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileResearchStation.java b/src/main/java/com/pahimar/ee3/tileentity/TileResearchStation.java index 4d740a68..1aae9d43 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileResearchStation.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileResearchStation.java @@ -1,5 +1,6 @@ package com.pahimar.ee3.tileentity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -92,6 +93,17 @@ public class TileResearchStation extends TileEE implements IInventory return 0; } + /** + * Do not make give this method the name canInteractWith because it clashes with Container + * + * @param entityplayer + */ + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + @Override public void openChest() {