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

Add this qualifier

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:26:54 +02:00
parent efecd4b8c1
commit ebda927fb5
105 changed files with 422 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class TileCraftingStorageTile extends TileCraftingTile
return 0;
}
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock();
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock();
switch( unit.type )
{
default:
src/main/java/appeng/tile/crafting/TileCraftingTile.java
+5 -5
View File
@@ -114,7 +114,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
return false;
}
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock();
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock();
return unit.type == CraftingUnitType.ACCELERATOR;
}
@@ -157,12 +157,12 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
power = this.gridProxy.isActive();
}
final IBlockState current = this.worldObj.getBlockState( pos );
final IBlockState current = this.worldObj.getBlockState( this.pos );
final IBlockState newState = current.withProperty( BlockCraftingUnit.POWERED, power ).withProperty( BlockCraftingUnit.FORMED, formed );
if( current != newState )
{
this.worldObj.setBlockState( pos, newState );
this.worldObj.setBlockState( this.pos, newState );
}
if( updateFormed )
@@ -182,7 +182,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
if( Platform.isClient() )
{
return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.FORMED );
return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED );
}
return this.cluster != null;
}
@@ -334,7 +334,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
if( Platform.isClient() )
{
return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.POWERED );
return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED );
}
return this.gridProxy.isActive();
}
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+3 -3
View File
@@ -511,9 +511,9 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
try
{
final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 32 );
final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 );
final IAEItemStack item = AEItemStack.create( output );
NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( pos, (byte) speed, item ), where );
NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where );
}
catch( final IOException e )
{
@@ -592,7 +592,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
return output;
}
final TileEntity te = this.getWorld().getTileEntity( pos.offset( d ) );
final TileEntity te = this.getWorld().getTileEntity( this.pos.offset( d ) );
if( te == null )
{