diff --git a/gradle.properties b/gradle.properties index 2e51a04dd..206175606 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,8 +8,8 @@ aebasename=appliedenergistics2 # Versions # ######################################################### minecraft_version=1.10.2 -mcp_mappings=snapshot_20160518 -forge_version=12.18.1.2050 +mcp_mappings=snapshot_20160930 +forge_version=12.18.1.2094 ######################################################### # Installable # diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index e63accb43..2af55a114 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -144,7 +144,7 @@ class FacadeBuilder int color = 0xffffff; try { - blockColors.func_189991_a( blockState ); + blockColors.getColor( blockState ); } catch( final Throwable ignored ) { diff --git a/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java b/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java index 02f4e872e..ac5aec2aa 100644 --- a/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java +++ b/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java @@ -35,7 +35,7 @@ public final class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem @Override protected ItemStack dispenseStack( final IBlockSource dispenser, final ItemStack dispensedItem ) { - final EnumFacing enumfacing = dispenser.func_189992_e().getValue( BlockDispenser.FACING ); + final EnumFacing enumfacing = dispenser.getBlockState().getValue( BlockDispenser.FACING ); final World world = dispenser.getWorld(); final int i = dispenser.getBlockPos().getX() + enumfacing.getFrontOffsetX(); final int j = dispenser.getBlockPos().getY() + enumfacing.getFrontOffsetY(); diff --git a/src/main/java/appeng/hooks/DispenserBlockTool.java b/src/main/java/appeng/hooks/DispenserBlockTool.java index 6c0d04e49..298d0e4c1 100644 --- a/src/main/java/appeng/hooks/DispenserBlockTool.java +++ b/src/main/java/appeng/hooks/DispenserBlockTool.java @@ -41,7 +41,7 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem final Item i = dispensedItem.getItem(); if( i instanceof IBlockTool ) { - final EnumFacing enumfacing = dispenser.func_189992_e().getValue( BlockDispenser.FACING ); + final EnumFacing enumfacing = dispenser.getBlockState().getValue( BlockDispenser.FACING ); final IBlockTool tm = (IBlockTool) i; final World w = dispenser.getWorld(); diff --git a/src/main/java/appeng/hooks/DispenserMatterCannon.java b/src/main/java/appeng/hooks/DispenserMatterCannon.java index 8dae68427..36082b0f4 100644 --- a/src/main/java/appeng/hooks/DispenserMatterCannon.java +++ b/src/main/java/appeng/hooks/DispenserMatterCannon.java @@ -43,7 +43,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem final Item i = dispensedItem.getItem(); if( i instanceof ToolMassCannon ) { - final EnumFacing enumfacing = dispenser.func_189992_e().getValue( BlockDispenser.FACING ); + final EnumFacing enumfacing = dispenser.getBlockState().getValue( BlockDispenser.FACING ); AEPartLocation dir = AEPartLocation.INTERNAL; for( final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS ) {