fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to 1.11

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/crafting/TileCraftingTile.java
+11 -11
View File
@@ -93,7 +93,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
@Override
public boolean canBeRotated()
{
return true;// return BlockCraftingUnit.checkType( worldObj.getBlockMetadata( xCoord, yCoord, zCoord ),
return true;// return BlockCraftingUnit.checkType( world.getBlockMetadata( xCoord, yCoord, zCoord ),
// BlockCraftingUnit.BASE_MONITOR );
}
@@ -109,12 +109,12 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
public boolean isAccelerator()
{
if( this.worldObj == null )
if( this.world == null )
{
return false;
}
final BlockCraftingUnit unit = (BlockCraftingUnit) this.worldObj.getBlockState( this.pos ).getBlock();
final BlockCraftingUnit unit = (BlockCraftingUnit) this.world.getBlockState( this.pos ).getBlock();
return unit.type == CraftingUnitType.ACCELERATOR;
}
@@ -128,7 +128,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
public void updateMultiBlock()
{
this.calc.calculateMultiblock( this.worldObj, this.getLocation() );
this.calc.calculateMultiblock( this.world, this.getLocation() );
}
public void updateStatus( final CraftingCPUCluster c )
@@ -144,7 +144,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
public void updateMeta( final boolean updateFormed )
{
if( this.worldObj == null || this.notLoaded() )
if( this.world == null || this.notLoaded() )
{
return;
}
@@ -157,7 +157,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
power = this.getProxy().isActive();
}
final IBlockState current = this.worldObj.getBlockState( this.pos );
final IBlockState current = this.world.getBlockState( this.pos );
// The tile might try to update while being destroyed
if( current.getBlock() instanceof BlockCraftingUnit )
@@ -168,7 +168,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
// Not using flag 2 here (only send to clients, prevent block update) will cause infinite loops
// In case there is an inconsistency in the crafting clusters.
this.worldObj.setBlockState( this.pos, newState, 2 );
this.world.setBlockState( this.pos, newState, 2 );
}
}
@@ -189,7 +189,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
if( Platform.isClient() )
{
return (boolean) this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED );
return (boolean) this.world.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED );
}
return this.cluster != null;
}
@@ -298,7 +298,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
final WorldCoord wc = new WorldCoord( te );
wc.add( d, 1 );
if( this.worldObj.isAirBlock( wc.getPos() ) )
if( this.world.isAirBlock( wc.getPos() ) )
{
places.add( wc );
}
@@ -328,7 +328,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
final WorldCoord wc = places.poll();
places.add( wc );
Platform.spawnDrops( this.worldObj, wc.getPos(), Collections.singletonList( g.getItemStack() ) );
Platform.spawnDrops( this.world, wc.getPos(), Collections.singletonList( g.getItemStack() ) );
}
}
@@ -341,7 +341,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
if( Platform.isClient() )
{
return (boolean) this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED );
return (boolean) this.world.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED );
}
return this.getProxy().isActive();
}