From 542c1dcdbd468626f0b2fb4b79794b0c15f03066 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Tue, 4 Nov 2014 12:32:33 +0100 Subject: [PATCH] Improved various typos --- .../implementations/CraftingCPURecord.java | 4 ++-- .../appeng/crafting/CraftingTreeProcess.java | 2 +- .../java/appeng/debug/TilePhantomNode.java | 12 +++++----- src/main/java/appeng/hooks/TickHandler.java | 1 - .../helpers/BSCrateStorageAdaptor.java | 16 ++++++------- .../items/storage/ItemSpatialStorageCell.java | 8 +++---- .../implementations/QuantumCluster.java | 2 +- .../parts/automation/PartImportBus.java | 6 ++--- .../java/appeng/parts/p2p/PartP2PItems.java | 24 +++++++++---------- src/main/java/appeng/recipes/RecipeData.java | 2 +- .../java/appeng/recipes/RecipeHandler.java | 4 ++-- src/main/java/appeng/spatial/CachedPlane.java | 12 +++++----- .../java/appeng/spatial/StorageHelper.java | 12 +++++----- .../appeng/tile/qnb/TileQuantumBridge.java | 2 +- .../java/appeng/tile/storage/TileIOPort.java | 6 ++--- 15 files changed, 56 insertions(+), 57 deletions(-) diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/main/java/appeng/container/implementations/CraftingCPURecord.java index be0d0e3c..741d0906 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPURecord.java +++ b/src/main/java/appeng/container/implementations/CraftingCPURecord.java @@ -13,9 +13,9 @@ public class CraftingCPURecord implements Comparable public final String myName; - public CraftingCPURecord(long size, int proc, ICraftingCPU server) { + public CraftingCPURecord(long size, int coProcessors, ICraftingCPU server) { this.size = size; - this.processors = proc; + this.processors = coProcessors; this.cpu = server; myName = server.getName(); } diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 205886c9..ecc62680 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -95,7 +95,7 @@ public class CraftingTreeProcess } else { - // this is minorly different then below, this slot uses the pattern, but kinda fudges it. + // this is minor different then below, this slot uses the pattern, but kinda fudges it. for (IAEItemStack part : details.getCondensedInputs()) { for (int x = 0; x < list.length; x++) diff --git a/src/main/java/appeng/debug/TilePhantomNode.java b/src/main/java/appeng/debug/TilePhantomNode.java index 924ccf73..ec9f9596 100644 --- a/src/main/java/appeng/debug/TilePhantomNode.java +++ b/src/main/java/appeng/debug/TilePhantomNode.java @@ -10,15 +10,15 @@ import appeng.tile.grid.AENetworkTile; public class TilePhantomNode extends AENetworkTile { - protected AENetworkProxy RWAR = null; + protected AENetworkProxy proxy = null; boolean crashMode = false; @Override public void onReady() { super.onReady(); - RWAR = createProxy(); - RWAR.onReady(); + proxy = createProxy(); + proxy.onReady(); crashMode = true; } @@ -28,15 +28,15 @@ public class TilePhantomNode extends AENetworkTile if ( !crashMode ) return super.getGridNode( dir ); - return RWAR.getNode(); + return proxy.getNode(); } public void BOOM() { - if ( RWAR != null ) + if ( proxy != null ) { crashMode = true; - RWAR.setValidSides( EnumSet.allOf( ForgeDirection.class ) ); + proxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) ); } } } diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index d361ea62..ed01648f 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -205,7 +205,6 @@ public class TickHandler } } - // rwar! if ( ev.type == Type.WORLD && ev.phase == Phase.END ) { WorldTickEvent wte = (WorldTickEvent) ev; diff --git a/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java b/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java index 1c3b7087..9f991ec7 100644 --- a/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java +++ b/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java @@ -24,7 +24,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor } @Override - public ItemStack removeItems(int how_many, ItemStack Filter, IInventoryDestination dest) + public ItemStack removeItems(int how_many, ItemStack Filter, IInventoryDestination destination) { ItemStack target = null; @@ -34,7 +34,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor { if ( is.stackSize > 0 && (Filter == null || Platform.isSameItem( Filter, is )) ) { - if ( dest == null || dest.canInsert( is ) ) + if ( destination == null || destination.canInsert( is ) ) { target = is; break; @@ -54,7 +54,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor } @Override - public ItemStack simulateRemove(int how_many, ItemStack Filter, IInventoryDestination dest) + public ItemStack simulateRemove(int how_many, ItemStack Filter, IInventoryDestination destination) { ItemStack target = null; @@ -64,7 +64,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor { if ( is.stackSize > 0 && (Filter == null || Platform.isSameItem( Filter, is )) ) { - if ( dest == null || dest.canInsert( is ) ) + if ( destination == null || destination.canInsert( is ) ) { target = is; break; @@ -89,7 +89,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor } @Override - public ItemStack removeSimilarItems(int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination dest) + public ItemStack removeSimilarItems(int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination) { ItemStack target = null; @@ -99,7 +99,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor { if ( is.stackSize > 0 && (filter == null || Platform.isSameItemFuzzy( filter, is, fuzzyMode )) ) { - if ( dest == null || dest.canInsert( is ) ) + if ( destination == null || destination.canInsert( is ) ) { target = is; break; @@ -119,7 +119,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor } @Override - public ItemStack simulateSimilarRemove(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination dest) + public ItemStack simulateSimilarRemove(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination) { ItemStack target = null; @@ -129,7 +129,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor { if ( is.stackSize > 0 && (filter == null || Platform.isSameItemFuzzy( filter, is, fuzzyMode )) ) { - if ( dest == null || dest.canInsert( is ) ) + if ( destination == null || destination.canInsert( is ) ) { target = is; break; diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index 3f63f950..2b57d0a3 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -160,17 +160,17 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag int maxSize = getMaxStoredDim( is ); int floorBuffer = 64; - World dest = getWorld( is ); + World destination = getWorld( is ); if ( (scale.x == 0 && scale.y == 0 && scale.z == 0) || (scale.x == targetX && scale.y == targetY && scale.z == targetZ) ) { if ( targetX <= maxSize && targetY <= maxSize && targetZ <= maxSize ) { - if ( dest == null ) - dest = createNewWorld( is ); + if ( destination == null ) + destination = createNewWorld( is ); StorageHelper.getInstance() - .swapRegions( w, dest, min.x + 1, min.y + 1, min.z + 1, 1, floorBuffer + 1, 1, targetX - 1, targetY - 1, targetZ - 1 ); + .swapRegions( w, destination, min.x + 1, min.y + 1, min.z + 1, 1, floorBuffer + 1, 1, targetX - 1, targetY - 1, targetZ - 1 ); setStoredSize( is, targetX, targetY, targetZ ); return new TransitionResult( true, 0 ); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index c1a2aae5..d2db8584 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -96,7 +96,7 @@ public class QuantumCluster implements ILocatable, IAECluster { long qe; - qe = center.getQEDest(); + qe = center.getQEFrequency(); if ( thisSide != qe && thisSide != -qe ) { diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index a1be7c1f..b8b1623f 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -74,7 +74,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin return out.getStackSize() != stack.stackSize; } - private IInventoryDestination configDest(IMEMonitor itemInventory) + private IInventoryDestination configDestination( IMEMonitor itemInventory ) { destination = itemInventory; return this; @@ -235,9 +235,9 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin ItemStack newItems; if ( getInstalledUpgrades( Upgrades.FUZZY ) > 0 ) - newItems = myAdaptor.removeSimilarItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), fzMode, configDest( inv ) ); + newItems = myAdaptor.removeSimilarItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), fzMode, configDestination( inv ) ); else - newItems = myAdaptor.removeItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), configDest( inv ) ); + newItems = myAdaptor.removeItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), configDestination( inv ) ); if ( newItems != null ) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index f76ae29e..ee51765f 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -145,7 +145,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo return wasReq ? TickRateModulation.FASTER : TickRateModulation.SLOWER; } - IInventory getDest() + IInventory getDestination() { requested = true; @@ -186,7 +186,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { cachedInv = null; int olderSize = oldSize; - oldSize = getDest().getSizeInventory(); + oldSize = getDestination().getSizeInventory(); if ( olderSize != oldSize ) { getHost().notifyNeighbors(); @@ -201,7 +201,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { cachedInv = null; int olderSize = oldSize; - oldSize = getDest().getSizeInventory(); + oldSize = getDestination().getSizeInventory(); if ( olderSize != oldSize ) { getHost().notifyNeighbors(); @@ -216,7 +216,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { cachedInv = null; int olderSize = oldSize; - oldSize = getDest().getSizeInventory(); + oldSize = getDestination().getSizeInventory(); if ( olderSize != oldSize ) { getHost().notifyNeighbors(); @@ -231,7 +231,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { cachedInv = null; int olderSize = oldSize; - oldSize = getDest().getSizeInventory(); + oldSize = getDestination().getSizeInventory(); if ( olderSize != oldSize ) { getHost().notifyNeighbors(); @@ -255,19 +255,19 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public int getSizeInventory() { - return getDest().getSizeInventory(); + return getDestination().getSizeInventory(); } @Override public ItemStack getStackInSlot(int i) { - return getDest().getStackInSlot( i ); + return getDestination().getStackInSlot( i ); } @Override public ItemStack decrStackSize(int i, int j) { - return getDest().decrStackSize( i, j ); + return getDestination().decrStackSize( i, j ); } @Override @@ -279,7 +279,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public void setInventorySlotContents(int i, ItemStack itemstack) { - getDest().setInventorySlotContents( i, itemstack ); + getDestination().setInventorySlotContents( i, itemstack ); } @Override @@ -297,7 +297,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public int getInventoryStackLimit() { - return getDest().getInventoryStackLimit(); + return getDestination().getInventoryStackLimit(); } @Override @@ -313,7 +313,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public boolean isItemValidForSlot(int i, net.minecraft.item.ItemStack itemstack) { - return getDest().isItemValidForSlot( i, itemstack ); + return getDestination().isItemValidForSlot( i, itemstack ); } @Override @@ -333,7 +333,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public boolean canInsertItem(int i, ItemStack itemstack, int j) { - return getDest().isItemValidForSlot( i, itemstack ); + return getDestination().isItemValidForSlot( i, itemstack ); } @Override diff --git a/src/main/java/appeng/recipes/RecipeData.java b/src/main/java/appeng/recipes/RecipeData.java index 53b01e94..9ef3872c 100644 --- a/src/main/java/appeng/recipes/RecipeData.java +++ b/src/main/java/appeng/recipes/RecipeData.java @@ -18,7 +18,7 @@ public class RecipeData public boolean crash = true; public boolean exceptions = true; - public boolean erroronmissing = true; + public boolean errorOnMissing = true; public final Set knownItem = new HashSet(); diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 24f421d3..eb9db069 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -110,7 +110,7 @@ public class RecipeHandler implements IRecipeHandler } catch (MissingIngredientError e) { - if ( data.erroronmissing ) + if ( data.errorOnMissing ) { AELog.warning( "Unable to register a recipe:" + e.getMessage() ); if ( data.exceptions ) @@ -532,7 +532,7 @@ public class RecipeHandler implements IRecipeHandler { if ( tokens.size() == 1 && (tokens.get( 0 ).equals( "true" ) || tokens.get( 0 ).equals( "false" )) ) { - data.erroronmissing = tokens.get( 0 ).equals( "true" ); + data.errorOnMissing = tokens.get( 0 ).equals( "true" ); } else throw new RecipeError( "erroronmissing must be true or false explicitly." ); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index ad4cbc31..571e8709 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -159,14 +159,14 @@ public class CachedPlane for (int cx = 0; cx < cx_size; cx++) for (int cz = 0; cz < cz_size; cz++) { - LinkedList> rwarTiles = new LinkedList>(); + LinkedList> rawTiles = new LinkedList>(); LinkedList deadTiles = new LinkedList(); Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz ); myChunks[cx][cz] = c; - rwarTiles.addAll( ((HashMap) c.chunkTileEntityMap).entrySet() ); - for (Entry tx : rwarTiles) + rawTiles.addAll( ( ( HashMap ) c.chunkTileEntityMap ).entrySet() ); + for (Entry tx : rawTiles) { ChunkPosition cp = tx.getKey(); TileEntity te = tx.getValue(); @@ -324,13 +324,13 @@ public class CachedPlane world.scheduleBlockUpdate( x + x_offset, y + y_offset, z + z_offset, entry.func_151351_a(), (int) entry.scheduledTime ); } - private void addTile(int x, int y, int z, TileEntity te, CachedPlane alternateDest, IMovableRegistry mr) + private void addTile(int x, int y, int z, TileEntity te, CachedPlane alternateDestination, IMovableRegistry mr) { try { Column c = myColumns[x][z]; - if ( c.doNotSkip( y + y_offset ) || alternateDest == null ) + if ( c.doNotSkip( y + y_offset ) || alternateDestination == null ) { IMovableHandler handler = getHandler( te ); @@ -362,7 +362,7 @@ public class CachedPlane } else { - alternateDest.addTile( x, y, z, te, null, mr ); + alternateDestination.addTile( x, y, z, te, null, mr ); } } catch (Throwable e) diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index e6668330..ee76983f 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -94,17 +94,17 @@ public class StorageHelper static class METeleporter extends Teleporter { - final TelDestination dest; + final TelDestination destination; public METeleporter(WorldServer par1WorldServer, TelDestination d) { super( par1WorldServer ); - dest = d; + destination = d; } @Override public void placeInPortal(Entity par1Entity, double par2, double par4, double par6, float par8) { - par1Entity.setLocationAndAngles( dest.x, dest.y, dest.z, par1Entity.rotationYaw, 0.0F ); + par1Entity.setLocationAndAngles( destination.x, destination.y, destination.z, par1Entity.rotationYaw, 0.0F ); par1Entity.motionX = par1Entity.motionY = par1Entity.motionZ = 0.0D; } @@ -175,8 +175,8 @@ public class StorageHelper // load the chunk! WorldServer.class.cast( newWorld ).getChunkProvider().loadChunk( MathHelper.floor_double( link.x ) >> 4, MathHelper.floor_double( link.z ) >> 4 ); - boolean difDest = newWorld != oldWorld; - if ( difDest ) + boolean diffDestination = newWorld != oldWorld; + if ( diffDestination ) { if ( player != null ) { @@ -310,7 +310,7 @@ public class StorageHelper transverseEdges( i, j, k, i + scaleX, j + scaleY, k + scaleZ, new TriggerUpdates( dst ) ); /* - * IChunkProvider cp = dest.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer + * IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer * srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); } * * cp.unloadQueuedChunks(); diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index a7310968..de4bab59 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -190,7 +190,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock } } - public long getQEDest() + public long getQEFrequency() { ItemStack is = inv.getStackInSlot( 0 ); if ( is != null ) diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index 6a37cc13..3d64e6ce 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -344,7 +344,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC return cachedFluid; } - private long transferContents(IEnergySource energy, IMEInventory src, IMEInventory dest, long itemsToMove, StorageChannel chan) + private long transferContents(IEnergySource energy, IMEInventory src, IMEInventory destination, long itemsToMove, StorageChannel chan) { IItemList myList; if ( src instanceof IMEMonitor ) @@ -363,7 +363,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC long totalStackSize = s.getStackSize(); if ( totalStackSize > 0 ) { - IAEStack stack = dest.injectItems( s, Actionable.SIMULATE, mySrc ); + IAEStack stack = destination.injectItems( s, Actionable.SIMULATE, mySrc ); long possible = 0; if ( stack == null ) @@ -380,7 +380,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC if ( extracted != null ) { possible = extracted.getStackSize(); - IAEStack failed = Platform.poweredInsert( energy, dest, extracted, mySrc ); + IAEStack failed = Platform.poweredInsert( energy, destination, extracted, mySrc ); if ( failed != null ) {