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

Renamed constants

Browse Source
This commit is contained in:
thatsIch
2015-01-01 22:13:10 +01:00
parent e0175bac98
commit 52c512635d
118 changed files with 511 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/networking/BlockCableBus.java
+6 -6
View File
@@ -78,7 +78,7 @@ import appeng.util.Platform;
public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{
static private final ICableBusContainer nullCB = new NullCableBusContainer();
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
static public Class<? extends TileEntity> noTesrTile;
static public Class<? extends TileEntity> tesrTile;
@@ -97,7 +97,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
}
public BlockCableBus() {
super( BlockCableBus.class, AEGlassMaterial.instance );
super( BlockCableBus.class, AEGlassMaterial.INSTANCE );
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setLightOpacity( 0 );
this.isFullSize = this.isOpaque = false;
@@ -227,7 +227,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@Override
public boolean canRenderInPass(int pass)
{
BusRenderHelper.instance.setPass( pass );
BusRenderHelper.INSTANCE.setPass( pass );
if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
return true;
@@ -424,10 +424,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
public void setupTile()
{
this.setTileEntity( noTesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBus.class.getName() ) );
this.setTileEntity( noTesrTile = Api.INSTANCE.partHelper.getCombinedInstance( TileCableBus.class.getName() ) );
if ( Platform.isClient() )
{
tesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBusTESR.class.getName() );
tesrTile = Api.INSTANCE.partHelper.getCombinedInstance( TileCableBusTESR.class.getName() );
GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" );
CommonHelper.proxy.bindTileEntitySpecialRenderer( tesrTile, this );
}
@@ -444,7 +444,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
else if ( AppEng.instance.isIntegrationEnabled( IntegrationType.FMP ) )
out = ((IFMP) AppEng.instance.getIntegration( IntegrationType.FMP )).getCableContainer( te );
return out == null ? nullCB : out;
return out == null ? NULL_CABLE_BUS : out;
}
/**
src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class BlockCreativeEnergyCell extends AEBaseBlock
{
public BlockCreativeEnergyCell() {
super( BlockCreativeEnergyCell.class, AEGlassMaterial.instance );
super( BlockCreativeEnergyCell.class, AEGlassMaterial.INSTANCE );
this.setFeature( EnumSet.of( AEFeature.Creative ) );
this.setTileEntity( TileCreativeEnergyCell.class );
}
src/main/java/appeng/block/networking/BlockEnergyCell.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class BlockEnergyCell extends AEBaseBlock
}
public BlockEnergyCell(Class c) {
super( c, AEGlassMaterial.instance );
super( c, AEGlassMaterial.INSTANCE );
}
public BlockEnergyCell() {
src/main/java/appeng/block/networking/BlockWireless.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
{
public BlockWireless() {
super( BlockWireless.class, AEGlassMaterial.instance );
super( BlockWireless.class, AEGlassMaterial.INSTANCE );
this.setFeature( EnumSet.of( AEFeature.Core, AEFeature.WirelessAccessTerminal ) );
this.setTileEntity( TileWireless.class );
this.setLightOpacity( 0 );