diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java
index 10345d42..0fe2b1e3 100644
--- a/src/api/java/appeng/api/config/PowerUnits.java
+++ b/src/api/java/appeng/api/config/PowerUnits.java
@@ -54,7 +54,7 @@ public enum PowerUnits
* will normally returns 64, as it will convert the EU, to AE with AE's power settings.
*
* @param target target power unit
- * @param value value
+ * @param value value
*
* @return value converted to target units, from this units.
*/
diff --git a/src/api/java/appeng/api/definitions/IBlockDefinition.java b/src/api/java/appeng/api/definitions/IBlockDefinition.java
index 3c52847b..cec10119 100644
--- a/src/api/java/appeng/api/definitions/IBlockDefinition.java
+++ b/src/api/java/appeng/api/definitions/IBlockDefinition.java
@@ -1,3 +1,4 @@
+
package appeng.api.definitions;
diff --git a/src/api/java/appeng/api/definitions/IBlocks.java b/src/api/java/appeng/api/definitions/IBlocks.java
index b784109a..11c71b77 100644
--- a/src/api/java/appeng/api/definitions/IBlocks.java
+++ b/src/api/java/appeng/api/definitions/IBlocks.java
@@ -86,23 +86,16 @@ public interface IBlocks
IBlockDefinition quartzPillarStair();
/*
- IBlockDefinition skyStoneSlab();
+ * IBlockDefinition skyStoneSlab();
+ * IBlockDefinition skyStoneBlockSlab();
+ * IBlockDefinition skyStoneBrickSlab();
+ * IBlockDefinition skyStoneSmallBrickSlab();
+ * IBlockDefinition fluixSlab();
+ * IBlockDefinition quartzSlab();
+ * IBlockDefinition chiseledQuartzSlab();
+ * IBlockDefinition quartzPillarSlab();
+ */
- IBlockDefinition skyStoneBlockSlab();
-
- IBlockDefinition skyStoneBrickSlab();
-
- IBlockDefinition skyStoneSmallBrickSlab();
-
- IBlockDefinition fluixSlab();
-
- IBlockDefinition quartzSlab();
-
- IBlockDefinition chiseledQuartzSlab();
-
- IBlockDefinition quartzPillarSlab();
-*/
-
/*
* misc
*/
diff --git a/src/api/java/appeng/api/definitions/IComparableDefinition.java b/src/api/java/appeng/api/definitions/IComparableDefinition.java
index 219a53df..830a4414 100644
--- a/src/api/java/appeng/api/definitions/IComparableDefinition.java
+++ b/src/api/java/appeng/api/definitions/IComparableDefinition.java
@@ -1,3 +1,4 @@
+
package appeng.api.definitions;
diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java
index df1183a4..e617f611 100644
--- a/src/api/java/appeng/api/definitions/IItemDefinition.java
+++ b/src/api/java/appeng/api/definitions/IItemDefinition.java
@@ -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();
diff --git a/src/api/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java
index 5c7b4adf..f828ede1 100644
--- a/src/api/java/appeng/api/definitions/IParts.java
+++ b/src/api/java/appeng/api/definitions/IParts.java
@@ -78,15 +78,15 @@ public interface IParts
IItemDefinition p2PTunnelLiquids();
- //IItemDefinition p2PTunnelEU();
+ // IItemDefinition p2PTunnelEU();
- //IItemDefinition p2PTunnelRF();
+ // IItemDefinition p2PTunnelRF();
IItemDefinition p2PTunnelLight();
- //IItemDefinition p2PTunnelOpenComputers();
+ // IItemDefinition p2PTunnelOpenComputers();
-// IItemDefinition p2PTunnelPneumaticCraft();
+ // IItemDefinition p2PTunnelPneumaticCraft();
IItemDefinition cableAnchor();
diff --git a/src/api/java/appeng/api/definitions/ITileDefinition.java b/src/api/java/appeng/api/definitions/ITileDefinition.java
index 829d23b7..f4644788 100644
--- a/src/api/java/appeng/api/definitions/ITileDefinition.java
+++ b/src/api/java/appeng/api/definitions/ITileDefinition.java
@@ -1,3 +1,4 @@
+
package appeng.api.definitions;
diff --git a/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java b/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java
index 88a5725f..a04caaab 100644
--- a/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java
+++ b/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java
@@ -1,3 +1,4 @@
+
package appeng.api.exceptions;
diff --git a/src/api/java/appeng/api/exceptions/MissingDefinition.java b/src/api/java/appeng/api/exceptions/MissingDefinition.java
index f920a9e9..78a093f9 100644
--- a/src/api/java/appeng/api/exceptions/MissingDefinition.java
+++ b/src/api/java/appeng/api/exceptions/MissingDefinition.java
@@ -1,3 +1,4 @@
+
package appeng.api.exceptions;
diff --git a/src/api/java/appeng/api/features/IGrinderRegistry.java b/src/api/java/appeng/api/features/IGrinderRegistry.java
index 4076df43..e263c915 100644
--- a/src/api/java/appeng/api/features/IGrinderRegistry.java
+++ b/src/api/java/appeng/api/features/IGrinderRegistry.java
@@ -45,8 +45,8 @@ public interface IGrinderRegistry
/**
* add a new recipe the easy way, in → out, how many turns., duplicates will not be added.
*
- * @param in input
- * @param out output
+ * @param in input
+ * @param out output
* @param turns amount of turns to turn the input into the output
*/
void addRecipe( ItemStack in, ItemStack out, int turns );
@@ -54,24 +54,24 @@ public interface IGrinderRegistry
/**
* add a new recipe with optional outputs, duplicates will not be added.
*
- * @param in input
- * @param out output
+ * @param in input
+ * @param out output
* @param optional optional output
- * @param chance chance to get the optional output within 0.0 - 1.0
- * @param turns amount of turns to turn the input into the outputs
+ * @param chance chance to get the optional output within 0.0 - 1.0
+ * @param turns amount of turns to turn the input into the outputs
*/
void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns );
/**
* add a new recipe with optional outputs, duplicates will not be added.
*
- * @param in input
- * @param out output
- * @param optional optional output
- * @param chance chance to get the optional output within 0.0 - 1.0
+ * @param in input
+ * @param out output
+ * @param optional optional output
+ * @param chance chance to get the optional output within 0.0 - 1.0
* @param optional2 second optional output
- * @param chance2 chance to get the second optional output within 0.0 - 1.0
- * @param turns amount of turns to turn the input into the outputs
+ * @param chance2 chance to get the second optional output within 0.0 - 1.0
+ * @param turns amount of turns to turn the input into the outputs
*/
void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns );
diff --git a/src/api/java/appeng/api/features/IInscriberRecipe.java b/src/api/java/appeng/api/features/IInscriberRecipe.java
index 0ad87c71..4dabca9f 100644
--- a/src/api/java/appeng/api/features/IInscriberRecipe.java
+++ b/src/api/java/appeng/api/features/IInscriberRecipe.java
@@ -1,3 +1,4 @@
+
package appeng.api.features;
diff --git a/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java b/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java
index 049b1527..38dc4b88 100644
--- a/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java
+++ b/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java
@@ -1,3 +1,4 @@
+
package appeng.api.features;
diff --git a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java
index 47a48e81..586470af 100644
--- a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java
+++ b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java
@@ -33,7 +33,7 @@ public interface IMatterCannonAmmoRegistry
/**
* register a new ammo, generally speaking this is based off of atomic weight to make it easier to guess at
*
- * @param ammo new ammo
+ * @param ammo new ammo
* @param weight atomic weight
*/
void registerAmmo( ItemStack ammo, double weight );
diff --git a/src/api/java/appeng/api/features/INetworkEncodable.java b/src/api/java/appeng/api/features/INetworkEncodable.java
index b9aa8bea..d44ebeca 100644
--- a/src/api/java/appeng/api/features/INetworkEncodable.java
+++ b/src/api/java/appeng/api/features/INetworkEncodable.java
@@ -42,9 +42,9 @@ public interface INetworkEncodable
/**
* Encode the wireless frequency via the Controller.
*
- * @param item the wireless terminal.
+ * @param item the wireless terminal.
* @param encKey the wireless encryption key.
- * @param name null for now.
+ * @param name null for now.
*/
void setEncryptionKey( ItemStack item, String encKey, String name );
}
diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java
index fa627247..4679422f 100644
--- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java
+++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java
@@ -42,7 +42,7 @@ public interface IP2PTunnelRegistry
* attunements for AE's P2P Tunnels
*
* @param trigger - the item which triggers attunement. Nullable, but then ignored
- * @param type - the type of tunnel. Nullable, but then ignored
+ * @param type - the type of tunnel. Nullable, but then ignored
*/
void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );
diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java
index eebfceda..2d26716a 100644
--- a/src/api/java/appeng/api/features/IWirelessTermHandler.java
+++ b/src/api/java/appeng/api/features/IWirelessTermHandler.java
@@ -47,8 +47,8 @@ public interface IWirelessTermHandler extends INetworkEncodable
* use an amount of power, in AE units
*
* @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
- * hasPower
- * @param is wireless terminal
+ * hasPower
+ * @param is wireless terminal
*
* @return true if wireless terminal uses power
*/
diff --git a/src/api/java/appeng/api/features/InscriberProcessType.java b/src/api/java/appeng/api/features/InscriberProcessType.java
index 70aaa9f7..179afccf 100644
--- a/src/api/java/appeng/api/features/InscriberProcessType.java
+++ b/src/api/java/appeng/api/features/InscriberProcessType.java
@@ -1,3 +1,4 @@
+
package appeng.api.features;
diff --git a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java
index 6524f6cc..a8bdbaac 100644
--- a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java
+++ b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java
@@ -41,7 +41,7 @@ public interface ICraftingPatternItem
* Access Details about a pattern
*
* @param is pattern
- * @param w crafting world
+ * @param w crafting world
*
* @return details of pattern
*/
diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java
index 32b35231..b1128f45 100644
--- a/src/api/java/appeng/api/implementations/items/IBiometricCard.java
+++ b/src/api/java/appeng/api/implementations/items/IBiometricCard.java
@@ -39,7 +39,7 @@ public interface IBiometricCard
{
/**
- * Set the {@link GameProfile} to null, to clear it.
+ * Set the {@link GameProfile} to null, to clear it.
*/
void setProfile( ItemStack itemStack, GameProfile username );
@@ -67,7 +67,7 @@ public interface IBiometricCard
/**
* remove a permission from the item stack.
*
- * @param itemStack card
+ * @param itemStack card
* @param permission to be removed permission
*/
void removePermission( ItemStack itemStack, SecurityPermissions permission );
@@ -75,7 +75,7 @@ public interface IBiometricCard
/**
* add a permission to the item stack.
*
- * @param itemStack card
+ * @param itemStack card
* @param permission to be added permission
*/
void addPermission( ItemStack itemStack, SecurityPermissions permission );
@@ -84,8 +84,8 @@ public interface IBiometricCard
* lets you handle submission of security values on the card for custom behavior.
*
* @param registry security registry
- * @param pr player registry
- * @param is card
+ * @param pr player registry
+ * @param is card
*/
void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is );
}
diff --git a/src/api/java/appeng/api/implementations/items/IMemoryCard.java b/src/api/java/appeng/api/implementations/items/IMemoryCard.java
index 587e005f..1772a2a4 100644
--- a/src/api/java/appeng/api/implementations/items/IMemoryCard.java
+++ b/src/api/java/appeng/api/implementations/items/IMemoryCard.java
@@ -41,11 +41,11 @@ public interface IMemoryCard
* Configures the data stored on the memory card, the SettingsName, will be
* localized when displayed.
*
- * @param is item
+ * @param is item
* @param SettingsName unlocalized string that represents the tile entity.
- * @param data may contain a String called "tooltip" which is is a
- * unlocalized string displayed after the settings name, optional
- * but can be used to add details to the card for later.
+ * @param data may contain a String called "tooltip" which is is a
+ * unlocalized string displayed after the settings name, optional
+ * but can be used to add details to the card for later.
*/
void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data );
@@ -72,7 +72,7 @@ public interface IMemoryCard
* notify the user of a outcome related to the memory card.
*
* @param player that used the card.
- * @param msg which message to send.
+ * @param msg which message to send.
*/
void notifyUser( EntityPlayer player, MemoryCardMessages msg );
}
diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java
index 1c0f89bf..7ae8f453 100644
--- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java
+++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java
@@ -89,10 +89,10 @@ public interface ISpatialStorageCell
/**
* Perform a spatial swap with the contents of the cell, and the world.
*
- * @param is spatial storage cell
- * @param w world of spatial
- * @param min min coord
- * @param max max coord
+ * @param is spatial storage cell
+ * @param w world of spatial
+ * @param min min coord
+ * @param max max coord
* @param doTransition transition
*
* @return result of transition
diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java
index 0eb2c052..b2b35463 100644
--- a/src/api/java/appeng/api/implementations/items/IStorageCell.java
+++ b/src/api/java/appeng/api/implementations/items/IStorageCell.java
@@ -77,7 +77,7 @@ public interface IStorageCell extends ICellWorkbenchItem
* don't care, just return false; As the handler for this type of cell is
* still the default cells, the normal AE black list is also applied.
*
- * @param cellItem item
+ * @param cellItem item
* @param requestedAddition requested addition
*
* @return true to preventAdditionOfItem
diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java
index fe214997..f3e3ee2c 100644
--- a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java
+++ b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java
@@ -36,8 +36,8 @@ public interface ICraftingMachine
/**
* inserts a crafting plan, and the necessary items into the crafting machine.
*
- * @param patternDetails details of pattern
- * @param table crafting table
+ * @param patternDetails details of pattern
+ * @param table crafting table
* @param ejectionDirection ejection direction
*
* @return if it was accepted, all or nothing.
diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java
index 8bb6d53d..dbd587f7 100644
--- a/src/api/java/appeng/api/movable/IMovableHandler.java
+++ b/src/api/java/appeng/api/movable/IMovableHandler.java
@@ -37,7 +37,7 @@ public interface IMovableHandler
* that single entity, you cannot opt out of single entities.
*
* @param myClass tile entity class
- * @param tile tile entity
+ * @param tile tile entity
*
* @return true if it can handle moving
*/
@@ -51,16 +51,22 @@ public interface IMovableHandler
* Potential Example:
*
*
- * {@code
- * Chunk c = world.getChunkFromBlockCoords( x, z ); c.setChunkBlockTileEntity( x
- * & 0xF, y + y, z & 0xF, tile );
- *
- * if ( c.isChunkLoaded ) { world.addTileEntity( tile ); world.markBlockForUpdate( x,
- * y, z ); }
+ * {
+ * @code
+ * Chunk c = world.getChunkFromBlockCoords( x, z );
+ * c.setChunkBlockTileEntity( x
+ * & 0xF, y + y, z & 0xF, tile );
+ *
+ * if( c.isChunkLoaded )
+ * {
+ * world.addTileEntity( tile );
+ * world.markBlockForUpdate( x,
+ * y, z );
+ * }
* }
*
*
- * @param tile to be moved tile
+ * @param tile to be moved tile
* @param world world of tile
* @param newPosition the new location
*/
diff --git a/src/api/java/appeng/api/networking/GridFlags.java b/src/api/java/appeng/api/networking/GridFlags.java
index b698fb93..c296eb64 100644
--- a/src/api/java/appeng/api/networking/GridFlags.java
+++ b/src/api/java/appeng/api/networking/GridFlags.java
@@ -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,
diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java
index dbdf7af4..87baf84d 100644
--- a/src/api/java/appeng/api/networking/IGridBlock.java
+++ b/src/api/java/appeng/api/networking/IGridBlock.java
@@ -85,7 +85,7 @@ public interface IGridBlock
/**
* Update Blocks network/connection/booting status. grid,
*
- * @param grid grid
+ * @param grid grid
* @param channelsInUse used channels
*/
void setNetworkStatus( IGrid grid, int channelsInUse );
diff --git a/src/api/java/appeng/api/networking/IGridCache.java b/src/api/java/appeng/api/networking/IGridCache.java
index 142f5e07..e692f237 100644
--- a/src/api/java/appeng/api/networking/IGridCache.java
+++ b/src/api/java/appeng/api/networking/IGridCache.java
@@ -48,7 +48,7 @@ public interface IGridCache
* information, do it on the next updateTick.
*
* @param gridNode removed from that grid
- * @param machine to be removed machine
+ * @param machine to be removed machine
*/
void removeNode( IGridNode gridNode, IGridHost machine );
@@ -60,7 +60,7 @@ public interface IGridCache
* information, do it on the next updateTick.
*
* @param gridNode added to grid node
- * @param machine to be added machine
+ * @param machine to be added machine
*/
void addNode( IGridNode gridNode, IGridHost machine );
diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java
index 817bef9e..bd272c89 100644
--- a/src/api/java/appeng/api/networking/IGridHost.java
+++ b/src/api/java/appeng/api/networking/IGridHost.java
@@ -44,7 +44,7 @@ public interface IGridHost
* Grid when your block is ready.
*
* @param dir feel free to ignore this, most blocks will use the same node
- * for every side.
+ * for every side.
*
* @return a new IGridNode, create these with
* AEApi.INSTANCE().createGridNode( MyIGridBlock )
diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java
index 44406a8f..667db387 100644
--- a/src/api/java/appeng/api/networking/IGridNode.java
+++ b/src/api/java/appeng/api/networking/IGridNode.java
@@ -119,7 +119,7 @@ public interface IGridNode
*
* Important: You must call this before updateState.
*
- * @param name nbt name
+ * @param name nbt name
* @param nodeData to be loaded data
*/
void loadFromNBT( String name, NBTTagCompound nodeData );
@@ -128,7 +128,7 @@ public interface IGridNode
* this should be called for each node you maintain, you can save all your nodes to the same tag with different
* names, if you fail to complete the load / save procedure, network state may be lost between game load/saves.
*
- * @param name nbt name
+ * @param name nbt name
* @param nodeData to be saved data
*/
void saveToNBT( String name, NBTTagCompound nodeData );
@@ -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
*/
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
index 79798ba8..7e0cc94e 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
@@ -42,9 +42,9 @@ public interface ICraftingGrid extends IGridCache
/**
* @param whatToCraft requested craft
- * @param world crafting world
- * @param slot slot index
- * @param details pattern details
+ * @param world crafting world
+ * @param slot slot index
+ * @param details pattern details
*
* @return a collection of crafting patterns for the item in question.
*/
@@ -53,12 +53,12 @@ public interface ICraftingGrid extends IGridCache
/**
* Begin calculating a crafting job.
*
- * @param world crafting world
- * @param grid network
+ * @param world crafting world
+ * @param grid network
* @param actionSrc source
* @param craftWhat result
- * @param callback callback
- * -- optional
+ * @param callback callback
+ * -- optional
*
* @return a future which will at an undetermined point in the future get you the {@link ICraftingJob} do not wait
* on this, your be waiting forever.
@@ -68,13 +68,14 @@ public interface ICraftingGrid extends IGridCache
/**
* Submit the job to the Crafting system for processing.
*
- * @param job - the crafting job from beginCraftingJob
+ * @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
- * 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.
+ * @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
+ * 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.
*
* @return null ( if failed ) or an {@link ICraftingLink} other wise, if you send requestingMachine you need to
* properly keep track of this and handle the nbt saving and loading of the object as well as the
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
index 3cb7da31..6f157890 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
@@ -38,7 +38,7 @@ public interface ICraftingMedium
* possible the output should be directed.
*
* @param patternDetails details
- * @param table crafting table
+ * @param table crafting table
*
* @return if the pattern was successfully pushed.
*/
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
index 7a4b2419..5f90e2c0 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
@@ -48,7 +48,7 @@ public interface ICraftingPatternDetails
/**
* @param slotIndex specific slot index
* @param itemStack item in slot
- * @param world crafting world
+ * @param world crafting world
*
* @return if an item can be used in the specific slot for this pattern.
*/
@@ -88,7 +88,7 @@ public interface ICraftingPatternDetails
* Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements.
*
* @param craftingInv inventory
- * @param world crafting world
+ * @param world crafting world
*
* @return the crafted ( work bench ) item.
*/
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
index 171ff348..e1684a12 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
@@ -47,7 +47,7 @@ public interface ICraftingRequester extends IActionHost
* be returned.
*
* @param items item
- * @param mode action mode
+ * @param mode action mode
*
* @return unwanted item
*/
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java
index ed6f6f9c..a18f4aa9 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java
@@ -42,7 +42,7 @@ public interface ICraftingWatcherHost
* Called when a crafting status changes.
*
* @param craftingGrid current crafting grid
- * @param what change
+ * @param what change
*/
void onRequestChange( ICraftingGrid craftingGrid, IAEItemStack what );
}
diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
index 938c61ce..7cb1ac10 100644
--- a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
+++ b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
@@ -37,7 +37,7 @@ public interface IAEPowerStorage extends IEnergySource
/**
* Inject amt, power into the device, it will store what it can, and return the amount unable to be stored.
*
- * @param amt to be injected amount
+ * @param amt to be injected amount
* @param mode action mode
*
* @return amount of power which was unable to be stored
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java
index fe6483a9..666b3532 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java
@@ -74,7 +74,7 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
* Another important note, is that if a network that had overflow is deleted, its power is gone, this is one of the
* reasons why keeping overflow to a minimum is important.
*
- * @param amt power to inject into the network
+ * @param amt power to inject into the network
* @param mode should the action be simulated or performed?
*
* @return the amount of power that the network has OVER the limit.
diff --git a/src/api/java/appeng/api/networking/energy/IEnergySource.java b/src/api/java/appeng/api/networking/energy/IEnergySource.java
index b1b8ac85..b1185dfa 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergySource.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergySource.java
@@ -34,7 +34,7 @@ public interface IEnergySource
/**
* Extract power from the network.
*
- * @param amt extracted power
+ * @param amt extracted power
* @param mode should the action be simulated or performed?
*
* @return returns extracted power.
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
index ed7ed4bc..b60bdfe5 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
@@ -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()
*/
diff --git a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java
index ea666a12..20cfc117 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java
@@ -36,7 +36,7 @@ public class MENetworkSpatialEvent extends MENetworkEvent
public final double spatialEnergyUsage;
/**
- * @param SpatialIO ( INSTANCE of the SpatialIO block )
+ * @param SpatialIO ( INSTANCE of the SpatialIO block )
* @param EnergyUsage ( the amount of energy that the SpatialIO uses)
*/
public MENetworkSpatialEvent( final IGridHost SpatialIO, final double EnergyUsage )
diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java
index 3a54590c..9dd0ad09 100644
--- a/src/api/java/appeng/api/networking/security/ISecurityGrid.java
+++ b/src/api/java/appeng/api/networking/security/ISecurityGrid.java
@@ -42,7 +42,7 @@ public interface ISecurityGrid extends IGridCache
* Check if a player has permissions.
*
* @param player to be checked player
- * @param perm checked permissions
+ * @param perm checked permissions
*
* @return true if the player has permissions.
*/
@@ -52,7 +52,7 @@ public interface ISecurityGrid extends IGridCache
* Check if a player has permissions.
*
* @param playerID id of player
- * @param perm checked permissions
+ * @param perm checked permissions
*
* @return true if the player has permissions.
*/
diff --git a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java
index 73a29777..77ed8df3 100644
--- a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java
+++ b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java
@@ -38,7 +38,7 @@ public interface ISecurityRegistry
/**
* Submit Permissions into the register.
*
- * @param playerID player id
+ * @param playerID player id
* @param permissions permissions of player
*/
void addPlayer( int playerID, EnumSet permissions );
diff --git a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java
index d70b9bda..68259ad1 100644
--- a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java
+++ b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java
@@ -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();
diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java
index f2a9f3dc..ca411821 100644
--- a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java
+++ b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java
@@ -44,11 +44,11 @@ public interface IStackWatcherHost
/**
* Called when a watched item changes amounts.
*
- * @param o changed item list
+ * @param o changed item list
* @param fullStack old stack
* @param diffStack new stack
- * @param src action source
- * @param chan storage channel
+ * @param src action source
+ * @param chan storage channel
*/
void onStackChange( IItemList o, IAEStack fullStack, IAEStack diffStack, BaseActionSource src, StorageChannel chan );
}
diff --git a/src/api/java/appeng/api/networking/ticking/IGridTickable.java b/src/api/java/appeng/api/networking/ticking/IGridTickable.java
index 5e2bd2a5..c5d10350 100644
--- a/src/api/java/appeng/api/networking/ticking/IGridTickable.java
+++ b/src/api/java/appeng/api/networking/ticking/IGridTickable.java
@@ -68,8 +68,8 @@ public interface IGridTickable
* Note: this is never called if you return null from getTickingRequest.
*
* @param TicksSinceLastCall the number of world ticks that were skipped since your last
- * tick, you can use this to adjust speed of processing or adjust
- * your tick rate.
+ * tick, you can use this to adjust speed of processing or adjust
+ * your tick rate.
*
* @return tick rate adjustment.
*/
diff --git a/src/api/java/appeng/api/package-info.java b/src/api/java/appeng/api/package-info.java
index 7bab7628..eaea0c21 100644
--- a/src/api/java/appeng/api/package-info.java
+++ b/src/api/java/appeng/api/package-info.java
@@ -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;
+
diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java
index c1459512..bb4f9ee1 100644
--- a/src/api/java/appeng/api/parts/IPart.java
+++ b/src/api/java/appeng/api/parts/IPart.java
@@ -70,7 +70,7 @@ public interface IPart extends IBoxProvider
*
* GL Available
*
- * @param rh helper
+ * @param rh helper
* @param renderer renderer
*/
@SideOnly( Side.CLIENT )
@@ -81,10 +81,10 @@ public interface IPart extends IBoxProvider
*
* GL is NOT Available
*
- * @param x x coord
- * @param y y coord
- * @param z z coord
- * @param rh helper
+ * @param x x coord
+ * @param y y coord
+ * @param z z coord
+ * @param rh helper
* @param renderer renderer
*/
@SideOnly( Side.CLIENT )
@@ -95,10 +95,10 @@ public interface IPart extends IBoxProvider
*
* GL Available
*
- * @param x x coord
- * @param y y coord
- * @param z z coord
- * @param rh helper
+ * @param x x coord
+ * @param y y coord
+ * @param z z coord
+ * @param rh helper
* @param renderer renderer
*/
@SideOnly( Side.CLIENT )
@@ -109,7 +109,7 @@ public interface IPart extends IBoxProvider
* texture.
*/
@SideOnly( Side.CLIENT )
- TextureAtlasSprite getBreakingTexture(ModelGenerator renderer);
+ TextureAtlasSprite getBreakingTexture( ModelGenerator renderer );
/**
* return true only if your part require dynamic rendering, must be consistent.
@@ -239,7 +239,7 @@ public interface IPart extends IBoxProvider
* Called when you right click the part, very similar to Block.onActivateBlock
*
* @param player right clicking player
- * @param pos position of block
+ * @param pos position of block
*
* @return if your activate method performed something.
*/
@@ -249,7 +249,7 @@ public interface IPart extends IBoxProvider
* Called when you right click the part, very similar to Block.onActivateBlock
*
* @param player shift right clicking player
- * @param pos position of block
+ * @param pos position of block
*
* @return if your activate method performed something, you should use false unless you really need it.
*/
@@ -259,7 +259,7 @@ public interface IPart extends IBoxProvider
* Add drops to the items being dropped into the world, if your item stores its contents when wrenched use the
* wrenched boolean to control what data is saved vs dropped when it is broken.
*
- * @param drops item drops if wrenched
+ * @param drops item drops if wrenched
* @param wrenched control flag for wrenched vs broken
*/
void getDrops( List drops, boolean wrenched );
@@ -273,8 +273,8 @@ public interface IPart extends IBoxProvider
* same as Block.randomDisplayTick, for but parts.
*
* @param world world of block
- * @param pos location of block
- * @param r random
+ * @param pos location of block
+ * @param r random
*/
void randomDisplayTick( World world, BlockPos pos, Random r );
@@ -282,8 +282,8 @@ public interface IPart extends IBoxProvider
* Called when placed in the world by a player, this happens before addWorld.
*
* @param player placing player
- * @param held held item
- * @param side placing side
+ * @param held held item
+ * @param side placing side
*/
void onPlacement( EntityPlayer player, ItemStack held, AEPartLocation side );
diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java
index cbe363fb..dc78aebf 100644
--- a/src/api/java/appeng/api/parts/IPartHelper.java
+++ b/src/api/java/appeng/api/parts/IPartHelper.java
@@ -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.
*/
diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java
index b5da172c..700585f7 100644
--- a/src/api/java/appeng/api/parts/IPartHost.java
+++ b/src/api/java/appeng/api/parts/IPartHost.java
@@ -64,8 +64,8 @@ public interface IPartHost
/**
* try to add a new part to the specified side, returns false if it failed to be added.
*
- * @param is new part
- * @param side onto side
+ * @param is new part
+ * @param side onto side
* @param owner with owning player
*
* @return null if the item failed to add, the side it was placed on other wise ( may different for cables,
@@ -90,14 +90,14 @@ public interface IPartHost
* @return the part located on the specified side, or null if there is no part.
*/
IPart getPart( EnumFacing side );
-
+
/**
* removes the part on the side, this doesn't drop it or anything, if you don't do something with it, its just
* "gone" and its never coming back; think about it.
*
* if you want to drop the part you must request it prior to removing it.
*
- * @param side side of part
+ * @param side side of part
* @param suppressUpdate - used if you need to replace a part's INSTANCE, without really removing it first.
*/
void removePart( AEPartLocation side, boolean suppressUpdate );
diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java
index 7940339f..1e0293a2 100644
--- a/src/api/java/appeng/api/parts/IPartItem.java
+++ b/src/api/java/appeng/api/parts/IPartItem.java
@@ -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
@@ -46,7 +46,7 @@ import net.minecraft.item.ItemStack;
* {
* return 0;
* }
- *
+ *
* {@literal @}Override
* public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
* {
diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java
index e855616b..d0b80d32 100644
--- a/src/api/java/appeng/api/parts/IPartRenderHelper.java
+++ b/src/api/java/appeng/api/parts/IPartRenderHelper.java
@@ -58,9 +58,9 @@ public interface IPartRenderHelper
*
* render a single face.
*
- * @param pos POSITION of part
- * @param ico icon of part
- * @param face direction its facing
+ * @param pos POSITION of part
+ * @param ico icon of part
+ * @param face direction its facing
* @param renderer renderer of part
*/
@SideOnly( Side.CLIENT )
@@ -71,11 +71,11 @@ public interface IPartRenderHelper
*
* render a box with a cut out box in the center.
*
- * @param pos pos of part
- * @param ico icon of part
- * @param face face of part
+ * @param pos pos of part
+ * @param ico icon of part
+ * @param face face of part
* @param edgeThickness thickness of the edge
- * @param renderer renderer
+ * @param renderer renderer
*/
@SideOnly( Side.CLIENT )
void renderFaceCutout( BlockPos pos, IAESprite ico, EnumFacing face, float edgeThickness, ModelGenerator renderer );
@@ -85,9 +85,9 @@ public interface IPartRenderHelper
*
* render a block of specified bounds.
*
- * @param x x pos of block
- * @param y y pos of block
- * @param z z pos of block
+ * @param x x pos of block
+ * @param y y pos of block
+ * @param z z pos of block
* @param renderer renderer
*/
@SideOnly( Side.CLIENT )
@@ -96,9 +96,9 @@ public interface IPartRenderHelper
/**
* render a single face in inventory renderer.
*
- * @param TextureAtlasSprite icon of part
+ * @param TextureAtlasSprite icon of part
* @param direction face of part
- * @param renderer renderer
+ * @param renderer renderer
*/
@SideOnly( Side.CLIENT )
void renderInventoryFace( IAESprite IIcon, EnumFacing direction, ModelGenerator renderer );
@@ -116,12 +116,12 @@ public interface IPartRenderHelper
*
* set unique icons for each side of the block.
*
- * @param down down face
- * @param up up face
+ * @param down down face
+ * @param up up face
* @param north north face
* @param south south face
- * @param west west face
- * @param east east face
+ * @param west west face
+ * @param east east face
*/
void setTexture( IAESprite down, IAESprite up, IAESprite north, IAESprite south, IAESprite west, IAESprite east );
@@ -164,9 +164,9 @@ public interface IPartRenderHelper
/**
* render a block using the current renderer state.
*
- * @param x x pos of part
- * @param y y pos of part
- * @param z z pos of part
+ * @param x x pos of part
+ * @param y y pos of part
+ * @param z z pos of part
* @param renderer renderer of part
*/
void renderBlockCurrentBounds( BlockPos pos, ModelGenerator renderer );
diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java
index 66f44277..bd94b2da 100644
--- a/src/api/java/appeng/api/recipes/ICraftHandler.java
+++ b/src/api/java/appeng/api/recipes/ICraftHandler.java
@@ -37,7 +37,7 @@ public interface ICraftHandler
/**
* Called when your recipe handler receives a newly parsed list of inputs/outputs.
*
- * @param input parsed inputs
+ * @param input parsed inputs
* @param output parsed outputs
*
* @throws RecipeError
diff --git a/src/api/java/appeng/api/recipes/IRecipeHandler.java b/src/api/java/appeng/api/recipes/IRecipeHandler.java
index 5c7b32e0..58c2b4a7 100644
--- a/src/api/java/appeng/api/recipes/IRecipeHandler.java
+++ b/src/api/java/appeng/api/recipes/IRecipeHandler.java
@@ -34,7 +34,7 @@ public interface IRecipeHandler
* Call when you want to read recipes in from a file based on a loader
*
* @param loader recipe loader
- * @param path path of file
+ * @param path path of file
*/
void parseRecipes( IRecipeLoader loader, String path );
diff --git a/src/api/java/appeng/api/recipes/ISubItemResolver.java b/src/api/java/appeng/api/recipes/ISubItemResolver.java
index 3e9c473a..1013986d 100644
--- a/src/api/java/appeng/api/recipes/ISubItemResolver.java
+++ b/src/api/java/appeng/api/recipes/ISubItemResolver.java
@@ -28,7 +28,7 @@ public interface ISubItemResolver
{
/**
* @param namespace namespace of sub item
- * @param fullName name of sub item
+ * @param fullName name of sub item
*
* @return either a ResolveResult, or a ResolverResultSet
*/
diff --git a/src/api/java/appeng/api/storage/ICellHandler.java b/src/api/java/appeng/api/storage/ICellHandler.java
index 755c70c6..5ef6f293 100644
--- a/src/api/java/appeng/api/storage/ICellHandler.java
+++ b/src/api/java/appeng/api/storage/ICellHandler.java
@@ -52,9 +52,9 @@ public interface ICellHandler
/**
* If you cannot handle the provided item, return null
*
- * @param is a storage cell item.
- * @param host anytime the contents of your storage cell changes it should use this to request a save, please
- * note, this value can be null.
+ * @param is a storage cell item.
+ * @param host anytime the contents of your storage cell changes it should use this to request a save, please
+ * note, this value can be null.
* @param channel the storage channel requested.
*
* @return a new IMEHandler for the provided item
@@ -90,12 +90,12 @@ public interface ICellHandler
* is not available via ME Chests simply tell the user they can't use it, or something, other wise you should open
* your gui and display the cell to the user.
*
- * @param player player opening chest gui
- * @param chest to be opened chest
+ * @param player player opening chest gui
+ * @param chest to be opened chest
* @param cellHandler cell handler
- * @param inv inventory handler
- * @param is item
- * @param chan storage channel
+ * @param inv inventory handler
+ * @param is item
+ * @param chan storage channel
*/
void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler inv, ItemStack is, StorageChannel chan );
@@ -108,7 +108,7 @@ public interface ICellHandler
*
* 3 - red, ( usually means the cell is 100% full )
*
- * @param is the cell item. ( use the handler for any details you can )
+ * @param is the cell item. ( use the handler for any details you can )
* @param handler the handler for the cell is provides for reference, you can cast this to your handler.
*
* @return get the status of the cell based on its contents.
diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java
index 406bfd22..9b4941d7 100644
--- a/src/api/java/appeng/api/storage/ICellRegistry.java
+++ b/src/api/java/appeng/api/storage/ICellRegistry.java
@@ -67,7 +67,7 @@ public interface ICellRegistry
/**
* returns an IMEInventoryHandler for the provided item.
*
- * @param is item with inventory handler
+ * @param is item with inventory handler
* @param host can be null, or the hosting tile / part.
* @param chan the storage channel to request the handler for.
*
diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java
index d7e3e615..81f941f8 100644
--- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java
+++ b/src/api/java/appeng/api/storage/IExternalStorageHandler.java
@@ -40,7 +40,7 @@ public interface IExternalStorageHandler
* if this can handle the provided inventory, return true. ( Generally skipped by AE, and it just calls getInventory
* )
*
- * @param te to be handled tile entity
+ * @param te to be handled tile entity
* @param mySrc source
*
* @return true, if it can get a handler via getInventory
@@ -53,10 +53,10 @@ public interface IExternalStorageHandler
* please note that if your inventory changes and requires polling, you must use an {@link IMEMonitor} instead of an
* {@link IMEInventory} failure to do so will result in invalid item counts and reporting of the inventory.
*
- * @param te to be handled tile entity
- * @param d direction
+ * @param te to be handled tile entity
+ * @param d direction
* @param channel channel
- * @param src source
+ * @param src source
*
* @return The Handler for the inventory
*/
diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java
index 648f7aec..eb6f80c5 100644
--- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java
+++ b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java
@@ -47,10 +47,10 @@ public interface IExternalStorageRegistry
void addExternalStorageInterface( IExternalStorageHandler esh );
/**
- * @param te tile entity
+ * @param te tile entity
* @param opposite direction
- * @param channel channel
- * @param mySrc source
+ * @param channel channel
+ * @param mySrc source
*
* @return the handler for a given tile / forge direction
*/
diff --git a/src/api/java/appeng/api/storage/IMEInventory.java b/src/api/java/appeng/api/storage/IMEInventory.java
index 58ff46c6..c6896004 100644
--- a/src/api/java/appeng/api/storage/IMEInventory.java
+++ b/src/api/java/appeng/api/storage/IMEInventory.java
@@ -47,8 +47,8 @@ public interface IMEInventory
* Store new items, or simulate the addition of new items into the ME Inventory.
*
* @param input item to add.
- * @param type action type
- * @param src action source
+ * @param type action type
+ * @param src action source
*
* @return returns the number of items not added.
*/
@@ -58,7 +58,7 @@ public interface IMEInventory
* Extract the specified item from the ME Inventory
*
* @param request item to request ( with stack size. )
- * @param mode simulate, or perform action?
+ * @param mode simulate, or perform action?
*
* @return returns the number of items extracted, null
*/
diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java
index c75eac22..c48b0e0a 100644
--- a/src/api/java/appeng/api/storage/IStorageHelper.java
+++ b/src/api/java/appeng/api/storage/IStorageHelper.java
@@ -102,10 +102,10 @@ public interface IStorageHelper
/**
* use energy from energy, to remove request items from cell, at the request of src.
*
- * @param energy to be drained energy source
- * @param cell cell of requested items
+ * @param energy to be drained energy source
+ * @param cell cell of requested items
* @param request requested items
- * @param src action source
+ * @param src action source
*
* @return items that successfully extracted.
*/
@@ -115,9 +115,9 @@ public interface IStorageHelper
* use energy from energy, to inject input items into cell, at the request of src
*
* @param energy to be added energy source
- * @param cell injected cell
- * @param input to be injected items
- * @param src action source
+ * @param cell injected cell
+ * @param input to be injected items
+ * @param src action source
*
* @return items that failed to insert.
*/
diff --git a/src/api/java/appeng/api/storage/MEMonitorHandler.java b/src/api/java/appeng/api/storage/MEMonitorHandler.java
index 7d9ee624..c8de980d 100644
--- a/src/api/java/appeng/api/storage/MEMonitorHandler.java
+++ b/src/api/java/appeng/api/storage/MEMonitorHandler.java
@@ -161,7 +161,9 @@ public class MEMonitorHandler implements IMEMonitor<
public AccessRestriction getAccess()
{
return this.getHandler().getAccess();
- } @Override
+ }
+
+ @Override
public IItemList getStorageList()
{
if( this.hasChanged )
@@ -184,7 +186,9 @@ public class MEMonitorHandler implements IMEMonitor<
public boolean canAccept( final StackType input )
{
return this.getHandler().canAccept( input );
- } @Override
+ }
+
+ @Override
public IItemList getAvailableItems( final IItemList out )
{
return this.getHandler().getAvailableItems( out );
@@ -208,7 +212,4 @@ public class MEMonitorHandler implements IMEMonitor<
return this.getHandler().validForPass( i );
}
-
-
-
}
diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java
index e1db8a0f..adc877cf 100644
--- a/src/api/java/appeng/api/storage/data/IAEStack.java
+++ b/src/api/java/appeng/api/storage/data/IAEStack.java
@@ -152,7 +152,7 @@ public interface IAEStack
*
* a IAEItemStack to another AEItemStack or a ItemStack.
*
- * @param st stacks
+ * @param st stacks
* @param mode used fuzzy mode
*
* @return true if two stacks are equal based on AE Fuzzy Comparison.
diff --git a/src/api/java/appeng/api/util/AEAxisAlignedBB.java b/src/api/java/appeng/api/util/AEAxisAlignedBB.java
index 415c67f9..70b13583 100644
--- a/src/api/java/appeng/api/util/AEAxisAlignedBB.java
+++ b/src/api/java/appeng/api/util/AEAxisAlignedBB.java
@@ -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.
*/
@@ -18,15 +21,15 @@ public class AEAxisAlignedBB
{
return AxisAlignedBB.fromBounds( this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ );
}
-
- public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f)
+
+ public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f )
{
- this.minX =a;
- this.minY =b;
- this.minZ =c;
- this.maxX =d;
- this.maxY =e;
- this.maxZ =f;
+ this.minX = a;
+ this.minY = b;
+ this.minZ = c;
+ this.maxX = d;
+ this.maxY = e;
+ this.maxZ = f;
}
public static AEAxisAlignedBB fromBounds(
@@ -37,17 +40,17 @@ public class AEAxisAlignedBB
final double e,
final double f )
{
- return new AEAxisAlignedBB(a,b,c,d,e,f);
+ return new AEAxisAlignedBB( a, b, c, d, e, f );
}
public static AEAxisAlignedBB fromBounds(
final AxisAlignedBB bb )
{
return new AEAxisAlignedBB( bb.minX,
- bb.minY,
- bb.minZ,
- bb.maxX,
- bb.maxY,
- bb.maxZ );
+ bb.minY,
+ bb.minZ,
+ bb.maxX,
+ bb.maxY,
+ bb.maxZ );
}
}
diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java
index b7fa2197..350d1b88 100644
--- a/src/api/java/appeng/api/util/AEColor.java
+++ b/src/api/java/appeng/api/util/AEColor.java
@@ -99,7 +99,7 @@ public enum AEColor
* Vanilla Dye Equivilient
*/
public final EnumDyeColor dye;
-
+
AEColor( final String unlocalizedName, final EnumDyeColor dye, final int blackHex, final int medHex, final int whiteHex )
{
this.unlocalizedName = unlocalizedName;
diff --git a/src/api/java/appeng/api/util/AEColoredItemDefinition.java b/src/api/java/appeng/api/util/AEColoredItemDefinition.java
index caf292a7..71367e86 100644
--- a/src/api/java/appeng/api/util/AEColoredItemDefinition.java
+++ b/src/api/java/appeng/api/util/AEColoredItemDefinition.java
@@ -63,7 +63,7 @@ public interface AEColoredItemDefinition
/**
* Compare {@link ItemStack} with this
*
- * @param color compared color of item
+ * @param color compared color of item
* @param comparableItem compared item
*
* @return true if the item stack is a matching item.
diff --git a/src/api/java/appeng/api/util/AEPartLocation.java b/src/api/java/appeng/api/util/AEPartLocation.java
index 5409ef5a..433f33fd 100644
--- a/src/api/java/appeng/api/util/AEPartLocation.java
+++ b/src/api/java/appeng/api/util/AEPartLocation.java
@@ -1,100 +1,105 @@
+
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
{
- /**
- * Negative Y
- */
- DOWN(0, -1, 0),
+ /**
+ * Negative Y
+ */
+ DOWN( 0, -1, 0 ),
/**
* Positive Y
*/
- UP(0, 1, 0),
+ UP( 0, 1, 0 ),
- /**
- * Negative Z
- */
- NORTH(0, 0, -1),
+ /**
+ * Negative Z
+ */
+ NORTH( 0, 0, -1 ),
/**
* Positive Z
*/
- SOUTH(0, 0, 1),
-
- /**
- * Negative X
- */
- WEST(-1, 0, 0),
+ SOUTH( 0, 0, 1 ),
- /**
- * Posative X
- */
- EAST(1, 0, 0),
+ /**
+ * Negative X
+ */
+ WEST( -1, 0, 0 ),
- /**
- * Center or inside of the block.
- */
- INTERNAL(0, 0, 0);
+ /**
+ * Posative X
+ */
+ EAST( 1, 0, 0 ),
- public final int xOffset;
- public final int yOffset;
- public final int zOffset;
-
- private static final EnumFacing[] facings = { EnumFacing.DOWN, EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST, null };
- private static final int[] OPPOSITES = {1, 0, 3, 2, 5, 4, 6};
+ /**
+ * Center or inside of the block.
+ */
+ INTERNAL( 0, 0, 0 );
- public static final AEPartLocation[] SIDE_LOCATIONS = {DOWN, UP, NORTH, SOUTH, WEST, EAST};
-
- private AEPartLocation( final int x, final int y, final int z)
- {
- this.xOffset = x;
- this.yOffset = y;
- this.zOffset = z;
- }
+ public final int xOffset;
+ public final int yOffset;
+ public final int zOffset;
- /**
- * @return Part Location
- */
- public static AEPartLocation fromOrdinal( final int id)
- {
- if (id >= 0 && id < SIDE_LOCATIONS.length)
- return SIDE_LOCATIONS[id];
-
- return INTERNAL;
- }
+ private static final EnumFacing[] facings = { EnumFacing.DOWN, EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST, null };
+ private static final int[] OPPOSITES = { 1, 0, 3, 2, 5, 4, 6 };
- /**
- * 100% chance of success.
- *
- * @param side
- * @return proper Part Location for a facing enum.
- */
- public static AEPartLocation fromFacing( final EnumFacing side)
- {
- if ( side == null ) return INTERNAL;
- return values()[side.ordinal()];
- }
+ public static final AEPartLocation[] SIDE_LOCATIONS = { DOWN, UP, NORTH, SOUTH, WEST, EAST };
- /**
- * @return Opposite Part Location, INTERNAL remains INTERNAL.
- */
- public AEPartLocation getOpposite()
- {
- return fromOrdinal(OPPOSITES[this.ordinal()]);
- }
+ private AEPartLocation( final int x, final int y, final int z )
+ {
+ this.xOffset = x;
+ this.yOffset = y;
+ this.zOffset = z;
+ }
- /**
- * @return EnumFacing Equivalence, if Center returns null.
- */
+ /**
+ * @return Part Location
+ */
+ public static AEPartLocation fromOrdinal( final int id )
+ {
+ if( id >= 0 && id < SIDE_LOCATIONS.length )
+ return SIDE_LOCATIONS[id];
+
+ return INTERNAL;
+ }
+
+ /**
+ * 100% chance of success.
+ *
+ * @param side
+ * @return proper Part Location for a facing enum.
+ */
+ public static AEPartLocation fromFacing( final EnumFacing side )
+ {
+ if( side == null )
+ return INTERNAL;
+ return values()[side.ordinal()];
+ }
+
+ /**
+ * @return Opposite Part Location, INTERNAL remains INTERNAL.
+ */
+ public AEPartLocation getOpposite()
+ {
+ return fromOrdinal( OPPOSITES[this.ordinal()] );
+ }
+
+ /**
+ * @return EnumFacing Equivalence, if Center returns null.
+ */
public EnumFacing getFacing()
{
return facings[this.ordinal()];
}
-
+
}
diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java
index fddcb4c0..ff291592 100644
--- a/src/api/java/appeng/api/util/DimensionalCoord.java
+++ b/src/api/java/appeng/api/util/DimensionalCoord.java
@@ -54,7 +54,7 @@ public class DimensionalCoord extends WorldCoord
public DimensionalCoord( final World _w, final int x, final int y, final int z )
{
- super( x,y,z );
+ super( x, y, z );
this.w = _w;
this.dimId = _w.provider.getDimensionId();
}
diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java
index 52df6945..9b4dad4c 100644
--- a/src/api/java/appeng/api/util/IConfigManager.java
+++ b/src/api/java/appeng/api/util/IConfigManager.java
@@ -49,7 +49,7 @@ public interface IConfigManager
/**
* used to initialize the configuration manager, should be called for all settings.
*
- * @param settingName name of setting
+ * @param settingName name of setting
* @param defaultValue default value of setting
*/
void registerSetting( Settings settingName, Enum defaultValue );
@@ -67,7 +67,7 @@ public interface IConfigManager
* Change setting
*
* @param settingName to be changed setting
- * @param newValue new value for setting
+ * @param newValue new value for setting
*
* @return changed setting
*/
diff --git a/src/api/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java
index f27a97be..6a5a3665 100644
--- a/src/api/java/appeng/api/util/IOrientable.java
+++ b/src/api/java/appeng/api/util/IOrientable.java
@@ -23,11 +23,10 @@
package appeng.api.util;
+
import net.minecraft.util.EnumFacing;
-
-
/**
* Nearly all of AE's Tile Entities implement IOrientable.
*
@@ -57,7 +56,7 @@ public interface IOrientable
* Update the orientation
*
* @param Forward new forward direction
- * @param Up new upwards direction
+ * @param Up new upwards direction
*/
void setOrientation( EnumFacing Forward, EnumFacing Up );
}
\ No newline at end of file
diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java
index 360dec89..de75256b 100644
--- a/src/api/java/appeng/api/util/IOrientableBlock.java
+++ b/src/api/java/appeng/api/util/IOrientableBlock.java
@@ -41,9 +41,9 @@ public interface IOrientableBlock
/**
* @param world world of block
- * @param x x pos of block
- * @param y y pos of block
- * @param z z pos of block
+ * @param x x pos of block
+ * @param y y pos of block
+ * @param z z pos of block
*
* @return a IOrientable if applicable
*/
diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java
index 854ac827..555813f9 100644
--- a/src/api/java/appeng/api/util/WorldCoord.java
+++ b/src/api/java/appeng/api/util/WorldCoord.java
@@ -179,7 +179,7 @@ public class WorldCoord
{
return new BlockPos( this.x, this.y, this.z );
}
-
+
@Override
public String toString()
{
diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java
index cae779d8..f1ca9b1b 100644
--- a/src/main/java/appeng/block/AEBaseBlock.java
+++ b/src/main/java/appeng/block/AEBaseBlock.java
@@ -169,7 +169,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
{
final Class re = this.getRenderer();
if( re == null )
- {
+ {
return null; // use 1.8 models.
}
final BaseBlockRender renderer = re.newInstance();
diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java
index f41599d0..bf7ea53b 100644
--- a/src/main/java/appeng/block/misc/BlockLightDetector.java
+++ b/src/main/java/appeng/block/misc/BlockLightDetector.java
@@ -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
{
@@ -86,7 +88,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final IBlockState state,
final EnumFacing side )
{
- if ( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
+ if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
{
return ( (World) w ).getLightFromNeighbors( pos ) - 6;
}
@@ -103,7 +105,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
super.onNeighborChange( world, pos, neighbor );
final TileLightDetector tld = this.getTileEntity( world, pos );
- if ( tld != null )
+ if( tld != null )
{
tld.updateLight();
}
@@ -165,12 +167,12 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final List out,
final Entity e )
{/*
- * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
- * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
- * AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff +
- * (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x
- * + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
- */
+ * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
+ * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
+ * AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff +
+ * (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x
+ * + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
+ */
}
@Override
@@ -181,7 +183,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final Block neighborBlock )
{
final EnumFacing up = getOrientable( w, pos ).getUp();
- if ( !canPlaceAt( w, pos, up.getOpposite() ) )
+ if( !canPlaceAt( w, pos, up.getOpposite() ) )
{
dropTorch( w, pos );
}
@@ -200,9 +202,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final World w,
final BlockPos pos )
{
- for ( final EnumFacing dir : EnumFacing.VALUES )
+ for( final EnumFacing dir : EnumFacing.VALUES )
{
- if ( canPlaceAt( w, pos, dir ) )
+ if( canPlaceAt( w, pos, dir ) )
{
return true;
}
diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java
index 1f85fe4d..f8b050e0 100644
--- a/src/main/java/appeng/block/networking/BlockCableBus.java
+++ b/src/main/java/appeng/block/networking/BlockCableBus.java
@@ -18,6 +18,7 @@
package appeng.block.networking;
+
import java.util.EnumSet;
import java.util.List;
import java.util.Random;
@@ -68,10 +69,11 @@ 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
- // IRedNetConnection
+// IRedNetConnection
{
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
@@ -175,11 +177,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final BlockPos pos )
{
final IBlockState block = world.getBlockState( pos );
- if ( block != null && block.getBlock() != this )
+ if( block != null && block.getBlock() != this )
{
return block.getBlock().getLightValue( world, pos );
}
- if ( block == null )
+ if( block == null )
{
return 0;
}
@@ -219,10 +221,10 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EntityPlayer player,
final boolean willHarvest )
{
- if ( player.capabilities.isCreativeMode )
+ if( player.capabilities.isCreativeMode )
{
final AEBaseTile tile = this.getTileEntity( world, pos );
- if ( tile != null )
+ if( tile != null )
{
tile.disableDrops();
}
@@ -237,7 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final BlockPos pos,
EnumFacing side )
{
- if ( side == null )
+ if( side == null )
{
side = EnumFacing.UP;
}
@@ -249,7 +251,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
public boolean canRenderInLayer(
final EnumWorldBlockLayer layer )
{
- if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
+ if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
{
return layer == EnumWorldBlockLayer.CUTOUT || layer == EnumWorldBlockLayer.TRANSLUCENT;
}
@@ -266,11 +268,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
final SelectedPart sp = cb( world, pos ).selectPart( v3 );
- if ( sp.part != null )
+ if( sp.part != null )
{
return sp.part.getItemStack( PartItemStack.Pick );
}
- else if ( sp.facade != null )
+ else if( sp.facade != null )
{
return sp.facade.getItemStack();
}
@@ -286,7 +288,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EffectRenderer effectRenderer )
{
final Object object = cb( world, target.getBlockPos() );
- if ( object instanceof IPartHost )
+ if( object instanceof IPartHost )
{
final IPartHost host = (IPartHost) object;
@@ -320,7 +322,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EffectRenderer effectRenderer )
{
final Object object = cb( world, pos );
- if ( object instanceof IPartHost )
+ if( object instanceof IPartHost )
{
final IPartHost host = (IPartHost) object;
@@ -349,7 +351,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final IBlockState state,
final Block neighborBlock )
{
- if ( Platform.isServer() )
+ if( Platform.isServer() )
{
cb( w, pos ).onNeighborChanged();
}
@@ -362,11 +364,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final TileEntity te = w.getTileEntity( pos );
ICableBusContainer out = null;
- if ( te instanceof TileCableBus )
+ if( te instanceof TileCableBus )
{
out = ( (TileCableBus) te ).getCableBus();
}
- else if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) )
+ else if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) )
{
out = ( (IFMP) IntegrationRegistry.INSTANCE.getInstance( IntegrationType.FMP ) ).getCableContainer( te );
}
@@ -414,7 +416,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
{
return cb( world, pos ).recolourBlock( side, AEColor.values()[color.ordinal()], who );
}
- catch ( final Throwable ignored )
+ catch( final Throwable ignored )
{
}
return false;
@@ -437,12 +439,12 @@ public class BlockCableBus extends AEBaseTileBlock // implements
{
final TileEntity te = w.getTileEntity( pos );
- if ( noTesrTile.isInstance( te ) )
+ if( noTesrTile.isInstance( te ) )
{
return (T) te;
}
- if ( tesrTile != null && tesrTile.isInstance( te ) )
+ if( tesrTile != null && tesrTile.isInstance( te ) )
{
return (T) te;
}
@@ -463,7 +465,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() );
setTileEntity( noTesrTile );
GameRegistry.registerTileEntity( noTesrTile, "BlockCableBus" );
- if ( Platform.isClient() )
+ if( Platform.isClient() )
{
tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() );
GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" );
diff --git a/src/main/java/appeng/client/ItemRenderType.java b/src/main/java/appeng/client/ItemRenderType.java
index 1f9cc1f5..5d73015b 100644
--- a/src/main/java/appeng/client/ItemRenderType.java
+++ b/src/main/java/appeng/client/ItemRenderType.java
@@ -1,5 +1,7 @@
+
package appeng.client;
+
public enum ItemRenderType
{
INVENTORY, ENTITY
diff --git a/src/main/java/appeng/client/SmartModel.java b/src/main/java/appeng/client/SmartModel.java
index 3c01b3e5..c126d592 100644
--- a/src/main/java/appeng/client/SmartModel.java
+++ b/src/main/java/appeng/client/SmartModel.java
@@ -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
{
@@ -65,7 +67,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
{
return false;
}
-
+
@Override
public TextureAtlasSprite getParticleTexture()
{
diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java
index c28c8dc9..4996469e 100644
--- a/src/main/java/appeng/client/gui/AEBaseGui.java
+++ b/src/main/java/appeng/client/gui/AEBaseGui.java
@@ -823,11 +823,11 @@ public abstract class AEBaseGui extends GuiContainer
final float f1 = 0.00390625F;
final float f = 0.00390625F;
final float par6 = 16;
- worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex();
+ worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex();
final float par5 = 16;
- worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex();
- worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex();
- worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
+ worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex();
+ worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex();
+ worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
tessellator.draw();
}
catch( final Exception err )
diff --git a/src/main/java/appeng/client/render/AppEngRenderItem.java b/src/main/java/appeng/client/render/AppEngRenderItem.java
index bd9f4457..3a2fcfbf 100644
--- a/src/main/java/appeng/client/render/AppEngRenderItem.java
+++ b/src/main/java/appeng/client/render/AppEngRenderItem.java
@@ -141,12 +141,12 @@ public class AppEngRenderItem extends RenderItem
{
final WorldRenderer wr = par1Tessellator.getWorldRenderer();
- wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM);
-
- wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2, par3, 0.0D ).endVertex();
- wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos(par2, par3 + par5, 0.0D ).endVertex();
- wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2 + par4, par3 + par5, 0.0D ).endVertex();
- wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
+ wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
+
+ wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2, par3, 0.0D ).endVertex();
+ wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2, par3 + par5, 0.0D ).endVertex();
+ wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3 + par5, 0.0D ).endVertex();
+ wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
par1Tessellator.draw();
}
diff --git a/src/main/java/appeng/client/render/SMFace.java b/src/main/java/appeng/client/render/SMFace.java
index 6874f411..51d963f0 100644
--- a/src/main/java/appeng/client/render/SMFace.java
+++ b/src/main/java/appeng/client/render/SMFace.java
@@ -2,7 +2,6 @@
package appeng.client.render;
-
import org.lwjgl.util.vector.Vector3f;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java
index 132c78b8..f556bd72 100644
--- a/src/main/java/appeng/client/render/SpatialSkyRender.java
+++ b/src/main/java/appeng/client/render/SpatialSkyRender.java
@@ -109,10 +109,10 @@ public class SpatialSkyRender extends IRenderHandler
}
worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
- worldrenderer.color(0f,0f,0f,1f).pos( -100.0D, -100.0D, -100.0D).tex( 0.0D, 0.0D ).endVertex();
- worldrenderer.color(0f,0f,0f,1f).pos( -100.0D, -100.0D, 100.0D).tex( 0.0D, 16.0D ).endVertex();
- worldrenderer.color(0f,0f,0f,1f).pos( 100.0D, -100.0D, 100.0D).tex( 16.0D, 16.0D ).endVertex();
- worldrenderer.color(0f,0f,0f,1f).pos( 100.0D, -100.0D, -100.0D).tex( 16.0D, 0.0D ).endVertex();
+ worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, -100.0D ).tex( 0.0D, 0.0D ).endVertex();
+ worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, 100.0D ).tex( 0.0D, 16.0D ).endVertex();
+ worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, 100.0D ).tex( 16.0D, 16.0D ).endVertex();
+ worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, -100.0D ).tex( 16.0D, 0.0D ).endVertex();
tessellator.draw();
GL11.glPopMatrix();
}
diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
index f59d8416..4f3b3e09 100644
--- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
@@ -193,31 +193,31 @@ public class RenderBlockInscriber extends BaseBlockRender