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

Improved readability of variables

Browse Source 
Hopefully improved semantics of variables

Fixed typos

Added hyphenations
This commit is contained in:
thatsIch
2014-09-28 11:47:17 +02:00
parent 6b60a0996b
commit 76b147fd5b
220 changed files with 1643 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/p2p/PartP2PBCPower.java
+18 -18
View File
@@ -1,5 +1,6 @@
package appeng.parts.p2p;
import appeng.integration.abstraction.helpers.BaseMJPerdition;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -18,7 +19,6 @@ import appeng.core.settings.TickRates;
import appeng.integration.IntegrationType;
import appeng.integration.abstraction.IMJ5;
import appeng.integration.abstraction.IMJ6;
import appeng.integration.abstraction.helpers.BaseMJperdition;
import appeng.me.GridAccessException;
import appeng.me.cache.helpers.TunnelCollection;
import appeng.transformer.annotations.integration.Interface;
@@ -40,7 +40,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPowerReceptor, ISidedBatteryProvider, IBatteryObject, IGridTickable
{
BaseMJperdition pp;
BaseMJPerdition pp;
public TunnelType getTunnelType()
{
@@ -55,7 +55,7 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.MJ5 ) )
{
pp = (BaseMJperdition) ((IMJ5) AppEng.instance.getIntegration( IntegrationType.MJ5 )).createPerdition( this );
pp = (BaseMJPerdition) ((IMJ5) AppEng.instance.getIntegration( IntegrationType.MJ5 )).createPerdition( this );
if ( pp != null )
pp.configure( 1, 380, 1.0f / 5.0f, 1000 );
}
@@ -75,18 +75,18 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
if ( !output && proxy.isActive() )
{
float totalRequiredPower = 0.0f;
TunnelCollection<PartP2PBCPower> tunnelset;
TunnelCollection<PartP2PBCPower> tunnels;
try
{
tunnelset = getOutputs();
tunnels = getOutputs();
}
catch (GridAccessException e)
{
return TickRateModulation.IDLE;
}
for (PartP2PBCPower o : tunnelset)
for (PartP2PBCPower o : tunnels)
{
IPowerReceptor target = o.getPowerTarget();
if ( target != null )
@@ -94,14 +94,14 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
PowerReceiver tp = target.getPowerReceiver( side.getOpposite() );
if ( tp != null )
{
double howmuch = tp.powerRequest();
double request = tp.powerRequest();
if ( howmuch > tp.getMaxEnergyReceived() )
howmuch = tp.getMaxEnergyReceived();
if ( request > tp.getMaxEnergyReceived() )
request = tp.getMaxEnergyReceived();
if ( howmuch > 0.01 && howmuch > tp.getMinEnergyReceived() )
if ( request > 0.01 && request > tp.getMinEnergyReceived() )
{
totalRequiredPower += howmuch;
totalRequiredPower += request;
}
}
}
@@ -114,7 +114,7 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
if ( currentTotal < 0.01 )
return TickRateModulation.SLOWER;
for (PartP2PBCPower o : tunnelset)
for (PartP2PBCPower o : tunnels)
{
IPowerReceptor target = o.getPowerTarget();
if ( target != null )
@@ -122,14 +122,14 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
PowerReceiver tp = target.getPowerReceiver( side.getOpposite() );
if ( tp != null )
{
double howmuch = tp.powerRequest();
double request = tp.powerRequest();
if ( howmuch > tp.getMaxEnergyReceived() )
howmuch = tp.getMaxEnergyReceived();
if ( request > tp.getMaxEnergyReceived() )
request = tp.getMaxEnergyReceived();
if ( howmuch > 0.01 && howmuch > tp.getMinEnergyReceived() )
if ( request > 0.01 && request > tp.getMinEnergyReceived() )
{
double toPull = currentTotal * (howmuch / totalRequiredPower);
double toPull = currentTotal * (request / totalRequiredPower);
double pulled = pp.useEnergy( 0, toPull, true );
QueueTunnelDrain( PowerUnits.MJ, pulled );
@@ -204,7 +204,7 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
public PowerReceiver getPowerReceiver(ForgeDirection side)
{
if ( side.equals( side ) )
return ((BaseMJperdition) pp).getPowerReceiver();
return ((BaseMJPerdition) pp).getPowerReceiver();
return null;
}
src/main/java/appeng/parts/p2p/PartP2PLiquids.java
+3 -3
View File
@@ -93,10 +93,10 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
{
for (PartP2PLiquids l : getOutputs())
{
IFluidHandler targ = l.getTarget();
if ( targ != null )
IFluidHandler handler = l.getTarget();
if ( handler != null )
{
if ( targ.canFill( l.side.getOpposite(), input ) )
if ( handler.canFill( l.side.getOpposite(), input ) )
outs.add( l );
}
}
src/main/java/appeng/parts/p2p/PartP2PRFPower.java
+6 -6
View File
@@ -114,9 +114,9 @@ public class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements cof
{
if ( Platform.getRandomInt() % 2 > 0 )
{
int recv = t.getOutput().receiveEnergy( t.side.getOpposite(), maxReceive, simulate );
maxReceive -= recv;
total += recv;
int receiver = t.getOutput().receiveEnergy( t.side.getOpposite(), maxReceive, simulate );
maxReceive -= receiver;
total += receiver;
if ( maxReceive <= 0 )
break;
@@ -127,9 +127,9 @@ public class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements cof
{
for (PartP2PRFPower t : getOutputs())
{
int recv = t.getOutput().receiveEnergy( t.side.getOpposite(), maxReceive, simulate );
maxReceive -= recv;
total += recv;
int receiver = t.getOutput().receiveEnergy( t.side.getOpposite(), maxReceive, simulate );
maxReceive -= receiver;
total += receiver;
if ( maxReceive <= 0 )
break;
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+5 -5
View File
@@ -118,7 +118,7 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
}
mc.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
}
else if ( tt != null ) // attune-ment
else if ( tt != null ) // attunement
{
ItemStack newType = null;
@@ -268,12 +268,12 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
if ( freq == 0 )
return null;
PartP2PTunnel tunn;
PartP2PTunnel tunnel;
try
{
tunn = proxy.getP2P().getInput( freq );
if ( getClass().isInstance( tunn ) )
return (T) tunn;
tunnel = proxy.getP2P().getInput( freq );
if ( getClass().isInstance( tunnel ) )
return (T) tunnel;
}
catch (GridAccessException e)
{