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/crafting/CraftingJob.java
+9 -9
View File
@@ -139,15 +139,15 @@ public class CraftingJob implements Runnable, ICraftingJob
try
{
TickHandler.instance.registerCraftingSimulation( world, this );
handlepausing();
handlePausing();
Stopwatch timer = Stopwatch.createStarted();
MECraftingInventory meci = new MECraftingInventory( original, true, false, true );
meci.ignore( output );
MECraftingInventory craftingInventory = new MECraftingInventory( original, true, false, true );
craftingInventory.ignore( output );
availableCheck = new MECraftingInventory( original, false, false, false );
tree.request( meci, output.getStackSize(), actionSrc );
tree.request( craftingInventory, output.getStackSize(), actionSrc );
tree.dive( this );
for (String s : opsAndMultiplier.keySet())
@@ -158,7 +158,7 @@ public class CraftingJob implements Runnable, ICraftingJob
AELog.crafting( "------------- " + getByteTotal() + "b real" + timer.elapsed( TimeUnit.MILLISECONDS ) + "ms" );
// if ( mode == Actionable.MODULATE )
// meci.moveItemsToStorage( storage );
// craftingInventory.moveItemsToStorage( storage );
}
catch (CraftBranchFailure e)
{
@@ -167,13 +167,13 @@ public class CraftingJob implements Runnable, ICraftingJob
try
{
Stopwatch timer = Stopwatch.createStarted();
MECraftingInventory meci = new MECraftingInventory( original, true, false, true );
meci.ignore( output );
MECraftingInventory craftingInventory = new MECraftingInventory( original, true, false, true );
craftingInventory.ignore( output );
availableCheck = new MECraftingInventory( original, false, false, false );
tree.setSimulate();
tree.request( meci, output.getStackSize(), actionSrc );
tree.request( craftingInventory, output.getStackSize(), actionSrc );
tree.dive( this );
for (String s : opsAndMultiplier.keySet())
@@ -300,7 +300,7 @@ public class CraftingJob implements Runnable, ICraftingJob
private int incTime = Integer.MAX_VALUE;
public void handlepausing() throws InterruptedException
public void handlePausing() throws InterruptedException
{
if ( incTime++ > 100 )
{
src/main/java/appeng/crafting/CraftingTreeNode.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class CraftingTreeNode
public IAEItemStack request(MECraftingInventory inv, long l, BaseActionSource src) throws CraftBranchFailure, InterruptedException
{
job.handlepausing();
job.handlePausing();
List<IAEItemStack> thingsUsed = new LinkedList();
src/main/java/appeng/crafting/CraftingTreeProcess.java
+7 -7
View File
@@ -31,7 +31,7 @@ public class CraftingTreeProcess
long crafts = 0;
boolean containerItems;
boolean limitQty;
boolean fullsimulation;
boolean fullSimulation;
private long bytes = 0;
final private int depth;
@@ -61,7 +61,7 @@ public class CraftingTreeProcess
{
ItemStack g = ic.getStackInSlot( x );
if ( g != null && g.stackSize > 1 )
fullsimulation = true;
fullSimulation = true;
}
for ( IAEItemStack part : details.getCondensedInputs() )
@@ -100,8 +100,8 @@ public class CraftingTreeProcess
{
for (int x = 0; x < list.length; x++)
{
IAEItemStack ppart = list[x];
if ( part != null && part.equals( ppart ) )
IAEItemStack comparePart = list[x];
if ( part != null && part.equals( comparePart ) )
{
// use the first slot...
nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, x, depth + 1 ), part.getStackSize() );
@@ -142,7 +142,7 @@ public class CraftingTreeProcess
long getTimes(long remaining, long stackSize)
{
if ( limitQty || fullsimulation )
if ( limitQty || fullSimulation )
return 1;
return (remaining / stackSize) + (remaining % stackSize != 0 ? 1 : 0);
}
@@ -175,9 +175,9 @@ public class CraftingTreeProcess
public void request(MECraftingInventory inv, long i, BaseActionSource src) throws CraftBranchFailure, InterruptedException
{
job.handlepausing();
job.handlePausing();
if ( fullsimulation )
if ( fullSimulation )
{
InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );