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

@ -54,7 +54,7 @@ public enum PowerUnits
* will normally returns 64, as it will convert the EU, to AE with AE's power settings. * will normally returns 64, as it will convert the EU, to AE with AE's power settings.
* *
* @param target target power unit * @param target target power unit
* @param value value * @param value value
* *
* @return value converted to target units, from this units. * @return value converted to target units, from this units.
*/ */

View file

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

View file

@ -86,23 +86,16 @@ public interface IBlocks
IBlockDefinition quartzPillarStair(); 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 * misc
*/ */

View file

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

View file

@ -32,11 +32,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public interface IItemDefinition extends IComparableDefinition 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 @Nonnull
String identifier(); String identifier();

View file

@ -78,15 +78,15 @@ public interface IParts
IItemDefinition p2PTunnelLiquids(); IItemDefinition p2PTunnelLiquids();
//IItemDefinition p2PTunnelEU(); // IItemDefinition p2PTunnelEU();
//IItemDefinition p2PTunnelRF(); // IItemDefinition p2PTunnelRF();
IItemDefinition p2PTunnelLight(); IItemDefinition p2PTunnelLight();
//IItemDefinition p2PTunnelOpenComputers(); // IItemDefinition p2PTunnelOpenComputers();
// IItemDefinition p2PTunnelPneumaticCraft(); // IItemDefinition p2PTunnelPneumaticCraft();
IItemDefinition cableAnchor(); IItemDefinition cableAnchor();

View file

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

View file

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

View file

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

View file

@ -45,8 +45,8 @@ public interface IGrinderRegistry
/** /**
* add a new recipe the easy way, in → out, how many turns., duplicates will not be added. * add a new recipe the easy way, in → out, how many turns., duplicates will not be added.
* *
* @param in input * @param in input
* @param out output * @param out output
* @param turns amount of turns to turn the input into the output * @param turns amount of turns to turn the input into the output
*/ */
void addRecipe( ItemStack in, ItemStack out, int turns ); 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. * add a new recipe with optional outputs, duplicates will not be added.
* *
* @param in input * @param in input
* @param out output * @param out output
* @param optional optional output * @param optional optional output
* @param chance chance to get the optional output within 0.0 - 1.0 * @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 turns amount of turns to turn the input into the outputs
*/ */
void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns ); void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns );
/** /**
* add a new recipe with optional outputs, duplicates will not be added. * add a new recipe with optional outputs, duplicates will not be added.
* *
* @param in input * @param in input
* @param out output * @param out output
* @param optional optional output * @param optional optional output
* @param chance chance to get the optional output within 0.0 - 1.0 * @param chance chance to get the optional output within 0.0 - 1.0
* @param optional2 second optional output * @param optional2 second optional output
* @param chance2 chance to get the second optional output within 0.0 - 1.0 * @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 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 ); void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns );

View file

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

View file

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

View file

@ -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 * 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 * @param weight atomic weight
*/ */
void registerAmmo( ItemStack ammo, double weight ); void registerAmmo( ItemStack ammo, double weight );

View file

@ -42,9 +42,9 @@ public interface INetworkEncodable
/** /**
* Encode the wireless frequency via the Controller. * Encode the wireless frequency via the Controller.
* *
* @param item the wireless terminal. * @param item the wireless terminal.
* @param encKey the wireless encryption key. * @param encKey the wireless encryption key.
* @param name null for now. * @param name null for now.
*/ */
void setEncryptionKey( ItemStack item, String encKey, String name ); void setEncryptionKey( ItemStack item, String encKey, String name );
} }

View file

@ -42,7 +42,7 @@ public interface IP2PTunnelRegistry
* attunements for AE's P2P Tunnels * attunements for AE's P2P Tunnels
* *
* @param trigger - the item which triggers attunement. Nullable, but then ignored * @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 ); void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );

View file

@ -47,8 +47,8 @@ public interface IWirelessTermHandler extends INetworkEncodable
* use an amount of power, in AE units * 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 * @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
* hasPower * hasPower
* @param is wireless terminal * @param is wireless terminal
* *
* @return true if wireless terminal uses power * @return true if wireless terminal uses power
*/ */

View file

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

View file

@ -41,7 +41,7 @@ public interface ICraftingPatternItem
* Access Details about a pattern * Access Details about a pattern
* *
* @param is pattern * @param is pattern
* @param w crafting world * @param w crafting world
* *
* @return details of pattern * @return details of pattern
*/ */

View file

@ -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 ); void setProfile( ItemStack itemStack, GameProfile username );
@ -67,7 +67,7 @@ public interface IBiometricCard
/** /**
* remove a permission from the item stack. * remove a permission from the item stack.
* *
* @param itemStack card * @param itemStack card
* @param permission to be removed permission * @param permission to be removed permission
*/ */
void removePermission( ItemStack itemStack, SecurityPermissions permission ); void removePermission( ItemStack itemStack, SecurityPermissions permission );
@ -75,7 +75,7 @@ public interface IBiometricCard
/** /**
* add a permission to the item stack. * add a permission to the item stack.
* *
* @param itemStack card * @param itemStack card
* @param permission to be added permission * @param permission to be added permission
*/ */
void addPermission( ItemStack itemStack, SecurityPermissions 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. * lets you handle submission of security values on the card for custom behavior.
* *
* @param registry security registry * @param registry security registry
* @param pr player registry * @param pr player registry
* @param is card * @param is card
*/ */
void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is ); void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is );
} }

View file

@ -41,11 +41,11 @@ public interface IMemoryCard
* Configures the data stored on the memory card, the SettingsName, will be * Configures the data stored on the memory card, the SettingsName, will be
* localized when displayed. * localized when displayed.
* *
* @param is item * @param is item
* @param SettingsName unlocalized string that represents the tile entity. * @param SettingsName unlocalized string that represents the tile entity.
* @param data may contain a String called "tooltip" which is is a * @param data may contain a String called "tooltip" which is is a
* unlocalized string displayed after the settings name, optional * unlocalized string displayed after the settings name, optional
* but can be used to add details to the card for later. * but can be used to add details to the card for later.
*/ */
void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data ); 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. * notify the user of a outcome related to the memory card.
* *
* @param player that used the 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 ); void notifyUser( EntityPlayer player, MemoryCardMessages msg );
} }

View file

