From e6e858820f5c1e30c717c97b1418d307f33fd917 Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Mon, 3 Jul 2017 07:34:24 +0200 Subject: [PATCH] Updated forge and added some more stuff from the new mappings. --- gradle.properties | 2 +- src/main/java/appeng/client/gui/Size1Slot.java | 4 ++-- src/main/java/appeng/container/slot/AppEngSlot.java | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 808f77bb7..409e95d1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ aebasename=appliedenergistics2 ######################################################### minecraft_version=1.11.2 mcp_mappings=stable_32 -forge_version=13.20.0.2310 +forge_version=13.20.1.2388 ######################################################### # Installable # diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java index 18d346b35..614b95535 100644 --- a/src/main/java/appeng/client/gui/Size1Slot.java +++ b/src/main/java/appeng/client/gui/Size1Slot.java @@ -83,9 +83,9 @@ class Size1Slot extends Slot @Override @SideOnly( Side.CLIENT) - public boolean canBeHovered() + public boolean isEnabled() { - return delegate.canBeHovered(); + return delegate.isEnabled(); } @Override diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index c2ae6b357..2ea4e688b 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -141,9 +141,9 @@ public class AppEngSlot extends Slot } @Override - public boolean canBeHovered() + public boolean isEnabled() { - return this.isEnabled(); + return super.isEnabled(); } public ItemStack getDisplayStack() @@ -151,11 +151,6 @@ public class AppEngSlot extends Slot return super.getStack(); } - public boolean isEnabled() - { - return true; - } - public float getOpacityOfIcon() { return 0.4f;