From 3a4afc50354d21fdbae5e1acb2a9ce599aaba1d1 Mon Sep 17 00:00:00 2001 From: 0xSeb Date: Sat, 19 Nov 2016 18:44:48 +0100 Subject: [PATCH] Added beta support for minecraft 1.11 --- .../craftingkeys/manager/ContainerManager.java | 12 ++++++++++++ .../java/de/skate702/craftingkeys/util/Util.java | 1 + 2 files changed, 13 insertions(+) diff --git a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java index ff586d7..5d7be8e 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java @@ -17,6 +17,8 @@ import org.lwjgl.input.Keyboard; */ public abstract class ContainerManager { + // NEW_1_11 stackSize is private. Use: func_190916_E() + /** * The Container to work with. */ @@ -354,6 +356,16 @@ public abstract class ContainerManager { if (index >= 0 && index < container.inventorySlots.size()) { Slot slot = (Slot) (container.inventorySlots.get(index)); + + // NEW_1_11 No Null-Stacks anymore. Empty Stacks with air... + /*ItemStack returnStack = (slot == null) ? null : slot.getStack(); + + if(returnStack.func_190916_E() == 0 && returnStack.getItem() == Item.getItemFromBlock(Blocks.AIR)) { + returnStack = null; + } + + return returnStack;*/ + return (slot == null) ? null : slot.getStack(); } else if (index == -1 && Util.isHoldingStack()) { diff --git a/src/main/java/de/skate702/craftingkeys/util/Util.java b/src/main/java/de/skate702/craftingkeys/util/Util.java index e230040..7687777 100644 --- a/src/main/java/de/skate702/craftingkeys/util/Util.java +++ b/src/main/java/de/skate702/craftingkeys/util/Util.java @@ -43,6 +43,7 @@ public class Util { * @return True, if held stack != null */ public static boolean isHoldingStack() { + // NEW_1_11 return (getHeldStack().func_190916_E() != 0); return (getHeldStack() != null); }