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/parts/p2p/PartP2PItems.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
}
/*
* if ( AppEng.instance.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.instance.getIntegration(
* if ( AppEng.INSTANCE.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.INSTANCE.getIntegration(
* "TE" ); if ( thermal != null ) { if ( thermal.isPipe( te, side.getOpposite() ) ) { try { output = new
* WrapperTEPipe( te, side.getOpposite() ); } catch (Throwable ignore) { } } } }
*/
src/main/java/appeng/parts/p2p/PartP2PLiquids.java
+8 -8
View File
@@ -42,8 +42,8 @@ import appeng.me.GridAccessException;
public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFluidHandler
{
private final static FluidTankInfo[] activeTank = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) };
private final static FluidTankInfo[] inactiveTank = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) };
private final static FluidTankInfo[] ACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) };
private final static FluidTankInfo[] INACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) };
@Override
public TunnelType getTunnelType()
@@ -61,21 +61,21 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
{
PartP2PLiquids tun = this.getInput();
if ( tun != null )
return activeTank;
return ACTIVE_TANK;
}
else
{
try
{
if ( !this.getOutputs().isEmpty() )
return activeTank;
return ACTIVE_TANK;
}
catch (GridAccessException e)
{
// :(
}
}
return inactiveTank;
return INACTIVE_TANK;
}
IFluidHandler cachedTank;
@@ -151,14 +151,14 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
return null;
}
static final ThreadLocal<Stack<PartP2PLiquids>> depth = new ThreadLocal<Stack<PartP2PLiquids>>();
static final ThreadLocal<Stack<PartP2PLiquids>> DEPTH = new ThreadLocal<Stack<PartP2PLiquids>>();
private Stack<PartP2PLiquids> getDepth()
{
Stack<PartP2PLiquids> s = depth.get();
Stack<PartP2PLiquids> s = DEPTH.get();
if ( s == null )
depth.set( s = new Stack<PartP2PLiquids>() );
DEPTH.set( s = new Stack<PartP2PLiquids>() );
return s;
}
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+1 -1
View File
@@ -375,7 +375,7 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
protected void QueueTunnelDrain(PowerUnits unit, double f)
{
double ae_to_tax = unit.convertTo( PowerUnits.AE, f * AEConfig.TunnelPowerLoss );
double ae_to_tax = unit.convertTo( PowerUnits.AE, f * AEConfig.TUNNEL_POWER_LOSS );
try
{
src/main/java/appeng/parts/p2p/PartP2PTunnelME.java
+3 -3
View File
@@ -145,19 +145,19 @@ public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements I
if ( !this.proxy.getEnergy().isNetworkPowered() )
{
this.connection.markDestroy();
TickHandler.instance.addCallable( this.tile.getWorldObj(), this.connection );
TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection );
}
else
{
if ( this.proxy.isActive() )
{
this.connection.markCreate();
TickHandler.instance.addCallable( this.tile.getWorldObj(), this.connection );
TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection );
}
else
{
this.connection.markDestroy();
TickHandler.instance.addCallable( this.tile.getWorldObj(), this.connection );
TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection );
}
}