Initial 1.12 port

Author: rubensworks

.travis.yml

@@ -1,5 +1,5 @@
 language: java
-jdk: openjdk7
+jdk: oraclejdk8
 notifications:
   email: false
   slack:

build.gradle

@@ -8,14 +8,14 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 
 plugins {
     // For people who want stable
     //id "net.minecraftforge.gradle.forge" version "2.0.2"
-    id 'com.matthewprenger.cursegradle' version '1.0.5'
+    id 'com.matthewprenger.cursegradle' version '1.0.9'
 }
 
 // For those who want the bleeding edge
@@ -26,8 +26,8 @@ loadProperties()
 version = config.mod_version
 group = "org.cyclops.structuredcrafting"
 archivesBaseName = "StructuredCrafting"
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 def loadProperties() {
     // Config file with custom properties

build.properties

@@ -1,6 +1,6 @@
 mod_version=0.1.7
-minecraft_version=1.11.2
-forge_version=13.20.0.2201
-mcp_mappings_version=snapshot_20161206
-cyclopscore_version=0.9.1-476
+minecraft_version=1.12
+forge_version=14.21.0.2343
+mcp_mappings_version=snapshot_20170620
+cyclopscore_version=0.10.6-584
 release_type=release

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

@@ -19,10 +19,10 @@ public final class Reference {
     // MOD ID's
     public static final String MOD_FORGE = "forge";
     public static final String MOD_FORGE_VERSION = "@FORGE_VERSION@";
-    public static final String MOD_FORGE_VERSION_MIN = "13.20.0.2201";
+    public static final String MOD_FORGE_VERSION_MIN = "14.21.0.2343";
     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.9.1";
+    public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.10.6";
 
     // Dependencies
     public static final String MOD_DEPENDENCIES =

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

@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
@@ -113,14 +114,17 @@ public boolean craft(boolean simulate) {
                         providers[arrayIndex] = result != null ? result.getRight() : null;
                     }
                 }
-                itemStack = CraftingManager.getInstance().findMatchingRecipe(INVENTORY_CRAFTING, world);
+                IRecipe recipe = CraftingManager.findMatchingRecipe(INVENTORY_CRAFTING, world);
+                if (recipe != null) {
+                    itemStack = recipe.getCraftingResult(INVENTORY_CRAFTING);
+                }
             }
         }
 
         // Determine output
         if(!itemStack.isEmpty() && addItemStackForOutput(world, targetPos, targetSide, outputProviders, itemStack, simulate)) {
             // Handle remaining container items: place blocks and drop items
-            NonNullList<ItemStack> remainingStacks = CraftingManager.getInstance().getRemainingItems(INVENTORY_CRAFTING, world);
+            NonNullList<ItemStack> remainingStacks = CraftingManager.getRemainingItems(INVENTORY_CRAFTING, world);
             for(int i = 0; i < remainingStacks.size(); i++) {
                 ItemStack remainingStack = remainingStacks.get(i);
                 if(providers[i] != null) {