From 574142ca846bc77574bffbcf5a100482ad96daf8 Mon Sep 17 00:00:00 2001 From: Kirsty McNaught Date: Fri, 2 Jun 2017 13:36:26 +0100 Subject: [PATCH] Fix remaining errors in v1.11 --- src/main/java/de/skate702/craftingkeys/CraftingKeys.java | 6 +++--- .../java/de/skate702/craftingkeys/config/GuiConfig.java | 4 ++-- .../skate702/craftingkeys/manager/ContainerManager.java | 4 ++-- .../java/de/skate702/craftingkeys/util/InputUtil.java | 4 ++-- src/main/java/de/skate702/craftingkeys/util/Util.java | 9 +++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java index a20c624..489e4c2 100644 --- a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java +++ b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java @@ -101,9 +101,9 @@ public class CraftingKeys { public void onKeyInput(InputEvent.KeyInputEvent event) { if (KeyBindings.openGuiBinding.isPressed()) { Logger.info("onKeyInput(e)", "Open Crafting Keys Config Gui."); - Util.client.thePlayer.openGui(instance, GuiConfig.GuiID, Util.client.theWorld, - ((int) Util.client.thePlayer.posX), (int) Util.client.thePlayer.posY, - (int) Util.client.thePlayer.posZ); + Util.client.player.openGui(instance, GuiConfig.GuiID, Util.client.world, + ((int) Util.client.player.posX), (int) Util.client.player.posY, + (int) Util.client.player.posZ); } } diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java index 1419564..9b9be38 100644 --- a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java +++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java @@ -142,11 +142,11 @@ public class GuiConfig extends GuiScreen { public void actionPerformed(GuiButton button) { if (button.id == buttonAbortID) { Logger.info("actionPerformed(b)", "Closing Crafting Keys GUI now!"); - mc.thePlayer.closeScreen(); + mc.player.closeScreen(); } else if (button.id == buttonSaveID) { save(); Logger.info("actionPerformed(b)", "Saving & closing Crafting Keys GUI now!"); - mc.thePlayer.closeScreen(); + mc.player.closeScreen(); } else if (button.id >= 0 && button.id <= 11) { if (selectedButtonID == -1) { selectedButtonID = button.id; diff --git a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java index 3b1b6e6..10a4a7d 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java @@ -161,7 +161,7 @@ public abstract class ContainerManager { void handleNumKey(Slot currentHoveredSlot) { // hotbar-slots are always the last 9 slots of the currently opened inventory - int hotbarStartIndex = Util.client.thePlayer.openContainer.getInventory().size() - 9 - 1; + int hotbarStartIndex = Util.client.player.openContainer.getInventory().size() - 9 - 1; if (Util.client.currentScreen instanceof GuiInventory) { hotbarStartIndex -= 1; @@ -505,7 +505,7 @@ public abstract class ContainerManager { int rightClickData = (rightClick) ? 1 : 0; CraftingKeys.proxy.sendSlotClick(Util.client.playerController, container.windowId, index, - rightClickData, 0, Util.client.thePlayer); + rightClickData, 0, Util.client.player); } diff --git a/src/main/java/de/skate702/craftingkeys/util/InputUtil.java b/src/main/java/de/skate702/craftingkeys/util/InputUtil.java index dd9de4c..98e0c91 100644 --- a/src/main/java/de/skate702/craftingkeys/util/InputUtil.java +++ b/src/main/java/de/skate702/craftingkeys/util/InputUtil.java @@ -61,8 +61,8 @@ public class InputUtil { // Constants from Minecraft Source Code x -= (guiContainer.width - 176) / 2; y -= (guiContainer.height - 166) / 2; - return x >= slot.xDisplayPosition - 1 && x < slot.xDisplayPosition + 16 + 1 - && y >= slot.yDisplayPosition - 1 && y < slot.yDisplayPosition + 16 + 1; + return x >= slot.xPos - 1 && x < slot.xPos + 16 + 1 + && y >= slot.yPos - 1 && y < slot.yPos + 16 + 1; } else { return false; } diff --git a/src/main/java/de/skate702/craftingkeys/util/Util.java b/src/main/java/de/skate702/craftingkeys/util/Util.java index 5b9d275..3ac14e6 100644 --- a/src/main/java/de/skate702/craftingkeys/util/Util.java +++ b/src/main/java/de/skate702/craftingkeys/util/Util.java @@ -32,7 +32,7 @@ public class Util { * @return A item stack */ public static ItemStack getHeldStack() { - return client.thePlayer.inventory.getItemStack(); + return client.player.inventory.getItemStack(); } /** @@ -50,10 +50,10 @@ public class Util { * @return True, if this is the first tick */ public static boolean isFirstInWorldTick() { - if (firstInWorldTick && client.theWorld != null) { + if (firstInWorldTick && client.world != null) { firstInWorldTick = false; return true; - } else if (client.theWorld == null) { + } else if (client.world == null) { firstInWorldTick = true; } return false; @@ -65,7 +65,8 @@ public class Util { * @param lang_key key from lang-file */ public static void printMessage(String lang_key) { - client.thePlayer.addChatMessage(new TextComponentTranslation(lang_key)); + String translated = (new TextComponentTranslation(lang_key)).getUnformattedComponentText(); + client.player.sendChatMessage(translated); } }