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

Most of the 1.8 Port.

Browse Source
This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
+8 -7
View File
@@ -21,9 +21,9 @@ package appeng.me.cluster.implementations;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IBlocks;
@@ -78,7 +78,8 @@ public class QuantumCalculator extends MBCalculator
{
for( int z = min.z; z <= max.z; z++ )
{
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( x, y, z );
BlockPos p = new BlockPos( x, y, z );
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( p );
if( !te.isValid() )
{
@@ -89,14 +90,14 @@ public class QuantumCalculator extends MBCalculator
final IBlocks blocks = AEApi.instance().definitions().blocks();
if( num == 5 )
{
if( !this.isBlockAtLocation( w, x, y, z, blocks.quantumLink() ) )
if( !this.isBlockAtLocation( w, p, blocks.quantumLink() ) )
{
return false;
}
}
else
{
if( !this.isBlockAtLocation( w, x, y, z, blocks.quantumRing() ) )
if( !this.isBlockAtLocation( w, p, blocks.quantumRing() ) )
{
return false;
}
@@ -126,7 +127,7 @@ public class QuantumCalculator extends MBCalculator
{
for( int z = min.z; z <= max.z; z++ )
{
TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity( x, y, z );
TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity( new BlockPos( x, y, z ) );
byte flags;
@@ -162,11 +163,11 @@ public class QuantumCalculator extends MBCalculator
return te instanceof TileQuantumBridge;
}
private boolean isBlockAtLocation( IBlockAccess w, int x, int y, int z, IBlockDefinition def )
private boolean isBlockAtLocation( IBlockAccess w, BlockPos pos, IBlockDefinition def )
{
for( Block block : def.maybeBlock().asSet() )
{
return block == w.getBlock( x, y, z );
return block == w.getBlockState( pos ).getBlock();
}
return false;