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

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

Browse source
This commit is contained in:
AlgorithmX2 2014-04-14 02:39:39 -05:00
parent e20f26fc6d 922ade793c
commit 506b7a7129
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
client/render/blocks/RenderBlockController.java
View file

@ -2,6 +2,7 @@ package appeng.client.render.blocks;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender; import appeng.client.render.BaseBlockRender;
@ -19,9 +20,9 @@ public class RenderBlockController extends BaseBlockRender
public boolean renderInWorld(AEBaseBlock blk, IBlockAccess world, int x, int y, int z, RenderBlocks renderer) public boolean renderInWorld(AEBaseBlock blk, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
{ {
boolean xx = world.getTileEntity( x - 1, y, z ) instanceof TileController && world.getTileEntity( x + 1, y, z ) instanceof TileController; boolean xx = getTileEntity( world, x - 1, y, z ) instanceof TileController && getTileEntity( world, x + 1, y, z ) instanceof TileController;
boolean yy = world.getTileEntity( x, y - 1, z ) instanceof TileController && world.getTileEntity( x, y + 1, z ) instanceof TileController; boolean yy = getTileEntity( world, x, y - 1, z ) instanceof TileController && getTileEntity( world, x, y + 1, z ) instanceof TileController;
boolean zz = world.getTileEntity( x, y, z - 1 ) instanceof TileController && world.getTileEntity( x, y, z + 1 ) instanceof TileController; boolean zz = getTileEntity( world, x, y, z - 1 ) instanceof TileController && getTileEntity( world, x, y, z + 1 ) instanceof TileController;
int meta = world.getBlockMetadata( x, y, z ); int meta = world.getBlockMetadata( x, y, z );
boolean hasPower = meta > 0; boolean hasPower = meta > 0;
@ -122,4 +123,11 @@ public class RenderBlockController extends BaseBlockRender
renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
return out; return out;
} }
private TileEntity getTileEntity(IBlockAccess world, int x, int y, int z)
{
if ( y >= 0 )
return world.getTileEntity( x, y, z );
return null;
}
} }

6
fmp/CableBusPart.java
View file

@ -428,7 +428,6 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
@Override @Override
public void partChanged() public void partChanged()
{ {
AELog.info( "rebuildSlotMap" );
if ( tile() instanceof TIInventoryTile ) if ( tile() instanceof TIInventoryTile )
((TIInventoryTile) tile()).rebuildSlotMap(); ((TIInventoryTile) tile()).rebuildSlotMap();
@ -485,11 +484,6 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
cb.onInputsChanged( world, x, y, z, side, inputValues ); cb.onInputsChanged( world, x, y, z, side, inputValues );
} }
public void markDirty()
{
markForSave();
}
@Override @Override
public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue) public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue)
{ {

3
parts/automation/PartImportBus.java
View file

@ -124,8 +124,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollsionHelper bch)
{ {
bch.addBox( 6, 6, 11, 10, 10, 12 ); bch.addBox( 6, 6, 11, 10, 10, 13 );
bch.addBox( 6, 6, 12, 10, 10, 13 );
bch.addBox( 5, 5, 13, 11, 11, 14 ); bch.addBox( 5, 5, 13, 11, 11, 14 );
bch.addBox( 4, 4, 14, 12, 12, 16 ); bch.addBox( 4, 4, 14, 12, 12, 16 );
} }

6
parts/misc/PartInterface.java
View file

@ -110,10 +110,8 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollsionHelper bch)
{ {
bch.addBox( 3, 3, 15, 13, 13, 16 ); bch.addBox( 2, 2, 14, 14, 14, 16 );
bch.addBox( 2, 2, 14, 14, 14, 15 ); bch.addBox( 5, 5, 12, 11, 11, 14 );
bch.addBox( 5, 5, 12, 11, 11, 13 );
bch.addBox( 5, 5, 13, 11, 11, 14 );
} }
@Override @Override

3
parts/misc/PartStorageBus.java
View file

@ -328,8 +328,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
{ {
bch.addBox( 3, 3, 15, 13, 13, 16 ); bch.addBox( 3, 3, 15, 13, 13, 16 );
bch.addBox( 2, 2, 14, 14, 14, 15 ); bch.addBox( 2, 2, 14, 14, 14, 15 );
bch.addBox( 5, 5, 12, 11, 11, 13 ); bch.addBox( 5, 5, 12, 11, 11, 14 );
bch.addBox( 5, 5, 13, 11, 11, 14 );
} }
@Override @Override

2
parts/p2p/PartP2PTunnel.java
View file

@ -332,6 +332,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollsionHelper bch)
{ {
bch.addBox( 5, 5, 12, 11, 11, 13 );
bch.addBox( 3, 3, 13, 13, 13, 14 );
bch.addBox( 2, 2, 14, 14, 14, 16 ); bch.addBox( 2, 2, 14, 14, 14, 16 );
} }