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

Merge pull request #1420 from thatsIch/e-method-parameter-naming-conventions

Browse Source 
Replaces all method parameter regarding their naming conventions
This commit is contained in:
thatsIch
2015-05-08 23:45:28 +02:00
parent c451a25c7f f193c2adc4
commit 5832e2d828
76 changed files with 381 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+8 -8
View File
@@ -421,7 +421,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
}
@Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
{
if( this.inv.getStackInSlot( 9 ) != null )
{
@@ -447,7 +447,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
if( this.reboot )
{
TicksSinceLastCall = 1;
ticksSinceLastCall = 1;
}
if( !this.isAwake )
@@ -460,22 +460,22 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
switch( this.upgrades.getInstalledUpgrades( Upgrades.SPEED ) )
{
case 0:
this.progress += this.userPower( TicksSinceLastCall, speed = 10, 1.0 );
this.progress += this.userPower( ticksSinceLastCall, speed = 10, 1.0 );
break;
case 1:
this.progress += this.userPower( TicksSinceLastCall, speed = 13, 1.3 );
this.progress += this.userPower( ticksSinceLastCall, speed = 13, 1.3 );
break;
case 2:
this.progress += this.userPower( TicksSinceLastCall, speed = 17, 1.7 );
this.progress += this.userPower( ticksSinceLastCall, speed = 17, 1.7 );
break;
case 3:
this.progress += this.userPower( TicksSinceLastCall, speed = 20, 2.0 );
this.progress += this.userPower( ticksSinceLastCall, speed = 20, 2.0 );
break;
case 4:
this.progress += this.userPower( TicksSinceLastCall, speed = 25, 2.5 );
this.progress += this.userPower( ticksSinceLastCall, speed = 25, 2.5 );
break;
case 5:
this.progress += this.userPower( TicksSinceLastCall, speed = 50, 5.0 );
this.progress += this.userPower( ticksSinceLastCall, speed = 50, 5.0 );
break;
}
src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
+2 -2
View File
@@ -43,9 +43,9 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
final int size;
int maxStack;
public AppEngInternalAEInventory( IAEAppEngInventory _te, int s )
public AppEngInternalAEInventory( IAEAppEngInventory te, int s )
{
this.te = _te;
this.te = te;
this.size = s;
this.maxStack = 64;
this.inv = new IAEItemStack[s];
src/main/java/appeng/tile/misc/TileInscriber.java
+4 -4
View File
@@ -25,6 +25,8 @@ import java.util.EnumSet;
import java.util.List;
import javax.annotation.Nullable;
import com.google.common.collect.Lists;
import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.IInventory;
@@ -33,8 +35,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.collect.Lists;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -418,7 +418,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
{
if( this.smash )
{
@@ -482,7 +482,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
else
{
this.processingTime += TicksSinceLastCall * speedFactor;
this.processingTime += ticksSinceLastCall * speedFactor;
}
}
}
src/main/java/appeng/tile/misc/TileInterface.java
+4 -4
View File
@@ -22,6 +22,8 @@ package appeng.tile.misc;
import java.util.ArrayList;
import java.util.EnumSet;
import com.google.common.collect.ImmutableSet;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
@@ -30,8 +32,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.collect.ImmutableSet;
import appeng.api.config.Actionable;
import appeng.api.config.Upgrades;
import appeng.api.implementations.tiles.ITileStorageMonitorable;
@@ -213,9 +213,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
}
@Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
{
return this.duality.tickingRequest( node, TicksSinceLastCall );
return this.duality.tickingRequest( node, ticksSinceLastCall );
}
@Override
src/main/java/appeng/tile/networking/TileController.java
+3 -3
View File
@@ -141,11 +141,11 @@ public class TileController extends AENetworkPowerTile
}
@Override
protected double funnelPowerIntoStorage( double AEUnits, Actionable mode )
protected double funnelPowerIntoStorage( double power, Actionable mode )
{
try
{
double ret = this.gridProxy.getEnergy().injectPower( AEUnits, mode );
double ret = this.gridProxy.getEnergy().injectPower( power, mode );
if( mode == Actionable.SIMULATE )
{
return ret;
@@ -155,7 +155,7 @@ public class TileController extends AENetworkPowerTile
catch( GridAccessException e )
{
// no grid? use local...
return super.funnelPowerIntoStorage( AEUnits, mode );
return super.funnelPowerIntoStorage( power, mode );
}
}
src/main/java/appeng/tile/networking/TileEnergyAcceptor.java
+3 -3
View File
@@ -82,12 +82,12 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
}
@Override
protected double funnelPowerIntoStorage( double newPower, Actionable mode )
protected double funnelPowerIntoStorage( double power, Actionable mode )
{
try
{
IEnergyGrid grid = this.gridProxy.getEnergy();
double leftOver = grid.injectPower( newPower, mode );
double leftOver = grid.injectPower( power, mode );
if( mode == Actionable.SIMULATE )
{
return leftOver;
@@ -96,7 +96,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
}
catch( GridAccessException e )
{
return super.funnelPowerIntoStorage( newPower, mode );
return super.funnelPowerIntoStorage( power, mode );
}
}
src/main/java/appeng/tile/powersink/AERootPoweredTile.java
+2 -2
View File
@@ -86,9 +86,9 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
return PowerUnits.AE.convertTo( input, this.funnelPowerIntoStorage( input.convertTo( PowerUnits.AE, amt ), Actionable.MODULATE ) );
}
protected double funnelPowerIntoStorage( double AEUnits, Actionable mode )
protected double funnelPowerIntoStorage( double power, Actionable mode )
{
return this.injectAEPower( AEUnits, mode );
return this.injectAEPower( power, mode );
}
@Override
src/main/java/appeng/tile/storage/TileIOPort.java
+1 -1
View File
@@ -311,7 +311,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
}
@Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
{
if( !this.gridProxy.isActive() )
{