tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed Incompatibility with FMP.

Browse source
This commit is contained in:
AlgorithmX2 2014-01-28 21:10:23 -06:00
parent 699e82a889
commit da5f8c4ad4
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
block/networking/BlockCableBus.java
View file

@ -4,6 +4,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -75,6 +76,13 @@ public class BlockCableBus extends AEBaseBlock
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z)
{
Block block = blocksList[world.getBlockId( x, y, z )];
if ( block != null && block != this )
{
return block.getLightValue( world, x, y, z );
}
if ( block == null )
return 0;
return cb( world, x, y, z ).getLightValue();
}

2
integration/modules/FMP.java
View file

@ -84,7 +84,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
MultiPartRegistry.registerConverter( this );
MultiPartRegistry.registerParts( this, data );
MinecraftForge.EVENT_BUS.register( new FMPEvent() );
// MultipartGenerator.registerPassThroughInterface( "appeng.helpers.AEMultiTile" );
MultipartGenerator.registerPassThroughInterface( "appeng.helpers.AEMultiTile" );
}
@Override

4
parts/CableBusContainer.java
View file

@ -274,6 +274,8 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
public void addToWorld()
{
if ( inWorld )
return;
inWorld = true;
TileEntity te = getTile();
@ -323,6 +325,8 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
public void removeFromWorld()
{
if ( !inWorld )
return;
inWorld = false;
for (ForgeDirection s : ForgeDirection.values())