diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java index dea97edf..94caf847 100644 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ b/src/api/java/appeng/api/events/LocatableEventAnnounce.java @@ -48,7 +48,14 @@ public class LocatableEventAnnounce extends Event 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 } } diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java index 8e5a9c73..725bb70c 100644 --- a/src/api/java/appeng/api/features/IWorldGen.java +++ b/src/api/java/appeng/api/features/IWorldGen.java @@ -41,6 +41,6 @@ public interface IWorldGen enum WorldGenType { - CertusQuartz, ChargedCertusQuartz, Meteorites + CERTUS_QUARTZ, CHARGED_CERTUS_QUARTZ, METEORITES } } diff --git a/src/api/java/appeng/api/features/InscriberProcessType.java b/src/api/java/appeng/api/features/InscriberProcessType.java index fbba219c..d28ef0a2 100644 --- a/src/api/java/appeng/api/features/InscriberProcessType.java +++ b/src/api/java/appeng/api/features/InscriberProcessType.java @@ -24,10 +24,10 @@ public enum InscriberProcessType /** * uses the optionals as catalyst */ - Inscribe, + INSCRIBE, /** * spends the optionals */ - Press + PRESS } diff --git a/src/api/java/appeng/api/networking/GridNotification.java b/src/api/java/appeng/api/networking/GridNotification.java index b53188d7..0815fc69 100644 --- a/src/api/java/appeng/api/networking/GridNotification.java +++ b/src/api/java/appeng/api/networking/GridNotification.java @@ -29,5 +29,5 @@ public enum GridNotification /** * the visible connections for this node have changed, useful for cable. */ - ConnectionsChanged, + CONNECTIONS_CHANGED, } diff --git a/src/api/java/appeng/api/parts/CableRenderMode.java b/src/api/java/appeng/api/parts/CableRenderMode.java index d9e80bfc..d232caab 100644 --- a/src/api/java/appeng/api/parts/CableRenderMode.java +++ b/src/api/java/appeng/api/parts/CableRenderMode.java @@ -26,9 +26,9 @@ package appeng.api.parts; public enum CableRenderMode { - Standard( false ), + STANDARD( false ), - CableView( true ); + CABLE_VIEW( true ); public final boolean transparentFacades; public final boolean opaqueFacades; diff --git a/src/api/java/appeng/api/parts/PartItemStack.java b/src/api/java/appeng/api/parts/PartItemStack.java index 795dd491..e619c420 100644 --- a/src/api/java/appeng/api/parts/PartItemStack.java +++ b/src/api/java/appeng/api/parts/PartItemStack.java @@ -26,13 +26,13 @@ package appeng.api.parts; public enum PartItemStack { - Pick, + PICK, - Break, + BREAK, - Wrench, + WRENCH, - Network, + NETWORK, - World + WORLD } diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index cd1cd509..cd650cc8 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -40,41 +40,41 @@ import net.minecraft.util.text.translation.I18n; 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 VALID_COLORS = Arrays.asList( White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, LightGray, Cyan, Purple, Blue, Brown, Green, Red, Black ); + public static final List 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. @@ -165,7 +165,7 @@ public enum AEColor */ public boolean matches( final AEColor color ) { - return this == Transparent || color == Transparent || this == color; + return this == TRANSPARENT || color == TRANSPARENT || this == color; } @Override diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index 6273cf7e..ea2b94d8 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -66,7 +66,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit @Override public IExtendedBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos ) { - AEColor color = AEColor.Transparent; + AEColor color = AEColor.TRANSPARENT; EnumFacing forward = EnumFacing.NORTH; TileCraftingMonitorTile te = getTileEntity( world, pos ); diff --git a/src/main/java/appeng/block/misc/SecurityStationRendering.java b/src/main/java/appeng/block/misc/SecurityStationRendering.java index e54b07aa..565b4cec 100644 --- a/src/main/java/appeng/block/misc/SecurityStationRendering.java +++ b/src/main/java/appeng/block/misc/SecurityStationRendering.java @@ -20,6 +20,6 @@ public class SecurityStationRendering extends BlockRenderingCustomizer public void customize( IBlockRendering rendering, IItemRendering itemRendering ) { rendering.blockColor( ColorableTileBlockColor.INSTANCE ); - itemRendering.color( new StaticItemColor( AEColor.Transparent ) ); + itemRendering.color( new StaticItemColor( AEColor.TRANSPARENT ) ); } } diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 7c5fd2fe..1cf70b70 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -244,7 +244,7 @@ public class BlockCableBus extends AEBaseTileBlock if( sp.part != null ) { - return sp.part.getItemStack( PartItemStack.Pick ); + return sp.part.getItemStack( PartItemStack.PICK ); } else if( sp.facade != null ) { diff --git a/src/main/java/appeng/block/networking/CableBusColor.java b/src/main/java/appeng/block/networking/CableBusColor.java index 666ac185..fa1b2e63 100644 --- a/src/main/java/appeng/block/networking/CableBusColor.java +++ b/src/main/java/appeng/block/networking/CableBusColor.java @@ -24,7 +24,7 @@ public class CableBusColor implements IBlockColor public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int color ) { - AEColor busColor = AEColor.Transparent; + AEColor busColor = AEColor.TRANSPARENT; if( state instanceof IExtendedBlockState ) { diff --git a/src/main/java/appeng/block/storage/ChestRendering.java b/src/main/java/appeng/block/storage/ChestRendering.java index 0abf4376..e52fec60 100644 --- a/src/main/java/appeng/block/storage/ChestRendering.java +++ b/src/main/java/appeng/block/storage/ChestRendering.java @@ -20,7 +20,7 @@ public class ChestRendering extends BlockRenderingCustomizer public void customize( IBlockRendering rendering, IItemRendering itemRendering ) { // 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() ); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index a297eb52..5a4abe95 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -250,7 +250,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource 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 startY = ( ( y * offY + ITEMSTACK_TOP_OFFSET ) - 3 ) * 2; drawRect( startX, startY, startX + ( SECTION_LENGTH * 2 ), startY + ( offY * 2 ) - 2, bgColor ); diff --git a/src/main/java/appeng/client/render/ColorableTileBlockColor.java b/src/main/java/appeng/client/render/ColorableTileBlockColor.java index 91d6e52b..8aad8a03 100644 --- a/src/main/java/appeng/client/render/ColorableTileBlockColor.java +++ b/src/main/java/appeng/client/render/ColorableTileBlockColor.java @@ -42,7 +42,7 @@ public class ColorableTileBlockColor implements IBlockColor @Override 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 ) { diff --git a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java index 2d554aff..f12ee1af 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java @@ -25,7 +25,7 @@ public class CableBusRenderState // The type to use for rendering the core of the cable. 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 private EnumMap connectionTypes = new EnumMap<>( EnumFacing.class ); diff --git a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java index 966de895..a765da3c 100644 --- a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java @@ -96,7 +96,7 @@ class MonitorBakedModel extends CraftingCubeBakedModel } } - return AEColor.Transparent; + return AEColor.TRANSPARENT; } private static EnumFacing getForward( IBlockState state ) diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 76c7d355..483ef682 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -482,7 +482,7 @@ public final class Registration // whitelist from config for( final int dimension : AEConfig.instance.meteoriteDimensionWhitelist ) { - registries.worldgen().enableWorldGenForDimension( WorldGenType.Meteorites, dimension ); + registries.worldgen().enableWorldGenForDimension( WorldGenType.METEORITES, dimension ); } /* diff --git a/src/main/java/appeng/core/features/registries/LocatableRegistry.java b/src/main/java/appeng/core/features/registries/LocatableRegistry.java index 2375d29a..53ffac7f 100644 --- a/src/main/java/appeng/core/features/registries/LocatableRegistry.java +++ b/src/main/java/appeng/core/features/registries/LocatableRegistry.java @@ -50,11 +50,11 @@ public final class LocatableRegistry implements ILocatableRegistry return; // IGNORE! } - if( e.change == LocatableEvent.Register ) + if( e.change == LocatableEvent.REGISTER ) { 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() ); } diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 4e3976e4..aea4e781 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -104,7 +104,7 @@ public final class WorldGenRegistry implements IWorldGen return false; } - if( !isGoodDimension && type == WorldGenType.Meteorites ) + if( !isGoodDimension && type == WorldGenType.METEORITES ) { return false; } diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java index f412920a..6bb728b9 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java @@ -23,6 +23,6 @@ public class InscriberInscribeRecipe extends InscriberRecipe { public InscriberInscribeRecipe( @Nonnull final Collection 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 ); } } diff --git a/src/main/java/appeng/core/stats/Achievements.java b/src/main/java/appeng/core/stats/Achievements.java index e64e69a4..66a39aa1 100644 --- a/src/main/java/appeng/core/stats/Achievements.java +++ b/src/main/java/appeng/core/stats/Achievements.java @@ -116,7 +116,7 @@ public enum Achievements 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.x = x; this.y = y; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 2fda43a3..ba43c345 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -67,7 +67,7 @@ public class TickHandler private final HandlerRep client = new HandlerRep(); private final HashMap cliPlayerColors = new HashMap(); private final HashMap srvPlayerColors = new HashMap(); - private CableRenderMode crm = CableRenderMode.Standard; + private CableRenderMode crm = CableRenderMode.STANDARD; public HashMap getPlayerColors() { diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 6e0d5c48..4f3b946a 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -61,7 +61,7 @@ public class ItemPaintBall extends AEBaseItem if( dmg >= AEColor.values().length ) { - return AEColor.Transparent; + return AEColor.TRANSPARENT; } return AEColor.values()[dmg]; @@ -72,7 +72,7 @@ public class ItemPaintBall extends AEBaseItem { for( final AEColor c : AEColor.values() ) { - if( c != AEColor.Transparent ) + if( c != AEColor.TRANSPARENT ) { itemStacks.add( new ItemStack( this, 1, c.ordinal() ) ); } @@ -80,7 +80,7 @@ public class ItemPaintBall extends AEBaseItem for( final AEColor c : AEColor.values() ) { - if( c != AEColor.Transparent ) + if( c != AEColor.TRANSPARENT ) { itemStacks.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) ); } diff --git a/src/main/java/appeng/items/parts/ItemMultipartRendering.java b/src/main/java/appeng/items/parts/ItemMultipartRendering.java index 5eef92be..47ead652 100644 --- a/src/main/java/appeng/items/parts/ItemMultipartRendering.java +++ b/src/main/java/appeng/items/parts/ItemMultipartRendering.java @@ -42,7 +42,7 @@ public class ItemMultipartRendering extends ItemRenderingCustomizer 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 rendering.variants( Arrays.stream( PartType.values() ) diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 7c25e0e5..87f80558 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -89,7 +89,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe for( final AEColor col : AEColor.values() ) { - if( col == AEColor.Transparent ) + if( col == AEColor.TRANSPARENT ) { continue; } @@ -142,9 +142,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe // clean cables. 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() ); this.extractAEPower( is, powerPerUse ); @@ -170,7 +170,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe 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() ); this.extractAEPower( is, powerPerUse ); @@ -217,7 +217,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe if( paintBall.getItem() instanceof ItemSnowball ) { - return AEColor.Transparent; + return AEColor.TRANSPARENT; } if( paintBall.getItem() instanceof ItemPaintBall ) diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 4f89505b..6a893935 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -106,7 +106,7 @@ public class GridNode implements IGridNode, IPathItem this.connections.add( gridConnection ); if( gridConnection.hasDirection() ) { - this.gridProxy.onGridNotification( GridNotification.ConnectionsChanged ); + this.gridProxy.onGridNotification( GridNotification.CONNECTIONS_CHANGED ); } final IGridNode gn = this; @@ -119,7 +119,7 @@ public class GridNode implements IGridNode, IPathItem this.connections.remove( gridConnection ); if( gridConnection.hasDirection() ) { - this.gridProxy.onGridNotification( GridNotification.ConnectionsChanged ); + this.gridProxy.onGridNotification( GridNotification.CONNECTIONS_CHANGED ); } } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index be4f84f0..6e6ea47c 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -87,7 +87,7 @@ public class QuantumCluster implements ILocatable, IAECluster { 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 ) ) @@ -101,11 +101,11 @@ public class QuantumCluster implements ILocatable, IAECluster this.otherSide = -qe; } - MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Register ) ); + MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.REGISTER ) ); } else { - MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); + MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) ); this.otherSide = 0; this.thisSide = 0; @@ -243,7 +243,7 @@ public class QuantumCluster implements ILocatable, IAECluster if( this.thisSide != 0 ) { 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() ); diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 840ce16c..a5cab9c7 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -61,7 +61,7 @@ public class AENetworkProxy implements IGridBlock private final IGridProxyable gp; private final boolean worldNode; private final String nbtName; // name - private AEColor myColor = AEColor.Transparent; + private AEColor myColor = AEColor.TRANSPARENT; private NBTTagCompound data = null; // input private ItemStack myRepInstance; private boolean isReady = false; diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 4a5c0b58..8221995e 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -140,7 +140,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, { if( this.host == null ) { - return AEColor.Transparent; + return AEColor.TRANSPARENT; } return this.host.getColor(); } @@ -212,7 +212,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, @Override public ItemStack getItemStack( final PartItemStack type ) { - if( type == PartItemStack.Network ) + if( type == PartItemStack.NETWORK ) { final ItemStack copy = this.is.copy(); copy.setTagCompound( null ); @@ -437,7 +437,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, { 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! final IDefinitions definitions = AEApi.instance().definitions(); diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index f28c3c7b..146cd99b 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -388,7 +388,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPartCable c = this.getCenter(); return c.getCableColor(); } - return AEColor.Transparent; + return AEColor.TRANSPARENT; } @Override @@ -928,7 +928,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPart p = this.getPart( AEPartLocation.fromOrdinal( x ) ); 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( is.getItemDamage() ); @@ -958,7 +958,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I 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( p.readFromStream( data ) ) @@ -1008,7 +1008,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I if( part != null ) { final NBTTagCompound def = new NBTTagCompound(); - part.getItemStack( PartItemStack.World ).writeToNBT( def ); + part.getItemStack( PartItemStack.WORLD ).writeToNBT( def ); final NBTTagCompound extra = new NBTTagCompound(); part.writeToNBT( extra ); @@ -1061,7 +1061,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I 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 ) ) { @@ -1098,7 +1098,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPart part = this.getPart( s ); if( part != null ) { - drops.add( part.getItemStack( PartItemStack.Break ) ); + drops.add( part.getItemStack( PartItemStack.BREAK ) ); part.getDrops( drops, false ); } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 27ef1fe7..4660da5e 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -113,7 +113,7 @@ public class PartPlacement if( sp.part != null ) { - is.add( sp.part.getItemStack( PartItemStack.Wrench ) ); + is.add( sp.part.getItemStack( PartItemStack.WRENCH ) ); sp.part.getDrops( is, true ); host.removePart( sp.side, false ); } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 027f33a8..b1c0a043 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -115,7 +115,7 @@ public abstract class PartP2PTunnel extends PartBasicSt @Override 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 ); } @@ -339,7 +339,7 @@ public abstract class PartP2PTunnel extends PartBasicSt this.onTunnelConfigChange(); - final ItemStack p2pItem = this.getItemStack( PartItemStack.Wrench ); + final ItemStack p2pItem = this.getItemStack( PartItemStack.WRENCH ); final String type = p2pItem.getUnlocalizedName(); p2pItem.writeToNBT( data ); diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 48cefcef..d94514cf 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -156,10 +156,10 @@ public class AEItemResolver implements ISubItemResolver } catch( final Throwable t ) { - col = AEColor.Transparent; + col = AEColor.TRANSPARENT; } - if( col == AEColor.Transparent ) + if( col == AEColor.TRANSPARENT ) { return null; } @@ -178,7 +178,7 @@ public class AEItemResolver implements ISubItemResolver } catch( final Throwable t ) { - col = AEColor.Transparent; + col = AEColor.TRANSPARENT; } final ItemStack is = partType.stack( col, 1 ); diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index a1c0d2a5..d582719d 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -61,7 +61,7 @@ public final class Inscribe extends InscriberProcess final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack(); final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().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 ); diff --git a/src/main/java/appeng/recipes/handlers/Press.java b/src/main/java/appeng/recipes/handlers/Press.java index f55806ef..598eed2e 100644 --- a/src/main/java/appeng/recipes/handlers/Press.java +++ b/src/main/java/appeng/recipes/handlers/Press.java @@ -61,7 +61,7 @@ public final class Press extends InscriberProcess final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack(); final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().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 ); diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index 3a1f1851..9238a387 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -144,7 +144,7 @@ public class ServerHelper extends CommonHelper { if( this.renderModeBased == null ) { - return CableRenderMode.Standard; + return CableRenderMode.STANDARD; } return this.renderModeForPlayer( this.renderModeBased ); @@ -181,12 +181,12 @@ public class ServerHelper extends CommonHelper final NBTTagCompound c = is.getTagCompound(); if( c != null && c.getBoolean( "hideFacades" ) ) { - return CableRenderMode.CableView; + return CableRenderMode.CABLE_VIEW; } } } } - return CableRenderMode.Standard; + return CableRenderMode.STANDARD; } } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java index a2915c4b..05fe9aaa 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java @@ -47,7 +47,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora private boolean updateList; private IAEItemStack dspPlay; - private AEColor paintedColor = AEColor.Transparent; + private AEColor paintedColor = AEColor.TRANSPARENT; @TileEvent( TileEventType.NETWORK_READ ) public boolean readFromStream_TileCraftingMonitorTile( final ByteBuf data ) throws IOException diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index 5bfee74d..46ebb37b 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -390,7 +390,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, } final List inputs = Lists.newArrayList( startingItem ); - final InscriberProcessType type = InscriberProcessType.Inscribe; + final InscriberProcessType type = InscriberProcessType.INSCRIBE; return new InscriberRecipe( inputs, renamedItem, plateA, plateB, type ); } @@ -436,7 +436,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, if( ad.addItems( outputCopy ) == null ) { this.setProcessingTime( 0 ); - if( out.getProcessType() == InscriberProcessType.Press ) + if( out.getProcessType() == InscriberProcessType.PRESS ) { this.setInventorySlotContents( 0, null ); this.setInventorySlotContents( 1, null ); diff --git a/src/main/java/appeng/tile/misc/TileSecurityStation.java b/src/main/java/appeng/tile/misc/TileSecurityStation.java index ff08dd18..37175d71 100644 --- a/src/main/java/appeng/tile/misc/TileSecurityStation.java +++ b/src/main/java/appeng/tile/misc/TileSecurityStation.java @@ -89,7 +89,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, private final SecurityStationInventory inventory = new SecurityStationInventory( this ); private final MEMonitorHandler securityMonitor = new MEMonitorHandler( this.inventory ); private long securityKey; - private AEColor paintedColor = AEColor.Transparent; + private AEColor paintedColor = AEColor.TRANSPARENT; private boolean isActive = false; public TileSecurityStation() @@ -234,7 +234,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, public void onChunkUnload() { super.onChunkUnload(); - MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); + MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) ); this.isActive = false; } @@ -245,7 +245,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, if( Platform.isServer() ) { 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() { super.invalidate(); - MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); + MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) ); this.isActive = false; } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 65ff6a11..dca430ca 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -108,7 +108,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan private int priority = 0; private int state = 0; private boolean wasActive = false; - private AEColor paintedColor = AEColor.Transparent; + private AEColor paintedColor = AEColor.TRANSPARENT; private boolean isCached = false; private ICellHandler cellHandler; private MEMonitorHandler itemCell; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index caa2f124..453c354d 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -2104,22 +2104,22 @@ public class Platform for( final ItemStack stack : is ) { - if( parts.cableGlass().sameAs( AEColor.Transparent, stack ) ) + if( parts.cableGlass().sameAs( AEColor.TRANSPARENT, stack ) ) { return stack; } - if( parts.cableCovered().sameAs( AEColor.Transparent, stack ) ) + if( parts.cableCovered().sameAs( AEColor.TRANSPARENT, stack ) ) { return stack; } - if( parts.cableSmart().sameAs( AEColor.Transparent, stack ) ) + if( parts.cableSmart().sameAs( AEColor.TRANSPARENT, stack ) ) { return stack; } - if( parts.cableDense().sameAs( AEColor.Transparent, stack ) ) + if( parts.cableDense().sameAs( AEColor.TRANSPARENT, stack ) ) { return stack; } diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java index c5d2d61d..89dc8759 100644 --- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java +++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java @@ -42,7 +42,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator @Override 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? if( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance ) diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 2da7395f..575ecc5a 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -80,7 +80,7 @@ public final class QuartzWorldGen implements IWorldGenerator final boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance; 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 cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64;