tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Capitalised enums to match conventions

Browse source
This commit is contained in:
yueh 2016-09-17 15:02:51 +02:00
parent 2d1d29eb37
commit f185bc07a6
43 changed files with 105 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/api/java/appeng/api/events/LocatableEventAnnounce.java
View file

@ -48,7 +48,14 @@ public class LocatableEventAnnounce extends Event
public enum LocatableEvent public enum LocatableEvent
{ {
Register, // Adds the locatable to the registry /**
Unregister // Removes the locatable from the registry * Adds the locatable to the registry
*/
REGISTER,
/**
* Removes the locatable from the registry
*/
UNREGISTER
} }
} }

2
src/api/java/appeng/api/features/IWorldGen.java
View file

@ -41,6 +41,6 @@ public interface IWorldGen
enum WorldGenType enum WorldGenType
{ {
CertusQuartz, ChargedCertusQuartz, Meteorites CERTUS_QUARTZ, CHARGED_CERTUS_QUARTZ, METEORITES
} }
} }

4
src/api/java/appeng/api/features/InscriberProcessType.java
View file

@ -24,10 +24,10 @@ public enum InscriberProcessType
/** /**
* uses the optionals as catalyst * uses the optionals as catalyst
*/ */
Inscribe, INSCRIBE,
/** /**
* spends the optionals * spends the optionals
*/ */
Press PRESS
} }

2
src/api/java/appeng/api/networking/GridNotification.java
View file

@ -29,5 +29,5 @@ public enum GridNotification
/** /**
* the visible connections for this node have changed, useful for cable. * the visible connections for this node have changed, useful for cable.
*/ */
ConnectionsChanged, CONNECTIONS_CHANGED,
} }

4
src/api/java/appeng/api/parts/CableRenderMode.java
View file