@ -89,10 +89,10 @@ public interface ISpatialStorageCell
/** /**
* Perform a spatial swap with the contents of the cell, and the world. * Perform a spatial swap with the contents of the cell, and the world.
* *
* @param is spatial storage cell * @param is spatial storage cell
* @param w world of spatial * @param w world of spatial
* @param min min coord * @param min min coord
* @param max max coord * @param max max coord
* @param doTransition transition * @param doTransition transition
* *
* @return result of transition * @return result of transition

View file

@ -77,7 +77,7 @@ public interface IStorageCell extends ICellWorkbenchItem
* don't care, just return false; As the handler for this type of cell is * 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. * still the default cells, the normal AE black list is also applied.
* *
* @param cellItem item * @param cellItem item
* @param requestedAddition requested addition * @param requestedAddition requested addition
* *
* @return true to preventAdditionOfItem * @return true to preventAdditionOfItem

View file

@ -36,8 +36,8 @@ public interface ICraftingMachine
/** /**
* inserts a crafting plan, and the necessary items into the crafting machine. * inserts a crafting plan, and the necessary items into the crafting machine.
* *
* @param patternDetails details of pattern * @param patternDetails details of pattern
* @param table crafting table * @param table crafting table
* @param ejectionDirection ejection direction * @param ejectionDirection ejection direction
* *
* @return if it was accepted, all or nothing. * @return if it was accepted, all or nothing.

View file

@ -37,7 +37,7 @@ public interface IMovableHandler
* that single entity, you cannot opt out of single entities. * that single entity, you cannot opt out of single entities.
* *
* @param myClass tile entity class * @param myClass tile entity class
* @param tile tile entity * @param tile tile entity
* *
* @return true if it can handle moving * @return true if it can handle moving
*/ */
@ -51,16 +51,22 @@ public interface IMovableHandler
* Potential Example: * Potential Example:
* *
* <pre> * <pre>
* {@code * {
* Chunk c = world.getChunkFromBlockCoords( x, z ); c.setChunkBlockTileEntity( x * &#064;code
* & 0xF, y + y, z & 0xF, tile ); * Chunk c = world.getChunkFromBlockCoords( x, z );
* * c.setChunkBlockTileEntity( x
* if ( c.isChunkLoaded ) { world.addTileEntity( tile ); world.markBlockForUpdate( x, * &amp; 0xF, y + y, z &amp; 0xF, tile );
* y, z ); } *
* if( c.isChunkLoaded )
* {
* world.addTileEntity( tile );
* world.markBlockForUpdate( x,
* y, z );
* }
* } * }
* </pre> * </pre>
* *
* @param tile to be moved tile * @param tile to be moved tile
* @param world world of tile * @param world world of tile
* @param newPosition the new location * @param newPosition the new location
*/ */

View file

@ -56,7 +56,8 @@ public enum GridFlags
DENSE_CAPACITY, 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. * interface for details.
*/ */
MULTIBLOCK, MULTIBLOCK,

View file

@ -85,7 +85,7 @@ public interface IGridBlock
/** /**
* Update Blocks network/connection/booting status. grid, * Update Blocks network/connection/booting status. grid,
* *
* @param grid grid * @param grid grid
* @param channelsInUse used channels * @param channelsInUse used channels
*/ */
void setNetworkStatus( IGrid grid, int channelsInUse ); void setNetworkStatus( IGrid grid, int channelsInUse );

View file

@ -48,7 +48,7 @@ public interface IGridCache
* information, do it on the next updateTick. * information, do it on the next updateTick.
* *
* @param gridNode removed from that grid * @param gridNode removed from that grid
* @param machine to be removed machine * @param machine to be removed machine
*/ */
void removeNode( IGridNode gridNode, IGridHost machine ); void removeNode( IGridNode gridNode, IGridHost machine );
@ -60,7 +60,7 @@ public interface IGridCache
* information, do it on the next updateTick. * information, do it on the next updateTick.
* *
* @param gridNode added to grid node * @param gridNode added to grid node
* @param machine to be added machine * @param machine to be added machine
*/ */
void addNode( IGridNode gridNode, IGridHost machine ); void addNode( IGridNode gridNode, IGridHost machine );

View file

@ -44,7 +44,7 @@ public interface IGridHost
* Grid when your block is ready. * Grid when your block is ready.
* *
* @param dir feel free to ignore this, most blocks will use the same node * @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 * @return a new IGridNode, create these with
* AEApi.INSTANCE().createGridNode( MyIGridBlock ) * AEApi.INSTANCE().createGridNode( MyIGridBlock )

View file

@ -119,7 +119,7 @@ public interface IGridNode
* *
* Important: You must call this before updateState. * Important: You must call this before updateState.
* *
* @param name nbt name * @param name nbt name
* @param nodeData to be loaded data * @param nodeData to be loaded data
*/ */
void loadFromNBT( String name, NBTTagCompound nodeData ); 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 * 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. * 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 * @param nodeData to be saved data
*/ */
void saveToNBT( String name, NBTTagCompound nodeData ); 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 * 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 * @param playerID new player id
*/ */

View file

@ -42,9 +42,9 @@ public interface ICraftingGrid extends IGridCache
/** /**
* @param whatToCraft requested craft * @param whatToCraft requested craft
* @param world crafting world * @param world crafting world
* @param slot slot index * @param slot slot index
* @param details pattern details * @param details pattern details
* *
* @return a collection of crafting patterns for the item in question. * @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. * Begin calculating a crafting job.
* *
* @param world crafting world * @param world crafting world
* @param grid network * @param grid network
* @param actionSrc source * @param actionSrc source
* @param craftWhat result * @param craftWhat result
* @param callback callback * @param callback callback
* -- optional * -- optional
* *
* @return a future which will at an undetermined point in the future get you the {@link ICraftingJob} do not wait * @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. * on this, your be waiting forever.
@ -68,13 +68,14 @@ public interface ICraftingGrid extends IGridCache
/** /**
* Submit the job to the Crafting system for processing. * 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 requestingMachine - a machine if its being requested via automation, may be null.
* @param target - can 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
* end cpus, automatic processes generally should pick lower end cpus. * find the lower
* @param src - the action source to use when starting the job, this will be used for extracting items, should * end cpus, automatic processes generally should pick lower end cpus.
* usually be the same as the one provided to beginCraftingJob. * @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 * @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 * properly keep track of this and handle the nbt saving and loading of the object as well as the

View file

@ -38,7 +38,7 @@ public interface ICraftingMedium
* possible the output should be directed. * possible the output should be directed.
* *
* @param patternDetails details * @param patternDetails details
* @param table crafting table * @param table crafting table
* *
* @return if the pattern was successfully pushed. * @return if the pattern was successfully pushed.
*/ */

View file

