From 9328e9b5695b8760491a2507f80196db9e053e73 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 14 Dec 2016 19:16:58 +0100 Subject: [PATCH 1/3] Update to newest 1.11 forge version --- .../java/de/skate702/craftingkeys/util/LanguageLocalizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java index fe0094b..77147c6 100644 --- a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java +++ b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java @@ -1,7 +1,7 @@ package de.skate702.craftingkeys.util; //NEW_1_9: net.minecraft.util.text.translation.I18n; -//NEW:1.9.4: import static net.minecraft.client.resources.I18n.format; +//NEW_1_11: net.minecraft.client.resources.I18n; import net.minecraft.util.StatCollector; public class LanguageLocalizer { From 3784bd1bba7f11f1c40fdc6bb95890e2eb6c3c8f Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 14 Dec 2016 19:24:24 +0100 Subject: [PATCH 2/3] windowClick wurde wieder implementiert func_187098_a() wurde wieder mit windowClick() in 1.11 ersetzt --- .../skate702/craftingkeys/proxies/CraftingKeysClientProxy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java index 6beed67..8cc932d 100644 --- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java +++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java @@ -18,6 +18,7 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy { controller.windowClick(windowId, slot, rightClick, action, player); // NEW_1_9 controller.func_187098_a(windowId, slot, rightClick, ClickType.PICKUP, player); + // NEW_1_11 controller.windowClick(windowId, slot, rightClick, ClickType.PICKUP, player); } -} \ No newline at end of file +} From 062e5ba1445a0e6d2b5d3c7ed4918b8234980d58 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 14 Dec 2016 21:45:37 +0100 Subject: [PATCH 3/3] Remove wrong Villager update and fix Inventory for 1.11 --- .../skate702/craftingkeys/config/GuiConfig.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java index c7bf0c9..fa7c299 100644 --- a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java +++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java @@ -290,15 +290,6 @@ public class GuiConfig extends GuiScreen { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 100, 100, 50, 50); - - //NEW_1.11 - /* - drawInfoString(1, 105, 22); - drawInfoString(2, 123, 22); - drawInfoString(4, 105, 40); - drawInfoString(5, 123, 40); - drawInfoString(9, 161, 32); - */ drawInfoString(4, 43, 57); drawInfoString(5, 69, 57); @@ -314,6 +305,14 @@ public class GuiConfig extends GuiScreen { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 0, 0, 50, 50); + + /* NEW_1_11 + drawInfoString(1, 105, 22); + drawInfoString(2, 123, 22); + drawInfoString(4, 105, 40); + drawInfoString(5, 123, 40); + drawInfoString(9, 164, 32); + */ drawInfoString(1, 95, 30); drawInfoString(2, 113, 30);