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

Renamed QNB's getConnections to make more sense.

This commit is contained in:
Sebastian Hartte 2016-10-15 00:47:45 +02:00
parent 7761a37d59
commit 7c8ee24f8c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/appeng/block/qnb/BlockQuantumBase.java
View File

@ -76,7 +76,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
TileQuantumBridge bridge = getTileEntity( world, pos );
if( bridge != null )
{
QnbFormedState formedState = new QnbFormedState( bridge.getConnections(), bridge.isCorner(), bridge.isPowered() );
QnbFormedState formedState = new QnbFormedState( bridge.getAdjacentQuantumBridges(), bridge.isCorner(), bridge.isPowered() );
extState = extState.withProperty( FORMED_STATE, formedState );
}

4
src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
View File

@ -92,7 +92,7 @@ class QnbFormedBakedModel implements IBakedModel
if( state.getBlock() == linkBlock )
{
Set<EnumFacing> sides = formedState.getConnections();
Set<EnumFacing> sides = formedState.getAdjacentQuantumBridges();
this.renderCableAt( builder, 0.11f * 16, glassCableTexture, 0.141f * 16, sides );
@ -105,7 +105,7 @@ class QnbFormedBakedModel implements IBakedModel
{
if( formedState.isCorner() )
{
this.renderCableAt( builder, 0.188f * 16, coveredCableTexture, 0.05f * 16, formedState.getConnections() );
this.renderCableAt( builder, 0.188f * 16, coveredCableTexture, 0.05f * 16, formedState.getAdjacentQuantumBridges() );
builder.setTexture( ringTexture );
builder.addCube( DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX );

10
src/main/java/appeng/block/qnb/QnbFormedState.java
View File

@ -9,22 +9,22 @@ import net.minecraft.util.EnumFacing;
public class QnbFormedState
{
private final Set<EnumFacing> connections;
private final Set<EnumFacing> adjacentQuantumBridges;
private final boolean corner;
private final boolean powered;
public QnbFormedState( Set<EnumFacing> connections, boolean corner, boolean powered )
public QnbFormedState( Set<EnumFacing> adjacentQuantumBridges, boolean corner, boolean powered )
{
this.connections = connections;
this.adjacentQuantumBridges = adjacentQuantumBridges;
this.corner = corner;
this.powered = powered;
}
public Set<EnumFacing> getConnections()
public Set<EnumFacing> getAdjacentQuantumBridges()
{
return connections;
return adjacentQuantumBridges;
}
public boolean isCorner()

4
src/main/java/appeng/tile/qnb/TileQuantumBridge.java
View File

@ -234,7 +234,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
if( this.isCorner() || this.isCenter() )
{
final EnumSet<EnumFacing> sides = EnumSet.noneOf( EnumFacing.class );
for( final EnumFacing dir : this.getConnections() )
for( final EnumFacing dir : this.getAdjacentQuantumBridges() )
{
sides.add( dir );
}
@ -253,7 +253,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
return ( this.constructed & this.getCorner() ) == this.getCorner() && this.constructed != -1;
}
public EnumSet<EnumFacing> getConnections()
public EnumSet<EnumFacing> getAdjacentQuantumBridges()
{
final EnumSet<EnumFacing> set = EnumSet.noneOf( EnumFacing.class );