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/CraftingCPUCalculator.java
+5 -5
View File
@@ -22,13 +22,13 @@ package appeng.me.cluster.implementations;
import java.util.Iterator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.networking.events.MENetworkCraftingCpuChange;
import appeng.api.util.AEPartLocation;
import appeng.api.util.WorldCoord;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
@@ -85,7 +85,7 @@ public class CraftingCPUCalculator extends MBCalculator
{
for( int z = min.z; z <= max.z; z++ )
{
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( x, y, z );
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( new BlockPos( x, y, z ) );
if( !te.isValid() )
{
@@ -120,7 +120,7 @@ public class CraftingCPUCalculator extends MBCalculator
{
for( int z = min.z; z <= max.z; z++ )
{
TileCraftingTile te = (TileCraftingTile) w.getTileEntity( x, y, z );
TileCraftingTile te = (TileCraftingTile) w.getTileEntity( new BlockPos( x, y, z ) );
te.updateStatus( c );
c.addTile( te );
}
@@ -133,7 +133,7 @@ public class CraftingCPUCalculator extends MBCalculator
while( i.hasNext() )
{
IGridHost gh = i.next();
IGridNode n = gh.getGridNode( ForgeDirection.UNKNOWN );
IGridNode n = gh.getGridNode( AEPartLocation.INTERNAL );
if( n != null )
{
IGrid g = n.getGrid();
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+5 -7
View File
@@ -26,18 +26,13 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
@@ -79,6 +74,9 @@ import appeng.tile.crafting.TileCraftingTile;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
public class CraftingCPUCluster implements IAECluster, ICraftingCPU
{
@@ -1245,7 +1243,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
private World getWorld()
{
return this.getCore().getWorldObj();
return this.getCore().getWorld();
}
public boolean isMaking( IAEItemStack what )
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;
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+9 -11
View File
@@ -26,11 +26,8 @@ import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.world.WorldEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import appeng.api.AEApi;
import appeng.api.events.LocatableEventAnnounce;
import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
@@ -38,6 +35,7 @@ import appeng.api.exceptions.FailedConnection;
import appeng.api.features.ILocatable;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.util.AEPartLocation;
import appeng.api.util.WorldCoord;
import appeng.me.cache.helpers.ConnectionWrapper;
import appeng.me.cluster.IAECluster;
@@ -69,7 +67,7 @@ public class QuantumCluster implements ILocatable, IAECluster
@SubscribeEvent
public void onUnload( WorldEvent.Unload e )
{
if( this.center.getWorldObj() == e.world )
if( this.center.getWorld() == e.world )
{
this.updateStatus = false;
this.destroy();
@@ -190,16 +188,16 @@ public class QuantumCluster implements ILocatable, IAECluster
QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy( qe );
if( qc != null )
{
World theWorld = qc.center.getWorldObj();
World theWorld = qc.center.getWorld();
if( !qc.isDestroyed )
{
Chunk c = theWorld.getChunkFromBlockCoords( qc.center.xCoord, qc.center.zCoord );
if( c.isChunkLoaded )
Chunk c = theWorld.getChunkFromBlockCoords( qc.center.getPos() );
if( c.isLoaded() )
{
int id = theWorld.provider.dimensionId;
int id = theWorld.provider.getDimensionId();
World cur = DimensionManager.getWorld( id );
TileEntity te = theWorld.getTileEntity( qc.center.xCoord, qc.center.yCoord, qc.center.zCoord );
TileEntity te = theWorld.getTileEntity( qc.center.getPos() );
return te != qc.center || theWorld != cur;
}
}
@@ -219,7 +217,7 @@ public class QuantumCluster implements ILocatable, IAECluster
private IGridNode getNode()
{
return this.center.getGridNode( ForgeDirection.UNKNOWN );
return this.center.getGridNode( AEPartLocation.INTERNAL );
}
public boolean hasQES()
src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
+3 -3
View File
@@ -20,8 +20,8 @@ package appeng.me.cluster.implementations;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.WorldCoord;
import appeng.me.cluster.IAECluster;
@@ -63,7 +63,7 @@ public class SpatialPylonCalculator extends MBCalculator
{
for( int z = min.z; z <= max.z; z++ )
{
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( x, y, z );
IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity( new BlockPos( x, y, z ) );
if( !te.isValid() )
{
@@ -93,7 +93,7 @@ public class SpatialPylonCalculator extends MBCalculator
{
for( int z = min.z; z <= max.z; z++ )
{
TileSpatialPylon te = (TileSpatialPylon) w.getTileEntity( x, y, z );
TileSpatialPylon te = (TileSpatialPylon) w.getTileEntity( new BlockPos( x, y, z ) );
te.updateStatus( c );
c.line.add( ( te ) );
}