@ -48,7 +48,7 @@ public interface ICraftingPatternDetails
/** /**
* @param slotIndex specific slot index * @param slotIndex specific slot index
* @param itemStack item in slot * @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. * @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. * Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements.
* *
* @param craftingInv inventory * @param craftingInv inventory
* @param world crafting world * @param world crafting world
* *
* @return the crafted ( work bench ) item. * @return the crafted ( work bench ) item.
*/ */

View file

@ -47,7 +47,7 @@ public interface ICraftingRequester extends IActionHost
* be returned. * be returned.
* *
* @param items item * @param items item
* @param mode action mode * @param mode action mode
* *
* @return unwanted item * @return unwanted item
*/ */

View file

@ -42,7 +42,7 @@ public interface ICraftingWatcherHost
* Called when a crafting status changes. * Called when a crafting status changes.
* *
* @param craftingGrid current crafting grid * @param craftingGrid current crafting grid
* @param what change * @param what change
*/ */
void onRequestChange( ICraftingGrid craftingGrid, IAEItemStack what ); void onRequestChange( ICraftingGrid craftingGrid, IAEItemStack what );
} }

View file

@ -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. * 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 * @param mode action mode
* *
* @return amount of power which was unable to be stored * @return amount of power which was unable to be stored

View file

@ -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 * 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. * 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? * @param mode should the action be simulated or performed?
* *
* @return the amount of power that the network has OVER the limit. * @return the amount of power that the network has OVER the limit.

View file

@ -34,7 +34,7 @@ public interface IEnergySource
/** /**
* Extract power from the network. * Extract power from the network.
* *
* @param amt extracted power * @param amt extracted power
* @param mode should the action be simulated or performed? * @param mode should the action be simulated or performed?
* *
* @return returns extracted power. * @return returns extracted power.

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, * 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 * the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via {@link IGridNode}.isActive()
* {@link IGridNode}.isActive()
* *
* Note: Most machines just need to check {@link IGridNode}.isActive() * Note: Most machines just need to check {@link IGridNode}.isActive()
*/ */

View file

@ -36,7 +36,7 @@ public class MENetworkSpatialEvent extends MENetworkEvent
public final double spatialEnergyUsage; 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) * @param EnergyUsage ( the amount of energy that the SpatialIO uses)
*/ */
public MENetworkSpatialEvent( final IGridHost SpatialIO, final double EnergyUsage ) public MENetworkSpatialEvent( final IGridHost SpatialIO, final double EnergyUsage )

View file

@ -42,7 +42,7 @@ public interface ISecurityGrid extends IGridCache
* Check if a player has permissions. * Check if a player has permissions.
* *
* @param player to be checked player * @param player to be checked player
* @param perm checked permissions * @param perm checked permissions
* *
* @return true if the player has permissions. * @return true if the player has permissions.
*/ */
@ -52,7 +52,7 @@ public interface ISecurityGrid extends IGridCache
* Check if a player has permissions. * Check if a player has permissions.
* *
* @param playerID id of player * @param playerID id of player
* @param perm checked permissions * @param perm checked permissions
* *
* @return true if the player has permissions. * @return true if the player has permissions.
*/ */

View file

@ -38,7 +38,7 @@ public interface ISecurityRegistry
/** /**
* Submit Permissions into the register. * Submit Permissions into the register.
* *
* @param playerID player id * @param playerID player id
* @param permissions permissions of player * @param permissions permissions of player
*/ */
void addPlayer( int playerID, EnumSet<SecurityPermissions> permissions ); void addPlayer( int playerID, EnumSet<SecurityPermissions> permissions );

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(); boolean hasRegion();

View file

@ -44,11 +44,11 @@ public interface IStackWatcherHost
/** /**
* Called when a watched item changes amounts. * Called when a watched item changes amounts.
* *
* @param o changed item list * @param o changed item list
* @param fullStack old stack * @param fullStack old stack
* @param diffStack new stack * @param diffStack new stack
* @param src action source * @param src action source
* @param chan storage channel * @param chan storage channel
*/ */
void onStackChange( IItemList o, IAEStack fullStack, IAEStack diffStack, BaseActionSource src, StorageChannel chan ); void onStackChange( IItemList o, IAEStack fullStack, IAEStack diffStack, BaseActionSource src, StorageChannel chan );
} }

View file

@ -68,8 +68,8 @@ public interface IGridTickable
* Note: this is never called if you return null from getTickingRequest. * Note: this is never called if you return null from getTickingRequest.
* *
* @param TicksSinceLastCall the number of world ticks that were skipped since your last * @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 * tick, you can use this to adjust speed of processing or adjust
* your tick rate. * your tick rate.
* *
* @return tick rate adjustment. * @return tick rate adjustment.
*/ */

View file

@ -21,8 +21,10 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 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; import net.minecraftforge.fml.common.API;

View file

@ -70,7 +70,7 @@ public interface IPart extends IBoxProvider
* *
* GL Available * GL Available
* *
* @param rh helper * @param rh helper
* @param renderer renderer * @param renderer renderer
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
@ -81,10 +81,10 @@ public interface IPart extends IBoxProvider
* *
* GL is NOT Available * GL is NOT Available
* *
* @param x x coord * @param x x coord
* @param y y coord * @param y y coord
* @param z z coord * @param z z coord
* @param rh helper * @param rh helper
* @param renderer renderer * @param renderer renderer
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
@ -95,10 +95,10 @@ public interface IPart extends IBoxProvider
* *
* GL Available * GL Available
* *
* @param x x coord * @param x x coord
* @param y y coord * @param y y coord
* @param z z coord * @param z z coord
* @param rh helper * @param rh helper
* @param renderer renderer * @param renderer renderer
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
@ -109,7 +109,7 @@ public interface IPart extends IBoxProvider
* texture. * texture.
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
TextureAtlasSprite getBreakingTexture(ModelGenerator renderer); TextureAtlasSprite getBreakingTexture( ModelGenerator renderer );
/** /**
* return true only if your part require dynamic rendering, must be consistent. * 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 * Called when you right click the part, very similar to Block.onActivateBlock
* *
* @param player right clicking player * @param player right clicking player
* @param pos position of block * @param pos position of block
* *
* @return if your activate method performed something. * @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 * Called when you right click the part, very similar to Block.onActivateBlock
* *
* @param player shift right clicking player * @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. * @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 * 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. * 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 * @param wrenched control flag for wrenched vs broken
*/ */
void getDrops( List<ItemStack> drops, boolean wrenched ); void getDrops( List<ItemStack> drops, boolean wrenched );
@ -273,8 +273,8 @@ public interface IPart extends IBoxProvider
* same as Block.randomDisplayTick, for but parts. * same as Block.randomDisplayTick, for but parts.
* *
* @param world world of block * @param world world of block
* @param pos location of block * @param pos location of block
* @param r random * @param r random
*/ */
void randomDisplayTick( World world, BlockPos pos, Random r ); 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. * Called when placed in the world by a player, this happens before addWorld.
* *
* @param player placing player * @param player placing player
* @param held held item * @param held held item
* @param side placing side * @param side placing side
*/ */
void onPlacement( EntityPlayer player, ItemStack held, AEPartLocation side ); void onPlacement( EntityPlayer player, ItemStack held, AEPartLocation side );

