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

Modifier are now using a consistent order based on the java conventions

Browse Source
This commit is contained in:
yueh
2015-04-06 00:35:42 +02:00
parent e2d0e5d424
commit eaf57bedf6
109 changed files with 268 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/powersink/AERootPoweredTile.java
+8 -8
View File
@@ -71,7 +71,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
this.internalCurrentPower = data.getDouble( "internalCurrentPower" );
}
final protected double getExternalPowerDemand( PowerUnits externalUnit, double maxPowerRequired )
protected final double getExternalPowerDemand( PowerUnits externalUnit, double maxPowerRequired )
{
return PowerUnits.AE.convertTo( externalUnit, Math.max( 0.0, this.getFunnelPowerDemand( externalUnit.convertTo( PowerUnits.AE, maxPowerRequired ) ) ) );
}
@@ -81,7 +81,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
return this.internalMaxPower - this.internalCurrentPower;
}
final public double injectExternalPower( PowerUnits input, double amt )
public final double injectExternalPower( PowerUnits input, double amt )
{
return PowerUnits.AE.convertTo( input, this.funnelPowerIntoStorage( input.convertTo( PowerUnits.AE, amt ), Actionable.MODULATE ) );
}
@@ -92,7 +92,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
}
@Override
final public double injectAEPower( double amt, Actionable mode )
public final double injectAEPower( double amt, Actionable mode )
{
if( amt < 0.000001 )
return 0;
@@ -129,31 +129,31 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
}
@Override
final public double getAEMaxPower()
public final double getAEMaxPower()
{
return this.internalMaxPower;
}
@Override
final public double getAECurrentPower()
public final double getAECurrentPower()
{
return this.internalCurrentPower;
}
@Override
final public boolean isAEPublicPowerStorage()
public final boolean isAEPublicPowerStorage()
{
return this.internalPublicPowerStorage;
}
@Override
final public AccessRestriction getPowerFlow()
public final AccessRestriction getPowerFlow()
{
return this.internalPowerFlow;
}
@Override
final public double extractAEPower( double amt, Actionable mode, PowerMultiplier multiplier )
public final double extractAEPower( double amt, Actionable mode, PowerMultiplier multiplier )
{
return multiplier.divide( this.extractAEPower( multiplier.multiply( amt ), mode ) );
}
src/main/java/appeng/tile/powersink/IC2.java
+4 -4
View File
@@ -41,25 +41,25 @@ public abstract class IC2 extends AERootPoweredTile implements IEnergySink
boolean isInIC2 = false;
@Override
final public boolean acceptsEnergyFrom( TileEntity emitter, ForgeDirection direction )
public final boolean acceptsEnergyFrom( TileEntity emitter, ForgeDirection direction )
{
return this.getPowerSides().contains( direction );
}
@Override
final public double getDemandedEnergy()
public final double getDemandedEnergy()
{
return this.getExternalPowerDemand( PowerUnits.EU, Double.MAX_VALUE );
}
@Override
final public int getSinkTier()
public final int getSinkTier()
{
return Integer.MAX_VALUE;
}
@Override
final public double injectEnergy( ForgeDirection directionFrom, double amount, double voltage )
public final double injectEnergy( ForgeDirection directionFrom, double amount, double voltage )
{
// just store the excess in the current block, if I return the waste,
// IC2 will just disintegrate it - Oct 20th 2013
src/main/java/appeng/tile/powersink/RedstoneFlux.java
+4 -4
View File
@@ -31,7 +31,7 @@ import appeng.transformer.annotations.Integration.Interface;
public abstract class RedstoneFlux extends RotaryCraft implements IEnergyReceiver
{
@Override
final public int receiveEnergy( ForgeDirection from, int maxReceive, boolean simulate )
public final int receiveEnergy( ForgeDirection from, int maxReceive, boolean simulate )
{
final int networkRFDemand = (int) Math.floor( this.getExternalPowerDemand( PowerUnits.RF, maxReceive ) );
final int usedRF = Math.min( maxReceive, networkRFDemand );
@@ -45,19 +45,19 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyReceive
}
@Override
final public int getEnergyStored( ForgeDirection from )
public final int getEnergyStored( ForgeDirection from )
{
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAECurrentPower() ) );
}
@Override
final public int getMaxEnergyStored( ForgeDirection from )
public final int getMaxEnergyStored( ForgeDirection from )
{
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAEMaxPower() ) );
}
@Override
final public boolean canConnectEnergy( ForgeDirection from )
public final boolean canConnectEnergy( ForgeDirection from )
{
return this.getPowerSides().contains( from );
}
src/main/java/appeng/tile/powersink/RotaryCraft.java
+14 -14
View File
@@ -49,43 +49,43 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
}
@Override
final public int getOmega()
public final int getOmega()
{
return this.omega;
}
@Override
final public int getTorque()
public final int getTorque()
{
return this.torque;
}
@Override
final public long getPower()
public final long getPower()
{
return this.power;
}
@Override
final public String getName()
public final String getName()
{
return "AE";
}
@Override
final public int getIORenderAlpha()
public final int getIORenderAlpha()
{
return this.alpha;
}
@Override
final public void setIORenderAlpha( int io )
public final void setIORenderAlpha( int io )
{
this.alpha = io;
}
@Override
final public void setPower( long p )
public final void setPower( long p )
{
if( Platform.isClient() )
return;
@@ -94,7 +94,7 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
}
@Override
final public void noInputMachine()
public final void noInputMachine()
{
this.power = 0;
this.torque = 0;
@@ -102,18 +102,18 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
}
@Override
final public void setTorque( int t )
public final void setTorque( int t )
{
this.torque = t;
}
@Override
final public void setOmega( int o )
public final void setOmega( int o )
{
this.omega = o;
}
final public boolean canReadFromBlock( int x, int y, int z )
public final boolean canReadFromBlock( int x, int y, int z )
{
ForgeDirection side = ForgeDirection.UNKNOWN;
@@ -134,19 +134,19 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
}
@Override
final public boolean canReadFrom( ForgeDirection side )
public final boolean canReadFrom( ForgeDirection side )
{
return this.getPowerSides().contains( side );
}
@Override
final public boolean isReceiving()
public final boolean isReceiving()
{
return true;
}
@Override
final public int getMinTorque( int available )
public final int getMinTorque( int available )
{
return 0;
}
src/main/java/appeng/tile/powersink/UniversalElectricity.java
+6 -6
View File
@@ -28,13 +28,13 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I
{
@Override
final public boolean canConnect(ForgeDirection direction)
public final boolean canConnect(ForgeDirection direction)
{
return internalCanAcceptPower && getPowerSides().contains( direction );
}
@Override
final public float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive)
public final float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive)
{
float accepted = 0;
double receivedPower = receive.getWatts();
@@ -56,25 +56,25 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I
}
@Override
final public float getRequest(ForgeDirection direction)
public final float getRequest(ForgeDirection direction)
{
return (float) getExternalPowerDemand( PowerUnits.KJ );
}
@Override
final public float getVoltage()
public final float getVoltage()
{
return 120;
}
@Override
final public ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide)
public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide)
{
return null; // cannot be dis-charged
}
@Override
final public float getProvide(ForgeDirection direction)
public final float getProvide(ForgeDirection direction)
{
return 0;
}