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

Third update pass (3/?)

Browse Source 
Last (?) update pass. AE2 can be launched and used (?) in game.

Rendering system changed again and again - rendering is NOT working, to
be rewritten and CAN be done a lot simpler.
This commit is contained in:
elix-x
2016-06-21 16:36:15 +02:00
parent 05aa6972c4
commit 8acee98b8f
20 changed files with 146 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseTile.java
+2 -2
View File
@@ -176,8 +176,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
if( this.canBeRotated() )
{
data.setString( "forward", this.forward.name() );
data.setString( "up", this.up.name() );
data.setString( "forward", this.getForward().name() );
data.setString( "up", this.getUp().name() );
}
if( this.customName != null )
src/main/java/appeng/tile/networking/TileController.java
+4 -4
View File
@@ -109,23 +109,23 @@ public class TileController extends AENetworkPowerTile
return;
}
ControllerBlockState metaState = ControllerBlockState.OFFLINE;
ControllerBlockState metaState = ControllerBlockState.offline;
try
{
if( this.getProxy().getEnergy().isNetworkPowered() )
{
metaState = ControllerBlockState.ONLINE;
metaState = ControllerBlockState.online;
if( this.getProxy().getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT )
{
metaState = ControllerBlockState.CONFLICTED;
metaState = ControllerBlockState.conflicted;
}
}
}
catch( final GridAccessException e )
{
metaState = ControllerBlockState.OFFLINE;
metaState = ControllerBlockState.offline;
}
if( this.checkController( this.pos ) && this.worldObj.getBlockState( this.pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState )