Code format

This commit is contained in:
yueh 2016-01-01 01:48:15 +01:00
parent 68c3ea5ae9
commit ab689f2a48
96 changed files with 419 additions and 388 deletions

View file

@ -1,3 +1,4 @@
package appeng.api.definitions;

View file

@ -86,21 +86,14 @@ public interface IBlocks
IBlockDefinition quartzPillarStair();
/*
IBlockDefinition skyStoneSlab();
IBlockDefinition skyStoneBlockSlab();
IBlockDefinition skyStoneBrickSlab();
IBlockDefinition skyStoneSmallBrickSlab();
IBlockDefinition fluixSlab();
IBlockDefinition quartzSlab();
IBlockDefinition chiseledQuartzSlab();
IBlockDefinition quartzPillarSlab();
* IBlockDefinition skyStoneSlab();
* IBlockDefinition skyStoneBlockSlab();
* IBlockDefinition skyStoneBrickSlab();
* IBlockDefinition skyStoneSmallBrickSlab();
* IBlockDefinition fluixSlab();
* IBlockDefinition quartzSlab();
* IBlockDefinition chiseledQuartzSlab();
* IBlockDefinition quartzPillarSlab();
*/
/*

View file

@ -1,3 +1,4 @@
package appeng.api.definitions;

View file

@ -32,11 +32,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public interface IItemDefinition extends IComparableDefinition
{
/**
* @return the unique name of the definition which will be used to register the underlying structure. Will never be null
* @return the unique name of the definition which will be used to register the underlying structure. Will never be
* null
*/
@Nonnull
String identifier();

View file

@ -1,3 +1,4 @@
package appeng.api.definitions;

View file

@ -1,3 +1,4 @@
package appeng.api.exceptions;

View file

@ -1,3 +1,4 @@
package appeng.api.exceptions;

View file

@ -1,3 +1,4 @@
package appeng.api.features;

View file

@ -1,3 +1,4 @@
package appeng.api.features;

View file

@ -1,3 +1,4 @@
package appeng.api.features;

View file