View file

@ -34,7 +34,8 @@ import net.minecraft.world.World;
public interface IPartHelper 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, * AE By Default includes,
* *
@ -52,7 +53,8 @@ public interface IPartHelper
* *
* 7. IPipeConnection BC Pipe Connections * 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. * @return true on success, false on failure, usually a error will be logged as well.
*/ */

View file

@ -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. * try to add a new part to the specified side, returns false if it failed to be added.
* *
* @param is new part * @param is new part
* @param side onto side * @param side onto side
* @param owner with owning player * @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, * @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. * @return the part located on the specified side, or null if there is no part.
*/ */
IPart getPart( EnumFacing side ); 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 * 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. * "gone" and its never coming back; think about it.
* *
* if you want to drop the part you must request it prior to removing 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. * @param suppressUpdate - used if you need to replace a part's INSTANCE, without really removing it first.
*/ */
void removePart( AEPartLocation side, boolean suppressUpdate ); void removePart( AEPartLocation side, boolean suppressUpdate );

View file

@ -28,8 +28,8 @@ import javax.annotation.Nullable;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
//@formatter:off
//@formatter:off
/** /**
* This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack * This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack
@ -46,7 +46,7 @@ import net.minecraft.item.ItemStack;
* { * {
* return 0; * return 0;
* } * }
* *
* {@literal @}Override * {@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) * public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
* { * {

View file

@ -58,9 +58,9 @@ public interface IPartRenderHelper
* *
* render a single face. * render a single face.
* *
* @param pos POSITION of part * @param pos POSITION of part
* @param ico icon of part * @param ico icon of part
* @param face direction its facing * @param face direction its facing
* @param renderer renderer of part * @param renderer renderer of part
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
@ -71,11 +71,11 @@ public interface IPartRenderHelper
* *
* render a box with a cut out box in the center. * render a box with a cut out box in the center.
* *
* @param pos pos of part * @param pos pos of part
* @param ico icon of part * @param ico icon of part
* @param face face of part * @param face face of part
* @param edgeThickness thickness of the edge * @param edgeThickness thickness of the edge
* @param renderer renderer * @param renderer renderer
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
void renderFaceCutout( BlockPos pos, IAESprite ico, EnumFacing face, float edgeThickness, ModelGenerator renderer ); 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. * render a block of specified bounds.
* *
* @param x x pos of block * @param x x pos of block
* @param y y pos of block * @param y y pos of block
* @param z z pos of block * @param z z pos of block
* @param renderer renderer * @param renderer renderer
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
@ -96,9 +96,9 @@ public interface IPartRenderHelper
/** /**
* render a single face in inventory renderer. * render a single face in inventory renderer.
* *
* @param TextureAtlasSprite icon of part * @param TextureAtlasSprite icon of part
* @param direction face of part * @param direction face of part
* @param renderer renderer * @param renderer renderer
*/ */
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
void renderInventoryFace( IAESprite IIcon, EnumFacing direction, ModelGenerator renderer ); void renderInventoryFace( IAESprite IIcon, EnumFacing direction, ModelGenerator renderer );
@ -116,12 +116,12 @@ public interface IPartRenderHelper
* *
* set unique icons for each side of the block. * set unique icons for each side of the block.
* *
* @param down down face * @param down down face
* @param up up face * @param up up face
* @param north north face * @param north north face
* @param south south face * @param south south face
* @param west west face * @param west west face
* @param east east face * @param east east face
*/ */
void setTexture( IAESprite down, IAESprite up, IAESprite north, IAESprite south, IAESprite west, IAESprite east ); 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. * render a block using the current renderer state.
* *
* @param x x pos of part * @param x x pos of part
* @param y y pos of part * @param y y pos of part
* @param z z pos of part * @param z z pos of part
* @param renderer renderer of part * @param renderer renderer of part
*/ */
void renderBlockCurrentBounds( BlockPos pos, ModelGenerator renderer ); void renderBlockCurrentBounds( BlockPos pos, ModelGenerator renderer );

View file

@ -37,7 +37,7 @@ public interface ICraftHandler
/** /**
* Called when your recipe handler receives a newly parsed list of inputs/outputs. * 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 * @param output parsed outputs
* *
* @throws RecipeError * @throws RecipeError

View file

@ -34,7 +34,7 @@ public interface IRecipeHandler
* Call when you want to read recipes in from a file based on a loader * Call when you want to read recipes in from a file based on a loader
* *
* @param loader recipe loader * @param loader recipe loader
* @param path path of file * @param path path of file
*/ */
void parseRecipes( IRecipeLoader loader, String path ); void parseRecipes( IRecipeLoader loader, String path );

View file

@ -28,7 +28,7 @@ public interface ISubItemResolver
{ {
/** /**
* @param namespace namespace of sub item * @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 * @return either a ResolveResult, or a ResolverResultSet
*/ */

View file

@ -52,9 +52,9 @@ public interface ICellHandler
/** /**
* If you cannot handle the provided item, return null * If you cannot handle the provided item, return null
* *
* @param is a storage cell item. * @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 * @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. * note, this value can be null.
* @param channel the storage channel requested. * @param channel the storage channel requested.
* *
* @return a new IMEHandler for the provided item * @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 * 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. * your gui and display the cell to the user.
* *
* @param player player opening chest gui * @param player player opening chest gui
* @param chest to be opened chest * @param chest to be opened chest
* @param cellHandler cell handler * @param cellHandler cell handler
* @param inv inventory handler * @param inv inventory handler
* @param is item * @param is item
* @param chan storage channel * @param chan storage channel
*/ */
void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler inv, ItemStack is, StorageChannel chan ); 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 ) * 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. * @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. * @return get the status of the cell based on its contents.

View file

