diff --git a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java index f664180..a20c624 100644 --- a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java +++ b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java @@ -1,20 +1,19 @@ package de.skate702.craftingkeys; -// NEW_1_8 cpw.mods.fml => net.minecraftforge.fml -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.InputEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; import de.skate702.craftingkeys.config.Config; import de.skate702.craftingkeys.config.GuiConfig; import de.skate702.craftingkeys.config.GuiConfigHandler; @@ -116,7 +115,7 @@ public class CraftingKeys { */ @SubscribeEvent public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { - if (eventArgs.modID.equals(MODID)) { // NEW_1_9 modID => getModID() + if (eventArgs.getModID().equals(MODID)) { Config.syncConfig(); Logger.info("onConfigChanged(e)", "Changed config."); } @@ -199,4 +198,4 @@ public class CraftingKeys { } } -} \ No newline at end of file +} diff --git a/src/main/java/de/skate702/craftingkeys/config/Config.java b/src/main/java/de/skate702/craftingkeys/config/Config.java index c9d2f70..39154fe 100644 --- a/src/main/java/de/skate702/craftingkeys/config/Config.java +++ b/src/main/java/de/skate702/craftingkeys/config/Config.java @@ -1,8 +1,7 @@ package de.skate702.craftingkeys.config; -// NEW_1_8 cpw.mods.fml => net.minecraftforge.fml -import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import de.skate702.craftingkeys.CraftingKeys; import de.skate702.craftingkeys.util.Logger; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java index fa7c299..1419564 100644 --- a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java +++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java @@ -229,18 +229,11 @@ public class GuiConfig extends GuiScreen { mc.renderEngine.bindTexture(new ResourceLocation(CraftingKeys.MODID, "textures/gui/symbols.png")); drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 200, 0, 50, 50); - //NEW_1.11 - /* drawInfoString(0, 24, 21); drawInfoString(4, 86, 63); drawInfoString(3, 64, 56); drawInfoString(5, 109, 56); - */ - drawInfoString(1, 86, 21); - drawInfoString(4, 86, 58); - drawInfoString(3, 63, 50); - drawInfoString(5, 109, 50); } private void genEnchantmentInfo() { @@ -253,14 +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); - //NEW_1.11 - /* drawInfoString(1, 22, 51); drawInfoString(2, 42, 51); - */ - - drawInfoString(1, 32, 51); - // NEW_1_8 drawInfoString(2, 42, 51); } @@ -306,19 +293,12 @@ 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); - /* 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); - drawInfoString(4, 95, 48); - drawInfoString(5, 113, 48); - drawInfoString(9, 151, 40); } private void genDispenserInfo() { diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfigHandler.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfigHandler.java index 098e392..8358514 100644 --- a/src/main/java/de/skate702/craftingkeys/config/GuiConfigHandler.java +++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfigHandler.java @@ -1,8 +1,7 @@ package de.skate702.craftingkeys.config; -// NEW_1_8 cpw.mods.fml => net.minecraftforge.fml -import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/de/skate702/craftingkeys/config/KeyBindings.java b/src/main/java/de/skate702/craftingkeys/config/KeyBindings.java index 7fad3ac..c4c8fa0 100644 --- a/src/main/java/de/skate702/craftingkeys/config/KeyBindings.java +++ b/src/main/java/de/skate702/craftingkeys/config/KeyBindings.java @@ -1,8 +1,7 @@ package de.skate702.craftingkeys.config; -// NEW_1_8 cpw.mods.fml => net.minecraftforge.fml -import cpw.mods.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java b/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java index f1ed5cc..b5e1729 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/BrewingManager.java @@ -36,8 +36,8 @@ public class BrewingManager extends ContainerManager { @Override protected int specificKeyToSlotIndex() { - //NEW_1.11 return mapKeyToSlot(4, 3, -1, 0, 1, 2, -1, -1, -1); - return mapKeyToSlot(-1, 3, -1, 0, 1, 2, -1, -1, -1); + //TODO: check for v1.11 + return mapKeyToSlot(4, 3, -1, 0, 1, 2, -1, -1, -1); } @Override diff --git a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java index 5d7be8e..3b1b6e6 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java @@ -6,9 +6,12 @@ import de.skate702.craftingkeys.util.InputUtil; import de.skate702.craftingkeys.util.Logger; import de.skate702.craftingkeys.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.settings.KeyBinding; +import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; @@ -17,8 +20,6 @@ import org.lwjgl.input.Keyboard; */ public abstract class ContainerManager { - // NEW_1_11 stackSize is private. Use: func_190916_E() - /** * The Container to work with. */ @@ -100,7 +101,7 @@ public abstract class ContainerManager { // Stack up on hand if equal or small enough, else throw held stack away if (Util.isHoldingStack() && getItemStack(getInteractionSlotIndex()) != null && ( !Util.getHeldStack().isItemEqual(getItemStack(getInteractionSlotIndex())) - || Util.getHeldStack().stackSize + getItemStack(getInteractionSlotIndex()).stackSize + || Util.getHeldStack().getCount() + getItemStack(getInteractionSlotIndex()).getCount() > getItemStack(getInteractionSlotIndex()).getMaxStackSize())) { moveStackToInventory(-1); } @@ -112,9 +113,9 @@ public abstract class ContainerManager { interact(); while (Util.isHoldingStack() && - oldStackSize != Util.getHeldStack().stackSize) { + oldStackSize != Util.getHeldStack().getCount()) { - oldStackSize = Util.getHeldStack().stackSize; + oldStackSize = Util.getHeldStack().getCount(); interact(); } @@ -162,10 +163,9 @@ public abstract class ContainerManager { // hotbar-slots are always the last 9 slots of the currently opened inventory int hotbarStartIndex = Util.client.thePlayer.openContainer.getInventory().size() - 9 - 1; - // NEW_1_9 Player inventory Shield fix - //if (Util.client.currentScreen instanceof GuiInventory) { - // hotbarStartIndex -= 1; - //} + if (Util.client.currentScreen instanceof GuiInventory) { + hotbarStartIndex -= 1; + } int inputdelta; KeyBinding[] hotbar = Util.client.gameSettings.keyBindsHotbar; @@ -286,7 +286,7 @@ public abstract class ContainerManager { if (source == null) { Logger.debug("moveAll(i,i)", "Source ItemStack from Index == null"); } else { - move(srcIndex, destIndex, source.stackSize); + move(srcIndex, destIndex, source.getCount()); } } @@ -313,7 +313,7 @@ public abstract class ContainerManager { } // Test for max. moving Amount - int sourceSize = source.stackSize; + int sourceSize = source.getCount(); int movedAmount = Math.min(amount, sourceSize); // Clear goal slot (May fail on full inventory!); only available if not holdling @@ -358,15 +358,13 @@ public abstract class ContainerManager { 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(); + ItemStack returnStack = (slot == null) ? null : slot.getStack(); - if(returnStack.func_190916_E() == 0 && returnStack.getItem() == Item.getItemFromBlock(Blocks.AIR)) { + if(returnStack.getCount() == 0 && returnStack.getItem() == Item.getItemFromBlock(Blocks.AIR)) { returnStack = null; } - return returnStack;*/ - - return (slot == null) ? null : slot.getStack(); + return returnStack; } else if (index == -1 && Util.isHoldingStack()) { return Util.getHeldStack(); @@ -444,7 +442,7 @@ public abstract class ContainerManager { if (potentialGoalStack != null && stackToMove != null) { if (potentialGoalStack.isItemEqual(stackToMove)) { - if (potentialGoalStack.stackSize + stackToMove.stackSize <= stackToMove.getMaxStackSize()) { + if (potentialGoalStack.getCount() + stackToMove.getCount() <= stackToMove.getMaxStackSize()) { return i; } } diff --git a/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java b/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java index a5a075d..6d88698 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java @@ -36,15 +36,15 @@ public class EnchantmentManager extends ContainerManager { @Override protected int specificKeyToSlotIndex() { - return mapKeyToSlot(-1, 0, -1, -1, 0, -1, -1, -1, -1); - // NEW_1_8 return mapKeyToSlot(-1, 0, 1, -1, 0, 1, -1, -1, -1); + //TODO: check for v1.11 + return mapKeyToSlot(-1, 0, 1, -1, 0, 1, -1, -1, -1); } @Override protected int getInventoryStartIndex() { - return 1; - // NEW_1_8 return 2; + // TODO: check for v1.11 + return 2; } @Override @@ -54,8 +54,8 @@ public class EnchantmentManager extends ContainerManager { @Override protected int[] getDropSlots() { - return new int[]{0}; - // NEW_1_8 return new int[] {0, 1}; + //TODO: check for v1.11 + return new int[] {0, 1}; } @Override diff --git a/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java b/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java index 11599d4..adc801f 100644 --- a/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java +++ b/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java @@ -36,9 +36,8 @@ public class InventoryManager extends ContainerManager { @Override protected int specificKeyToSlotIndex() { - - return mapKeyToSlot(-1, 1, 2, -1, 3, 4, -1, -1, -1); - // NEW_1_9 return mapKeyToSlot(-1, 1, 2, 45, 3, 4, 45, -1, -1); + //TODO: check for v1.11 + return mapKeyToSlot(-1, 1, 2, 45, 3, 4, 45, -1, -1); } @Override diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java index 8cc932d..ba5c9a7 100644 --- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java +++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java @@ -1,9 +1,8 @@ package de.skate702.craftingkeys.proxies; -// NEW_1_9 import net.minecraft.inventory.ClickType; - import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ClickType; /** * Client Proxy, extending Common Proxy. @@ -16,9 +15,7 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy { public void sendSlotClick(PlayerControllerMP controller, int windowId, int slot, int rightClick, int action, EntityPlayer player) { - 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); + controller.windowClick(windowId, slot, rightClick, ClickType.PICKUP, player); } } diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java index ded772e..97ec2c4 100644 --- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java +++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java @@ -1,9 +1,7 @@ package de.skate702.craftingkeys.proxies; -// NEW_1_8 cpw.mods.fml => net.minecraftforge.fml - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java index 77147c6..565d05a 100644 --- a/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java +++ b/src/main/java/de/skate702/craftingkeys/util/LanguageLocalizer.java @@ -1,8 +1,6 @@ package de.skate702.craftingkeys.util; -//NEW_1_9: net.minecraft.util.text.translation.I18n; -//NEW_1_11: net.minecraft.client.resources.I18n; -import net.minecraft.util.StatCollector; +import net.minecraft.client.resources.I18n; public class LanguageLocalizer { /** @@ -12,8 +10,6 @@ public class LanguageLocalizer { * @return localized The localized String */ public static String localize(String unloc) { - //NEW_1_9 return I18n.translateToLocal(unloc); - //NEW_1_9.4: return I18n.format(unloc); - return StatCollector.translateToLocal(unloc); + return I18n.format(unloc); } } diff --git a/src/main/java/de/skate702/craftingkeys/util/Util.java b/src/main/java/de/skate702/craftingkeys/util/Util.java index 7687777..5b9d275 100644 --- a/src/main/java/de/skate702/craftingkeys/util/Util.java +++ b/src/main/java/de/skate702/craftingkeys/util/Util.java @@ -1,12 +1,10 @@ package de.skate702.craftingkeys.util; -// NEW_1_8 cpw.mods.fml => net.minecraftforge.fml -// NEW_1_9 net.minecraft.util.text.TextComponentTranslation; -import cpw.mods.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; /** * Provides basic utility methods. For input methods, look at InputUtil. @@ -42,9 +40,8 @@ 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); + public static boolean isHoldingStack() { + return (getHeldStack().getCount() > 0); } /** @@ -68,8 +65,7 @@ public class Util { * @param lang_key key from lang-file */ public static void printMessage(String lang_key) { - client.thePlayer.addChatMessage(new ChatComponentTranslation(lang_key)); - // NEW_1_9 client.thePlayer.addChatMessage(new TextComponentTranslation(lang_key)); + client.thePlayer.addChatMessage(new TextComponentTranslation(lang_key)); } }