@ -26,9 +26,9 @@ package appeng.api.parts;
public enum CableRenderMode public enum CableRenderMode
{ {
Standard( false ), STANDARD( false ),
CableView( true ); CABLE_VIEW( true );
public final boolean transparentFacades; public final boolean transparentFacades;
public final boolean opaqueFacades; public final boolean opaqueFacades;

10
src/api/java/appeng/api/parts/PartItemStack.java
View file

@ -26,13 +26,13 @@ package appeng.api.parts;
public enum PartItemStack public enum PartItemStack
{ {
Pick, PICK,
Break, BREAK,
Wrench, WRENCH,
Network, NETWORK,
World WORLD
} }

38
src/api/java/appeng/api/util/AEColor.java
View file

@ -40,41 +40,41 @@ import net.minecraft.util.text.translation.I18n;
public enum AEColor public enum AEColor
{ {
White( "gui.appliedenergistics2.White", EnumDyeColor.WHITE, 0xBEBEBE, 0xDBDBDB, 0xFAFAFA ), WHITE( "gui.appliedenergistics2.White", EnumDyeColor.WHITE, 0xBEBEBE, 0xDBDBDB, 0xFAFAFA ),
Orange( "gui.appliedenergistics2.Orange", EnumDyeColor.ORANGE, 0xF99739, 0xFAAE44, 0xF4DEC3 ), ORANGE( "gui.appliedenergistics2.Orange", EnumDyeColor.ORANGE, 0xF99739, 0xFAAE44, 0xF4DEC3 ),
Magenta( "gui.appliedenergistics2.Magenta", EnumDyeColor.MAGENTA, 0x821E82, 0xB82AB8, 0xC598C8 ), MAGENTA( "gui.appliedenergistics2.Magenta", EnumDyeColor.MAGENTA, 0x821E82, 0xB82AB8, 0xC598C8 ),
LightBlue( "gui.appliedenergistics2.LightBlue", EnumDyeColor.LIGHT_BLUE, 0x628DCB, 0x82ACE7, 0xD8F6FF ), LIGHT_BLUE( "gui.appliedenergistics2.LightBlue", EnumDyeColor.LIGHT_BLUE, 0x628DCB, 0x82ACE7, 0xD8F6FF ),
Yellow( "gui.appliedenergistics2.Yellow", EnumDyeColor.YELLOW, 0xFFF7AA, 0xF8FF4A, 0xFFFFE8 ), YELLOW( "gui.appliedenergistics2.Yellow", EnumDyeColor.YELLOW, 0xFFF7AA, 0xF8FF4A, 0xFFFFE8 ),
Lime( "gui.appliedenergistics2.Lime", EnumDyeColor.LIME, 0x7CFF4A, 0xBBFF51, 0xE7F7D7 ), LIME( "gui.appliedenergistics2.Lime", EnumDyeColor.LIME, 0x7CFF4A, 0xBBFF51, 0xE7F7D7 ),
Pink( "gui.appliedenergistics2.Pink", EnumDyeColor.PINK, 0xDC8DB5, 0xF8B5D7, 0xF7DEEB ), PINK( "gui.appliedenergistics2.Pink", EnumDyeColor.PINK, 0xDC8DB5, 0xF8B5D7, 0xF7DEEB ),
Gray( "gui.appliedenergistics2.Gray", EnumDyeColor.GRAY, 0x7C7C7C, 0xA0A0A0, 0xC9C9C9 ), GRAY( "gui.appliedenergistics2.Gray", EnumDyeColor.GRAY, 0x7C7C7C, 0xA0A0A0, 0xC9C9C9 ),
LightGray( "gui.appliedenergistics2.LightGray", EnumDyeColor.SILVER, 0x9D9D9D, 0xCDCDCD, 0xEFEFEF ), LIGHT_GRAY( "gui.appliedenergistics2.LightGray", EnumDyeColor.SILVER, 0x9D9D9D, 0xCDCDCD, 0xEFEFEF ),
Cyan( "gui.appliedenergistics2.Cyan", EnumDyeColor.CYAN, 0x2F9BA5, 0x51AAC6, 0xAEDDF4 ), CYAN( "gui.appliedenergistics2.Cyan", EnumDyeColor.CYAN, 0x2F9BA5, 0x51AAC6, 0xAEDDF4 ),
Purple( "gui.appliedenergistics2.Purple", EnumDyeColor.PURPLE, 0x8230B2, 0xA453CE, 0xC7A3CC ), PURPLE( "gui.appliedenergistics2.Purple", EnumDyeColor.PURPLE, 0x8230B2, 0xA453CE, 0xC7A3CC ),
Blue( "gui.appliedenergistics2.Blue", EnumDyeColor.BLUE, 0x2D29A0, 0x514AFF, 0xDDE6FF ), BLUE( "gui.appliedenergistics2.Blue", EnumDyeColor.BLUE, 0x2D29A0, 0x514AFF, 0xDDE6FF ),
Brown( "gui.appliedenergistics2.Brown", EnumDyeColor.BROWN, 0x724E35, 0xB7967F, 0xE0D2C8 ), BROWN( "gui.appliedenergistics2.Brown", EnumDyeColor.BROWN, 0x724E35, 0xB7967F, 0xE0D2C8 ),
Green( "gui.appliedenergistics2.Green", EnumDyeColor.GREEN, 0x45A021, 0x60E32E, 0xE3F2E3 ), GREEN( "gui.appliedenergistics2.Green", EnumDyeColor.GREEN, 0x45A021, 0x60E32E, 0xE3F2E3 ),
Red( "gui.appliedenergistics2.Red", EnumDyeColor.RED, 0xA50029, 0xFF003C, 0xFFE6ED ), RED( "gui.appliedenergistics2.Red", EnumDyeColor.RED, 0xA50029, 0xFF003C, 0xFFE6ED ),
Black( "gui.appliedenergistics2.Black", EnumDyeColor.BLACK, 0x2B2B2B, 0x565656, 0x848484 ), BLACK( "gui.appliedenergistics2.Black", EnumDyeColor.BLACK, 0x2B2B2B, 0x565656, 0x848484 ),
Transparent( "gui.appliedenergistics2.Fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC ); TRANSPARENT( "gui.appliedenergistics2.Fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC );
public static final List<AEColor> VALID_COLORS = Arrays.asList( White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, LightGray, Cyan, Purple, Blue, Brown, Green, Red, Black ); public static final List<AEColor> VALID_COLORS = Arrays.asList( WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE, BLUE, BROWN, GREEN, RED, BLACK );
/** /**
* The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #blackVariant dark variant} of the apprioriate AE color. * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #blackVariant dark variant} of the apprioriate AE color.
@ -165,7 +165,7 @@ public enum AEColor
*/ */
public boolean matches( final AEColor color ) public boolean matches( final AEColor color )
{ {
return this == Transparent || color == Transparent || this == color; return this == TRANSPARENT || color == TRANSPARENT || this == color;
} }
@Override @Override

2
src/main/java/appeng/block/crafting/BlockCraftingMonitor.java
View file

@ -66,7 +66,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
@Override @Override
public IExtendedBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos ) public IExtendedBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
{ {
AEColor color = AEColor.Transparent; AEColor color = AEColor.TRANSPARENT;
EnumFacing forward = EnumFacing.NORTH; EnumFacing forward = EnumFacing.NORTH;
TileCraftingMonitorTile te = getTileEntity( world, pos ); TileCraftingMonitorTile te = getTileEntity( world, pos );

2
src/main/java/appeng/block/misc/SecurityStationRendering.java
View file

@ -20,6 +20,6 @@ public class SecurityStationRendering extends BlockRenderingCustomizer
public void customize( IBlockRendering rendering, IItemRendering itemRendering ) public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{ {
rendering.blockColor( ColorableTileBlockColor.INSTANCE ); rendering.blockColor( ColorableTileBlockColor.INSTANCE );
itemRendering.color( new StaticItemColor( AEColor.Transparent ) ); itemRendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
} }
} }

2
src/main/java/appeng/block/networking/BlockCableBus.java
View file

@ -244,7 +244,7 @@ public class BlockCableBus extends AEBaseTileBlock
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 )
{ {

2
src/main/java/appeng/block/networking/CableBusColor.java
View file

@ -24,7 +24,7 @@ public class CableBusColor implements IBlockColor
public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int color ) public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int color )
{ {
AEColor busColor = AEColor.Transparent; AEColor busColor = AEColor.TRANSPARENT;
if( state instanceof IExtendedBlockState ) if( state instanceof IExtendedBlockState )
{ {

2
src/main/java/appeng/block/storage/ChestRendering.java
View file

@ -20,7 +20,7 @@ public class ChestRendering extends BlockRenderingCustomizer
public void customize( IBlockRendering rendering, IItemRendering itemRendering ) public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{ {
// I checked, the ME chest doesn't keep its color in item form // I checked, the ME chest doesn't keep its color in item form
itemRendering.color( new StaticItemColor( AEColor.Transparent ) ); itemRendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
rendering.blockColor( new ColorableTileBlockColor() ); rendering.blockColor( new ColorableTileBlockColor() );
} }

2
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
View file

@ -250,7 +250,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( AEConfig.instance.useColoredCraftingStatus && ( active || scheduled ) ) if( AEConfig.instance.useColoredCraftingStatus && ( active || scheduled ) )
{ {
final int bgColor = ( active ? AEColor.Green.blackVariant : AEColor.Yellow.blackVariant ) | BACKGROUND_ALPHA; final int bgColor = ( active ? AEColor.GREEN.blackVariant : AEColor.YELLOW.blackVariant ) | BACKGROUND_ALPHA;
final int startX = ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET ) * 2; final int startX = ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET ) * 2;
final int startY = ( ( y * offY + ITEMSTACK_TOP_OFFSET ) - 3 ) * 2; final int startY = ( ( y * offY + ITEMSTACK_TOP_OFFSET ) - 3 ) * 2;
drawRect( startX, startY, startX + ( SECTION_LENGTH * 2 ), startY + ( offY * 2 ) - 2, bgColor ); drawRect( startX, startY, startX + ( SECTION_LENGTH * 2 ), startY + ( offY * 2 ) - 2, bgColor );

2
src/main/java/appeng/client/render/ColorableTileBlockColor.java
View file

@ -42,7 +42,7 @@ public class ColorableTileBlockColor implements IBlockColor
@Override @Override
public int colorMultiplier( IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex ) public int colorMultiplier( IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex )
{ {
AEColor color = AEColor.Transparent; // Default to a neutral color AEColor color = AEColor.TRANSPARENT; // Default to a neutral color
if( worldIn != null && pos != null ) if( worldIn != null && pos != null )
{ {

2
src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
View file

@ -25,7 +25,7 @@ public class CableBusRenderState
// The type to use for rendering the core of the cable. // The type to use for rendering the core of the cable.
private CableCoreType coreType; private CableCoreType coreType;
private AEColor cableColor = AEColor.Transparent; private AEColor cableColor = AEColor.TRANSPARENT;
// Describes the outgoing connections of this cable bus to other blocks, and how they should be rendered // Describes the outgoing connections of this cable bus to other blocks, and how they should be rendered
private EnumMap<EnumFacing, AECableType> connectionTypes = new EnumMap<>( EnumFacing.class ); private EnumMap<EnumFacing, AECableType> connectionTypes = new EnumMap<>( EnumFacing.class );

2
src/main/java/appeng/client/render/crafting/MonitorBakedModel.java
View file

@ -96,7 +96,7 @@ class MonitorBakedModel extends CraftingCubeBakedModel
} }
} }
return AEColor.Transparent; return AEColor.TRANSPARENT;
} }
private static EnumFacing getForward( IBlockState state ) private static EnumFacing getForward( IBlockState state )

2
src/main/java/appeng/core/Registration.java
View file

@ -482,7 +482,7 @@ public final class Registration
// whitelist from config // whitelist from config
for( final int dimension : AEConfig.instance.meteoriteDimensionWhitelist ) for( final int dimension : AEConfig.instance.meteoriteDimensionWhitelist )
{ {
registries.worldgen().enableWorldGenForDimension( WorldGenType.Meteorites, dimension ); registries.worldgen().enableWorldGenForDimension( WorldGenType.METEORITES, dimension );
} }
/* /*

4
src/main/java/appeng/core/features/registries/LocatableRegistry.java
View file

@ -50,11 +50,11 @@ public final class LocatableRegistry implements ILocatableRegistry
return; // IGNORE! return; // IGNORE!
} }
if( e.change == LocatableEvent.Register ) if( e.change == LocatableEvent.REGISTER )
{ {
this.set.put( e.target.getLocatableSerial(), e.target ); this.set.put( e.target.getLocatableSerial(), e.target );
} }
else if( e.change == LocatableEvent.Unregister ) else if( e.change == LocatableEvent.UNREGISTER )
{ {
this.set.remove( e.target.getLocatableSerial() ); this.set.remove( e.target.getLocatableSerial() );
} }

2
src/main/java/appeng/core/features/registries/WorldGenRegistry.java
View file

@ -104,7 +104,7 @@ public final class WorldGenRegistry implements IWorldGen
return false; return false;
} }
if( !isGoodDimension && type == WorldGenType.Meteorites ) if( !isGoodDimension && type == WorldGenType.METEORITES )
{ {
return false; return false;
} }

2
src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java
View file

@ -23,6 +23,6 @@ public class InscriberInscribeRecipe extends InscriberRecipe
{ {
public InscriberInscribeRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot ) public InscriberInscribeRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot )
{ {
super( inputs, output, top, bot, InscriberProcessType.Inscribe ); super( inputs, output, top, bot, InscriberProcessType.INSCRIBE );
} }
} }

2
src/main/java/appeng/core/stats/Achievements.java
View file

@ -116,7 +116,7 @@ public enum Achievements
Achievements( final int x, final int y, final AEColoredItemDefinition which, final AchievementType type ) Achievements( final int x, final int y, final AEColoredItemDefinition which, final AchievementType type )
{ {
this.stack = ( which != null ) ? which.stack( AEColor.Transparent, 1 ) : null; this.stack = ( which != null ) ? which.stack( AEColor.TRANSPARENT, 1 ) : null;
this.type = type; this.type = type;
this.x = x; this.x = x;
this.y = y; this.y = y;

2
src/main/java/appeng/hooks/TickHandler.java
View file

@ -67,7 +67,7 @@ public class TickHandler
private final HandlerRep client = new HandlerRep(); private final HandlerRep client = new HandlerRep();
private final HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap<Integer, PlayerColor>(); private final HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap<Integer, PlayerColor>();
private final HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap<Integer, PlayerColor>(); private final HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap<Integer, PlayerColor>();
private CableRenderMode crm = CableRenderMode.Standard; private CableRenderMode crm = CableRenderMode.STANDARD;
public HashMap<Integer, PlayerColor> getPlayerColors() public HashMap<Integer, PlayerColor> getPlayerColors()
{ {

6
src/main/java/appeng/items/misc/ItemPaintBall.java
View file

@ -61,7 +61,7 @@ public class ItemPaintBall extends AEBaseItem
if( dmg >= AEColor.values().length ) if( dmg >= AEColor.values().length )
{ {
return AEColor.Transparent; return AEColor.TRANSPARENT;
} }
return AEColor.values()[dmg]; return AEColor.values()[dmg];
@ -72,7 +72,7 @@ public class ItemPaintBall extends AEBaseItem
{ {
for( final AEColor c : AEColor.values() ) for( final AEColor c : AEColor.values() )
{ {
if( c != AEColor.Transparent ) if( c != AEColor.TRANSPARENT )
{ {
itemStacks.add( new ItemStack( this, 1, c.ordinal() ) ); itemStacks.add( new ItemStack( this, 1, c.ordinal() ) );
} }
@ -80,7 +80,7 @@ public class ItemPaintBall extends AEBaseItem
for( final AEColor c : AEColor.values() ) for( final AEColor c : AEColor.values() )
{ {
if( c != AEColor.Transparent ) if( c != AEColor.TRANSPARENT )
{ {
itemStacks.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) ); itemStacks.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) );
} }

2
src/main/java/appeng/items/parts/ItemMultipartRendering.java
View file

@ -42,7 +42,7 @@ public class ItemMultipartRendering extends ItemRenderingCustomizer
rendering.meshDefinition( this::getItemMeshDefinition ); rendering.meshDefinition( this::getItemMeshDefinition );
rendering.color( new StaticItemColor( AEColor.Transparent ) ); rendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
// Register all item models as variants so they get loaded // Register all item models as variants so they get loaded
rendering.variants( Arrays.stream( PartType.values() ) rendering.variants( Arrays.stream( PartType.values() )

10
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
View file

@ -89,7 +89,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
for( final AEColor col : AEColor.values() ) for( final AEColor col : AEColor.values() )
{ {
if( col == AEColor.Transparent ) if( col == AEColor.TRANSPARENT )
{ {
continue; continue;
} }
@ -142,9 +142,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
// clean cables. // clean cables.
if( te instanceof IColorableTile ) if( te instanceof IColorableTile )
{ {
if( this.getAECurrentPower( is ) > powerPerUse && ( (IColorableTile) te ).getColor() != AEColor.Transparent ) if( this.getAECurrentPower( is ) > powerPerUse && ( (IColorableTile) te ).getColor() != AEColor.TRANSPARENT )
{ {
if( ( (IColorableTile) te ).recolourBlock( side, AEColor.Transparent, p ) ) if( ( (IColorableTile) te ).recolourBlock( side, AEColor.TRANSPARENT, p ) )
{ {
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() ); inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
this.extractAEPower( is, powerPerUse ); this.extractAEPower( is, powerPerUse );
@ -170,7 +170,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( color != null && this.getAECurrentPower( is ) > powerPerUse ) if( color != null && this.getAECurrentPower( is ) > powerPerUse )
{ {
if( color != AEColor.Transparent && this.recolourBlock( blk, side, w, pos, side, color, p ) ) if( color != AEColor.TRANSPARENT && this.recolourBlock( blk, side, w, pos, side, color, p ) )
{ {
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() ); inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
this.extractAEPower( is, powerPerUse ); this.extractAEPower( is, powerPerUse );
@ -217,7 +217,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( paintBall.getItem() instanceof ItemSnowball ) if( paintBall.getItem() instanceof ItemSnowball )
{ {
return AEColor.Transparent; return AEColor.TRANSPARENT;
} }
if( paintBall.getItem() instanceof ItemPaintBall ) if( paintBall.getItem() instanceof ItemPaintBall )

4
src/main/java/appeng/me/GridNode.java
View file

@ -106,7 +106,7 @@ public class GridNode implements IGridNode, IPathItem
this.connections.add( gridConnection ); this.connections.add( gridConnection );
if( gridConnection.hasDirection() ) if( gridConnection.hasDirection() )
{ {
this.gridProxy.onGridNotification( GridNotification.ConnectionsChanged ); this.gridProxy.onGridNotification( GridNotification.CONNECTIONS_CHANGED );
} }
final IGridNode gn = this; final IGridNode gn = this;
@ -119,7 +119,7 @@ public class GridNode implements IGridNode, IPathItem
this.connections.remove( gridConnection ); this.connections.remove( gridConnection );
if( gridConnection.hasDirection() ) if( gridConnection.hasDirection() )
{ {
this.gridProxy.onGridNotification( GridNotification.ConnectionsChanged ); this.gridProxy.onGridNotification( GridNotification.CONNECTIONS_CHANGED );
} }
} }

8
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
View file

@ -87,7 +87,7 @@ public class QuantumCluster implements ILocatable, IAECluster
{ {
if( this.thisSide != 0 ) if( this.thisSide != 0 )
{ {
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
} }
if( this.canUseNode( -qe ) ) if( this.canUseNode( -qe ) )
@ -101,11 +101,11 @@ public class QuantumCluster implements ILocatable, IAECluster
this.otherSide = -qe; this.otherSide = -qe;
} }
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Register ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.REGISTER ) );
} }
else else
{ {
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
this.otherSide = 0; this.otherSide = 0;
this.thisSide = 0; this.thisSide = 0;
@ -243,7 +243,7 @@ public class QuantumCluster implements ILocatable, IAECluster
if( this.thisSide != 0 ) if( this.thisSide != 0 )
{ {
this.updateStatus( true ); this.updateStatus( true );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
} }
this.center.updateStatus( null, (byte) -1, this.isUpdateStatus() ); this.center.updateStatus( null, (byte) -1, this.isUpdateStatus() );

2
src/main/java/appeng/me/helpers/AENetworkProxy.java
View file

@ -61,7 +61,7 @@ public class AENetworkProxy implements IGridBlock
private final IGridProxyable gp; private final IGridProxyable gp;
private final boolean worldNode; private final boolean worldNode;
private final String nbtName; // name private final String nbtName; // name
private AEColor myColor = AEColor.Transparent; private AEColor myColor = AEColor.TRANSPARENT;
private NBTTagCompound data = null; // input private NBTTagCompound data = null; // input
private ItemStack myRepInstance; private ItemStack myRepInstance;
private boolean isReady = false; private boolean isReady = false;

6
src/main/java/appeng/parts/AEBasePart.java
View file

@ -140,7 +140,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
{ {
if( this.host == null ) if( this.host == null )
{ {
return AEColor.Transparent; return AEColor.TRANSPARENT;
} }
return this.host.getColor(); return this.host.getColor();
} }
@ -212,7 +212,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override @Override
public ItemStack getItemStack( final PartItemStack type ) public ItemStack getItemStack( final PartItemStack type )
{ {
if( type == PartItemStack.Network ) if( type == PartItemStack.NETWORK )
{ {
final ItemStack copy = this.is.copy(); final ItemStack copy = this.is.copy();
copy.setTagCompound( null ); copy.setTagCompound( null );
@ -437,7 +437,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
{ {
final IMemoryCard memoryCard = (IMemoryCard) memCardIS.getItem(); final IMemoryCard memoryCard = (IMemoryCard) memCardIS.getItem();
ItemStack is = this.getItemStack( PartItemStack.Network ); ItemStack is = this.getItemStack( PartItemStack.NETWORK );
// Blocks and parts share the same soul! // Blocks and parts share the same soul!
final IDefinitions definitions = AEApi.instance().definitions(); final IDefinitions definitions = AEApi.instance().definitions();

12
src/main/java/appeng/parts/CableBusContainer.java
View file

@ -388,7 +388,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPartCable c = this.getCenter(); final IPartCable c = this.getCenter();
return c.getCableColor(); return c.getCableColor();
} }
return AEColor.Transparent; return AEColor.TRANSPARENT;
} }
@Override @Override
@ -928,7 +928,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart p = this.getPart( AEPartLocation.fromOrdinal( x ) ); final IPart p = this.getPart( AEPartLocation.fromOrdinal( x ) );
if( p != null ) if( p != null )
{ {
final ItemStack is = p.getItemStack( PartItemStack.Network ); final ItemStack is = p.getItemStack( PartItemStack.NETWORK );
data.writeShort( Item.getIdFromItem( is.getItem() ) ); data.writeShort( Item.getIdFromItem( is.getItem() ) );
data.writeShort( is.getItemDamage() ); data.writeShort( is.getItemDamage() );
@ -958,7 +958,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final Item myItem = Item.getItemById( itemID ); final Item myItem = Item.getItemById( itemID );
final ItemStack current = p != null ? p.getItemStack( PartItemStack.Network ) : null; final ItemStack current = p != null ? p.getItemStack( PartItemStack.NETWORK ) : null;
if( current != null && current.getItem() == myItem && current.getItemDamage() == dmgValue ) if( current != null && current.getItem() == myItem && current.getItemDamage() == dmgValue )
{ {
if( p.readFromStream( data ) ) if( p.readFromStream( data ) )
@ -1008,7 +1008,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
if( part != null ) if( part != null )
{ {
final NBTTagCompound def = new NBTTagCompound(); final NBTTagCompound def = new NBTTagCompound();
part.getItemStack( PartItemStack.World ).writeToNBT( def ); part.getItemStack( PartItemStack.WORLD ).writeToNBT( def );
final NBTTagCompound extra = new NBTTagCompound(); final NBTTagCompound extra = new NBTTagCompound();
part.writeToNBT( extra ); part.writeToNBT( extra );
@ -1061,7 +1061,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
continue; continue;
} }
final ItemStack current = p == null ? null : p.getItemStack( PartItemStack.World ); final ItemStack current = p == null ? null : p.getItemStack( PartItemStack.WORLD );
if( Platform.isSameItemType( iss, current ) ) if( Platform.isSameItemType( iss, current ) )
{ {
@ -1098,7 +1098,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart part = this.getPart( s ); final IPart part = this.getPart( s );
if( part != null ) if( part != null )
{ {
drops.add( part.getItemStack( PartItemStack.Break ) ); drops.add( part.getItemStack( PartItemStack.BREAK ) );
part.getDrops( drops, false ); part.getDrops( drops, false );
} }

2
src/main/java/appeng/parts/PartPlacement.java
View file

@ -113,7 +113,7 @@ public class PartPlacement
if( sp.part != null ) if( sp.part != null )
{ {
is.add( sp.part.getItemStack( PartItemStack.Wrench ) ); is.add( sp.part.getItemStack( PartItemStack.WRENCH ) );
sp.part.getDrops( is, true ); sp.part.getDrops( is, true );
host.removePart( sp.side, false ); host.removePart( sp.side, false );
} }

4
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
View file

@ -115,7 +115,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
@Override @Override
public ItemStack getItemStack( final PartItemStack type ) public ItemStack getItemStack( final PartItemStack type )
{ {
if( type == PartItemStack.World || type == PartItemStack.Network || type == PartItemStack.Wrench || type == PartItemStack.Pick ) if( type == PartItemStack.WORLD || type == PartItemStack.NETWORK || type == PartItemStack.WRENCH || type == PartItemStack.PICK )
{ {
return super.getItemStack( type ); return super.getItemStack( type );
} }
@ -339,7 +339,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
this.onTunnelConfigChange(); this.onTunnelConfigChange();
final ItemStack p2pItem = this.getItemStack( PartItemStack.Wrench ); final ItemStack p2pItem = this.getItemStack( PartItemStack.WRENCH );
final String type = p2pItem.getUnlocalizedName(); final String type = p2pItem.getUnlocalizedName();
p2pItem.writeToNBT( data ); p2pItem.writeToNBT( data );

6
src/main/java/appeng/recipes/AEItemResolver.java
View file

@ -156,10 +156,10 @@ public class AEItemResolver implements ISubItemResolver
} }
catch( final Throwable t ) catch( final Throwable t )
{ {
col = AEColor.Transparent; col = AEColor.TRANSPARENT;
} }
if( col == AEColor.Transparent ) if( col == AEColor.TRANSPARENT )
{ {
return null; return null;
} }
@ -178,7 +178,7 @@ public class AEItemResolver implements ISubItemResolver
} }
catch( final Throwable t ) catch( final Throwable t )
{ {
col = AEColor.Transparent; col = AEColor.TRANSPARENT;
} }
final ItemStack is = partType.stack( col, 1 ); final ItemStack is = partType.stack( col, 1 );

2
src/main/java/appeng/recipes/handlers/Inscribe.java
View file

@ -61,7 +61,7 @@ public final class Inscribe extends InscriberProcess
final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack(); final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack();
final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack(); final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack();
final ItemStack output = this.getOutput().getItemStack(); final ItemStack output = this.getOutput().getItemStack();
final InscriberProcessType type = InscriberProcessType.Inscribe; final InscriberProcessType type = InscriberProcessType.INSCRIBE;
final IInscriberRecipe recipe = new InscriberRecipe( inputs, output, top, bot, type ); final IInscriberRecipe recipe = new InscriberRecipe( inputs, output, top, bot, type );

2
src/main/java/appeng/recipes/handlers/Press.java
View file

@ -61,7 +61,7 @@ public final class Press extends InscriberProcess
final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack(); final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack();
final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack(); final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack();
final ItemStack output = this.getOutput().getItemStack(); final ItemStack output = this.getOutput().getItemStack();
final InscriberProcessType type = InscriberProcessType.Press; final InscriberProcessType type = InscriberProcessType.PRESS;
final IInscriberRecipe recipe = new InscriberRecipe( inputs, output, top, bot, type ); final IInscriberRecipe recipe = new InscriberRecipe( inputs, output, top, bot, type );

6
src/main/java/appeng/server/ServerHelper.java
View file

@ -144,7 +144,7 @@ public class ServerHelper extends CommonHelper
{ {
if( this.renderModeBased == null ) if( this.renderModeBased == null )
{ {
return CableRenderMode.Standard; return CableRenderMode.STANDARD;
} }
return this.renderModeForPlayer( this.renderModeBased ); return this.renderModeForPlayer( this.renderModeBased );
@ -181,12 +181,12 @@ public class ServerHelper extends CommonHelper
final NBTTagCompound c = is.getTagCompound(); final NBTTagCompound c = is.getTagCompound();
if( c != null && c.getBoolean( "hideFacades" ) ) if( c != null && c.getBoolean( "hideFacades" ) )
{ {
return CableRenderMode.CableView; return CableRenderMode.CABLE_VIEW;
} }
} }
} }
} }
return CableRenderMode.Standard; return CableRenderMode.STANDARD;
} }
} }

2
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
View file

@ -47,7 +47,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
private boolean updateList; private boolean updateList;
private IAEItemStack dspPlay; private IAEItemStack dspPlay;
private AEColor paintedColor = AEColor.Transparent; private AEColor paintedColor = AEColor.TRANSPARENT;
@TileEvent( TileEventType.NETWORK_READ ) @TileEvent( TileEventType.NETWORK_READ )
public boolean readFromStream_TileCraftingMonitorTile( final ByteBuf data ) throws IOException public boolean readFromStream_TileCraftingMonitorTile( final ByteBuf data ) throws IOException

4
src/main/java/appeng/tile/misc/TileInscriber.java
View file

@ -390,7 +390,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
} }
final List<ItemStack> inputs = Lists.newArrayList( startingItem ); final List<ItemStack> inputs = Lists.newArrayList( startingItem );
final InscriberProcessType type = InscriberProcessType.Inscribe; final InscriberProcessType type = InscriberProcessType.INSCRIBE;
return new InscriberRecipe( inputs, renamedItem, plateA, plateB, type ); return new InscriberRecipe( inputs, renamedItem, plateA, plateB, type );
} }
@ -436,7 +436,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
if( ad.addItems( outputCopy ) == null ) if( ad.addItems( outputCopy ) == null )
{ {
this.setProcessingTime( 0 ); this.setProcessingTime( 0 );
if( out.getProcessType() == InscriberProcessType.Press ) if( out.getProcessType() == InscriberProcessType.PRESS )
{ {
this.setInventorySlotContents( 0, null ); this.setInventorySlotContents( 0, null );
this.setInventorySlotContents( 1, null ); this.setInventorySlotContents( 1, null );

8
src/main/java/appeng/tile/misc/TileSecurityStation.java
View file

@ -89,7 +89,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
private final SecurityStationInventory inventory = new SecurityStationInventory( this ); private final SecurityStationInventory inventory = new SecurityStationInventory( this );
private final MEMonitorHandler<IAEItemStack> securityMonitor = new MEMonitorHandler<IAEItemStack>( this.inventory ); private final MEMonitorHandler<IAEItemStack> securityMonitor = new MEMonitorHandler<IAEItemStack>( this.inventory );
private long securityKey; private long securityKey;
private AEColor paintedColor = AEColor.Transparent; private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isActive = false; private boolean isActive = false;
public TileSecurityStation() public TileSecurityStation()
@ -234,7 +234,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
public void onChunkUnload() public void onChunkUnload()
{ {
super.onChunkUnload(); super.onChunkUnload();
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
this.isActive = false; this.isActive = false;
} }
@ -245,7 +245,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
if( Platform.isServer() ) if( Platform.isServer() )
{ {
this.isActive = true; this.isActive = true;
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Register ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.REGISTER ) );
} }
} }
@ -253,7 +253,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
public void invalidate() public void invalidate()
{ {
super.invalidate(); super.invalidate();
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
this.isActive = false; this.isActive = false;
} }

2
src/main/java/appeng/tile/storage/TileChest.java
View file

@ -108,7 +108,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
private int priority = 0; private int priority = 0;
private int state = 0; private int state = 0;
private boolean wasActive = false; private boolean wasActive = false;
private AEColor paintedColor = AEColor.Transparent; private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isCached = false; private boolean isCached = false;
private ICellHandler cellHandler; private ICellHandler cellHandler;
private MEMonitorHandler itemCell; private MEMonitorHandler itemCell;

8
src/main/java/appeng/util/Platform.java
View file

@ -2104,22 +2104,22 @@ public class Platform
for( final ItemStack stack : is ) for( final ItemStack stack : is )
{ {
if( parts.cableGlass().sameAs( AEColor.Transparent, stack ) ) if( parts.cableGlass().sameAs( AEColor.TRANSPARENT, stack ) )
{ {
return stack; return stack;
} }
if( parts.cableCovered().sameAs( AEColor.Transparent, stack ) ) if( parts.cableCovered().sameAs( AEColor.TRANSPARENT, stack ) )
{ {
return stack; return stack;
} }
if( parts.cableSmart().sameAs( AEColor.Transparent, stack ) ) if( parts.cableSmart().sameAs( AEColor.TRANSPARENT, stack ) )
{ {
return stack; return stack;
} }
if( parts.cableDense().sameAs( AEColor.Transparent, stack ) ) if( parts.cableDense().sameAs( AEColor.TRANSPARENT, stack ) )
{ {
return stack; return stack;
} }

2
src/main/java/appeng/worldgen/MeteoriteWorldGen.java
View file

@ -42,7 +42,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
@Override @Override
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider ) public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
{ {
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.Meteorites, w ) ) if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.METEORITES, w ) )
{ {
// add new meteorites? // add new meteorites?
if( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance ) if( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance )

2
src/main/java/appeng/worldgen/QuartzWorldGen.java
View file

@ -80,7 +80,7 @@ public final class QuartzWorldGen implements IWorldGenerator
final boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance; final boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance;
final WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal; final WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal;
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.ChargedCertusQuartz : WorldGenType.CertusQuartz, w ) ) if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.CHARGED_CERTUS_QUARTZ : WorldGenType.CERTUS_QUARTZ, w ) )
{ {
final int cx = chunkX * 16 + r.nextInt( 22 ); final int cx = chunkX * 16 + r.nextInt( 22 );
final int cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64; final int cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64;