@ -67,7 +67,7 @@ public interface ICellRegistry
/** /**
* returns an IMEInventoryHandler for the provided item. * 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 host can be null, or the hosting tile / part.
* @param chan the storage channel to request the handler for. * @param chan the storage channel to request the handler for.
* *

View file

@ -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 * 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 * @param mySrc source
* *
* @return true, if it can get a handler via getInventory * @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 * 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. * {@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 te to be handled tile entity
* @param d direction * @param d direction
* @param channel channel * @param channel channel
* @param src source * @param src source
* *
* @return The Handler for the inventory * @return The Handler for the inventory
*/ */

View file

@ -47,10 +47,10 @@ public interface IExternalStorageRegistry
void addExternalStorageInterface( IExternalStorageHandler esh ); void addExternalStorageInterface( IExternalStorageHandler esh );
/** /**
* @param te tile entity * @param te tile entity
* @param opposite direction * @param opposite direction
* @param channel channel * @param channel channel
* @param mySrc source * @param mySrc source
* *
* @return the handler for a given tile / forge direction * @return the handler for a given tile / forge direction
*/ */

View file

@ -47,8 +47,8 @@ public interface IMEInventory<StackType extends IAEStack>
* Store new items, or simulate the addition of new items into the ME Inventory. * Store new items, or simulate the addition of new items into the ME Inventory.
* *
* @param input item to add. * @param input item to add.
* @param type action type * @param type action type
* @param src action source * @param src action source
* *
* @return returns the number of items not added. * @return returns the number of items not added.
*/ */
@ -58,7 +58,7 @@ public interface IMEInventory<StackType extends IAEStack>
* Extract the specified item from the ME Inventory * Extract the specified item from the ME Inventory
* *
* @param request item to request ( with stack size. ) * @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 * @return returns the number of items extracted, null
*/ */

View file

@ -102,10 +102,10 @@ public interface IStorageHelper
/** /**
* use energy from energy, to remove request items from cell, at the request of src. * use energy from energy, to remove request items from cell, at the request of src.
* *
* @param energy to be drained energy source * @param energy to be drained energy source
* @param cell cell of requested items * @param cell cell of requested items
* @param request requested items * @param request requested items
* @param src action source * @param src action source
* *
* @return items that successfully extracted. * @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 * use energy from energy, to inject input items into cell, at the request of src
* *
* @param energy to be added energy source * @param energy to be added energy source
* @param cell injected cell * @param cell injected cell
* @param input to be injected items * @param input to be injected items
* @param src action source * @param src action source
* *
* @return items that failed to insert. * @return items that failed to insert.
*/ */

View file

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

View file

@ -152,7 +152,7 @@ public interface IAEStack<StackType extends IAEStack>
* *
* a IAEItemStack to another AEItemStack or a ItemStack. * a IAEItemStack to another AEItemStack or a ItemStack.
* *
* @param st stacks * @param st stacks
* @param mode used fuzzy mode * @param mode used fuzzy mode
* *
* @return true if two stacks are equal based on AE Fuzzy Comparison. * @return true if two stacks are equal based on AE Fuzzy Comparison.

View file

@ -1,7 +1,10 @@
package appeng.api.util; package appeng.api.util;
import net.minecraft.util.AxisAlignedBB; 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. * 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 ); 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.minX = a;
this.minY =b; this.minY = b;
this.minZ =c; this.minZ = c;
this.maxX =d; this.maxX = d;
this.maxY =e; this.maxY = e;
this.maxZ =f; this.maxZ = f;
} }
public static AEAxisAlignedBB fromBounds( public static AEAxisAlignedBB fromBounds(
@ -37,17 +40,17 @@ public class AEAxisAlignedBB
final double e, final double e,
final double f ) 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( public static AEAxisAlignedBB fromBounds(
final AxisAlignedBB bb ) final AxisAlignedBB bb )
{ {
return new AEAxisAlignedBB( bb.minX, return new AEAxisAlignedBB( bb.minX,
bb.minY, bb.minY,
bb.minZ, bb.minZ,
bb.maxX, bb.maxX,
bb.maxY, bb.maxY,
bb.maxZ ); bb.maxZ );
} }
} }

View file

@ -99,7 +99,7 @@ public enum AEColor
* Vanilla Dye Equivilient * Vanilla Dye Equivilient
*/ */
public final EnumDyeColor dye; public final EnumDyeColor dye;
AEColor( final String unlocalizedName, final EnumDyeColor dye, final int blackHex, final int medHex, final int whiteHex ) AEColor( final String unlocalizedName, final EnumDyeColor dye, final int blackHex, final int medHex, final int whiteHex )
{ {
this.unlocalizedName = unlocalizedName; this.unlocalizedName = unlocalizedName;

View file

@ -63,7 +63,7 @@ public interface AEColoredItemDefinition
/** /**
* Compare {@link ItemStack} with this * Compare {@link ItemStack} with this
* *
* @param color compared color of item * @param color compared color of item
* @param comparableItem compared item * @param comparableItem compared item
* *
* @return true if the item stack is a matching item. * @return true if the item stack is a matching item.

View file

@ -1,100 +1,105 @@
package appeng.api.util; package appeng.api.util;
import net.minecraft.util.EnumFacing; 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 public enum AEPartLocation
{ {
/** /**
* Negative Y * Negative Y
*/ */
DOWN(0, -1, 0), DOWN( 0, -1, 0 ),
/** /**
* Positive Y * Positive Y
*/ */
UP(0, 1, 0), UP( 0, 1, 0 ),
/** /**
* Negative Z * Negative Z
*/ */
NORTH(0, 0, -1), NORTH( 0, 0, -1 ),
/** /**
* Positive Z * Positive Z
*/ */
SOUTH(0, 0, 1), SOUTH( 0, 0, 1 ),
/**
* Negative X
*/
WEST(-1, 0, 0),
/** /**
* Posative X * Negative X
*/ */
EAST(1, 0, 0), WEST( -1, 0, 0 ),
/** /**
* Center or inside of the block. * Posative X
*/ */
INTERNAL(0, 0, 0); EAST( 1, 0, 0 ),
public final int xOffset; /**
public final int yOffset; * Center or inside of the block.
public final int zOffset; */
INTERNAL( 0, 0, 0 );
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};
public static final AEPartLocation[] SIDE_LOCATIONS = {DOWN, UP, NORTH, SOUTH, WEST, EAST}; public final int xOffset;
public final int yOffset;
private AEPartLocation( final int x, final int y, final int z) public final int zOffset;
{
this.xOffset = x;
this.yOffset = y;
this.zOffset = z;
}
/** private static final EnumFacing[] facings = { EnumFacing.DOWN, EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST, null };
* @return Part Location private static final int[] OPPOSITES = { 1, 0, 3, 2, 5, 4, 6 };
*/
public static AEPartLocation fromOrdinal( final int id)
{
if (id >= 0 && id < SIDE_LOCATIONS.length)
return SIDE_LOCATIONS[id];
return INTERNAL;
}
/** public static final AEPartLocation[] SIDE_LOCATIONS = { DOWN, UP, NORTH, SOUTH, WEST, EAST };
* 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()];
}
/** private AEPartLocation( final int x, final int y, final int z )
* @return Opposite Part Location, INTERNAL remains INTERNAL. {
*/ this.xOffset = x;
public AEPartLocation getOpposite() this.yOffset = y;
{ this.zOffset = z;
return fromOrdinal(OPPOSITES[this.ordinal()]); }
}
/** /**
* @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() public EnumFacing getFacing()
{ {
return facings[this.ordinal()]; return facings[this.ordinal()];
} }
} }

View file

@ -54,7 +54,7 @@ public class DimensionalCoord extends WorldCoord
public DimensionalCoord( final World _w, final int x, final int y, final int z ) 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.w = _w;
this.dimId = _w.provider.getDimensionId(); this.dimId = _w.provider.getDimensionId();
} }

View file

@ -49,7 +49,7 @@ public interface IConfigManager
/** /**
* used to initialize the configuration manager, should be called for all settings. * 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 * @param defaultValue default value of setting
*/ */
void registerSetting( Settings settingName, Enum<?> defaultValue ); void registerSetting( Settings settingName, Enum<?> defaultValue );
@ -67,7 +67,7 @@ public interface IConfigManager
* Change setting * Change setting
* *
* @param settingName to be changed setting * @param settingName to be changed setting
* @param newValue new value for setting * @param newValue new value for setting
* *
* @return changed setting * @return changed setting
*/ */

