Port to Minecraft 1.9

Author: rubensworks

build.properties

@@ -1,5 +1,6 @@
 mod_version=0.1.3
-minecraft_version=1.8.9
-forge_version=11.15.1.1722
-cyclopscore_version=0.5.1-249
+minecraft_version=1.9
+forge_version=12.16.0.1767-1.9
+mcp_mappings_version=snapshot_20160312
+cyclopscore_version=0.5.2-255
 release_type=release

gradle/forge.gradle

@@ -36,7 +36,7 @@ minecraft {
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not allways work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20151230"
+    mappings = "${config.mcp_mappings_version}"
 }
 
 if (project.buildnumber.equals("RELEASE"))

src/main/java/org/cyclops/structuredcrafting/Reference.java

@@ -22,7 +22,7 @@ public final class Reference {
     public static final String MOD_FORGE_VERSION_MIN = "11.15.1.1722";
     public static final String MOD_CYCLOPSCORE = "cyclopscore";
     public static final String MOD_CYCLOPSCORE_MINVERSION = "@CYCLOPSCORE_VERSION@";
-    public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.5.0";
+    public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.5.2";
 
     // Dependencies
     public static final String MOD_DEPENDENCIES =

src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java

@@ -1,14 +1,17 @@
 package org.cyclops.structuredcrafting.block;
 
 import com.google.common.collect.Lists;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyDirection;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
-import net.minecraft.util.BlockPos;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.cyclops.cyclopscore.block.property.BlockProperty;
 import org.cyclops.cyclopscore.config.configurable.ConfigurableBlockContainer;
@@ -42,7 +45,7 @@ public BlockStructuredCrafter(ExtendedConfig eConfig) {
         super(eConfig, Material.ground, TileStructuredCrafter.class);
 
         setHardness(2.0F);
-        setStepSound(soundTypeStone);
+        setStepSound(SoundType.STONE);
     }
 
     @Override
@@ -52,11 +55,11 @@ public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing,
     }
 
     @Override
-    public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) {
-        if(playerIn != null && playerIn.getHeldItem() != null && playerIn.getHeldItem().getItem() == Items.stick) {
+    public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+        if(playerIn != null && heldItem != null && heldItem.getItem() == Items.stick) {
             this.rotateBlock(worldIn, pos, side);
         }
-        return super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ);
+        return super.onBlockActivated(worldIn, pos, state, playerIn, hand, heldItem, side, hitX, hitY, hitZ);
     }
 
 }

src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java

@@ -3,7 +3,7 @@
 import com.google.common.collect.Lists;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.Pair;

src/main/java/org/cyclops/structuredcrafting/craft/provider/IItemStackProvider.java

@@ -1,7 +1,7 @@
 package org.cyclops.structuredcrafting.craft.provider;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 

src/main/java/org/cyclops/structuredcrafting/craft/provider/InventoryItemStackProvider.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import net.minecraftforge.items.CapabilityItemHandler;

src/main/java/org/cyclops/structuredcrafting/craft/provider/WorldItemStackProvider.java

@@ -4,7 +4,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import org.cyclops.cyclopscore.helper.ItemStackHelpers;
@@ -32,7 +32,7 @@ public ItemStack getItemStack(World world, BlockPos pos, EnumFacing side) {
         if(blockState != null) {
             Item item = Item.getItemFromBlock(blockState.getBlock());
             if(item != null) {
-                itemStack = new ItemStack(item, 1, blockState.getBlock().getDamageValue(world, pos));
+                itemStack = new ItemStack(item, 1, blockState.getBlock().damageDropped(blockState));
             }
         }
         return itemStack;