Meduris/CraftingKeys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14 from MTRNord/patch-1

Browse Source 
Update to newest 1.11 forge version
This commit is contained in:
Sebastian
2016-12-15 16:04:02 +01:00
committed by GitHub
parent 7e912a9b1c 062e5ba144
commit 96682b3231
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
+8 -9
View File
@@ -290,15 +290,6 @@ public class GuiConfig extends GuiScreen {
GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glColor4f(1F, 1F, 1F, 1F);
mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png"));
drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 100, 100, 50, 50); 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(4, 43, 57);
drawInfoString(5, 69, 57); drawInfoString(5, 69, 57);
@@ -314,6 +305,14 @@ public class GuiConfig extends GuiScreen {
GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glColor4f(1F, 1F, 1F, 1F);
mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png"));
drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 0, 0, 50, 50); 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(1, 95, 30);
drawInfoString(2, 113, 30); drawInfoString(2, 113, 30);
src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java
+2 -1
View File
@@ -18,6 +18,7 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy {
controller.windowClick(windowId, slot, rightClick, action, player); controller.windowClick(windowId, slot, rightClick, action, player);
// NEW_1_9 controller.func_187098_a(windowId, slot, rightClick, ClickType.PICKUP, 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);
} }
} }
src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java
+1 -1
View File
@@ -1,7 +1,7 @@
package de.skate702.craftingkeys.util; package de.skate702.craftingkeys.util;
//NEW_1_9: net.minecraft.util.text.translation.I18n; //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; import net.minecraft.util.StatCollector;
public class LanguageLocalizer { public class LanguageLocalizer {