@ -51,12 +51,18 @@ public interface IMovableHandler
* Potential Example:
*
* <pre>
* {@code
* Chunk c = world.getChunkFromBlockCoords( x, z ); c.setChunkBlockTileEntity( x
* & 0xF, y + y, z & 0xF, tile );
* {
* &#064;code
* Chunk c = world.getChunkFromBlockCoords( x, z );
* c.setChunkBlockTileEntity( x
* &amp; 0xF, y + y, z &amp; 0xF, tile );
*
* if ( c.isChunkLoaded ) { world.addTileEntity( tile ); world.markBlockForUpdate( x,
* y, z ); }
* if( c.isChunkLoaded )
* {
* world.addTileEntity( tile );
* world.markBlockForUpdate( x,
* y, z );
* }
* }
* </pre>
*

View file

@ -56,7 +56,8 @@ public enum GridFlags
DENSE_CAPACITY,
/**
* This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see this
* This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see
* this
* interface for details.
*/
MULTIBLOCK,

View file

@ -155,7 +155,8 @@ public interface IGridNode
/**
* tell the node who was responsible for placing it, failure to do this may result in in-compatibility with the
* security system. Called instead of loadFromNBT when initially placed, once set never required again, the value is saved with the Node NBT.
* security system. Called instead of loadFromNBT when initially placed, once set never required again, the value is
* saved with the Node NBT.
*
* @param playerID new player id
*/

View file

@ -71,7 +71,8 @@ public interface ICraftingGrid extends IGridCache
* @param job - the crafting job from beginCraftingJob
* @param requestingMachine - a machine if its being requested via automation, may be null.
* @param target - can be null
* @param prioritizePower - if cpu is null, this determine if the system should prioritize power, or if it should find the lower
* @param prioritizePower - if cpu is null, this determine if the system should prioritize power, or if it should
* find the lower
* end cpus, automatic processes generally should pick lower end cpus.
* @param src - the action source to use when starting the job, this will be used for extracting items, should
* usually be the same as the one provided to beginCraftingJob.

View file

@ -30,8 +30,7 @@ import appeng.api.networking.energy.IEnergyGrid;
/**
* Posted by the network when the power status of the network goes up or down,
* the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via
* {@link IGridNode}.isActive()
* the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via {@link IGridNode}.isActive()
*
* Note: Most machines just need to check {@link IGridNode}.isActive()
*/

View file

@ -32,7 +32,8 @@ public interface ISpatialCache extends IGridCache
{
/**
* @return true if a region is defined at all, it doesn't have to be valid, but all points must be in the same world.
* @return true if a region is defined at all, it doesn't have to be valid, but all points must be in the same
* world.
*/
boolean hasRegion();

View file

@ -21,8 +21,10 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
@API( apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API" ) package appeng.api;
@API( apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API" )
package appeng.api;
import net.minecraftforge.fml.common.API;

View file

@ -34,7 +34,8 @@ import net.minecraft.world.World;
public interface IPartHelper
{
/**
* Register a new layer with the part layer system, this allows you to write an in between between tile entities and parts.
* Register a new layer with the part layer system, this allows you to write an in between between tile entities and
* parts.
*
* AE By Default includes,
*
@ -52,7 +53,8 @@ public interface IPartHelper
*
* 7. IPipeConnection BC Pipe Connections
*
* As long as a valid layer is registered for a interface you can simply implement that interface on a part get implement it.
* As long as a valid layer is registered for a interface you can simply implement that interface on a part get
* implement it.
*
* @return true on success, false on failure, usually a error will be logged as well.
*/

View file

@ -28,8 +28,8 @@ import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
//@formatter:off
//@formatter:off
/**
* This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack

View file

@ -161,7 +161,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
public AccessRestriction getAccess()
{
return this.getHandler().getAccess();
} @Override
}
@Override
public IItemList<StackType> getStorageList()
{
if( this.hasChanged )
@ -184,7 +186,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
public boolean canAccept( final StackType input )
{
return this.getHandler().canAccept( input );
} @Override
}
@Override
public IItemList<StackType> getAvailableItems( final IItemList out )
{
return this.getHandler().getAvailableItems( out );
@ -208,7 +212,4 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
return this.getHandler().validForPass( i );
}
}

View file

@ -1,7 +1,10 @@
package appeng.api.util;
import net.minecraft.util.AxisAlignedBB;
/**
* Mutable stand in for Axis Aligned BB, this was used to prevent GC Thrashing.. Related code could also be re-written.
*/

View file

@ -1,9 +1,13 @@
package appeng.api.util;
import net.minecraft.util.EnumFacing;
/**
* Stand in for previous Forge Direction, Several uses of this class are simply legacy where as some uses of this class are intended.
* Stand in for previous Forge Direction, Several uses of this class are simply legacy where as some uses of this class
* are intended.
*/
public enum AEPartLocation
{
@ -77,7 +81,8 @@ public enum AEPartLocation
*/
public static AEPartLocation fromFacing( final EnumFacing side )
{
if ( side == null ) return INTERNAL;
if( side == null )
return INTERNAL;
return values()[side.ordinal()];
}

View file

@ -23,11 +23,10 @@
package appeng.api.util;
import net.minecraft.util.EnumFacing;
/**
* Nearly all of AE's Tile Entities implement IOrientable.
*

View file

@ -18,6 +18,7 @@
package appeng.block.misc;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
@ -44,6 +45,7 @@ import appeng.helpers.ICustomCollision;
import appeng.helpers.MetaRotation;
import appeng.tile.misc.TileLightDetector;
public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
{

View file

@ -18,6 +18,7 @@
package appeng.block.networking;
import java.util.EnumSet;
import java.util.List;
import java.util.Random;
@ -68,6 +69,7 @@ import appeng.tile.networking.TileCableBus;
import appeng.tile.networking.TileCableBusTESR;
import appeng.util.Platform;
// TODO: MFR INTEGRATION
//@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR )
public class BlockCableBus extends AEBaseTileBlock // implements

View file

@ -1,5 +1,7 @@
package appeng.client;
public enum ItemRenderType
{
INVENTORY, ENTITY

View file

@ -1,6 +1,7 @@
package appeng.client;
import java.util.Collections;
import java.util.List;
@ -23,6 +24,7 @@ import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.MissingIcon;
// net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer
public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel
{

View file

@ -2,7 +2,6 @@
package appeng.client.render;
import org.lwjgl.util.vector.Vector3f;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;

View file

@ -28,19 +28,18 @@ import appeng.client.ItemRenderType;
public class ToolBiometricCardRender // TileEntityItemStackRenderer
{
public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
{
return true;
}
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )//, final ItemRendererHelper helper )
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )// , final ItemRendererHelper
// helper )
{
return false;//return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
return false;// return helper == ItemRendererHelper.ENTITY_BOBBING || helper ==
// ItemRendererHelper.ENTITY_ROTATION;
}
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
{
/*

View file

@ -34,7 +34,8 @@ public class ToolColorApplicatorRender
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )
{
return false;//return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
return false;// return helper == ItemRendererHelper.ENTITY_BOBBING || helper ==
// ItemRendererHelper.ENTITY_ROTATION;
}
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )

View file

@ -45,7 +45,7 @@ public class PlayerStatsRegistration
/**
* is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the
*
* @param config}
* @param config
*/
private final boolean isAchievementFeatureEnabled;

View file

@ -411,14 +411,16 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Override
public EnumFacing getForward()
{
if ( forward == null ) return EnumFacing.NORTH;
if( forward == null )
return EnumFacing.NORTH;
return this.forward;
}
@Override
public EnumFacing getUp()
{
if ( up == null ) return EnumFacing.UP;
if( up == null )
return EnumFacing.UP;
return this.up;
}

View file

@ -19,7 +19,6 @@
package appeng.tile.misc;
import net.minecraft.util.ITickable;
import appeng.tile.AEBaseTile;

View file

@ -113,5 +113,4 @@ public final class VersionTest
Assert.assertEquals( DEFAULT_VERSION_RV2_BETA_8.formatted(), "rv2-beta-8" );
}
}

View file

@ -1,3 +1,4 @@
package appeng.util;

View file

@ -1,3 +1,4 @@
package appeng.util;