Improved various typos
This commit is contained in:
parent
fe7510d607
commit
542c1dcdbd
15 changed files with 56 additions and 57 deletions
|
@ -13,9 +13,9 @@ public class CraftingCPURecord implements Comparable<CraftingCPURecord>
|
||||||
|
|
||||||
public final String myName;
|
public final String myName;
|
||||||
|
|
||||||
public CraftingCPURecord(long size, int proc, ICraftingCPU server) {
|
public CraftingCPURecord(long size, int coProcessors, ICraftingCPU server) {
|
||||||
this.size = size;
|
this.size = size;
|
||||||
this.processors = proc;
|
this.processors = coProcessors;
|
||||||
this.cpu = server;
|
this.cpu = server;
|
||||||
myName = server.getName();
|
myName = server.getName();
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,7 +95,7 @@ public class CraftingTreeProcess
|
||||||
}
|
}
|
||||||
else
|
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 (IAEItemStack part : details.getCondensedInputs())
|
||||||
{
|
{
|
||||||
for (int x = 0; x < list.length; x++)
|
for (int x = 0; x < list.length; x++)
|
||||||
|
|
|
@ -10,15 +10,15 @@ import appeng.tile.grid.AENetworkTile;
|
||||||
public class TilePhantomNode extends AENetworkTile
|
public class TilePhantomNode extends AENetworkTile
|
||||||
{
|
{
|
||||||
|
|
||||||
protected AENetworkProxy RWAR = null;
|
protected AENetworkProxy proxy = null;
|
||||||
boolean crashMode = false;
|
boolean crashMode = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onReady()
|
public void onReady()
|
||||||
{
|
{
|
||||||
super.onReady();
|
super.onReady();
|
||||||
RWAR = createProxy();
|
proxy = createProxy();
|
||||||
RWAR.onReady();
|
proxy.onReady();
|
||||||
crashMode = true;
|
crashMode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,15 +28,15 @@ public class TilePhantomNode extends AENetworkTile
|
||||||
if ( !crashMode )
|
if ( !crashMode )
|
||||||
return super.getGridNode( dir );
|
return super.getGridNode( dir );
|
||||||
|
|
||||||
return RWAR.getNode();
|
return proxy.getNode();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void BOOM()
|
public void BOOM()
|
||||||
{
|
{
|
||||||
if ( RWAR != null )
|
if ( proxy != null )
|
||||||
{
|
{
|
||||||
crashMode = true;
|
crashMode = true;
|
||||||
RWAR.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
|
proxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -205,7 +205,6 @@ public class TickHandler
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// rwar!
|
|
||||||
if ( ev.type == Type.WORLD && ev.phase == Phase.END )
|
if ( ev.type == Type.WORLD && ev.phase == Phase.END )
|
||||||
{
|
{
|
||||||
WorldTickEvent wte = (WorldTickEvent) ev;
|
WorldTickEvent wte = (WorldTickEvent) ev;
|
||||||
|
|
|
@ -24,7 +24,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack removeItems(int how_many, ItemStack Filter, IInventoryDestination dest)
|
public ItemStack removeItems(int how_many, ItemStack Filter, IInventoryDestination destination)
|
||||||
{
|
{
|
||||||
ItemStack target = null;
|
ItemStack target = null;
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
{
|
{
|
||||||
if ( is.stackSize > 0 && (Filter == null || Platform.isSameItem( Filter, is )) )
|
if ( is.stackSize > 0 && (Filter == null || Platform.isSameItem( Filter, is )) )
|
||||||
{
|
{
|
||||||
if ( dest == null || dest.canInsert( is ) )
|
if ( destination == null || destination.canInsert( is ) )
|
||||||
{
|
{
|
||||||
target = is;
|
target = is;
|
||||||
break;
|
break;
|
||||||
|
@ -54,7 +54,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack simulateRemove(int how_many, ItemStack Filter, IInventoryDestination dest)
|
public ItemStack simulateRemove(int how_many, ItemStack Filter, IInventoryDestination destination)
|
||||||
{
|
{
|
||||||
ItemStack target = null;
|
ItemStack target = null;
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
{
|
{
|
||||||
if ( is.stackSize > 0 && (Filter == null || Platform.isSameItem( Filter, is )) )
|
if ( is.stackSize > 0 && (Filter == null || Platform.isSameItem( Filter, is )) )
|
||||||
{
|
{
|
||||||
if ( dest == null || dest.canInsert( is ) )
|
if ( destination == null || destination.canInsert( is ) )
|
||||||
{
|
{
|
||||||
target = is;
|
target = is;
|
||||||
break;
|
break;
|
||||||
|
@ -89,7 +89,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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;
|
ItemStack target = null;
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
{
|
{
|
||||||
if ( is.stackSize > 0 && (filter == null || Platform.isSameItemFuzzy( filter, is, fuzzyMode )) )
|
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;
|
target = is;
|
||||||
break;
|
break;
|
||||||
|
@ -119,7 +119,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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;
|
ItemStack target = null;
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
|
||||||
{
|
{
|
||||||
if ( is.stackSize > 0 && (filter == null || Platform.isSameItemFuzzy( filter, is, fuzzyMode )) )
|
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;
|
target = is;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -160,17 +160,17 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag
|
||||||
int maxSize = getMaxStoredDim( is );
|
int maxSize = getMaxStoredDim( is );
|
||||||
|
|
||||||
int floorBuffer = 64;
|
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 ( (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 ( targetX <= maxSize && targetY <= maxSize && targetZ <= maxSize )
|
||||||
{
|
{
|
||||||
if ( dest == null )
|
if ( destination == null )
|
||||||
dest = createNewWorld( is );
|
destination = createNewWorld( is );
|
||||||
|
|
||||||
StorageHelper.getInstance()
|
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 );
|
setStoredSize( is, targetX, targetY, targetZ );
|
||||||
|
|
||||||
return new TransitionResult( true, 0 );
|
return new TransitionResult( true, 0 );
|
||||||
|
|
|
@ -96,7 +96,7 @@ public class QuantumCluster implements ILocatable, IAECluster
|
||||||
{
|
{
|
||||||
long qe;
|
long qe;
|
||||||
|
|
||||||
qe = center.getQEDest();
|
qe = center.getQEFrequency();
|
||||||
|
|
||||||
if ( thisSide != qe && thisSide != -qe )
|
if ( thisSide != qe && thisSide != -qe )
|
||||||
{
|
{
|
||||||
|
|
|
@ -74,7 +74,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
|
||||||
return out.getStackSize() != stack.stackSize;
|
return out.getStackSize() != stack.stackSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IInventoryDestination configDest(IMEMonitor<IAEItemStack> itemInventory)
|
private IInventoryDestination configDestination( IMEMonitor<IAEItemStack> itemInventory )
|
||||||
{
|
{
|
||||||
destination = itemInventory;
|
destination = itemInventory;
|
||||||
return this;
|
return this;
|
||||||
|
@ -235,9 +235,9 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
|
||||||
|
|
||||||
ItemStack newItems;
|
ItemStack newItems;
|
||||||
if ( getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
|
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
|
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 )
|
if ( newItems != null )
|
||||||
{
|
{
|
||||||
|
|
|
@ -145,7 +145,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
return wasReq ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
|
return wasReq ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
|
||||||
}
|
}
|
||||||
|
|
||||||
IInventory getDest()
|
IInventory getDestination()
|
||||||
{
|
{
|
||||||
requested = true;
|
requested = true;
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
{
|
{
|
||||||
cachedInv = null;
|
cachedInv = null;
|
||||||
int olderSize = oldSize;
|
int olderSize = oldSize;
|
||||||
oldSize = getDest().getSizeInventory();
|
oldSize = getDestination().getSizeInventory();
|
||||||
if ( olderSize != oldSize )
|
if ( olderSize != oldSize )
|
||||||
{
|
{
|
||||||
getHost().notifyNeighbors();
|
getHost().notifyNeighbors();
|
||||||
|
@ -201,7 +201,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
{
|
{
|
||||||
cachedInv = null;
|
cachedInv = null;
|
||||||
int olderSize = oldSize;
|
int olderSize = oldSize;
|
||||||
oldSize = getDest().getSizeInventory();
|
oldSize = getDestination().getSizeInventory();
|
||||||
if ( olderSize != oldSize )
|
if ( olderSize != oldSize )
|
||||||
{
|
{
|
||||||
getHost().notifyNeighbors();
|
getHost().notifyNeighbors();
|
||||||
|
@ -216,7 +216,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
{
|
{
|
||||||
cachedInv = null;
|
cachedInv = null;
|
||||||
int olderSize = oldSize;
|
int olderSize = oldSize;
|
||||||
oldSize = getDest().getSizeInventory();
|
oldSize = getDestination().getSizeInventory();
|
||||||
if ( olderSize != oldSize )
|
if ( olderSize != oldSize )
|
||||||
{
|
{
|
||||||
getHost().notifyNeighbors();
|
getHost().notifyNeighbors();
|
||||||
|
@ -231,7 +231,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
{
|
{
|
||||||
cachedInv = null;
|
cachedInv = null;
|
||||||
int olderSize = oldSize;
|
int olderSize = oldSize;
|
||||||
oldSize = getDest().getSizeInventory();
|
oldSize = getDestination().getSizeInventory();
|
||||||
if ( olderSize != oldSize )
|
if ( olderSize != oldSize )
|
||||||
{
|
{
|
||||||
getHost().notifyNeighbors();
|
getHost().notifyNeighbors();
|
||||||
|
@ -255,19 +255,19 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
@Override
|
@Override
|
||||||
public int getSizeInventory()
|
public int getSizeInventory()
|
||||||
{
|
{
|
||||||
return getDest().getSizeInventory();
|
return getDestination().getSizeInventory();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackInSlot(int i)
|
public ItemStack getStackInSlot(int i)
|
||||||
{
|
{
|
||||||
return getDest().getStackInSlot( i );
|
return getDestination().getStackInSlot( i );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack decrStackSize(int i, int j)
|
public ItemStack decrStackSize(int i, int j)
|
||||||
{
|
{
|
||||||
return getDest().decrStackSize( i, j );
|
return getDestination().decrStackSize( i, j );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -279,7 +279,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
@Override
|
@Override
|
||||||
public void setInventorySlotContents(int i, ItemStack itemstack)
|
public void setInventorySlotContents(int i, ItemStack itemstack)
|
||||||
{
|
{
|
||||||
getDest().setInventorySlotContents( i, itemstack );
|
getDestination().setInventorySlotContents( i, itemstack );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -297,7 +297,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
@Override
|
@Override
|
||||||
public int getInventoryStackLimit()
|
public int getInventoryStackLimit()
|
||||||
{
|
{
|
||||||
return getDest().getInventoryStackLimit();
|
return getDestination().getInventoryStackLimit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -313,7 +313,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemValidForSlot(int i, net.minecraft.item.ItemStack itemstack)
|
public boolean isItemValidForSlot(int i, net.minecraft.item.ItemStack itemstack)
|
||||||
{
|
{
|
||||||
return getDest().isItemValidForSlot( i, itemstack );
|
return getDestination().isItemValidForSlot( i, itemstack );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -333,7 +333,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
|
||||||
@Override
|
@Override
|
||||||
public boolean canInsertItem(int i, ItemStack itemstack, int j)
|
public boolean canInsertItem(int i, ItemStack itemstack, int j)
|
||||||
{
|
{
|
||||||
return getDest().isItemValidForSlot( i, itemstack );
|
return getDestination().isItemValidForSlot( i, itemstack );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -18,7 +18,7 @@ public class RecipeData
|
||||||
|
|
||||||
public boolean crash = true;
|
public boolean crash = true;
|
||||||
public boolean exceptions = true;
|
public boolean exceptions = true;
|
||||||
public boolean erroronmissing = true;
|
public boolean errorOnMissing = true;
|
||||||
|
|
||||||
public final Set<String> knownItem = new HashSet<String>();
|
public final Set<String> knownItem = new HashSet<String>();
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ public class RecipeHandler implements IRecipeHandler
|
||||||
}
|
}
|
||||||
catch (MissingIngredientError e)
|
catch (MissingIngredientError e)
|
||||||
{
|
{
|
||||||
if ( data.erroronmissing )
|
if ( data.errorOnMissing )
|
||||||
{
|
{
|
||||||
AELog.warning( "Unable to register a recipe:" + e.getMessage() );
|
AELog.warning( "Unable to register a recipe:" + e.getMessage() );
|
||||||
if ( data.exceptions )
|
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" )) )
|
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
|
else
|
||||||
throw new RecipeError( "erroronmissing must be true or false explicitly." );
|
throw new RecipeError( "erroronmissing must be true or false explicitly." );
|
||||||
|
|
|
@ -159,14 +159,14 @@ public class CachedPlane
|
||||||
for (int cx = 0; cx < cx_size; cx++)
|
for (int cx = 0; cx < cx_size; cx++)
|
||||||
for (int cz = 0; cz < cz_size; cz++)
|
for (int cz = 0; cz < cz_size; cz++)
|
||||||
{
|
{
|
||||||
LinkedList<Entry<ChunkPosition, TileEntity>> rwarTiles = new LinkedList<Entry<ChunkPosition, TileEntity>>();
|
LinkedList<Entry<ChunkPosition, TileEntity>> rawTiles = new LinkedList<Entry<ChunkPosition, TileEntity>>();
|
||||||
LinkedList<ChunkPosition> deadTiles = new LinkedList<ChunkPosition>();
|
LinkedList<ChunkPosition> deadTiles = new LinkedList<ChunkPosition>();
|
||||||
|
|
||||||
Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz );
|
Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz );
|
||||||
myChunks[cx][cz] = c;
|
myChunks[cx][cz] = c;
|
||||||
|
|
||||||
rwarTiles.addAll( ((HashMap<ChunkPosition, TileEntity>) c.chunkTileEntityMap).entrySet() );
|
rawTiles.addAll( ( ( HashMap<ChunkPosition, TileEntity> ) c.chunkTileEntityMap ).entrySet() );
|
||||||
for (Entry<ChunkPosition, TileEntity> tx : rwarTiles)
|
for (Entry<ChunkPosition, TileEntity> tx : rawTiles)
|
||||||
{
|
{
|
||||||
ChunkPosition cp = tx.getKey();
|
ChunkPosition cp = tx.getKey();
|
||||||
TileEntity te = tx.getValue();
|
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 );
|
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
|
try
|
||||||
{
|
{
|
||||||
Column c = myColumns[x][z];
|
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 );
|
IMovableHandler handler = getHandler( te );
|
||||||
|
|
||||||
|
@ -362,7 +362,7 @@ public class CachedPlane
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
alternateDest.addTile( x, y, z, te, null, mr );
|
alternateDestination.addTile( x, y, z, te, null, mr );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Throwable e)
|
catch (Throwable e)
|
||||||
|
|
|
@ -94,17 +94,17 @@ public class StorageHelper
|
||||||
static class METeleporter extends Teleporter
|
static class METeleporter extends Teleporter
|
||||||
{
|
{
|
||||||
|
|
||||||
final TelDestination dest;
|
final TelDestination destination;
|
||||||
|
|
||||||
public METeleporter(WorldServer par1WorldServer, TelDestination d) {
|
public METeleporter(WorldServer par1WorldServer, TelDestination d) {
|
||||||
super( par1WorldServer );
|
super( par1WorldServer );
|
||||||
dest = d;
|
destination = d;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void placeInPortal(Entity par1Entity, double par2, double par4, double par6, float par8)
|
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;
|
par1Entity.motionX = par1Entity.motionY = par1Entity.motionZ = 0.0D;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,8 +175,8 @@ public class StorageHelper
|
||||||
// load the chunk!
|
// load the chunk!
|
||||||
WorldServer.class.cast( newWorld ).getChunkProvider().loadChunk( MathHelper.floor_double( link.x ) >> 4, MathHelper.floor_double( link.z ) >> 4 );
|
WorldServer.class.cast( newWorld ).getChunkProvider().loadChunk( MathHelper.floor_double( link.x ) >> 4, MathHelper.floor_double( link.z ) >> 4 );
|
||||||
|
|
||||||
boolean difDest = newWorld != oldWorld;
|
boolean diffDestination = newWorld != oldWorld;
|
||||||
if ( difDest )
|
if ( diffDestination )
|
||||||
{
|
{
|
||||||
if ( player != null )
|
if ( player != null )
|
||||||
{
|
{
|
||||||
|
@ -310,7 +310,7 @@ public class StorageHelper
|
||||||
transverseEdges( i, j, k, i + scaleX, j + scaleY, k + scaleZ, new TriggerUpdates( dst ) );
|
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(); }
|
* srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); }
|
||||||
*
|
*
|
||||||
* cp.unloadQueuedChunks();
|
* cp.unloadQueuedChunks();
|
||||||
|
|
|
@ -190,7 +190,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getQEDest()
|
public long getQEFrequency()
|
||||||
{
|
{
|
||||||
ItemStack is = inv.getStackInSlot( 0 );
|
ItemStack is = inv.getStackInSlot( 0 );
|
||||||
if ( is != null )
|
if ( is != null )
|
||||||
|
|
|
@ -344,7 +344,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
|
||||||
return cachedFluid;
|
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<? extends IAEStack> myList;
|
IItemList<? extends IAEStack> myList;
|
||||||
if ( src instanceof IMEMonitor )
|
if ( src instanceof IMEMonitor )
|
||||||
|
@ -363,7 +363,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
|
||||||
long totalStackSize = s.getStackSize();
|
long totalStackSize = s.getStackSize();
|
||||||
if ( totalStackSize > 0 )
|
if ( totalStackSize > 0 )
|
||||||
{
|
{
|
||||||
IAEStack stack = dest.injectItems( s, Actionable.SIMULATE, mySrc );
|
IAEStack stack = destination.injectItems( s, Actionable.SIMULATE, mySrc );
|
||||||
|
|
||||||
long possible = 0;
|
long possible = 0;
|
||||||
if ( stack == null )
|
if ( stack == null )
|
||||||
|
@ -380,7 +380,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
|
||||||
if ( extracted != null )
|
if ( extracted != null )
|
||||||
{
|
{
|
||||||
possible = extracted.getStackSize();
|
possible = extracted.getStackSize();
|
||||||
IAEStack failed = Platform.poweredInsert( energy, dest, extracted, mySrc );
|
IAEStack failed = Platform.poweredInsert( energy, destination, extracted, mySrc );
|
||||||
|
|
||||||
if ( failed != null )
|
if ( failed != null )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue