1.12

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -17,7 +17,7 @@ configFile.withReader {
     // read config. it shall from now on be referenced as simply config or as project.config
     def prop = new Properties()
     prop.load(it)
-    ext.config = new ConfigSlurper().parse prop
+    project.ext.config = new ConfigSlurper().parse prop
 }
 
 //y = config.droneAlter as Integer
@@ -33,6 +33,11 @@ version = config.mod_version + "." + config.buildNum
 group= "tv.vanhal.jacb" 
 archivesBaseName = "JACB-" + config.minecraft_version
 
+sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
+}
+
 repositories {
 	maven {
 		url "http://dvs1.progwml6.com/files/maven"
@@ -44,12 +49,12 @@ minecraft {
     runDir = "run"
 
     replace "@VERSION@", project.version
-    mappings = "snapshot_20161220"
+    mappings = config.mappings
 	useDepAts = true
 }
 
 dependencies {
-	deobfCompile "mezz.jei:jei_"+config.minecraft_version+":4.2.10.248"
+	deobfCompile "mezz.jei:jei_1.12:4.+"
 }
 
 processResources

build.properties

@@ -1,5 +1,6 @@
-minecraft_version=1.11.2
-forge_version=13.20.0.2260
+minecraft_version=1.12.2
+forge_version=14.23.2.2613
+mappings=snapshot_20171003
 mod_version=1.0
 buildNum=6
 droneAlter=0

src/main/java/tv/vanhal/jacb/BlockBench.java

@@ -6,15 +6,13 @@
 import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -37,7 +35,7 @@ protected BlockBench() {
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileBench();
 	}
 
@@ -73,7 +71,7 @@ public void dumpItems(World world, BlockPos pos, ItemStack items) {
 		entItem.motionZ = (double)((float)world.rand.nextGaussian() * f3);
 
 		if (items.hasTagCompound()) {
-			entItem.getEntityItem().setTagCompound((NBTTagCompound)items.getTagCompound().copy());
+			entItem.writeToNBT((NBTTagCompound)items.getTagCompound().copy());
         }
 
 		world.spawnEntity(entItem);

src/main/java/tv/vanhal/jacb/JACB.java

@@ -1,24 +1,21 @@
 package tv.vanhal.jacb;
 
+import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import tv.vanhal.jacb.core.Proxy;
-import tv.vanhal.jacb.gui.BenchGUI;
 import tv.vanhal.jacb.gui.SimpleGuiHandler;
 import tv.vanhal.jacb.ref.Ref;
-import net.minecraftforge.fml.client.event.ConfigChangedEvent;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -27,7 +24,6 @@
 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.network.NetworkRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
@@ -71,17 +67,17 @@ public void preInit(FMLPreInitializationEvent event) {
 
 		//Initialise the block
 		bench = new BlockBench();
-		GameRegistry.register(bench);
-		GameRegistry.register(new ItemBlock(bench).setRegistryName(bench.getRegistryName()));
+		GameRegistry.findRegistry(Block.class).register(bench);
+		GameRegistry.findRegistry(Item.class).register(new ItemBlock(bench).setRegistryName(bench.getRegistryName()));
 
 		//set recipes
 		ShapelessOreRecipe recipe;
 		if (config.getBoolean("straightSwap", "General", true, "JACB Crafting tables can be crafted by putting a vanilla crafting bench in a crafting grid, other wise it requires a chest as well")) {
-			recipe = new ShapelessOreRecipe(new ItemStack(bench), Blocks.CRAFTING_TABLE);
+			recipe = new ShapelessOreRecipe(null, new ItemStack(bench), Blocks.CRAFTING_TABLE);
 		} else {
-			recipe = new ShapelessOreRecipe(new ItemStack(bench), Blocks.CRAFTING_TABLE, Blocks.CHEST);
+			recipe = new ShapelessOreRecipe(null, new ItemStack(bench), Blocks.CRAFTING_TABLE, Blocks.CHEST);
 		}
-		GameRegistry.addRecipe(recipe);
+		GameRegistry.findRegistry(IRecipe.class).register(recipe.setRegistryName(bench.getRegistryName()));
 
 		config.save();
 	}

src/main/java/tv/vanhal/jacb/TileBench.java

@@ -5,7 +5,6 @@
 import net.minecraft.inventory.ItemStackHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.ITextComponent;

src/main/java/tv/vanhal/jacb/compat/JeiHandler.java

@@ -1,10 +1,8 @@
 package tv.vanhal.jacb.compat;
 
-import mezz.jei.api.IJeiHelpers;
 import mezz.jei.api.IJeiRuntime;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
-import mezz.jei.api.IRecipeRegistry;
 import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.JEIPlugin;
 import mezz.jei.api.ingredients.IModIngredientRegistration;

src/main/java/tv/vanhal/jacb/core/ClientProxy.java

@@ -1,8 +1,5 @@
 package tv.vanhal.jacb.core;
 
-import net.minecraftforge.fml.client.registry.ClientRegistry;
-import tv.vanhal.jacb.compat.JeiHandler;
-
 public class ClientProxy extends Proxy {
 
 	@Override

src/main/java/tv/vanhal/jacb/gui/BenchContainer.java

@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryCraftResult;
@@ -11,7 +10,6 @@
 import net.minecraft.inventory.SlotCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
-import tv.vanhal.jacb.JACB;
 import tv.vanhal.jacb.TileBench;
 
 public class BenchContainer extends Container {
@@ -39,7 +37,7 @@ public BenchContainer(InventoryPlayer inv, TileBench tile) {
 
 	public void onCraftMatrixChanged(IInventory inv) {
 		craftResult.setInventorySlotContents(0, 
-    			CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, bench.getWorld()));
+    			CraftingManager.findMatchingResult(this.craftMatrix, bench.getWorld()));
     	if (init) updateTile();
     }
 

src/main/java/tv/vanhal/jacb/gui/BenchGUI.java

@@ -5,7 +5,6 @@
 import tv.vanhal.jacb.TileBench;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.translation.I18n;
 
@@ -18,8 +17,8 @@ public BenchGUI(InventoryPlayer inv, TileBench tile) {
 
 	@Override
 	protected void drawGuiContainerForegroundLayer(int x, int y) {
-		this.fontRendererObj.drawString(I18n.translateToLocal("container.bettercrafting"), 28, 6, 0x404040);
-		this.fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, 74, 0x404040);
+		this.fontRenderer.drawString(I18n.translateToLocal("container.bettercrafting"), 28, 6, 0x404040);
+		this.fontRenderer.drawString(I18n.translateToLocal("container.inventory"), 8, 74, 0x404040);
 	}
 
 	@Override

src/main/java/tv/vanhal/jacb/gui/SimpleGuiHandler.java

@@ -2,7 +2,6 @@
 
 import tv.vanhal.jacb.TileBench;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.network.IGuiHandler;

src/main/resources/assets/jacb/blockstates/betterBench.json → src/main/resources/assets/jacb/blockstates/betterbench.json

@@ -1,7 +1,7 @@
 {
     "forge_marker": 1,
     "defaults": {
-        "model": "jacb:betterBench"
+        "model": "jacb:betterbench"
     },
     "variants": {
         "normal": [{}],

src/main/resources/assets/jacb/lang/de_DE.lang

@@ -1,3 +1,3 @@
 itemGroup.JACB=JACB
 container.bettercrafting=Besseres Handwerk
-tile.betterBench.name=JACB Werkbank
+tile.betterbench.name=JACB Werkbank

src/main/resources/assets/jacb/lang/en_US.lang

@@ -1,3 +1,3 @@
 itemGroup.JACB=JACB
 container.bettercrafting=Better Crafting
-tile.betterBench.name=JACB Crafting Table
+tile.betterbench.name=JACB Crafting Table

src/main/resources/assets/jacb/lang/nl_NL.lang

@@ -1,3 +1,3 @@
 itemGroup.JACB=JACB
 container.bettercrafting=Verbeterde werkbank
-tile.betterBench.name=JACB Werkbank
+tile.betterbench.name=JACB Werkbank

src/main/resources/assets/jacb/lang/zh_CN.lang

@@ -1,3 +1,3 @@
 itemGroup.JACB=更好的工作台
 container.bettercrafting=更好的工作台
-tile.betterBench.name=更好的工作台
+tile.betterbench.name=更好的工作台