Partial update to MC 1.11, looks like WrappedStack and how energy val…

…ues are calculated will need some love
pahimar · Dec 9, 2016 · 889f094 · 889f094
1 parent 120ad36
commit 889f094
Show file tree

Hide file tree

Showing 36 changed files with 113 additions and 167 deletions.
diff --git a/build.gradle b/build.gradle
@@ -75,7 +75,7 @@ minecraft {
 
 dependencies {
     deobfCompile "mezz.jei:jei_${minecraft_version}:${dep_jei_version}"
-    deobfCompile "mcp.mobius.waila:Waila:${dep_waila_version}"
+//    deobfCompile "mcp.mobius.waila:Waila:${dep_waila_version}"
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Build related properties
-minecraft_version = 1.10.2
-forge_version = 12.18.2.2125
-mcp_mappings_version = snapshot_20161111
+minecraft_version = 1.11
+forge_version = 13.19.1.2188
+mcp_mappings_version = snapshot_20161209
 curseforge_plugin_version = 1.0.7
 
 # Mod related properties
@@ -12,5 +12,5 @@ api_version = 1.5.0
 mod_release_type = beta
 
 # Mod dependency related properties
-dep_jei_version = 3.13.0.335
+dep_jei_version = 4.0.5.202
 dep_waila_version = 1.7.0-B3_1.9.4
diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
@@ -17,7 +17,6 @@
         name = "Equivalent Exchange 3",
         certificateFingerprint = EquivalentExchange3.FINGERPRINT,
         version = "@MOD_VERSION@",
-        dependencies = "required-after:Forge@[12.18.1,)",
         guiFactory = "com.pahimar.ee3.client.gui.GuiFactory",
         updateJSON = "http://ee3.pahimar.com/update/versions.json")
 public class EquivalentExchange3 {

diff --git a/src/main/java/com/pahimar/ee3/api/recipe/InfusionRecipe.java b/src/main/java/com/pahimar/ee3/api/recipe/InfusionRecipe.java
@@ -3,6 +3,7 @@
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 
 import javax.annotation.Nullable;
@@ -32,7 +33,7 @@ public ItemStack getRecipeOutput() {
     }
 
     @Override
-    public ItemStack[] getRemainingItems(InventoryCrafting inventory) {
-        return new ItemStack[0];
+    public NonNullList<ItemStack> getRemainingItems(InventoryCrafting inventory) {
+        return NonNullList.withSize(inventory.getSizeInventory(), ItemStack.EMPTY);
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java b/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java
@@ -9,6 +9,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
@@ -100,7 +101,7 @@ else if (state.getValue(FACING) == EnumFacing.WEST) {
     }
 
     @Override
-    public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) {
+    public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
         return this.getDefaultState().withProperty(FACING, facing);
     }
 

diff --git a/src/main/java/com/pahimar/ee3/block/BlockInfusedStoneSlab.java b/src/main/java/com/pahimar/ee3/block/BlockInfusedStoneSlab.java
@@ -6,6 +6,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -34,7 +35,7 @@ protected BlockStateContainer createBlockState() {
     }
 
     @Override
-    public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) {
+    public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
         return this.getDefaultState().withProperty(FACING, facing);
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/client/gui/base/GuiBase.java b/src/main/java/com/pahimar/ee3/client/gui/base/GuiBase.java
@@ -282,7 +282,7 @@ public Slot getSlotAtPosition(int rawMouseX, int rawMouseY) {
     }
 
     public boolean isMouseOverSlot(Slot slot, int rawMouseX, int rawMouseY) {
-        return this.isMouseOverSlot(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, rawMouseX, rawMouseY);
+        return this.isMouseOverSlot(slot.xPos, slot.yPos, 16, 16, rawMouseX, rawMouseY);
     }
 
 

diff --git a/src/main/java/com/pahimar/ee3/client/handler/KeyInputEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/KeyInputEventHandler.java
@@ -45,7 +45,7 @@ public void handleKeyInputEvent(InputEvent.KeyInputEvent event) {
             EntityPlayer entityPlayer = FMLClientHandler.instance().getClientPlayerEntity();
 
             if (entityPlayer.getHeldItemMainhand() != null && entityPlayer.getHeldItemMainhand().getItem() instanceof IKeyBound) {
-                if (entityPlayer.worldObj.isRemote) {
+                if (entityPlayer.getEntityWorld().isRemote) {
                     Network.INSTANCE.sendToServer(new MessageKeyPressed(getPressedKeybinding()));
                 }
                 else {

diff --git a/src/main/java/com/pahimar/ee3/command/CommandEE.java b/src/main/java/com/pahimar/ee3/command/CommandEE.java
@@ -18,12 +18,12 @@ public class CommandEE extends CommandBase {
     private static List<String> commands = new ArrayList<>();
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.BASE_COMMAND;
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.BASE_COMMAND_USAGE;
     }
 
@@ -36,7 +36,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
             for (CommandBase command : modCommands) {
 
-                if (command.getCommandName().equalsIgnoreCase(args[0]) && command.checkPermission(server, sender)) {
+                if (command.getName().equalsIgnoreCase(args[0]) && command.checkPermission(server, sender)) {
                     found = true;
                     command.execute(server, sender, args);
                 }
@@ -49,15 +49,15 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos pos) {
+    public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos pos) {
 
         if (args.length == 1) {
             return getListOfStringsMatchingLastWord(args, commands);
         }
         else if (args.length >= 2) {
             for (CommandBase command : modCommands) {
-                if (command.getCommandName().equalsIgnoreCase(args[0])) {
-                    return command.getTabCompletionOptions(server, sender, args, pos);
+                if (command.getName().equalsIgnoreCase(args[0])) {
+                    return command.getTabCompletions(server, sender, args, pos);
                 }
             }
         }
@@ -78,6 +78,6 @@ else if (args.length >= 2) {
         modCommands.add(new CommandRegenEnergyValues());
         modCommands.add(new CommandRunTest());
 
-        commands.addAll(modCommands.stream().map(ICommand::getCommandName).collect(Collectors.toList()));
+        commands.addAll(modCommands.stream().map(ICommand::getName).collect(Collectors.toList()));
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/command/CommandPlayerForgetEverything.java b/src/main/java/com/pahimar/ee3/command/CommandPlayerForgetEverything.java
@@ -18,7 +18,7 @@
 public class CommandPlayerForgetEverything extends CommandBase {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.PLAYER_FORGET_EVERYTHING;
     }
 
@@ -28,7 +28,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.PLAYER_FORGET_EVERYTHING_USAGE;
     }
 
@@ -49,10 +49,10 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos blockPos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos blockPos) {
 
         if (args.length == 2) {
-            return getListOfStringsMatchingLastWord(args, FMLCommonHandler.instance().getMinecraftServerInstance().getAllUsernames());
+            return getListOfStringsMatchingLastWord(args, FMLCommonHandler.instance().getMinecraftServerInstance().getOnlinePlayerNames());
         }
 
         return null;

diff --git a/src/main/java/com/pahimar/ee3/command/CommandPlayerForgetItem.java b/src/main/java/com/pahimar/ee3/command/CommandPlayerForgetItem.java
@@ -21,7 +21,7 @@
 public class CommandPlayerForgetItem extends CommandBase {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.PLAYER_FORGET_ITEM;
     }
 
@@ -31,7 +31,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.PLAYER_FORGET_ITEM_USAGE;
     }
 
@@ -69,10 +69,10 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
 
         if (args.length == 2) {
-            return getListOfStringsMatchingLastWord(args, FMLCommonHandler.instance().getMinecraftServerInstance().getAllUsernames());
+            return getListOfStringsMatchingLastWord(args, FMLCommonHandler.instance().getMinecraftServerInstance().getOnlinePlayerNames());
         }
         else if (args.length == 3) {
             return getListOfStringsMatchingLastWord(args, Item.REGISTRY.getKeys());

diff --git a/src/main/java/com/pahimar/ee3/command/CommandPlayerLearnItem.java b/src/main/java/com/pahimar/ee3/command/CommandPlayerLearnItem.java
@@ -22,7 +22,7 @@
 public class CommandPlayerLearnItem extends CommandBase {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.PLAYER_LEARN_ITEM;
     }
 
@@ -32,7 +32,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.PLAYER_LEARN_ITEM_USAGE;
     }
 
@@ -73,10 +73,10 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos blockPos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos blockPos) {
 
         if (args.length == 2) {
-            return getListOfStringsMatchingLastWord(args, FMLCommonHandler.instance().getMinecraftServerInstance().getAllUsernames());
+            return getListOfStringsMatchingLastWord(args, FMLCommonHandler.instance().getMinecraftServerInstance().getOnlinePlayerNames());
         }
         else if (args.length == 3) {
             return getListOfStringsMatchingLastWord(args, Item.REGISTRY.getKeys());

diff --git a/src/main/java/com/pahimar/ee3/command/CommandRegenEnergyValues.java b/src/main/java/com/pahimar/ee3/command/CommandRegenEnergyValues.java
@@ -24,7 +24,7 @@ public class CommandRegenEnergyValues extends CommandBase {
     private static Map<UUID, Long> requesterMap = new HashMap<>();
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.REGEN_ENERGY_VALUES;
     }
 
@@ -34,7 +34,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.SYNC_ENERGY_VALUES_USAGE;
     }
 
@@ -65,7 +65,7 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
             LogHelper.info(EnergyValueRegistry.ENERGY_VALUE_MARKER, "Regenerating energy values at {}'s request", commandSender.getName());
             EnergyValueRegistry.INSTANCE.compute();
             Network.INSTANCE.sendToAll(new MessageSyncEnergyValues());
-            commandSender.addChatMessage(new TextComponentTranslation(Messages.Commands.REGEN_ENERGY_VALUES_SUCCESS));
+            commandSender.sendMessage(new TextComponentTranslation(Messages.Commands.REGEN_ENERGY_VALUES_SUCCESS));
         }
         else {
             throw new WrongUsageException(Messages.Commands.REGEN_ENERGY_VALUES_DENIED, coolDown / 1000f);

diff --git a/src/main/java/com/pahimar/ee3/command/CommandRunTest.java b/src/main/java/com/pahimar/ee3/command/CommandRunTest.java
@@ -22,7 +22,7 @@
 public class CommandRunTest extends CommandEE {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.RUN_TEST;
     }
 
@@ -32,7 +32,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.RUN_TEST_USAGE;
     }
 
@@ -55,10 +55,10 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
                 }
 
                 if (testFound) {
-                    commandSender.addChatMessage(new TextComponentTranslation(Messages.Commands.RUN_TESTS_SUCCESS, args[1]));
+                    commandSender.sendMessage(new TextComponentTranslation(Messages.Commands.RUN_TESTS_SUCCESS, args[1]));
                 }
                 else {
-                    commandSender.addChatMessage(new TextComponentTranslation(Messages.Commands.RUN_TESTS_NOT_FOUND, args[1]));
+                    commandSender.sendMessage(new TextComponentTranslation(Messages.Commands.RUN_TESTS_NOT_FOUND, args[1]));
                 }
             }
             else {
@@ -71,7 +71,7 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
 
         if (args.length == 2) {
 

diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java
@@ -26,7 +26,7 @@
 public class CommandSetEnergyValue extends CommandBase {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.SET_ENERGY_VALUE;
     }
 
@@ -36,7 +36,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.SET_ENERGY_VALUE_USAGE;
     }
 
@@ -106,7 +106,7 @@ else if (Float.compare(newEnergyValue.getValue(), 0) == 0) {
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
 
         if (args.length == 2) {
             return getListOfStringsMatchingLastWord(args, "pre", "post");

diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java
@@ -21,7 +21,7 @@
 public class CommandSetItemLearnable extends CommandBase {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.SET_ITEM_LEARNABLE;
     }
 
@@ -31,7 +31,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.SET_ITEM_LEARNABLE_USAGE;
     }
 
@@ -68,7 +68,7 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
 
         if (args.length == 2) {
             return getListOfStringsMatchingLastWord(args, Item.REGISTRY.getKeys());

diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java
@@ -21,7 +21,7 @@
 public class CommandSetItemNotLearnable extends CommandBase {
 
     @Override
-    public String getCommandName() {
+    public String getName() {
         return Names.Commands.SET_ITEM_NOT_LEARNABLE;
     }
 
@@ -31,7 +31,7 @@ public int getRequiredPermissionLevel() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender) {
+    public String getUsage(ICommandSender commandSender) {
         return Messages.Commands.SET_ITEM_NOT_LEARNABLE_USAGE;
     }
 
@@ -69,7 +69,7 @@ public void execute(MinecraftServer minecraftServer, ICommandSender commandSende
     }
 
     @Override
-    public List<String> getTabCompletionOptions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
+    public List<String> getTabCompletions(MinecraftServer minecraftServer, ICommandSender commandSender, String[] args, @Nullable BlockPos pos) {
 
         if (args.length == 2) {
             return getListOfStringsMatchingLastWord(args, Item.REGISTRY.getKeys());