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

Ported to 1.7

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cluster/implementations/QuantumCalculator.java
+2 -2
View File
@@ -54,7 +54,7 @@ public class QuantumCalculator extends MBCalculator
{
for (int z = min.z; z <= max.z; z++)
{
TileQuantumBridge te = (TileQuantumBridge) w.getBlockTileEntity( x, y, z );
TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity( x, y, z );
byte flags = 0;
@@ -104,7 +104,7 @@ public class QuantumCalculator extends MBCalculator
{
for (int z = min.z; z <= max.z; z++)
{
IAEMultiBlock te = (IAEMultiBlock) w.getBlockTileEntity( x, y, z );
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( x, y, z );
if ( !te.isValid() )
return false;
me/cluster/implementations/QuantumCluster.java
+5 -5
View File
@@ -3,9 +3,8 @@ package appeng.me.cluster.implementations;
import java.util.Iterator;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.world.WorldEvent;
import appeng.api.AEApi;
import appeng.api.events.LocatableEventAnnounce;
@@ -19,6 +18,7 @@ import appeng.me.cache.helpers.ConnectionWrapper;
import appeng.me.cluster.IAECluster;
import appeng.tile.qnb.TileQuantumBridge;
import appeng.util.iterators.ChainedIterator;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class QuantumCluster implements ILocatable, IAECluster
{
@@ -62,7 +62,7 @@ public class QuantumCluster implements ILocatable, IAECluster
{
if ( !qc.isDestroyed )
{
Chunk c = qc.center.worldObj.getChunkFromBlockCoords( qc.center.xCoord, qc.center.zCoord );
Chunk c = qc.center.getWorldObj().getChunkFromBlockCoords( qc.center.xCoord, qc.center.zCoord );
if ( c.isChunkLoaded )
return false;
}
@@ -70,10 +70,10 @@ public class QuantumCluster implements ILocatable, IAECluster
return true;
}
@ForgeSubscribe
@SubscribeEvent
public void onUnload(WorldEvent.Unload e)
{
if ( center.worldObj == e.world )
if ( center.getWorldObj() == e.world )
{
destroy();
}
me/cluster/implementations/SpatialPylonCalculator.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class SpatialPylonCalculator extends MBCalculator
{
for (int z = min.z; z <= max.z; z++)
{
TileSpatialPylon te = (TileSpatialPylon) w.getBlockTileEntity( x, y, z );
TileSpatialPylon te = (TileSpatialPylon) w.getTileEntity( x, y, z );
te.updateStatus( c );
c.line.add( (te) );
}
@@ -73,7 +73,7 @@ public class SpatialPylonCalculator extends MBCalculator
{
for (int z = min.z; z <= max.z; z++)
{
IAEMultiBlock te = (IAEMultiBlock) w.getBlockTileEntity( x, y, z );
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( x, y, z );
if ( !te.isValid() )
return false;