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

Fixes broken controller rendering.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-08-26 16:55:01 +02:00
parent 96a9e2f558
commit 9fe692c9bd
10 changed files with 121 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/networking/BlockController.java
+22 -45
View File
@@ -23,14 +23,13 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.property.IExtendedBlockState;
import appeng.block.AEBaseTileBlock;
import appeng.tile.networking.TileController;
@@ -57,7 +56,7 @@ public class BlockController extends AEBaseTileBlock
*/
public enum ControllerRenderType implements IStringSerializable
{
block, column, inside_a, inside_b;
block, column_x, column_y, column_z, inside_a, inside_b;
@Override
public String getName()
@@ -71,12 +70,28 @@ public class BlockController extends AEBaseTileBlock
public static final PropertyEnum<ControllerRenderType> CONTROLLER_TYPE = PropertyEnum.create( "type", ControllerRenderType.class );
public BlockController()
{
super( Material.IRON );
this.setTileEntity( TileController.class );
this.setHardness( 6 );
this.setDefaultState( getDefaultState()
.withProperty( CONTROLLER_STATE, ControllerBlockState.offline )
.withProperty( CONTROLLER_TYPE, ControllerRenderType.block ) );
}
@Override
protected IProperty[] getAEStates()
{
return new IProperty[] { CONTROLLER_STATE, CONTROLLER_TYPE };
}
@Override
protected BlockStateContainer createBlockState()
{
return new BlockStateContainer( this, getAEStates() );
}
/**
* This will compute the AE_BLOCK_FORWARD, AE_BLOCK_UP and CONTROLLER_TYPE block states based on adjacent
* controllers and the network state of this controller (offline, online, conflicted). This is used to
@@ -100,15 +115,15 @@ public class BlockController extends AEBaseTileBlock
if( xx && !yy && !zz )
{
type = ControllerRenderType.column;
type = ControllerRenderType.column_x;
}
else if( !xx && yy && !zz )
{
type = ControllerRenderType.column;
type = ControllerRenderType.column_y;
}
else if( !xx && !yy && zz )
{
type = ControllerRenderType.column;
type = ControllerRenderType.column_z;
}
else if( ( xx ? 1 : 0 ) + ( yy ? 1 : 0 ) + ( zz ? 1 : 0 ) >= 2 )
{
@@ -132,37 +147,7 @@ public class BlockController extends AEBaseTileBlock
@Override
public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
{
// Only used for columns, really
EnumFacing up = EnumFacing.UP;
EnumFacing forward = EnumFacing.NORTH;
int x = pos.getX();
int y = pos.getY();
int z = pos.getZ();
// Detect whether controllers are on both sides of the x, y, and z axes
final boolean xx = this.getTileEntity( world, x - 1, y, z ) instanceof TileController && this.getTileEntity( world, x + 1, y, z ) instanceof TileController;
final boolean yy = this.getTileEntity( world, x, y - 1, z ) instanceof TileController && this.getTileEntity( world, x, y + 1, z ) instanceof TileController;
final boolean zz = this.getTileEntity( world, x, y, z - 1 ) instanceof TileController && this.getTileEntity( world, x, y, z + 1 ) instanceof TileController;
if( xx && !yy && !zz )
{
up = EnumFacing.EAST;
forward = EnumFacing.UP;
}
else if( !xx && yy && !zz )
{
up = EnumFacing.UP;
forward = EnumFacing.NORTH;
}
else if( !xx && !yy && zz )
{
up = EnumFacing.NORTH;
forward = EnumFacing.UP;
}
IExtendedBlockState extState = (IExtendedBlockState) super.getExtendedState( state, world, pos );
return extState.withProperty( FORWARD, forward ).withProperty( UP, up );
return state;
}
@Override
@@ -184,14 +169,6 @@ public class BlockController extends AEBaseTileBlock
return BlockRenderLayer.CUTOUT;
}
public BlockController()
{
super( Material.IRON );
this.setTileEntity( TileController.class );
this.setHardness( 6 );
this.setDefaultState( getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.offline ).withProperty( CONTROLLER_TYPE, ControllerRenderType.block ) );
}
@Override
public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
{