Port to 1.11

This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
+6 -6
View File
@@ -95,7 +95,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public boolean notLoaded()
{
return !this.worldObj.isBlockLoaded( this.pos );
return !this.world.isBlockLoaded( this.pos );
}
@Nonnull
@@ -120,7 +120,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
{
if( state == null )
{
state = worldObj.getBlockState( getPos() );
state = world.getBlockState( getPos() );
}
return state;
}
@@ -337,10 +337,10 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
else
{
// TODO: Optimize Network Load
if( this.worldObj != null )
if( this.world != null )
{
AELog.blockUpdate( this.pos, this );
this.worldObj.notifyBlockUpdate( this.pos, getBlockState(), getBlockState(), 3 );
this.world.notifyBlockUpdate( this.pos, getBlockState(), getBlockState(), 3 );
}
}
}
@@ -472,7 +472,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
this.forward = inForward;
this.up = inUp;
this.markForUpdate();
Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
Platform.notifyBlocksOfNeighbors( this.world, this.pos );
}
public void onPlacement( final ItemStack stack, final EntityPlayer player, final EnumFacing side )
@@ -618,7 +618,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public void securityBreak()
{
this.worldObj.destroyBlock( this.pos, true );
this.world.destroyBlock( this.pos, true );
this.disableDrops();
}