diff --git a/gradle.properties b/gradle.properties index 398678d28..cb505068b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.4.1566-1.7.10 version_major=4 version_minor=2 -version_patch=2 +version_patch=3 diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index a4fa21f11..1a831b7c7 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -113,4 +113,9 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement public Object getContainer(EntityPlayer player, int data) { return new ContainerMinecartBeehouse(player.inventory, this, true); } + + @Override + public int getIdOfEntity() { + return getEntityId(); + } } diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index b7714189e..813e2fb2e 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -98,4 +98,9 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { public Object getContainer(EntityPlayer player, int data) { return new ContainerMinecartBeehouse(player.inventory, this, false); } + + @Override + public int getIdOfEntity() { + return getEntityId(); + } } diff --git a/src/main/java/forestry/core/gui/GuiHandler.java b/src/main/java/forestry/core/gui/GuiHandler.java index cddb73233..1ef367d6e 100644 --- a/src/main/java/forestry/core/gui/GuiHandler.java +++ b/src/main/java/forestry/core/gui/GuiHandler.java @@ -29,7 +29,7 @@ public class GuiHandler implements IGuiHandler { public static void openGui(EntityPlayer entityplayer, IGuiHandlerEntity guiHandler, short data) { int guiData = encodeGuiData(guiHandler, data); - entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, guiHandler.getEntityId(), 0, 0); + entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, guiHandler.getIdOfEntity(), 0, 0); } public static void openGui(EntityPlayer entityplayer, IGuiHandlerItem guiHandler) { diff --git a/src/main/java/forestry/core/gui/IGuiHandlerEntity.java b/src/main/java/forestry/core/gui/IGuiHandlerEntity.java index f7473d873..a44f4639d 100644 --- a/src/main/java/forestry/core/gui/IGuiHandlerEntity.java +++ b/src/main/java/forestry/core/gui/IGuiHandlerEntity.java @@ -17,5 +17,6 @@ public interface IGuiHandlerEntity extends IGuiHandlerForestry { Object getContainer(EntityPlayer player, int data); - int getEntityId(); + // can't be named getEntityId() for obfuscation reasons + int getIdOfEntity(); }