remove trailing whitespaces

This commit is contained in:
yueh
2015-02-03 12:04:13 +01:00
parent ef3cb0a455
commit b18addbf37
303 changed files with 1526 additions and 1526 deletions
@@ -76,7 +76,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
public int damageDropped(int metadata) {
return metadata;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int direction, int metadata)
@@ -17,7 +17,7 @@
*/
/**
*
*
*/
package appeng.client.gui.implementations;
@@ -59,7 +59,7 @@ public class GuiInscriber extends AEBaseGui
this.pb.yPosition = 39 + this.guiTop;
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, this.ySize );
if ( this.drawUpgrades() )
this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvc.availableUpgrades() * 18 );
if ( this.hasToolbox() )
@@ -347,7 +347,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
*
* If this cache should be empty, it will populate it with an earlier cache if available or at least the cache for
* the empty string.
*
*
* @param searchTerm
* the corresponding search
* @return a Set matching a superset of the search term
@@ -40,7 +40,7 @@ public class GuiSecurity extends GuiMEMonitorable
super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) );
this.customSortOrder = false;
this.reservedSpace = 33;
// increase size so that the slot is over the gui.
this.xSize += 56;
this.standardSize = this.xSize;
@@ -24,9 +24,9 @@ import net.minecraft.client.gui.GuiTextField;
public class GuiNumberBox extends GuiTextField
{
final Class type;
public GuiNumberBox(FontRenderer p_i1032_1_, int p_i1032_2_, int p_i1032_3_, int p_i1032_4_, int p_i1032_5_,Class type) {
super( p_i1032_1_, p_i1032_2_, p_i1032_3_, p_i1032_4_, p_i1032_5_ );
this.type = type;
@@ -37,7 +37,7 @@ public class GuiNumberBox extends GuiTextField
{
String original = this.getText();
super.writeText( p_146191_1_ );
try
{
if ( this.type == int.class || this.type == Integer.class )
@@ -52,6 +52,6 @@ public class GuiNumberBox extends GuiTextField
this.setText( original );
}
}
}
@@ -20,42 +20,42 @@ package appeng.client.gui.widgets;
/**
* AEBaseGui controlled Tooltip Interface.
*
*
*/
public interface ITooltip
{
/**
* returns the tooltip message.
*
*
* @return tooltip message
*/
String getMessage();
/**
* x Location for the object that triggers the tooltip.
*
*
* @return xPosition
*/
int xPos();
/**
* y Location for the object that triggers the tooltip.
*
*
* @return yPosition
*/
int yPos();
/**
* Width of the object that triggers the tooltip.
*
*
* @return width
*/
int getWidth();
/**
* Height for the object that triggers the tooltip.
*
*
* @return height
*/
int getHeight();
@@ -108,9 +108,9 @@ public class SpatialSkyRender extends IRenderHandler
}
GL11.glDepthMask(true);
if ( fade > 0.0f )
{
{
GL11.glDisable( GL11.GL_FOG );
GL11.glDisable( GL11.GL_ALPHA_TEST );
GL11.glEnable( GL11.GL_BLEND );
@@ -128,7 +128,7 @@ public class SpatialSkyRender extends IRenderHandler
}
GL11.glPopAttrib();
GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
}
@@ -273,7 +273,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
return true;
}
@Override
public void getBoxes(IPartCollisionHelper bch)
{
@@ -101,7 +101,7 @@ public class RenderMEChest extends BaseBlockRender
/*
* 1.7.2
*
*
* else if ( forward == ForgeDirection.EAST && up == ForgeDirection.UP ) flippableIcon.setFlip( true, false ); else if (
* forward == ForgeDirection.NORTH && up == ForgeDirection.UP ) flippableIcon.setFlip( true, false );
*/
@@ -29,10 +29,10 @@ public class FullIcon implements IIcon
private final IIcon p;
public FullIcon(IIcon o) {
if ( o == null )
throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
this.p = o;
}
@@ -32,10 +32,10 @@ public class OffsetIcon implements IIcon
private final IIcon p;
public OffsetIcon(IIcon o, float x, float y) {
if ( o == null )
throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
this.p = o;
this.offsetX = x;
this.offsetY = y;
@@ -31,10 +31,10 @@ public class TaughtIcon implements IIcon
private final IIcon p;
public TaughtIcon(IIcon o, float tightness) {
if ( o == null )
throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
this.p = o;
this.tightness = tightness * 0.4f;
}
@@ -235,10 +235,10 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
/*
* if ( supportCapacity() ) { for (int w = 0; w < 2; w++) for (int z = 0; z < 9; z++) addSlotToContainer( new
* OptionalSlotFakeTypeOnly( inv, this, offset++, x, y, z, w, 1 ) );
*
*
* for (int w = 0; w < 2; w++) for (int z = 0; z < 9; z++) addSlotToContainer( new OptionalSlotFakeTypeOnly(
* inv, this, offset++, x, y, z, w + 2, 2 ) );
*
*
* for (int w = 0; w < 2; w++) for (int z = 0; z < 9; z++) addSlotToContainer( new OptionalSlotFakeTypeOnly(
* inv, this, offset++, x, y, z, w + 4, 3 ) ); }
*/
@@ -162,7 +162,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
if ( this.monitor != this.host.getItemInventory() )
this.isContainerValid = false;
for (Enum set : this.serverCM.getSettings())
{
Enum sideLocal = this.serverCM.getSetting( set );
@@ -22,7 +22,7 @@ import appeng.client.gui.widgets.GuiProgressBar;
/**
* This interface provides the data for anything simulating a progress.
*
*
* Its main use is in combination with the {@link GuiProgressBar}, which ensures to scale it to a percentage of 0 to
* 100.
*
@@ -32,17 +32,17 @@ public interface IProgressProvider
/**
* The current value of the progress. It should cover a range from 0 to the max progress
*
*
* @return An int representing the current progress
*/
int getCurrentProgress();
/**
* The max value the progress.
*
*
* It is not limited to a value of 100 and can be scaled to fit the current needs. For example scaled down to
* decrease or scaled up to increase the precision.
*
*
* @return An int representing the max progress
*/
int getMaxProgress();
@@ -190,7 +190,7 @@ public class SlotRestrictedInput extends AppEngSlot
case INSCRIBER_INPUT:
return true;/*
* for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return true;
*
*
* return false;
*/
+1 -1
View File
@@ -51,7 +51,7 @@ public class Api implements IAppEngApi
// private MovableTileRegistry MovableRegistry = new MovableTileRegistry();
private final RegistryContainer rc = new RegistryContainer();
private final ApiStorage storageHelper = new ApiStorage();
public final ApiPart partHelper = new ApiPart();
private final Materials materials = new Materials();
@@ -31,7 +31,7 @@ msg.setInteger( "turns", 8 );
FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg );
-- or --
NBTTagCompound msg = new NBTTagCompound();
NBTTagCompound in = new NBTTagCompound();
NBTTagCompound out = new NBTTagCompound();
@@ -42,10 +42,10 @@ public class ExternalIInv implements IExternalStorageHandler
public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src)
{
InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, d );
if ( channel == StorageChannel.ITEMS && ad != null )
return new MEMonitorIInventory( ad );
return null;
}
@@ -67,7 +67,7 @@ public enum GuiText
InterfaceTerminalHint, Range, TransparentFacades, TransparentFacadesHint,
NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind,
Included, Excluded, Partitioned, Precise, Fuzzy;
final String root;
@@ -66,7 +66,7 @@ public class PacketPartPlacement extends AppEngPacket
data.writeInt( z );
data.writeByte( face );
data.writeFloat( eyeHeight );
this.configureWrite( data );
}
@@ -282,7 +282,7 @@ public class CraftingJob implements Runnable, ICraftingJob
/**
* returns true if this needs more simulation.
*
*
* @param milli milliseconds of simulation
* @return true if this needs more simulation
*/
@@ -40,14 +40,14 @@ public class BlockCubeGenerator extends AEBaseBlock
@Override
public boolean onActivated(World w, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
TileCubeGenerator tcg = this.getTileEntity(w, x, y, z);
if ( tcg != null )
tcg.click( player );
return true;
}
@Override
public void registerBlockIcons(IIconRegister iconRegistry)
{
+10 -10
View File
@@ -97,40 +97,40 @@ public class ToolDebugCard extends AEBaseItem
IGridNode center = g.getPivot();
this.outputMsg( player, "This Node: " + node.toString() );
this.outputMsg( player, "Center Node: " + center.toString() );
IPathingGrid pg = g.getCache( IPathingGrid.class );
if ( pg.getControllerState() == ControllerState.CONTROLLER_ONLINE )
{
int length = 0;
HashSet<IGridNode> next = new HashSet<IGridNode>();
next.add( node );
int maxLength = 10000;
outer: while ( ! next.isEmpty() )
{
HashSet<IGridNode> current = next;
next = new HashSet<IGridNode>();
for ( IGridNode n : current )
{
if ( n.getMachine() instanceof TileController )
break outer;
for ( IGridConnection c : n.getConnections() )
next.add( c.getOtherSide( n ) );
}
length++;
if ( length > maxLength )
break;
}
this.outputMsg( player, "Cable Distance: " + length );
}
if ( center.getMachine() instanceof PartP2PTunnel )
{
this.outputMsg( player, "Freq: " + ((PartP2PTunnel) center.getMachine()).freq );
+5 -5
View File
@@ -386,23 +386,23 @@ public class FacadePart implements IFacadePart, IBoxProvider
* if ( out.contains( ForgeDirection.EAST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade(
* ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
* ForgeDirection.EAST ); }
*
*
* if ( out.contains( ForgeDirection.WEST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade(
* ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
* ForgeDirection.WEST ); }
*
*
* if ( out.contains( ForgeDirection.NORTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
* ForgeDirection.NORTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
* ForgeDirection.NORTH ); }
*
*
* if ( out.contains( ForgeDirection.SOUTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
* ForgeDirection.SOUTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
* ForgeDirection.SOUTH ); }
*
*
* if ( out.contains( ForgeDirection.EAST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
* ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
* ForgeDirection.EAST ); }
*
*
* if ( out.contains( ForgeDirection.WEST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
* ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
* ForgeDirection.WEST ); }
+1 -1
View File
@@ -78,7 +78,7 @@ import appeng.util.Platform;
/**
* Implementing these might help improve visuals for hollow covers
*
*
* TSlottedPart,ISidedHollowConnect
*/
public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IRedstonePart, AEMultiTile
+1 -1
View File
@@ -64,7 +64,7 @@ public class AETrading implements IVillageTradeHandler
{
if ( item == null )
return;
// Sell
ItemStack From = item.copy();
ItemStack To = new ItemStack( Items.emerald );
@@ -30,5 +30,5 @@ public abstract class BaseModule implements IIntegrationModule {
@Override
public abstract void postInit();
}
@@ -59,7 +59,7 @@ public enum IntegrationType
Mekanism(IntegrationSide.BOTH, "Mekanism", "Mekanism"),
ImmibisMicroblocks(IntegrationSide.BOTH, "ImmibisMicroblocks", "ImmibisMicroblocks"),
BetterStorage(IntegrationSide.BOTH, "BetterStorage", "betterstorage" );
public final IntegrationSide side;
@@ -43,7 +43,7 @@ public class MFRDSUHandler implements IExternalStorageHandler
{
if ( chan == StorageChannel.ITEMS )
return new MEMonitorIInventory( new IMEAdaptor( DSU.instance.getDSU( te ), src ) );
return null;
}
}
@@ -89,8 +89,8 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
private void encode(ItemStack is, EntityPlayer p)
{
GameProfile username = this.getProfile( is );
if (username != null && username.equals(p.getGameProfile()))
if (username != null && username.equals(p.getGameProfile()))
this.setProfile( is, null );
else
this.setProfile( is, p.getGameProfile() );
@@ -157,7 +157,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
if ( profile!= null )
{
NBTTagCompound pNBT = new NBTTagCompound();
NBTUtil.func_152460_a( pNBT, profile );
NBTUtil.func_152460_a( pNBT, profile );
tag.setTag( "profile", pNBT );
}
else
@@ -47,7 +47,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
/**
* Find the localized string...
*
*
* @param name possible names for the localized string
* @return localized name
*/
@@ -72,7 +72,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
{
return false;
}
@Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player )
{
@@ -65,7 +65,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
{
return false;
}
@Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player )
{
@@ -22,32 +22,32 @@ package appeng.items.tools.powered.powersink;
@Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2")
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
{
*
*
* public UniversalElectricity(Class c, String subName) { super( c, subName ); }
*
*
* @Override public float recharge(ItemStack is, float energy, boolean
* doRecharge) { return (float) (energy - injectExternalPower( PowerUnits.KJ,
* is, energy, !doRecharge )); }
*
*
* @Override public float discharge(ItemStack is, float energy, boolean
* doDischarge) { return 0; }
*
*
* @Override public float getElectricityStored(ItemStack is) { return (int)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAECurrentPower( is ) ); }
*
*
* @Override public float getMaxElectricityStored(ItemStack is) { return (int)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) ); }
*
*
* @Override public void setElectricity(ItemStack is, float joules) { double
* currentPower = getAECurrentPower( is ); double targetPower =
* PowerUnits.KJ.convertTo( PowerUnits.AE, joules ); if ( targetPower >
* currentPower ) injectAEPower( is, targetPower - currentPower ); else
* extractAEPower( is, currentPower - targetPower ); }
*
*
* @Override public float getTransfer(ItemStack is) { return (float)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) -
* getAECurrentPower( is ) ); }
*
*
* @Override public float getVoltage(ItemStack itemStack) { return 120; }
}
+2 -2
View File
@@ -47,7 +47,7 @@ public class GridStorage implements IGridStorage
/**
* for use with world settings
*
*
* @param id ID of grid storage
* @param gss grid storage search
*/
@@ -59,7 +59,7 @@ public class GridStorage implements IGridStorage
/**
* for use with world settings
*
*
* @param input array of bytes string
* @param id ID of grid storage
* @param gss grid storage search
@@ -28,7 +28,7 @@ public class GridStorageSearch
/**
* for use with the world settings
*
*
* @param id ID of grid storage search
*/
public GridStorageSearch(long id) {
+2 -2
View File
@@ -65,13 +65,13 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
}
final static public LinkedList DEPTH = new LinkedList();
@Override
protected void postChangesToListeners(Iterable<T> changes, BaseActionSource src)
{
this.postChange( true, changes, src );
}
protected void postChange(boolean Add, Iterable<T> changes, BaseActionSource src)
{
if ( DEPTH.contains( this ) )
+3 -3
View File
@@ -175,14 +175,14 @@ public class SpatialPylonCache implements ISpatialCache
reqY = this.captureMax.y - this.captureMin.y;
reqZ = this.captureMax.z - this.captureMin.z;
requirePylonBlocks = Math.max( 6, ((reqX * reqZ + reqX * reqY + reqY * reqZ) * 3) / 8 );
this.efficiency = (double) pylonBlocks / (double) requirePylonBlocks;
if ( this.efficiency > 1.0 )
this.efficiency = 1.0;
if ( this.efficiency < 0.0 )
this.efficiency = 0.0;
minPower = (double) reqX * (double) reqY * reqZ * AEConfig.instance.spatialPowerMultiplier;
maxPower = Math.pow( minPower, AEConfig.instance.spatialPowerExponent );
}
+2 -2
View File
@@ -87,7 +87,7 @@ public class TickManagerCache implements ITickManager
// remove tt..
this.upcomingTicks.poll();
TickRateModulation mod = tt.gt.tickingRequest( tt.node, diff );
switch (mod)
{
case FASTER:
@@ -110,7 +110,7 @@ public class TickManagerCache implements ITickManager
default:
break;
}
if ( this.awake.containsKey( tt.node ) )
this.addToQueue( tt );
}
+2 -2
View File
@@ -80,14 +80,14 @@ public class TickTracker implements Comparable<TickTracker>
AEBasePart part = (AEBasePart)this.gt;
part.addEntityCrashInfo( crashreportcategory );
}
crashreportcategory.addCrashSection( "CurrentTickRate", this.current_rate );
crashreportcategory.addCrashSection( "MinTickRate", this.request.minTickRate );
crashreportcategory.addCrashSection( "MaxTickRate", this.request.maxTickRate );
crashreportcategory.addCrashSection( "MachineType", this.gt.getClass().getName() );
crashreportcategory.addCrashSection( "GridBlockType", this.node.getGridBlock().getClass().getName() );
crashreportcategory.addCrashSection( "ConnectedSides", this.node.getConnectedSides() );
DimensionalCoord dc = this.node.getGridBlock().getLocation();
if ( dc != null )
crashreportcategory.addCrashSection( "Location", dc );
@@ -37,7 +37,7 @@ public abstract class MBCalculator
/**
* check if the tile entities are correct for the structure.
*
*
* @param te to be checked tile entity
* @return true if tile entity is valid for structure
*/
@@ -45,7 +45,7 @@ public abstract class MBCalculator
/**
* construct the correct cluster, usually very simple.
*
*
* @param w world
* @param min min world coord
* @param max max world coord
@@ -55,7 +55,7 @@ public abstract class MBCalculator
/**
* configure the multi-block tiles, most of the important stuff is in here.
*
*
* @param c updated cluster
* @param w in world
* @param min min world coord
@@ -70,7 +70,7 @@ public abstract class MBCalculator
/**
* verify if the structure is the correct dimensions, or size
*
*
* @param min min world coord
* @param max max world coord
* @return true if structure has correct dimensions or size
@@ -36,7 +36,7 @@ import appeng.tile.crafting.TileCraftingTile;
public class CraftingCPUCalculator extends MBCalculator
{
final TileCraftingTile tqb;
public CraftingCPUCalculator(IAEMultiBlock t) {
@@ -208,7 +208,7 @@ public class AENetworkProxy implements IGridBlock
/**
* short cut!
*
*
* @return grid of node
* @throws GridAccessException of node or grid is null
*/
@@ -47,7 +47,7 @@ public interface IPathItem
/**
* get the grid flags for this IPathItem.
*
*
* @return the flag set.
*/
public EnumSet<GridFlags> getFlags();
@@ -114,7 +114,7 @@ public class CellInventoryHandler extends MEInventoryHandler<IAEItemStack> imple
}
@Override
public boolean isPreformatted()
public boolean isPreformatted()
{
return ! this.myPartitionList.isEmpty();
}
@@ -134,10 +134,10 @@ public class CellInventoryHandler extends MEInventoryHandler<IAEItemStack> imple
public int getStatusForCell()
{
int val = this.getCellInv().getStatusForCell();
if ( val == 1 && this.isPreformatted() )
val = 2;
return val;
}
@@ -145,7 +145,7 @@ public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
GameProfile thisUser = tbc.getProfile( ais.getItemStack() );
if ( thisUser == newUser )
return false;
if ( thisUser != null && thisUser.equals( newUser ) )
return false;
}
+2 -2
View File
@@ -311,7 +311,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
/**
* depending on the from, different settings will be accepted, don't call this with null
*
*
* @param from source of settings
* @param compound compound of source
*/
@@ -343,7 +343,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
/**
* null means nothing to store...
*
*
* @param from source of settings
* @return compound of source
*/
@@ -207,9 +207,9 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
/**
* If the plane is accepting items.
*
*
* This might be improved if a performance problem shows up.
*
*
* @return true if planes accepts items.
*/
private boolean isAccepting()
@@ -403,9 +403,9 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
/**
* Checks if the network can store the possible drops.
*
*
* It also sets isAccepting to false, if the item can not be stored.
*
*
* @param itemStacks an array of {@link ItemStack} to test
* @return true, if the network can store at least a single item of all drops or no drops are reported
*/
@@ -438,7 +438,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
/**
* Stores an {@link ItemStack} inside the network.
*
*
* @param item {@link ItemStack} to store
* @return null or leftover {@link IAEItemStack}
*/
@@ -465,7 +465,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
/**
* Stores an {@link EntityItem} inside the network and either marks it as dead or sets it to the leftover stackSize.
*
*
* @param entityItem {@link EntityItem} to store
*/
private void storeEntityItem( EntityItem entityItem )
@@ -87,7 +87,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
{
if ( stack == null || stack.getItem() == null )
return false;
IAEItemStack out = this.destination.injectItems( this.lastItemChecked = AEApi.instance().storage().createItemStack( stack ), Actionable.SIMULATE, this.mySrc );
if ( out == null )
return true;
@@ -43,7 +43,7 @@ public class InvLayerData
/**
* check if a slot index is valid, prevent crashes from bad code :)
*
*
* @param slot slot index
* @return true, if the slot exists.
*/
@@ -34,11 +34,11 @@ import appeng.api.parts.LayerBase;
/**
* Inventory wrapper for parts,
*
*
* this is considerably more complicated then the other wrappers as it requires creating a "unified inventory".
*
*
* You must use {@link ISidedInventory} instead of {@link IInventory}.
*
*
* If your inventory changes in between placement and removal, you must trigger a PartChange on the {@link IPartHost} so
* it can recalculate the inventory wrapper.
*/
@@ -257,25 +257,25 @@ public class PartDenseCable extends PartCable
* ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16,
* 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y,
* z, renderer );
*
*
* if ( true ) { setSmartConnectionRotations( of, renderer ); IIcon firstIcon = new TaughtIcon( getChannelTex(
* channels, false ).getIcon(), -0.2f ); IIcon secondIcon = new TaughtIcon( getChannelTex( channels, true ).getIcon(),
* -0.2f );
*
*
* if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock)
* rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip(
* false, true ); }
*
*
* Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I(
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); renderAllFaces( (AEBaseBlock)
* rh.getBlock(), x, y, z, renderer );
*
*
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon,
* secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
*
*
* renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
* renderer.uvRotateTop = renderer.uvRotateWest = 0; }
*
*
* rh.setTexture( getTexture( getCableColor() ) ); }
*/
@@ -182,7 +182,7 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
IBatteryObject bo = MjAPI.getMjBattery( te, MjAPI.DEFAULT_POWER_FRAMEWORK, this.side.getOpposite() );
if ( bo != null )
return bo;
return ((IMJ6) AppEng.instance.getIntegration( IntegrationType.MJ6 )).provider( te, this.side.getOpposite() );
}
return null;
@@ -53,7 +53,7 @@ public class PartCraftingTerminal extends PartTerminal
public void getDrops(List<ItemStack> drops, boolean wrenched)
{
super.getDrops(drops, wrenched);
for (ItemStack is : this.craftingGrid)
if ( is != null )
drops.add( is );
+3 -3
View File
@@ -163,12 +163,12 @@ public class Ingredient implements IIngredient
/*
* Object o = Item.itemRegistry.getObject( nameSpace + ":" + itemName ); if ( o instanceof Item ) return new
* ItemStack( (Item) o, qty, meta );
*
*
* if ( o instanceof Block ) return new ItemStack( (Block) o, qty, meta );
*
*
* o = Item.itemRegistry.getObject( nameSpace + ":item." + itemName ); if ( o instanceof Item ) return new
* ItemStack( (Item) o, qty, meta );
*
*
* o = Block.blockRegistry.getObject( nameSpace + ":tile." + itemName ); if ( o instanceof Block && (!(o
* instanceof BlockAir)) ) return new ItemStack( (Block) o, qty, meta );
*/
+1 -1
View File
@@ -37,7 +37,7 @@ public class RecipeData
public boolean crash = true;
public boolean exceptions = true;
public boolean errorOnMissing = true;
public final Set<String> knownItem = new HashSet<String>();
}
@@ -274,7 +274,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
/**
* Returns the input for this recipe, any mod accessing this value should never manipulate the values in this array
* as it will effect the recipe itself.
*
*
* @return The recipes input vales.
*/
public Object[] getInput()
@@ -149,7 +149,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
/**
* Returns the input for this recipe, any mod accessing this value should never manipulate the values in this array
* as it will effect the recipe itself.
*
*
* @return The recipes input vales.
*/
public ArrayList<Object> getInput()
@@ -72,5 +72,5 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
h.getName(this.pro_input)+ '\n' +
h.getName(this.pro_output[0]);
}
}
@@ -66,7 +66,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
NBTTagCompound toRegister = new NBTTagCompound();
ItemStack endStack = this.pro_output[0].getItemStack();
NBTTagCompound itemFrom = new NBTTagCompound();
NBTTagCompound itemTo = new NBTTagCompound();
@@ -76,7 +76,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
toRegister.setTag("itemFrom", itemFrom);
toRegister.setTag("itemTo", itemTo);
toRegister.setFloat("pressureRatio", 1.0F);
FMLInterModComms.sendMessage("HydCraft", "registerCrushingRecipe", toRegister);
}
catch (java.lang.RuntimeException err)
@@ -132,7 +132,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
}
}
}
return Platform.isSameItemPrecise( this.output.getItemStack(), reqOutput );
}
@@ -26,7 +26,7 @@ public interface IOreListener
/**
* Called with various items registered in the dictionary.
* AppEng.oreDictionary.observe(...) to register them.
*
*
* @param name name of ore
* @param item item with name
*/
@@ -41,7 +41,7 @@ public class OreDictionaryHandler
/**
* Just limit what items are sent to the final listeners, I got sick of strange items showing up...
*
*
* @param name name about cared item
* @return true if it should care
*/
@@ -69,7 +69,7 @@ public class OreDictionaryHandler
/**
* Adds a new IOreListener and immediately notifies it of any previous ores, any ores added latter will be added at
* that point.
*
*
* @param n to be added ore listener
*/
public void observe(IOreListener n)
@@ -23,7 +23,7 @@ public interface ICompassCallback
/**
* Called from another thread.
*
*
* @param hasResult true if found a target
* @param spin true if should spin
* @param radians radians
@@ -49,7 +49,7 @@ public class DefaultSpatialHandler implements IMovableHandler
/**
* never called for the default.
*
*
* @param tile tile entity
* @return true
*/
@@ -35,17 +35,17 @@ public class StorageChunkProvider extends ChunkProviderGenerate
{
final static Block[] BLOCKS;
static {
BLOCKS = new Block[255 * 256];
Block matrixFrame = AEApi.instance().blocks().blockMatrixFrame.block();
for (int x = 0; x < BLOCKS.length; x++)
BLOCKS[x] = matrixFrame;
}
final World w;
public StorageChunkProvider(World wrd, long i) {
@@ -151,7 +151,7 @@ public class StorageHelper
/**
* Mostly from dimensional doors.. which mostly got it form X-Comp.
*
*
* @param entity to be teleported entity
* @param link destination
* @return teleported entity
@@ -331,7 +331,7 @@ public class StorageHelper
/*
* IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer
* srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); }
*
*
* cp.unloadQueuedChunks();
*/
@@ -143,7 +143,7 @@ public class StorageWorldProvider extends WorldProvider
{
return "Storage Cell";
}
@Override
public IRenderHandler getSkyRenderer()
{
+4 -4
View File
@@ -285,7 +285,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
/**
* By default all blocks can have orientation, this handles saving, and loading, as well as synchronization.
*
*
* @return true if tile can be rotated
*/
@Override
@@ -375,7 +375,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
/**
* returns the contents of the tile entity, into the world, defaults to dropping everything in the inventory.
*
*
* @param w world
* @param x x pos of tile entity
* @param y y pos of tile entity
@@ -411,7 +411,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
/**
* depending on the from, different settings will be accepted, don't call this with null
*
*
* @param from source of settings
* @param compound compound of source
*/
@@ -446,7 +446,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
/**
* null means nothing to store...
*
*
* @param from source of settings
* @return compound of source
*/
@@ -113,7 +113,7 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf
/**
* make sure you validate with canAddOutput prior to this.
*
*
* @param output to be added output
*/
private void addOutput(ItemStack output)
@@ -82,7 +82,7 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
this.alpha = io;
}
@Override
final public int getMachineX()
{
+2 -2
View File
@@ -40,7 +40,7 @@ public class ConfigManager implements IConfigManager
/**
* read all settings using config manager.
*
*
* @param tagCompound to be read from compound
*/
@Override
@@ -77,7 +77,7 @@ public class ConfigManager implements IConfigManager
/**
* save all settings using config manager.
*
*
* @param tagCompound to be written to compound
*/
@Override
@@ -66,9 +66,9 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
{
if ( te == null )
return null;
IBetterStorage bs = (IBetterStorage) (AppEng.instance.isIntegrationEnabled( IntegrationType.BetterStorage ) ? AppEng.instance.getIntegration( IntegrationType.BetterStorage ) : null);
if ( te instanceof EntityPlayer )
{
return new AdaptorIInventory( new AdaptorPlayerInventory( ((EntityPlayer) te).inventory, false ) );
+4 -4
View File
@@ -167,7 +167,7 @@ public class Platform
/**
* This displays the value for encoded longs ( double *100 )
*
*
* @param n to be formatted long value
* @param isRate if true it adds a /t to the formatted string
* @return formatted long value
@@ -1212,13 +1212,13 @@ public class Platform
/*
* // test ore dictionary.. int OreID = getOreID( a ); if ( OreID != -1 ) return OreID == getOreID( b );
*
*
* if ( Mode != FuzzyMode.IGNORE_ALL ) { if ( a.hasTagCompound() && !isShared( a.getTagCompound() ) ) { a =
* Platform.getSharedItemStack( AEItemStack.create( a ) ); }
*
*
* if ( b.hasTagCompound() && !isShared( b.getTagCompound() ) ) { b = Platform.getSharedItemStack(
* AEItemStack.create( b ) ); }
*
*
* // test regular items with damage values and what not... if ( isShared( a.getTagCompound() ) && isShared(
* b.getTagCompound() ) && a.itemID == b.itemID ) { return ((AppEngSharedNBTTagCompound)
* a.getTagCompound()).compareFuzzyWithRegistry( (AppEngSharedNBTTagCompound) b.getTagCompound() ); } }
@@ -237,11 +237,11 @@ public class AdaptorIInventory extends InventoryAdaptor
/**
* Adds an {@link ItemStack} to the adapted {@link IInventory}.
*
*
* It respects the inventories stack limit, which can result in not all items added and some left ones are returned.
* The ItemStack next is required for inventories, which will fail on isItemValidForSlot() for stacksizes larger
* than the limit.
*
*
* @param itemsToAdd itemStack to add to the inventory
* @param modulate true to modulate, false for simulate
*
@@ -31,12 +31,12 @@ public class AdaptorPlayerInventory implements IInventory
public AdaptorPlayerInventory(IInventory playerInv, boolean swap)
{
if ( swap )
this.src = new WrapperChainedInventory( new WrapperInventoryRange( playerInv, 9, this.size -9, false ), new WrapperInventoryRange( playerInv, 0, 9, false ) );
else
this.src = playerInv;
}
@Override
@@ -90,7 +90,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
/*
* Super hackery.
*
*
* is.itemID = appeng.api.Materials.matQuartz.itemID; damageValue = is.getItemDamage(); is.itemID = itemID;
*/