View file

@ -23,11 +23,10 @@
package appeng.api.util; package appeng.api.util;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
/** /**
* Nearly all of AE's Tile Entities implement IOrientable. * Nearly all of AE's Tile Entities implement IOrientable.
* *
@ -57,7 +56,7 @@ public interface IOrientable
* Update the orientation * Update the orientation
* *
* @param Forward new forward direction * @param Forward new forward direction
* @param Up new upwards direction * @param Up new upwards direction
*/ */
void setOrientation( EnumFacing Forward, EnumFacing Up ); void setOrientation( EnumFacing Forward, EnumFacing Up );
} }

View file

@ -41,9 +41,9 @@ public interface IOrientableBlock
/** /**
* @param world world of block * @param world world of block
* @param x x pos of block * @param x x pos of block
* @param y y pos of block * @param y y pos of block
* @param z z pos of block * @param z z pos of block
* *
* @return a IOrientable if applicable * @return a IOrientable if applicable
*/ */

View file

@ -179,7 +179,7 @@ public class WorldCoord
{ {
return new BlockPos( this.x, this.y, this.z ); return new BlockPos( this.x, this.y, this.z );
} }
@Override @Override
public String toString() public String toString()
{ {

View file

@ -169,7 +169,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
{ {
final Class<? extends BaseBlockRender> re = this.getRenderer(); final Class<? extends BaseBlockRender> re = this.getRenderer();
if( re == null ) if( re == null )
{ {
return null; // use 1.8 models. return null; // use 1.8 models.
} }
final BaseBlockRender renderer = re.newInstance(); final BaseBlockRender renderer = re.newInstance();

View file

@ -18,6 +18,7 @@
package appeng.block.misc; package appeng.block.misc;
import java.util.Collections; import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
@ -44,6 +45,7 @@ import appeng.helpers.ICustomCollision;
import appeng.helpers.MetaRotation; import appeng.helpers.MetaRotation;
import appeng.tile.misc.TileLightDetector; import appeng.tile.misc.TileLightDetector;
public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
{ {
@ -86,7 +88,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final IBlockState state, final IBlockState state,
final EnumFacing side ) 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; return ( (World) w ).getLightFromNeighbors( pos ) - 6;
} }
@ -103,7 +105,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
super.onNeighborChange( world, pos, neighbor ); super.onNeighborChange( world, pos, neighbor );
final TileLightDetector tld = this.getTileEntity( world, pos ); final TileLightDetector tld = this.getTileEntity( world, pos );
if ( tld != null ) if( tld != null )
{ {
tld.updateLight(); tld.updateLight();
} }
@ -165,12 +167,12 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final List<AxisAlignedBB> out, final List<AxisAlignedBB> out,
final Entity e ) final Entity e )
{/* {/*
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
* getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add( * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
* AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + * AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff +
* (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x * (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 ) ); * + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
*/ */
} }
@Override @Override
@ -181,7 +183,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final Block neighborBlock ) final Block neighborBlock )
{ {
final EnumFacing up = getOrientable( w, pos ).getUp(); final EnumFacing up = getOrientable( w, pos ).getUp();
if ( !canPlaceAt( w, pos, up.getOpposite() ) ) if( !canPlaceAt( w, pos, up.getOpposite() ) )
{ {
dropTorch( w, pos ); dropTorch( w, pos );
} }
@ -200,9 +202,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final World w, final World w,
final BlockPos pos ) 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; return true;
} }

View file

