tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Updated forge and MCP mappings to latest version.

Browse source
This commit is contained in:
Sebastian Hartte 2016-09-30 22:13:57 +02:00
parent e1455df108
commit 8666936646
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gradle.properties
View file

@ -8,8 +8,8 @@ aebasename=appliedenergistics2
# Versions # # Versions #
######################################################### #########################################################
minecraft_version=1.10.2 minecraft_version=1.10.2
mcp_mappings=snapshot_20160518 mcp_mappings=snapshot_20160930
forge_version=12.18.1.2050 forge_version=12.18.1.2094
######################################################### #########################################################
# Installable # # Installable #

2
src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
View file

@ -144,7 +144,7 @@ class FacadeBuilder
int color = 0xffffff; int color = 0xffffff;
try try
{ {
blockColors.func_189991_a( blockState ); blockColors.getColor( blockState );
} }
catch( final Throwable ignored ) catch( final Throwable ignored )
{ {

2
src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java
View file

@ -35,7 +35,7 @@ public final class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem
@Override @Override
protected ItemStack dispenseStack( final IBlockSource dispenser, final ItemStack dispensedItem ) 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 World world = dispenser.getWorld();
final int i = dispenser.getBlockPos().getX() + enumfacing.getFrontOffsetX(); final int i = dispenser.getBlockPos().getX() + enumfacing.getFrontOffsetX();
final int j = dispenser.getBlockPos().getY() + enumfacing.getFrontOffsetY(); final int j = dispenser.getBlockPos().getY() + enumfacing.getFrontOffsetY();

2
src/main/java/appeng/hooks/DispenserBlockTool.java
View file

@ -41,7 +41,7 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem
final Item i = dispensedItem.getItem(); final Item i = dispensedItem.getItem();
if( i instanceof IBlockTool ) 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 IBlockTool tm = (IBlockTool) i;
final World w = dispenser.getWorld(); final World w = dispenser.getWorld();

2
src/main/java/appeng/hooks/DispenserMatterCannon.java
View file

@ -43,7 +43,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
final Item i = dispensedItem.getItem(); final Item i = dispensedItem.getItem();
if( i instanceof ToolMassCannon ) 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; AEPartLocation dir = AEPartLocation.INTERNAL;
for( final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS ) for( final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS )
{ {