Merge branch '1.9'

build.properties

@@ -1,6 +1,6 @@
 mod_version=1.5.0
-minecraft_version=1.9
-forge_version=12.16.1.1896
-mappings=snapshot_20160312
+minecraft_version=1.9.4
+forge_version=12.17.0.1961
+mappings=snapshot_20160518
 
-jei_version=3.3.+
+jei_version=3.6.+

src/main/java/com/renevo/pcb/ItemPortableCraftBench.java

@@ -22,23 +22,23 @@ public static void create() {
 		GameRegistry.addShapelessRecipe(
 				new ItemStack(portableCraftBench),
 				new Object[] {
-							Blocks.crafting_table,
-							Items.string
+							Blocks.CRAFTING_TABLE,
+							Items.STRING
 						});
 	}
 
 	public ItemPortableCraftBench() {
 		super();
 
-		setMaxStackSize(1);
-		setUnlocalizedName("portableCraftBench");
-		setCreativeTab(CreativeTabs.tabTools);
+		super.setMaxStackSize(1);
+		super.setUnlocalizedName("portableCraftBench");
+		super.setCreativeTab(CreativeTabs.TOOLS);
 	}
 
 	@Override
 	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) {
 		if (world.isRemote) {
-			return ActionResult.newResult(EnumActionResult.PASS, itemStack);
+			return ActionResult.newResult(EnumActionResult.SUCCESS, itemStack);
 		} else {
 			player.openGui(PortableCraftBenchMod.instance, PortableCraftBenchMod.GUI_PORTABLE_CRAFT_BENCH_ID, world, 0, 0, 0);
 			return ActionResult.newResult(EnumActionResult.SUCCESS, itemStack);

src/main/java/com/renevo/pcb/PortableCraftBenchMod.java

@@ -34,7 +34,7 @@ public void init(FMLInitializationEvent event) {
     	MinecraftForge.EVENT_BUS.register(this);
 
     	// 6 left, 0 up/down - since we are just adding a new achievement, we don't need an achievement page, this somehow just works...
-    	achievementPcb = new Achievement("achievement.pcb", "pcb", 5, -4, ItemPortableCraftBench.portableCraftBench, net.minecraft.stats.AchievementList.buildWorkBench);
+    	achievementPcb = new Achievement("achievement.pcb", "pcb", 5, -4, ItemPortableCraftBench.portableCraftBench, AchievementList.BUILD_WORK_BENCH);
     	achievementPcb.registerStat();
 
     	proxy.initialization();