@ -18,6 +18,7 @@
package appeng.block.networking; package appeng.block.networking;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -68,10 +69,11 @@ import appeng.tile.networking.TileCableBus;
import appeng.tile.networking.TileCableBusTESR; import appeng.tile.networking.TileCableBusTESR;
import appeng.util.Platform; import appeng.util.Platform;
// TODO: MFR INTEGRATION // TODO: MFR INTEGRATION
//@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR ) //@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR )
public class BlockCableBus extends AEBaseTileBlock // implements public class BlockCableBus extends AEBaseTileBlock // implements
// IRedNetConnection // IRedNetConnection
{ {
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
@ -175,11 +177,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final BlockPos pos ) final BlockPos pos )
{ {
final IBlockState block = world.getBlockState( 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 ); return block.getBlock().getLightValue( world, pos );
} }
if ( block == null ) if( block == null )
{ {
return 0; return 0;
} }
@ -219,10 +221,10 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EntityPlayer player, final EntityPlayer player,
final boolean willHarvest ) final boolean willHarvest )
{ {
if ( player.capabilities.isCreativeMode ) if( player.capabilities.isCreativeMode )
{ {
final AEBaseTile tile = this.getTileEntity( world, pos ); final AEBaseTile tile = this.getTileEntity( world, pos );
if ( tile != null ) if( tile != null )
{ {
tile.disableDrops(); tile.disableDrops();
} }
@ -237,7 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final BlockPos pos, final BlockPos pos,
EnumFacing side ) EnumFacing side )
{ {
if ( side == null ) if( side == null )
{ {
side = EnumFacing.UP; side = EnumFacing.UP;
} }
@ -249,7 +251,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
public boolean canRenderInLayer( public boolean canRenderInLayer(
final EnumWorldBlockLayer layer ) final EnumWorldBlockLayer layer )
{ {
if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
{ {
return layer == EnumWorldBlockLayer.CUTOUT || layer == EnumWorldBlockLayer.TRANSLUCENT; 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 Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
final SelectedPart sp = cb( world, pos ).selectPart( v3 ); final SelectedPart sp = cb( world, pos ).selectPart( v3 );
if ( sp.part != null ) if( sp.part != null )
{ {
return sp.part.getItemStack( PartItemStack.Pick ); return sp.part.getItemStack( PartItemStack.Pick );
} }
else if ( sp.facade != null ) else if( sp.facade != null )
{ {
return sp.facade.getItemStack(); return sp.facade.getItemStack();
} }
@ -286,7 +288,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EffectRenderer effectRenderer ) final EffectRenderer effectRenderer )
{ {
final Object object = cb( world, target.getBlockPos() ); final Object object = cb( world, target.getBlockPos() );
if ( object instanceof IPartHost ) if( object instanceof IPartHost )
{ {
final IPartHost host = (IPartHost) object; final IPartHost host = (IPartHost) object;
@ -320,7 +322,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EffectRenderer effectRenderer ) final EffectRenderer effectRenderer )
{ {
final Object object = cb( world, pos ); final Object object = cb( world, pos );
if ( object instanceof IPartHost ) if( object instanceof IPartHost )
{ {
final IPartHost host = (IPartHost) object; final IPartHost host = (IPartHost) object;
@ -349,7 +351,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final IBlockState state, final IBlockState state,
final Block neighborBlock ) final Block neighborBlock )
{ {
if ( Platform.isServer() ) if( Platform.isServer() )
{ {
cb( w, pos ).onNeighborChanged(); cb( w, pos ).onNeighborChanged();
} }
@ -362,11 +364,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final TileEntity te = w.getTileEntity( pos ); final TileEntity te = w.getTileEntity( pos );
ICableBusContainer out = null; ICableBusContainer out = null;
if ( te instanceof TileCableBus ) if( te instanceof TileCableBus )
{ {
out = ( (TileCableBus) te ).getCableBus(); 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 ); 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 ); return cb( world, pos ).recolourBlock( side, AEColor.values()[color.ordinal()], who );
} }
catch ( final Throwable ignored ) catch( final Throwable ignored )
{ {
} }
return false; return false;
@ -437,12 +439,12 @@ public class BlockCableBus extends AEBaseTileBlock // implements
{ {
final TileEntity te = w.getTileEntity( pos ); final TileEntity te = w.getTileEntity( pos );
if ( noTesrTile.isInstance( te ) ) if( noTesrTile.isInstance( te ) )
{ {
return (T) te; return (T) te;
} }
if ( tesrTile != null && tesrTile.isInstance( te ) ) if( tesrTile != null && tesrTile.isInstance( te ) )
{ {
return (T) te; return (T) te;
} }
@ -463,7 +465,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() ); noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() );
setTileEntity( noTesrTile ); setTileEntity( noTesrTile );
GameRegistry.registerTileEntity( noTesrTile, "BlockCableBus" ); GameRegistry.registerTileEntity( noTesrTile, "BlockCableBus" );
if ( Platform.isClient() ) if( Platform.isClient() )
{ {
tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() ); tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() );
GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" ); GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" );

View file

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

View file

@ -1,6 +1,7 @@
package appeng.client; package appeng.client;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -23,6 +24,7 @@ import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator; import appeng.client.render.ModelGenerator;
import appeng.client.texture.MissingIcon; import appeng.client.texture.MissingIcon;
// net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer // net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer
public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel
{ {
@ -65,7 +67,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
{ {
return false; return false;
} }
@Override @Override
public TextureAtlasSprite getParticleTexture() public TextureAtlasSprite getParticleTexture()
{ {

View file

@ -823,11 +823,11 @@ public abstract class AEBaseGui extends GuiContainer
final float f1 = 0.00390625F; final float f1 = 0.00390625F;
final float f = 0.00390625F; final float f = 0.00390625F;
final float par6 = 16; 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; 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 + 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 + 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 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
tessellator.draw(); tessellator.draw();
} }
catch( final Exception err ) catch( final Exception err )

View file

@ -141,12 +141,12 @@ public class AppEngRenderItem extends RenderItem
{ {
final WorldRenderer wr = par1Tessellator.getWorldRenderer(); final WorldRenderer wr = par1Tessellator.getWorldRenderer();
wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM); 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, 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, 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 + 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.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
par1Tessellator.draw(); par1Tessellator.draw();
} }

View file

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

View file

@ -109,10 +109,10 @@ public class SpatialSkyRender extends IRenderHandler
} }
worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); 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, 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( 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, 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( 16.0D, 0.0D ).endVertex();
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
} }

View file

@ -193,31 +193,31 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
final IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon(); final IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
tess.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); tess.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
float middle = 0.5f; float middle = 0.5f;
middle += 0.02f; middle += 0.02f;
final float TwoPx = 2.0f / 16.0f; final float TwoPx = 2.0f / 16.0f;
tess.pos( TwoPx, middle + press, TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex(); tess.pos( TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex(); tess.pos( TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex(); tess.pos( TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
final float base = 0.4f; final float base = 0.4f;
tess.pos( 1.0 - TwoPx, middle + base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle + base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( TwoPx, middle + base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex(); tess.pos( TwoPx, middle + base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
middle -= 2.0f * 0.02f; middle -= 2.0f * 0.02f;
tess.pos( 1.0 - TwoPx, middle - press, TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle - press, TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle - press, TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex(); tess.pos( TwoPx, middle - press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex(); tess.pos( TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex(); tess.pos( TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle - base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex(); tess.pos( TwoPx, middle - base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + -base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex(); tess.pos( 1.0 - TwoPx, middle + -base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
Tessellator.getInstance().draw(); Tessellator.getInstance().draw();

View file

@ -97,10 +97,10 @@ public class CraftingFx extends EntityBreakingFX
// AELog.info( "" + partialTick ); // AELog.info( "" + partialTick );
final float f14 = 1.0F; final float f14 = 1.0F;
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale).tex( f7, f9 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale ).tex( f7, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale).tex( f7, f8 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale ).tex( f7, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale).tex( f6, f8 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale ).tex( f6, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale).tex( f6, f9 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale ).tex( f6, f9 ).endVertex();
} }
} }

View file

@ -87,10 +87,10 @@ public class EnergyFx extends EntityBreakingFX
if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ ) if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
{ {
final float f14 = 1.0F; final float f14 = 1.0F;
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10).tex( f7, f9 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10).tex( f7, f8 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10).tex( f6, f8 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10).tex( f6, f9 ).endVertex(); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 ).endVertex();
} }
} }

View file

@ -91,7 +91,7 @@ public class LightningFX extends EntityFX
float green = this.particleGreen * j * 0.95f; float green = this.particleGreen * j * 0.95f;
float blue = this.particleBlue * j; float blue = this.particleBlue * j;
float alpha = this.particleAlpha; float alpha = this.particleAlpha;
if( this.particleAge == 3 ) if( this.particleAge == 3 )
{ {
this.regen(); this.regen();
@ -126,9 +126,9 @@ public class LightningFX extends EntityFX
offX *= 0.001; offX *= 0.001;
offY *= 0.001; offY *= 0.001;
offZ *= 0.001; offZ *= 0.001;
red=this.particleRed * j * 0.4f; red = this.particleRed * j * 0.4f;
green=this.particleGreen * j * 0.25f; green = this.particleGreen * j * 0.25f;
blue= this.particleBlue * j * 0.45f; blue = this.particleBlue * j * 0.45f;
} }
else else
{ {
@ -136,7 +136,7 @@ public class LightningFX extends EntityFX
offY = 0; offY = 0;
offZ = 0; offZ = 0;
scale = 0.02; scale = 0.02;
red= this.particleRed * j * 0.9f; red = this.particleRed * j * 0.9f;
green = this.particleGreen * j * 0.65f; green = this.particleGreen * j * 0.65f;
blue = this.particleBlue * j * 0.85f; blue = this.particleBlue * j * 0.85f;
} }
@ -191,7 +191,7 @@ public class LightningFX extends EntityFX
b[1] = y; b[1] = y;
b[2] = z; b[2] = z;
this.draw( red,green,blue,tess, a, b, f6, f8 ); this.draw( red, green, blue, tess, a, b, f6, f8 );
x = xN; x = xN;
y = yN; y = yN;
@ -210,14 +210,14 @@ public class LightningFX extends EntityFX
this.hasData = false; this.hasData = false;
} }
private void draw( float red,float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 ) private void draw( float red, float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 )
{ {
if( this.hasData ) if( this.hasData )
{ {
tess.color(red,green,blue,particleAlpha).pos( a[0], a[1], a[2]).tex( f6, f8 ).endVertex(); tess.color( red, green, blue, particleAlpha ).pos( a[0], a[1], a[2] ).tex( f6, f8 ).endVertex();
tess.color(red,green,blue,particleAlpha).pos( this.vertices[0], this.vertices[1], this.vertices[2]).tex( f6, f8 ).endVertex(); tess.color( red, green, blue, particleAlpha ).pos( this.vertices[0], this.vertices[1], this.vertices[2] ).tex( f6, f8 ).endVertex();
tess.color(red,green,blue,particleAlpha).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2]).tex( f6, f8 ).endVertex(); tess.color( red, green, blue, particleAlpha ).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ).tex( f6, f8 ).endVertex();
tess.color(red,green,blue,particleAlpha).pos( b[0], b[1], b[2]).tex( f6, f8 ).endVertex(); tess.color( red, green, blue, particleAlpha ).pos( b[0], b[1], b[2] ).tex( f6, f8 ).endVertex();
} }
this.hasData = true; this.hasData = true;
for( int x = 0; x < 3; x++ ) for( int x = 0; x < 3; x++ )

View file

@ -84,9 +84,9 @@ public class MatterCannonFX extends EntityBreakingFX
final float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ ); final float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ );
final float f14 = 1.0F; final float f14 = 1.0F;
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10).tex( f7, f9 ); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10).tex( f7, f8 ); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10).tex( f6, f8 ); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10).tex( f6, f9 ); par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 );
} }
} }

