Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

client/render/BusRenderHelper.java

@@ -334,7 +334,7 @@ public class BusRenderHelper implements IPartRenderHelper
 		if ( !renderThis() )
 			return;
 
-		renderer.renderStandardBlock( renderer.blockAccess.getBlock( x, y, z ), x, y, z );
+		renderer.renderStandardBlock( blk, x, y, z );
 	}
 
 	@Override

core/Registration.java

@@ -430,8 +430,7 @@ public class Registration
 		}
 		catch (Throwable e)
 		{
-			AELog.severe( "Error with Feature: " + c.getName() );
+			throw new RuntimeException( "Error with Feature: " + c.getName(), e );
-			throw new RuntimeException( e );
 		}
 	}
 
@@ -477,15 +476,25 @@ public class Registration
 			recipeHandler.parseRecipes( new JarLoader( "/assets/appliedenergistics2/recipes/" ), "index.recipe" );
 
 		IPartHelper ph = AEApi.instance().partHelper();
-		ph.registerNewLayer( "appeng.api.parts.layers.LayerIEnergySink", "ic2.api.energy.tile.IEnergySink" );
-		ph.registerNewLayer( "appeng.api.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" );
 		ph.registerNewLayer( "appeng.api.parts.layers.LayerISidedInventory", "net.minecraft.inventory.ISidedInventory" );
-		ph.registerNewLayer( "appeng.api.parts.layers.LayerIPowerEmitter", "buildcraft.api.power.IPowerEmitter" );
-		ph.registerNewLayer( "appeng.api.parts.layers.LayerIPowerReceptor", "buildcraft.api.power.IPowerReceptor" );
 		ph.registerNewLayer( "appeng.api.parts.layers.LayerIFluidHandler", "net.minecraftforge.fluids.IFluidHandler" );
-		ph.registerNewLayer( "appeng.api.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyHandler" );
 		ph.registerNewLayer( "appeng.api.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" );
 
+		if ( AppEng.instance.isIntegrationEnabled( "IC2" ) )
+		{
+			ph.registerNewLayer( "appeng.api.parts.layers.LayerIEnergySink", "ic2.api.energy.tile.IEnergySink" );
+			ph.registerNewLayer( "appeng.api.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" );
+		}
+
+		if ( AppEng.instance.isIntegrationEnabled( "MJ" ) )
+		{
+			ph.registerNewLayer( "appeng.api.parts.layers.LayerIPowerEmitter", "buildcraft.api.power.IPowerEmitter" );
+			ph.registerNewLayer( "appeng.api.parts.layers.LayerIPowerReceptor", "buildcraft.api.power.IPowerReceptor" );
+		}
+
+		if ( AppEng.instance.isIntegrationEnabled( "RF" ) )
+			ph.registerNewLayer( "appeng.api.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyHandler" );
+
 		FMLCommonHandler.instance().bus().register( TickHandler.instance );
 		MinecraftForge.EVENT_BUS.register( new PartPlacement() );
 

integration/modules/RF.java

@@ -16,6 +16,7 @@ public class RF extends BaseModule implements IIntegrationModule
 
 	public RF() {
 		TestClass( cofh.api.energy.IEnergyHandler.class );
+		TestClass( cofh.api.energy.IEnergyConnection.class );
 	}
 
 	@Override

integration/modules/helpers/NullRFHandler.java

@@ -1,4 +1,5 @@
 package appeng.integration.modules.helpers;
+
 import net.minecraftforge.common.util.ForgeDirection;
 import cofh.api.energy.IEnergyHandler;
 
@@ -29,15 +30,10 @@ public class NullRFHandler implements IEnergyHandler
 		return 0;
 	}
 
-	@Deprecated
+	@Override
-	public boolean canInterface(ForgeDirection from)
+	public boolean canConnectEnergy(ForgeDirection from)
 	{
 		return true;
 	}
 
-	@Override
-	public boolean canConnectEnergy(ForgeDirection from) {
-		return true;
-	}
-
 }

parts/CableBusContainer.java

@@ -575,6 +575,8 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
 	{
 		byte sides = data.readByte();
 
+		boolean updateBlock = false;
+
 		for (int x = 0; x < 7; x++)
 		{
 			ForgeDirection side = ForgeDirection.getOrientation( x );
@@ -589,7 +591,10 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
 
 				ItemStack current = p != null ? p.getItemStack( PartItemStack.Network ) : null;
 				if ( current != null && current.getItem() == myItem && current.getItemDamage() == dmgValue )
-					p.readFromStream( data );
+				{
+					if ( p.readFromStream( data ) )
+						updateBlock = true;
+				}
 				else
 				{
 					removePart( side, false );
@@ -607,7 +612,9 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
 				removePart( side, false );
 		}
 
-		return fc.readFromStream( data );
+		if ( fc.readFromStream( data ) )
+			return true;
+		return updateBlock;
 	}
 
 	ForgeDirection getSide(IPart part)

parts/networking/PartCable.java

@@ -284,7 +284,7 @@ public class PartCable extends AEBasePart implements IPartCable
 		int cs = data.readByte();
 		int sideOut = data.readInt();
 
-		EnumSet<ForgeDirection> myC = connections;
+		EnumSet<ForgeDirection> myC = connections.clone();
 		boolean wasPowered = powered;
 		powered = false;
 		boolean chchanged = false;
@@ -381,7 +381,7 @@ public class PartCable extends AEBasePart implements IPartCable
 		IPartHost ccph = te instanceof IPartHost ? (IPartHost) te : null;
 		IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null;
 
-		rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of, of.getOpposite() ) ) );
+		rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of ) ) );
 
 		if ( gh != null && ccph != null && gh.getCableConnectionType( of ) == AECableType.GLASS && ccph.getColor() != AEColor.Transparent
 				&& ccph.getPart( of.getOpposite() ) == null )
@@ -494,7 +494,7 @@ public class PartCable extends AEBasePart implements IPartCable
 		IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
 		boolean isSmart = false;
 
-		rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of, of.getOpposite() ) ) );
+		rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getOpposite() ) ) );
 		if ( ghh != null && ccph != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && ccph.getPart( of.getOpposite() ) == null
 				&& ccph.getColor() != AEColor.Transparent )
 			rh.setTexture( getGlassTexture( ccph.getColor() ) );

parts/p2p/PartP2PRFPower.java

@@ -236,7 +236,7 @@ public class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements cof
 				cachedTarget = true;
 			}
 
-			if ( outputTarget == null )
+			if ( outputTarget == null || !outputTarget.canConnectEnergy( side.getOpposite() ) )
 				return myNullHandler;
 
 			return outputTarget;
@@ -244,14 +244,9 @@ public class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements cof
 		return myNullHandler;
 	}
 
-	@Deprecated
+	@Override
-	public boolean canInterface(ForgeDirection from)
+	public boolean canConnectEnergy(ForgeDirection from)
 	{
 		return true;
 	}
-
-	@Override
-	public boolean canConnectEnergy(ForgeDirection from) {
-		return true;
-	}
 }

tile/powersink/RedstoneFlux.java

@@ -34,12 +34,6 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
 		return 0;
 	}
 
-	@Deprecated
-	final public boolean canInterface(ForgeDirection from)
-	{
-		return canConnectEnergy(from);
-	}
-	
 	final public boolean canConnectEnergy(ForgeDirection from)
 	{
 		return internalCanAcceptPower && getPowerSides().contains( from );