From 923e391361ee3bbcb98490efb0c52b852325772e Mon Sep 17 00:00:00 2001 From: MTRNord Date: Sat, 19 Nov 2016 23:50:38 +0100 Subject: [PATCH] Fix GUI and update to correct translate function --- .../craftingkeys/config/GuiConfig.java | 21 ++++++++++--------- .../craftingkeys/manager/BrewingManager.java | 2 +- .../craftingkeys/util/LanguageLocalizer.java | 7 ++++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java index 15e88f1..93b59da 100644 --- a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java +++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java @@ -230,9 +230,10 @@ public class GuiConfig extends GuiScreen { drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 200, 0, 50, 50); drawInfoString(1, 86, 21); - drawInfoString(4, 86, 58); - drawInfoString(3, 63, 50); - drawInfoString(5, 109, 50); + drawInfoString(0, 24, 21); + drawInfoString(4, 86, 63); + drawInfoString(3, 64, 56); + drawInfoString(5, 109, 56); } private void genEnchantmentInfo() { @@ -245,8 +246,8 @@ public class GuiConfig extends GuiScreen { mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 150, 50, 50, 50); - drawInfoString(1, 32, 51); - // NEW_1_8 drawInfoString(2, 42, 51); + drawInfoString(1, 22, 51); + drawInfoString(2, 42, 51); } @@ -292,11 +293,11 @@ public class GuiConfig extends GuiScreen { mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 0, 0, 50, 50); - drawInfoString(1, 95, 30); - drawInfoString(2, 113, 30); - drawInfoString(4, 95, 48); - drawInfoString(5, 113, 48); - drawInfoString(9, 151, 40); + drawInfoString(1, 105, 22); + drawInfoString(2, 123, 22); + drawInfoString(4, 105, 40); + drawInfoString(5, 123, 40); + drawInfoString(9, 161, 32); } private void genDispenserInfo() { diff --git a/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java b/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java index 2530c5d..09ad865 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java @@ -36,7 +36,7 @@ public class BrewingManager extends ContainerManager { @Override protected int specificKeyToSlotIndex() { - return mapKeyToSlot(-1, 3, -1, 0, 1, 2, -1, -1, -1); + return mapKeyToSlot(4, 3, -1, 0, 1, 2, -1, -1, -1); } @Override diff --git a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java index d74642d..20aadf0 100644 --- a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java +++ b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java @@ -1,8 +1,8 @@ package de.skate702.craftingkeys.util; //NEW_1_9: net.minecraft.util.text.translation.I18n; - -import net.minecraft.util.StatCollector; +//NEW:1.9.4: import static net.minecraft.client.resources.I18n.format; +import static net.minecraft.client.resources.I18n.format; public class LanguageLocalizer { /** @@ -13,6 +13,7 @@ public class LanguageLocalizer { */ public static String localize(String unloc) { //NEW_1_9 return I18n.translateToLocal(unloc); - return StatCollector.translateToLocal(unloc); + //NEW_1_9.4: return I18n.format(unloc); + return format(unloc); } }