View file

@ -25,22 +25,21 @@ import appeng.client.ItemRenderType;
// TODO - PORT // TODO - PORT
public class ToolBiometricCardRender // TileEntityItemStackRenderer public class ToolBiometricCardRender // TileEntityItemStackRenderer
{ {
public boolean handleRenderType( final ItemStack item, final ItemRenderType type ) public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
{ {
return true; return true;
} }
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )// , final ItemRendererHelper
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )//, final ItemRendererHelper helper ) // 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 ) public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
{ {
/* /*

View file

@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
import appeng.client.ItemRenderType; import appeng.client.ItemRenderType;
public class ToolColorApplicatorRender public class ToolColorApplicatorRender
{ {
public boolean handleRenderType( final ItemStack item, final ItemRenderType type ) public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
@ -34,7 +34,8 @@ public class ToolColorApplicatorRender
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item ) 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 ) 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 * is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the
* *
* @param config} * @param config
*/ */
private final boolean isAchievementFeatureEnabled; private final boolean isAchievementFeatureEnabled;

View file

@ -51,7 +51,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
if( Platform.isClient() ) if( Platform.isClient() )
{ {
// TODO - PORT ToolBiometricCardRender // TODO - PORT ToolBiometricCardRender
//MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() ); // MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() );
} }
} }

View file

@ -108,8 +108,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
this.setFeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) ); this.setFeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) );
if( Platform.isClient() ) if( Platform.isClient() )
{ {
//TODO - color applicator // TODO - color applicator
//MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() ); // MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() );
} }
} }

View file

@ -83,7 +83,7 @@ public class ServerHelper extends CommonHelper
if( server != null ) if( server != null )
{ {
return (List)server.getConfigurationManager().playerEntityList; return (List) server.getConfigurationManager().playerEntityList;
} }
} }

View file

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

View file

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

View file

@ -30,7 +30,7 @@ import org.junit.Test;
*/ */
public class ModVersionFetcherTest public class ModVersionFetcherTest
{ {
// private static final ModVersionFetcher FETCHER = new ModVersionFetcher( ) // private static final ModVersionFetcher FETCHER = new ModVersionFetcher( )
private final ModVersionFetcher indev; private final ModVersionFetcher indev;
private final ModVersionFetcher pullRequest; private final ModVersionFetcher pullRequest;

View file

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

View file

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

View file

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