diff --git a/src/api/java/appeng/api/AEApi.java b/src/api/java/appeng/api/AEApi.java index f318fa0a2..89ab041c4 100644 --- a/src/api/java/appeng/api/AEApi.java +++ b/src/api/java/appeng/api/AEApi.java @@ -38,7 +38,7 @@ public class AEApi /** * API Entry Point. * - * @return the {@link IAppEngApi} or null if the instance could not be retrieved + * @return the {@link IAppEngApi} or null if the INSTANCE could not be retrieved */ public static IAppEngApi instance() { @@ -47,7 +47,7 @@ public class AEApi try { Class c = Class.forName( "appeng.core.Api" ); - api = (IAppEngApi) c.getField( "instance" ).get( c ); + api = (IAppEngApi) c.getField( "INSTANCE" ).get( c ); } catch (Throwable e) { diff --git a/src/api/java/appeng/api/networking/IGridCacheRegistry.java b/src/api/java/appeng/api/networking/IGridCacheRegistry.java index 8f30f55aa..9f7b9c1f6 100644 --- a/src/api/java/appeng/api/networking/IGridCacheRegistry.java +++ b/src/api/java/appeng/api/networking/IGridCacheRegistry.java @@ -39,7 +39,7 @@ public interface IGridCacheRegistry void registerGridCache(Class iface, Class implementation); /** - * requests a new instance of a grid cache for use, used internally + * requests a new INSTANCE of a grid cache for use, used internally * * @param grid grid * diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java index 65d10a98b..08381c049 100644 --- a/src/api/java/appeng/api/networking/IGridHost.java +++ b/src/api/java/appeng/api/networking/IGridHost.java @@ -46,7 +46,7 @@ public interface IGridHost * feel free to ignore this, most blocks will use the same node * for every side. * @return a new IGridNode, create these with - * AEApi.instance().createGridNode( MyIGridBlock ) + * AEApi.INSTANCE().createGridNode( MyIGridBlock ) */ public IGridNode getGridNode(ForgeDirection dir); diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java index 4111537be..8b7bfa2e0 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java @@ -32,7 +32,7 @@ import appeng.api.storage.data.IAEItemStack; /** * do not implement provided by {@link ICraftingPatternItem} * - * caching this instance will increase performance of validation and checks. + * caching this INSTANCE will increase performance of validation and checks. */ public interface ICraftingPatternDetails { @@ -82,7 +82,7 @@ public interface ICraftingPatternDetails boolean canSubstitute(); /** - * 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 world crafting world diff --git a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java index fd062e96a..dbffb5343 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java @@ -34,7 +34,7 @@ public class MENetworkSpatialEvent extends MENetworkEvent public final double spatialEnergyUsage; /** - * @param SpatialIO ( instance of the SpatialIO block ) + * @param SpatialIO ( INSTANCE of the SpatialIO block ) * @param EnergyUsage ( the amount of energy that the SpatialIO uses) */ public MENetworkSpatialEvent(IGridHost SpatialIO, double EnergyUsage) diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index 8179b5769..1dce8c02a 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -83,7 +83,7 @@ public interface IPartHost * * @param side side of part * @param suppressUpdate - * - used if you need to replace a part's instance, without really removing it first. + * - used if you need to replace a part's INSTANCE, without really removing it first. */ void removePart(ForgeDirection side, boolean suppressUpdate); diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java index b9548ec07..5829ed84c 100644 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ b/src/api/java/appeng/api/parts/IPartItem.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; /** * This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack * - * you must register your bus with the Bus renderer, using AEApi.instance().partHelper().setItemBusRenderer( this ); + * you must register your bus with the Bus renderer, using AEApi.INSTANCE().partHelper().setItemBusRenderer( this ); * * then simply add these two methods, which tell MC to use the Block Textures, and call AE's Bus Placement Code. * @@ -45,7 +45,7 @@ import net.minecraft.item.ItemStack; * {@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) * { - * return AEApi.instance().partHelper().placeBus( is, x, y, z, side, player, world ); + * return AEApi.INSTANCE().partHelper().placeBus( is, x, y, z, side, player, world ); * } * * @@ -55,7 +55,7 @@ public interface IPartItem { /** - * create a new part instance, from the item stack. + * create a new part INSTANCE, from the item stack. * * @param is item * @return part from item diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java index e5ebb3315..527dec0cb 100644 --- a/src/api/java/appeng/api/storage/IStorageHelper.java +++ b/src/api/java/appeng/api/storage/IStorageHelper.java @@ -52,7 +52,7 @@ public interface IStorageHelper * @param is * An ItemStack * - * @return a new instance of {@link IAEItemStack} from a MC {@link ItemStack} + * @return a new INSTANCE of {@link IAEItemStack} from a MC {@link ItemStack} */ IAEItemStack createItemStack(ItemStack is); @@ -60,17 +60,17 @@ public interface IStorageHelper * @param is * A FluidStack * - * @return a new instance of {@link IAEFluidStack} from a Forge {@link FluidStack} + * @return a new INSTANCE of {@link IAEFluidStack} from a Forge {@link FluidStack} */ IAEFluidStack createFluidStack(FluidStack is); /** - * @return a new instance of {@link IItemList} for items + * @return a new INSTANCE of {@link IItemList} for items */ IItemList createItemList(); /** - * @return a new instance of {@link IItemList} for fluids + * @return a new INSTANCE of {@link IItemList} for fluids */ IItemList createFluidList(); diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index a61a929a7..dfa6f35c1 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -113,7 +113,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature { super( mat ); - if ( mat == AEGlassMaterial.instance || mat == Material.glass ) + if ( mat == AEGlassMaterial.INSTANCE || mat == Material.glass ) this.setStepSound( Block.soundTypeGlass ); else if ( mat == Material.rock ) this.setStepSound( Block.soundTypeStone ); @@ -190,7 +190,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature @SideOnly( Side.CLIENT ) public int getRenderType() { - return WorldRender.instance.getRenderId(); + return WorldRender.INSTANCE.getRenderId(); } @Override diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java index 030fe2c3b..435f8b49c 100644 --- a/src/main/java/appeng/block/AEBaseItemBlock.java +++ b/src/main/java/appeng/block/AEBaseItemBlock.java @@ -54,7 +54,7 @@ public class AEBaseItemBlock extends ItemBlock this.hasSubtypes = this.blockType.hasSubtypes; if ( Platform.isClient() ) - MinecraftForgeClient.registerItemRenderer( this, ItemRenderer.instance ); + MinecraftForgeClient.registerItemRenderer( this, ItemRenderer.INSTANCE ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockPaint.java b/src/main/java/appeng/block/misc/BlockPaint.java index 6930d446a..09fe7003e 100644 --- a/src/main/java/appeng/block/misc/BlockPaint.java +++ b/src/main/java/appeng/block/misc/BlockPaint.java @@ -84,7 +84,7 @@ public class BlockPaint extends AEBaseBlock public void fillWithRain(World w, int x, int y, int z) { if ( Platform.isServer() ) - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); } @Override diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 763ff5d42..abc9ad7cf 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -78,7 +78,7 @@ import appeng.util.Platform; public class BlockCableBus extends AEBaseBlock implements IRedNetConnection { - static private final ICableBusContainer nullCB = new NullCableBusContainer(); + private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); static public Class noTesrTile; static public Class tesrTile; @@ -97,7 +97,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection } public BlockCableBus() { - super( BlockCableBus.class, AEGlassMaterial.instance ); + super( BlockCableBus.class, AEGlassMaterial.INSTANCE ); this.setFeature( EnumSet.of( AEFeature.Core ) ); this.setLightOpacity( 0 ); this.isFullSize = this.isOpaque = false; @@ -227,7 +227,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection @Override public boolean canRenderInPass(int pass) { - BusRenderHelper.instance.setPass( pass ); + BusRenderHelper.INSTANCE.setPass( pass ); if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) return true; @@ -424,10 +424,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection public void setupTile() { - this.setTileEntity( noTesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBus.class.getName() ) ); + this.setTileEntity( noTesrTile = Api.INSTANCE.partHelper.getCombinedInstance( TileCableBus.class.getName() ) ); 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" ); CommonHelper.proxy.bindTileEntitySpecialRenderer( tesrTile, this ); } @@ -444,7 +444,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection else if ( AppEng.instance.isIntegrationEnabled( IntegrationType.FMP ) ) out = ((IFMP) AppEng.instance.getIntegration( IntegrationType.FMP )).getCableContainer( te ); - return out == null ? nullCB : out; + return out == null ? NULL_CABLE_BUS : out; } /** diff --git a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java b/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java index 3441c13a9..4679f4a7f 100644 --- a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java @@ -29,7 +29,7 @@ public class BlockCreativeEnergyCell extends AEBaseBlock { public BlockCreativeEnergyCell() { - super( BlockCreativeEnergyCell.class, AEGlassMaterial.instance ); + super( BlockCreativeEnergyCell.class, AEGlassMaterial.INSTANCE ); this.setFeature( EnumSet.of( AEFeature.Creative ) ); this.setTileEntity( TileCreativeEnergyCell.class ); } diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index d6a1ee121..2d3d5d291 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -50,7 +50,7 @@ public class BlockEnergyCell extends AEBaseBlock } public BlockEnergyCell(Class c) { - super( c, AEGlassMaterial.instance ); + super( c, AEGlassMaterial.INSTANCE ); } public BlockEnergyCell() { diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index cc8853464..89ff1db75 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -43,7 +43,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision { public BlockWireless() { - super( BlockWireless.class, AEGlassMaterial.instance ); + super( BlockWireless.class, AEGlassMaterial.INSTANCE ); this.setFeature( EnumSet.of( AEFeature.Core, AEFeature.WirelessAccessTerminal ) ); this.setTileEntity( TileWireless.class ); this.setLightOpacity( 0 ); diff --git a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java index 53e0397d3..079c07fba 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java @@ -50,7 +50,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli { public BlockQuantumLinkChamber() { - super( BlockQuantumLinkChamber.class, AEGlassMaterial.instance ); + super( BlockQuantumLinkChamber.class, AEGlassMaterial.INSTANCE ); this.setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) ); this.setTileEntity( TileQuantumBridge.class ); float shave = 2.0f / 16.0f; diff --git a/src/main/java/appeng/block/solids/BlockQuartzGlass.java b/src/main/java/appeng/block/solids/BlockQuartzGlass.java index 5950bdbc1..c0d23f0ef 100644 --- a/src/main/java/appeng/block/solids/BlockQuartzGlass.java +++ b/src/main/java/appeng/block/solids/BlockQuartzGlass.java @@ -50,7 +50,7 @@ public class BlockQuartzGlass extends AEBaseBlock public boolean shouldSideBeRendered(IBlockAccess w, int x, int y, int z, int side) { Material mat = w.getBlock( x, y, z ).getMaterial(); - if ( mat == Material.glass || mat == AEGlassMaterial.instance ) + if ( mat == Material.glass || mat == AEGlassMaterial.INSTANCE ) { if ( w.getBlock( x, y, z ).getRenderType() == this.getRenderType() ) return false; diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java index f9e7b183c..28876e408 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java @@ -35,7 +35,7 @@ public class BlockSpatialPylon extends AEBaseBlock { public BlockSpatialPylon() { - super( BlockSpatialPylon.class, AEGlassMaterial.instance ); + super( BlockSpatialPylon.class, AEGlassMaterial.INSTANCE ); this.setFeature( EnumSet.of( AEFeature.SpatialIO ) ); this.setTileEntity( TileSpatialPylon.class ); } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index f2fd0eae6..e179acbd9 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -89,8 +89,8 @@ import appeng.util.Platform; public class ClientHelper extends ServerHelper { - private static final RenderItem itemRenderer = new RenderItem(); - private static final RenderBlocks blockRenderer = new RenderBlocks(); + private static final RenderItem ITEM_RENDERER = new RenderItem(); + private static final RenderBlocks BLOCK_RENDERER = new RenderBlocks(); @Override public CableRenderMode getRenderMode() @@ -128,7 +128,7 @@ public class ClientHelper extends ServerHelper @SubscribeEvent public void postPlayerRender(RenderLivingEvent.Pre p) { - PlayerColor player = TickHandler.instance.getPlayerColors().get( p.entity.getEntityId() ); + PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.entity.getEntityId() ); if ( player != null ) { AEColor col = player.myColor; @@ -210,9 +210,9 @@ public class ClientHelper extends ServerHelper RenderItem.renderInFrame = false; FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - if ( !ForgeHooksClient.renderInventoryItem( blockRenderer, Minecraft.getMinecraft().renderEngine, itemstack, true, 0, 0, 0 ) ) + if ( !ForgeHooksClient.renderInventoryItem( BLOCK_RENDERER, Minecraft.getMinecraft().renderEngine, itemstack, true, 0, 0, 0 ) ) { - itemRenderer.renderItemIntoGUI( fr, Minecraft.getMinecraft().renderEngine, itemstack, 0, 0, false ); + ITEM_RENDERER.renderItemIntoGUI( fr, Minecraft.getMinecraft().renderEngine, itemstack, 0, 0, false ); } } @@ -229,7 +229,7 @@ public class ClientHelper extends ServerHelper @Override public void postInit() { - RenderingRegistry.registerBlockHandler( WorldRender.instance ); + RenderingRegistry.registerBlockHandler( WorldRender.INSTANCE ); RenderManager.instance.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed() ); RenderManager.instance.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem() ); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index ef0c5cc21..38a40d943 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -257,7 +257,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.craftingStatusBtn.hideEdge = 13; } - // Enum setting = AEConfig.instance.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH ); + // Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH ); Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ); this.searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting ); diff --git a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java b/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java index de3442af6..d765a015f 100644 --- a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java +++ b/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java @@ -32,7 +32,7 @@ import net.minecraft.client.gui.GuiTextField; */ public class MEGuiTextField extends GuiTextField { - private static final int padding = 2; + private static final int PADDING = 2; private final int _xPos; private final int _yPos; @@ -51,7 +51,7 @@ public class MEGuiTextField extends GuiTextField */ public MEGuiTextField( FontRenderer fontRenderer, int xPos, int yPos, int width, int height ) { - super( fontRenderer, xPos + padding, yPos + padding, width - 2 * padding - fontRenderer.getCharWidth( '_' ), height - 2 * padding ); + super( fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - fontRenderer.getCharWidth( '_' ), height - 2 * PADDING ); this._xPos = xPos; this._yPos = yPos; diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index b87a8be89..10067a911 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -149,7 +149,7 @@ public class ItemRepo this.innerSearch = this.searchString; boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO; - // boolean terminalSearchMods = Configuration.instance.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO; + // boolean terminalSearchMods = Configuration.INSTANCE.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO; boolean searchMod = false; if ( this.innerSearch.startsWith( "@" ) ) @@ -229,13 +229,13 @@ public class ItemRepo ItemSorters.init(); if ( SortBy == SortOrder.MOD ) - Collections.sort( this.view, ItemSorters.ConfigBased_SortByMod ); + Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_MOD ); else if ( SortBy == SortOrder.AMOUNT ) - Collections.sort( this.view, ItemSorters.ConfigBased_SortBySize ); + Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_SIZE ); else if ( SortBy == SortOrder.INVTWEAKS ) - Collections.sort( this.view, ItemSorters.ConfigBased_SortByInvTweaks ); + Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS ); else - Collections.sort( this.view, ItemSorters.ConfigBased_SortByName ); + Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_NAME ); for (IAEItemStack is : this.view) this.dsp.add( is.getItemStack() ); diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 5c7f844fc..1150b143a 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -61,7 +61,7 @@ public class BaseBlockRender final double MAX_DISTANCE; final public boolean hasTESR; - final static private byte[][][] OrientationMap = new byte[6][6][6]; + private static final byte[][][] ORIENTATION_MAP = new byte[6][6][6]; protected int adjustBrightness(int v, double d) { @@ -91,184 +91,184 @@ public class BaseBlockRender int b = forward.ordinal(); int c = up.ordinal(); - return OrientationMap[a][b][c]; + return ORIENTATION_MAP[a][b][c]; } static public void setOriMap() { // pointed up... - OrientationMap[0][3][1] = 0; - OrientationMap[1][3][1] = 0; - OrientationMap[2][3][1] = 0; - OrientationMap[3][3][1] = 0; - OrientationMap[4][3][1] = 0; - OrientationMap[5][3][1] = 0; + ORIENTATION_MAP[0][3][1] = 0; + ORIENTATION_MAP[1][3][1] = 0; + ORIENTATION_MAP[2][3][1] = 0; + ORIENTATION_MAP[3][3][1] = 0; + ORIENTATION_MAP[4][3][1] = 0; + ORIENTATION_MAP[5][3][1] = 0; - OrientationMap[0][5][1] = 1; - OrientationMap[1][5][1] = 2; - OrientationMap[2][5][1] = 0; - OrientationMap[3][5][1] = 0; - OrientationMap[4][5][1] = 0; - OrientationMap[5][5][1] = 0; + ORIENTATION_MAP[0][5][1] = 1; + ORIENTATION_MAP[1][5][1] = 2; + ORIENTATION_MAP[2][5][1] = 0; + ORIENTATION_MAP[3][5][1] = 0; + ORIENTATION_MAP[4][5][1] = 0; + ORIENTATION_MAP[5][5][1] = 0; - OrientationMap[0][2][1] = 3; - OrientationMap[1][2][1] = 3; - OrientationMap[2][2][1] = 0; - OrientationMap[3][2][1] = 0; - OrientationMap[4][2][1] = 0; - OrientationMap[5][2][1] = 0; + ORIENTATION_MAP[0][2][1] = 3; + ORIENTATION_MAP[1][2][1] = 3; + ORIENTATION_MAP[2][2][1] = 0; + ORIENTATION_MAP[3][2][1] = 0; + ORIENTATION_MAP[4][2][1] = 0; + ORIENTATION_MAP[5][2][1] = 0; - OrientationMap[0][4][1] = 2; - OrientationMap[1][4][1] = 1; - OrientationMap[2][4][1] = 0; - OrientationMap[3][4][1] = 0; - OrientationMap[4][4][1] = 0; - OrientationMap[5][4][1] = 0; + ORIENTATION_MAP[0][4][1] = 2; + ORIENTATION_MAP[1][4][1] = 1; + ORIENTATION_MAP[2][4][1] = 0; + ORIENTATION_MAP[3][4][1] = 0; + ORIENTATION_MAP[4][4][1] = 0; + ORIENTATION_MAP[5][4][1] = 0; // upside down - OrientationMap[0][3][0] = FLIP_H_BIT; - OrientationMap[1][3][0] = FLIP_H_BIT; - OrientationMap[2][3][0] = 3; - OrientationMap[3][3][0] = 3; - OrientationMap[4][3][0] = 3; - OrientationMap[5][3][0] = 3; + ORIENTATION_MAP[0][3][0] = FLIP_H_BIT; + ORIENTATION_MAP[1][3][0] = FLIP_H_BIT; + ORIENTATION_MAP[2][3][0] = 3; + ORIENTATION_MAP[3][3][0] = 3; + ORIENTATION_MAP[4][3][0] = 3; + ORIENTATION_MAP[5][3][0] = 3; - OrientationMap[0][4][0] = 2 | FLIP_H_BIT; - OrientationMap[1][4][0] = 1 | FLIP_H_BIT; - OrientationMap[2][4][0] = 3; - OrientationMap[3][4][0] = 3; - OrientationMap[4][4][0] = 3; - OrientationMap[5][4][0] = 3; + ORIENTATION_MAP[0][4][0] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[1][4][0] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[2][4][0] = 3; + ORIENTATION_MAP[3][4][0] = 3; + ORIENTATION_MAP[4][4][0] = 3; + ORIENTATION_MAP[5][4][0] = 3; - OrientationMap[0][5][0] = 1 | FLIP_H_BIT; - OrientationMap[1][5][0] = 2 | FLIP_H_BIT; - OrientationMap[2][5][0] = 3; - OrientationMap[3][5][0] = 3; - OrientationMap[4][5][0] = 3; - OrientationMap[5][5][0] = 3; + ORIENTATION_MAP[0][5][0] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[1][5][0] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[2][5][0] = 3; + ORIENTATION_MAP[3][5][0] = 3; + ORIENTATION_MAP[4][5][0] = 3; + ORIENTATION_MAP[5][5][0] = 3; - OrientationMap[0][2][0] = 3 | FLIP_H_BIT; - OrientationMap[1][2][0] = 3 | FLIP_H_BIT; - OrientationMap[2][2][0] = 3; - OrientationMap[3][2][0] = 3; - OrientationMap[4][2][0] = 3; - OrientationMap[5][2][0] = 3; + ORIENTATION_MAP[0][2][0] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[1][2][0] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[2][2][0] = 3; + ORIENTATION_MAP[3][2][0] = 3; + ORIENTATION_MAP[4][2][0] = 3; + ORIENTATION_MAP[5][2][0] = 3; // side 1 - OrientationMap[0][3][5] = 1 | FLIP_V_BIT; - OrientationMap[1][3][5] = 1 | FLIP_H_BIT; - OrientationMap[2][3][5] = 1; - OrientationMap[3][3][5] = 1; - OrientationMap[4][3][5] = 1; - OrientationMap[5][3][5] = 1 | FLIP_V_BIT; + ORIENTATION_MAP[0][3][5] = 1 | FLIP_V_BIT; + ORIENTATION_MAP[1][3][5] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[2][3][5] = 1; + ORIENTATION_MAP[3][3][5] = 1; + ORIENTATION_MAP[4][3][5] = 1; + ORIENTATION_MAP[5][3][5] = 1 | FLIP_V_BIT; - OrientationMap[0][1][5] = 1 | FLIP_H_BIT; - OrientationMap[1][1][5] = 1; - OrientationMap[2][1][5] = 3 | FLIP_V_BIT; - OrientationMap[3][1][5] = 3; - OrientationMap[4][1][5] = 1 | FLIP_V_BIT; - OrientationMap[5][1][5] = 1; + ORIENTATION_MAP[0][1][5] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[1][1][5] = 1; + ORIENTATION_MAP[2][1][5] = 3 | FLIP_V_BIT; + ORIENTATION_MAP[3][1][5] = 3; + ORIENTATION_MAP[4][1][5] = 1 | FLIP_V_BIT; + ORIENTATION_MAP[5][1][5] = 1; - OrientationMap[0][2][5] = 1 | FLIP_H_BIT; - OrientationMap[1][2][5] = 1 | FLIP_H_BIT; - OrientationMap[2][2][5] = 1; - OrientationMap[3][2][5] = 2 | FLIP_V_BIT; - OrientationMap[4][2][5] = 1 | FLIP_V_BIT; - OrientationMap[5][2][5] = 1; + ORIENTATION_MAP[0][2][5] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[1][2][5] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[2][2][5] = 1; + ORIENTATION_MAP[3][2][5] = 2 | FLIP_V_BIT; + ORIENTATION_MAP[4][2][5] = 1 | FLIP_V_BIT; + ORIENTATION_MAP[5][2][5] = 1; - OrientationMap[0][0][5] = 1 | FLIP_H_BIT; - OrientationMap[1][0][5] = 1; - OrientationMap[2][0][5] = 0; - OrientationMap[3][0][5] = FLIP_V_BIT; - OrientationMap[4][0][5] = 1; - OrientationMap[5][0][5] = 1 | FLIP_V_BIT; + ORIENTATION_MAP[0][0][5] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[1][0][5] = 1; + ORIENTATION_MAP[2][0][5] = 0; + ORIENTATION_MAP[3][0][5] = FLIP_V_BIT; + ORIENTATION_MAP[4][0][5] = 1; + ORIENTATION_MAP[5][0][5] = 1 | FLIP_V_BIT; // side 2 - OrientationMap[0][1][2] = FLIP_H_BIT; - OrientationMap[1][1][2] = 0; - OrientationMap[2][1][2] = 2 | FLIP_H_BIT; - OrientationMap[3][1][2] = 1; - OrientationMap[4][1][2] = 3; - OrientationMap[5][1][2] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[0][1][2] = FLIP_H_BIT; + ORIENTATION_MAP[1][1][2] = 0; + ORIENTATION_MAP[2][1][2] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[3][1][2] = 1; + ORIENTATION_MAP[4][1][2] = 3; + ORIENTATION_MAP[5][1][2] = 3 | FLIP_H_BIT; - OrientationMap[0][4][2] = FLIP_H_BIT; - OrientationMap[1][4][2] = FLIP_H_BIT; - OrientationMap[2][4][2] = 2 | FLIP_H_BIT; - OrientationMap[3][4][2] = 1; - OrientationMap[4][4][2] = 1 | FLIP_H_BIT; - OrientationMap[5][4][2] = 2; + ORIENTATION_MAP[0][4][2] = FLIP_H_BIT; + ORIENTATION_MAP[1][4][2] = FLIP_H_BIT; + ORIENTATION_MAP[2][4][2] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[3][4][2] = 1; + ORIENTATION_MAP[4][4][2] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[5][4][2] = 2; - OrientationMap[0][0][2] = FLIP_V_BIT; - OrientationMap[1][0][2] = 0; - OrientationMap[2][0][2] = 2; - OrientationMap[3][0][2] = 1 | FLIP_H_BIT; - OrientationMap[4][0][2] = 3 | FLIP_H_BIT; - OrientationMap[5][0][2] = 0; + ORIENTATION_MAP[0][0][2] = FLIP_V_BIT; + ORIENTATION_MAP[1][0][2] = 0; + ORIENTATION_MAP[2][0][2] = 2; + ORIENTATION_MAP[3][0][2] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[4][0][2] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[5][0][2] = 0; - OrientationMap[0][5][2] = FLIP_H_BIT; - OrientationMap[1][5][2] = FLIP_H_BIT; - OrientationMap[2][5][2] = 2; - OrientationMap[3][5][2] = 1 | FLIP_H_BIT; - OrientationMap[4][5][2] = 2; - OrientationMap[5][5][2] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[0][5][2] = FLIP_H_BIT; + ORIENTATION_MAP[1][5][2] = FLIP_H_BIT; + ORIENTATION_MAP[2][5][2] = 2; + ORIENTATION_MAP[3][5][2] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[4][5][2] = 2; + ORIENTATION_MAP[5][5][2] = 1 | FLIP_H_BIT; // side 3 - OrientationMap[0][0][3] = 3 | FLIP_H_BIT; - OrientationMap[1][0][3] = 3; - OrientationMap[2][0][3] = 1; - OrientationMap[3][0][3] = 2 | FLIP_H_BIT; - OrientationMap[4][0][3] = 0; - OrientationMap[5][0][3] = FLIP_H_BIT; + ORIENTATION_MAP[0][0][3] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[1][0][3] = 3; + ORIENTATION_MAP[2][0][3] = 1; + ORIENTATION_MAP[3][0][3] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[4][0][3] = 0; + ORIENTATION_MAP[5][0][3] = FLIP_H_BIT; - OrientationMap[0][4][3] = 3; - OrientationMap[1][4][3] = 3; - OrientationMap[2][4][3] = 1 | FLIP_H_BIT; - OrientationMap[3][4][3] = 2; - OrientationMap[4][4][3] = 1; - OrientationMap[5][4][3] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[0][4][3] = 3; + ORIENTATION_MAP[1][4][3] = 3; + ORIENTATION_MAP[2][4][3] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[3][4][3] = 2; + ORIENTATION_MAP[4][4][3] = 1; + ORIENTATION_MAP[5][4][3] = 2 | FLIP_H_BIT; - OrientationMap[0][1][3] = 3 | FLIP_V_BIT; - OrientationMap[1][1][3] = 3; - OrientationMap[2][1][3] = 1 | FLIP_H_BIT; - OrientationMap[3][1][3] = 2; - OrientationMap[4][1][3] = 3 | FLIP_H_BIT; - OrientationMap[5][1][3] = 0; + ORIENTATION_MAP[0][1][3] = 3 | FLIP_V_BIT; + ORIENTATION_MAP[1][1][3] = 3; + ORIENTATION_MAP[2][1][3] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[3][1][3] = 2; + ORIENTATION_MAP[4][1][3] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[5][1][3] = 0; - OrientationMap[0][5][3] = 3; - OrientationMap[1][5][3] = 3; - OrientationMap[2][5][3] = 1; - OrientationMap[3][5][3] = 2 | FLIP_H_BIT; - OrientationMap[4][5][3] = 2 | FLIP_H_BIT; - OrientationMap[5][5][3] = 1; + ORIENTATION_MAP[0][5][3] = 3; + ORIENTATION_MAP[1][5][3] = 3; + ORIENTATION_MAP[2][5][3] = 1; + ORIENTATION_MAP[3][5][3] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[4][5][3] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[5][5][3] = 1; // side 4 - OrientationMap[0][3][4] = 1; - OrientationMap[1][3][4] = 2; - OrientationMap[2][3][4] = 2 | FLIP_H_BIT; - OrientationMap[3][3][4] = 1; - OrientationMap[4][3][4] = 2 | FLIP_H_BIT; - OrientationMap[5][3][4] = 1; + ORIENTATION_MAP[0][3][4] = 1; + ORIENTATION_MAP[1][3][4] = 2; + ORIENTATION_MAP[2][3][4] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[3][3][4] = 1; + ORIENTATION_MAP[4][3][4] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[5][3][4] = 1; - OrientationMap[0][0][4] = 1 | FLIP_H_BIT; - OrientationMap[1][0][4] = 2; - OrientationMap[2][0][4] = 0; - OrientationMap[3][0][4] = FLIP_H_BIT; - OrientationMap[4][0][4] = 2 | FLIP_H_BIT; - OrientationMap[5][0][4] = 1; + ORIENTATION_MAP[0][0][4] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[1][0][4] = 2; + ORIENTATION_MAP[2][0][4] = 0; + ORIENTATION_MAP[3][0][4] = FLIP_H_BIT; + ORIENTATION_MAP[4][0][4] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[5][0][4] = 1; - OrientationMap[0][1][4] = 1 | FLIP_H_BIT; - OrientationMap[1][1][4] = 2; - OrientationMap[2][1][4] = 3 | FLIP_H_BIT; - OrientationMap[3][1][4] = 3; - OrientationMap[4][1][4] = 2; - OrientationMap[5][1][4] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[0][1][4] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[1][1][4] = 2; + ORIENTATION_MAP[2][1][4] = 3 | FLIP_H_BIT; + ORIENTATION_MAP[3][1][4] = 3; + ORIENTATION_MAP[4][1][4] = 2; + ORIENTATION_MAP[5][1][4] = 1 | FLIP_H_BIT; - OrientationMap[0][2][4] = 1; - OrientationMap[1][2][4] = 2; - OrientationMap[2][2][4] = 1; - OrientationMap[3][2][4] = 2 | FLIP_H_BIT; - OrientationMap[4][2][4] = 2; - OrientationMap[5][2][4] = 1 | FLIP_H_BIT; + ORIENTATION_MAP[0][2][4] = 1; + ORIENTATION_MAP[1][2][4] = 2; + ORIENTATION_MAP[2][2][4] = 1; + ORIENTATION_MAP[3][2][4] = 2 | FLIP_H_BIT; + ORIENTATION_MAP[4][2][4] = 2; + ORIENTATION_MAP[5][2][4] = 1 | FLIP_H_BIT; } public BaseBlockRender() { diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 60dcd9596..8f410b932 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -43,7 +43,7 @@ import appeng.core.features.AEFeature; public class BusRenderHelper implements IPartRenderHelper { - final public static BusRenderHelper instance = new BusRenderHelper(); + final public static BusRenderHelper INSTANCE = new BusRenderHelper(); double minX = 0; double minY = 0; @@ -162,7 +162,7 @@ public class BusRenderHelper implements IPartRenderHelper @Override public void normalRendering() { - RenderBlocksWorkaround rbw = BusRenderer.instance.renderer; + RenderBlocksWorkaround rbw = BusRenderer.INSTANCE.renderer; rbw.calculations = true; rbw.useTextures = true; rbw.enableAO = false; @@ -171,7 +171,7 @@ public class BusRenderHelper implements IPartRenderHelper @Override public ISimplifiedBundle useSimplifiedRendering(int x, int y, int z, IBoxProvider p, ISimplifiedBundle sim) { - RenderBlocksWorkaround rbw = BusRenderer.instance.renderer; + RenderBlocksWorkaround rbw = BusRenderer.INSTANCE.renderer; if ( sim != null && rbw.similarLighting( this.blk, rbw.blockAccess, x, y, z, sim ) ) { @@ -350,8 +350,8 @@ public class BusRenderHelper implements IPartRenderHelper AEBaseBlock blk = (AEBaseBlock) AEApi.instance().blocks().blockMultiPart.block(); BlockRenderInfo info = blk.getRendererInstance(); - ForgeDirection forward = BusRenderHelper.instance.az; - ForgeDirection up = BusRenderHelper.instance.ay; + ForgeDirection forward = BusRenderHelper.INSTANCE.az; + ForgeDirection up = BusRenderHelper.INSTANCE.ay; renderer.uvRotateBottom = info.getTexture( ForgeDirection.DOWN ).setFlip( BaseBlockRender.getOrientation( ForgeDirection.DOWN, forward, up ) ); renderer.uvRotateTop = info.getTexture( ForgeDirection.UP ).setFlip( BaseBlockRender.getOrientation( ForgeDirection.UP, forward, up ) ); @@ -387,7 +387,7 @@ public class BusRenderHelper implements IPartRenderHelper @Override public void setFacesToRender(EnumSet faces) { - BusRenderer.instance.renderer.renderFaces = faces; + BusRenderer.INSTANCE.renderer.renderFaces = faces; } @Override diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index 8b45703f1..88e8e5900 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -45,21 +45,21 @@ import appeng.util.Platform; public class BusRenderer implements IItemRenderer { - public static final BusRenderer instance = new BusRenderer(); + public static final BusRenderer INSTANCE = new BusRenderer(); public final RenderBlocksWorkaround renderer = new RenderBlocksWorkaround(); - public static final HashMap renderPart = new HashMap(); + public static final HashMap RENDER_PART = new HashMap(); public IPart getRenderer(ItemStack is, IPartItem c) { int id = (Item.getIdFromItem( is.getItem() ) << Platform.DEF_OFFSET) | is.getItemDamage(); - IPart part = renderPart.get( id ); + IPart part = RENDER_PART.get( id ); if ( part == null ) { part = c.createPartFromItemStack( is ); if ( part != null ) - renderPart.put( id, part ); + RENDER_PART.put( id, part ); } return part; @@ -126,12 +126,12 @@ public class BusRenderer implements IItemRenderer Tessellator.instance.setColorOpaque_F( 1, 1, 1 ); Tessellator.instance.setBrightness( 14 << 20 | 14 << 4 ); - BusRenderHelper.instance.setBounds( 0, 0, 0, 1, 1, 1 ); - BusRenderHelper.instance.setTexture( null ); - BusRenderHelper.instance.setInvColor( 0xffffff ); + BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 ); + BusRenderHelper.INSTANCE.setTexture( null ); + BusRenderHelper.INSTANCE.setInvColor( 0xffffff ); this.renderer.blockAccess = ClientHelper.proxy.getWorld(); - BusRenderHelper.instance.setOrientation( ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH ); + BusRenderHelper.INSTANCE.setOrientation( ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH ); this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0; this.renderer.useInventoryTint = false; @@ -149,7 +149,7 @@ public class BusRenderer implements IItemRenderer } if ( fp != null ) - fp.renderInventory( BusRenderHelper.instance, this.renderer ); + fp.renderInventory( BusRenderHelper.INSTANCE, this.renderer ); } else { @@ -162,7 +162,7 @@ public class BusRenderer implements IItemRenderer GL11.glTranslatef( 0.0f, 0.0f, -0.04f * (8 - depth) - 0.06f ); } - ip.renderInventory( BusRenderHelper.instance, this.renderer ); + ip.renderInventory( BusRenderHelper.INSTANCE, this.renderer ); } } diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index aca613922..c46f80b10 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -36,11 +36,11 @@ import appeng.parts.CableBusContainer; public class CableRenderHelper { - private static final CableRenderHelper instance = new CableRenderHelper(); + private static final CableRenderHelper INSTANCE = new CableRenderHelper(); public static CableRenderHelper getInstance() { - return instance; + return INSTANCE; } private void setSide(ForgeDirection s) @@ -87,16 +87,16 @@ public class CableRenderHelper break; } - BusRenderHelper.instance.setOrientation( ax, ay, az ); + BusRenderHelper.INSTANCE.setOrientation( ax, ay, az ); } public void renderStatic(CableBusContainer cableBusContainer, IFacadeContainer iFacadeContainer) { TileEntity te = cableBusContainer.getTile(); - RenderBlocksWorkaround renderer = BusRenderer.instance.renderer; + RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.renderer; if ( renderer.overrideBlockTexture != null ) - BusRenderHelper.instance.setPass( 0 ); + BusRenderHelper.INSTANCE.setPass( 0 ); if ( renderer.blockAccess == null ) renderer.blockAccess = Minecraft.getMinecraft().theWorld; @@ -112,7 +112,7 @@ public class CableRenderHelper renderer.flipTexture = false; renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; - part.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer ); + part.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.INSTANCE, renderer ); renderer.faces = EnumSet.allOf( ForgeDirection.class ); renderer.calculations = true; @@ -132,7 +132,7 @@ public class CableRenderHelper if ( part != null ) { this.setSide( s ); - BusRenderHelper brh = BusRenderHelper.instance; + BusRenderHelper brh = BusRenderHelper.INSTANCE; BusCollisionHelper bch = new BusCollisionHelper( boxes, brh.getWorldX(), brh.getWorldY(), brh.getWorldZ(), null, true ); part.getBoxes( bch ); } @@ -186,7 +186,7 @@ public class CableRenderHelper renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; this.setSide( s ); - fPart.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer, iFacadeContainer, b, + fPart.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.INSTANCE, renderer, iFacadeContainer, b, cableBusContainer.getPart( s ) == null ); } } @@ -247,8 +247,8 @@ public class CableRenderHelper break; } - BusRenderHelper.instance.setOrientation( ax, ay, az ); - part.renderDynamic( x, y, z, BusRenderHelper.instance, BusRenderer.instance.renderer ); + BusRenderHelper.INSTANCE.setOrientation( ax, ay, az ); + part.renderDynamic( x, y, z, BusRenderHelper.INSTANCE, BusRenderer.INSTANCE.renderer ); } } } diff --git a/src/main/java/appeng/client/render/ItemRenderer.java b/src/main/java/appeng/client/render/ItemRenderer.java index b2d4cb727..be73c0bf7 100644 --- a/src/main/java/appeng/client/render/ItemRenderer.java +++ b/src/main/java/appeng/client/render/ItemRenderer.java @@ -26,7 +26,7 @@ import net.minecraftforge.client.IItemRenderer; public class ItemRenderer implements IItemRenderer { - public static final ItemRenderer instance = new ItemRenderer(); + public static final ItemRenderer INSTANCE = new ItemRenderer(); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) @@ -56,7 +56,7 @@ public class ItemRenderer implements IItemRenderer if ( type == ItemRenderType.INVENTORY ) GL11.glTranslatef( 0.0f, -0.1f, 0.0f ); - WorldRender.instance.renderItemBlock( item, type, data ); + WorldRender.INSTANCE.renderItemBlock( item, type, data ); GL11.glPopAttrib(); GL11.glPopMatrix(); diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index ffc2bd9df..7d30d8238 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -33,7 +33,7 @@ import net.minecraftforge.client.IRenderHandler; public class SpatialSkyRender extends IRenderHandler { - private static final SpatialSkyRender instance = new SpatialSkyRender(); + private static final SpatialSkyRender INSTANCE = new SpatialSkyRender(); private final Random random = new Random(); private long cycle = 0; @@ -185,7 +185,7 @@ public class SpatialSkyRender extends IRenderHandler public static IRenderHandler getInstance() { - return instance; + return INSTANCE; } } diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index 451d3aa7b..cd8f3a401 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -40,7 +40,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler private final RenderBlocks renderer = new RenderBlocks(); final int renderID = RenderingRegistry.getNextAvailableRenderId(); - public static final WorldRender instance = new WorldRender(); + public static final WorldRender INSTANCE = new WorldRender(); boolean hasError = false; public final HashMap blockRenders = new HashMap(); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index 013c85653..b7359face 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -201,14 +201,14 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide return false; } - BusRenderer.instance.renderer.blockAccess = renderer.blockAccess; - renderer = BusRenderer.instance.renderer; + BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess; + renderer = BusRenderer.INSTANCE.renderer; this.preRenderInWorld( block, world, x, y, z, renderer ); - tma.lightCache = BusRenderHelper.instance.useSimplifiedRendering( x, y, z, this, tma.lightCache ); + tma.lightCache = BusRenderHelper.INSTANCE.useSimplifiedRendering( x, y, z, this, tma.lightCache ); - BusRenderer.instance.renderer.isFacade = true; + BusRenderer.INSTANCE.renderer.isFacade = true; IOrientable te = this.getOrientable( block, world, x, y, z ); ForgeDirection fdy = te.getUp(); @@ -262,12 +262,12 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide this.renderBlockBounds( renderer, 1, 1, 1, 15, 15, 15, fdx, fdy, fdz ); renderer.renderStandardBlock( blk, x, y, z ); - BusRenderHelper.instance.normalRendering(); + BusRenderHelper.INSTANCE.normalRendering(); blk.getRendererInstance().setTemporaryRenderIcon( null ); renderer.renderAllFaces = false; - BusRenderer.instance.renderer.isFacade = false; + BusRenderer.INSTANCE.renderer.isFacade = false; this.postRenderInWorld( renderer ); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java index 0775ad081..f6c8e6bc9 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java @@ -74,9 +74,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender if ( formed && renderer.overrideBlockTexture == null ) { - renderer = BusRenderer.instance.renderer; - BusRenderHelper i = BusRenderHelper.instance; - BusRenderer.instance.renderer.isFacade = true; + renderer = BusRenderer.INSTANCE.renderer; + BusRenderHelper i = BusRenderHelper.INSTANCE; + BusRenderer.INSTANCE.renderer.isFacade = true; renderer.blockAccess = w; i.setPass( 0 ); @@ -122,7 +122,7 @@ public class RenderBlockCraftingCPU extends BaseBlockRender this.handleSide( blk, meta, x, y, z, i, renderer, ct.getForward() == side ? theIcon : nonForward, LocalEmit, isMonitor, side, w ); } - BusRenderer.instance.renderer.isFacade = false; + BusRenderer.INSTANCE.renderer.isFacade = false; i.setFacesToRender( EnumSet.allOf( ForgeDirection.class ) ); i.normalRendering(); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java index 525af5ed1..5ee6b277f 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java @@ -108,11 +108,11 @@ public class RenderBlockSkyCompass extends BaseBlockRender int x = (int) p.posX; int y = (int) p.posY; int z = (int) p.posZ; - CompassResult cr = CompassManager.instance.getCompassDirection( 0, x, y, z ); + CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, x, y, z ); for (int i = 0; i < 3; i++) for (int j = 0; j < 3; j++) - CompassManager.instance.getCompassDirection( 0, x + i - 1, y, z + j - 1 ); + CompassManager.INSTANCE.getCompassDirection( 0, x + i - 1, y, z + j - 1 ); if ( cr.hasResult ) { @@ -187,7 +187,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender CompassResult cr = null; if ( skyCompass.getForward() == ForgeDirection.UP || skyCompass.getForward() == ForgeDirection.DOWN ) - cr = CompassManager.instance.getCompassDirection( 0, tile.xCoord, tile.yCoord, tile.zCoord ); + cr = CompassManager.INSTANCE.getCompassDirection( 0, tile.xCoord, tile.yCoord, tile.zCoord ); else cr = new CompassResult( false, true, 0 ); diff --git a/src/main/java/appeng/client/render/blocks/RendererCableBus.java b/src/main/java/appeng/client/render/blocks/RendererCableBus.java index b61b76de6..e04f02917 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -51,14 +51,14 @@ public class RendererCableBus extends BaseBlockRender if ( t instanceof TileCableBus ) { - BusRenderer.instance.renderer.renderAllFaces = true; - BusRenderer.instance.renderer.blockAccess = renderer.blockAccess; - BusRenderer.instance.renderer.overrideBlockTexture = renderer.overrideBlockTexture; + BusRenderer.INSTANCE.renderer.renderAllFaces = true; + BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess; + BusRenderer.INSTANCE.renderer.overrideBlockTexture = renderer.overrideBlockTexture; ((TileCableBus) t).cb.renderStatic( x, y, z ); - BusRenderer.instance.renderer.renderAllFaces = false; + BusRenderer.INSTANCE.renderer.renderAllFaces = false; } - return BusRenderHelper.instance.getItemsRendered() > 0; + return BusRenderHelper.INSTANCE.getItemsRendered() > 0; } @Override @@ -66,7 +66,7 @@ public class RendererCableBus extends BaseBlockRender { if ( t instanceof TileCableBus ) { - BusRenderer.instance.renderer.overrideBlockTexture = null; + BusRenderer.INSTANCE.renderer.overrideBlockTexture = null; ((TileCableBus) t).cb.renderDynamic( x, y, z ); } } diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index 7d45f9d64..d2c5763fe 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -18,10 +18,13 @@ package appeng.client.render.effects; +import java.util.Random; + import net.minecraft.world.World; public class LightningArcFX extends LightningFX { + private static final Random RANDOM_GENERATOR = new Random(); final double rx; final double ry; @@ -48,9 +51,9 @@ public class LightningArcFX extends LightningFX double len = Math.sqrt( lastDirectionX * lastDirectionX + lastDirectionY * lastDirectionY + lastDirectionZ * lastDirectionZ ); for (int s = 0; s < this.steps; s++) { - this.Steps[s][0] = (lastDirectionX + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0; - this.Steps[s][1] = (lastDirectionY + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0; - this.Steps[s][2] = (lastDirectionZ + (rng.nextDouble() - 0.5) * len * 1.2) / 2.0; + this.Steps[s][0] = (lastDirectionX + ( RANDOM_GENERATOR.nextDouble() - 0.5) * len * 1.2) / 2.0; + this.Steps[s][1] = (lastDirectionY + ( RANDOM_GENERATOR.nextDouble() - 0.5) * len * 1.2) / 2.0; + this.Steps[s][2] = (lastDirectionZ + ( RANDOM_GENERATOR.nextDouble() - 0.5) * len * 1.2) / 2.0; } } diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index ba3c2b166..5fae3d95a 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -31,7 +31,7 @@ public class LightningFX extends EntityFX { final int steps = this.getSteps(); - static final Random rng = new Random(); + private static final Random RANDOM_GENERATOR = new Random(); final double[][] Steps; protected LightningFX(World w, double x, double y, double z, double r, double g, double b, int maxAge) { @@ -64,14 +64,14 @@ public class LightningFX extends EntityFX protected void regen() { - double lastDirectionX = (rng.nextDouble() - 0.5) * 0.9; - double lastDirectionY = (rng.nextDouble() - 0.5) * 0.9; - double lastDirectionZ = (rng.nextDouble() - 0.5) * 0.9; + double lastDirectionX = ( RANDOM_GENERATOR.nextDouble() - 0.5) * 0.9; + double lastDirectionY = ( RANDOM_GENERATOR.nextDouble() - 0.5) * 0.9; + double lastDirectionZ = ( RANDOM_GENERATOR.nextDouble() - 0.5) * 0.9; for (int s = 0; s < this.steps; s++) { - this.Steps[s][0] = lastDirectionX = (lastDirectionX + (rng.nextDouble() - 0.5) * 0.9) / 2.0; - this.Steps[s][1] = lastDirectionY = (lastDirectionY + (rng.nextDouble() - 0.5) * 0.9) / 2.0; - this.Steps[s][2] = lastDirectionZ = (lastDirectionZ + (rng.nextDouble() - 0.5) * 0.9) / 2.0; + this.Steps[s][0] = lastDirectionX = (lastDirectionX + ( RANDOM_GENERATOR.nextDouble() - 0.5) * 0.9) / 2.0; + this.Steps[s][1] = lastDirectionY = (lastDirectionY + ( RANDOM_GENERATOR.nextDouble() - 0.5) * 0.9) / 2.0; + this.Steps[s][2] = lastDirectionZ = (lastDirectionZ + ( RANDOM_GENERATOR.nextDouble() - 0.5) * 0.9) / 2.0; } } diff --git a/src/main/java/appeng/client/texture/TmpFlippableIcon.java b/src/main/java/appeng/client/texture/TmpFlippableIcon.java index 722dc438d..c662771f6 100644 --- a/src/main/java/appeng/client/texture/TmpFlippableIcon.java +++ b/src/main/java/appeng/client/texture/TmpFlippableIcon.java @@ -24,10 +24,10 @@ import net.minecraft.util.IIcon; public class TmpFlippableIcon extends FlippableIcon { - private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block ); + private static final IIcon NULL_ICON = new MissingIcon( Blocks.diamond_block ); public TmpFlippableIcon() { - super( nullIcon ); + super( NULL_ICON ); } public void setOriginal(IIcon i) @@ -47,7 +47,7 @@ public class TmpFlippableIcon extends FlippableIcon } if ( i == null ) - this.original = nullIcon; + this.original = NULL_ICON; else this.original = i; } diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index e401bf273..97a2560b0 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -97,7 +97,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres if ( s == this.middle ) { - for (ItemStack i : Inscribe.plates) + for (ItemStack i : Inscribe.PLATES ) { if ( Platform.isSameItemPrecise( i, is ) ) return false; @@ -106,7 +106,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres boolean matches = false; boolean found = false; - for (InscriberRecipe i : Inscribe.recipes) + for (InscriberRecipe i : Inscribe.RECIPES ) { boolean matchA = (PlateA == null && i.plateA == null) || (Platform.isSameItemPrecise( PlateA, i.plateA )) && // and... (PlateB == null && i.plateB == null) | (Platform.isSameItemPrecise( PlateB, i.plateB )); @@ -144,7 +144,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres return AEApi.instance().materials().materialNamePress.sameAsStack( is ); // everything else - for (InscriberRecipe i : Inscribe.recipes) + for (InscriberRecipe i : Inscribe.RECIPES ) { if ( Platform.isSameItemPrecise( i.plateA, otherSlot ) ) { diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index affaa900a..5350dcd19 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -181,7 +181,7 @@ public class SlotRestrictedInput extends AppEngSlot if ( AEApi.instance().materials().materialNamePress.sameAsStack( i ) ) return true; - for (ItemStack is : Inscribe.plates) + for (ItemStack is : Inscribe.PLATES ) if ( Platform.isSameItemPrecise( is, i ) ) return true; diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 338bf610e..fb15ad4d4 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -53,7 +53,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon public static AEConfig instance; - public static final double TunnelPowerLoss = 0.05; + public static final double TUNNEL_POWER_LOSS = 0.05; public String latestVersion = VERSION; public long latestTimeStamp = 0; diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index 6688ffa76..3722c4cb0 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -42,7 +42,7 @@ import appeng.util.Platform; public class Api implements IAppEngApi { - public static final Api instance = new Api(); + public static final Api INSTANCE = new Api(); private Api() { diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 973211213..9992320e1 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -178,7 +178,7 @@ public class AppEng public void serverStopping( FMLServerStoppingEvent event ) { WorldSettings.getInstance().shutdown(); - TickHandler.instance.shutdown(); + TickHandler.INSTANCE.shutdown(); } @EventHandler diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 8c9ca949c..1230cbe80 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -252,12 +252,12 @@ public final class Registration RecipeSorter.register( "AE2-Shaped", ShapedRecipe.class, Category.SHAPED, "" ); RecipeSorter.register( "AE2-Shapeless", ShapelessRecipe.class, Category.SHAPELESS, "" ); - MinecraftForge.EVENT_BUS.register( OreDictionaryHandler.instance ); + MinecraftForge.EVENT_BUS.register( OreDictionaryHandler.INSTANCE ); - Items items = Api.instance.items(); - Materials materials = Api.instance.materials(); - Parts parts = Api.instance.parts(); - Blocks blocks = Api.instance.blocks(); + Items items = Api.INSTANCE.items(); + Materials materials = Api.INSTANCE.materials(); + Parts parts = Api.INSTANCE.parts(); + Blocks blocks = Api.INSTANCE.blocks(); AEItemDefinition materialItem = this.addFeature( ItemMultiMaterial.class ); @@ -573,8 +573,8 @@ public final class Registration if ( AppEng.instance.isIntegrationEnabled( IntegrationType.RF ) ) ph.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyReceiver" ); - FMLCommonHandler.instance().bus().register( TickHandler.instance ); - MinecraftForge.EVENT_BUS.register( TickHandler.instance ); + FMLCommonHandler.instance().bus().register( TickHandler.INSTANCE ); + MinecraftForge.EVENT_BUS.register( TickHandler.INSTANCE ); PartPlacement pp = new PartPlacement(); MinecraftForge.EVENT_BUS.register( pp ); @@ -627,7 +627,7 @@ public final class Registration PlayerMessages.values(); GuiText.values(); - Api.instance.partHelper.initFMPSupport(); + Api.INSTANCE.partHelper.initFMPSupport(); ( ( BlockCableBus ) blocks.blockMultiPart.block() ).setupTile(); // Interface @@ -777,6 +777,6 @@ public final class Registration /** * initial recipe bake, if ore dictionary changes after this it re-bakes. */ - OreDictionaryHandler.instance.bakeRecipes(); + OreDictionaryHandler.INSTANCE.bakeRecipes(); } } diff --git a/src/main/java/appeng/core/WorldSettings.java b/src/main/java/appeng/core/WorldSettings.java index 0907ed2b1..b50e9fde8 100644 --- a/src/main/java/appeng/core/WorldSettings.java +++ b/src/main/java/appeng/core/WorldSettings.java @@ -336,7 +336,7 @@ public class WorldSettings extends Configuration } else { - for ( PlayerColor pc : TickHandler.instance.getPlayerColors().values() ) + for ( PlayerColor pc : TickHandler.INSTANCE.getPlayerColors().values() ) NetworkHandler.instance.sendToAll( pc.getPacket() ); } } diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 13a409ac7..871da7888 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -331,7 +331,7 @@ public class ApiPart implements IPartHelper public void setItemBusRenderer(IPartItem i) { if ( Platform.isClient() && i instanceof Item ) - MinecraftForgeClient.registerItemRenderer( (Item) i, BusRenderer.instance ); + MinecraftForgeClient.registerItemRenderer( (Item) i, BusRenderer.INSTANCE ); } @Override diff --git a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java index 0e44188ba..7ec835d8d 100644 --- a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java @@ -71,7 +71,7 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener this.addIngot( "Wheat", new ItemStack( Items.wheat ) ); - OreDictionaryHandler.instance.observe( this ); + OreDictionaryHandler.INSTANCE.observe( this ); } @Override diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index 29fb2b000..a75246710 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -127,7 +127,7 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo } public MatterCannonAmmoRegistry() { - OreDictionaryHandler.instance.observe( this ); + OreDictionaryHandler.INSTANCE.observe( this ); this.registerAmmo( new ItemStack( Items.gold_nugget ), 196.96655 ); } diff --git a/src/main/java/appeng/core/features/registries/RegistryContainer.java b/src/main/java/appeng/core/features/registries/RegistryContainer.java index 4ed0b1a5c..a09865f85 100644 --- a/src/main/java/appeng/core/features/registries/RegistryContainer.java +++ b/src/main/java/appeng/core/features/registries/RegistryContainer.java @@ -124,7 +124,7 @@ public class RegistryContainer implements IRegistryContainer @Override public IWorldGen worldgen() { - return WorldGenRegistry.instance; + return WorldGenRegistry.INSTANCE; } } diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index c0a494fcd..0cb8c1427 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -39,7 +39,7 @@ public class WorldGenRegistry implements IWorldGen final TypeSet[] types; - static final public WorldGenRegistry instance = new WorldGenRegistry(); + static final public WorldGenRegistry INSTANCE = new WorldGenRegistry(); private WorldGenRegistry() { diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index ed5a97050..b8a6817d4 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -53,7 +53,7 @@ import appeng.core.sync.packets.PacketValueConfig; public class AppEngPacketHandlerBase { - public static final Map reverseLookup = new HashMap(); + public static final Map REVERSE_LOOKUP = new HashMap(); public enum PacketTypes { @@ -124,7 +124,7 @@ public class AppEngPacketHandlerBase } this.con = x; - AppEngPacketHandlerBase.reverseLookup.put( this.pc, this ); + AppEngPacketHandlerBase.REVERSE_LOOKUP.put( this.pc, this ); if ( this.con == null ) throw new RuntimeException( "Invalid Packet Class, must be constructable on DataInputStream" ); @@ -142,7 +142,7 @@ public class AppEngPacketHandlerBase public static PacketTypes getID(Class c) { - return AppEngPacketHandlerBase.reverseLookup.get( c ); + return AppEngPacketHandlerBase.REVERSE_LOOKUP.get( c ); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java index 893669bd5..ce7ede240 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java @@ -49,7 +49,7 @@ public class PacketCompassResponse extends AppEngPacket @Override public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player) { - CompassManager.instance.postResult( this.attunement, this.cx << 4, this.cdy << 5, this.cz << 4, this.cr ); + CompassManager.INSTANCE.postResult( this.attunement, this.cx << 4, this.cdy << 5, this.cz << 4, this.cr ); } // api diff --git a/src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java b/src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java index 1a8129a18..9d5b059bc 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java +++ b/src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java @@ -48,7 +48,7 @@ public class PacketPaintedEntity extends AppEngPacket public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player) { PlayerColor pc = new PlayerColor( this.entityId, this.myColor, this.ticks ); - TickHandler.instance.getPlayerColors().put( this.entityId, pc ); + TickHandler.INSTANCE.getPlayerColors().put( this.entityId, pc ); } // api diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index c32066cc7..ae6dd6d3e 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -159,7 +159,7 @@ public class CraftingJob implements Runnable, ICraftingJob { try { - TickHandler.instance.registerCraftingSimulation( this.world, this ); + TickHandler.INSTANCE.registerCraftingSimulation( this.world, this ); this.handlePausing(); Stopwatch timer = Stopwatch.createStarted(); diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/TileCubeGenerator.java index 6040901dd..14ab93853 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/TileCubeGenerator.java @@ -60,7 +60,7 @@ public class TileCubeGenerator extends AEBaseTile void spawn() { - this.worldObj.setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.air, 0, 3 ); + this.worldObj.setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR, 0, 3 ); Item i = this.is.getItem(); int side = ForgeDirection.UP.ordinal(); diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index ce6d83855..94d01eb48 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -33,10 +33,10 @@ import appeng.tile.AEBaseTile; public class TileItemGen extends AEBaseTile implements IInventory { - public static final Queue possibleItems = new LinkedList(); + public static final Queue POSSIBLE_ITEMS = new LinkedList(); public TileItemGen() { - if ( possibleItems.isEmpty() ) + if ( POSSIBLE_ITEMS.isEmpty() ) { for (Object obj : Item.itemRegistry) { @@ -46,13 +46,13 @@ public class TileItemGen extends AEBaseTile implements IInventory if ( mi.isDamageable() ) { for (int dmg = 0; dmg < mi.getMaxDamage(); dmg++) - possibleItems.add( new ItemStack( mi, 1, dmg ) ); + POSSIBLE_ITEMS.add( new ItemStack( mi, 1, dmg ) ); } else { List list = new ArrayList(); mi.getSubItems( mi, mi.getCreativeTab(), list ); - possibleItems.addAll( list ); + POSSIBLE_ITEMS.addAll( list ); } } } @@ -73,15 +73,15 @@ public class TileItemGen extends AEBaseTile implements IInventory private ItemStack getRandomItem() { - return possibleItems.peek(); + return POSSIBLE_ITEMS.peek(); } @Override public ItemStack decrStackSize(int i, int j) { - ItemStack a = possibleItems.poll(); + ItemStack a = POSSIBLE_ITEMS.poll(); ItemStack out = a.copy(); - possibleItems.add( a ); + POSSIBLE_ITEMS.add( a ); return out; } @@ -94,8 +94,8 @@ public class TileItemGen extends AEBaseTile implements IInventory @Override public void setInventorySlotContents(int i, ItemStack itemstack) { - ItemStack a = possibleItems.poll(); - possibleItems.add( a ); + ItemStack a = POSSIBLE_ITEMS.poll(); + POSSIBLE_ITEMS.add( a ); } @Override diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index 23b07bae1..c85872161 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -75,7 +75,7 @@ public class ToolDebugCard extends AEBaseItem int grids = 0; int totalNodes = 0; - for (Grid g : TickHandler.instance.getGridList()) + for (Grid g : TickHandler.INSTANCE.getGridList()) { grids++; totalNodes += g.getNodes().size(); diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index b3a50cf17..cfcda0456 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -70,7 +70,7 @@ public class ToolEraser extends AEBaseItem if ( c_blk == blk && c_meta == meta ) { blocks++; - world.setBlock( wc.x, wc.y, wc.z, Platform.air ); + world.setBlock( wc.x, wc.y, wc.z, Platform.AIR ); this.check( world, wc.x + 1, wc.y, wc.z, next ); this.check( world, wc.x - 1, wc.y, wc.z, next ); diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index 3603b8a78..e5a06c0d8 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -84,7 +84,7 @@ import appeng.util.Platform; public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IRedstonePart, AEMultiTile { - final static Cuboid6[] sideTests = new Cuboid6[] { + private final static Cuboid6[] SIDE_TESTS = new Cuboid6[] { new Cuboid6( 6.0 / 16.0, 0, 6.0 / 16.0, 10.0 / 16.0, 6.0 / 16.0, 10.0 / 16.0 ), // DOWN(0, -1, 0), @@ -99,7 +99,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds new Cuboid6( 10.0 / 16.0, 6.0 / 16.0, 6.0 / 16.0, 1.0, 10.0 / 16.0, 10.0 / 16.0 ),// EAST(1, 0, 0), }; - public static final ThreadLocal disableFacadeOcclusion = new ThreadLocal(); + public static final ThreadLocal DISABLE_FACADE_OCCLUSION = new ThreadLocal(); public CableBusContainer cb = new CableBusContainer( this ); @Override @@ -299,7 +299,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds { if ( pass == 0 || (pass == 1 && AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass )) ) { - BusRenderHelper.instance.setPass( pass ); + BusRenderHelper.INSTANCE.setPass( pass ); this.cb.renderDynamic( pos.x, pos.y, pos.z ); } } @@ -309,12 +309,12 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds { if ( pass == 0 || (pass == 1 && AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass )) ) { - BusRenderHelper.instance.setPass( pass ); - BusRenderer.instance.renderer.renderAllFaces = true; - BusRenderer.instance.renderer.blockAccess = this.world(); - BusRenderer.instance.renderer.overrideBlockTexture = null; + BusRenderHelper.INSTANCE.setPass( pass ); + BusRenderer.INSTANCE.renderer.renderAllFaces = true; + BusRenderer.INSTANCE.renderer.blockAccess = this.world(); + BusRenderer.INSTANCE.renderer.overrideBlockTexture = null; this.cb.renderStatic( pos.x, pos.y, pos.z ); - return BusRenderHelper.instance.getItemsRendered() > 0; + return BusRenderHelper.INSTANCE.getItemsRendered() > 0; } return false; } @@ -338,9 +338,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds fp.getBoxes( bch, null ); for (AxisAlignedBB bb : boxes) { - disableFacadeOcclusion.set( true ); + DISABLE_FACADE_OCCLUSION.set( true ); boolean canAdd = this.tile().canAddPart( new NormallyOccludedPart( new Cuboid6( bb ) ) ); - disableFacadeOcclusion.remove(); + DISABLE_FACADE_OCCLUSION.remove(); if ( !canAdd ) { return false; @@ -454,7 +454,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds public Iterable getOcclusionBoxes() { LinkedList l = new LinkedList(); - for (AxisAlignedBB b : this.cb.getSelectedBoundingBoxesFromPool( true, disableFacadeOcclusion.get() == null, null, true )) + for (AxisAlignedBB b : this.cb.getSelectedBoundingBoxesFromPool( true, DISABLE_FACADE_OCCLUSION.get() == null, null, true )) { l.add( new Cuboid6( b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ ) ); } @@ -485,9 +485,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds if ( side == null || side == ForgeDirection.UNKNOWN || this.tile() == null ) return false; - disableFacadeOcclusion.set( true ); - boolean blocked = !this.tile().canAddPart( new NormallyOccludedPart( sideTests[side.ordinal()] ) ); - disableFacadeOcclusion.remove(); + DISABLE_FACADE_OCCLUSION.set( true ); + boolean blocked = !this.tile().canAddPart( new NormallyOccludedPart( SIDE_TESTS[side.ordinal()] ) ); + DISABLE_FACADE_OCCLUSION.remove(); return blocked; } diff --git a/src/main/java/appeng/fmp/FMPPlacementHelper.java b/src/main/java/appeng/fmp/FMPPlacementHelper.java index 604ba0949..cb22046cd 100644 --- a/src/main/java/appeng/fmp/FMPPlacementHelper.java +++ b/src/main/java/appeng/fmp/FMPPlacementHelper.java @@ -63,7 +63,7 @@ public class FMPPlacementHelper implements IPartHost } - final private static CableBusStorage nullStorage = new NullStorage(); + final private static CableBusStorage NULL_STORAGE = new NullStorage(); private boolean hasPart = false; private TileMultipart myMP; @@ -120,7 +120,7 @@ public class FMPPlacementHelper implements IPartHost public IFacadeContainer getFacadeContainer() { if ( this.myPart == null ) - return new FacadeContainer( nullStorage ); + return new FacadeContainer( NULL_STORAGE ); return this.myPart.getFacadeContainer(); } diff --git a/src/main/java/appeng/fmp/PartRegistry.java b/src/main/java/appeng/fmp/PartRegistry.java index c78a843b0..e3cb58ec4 100644 --- a/src/main/java/appeng/fmp/PartRegistry.java +++ b/src/main/java/appeng/fmp/PartRegistry.java @@ -51,7 +51,7 @@ public enum PartRegistry try { if ( this == CableBusPart ) - return (TMultiPart) Api.instance.partHelper.getCombinedInstance( this.part.getName() ).newInstance(); + return (TMultiPart) Api.INSTANCE.partHelper.getCombinedInstance( this.part.getName() ).newInstance(); else return this.part.getConstructor( int.class ).newInstance( meta ); } diff --git a/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java index 481ee3adb..43589f537 100644 --- a/src/main/java/appeng/helpers/AEGlassMaterial.java +++ b/src/main/java/appeng/helpers/AEGlassMaterial.java @@ -34,6 +34,6 @@ public class AEGlassMaterial extends Material return false; } - public static final AEGlassMaterial instance = (new AEGlassMaterial( MapColor.airColor )); + public static final AEGlassMaterial INSTANCE = (new AEGlassMaterial( MapColor.airColor )); } diff --git a/src/main/java/appeng/helpers/MeteoritePlacer.java b/src/main/java/appeng/helpers/MeteoritePlacer.java index e625ff782..75def595f 100644 --- a/src/main/java/appeng/helpers/MeteoritePlacer.java +++ b/src/main/java/appeng/helpers/MeteoritePlacer.java @@ -81,7 +81,7 @@ public class MeteoritePlacer else if ( a > 0.5 ) MeteoritePlacer.this.put( w, x, y, z, Blocks.gravel ); else if ( a > 0.5 ) - MeteoritePlacer.this.put( w, x, y, z, Platform.air ); + MeteoritePlacer.this.put( w, x, y, z, Platform.AIR ); } } @@ -119,7 +119,7 @@ public class MeteoritePlacer if ( a > 0.9 ) MeteoritePlacer.this.put( w, x, y, z, this.blk, this.meta ); else if ( a > 0.8 ) - MeteoritePlacer.this.put( w, x, y, z, Platform.air ); + MeteoritePlacer.this.put( w, x, y, z, Platform.AIR ); else this.getOther( w, x, y, z, a - 0.1 ); } @@ -230,7 +230,7 @@ public class MeteoritePlacer { if ( this.range( x, y, z ) ) return this.w.getBlock( x, y, z ); - return Platform.air; + return Platform.AIR; } @Override @@ -354,7 +354,7 @@ public class MeteoritePlacer { if ( this.range( x, y, z ) ) return this.target.getBlock( x & 0xF, y, z & 0xF ); - return Platform.air; + return Platform.AIR; } @Override @@ -563,7 +563,7 @@ public class MeteoritePlacer boolean solid = true; for (int j = y - 15; j < y - 1; j++) { - if ( w.getBlock( x, j, z ) == Platform.air ) + if ( w.getBlock( x, j, z ) == Platform.AIR ) solid = false; } @@ -620,7 +620,7 @@ public class MeteoritePlacer this.put( w, i, j, k, Blocks.lava ); } else - changed = this.put( w, i, j, k, Platform.air ) || changed; + changed = this.put( w, i, j, k, Platform.AIR ) || changed; } } } @@ -764,7 +764,7 @@ public class MeteoritePlacer if ( blk.isReplaceable( w.getWorld(), i, j, k ) ) { - blk = Platform.air; + blk = Platform.AIR; Block blk_b = w.getBlock( i, j + 1, k ); if ( blk_b != blk ) @@ -799,7 +799,7 @@ public class MeteoritePlacer { // decay. Block blk_b = w.getBlock( i, j + 1, k ); - if ( blk_b == Platform.air ) + if ( blk_b == Platform.AIR ) { if ( Math.random() > 0.4 ) { diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index e00c94b6a..433cf14ab 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -27,7 +27,7 @@ import appeng.core.sync.packets.PacketCompassRequest; public class CompassManager { - public static final CompassManager instance = new CompassManager(); + public static final CompassManager INSTANCE = new CompassManager(); static class CompassRequest { diff --git a/src/main/java/appeng/hooks/MeteoriteWorldGen.java b/src/main/java/appeng/hooks/MeteoriteWorldGen.java index 23cdd3885..f0ccedd99 100644 --- a/src/main/java/appeng/hooks/MeteoriteWorldGen.java +++ b/src/main/java/appeng/hooks/MeteoriteWorldGen.java @@ -58,7 +58,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator @Override public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, 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 ) @@ -67,10 +67,10 @@ final public class MeteoriteWorldGen implements IWorldGenerator int z = r.nextInt( 16 ) + (chunkZ << 4); int depth = 180 + r.nextInt( 20 ); - TickHandler.instance.addCallable( w, new MeteoriteSpawn( x, depth, z, w ) ); + TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( x, depth, z, w ) ); } else - TickHandler.instance.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) ); + TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) ); } else WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ ); diff --git a/src/main/java/appeng/hooks/QuartzWorldGen.java b/src/main/java/appeng/hooks/QuartzWorldGen.java index fb676ba8e..068c6f26b 100644 --- a/src/main/java/appeng/hooks/QuartzWorldGen.java +++ b/src/main/java/appeng/hooks/QuartzWorldGen.java @@ -75,7 +75,7 @@ final public class QuartzWorldGen implements IWorldGenerator boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance; WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal; - if ( WorldGenRegistry.instance.isWorldGenEnabled( isCharged ? WorldGenType.ChargedCertusQuartz : WorldGenType.CertusQuartz, w ) ) + if ( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.ChargedCertusQuartz : WorldGenType.CertusQuartz, w ) ) { int cx = chunkX * 16 + r.nextInt( 22 ); int cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 7b1d27112..da71bbf18 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -74,7 +74,7 @@ public class TickHandler } - final public static TickHandler instance = new TickHandler(); + public static final TickHandler INSTANCE = new TickHandler(); final private WeakHashMap> callQueue = new WeakHashMap>(); final Queue serverQueue = new LinkedList(); diff --git a/src/main/java/appeng/integration/modules/IC2.java b/src/main/java/appeng/integration/modules/IC2.java index fa1b7c18b..cbb7db207 100644 --- a/src/main/java/appeng/integration/modules/IC2.java +++ b/src/main/java/appeng/integration/modules/IC2.java @@ -62,7 +62,7 @@ public class IC2 extends BaseModule implements IIC2 reg.addNewAttunement( this.getItem( "splitterCableItem" ), TunnelType.IC2_POWER ); // this is gone? - // AEApi.instance().registries().matterCannon().registerAmmo( getItem( "uraniumDrop" ), 238.0289 ); + // AEApi.INSTANCE().registries().matterCannon().registerAmmo( getItem( "uraniumDrop" ), 238.0289 ); } @Override diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java index 57593ba25..0f625ae28 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java @@ -77,7 +77,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler { if ( (outputId.equals( "inscriber" )) && (this.getClass() == NEIInscriberRecipeHandler.class) ) { - for (InscriberRecipe recipe : Inscribe.recipes) + for (InscriberRecipe recipe : Inscribe.RECIPES ) { CachedInscriberRecipe cachedRecipe = new CachedInscriberRecipe( recipe ); cachedRecipe.computeVisuals(); @@ -93,7 +93,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler @Override public void loadCraftingRecipes(ItemStack result) { - for (InscriberRecipe recipe : Inscribe.recipes) + for (InscriberRecipe recipe : Inscribe.RECIPES ) { if ( NEIServerUtils.areStacksSameTypeCrafting( recipe.output, result ) ) { @@ -107,7 +107,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler @Override public void loadUsageRecipes(ItemStack ingredient) { - for (InscriberRecipe recipe : Inscribe.recipes) + for (InscriberRecipe recipe : Inscribe.RECIPES ) { CachedInscriberRecipe cachedRecipe = new CachedInscriberRecipe( recipe ); diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 5cb465eba..c451f53cc 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -134,11 +134,11 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt } // rather simple client side caching. - static final WeakHashMap simpleCache = new WeakHashMap(); + static final WeakHashMap SIMPLE_CACHE = new WeakHashMap(); public ItemStack getOutput(ItemStack item) { - ItemStack out = simpleCache.get( item ); + ItemStack out = SIMPLE_CACHE.get( item ); if ( out != null ) return out; @@ -151,7 +151,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt if ( details == null ) return null; - simpleCache.put( item, out = details.getCondensedOutputs()[0].getItemStack() ); + SIMPLE_CACHE.put( item, out = details.getCondensedOutputs()[0].getItemStack() ); return out; } diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 473e9d75f..e9add328c 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -60,7 +60,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte this.setFeature( EnumSet.of( AEFeature.Facades ) ); this.setHasSubtypes( true ); if ( Platform.isClient() ) - MinecraftForgeClient.registerItemRenderer( this, BusRenderer.instance ); + MinecraftForgeClient.registerItemRenderer( this, BusRenderer.INSTANCE ); } @Override diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index c8a7c7d02..e778f345c 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -146,7 +146,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench, { if ( b.rotateBlock( w, x, y, z, ForgeDirection.getOrientation( side ) ) ) { - b.onNeighborBlockChange( w, x, y, z, Platform.air ); + b.onNeighborBlockChange( w, x, y, z, Platform.AIR ); p.swingItem(); return !w.isRemote; } diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 659b242f7..473722fd6 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -82,7 +82,7 @@ import appeng.util.item.AEItemStack; public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - final static Map oreToColor = new HashMap(); + final static Map ORE_TO_COLOR = new HashMap(); static { @@ -92,7 +92,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe if ( col == AEColor.Transparent ) continue; - oreToColor.put( OreDictionary.getOreID( "dye" + col.name() ), col ); + ORE_TO_COLOR.put( OreDictionary.getOreID( "dye" + col.name() ), col ); } } @@ -229,8 +229,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe for ( int oreID : id ) { - if ( oreToColor.containsKey( oreID ) ) - return oreToColor.get( oreID ); + if ( ORE_TO_COLOR.containsKey( oreID ) ) + return ORE_TO_COLOR.get( oreID ); } } @@ -436,7 +436,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe for ( int x : id ) { - if ( oreToColor.containsKey( x ) ) + if ( ORE_TO_COLOR.containsKey( x ) ) return false; } diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 25d0f880b..ff22c3851 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -139,7 +139,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } else { - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); } if ( r.Drops != null ) @@ -175,7 +175,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } else { - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); } if ( r.Drops != null ) @@ -260,14 +260,14 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT { if ( blockID instanceof BlockTNT ) { - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); ( (BlockTNT) blockID ).func_150114_a( w, x, y, z, 1, p ); return true; } if ( blockID instanceof BlockTinyTNT ) { - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); ( (BlockTinyTNT) blockID ).startFuse( w, x, y, z, p ); return true; } @@ -315,7 +315,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT if ( or.BlockItem == null ) { - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); } else { diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index 12687068a..a450f3063 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -272,7 +272,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell { int id = pos.entityHit.getEntityId(); PlayerColor marker = new PlayerColor( id, col, 20 * 30 ); - TickHandler.instance.getPlayerColors().put( id, marker ); + TickHandler.INSTANCE.getPlayerColors().put( id, marker ); if ( pos.entityHit instanceof EntitySheep ) { diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index e2d0fc096..7b6bea391 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -64,7 +64,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren ForgeDirection mySide = ForgeDirection.getOrientation( side ); if ( b.rotateBlock( world, x, y, z, mySide ) ) { - b.onNeighborBlockChange( world, x, y, z, Platform.air ); + b.onNeighborBlockChange( world, x, y, z, Platform.AIR ); player.swingItem(); return !world.isRemote; } diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java index 9c4a59f4e..b900693cc 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -67,7 +67,7 @@ public class Grid implements IGrid this.postEvent( new MENetworkPostCacheConstruction() ); - TickHandler.instance.addNetwork( this ); + TickHandler.INSTANCE.addNetwork( this ); center.setGrid( this ); } @@ -122,7 +122,7 @@ public class Grid implements IGrid else { this.pivot = null; - TickHandler.instance.removeNetwork( this ); + TickHandler.INSTANCE.removeNetwork( this ); this.myStorage.remove(); } } diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index 206c9d075..08d585d54 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -41,7 +41,7 @@ import appeng.util.ReadOnlyCollection; public class GridConnection implements IGridConnection, IPathItem { - final static private MENetworkChannelsChanged event = new MENetworkChannelsChanged(); + private static final MENetworkChannelsChanged EVENT = new MENetworkChannelsChanged(); private GridNode sideA; private ForgeDirection fromAtoB; @@ -234,10 +234,10 @@ public class GridConnection implements IGridConnection, IPathItem this.channelData |= this.channelData << 8; if ( this.sideA.getInternalGrid() != null ) - this.sideA.getInternalGrid().postEventTo( this.sideA, event ); + this.sideA.getInternalGrid().postEventTo( this.sideA, EVENT ); if ( this.sideB.getInternalGrid() != null ) - this.sideB.getInternalGrid().postEventTo( this.sideB, event ); + this.sideB.getInternalGrid().postEventTo( this.sideB, EVENT ); } } diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 037cd1a03..d0f17bbdc 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -57,8 +57,8 @@ import appeng.util.ReadOnlyCollection; public class GridNode implements IGridNode, IPathItem { - private static final MENetworkChannelsChanged event = new MENetworkChannelsChanged(); - private static final int[] channelCount = new int[] { 0, 8, 32 }; + private static final MENetworkChannelsChanged EVENT = new MENetworkChannelsChanged(); + private static final int[] CHANNEL_COUNT = new int[] { 0, 8, 32 }; private final List connections = new LinkedList(); private final IGridBlock gridProxy; @@ -407,7 +407,7 @@ public class GridNode implements IGridNode, IPathItem } catch ( FailedConnection e ) { - TickHandler.instance.addCallable( node.getWorld(), new MachineSecurityBreak( this ) ); + TickHandler.INSTANCE.addCallable( node.getWorld(), new MachineSecurityBreak( this ) ); return; } @@ -432,7 +432,7 @@ public class GridNode implements IGridNode, IPathItem } catch ( FailedConnection e ) { - TickHandler.instance.addCallable( node.getWorld(), new MachineSecurityBreak( this ) ); + TickHandler.INSTANCE.addCallable( node.getWorld(), new MachineSecurityBreak( this ) ); return; } @@ -557,7 +557,7 @@ public class GridNode implements IGridNode, IPathItem public int getMaxChannels() { - return channelCount[this.compressedData & 0x03]; + return CHANNEL_COUNT[this.compressedData & 0x03]; } @Override @@ -590,7 +590,7 @@ public class GridNode implements IGridNode, IPathItem this.channelData |= this.channelData << 8; if ( this.getInternalGrid() != null ) - this.getInternalGrid().postEventTo( this, event ); + this.getInternalGrid().postEventTo( this, EVENT ); } } diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 0446e6caf..5b7708789 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -36,14 +36,14 @@ import appeng.core.AELog; public class NetworkEventBus { - private static final Collection readClasses = new HashSet(); - private static final Map, Map> events = new HashMap, Map>(); + private static final Collection READ_CLASSES = new HashSet(); + private static final Map, Map> EVENTS = new HashMap, Map>(); public void readClass( Class listAs, Class c ) { - if ( readClasses.contains( c ) ) + if ( READ_CLASSES.contains( c ) ) return; - readClasses.add( c ); + READ_CLASSES.add( c ); try { @@ -58,9 +58,9 @@ public class NetworkEventBus if ( MENetworkEvent.class.isAssignableFrom( types[0] ) ) { - Map classEvents = events.get( types[0] ); + Map classEvents = EVENTS.get( types[0] ); if ( classEvents == null ) - events.put( types[0], classEvents = new HashMap() ); + EVENTS.put( types[0], classEvents = new HashMap() ); MENetworkEventInfo thisEvent = classEvents.get( listAs ); if ( thisEvent == null ) @@ -86,7 +86,7 @@ public class NetworkEventBus public MENetworkEvent postEvent( Grid g, MENetworkEvent e ) { - Map subscribers = events.get( e.getClass() ); + Map subscribers = EVENTS.get( e.getClass() ); int x = 0; try @@ -122,7 +122,7 @@ public class NetworkEventBus public MENetworkEvent postEventTo( Grid grid, GridNode node, MENetworkEvent e ) { - Map subscribers = events.get( e.getClass() ); + Map subscribers = EVENTS.get( e.getClass() ); int x = 0; try diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index f1ba97a88..57a562a08 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -332,7 +332,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper } } - static final Comparator comp = new Comparator() + static final Comparator COMPARATOR = new Comparator() { @Override public int compare(ICraftingPatternDetails firstDetail, ICraftingPatternDetails nextDetail) @@ -374,7 +374,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper if ( methods == null ) { - tmpCraft.put( out, methods = new TreeSet( comp ) ); + tmpCraft.put( out, methods = new TreeSet( COMPARATOR ) ); } methods.add( details ); @@ -604,7 +604,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper return i == 1; } - final public static ExecutorService craftingPool; + final public static ExecutorService CRAFTING_POOL; static { @@ -618,7 +618,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper }; - craftingPool = Executors.newCachedThreadPool( factory ); + CRAFTING_POOL = Executors.newCachedThreadPool( factory ); } @Override @@ -631,7 +631,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper CraftingJob job = new CraftingJob( world, grid, actionSrc, slotItem, cb ); - return craftingPool.submit( job, (ICraftingJob) job ); + return CRAFTING_POOL.submit( job, (ICraftingJob) job ); } public boolean hasCpu(ICraftingCPU cpu) diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 5db26f345..5a98f8bdd 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -64,7 +64,7 @@ public class NetworkMonitor> extends MEMonitorHandler this.myChannel = chan; } - final static public LinkedList depth = new LinkedList(); + final static public LinkedList DEPTH = new LinkedList(); @Override protected void postChangesToListeners(Iterable changes, BaseActionSource src) @@ -74,10 +74,10 @@ public class NetworkMonitor> extends MEMonitorHandler protected void postChange(boolean Add, Iterable changes, BaseActionSource src) { - if ( depth.contains( this ) ) + if ( DEPTH.contains( this ) ) return; - depth.push( this ); + DEPTH.push( this ); this.sendEvent = true; this.notifyListenersOfChange( changes, src ); @@ -113,7 +113,7 @@ public class NetworkMonitor> extends MEMonitorHandler } } - Object last = depth.pop(); + Object last = DEPTH.pop(); if ( last != this ) throw new RuntimeException( "Invalid Access to Networked Storage API detected." ); } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index e7a3a222b..84e8bc825 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -102,7 +102,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU final Map tasks = new HashMap(); IItemList waitingFor = AEApi.instance().storage().createItemList(); - // instance sate + // INSTANCE sate final private LinkedList tiles = new LinkedList(); final private LinkedList storage = new LinkedList(); final private LinkedList status = new LinkedList(); diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 245c9bd9d..c793d28d0 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -166,7 +166,7 @@ public class AENetworkProxy implements IGridBlock public void validate() { if ( this.gp instanceof AEBaseTile ) - TickHandler.instance.addInit( (AEBaseTile) this.gp ); + TickHandler.INSTANCE.addInit( (AEBaseTile) this.gp ); } public void onChunkUnload() diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index b66603096..194ff64ab 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -369,18 +369,18 @@ public class CellInventory implements ICellInventory return 8 - div; } - private static final HashSet blackList = new HashSet(); + private static final HashSet BLACK_LIST = new HashSet(); public static void addBasicBlackList(int itemID, int Meta) { - blackList.add( (Meta << Platform.DEF_OFFSET) | itemID ); + BLACK_LIST.add( ( Meta << Platform.DEF_OFFSET ) | itemID ); } public static boolean isBlackListed(IAEItemStack input) { - if ( blackList.contains( (OreDictionary.WILDCARD_VALUE << Platform.DEF_OFFSET) | Item.getIdFromItem( input.getItem() ) ) ) + if ( BLACK_LIST.contains( (OreDictionary.WILDCARD_VALUE << Platform.DEF_OFFSET) | Item.getIdFromItem( input.getItem() ) ) ) return true; - return blackList.contains( (input.getItemDamage() << Platform.DEF_OFFSET) | Item.getIdFromItem( input.getItem() ) ); + return BLACK_LIST.contains( (input.getItemDamage() << Platform.DEF_OFFSET) | Item.getIdFromItem( input.getItem() ) ); } private boolean isEmpty(IMEInventory meInventory) diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index f42d9e7b2..25f623fd1 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -45,7 +45,7 @@ import appeng.util.ItemSorters; public class NetworkInventoryHandler> implements IMEInventoryHandler { - private final static Comparator prioritySorter = new Comparator() { + private final static Comparator PRIORITY_SORTER = new Comparator() { @Override public int compare(Integer o1, Integer o2) @@ -64,7 +64,7 @@ public class NetworkInventoryHandler> implements IMEInvent public NetworkInventoryHandler(StorageChannel chan, SecurityCache security) { this.myChannel = chan; this.security = security; - this.priorityInventory = new ConcurrentSkipListMap>>( prioritySorter ); // TreeMultimap.create( prioritySorter, hashSorter ); + this.priorityInventory = new ConcurrentSkipListMap>>( PRIORITY_SORTER ); // TreeMultimap.create( prioritySorter, hashSorter ); } public void addNewStorage(IMEInventoryHandler h) @@ -79,12 +79,12 @@ public class NetworkInventoryHandler> implements IMEInvent static int currentPass = 0; int myPass = 0; - static final ThreadLocal depthMod = new ThreadLocal(); - static final ThreadLocal depthSim = new ThreadLocal(); + static final ThreadLocal DEPTH_MOD = new ThreadLocal(); + static final ThreadLocal DEPTH_SIM = new ThreadLocal(); private LinkedList getDepth(Actionable type) { - ThreadLocal depth = type == Actionable.MODULATE ? depthMod : depthSim; + ThreadLocal depth = type == Actionable.MODULATE ? DEPTH_MOD : DEPTH_SIM; LinkedList s = depth.get(); diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 0a9b786ee..9a3c2254b 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -341,11 +341,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return null; } - private static final ThreadLocal isLoading = new ThreadLocal(); + private static final ThreadLocal IS_LOADING = new ThreadLocal(); public static boolean isLoading() { - Boolean is = isLoading.get(); + Boolean is = IS_LOADING.get(); return is != null && is; } @@ -355,7 +355,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return; this.inWorld = true; - isLoading.set( true ); + IS_LOADING.set( true ); TileEntity te = this.getTile(); @@ -403,7 +403,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I this.partChanged(); - isLoading.set( false ); + IS_LOADING.set( false ); } public void removeFromWorld() diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index df82ba3c7..afd7f87f0 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -290,7 +290,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab if ( eatForReal ) { energy.extractAEPower( total, Actionable.MODULATE, PowerMultiplier.CONFIG ); - w.setBlock( x, y, z, Platform.air, 0, 3 ); + w.setBlock( x, y, z, Platform.AIR, 0, 3 ); AxisAlignedBB box = AxisAlignedBB.getBoundingBox( x - 0.2, y - 0.2, z - 0.2, x + 1.2, y + 1.2, z + 1.2 ); for (Object ei : w.getEntitiesWithinAABB( EntityItem.class, box )) @@ -325,7 +325,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab else { this.breaking = true; - TickHandler.instance.addCallable( this.tile.getWorldObj(), this ); + TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this ); return TickRateModulation.URGENT; } } diff --git a/src/main/java/appeng/parts/layers/InvLayerData.java b/src/main/java/appeng/parts/layers/InvLayerData.java index af7a46d48..81f4f84d3 100644 --- a/src/main/java/appeng/parts/layers/InvLayerData.java +++ b/src/main/java/appeng/parts/layers/InvLayerData.java @@ -28,7 +28,7 @@ public class InvLayerData { // a simple empty array for empty stuff.. - private final static int[] nullSides = new int[] {}; + private final static int[] NULL_SIDES = new int[] {}; // cache of inventory state. final private int[][] sides; @@ -118,7 +118,7 @@ public class InvLayerData public int[] getAccessibleSlotsFromSide(int side) { if ( this.sides == null || side < 0 || side > 5 ) - return nullSides; + return NULL_SIDES; return this.sides[side]; } diff --git a/src/main/java/appeng/parts/layers/LayerIFluidHandler.java b/src/main/java/appeng/parts/layers/LayerIFluidHandler.java index 1407b69a8..acb614d56 100644 --- a/src/main/java/appeng/parts/layers/LayerIFluidHandler.java +++ b/src/main/java/appeng/parts/layers/LayerIFluidHandler.java @@ -29,7 +29,7 @@ import appeng.api.parts.LayerBase; public class LayerIFluidHandler extends LayerBase implements IFluidHandler { - static final FluidTankInfo[] emptyList = new FluidTankInfo[0]; + static final FluidTankInfo[] EMPTY_LIST = new FluidTankInfo[0]; @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) @@ -82,7 +82,7 @@ public class LayerIFluidHandler extends LayerBase implements IFluidHandler IPart part = this.getPart( from ); if ( part instanceof IFluidHandler ) return ((IFluidHandler) part).getTankInfo( from ); - return emptyList; + return EMPTY_LIST; } } diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index 98a2fb749..1154f0b22 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -46,7 +46,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory { // a simple empty array for empty stuff.. - private final static int[] nullSides = new int[] {}; + private final static int[] NULL_SIDES = new int[] {}; InvLayerData invLayer = null; @@ -81,7 +81,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory } else { - sideData = new int[][] { nullSides, nullSides, nullSides, nullSides, nullSides, nullSides }; + sideData = new int[][] { NULL_SIDES, NULL_SIDES, NULL_SIDES, NULL_SIDES, NULL_SIDES, NULL_SIDES }; slots = new ArrayList( Collections.nCopies( slotCount, (InvSot) null ) ); int offsetForLayer = 0; @@ -195,7 +195,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory if ( this.invLayer != null ) return this.invLayer.getAccessibleSlotsFromSide( side ); - return nullSides; + return NULL_SIDES; } @Override diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index 7dcaea096..04672b8fe 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -266,11 +266,11 @@ public class PartDenseCable extends PartCable * rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( * false, true ); } * - * Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setColorOpaque_I( + * Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I( * myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); renderAllFaces( (AEBaseBlock) * rh.getBlock(), x, y, z, renderer ); * - * Tessellator.instance.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, + * Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, * secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); * * renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 4ed679822..25dbae942 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -112,7 +112,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo } /* - * if ( AppEng.instance.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.instance.getIntegration( + * if ( AppEng.INSTANCE.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.INSTANCE.getIntegration( * "TE" ); if ( thermal != null ) { if ( thermal.isPipe( te, side.getOpposite() ) ) { try { output = new * WrapperTEPipe( te, side.getOpposite() ); } catch (Throwable ignore) { } } } } */ diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index e7dcbf939..6f00803e6 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -42,8 +42,8 @@ import appeng.me.GridAccessException; public class PartP2PLiquids extends PartP2PTunnel implements IFluidHandler { - private final static FluidTankInfo[] activeTank = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; - private final static FluidTankInfo[] inactiveTank = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; + private final static FluidTankInfo[] ACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; + private final static FluidTankInfo[] INACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; @Override public TunnelType getTunnelType() @@ -61,21 +61,21 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl { PartP2PLiquids tun = this.getInput(); if ( tun != null ) - return activeTank; + return ACTIVE_TANK; } else { try { if ( !this.getOutputs().isEmpty() ) - return activeTank; + return ACTIVE_TANK; } catch (GridAccessException e) { // :( } } - return inactiveTank; + return INACTIVE_TANK; } IFluidHandler cachedTank; @@ -151,14 +151,14 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl return null; } - static final ThreadLocal> depth = new ThreadLocal>(); + static final ThreadLocal> DEPTH = new ThreadLocal>(); private Stack getDepth() { - Stack s = depth.get(); + Stack s = DEPTH.get(); if ( s == null ) - depth.set( s = new Stack() ); + DEPTH.set( s = new Stack() ); return s; } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 445fd3fb9..4795c5612 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -375,7 +375,7 @@ public class PartP2PTunnel extends PartBasicState protected void QueueTunnelDrain(PowerUnits unit, double f) { - double ae_to_tax = unit.convertTo( PowerUnits.AE, f * AEConfig.TunnelPowerLoss ); + double ae_to_tax = unit.convertTo( PowerUnits.AE, f * AEConfig.TUNNEL_POWER_LOSS ); try { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 8dd53360a..31c98c10d 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -145,19 +145,19 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I if ( !this.proxy.getEnergy().isNetworkPowered() ) { this.connection.markDestroy(); - TickHandler.instance.addCallable( this.tile.getWorldObj(), this.connection ); + TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection ); } else { if ( this.proxy.isActive() ) { this.connection.markCreate(); - TickHandler.instance.addCallable( this.tile.getWorldObj(), this.connection ); + TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection ); } else { this.connection.markDestroy(); - TickHandler.instance.addCallable( this.tile.getWorldObj(), this.connection ); + TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection ); } } diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 9671231ad..f0785fbae 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -59,9 +59,9 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer public boolean usePlates = false; - public static final HashSet plates = new HashSet(); - public static final HashSet inputs = new HashSet(); - public static final LinkedList recipes = new LinkedList(); + public static final HashSet PLATES = new HashSet(); + public static final HashSet INPUTS = new HashSet(); + public static final LinkedList RECIPES = new LinkedList(); IIngredient imprintable; @@ -97,17 +97,17 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer public void register() throws RegistrationError, MissingIngredientError { if ( this.imprintable != null ) - Collections.addAll( inputs, this.imprintable.getItemStackSet() ); + Collections.addAll( INPUTS, this.imprintable.getItemStackSet() ); if ( this.plateA != null ) - Collections.addAll( plates, this.plateA.getItemStackSet() ); + Collections.addAll( PLATES, this.plateA.getItemStackSet() ); if ( this.plateB != null ) - Collections.addAll( plates, this.plateB.getItemStackSet() ); + Collections.addAll( PLATES, this.plateB.getItemStackSet() ); InscriberRecipe ir = new InscriberRecipe( this.imprintable.getItemStackSet(), this.plateA == null ? null : this.plateA.getItemStack(), this.plateB == null ? null : this.plateB.getItemStack(), this.output.getItemStack(), this.usePlates ); - recipes.add( ir ); + RECIPES.add( ir ); } @Override diff --git a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java index 6b94396ba..48ccbfac2 100644 --- a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java +++ b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java @@ -33,7 +33,7 @@ import appeng.recipes.game.IRecipeBakeable; public class OreDictionaryHandler { - public static final OreDictionaryHandler instance = new OreDictionaryHandler(); + public static final OreDictionaryHandler INSTANCE = new OreDictionaryHandler(); private final List ol = new ArrayList(); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 11a65e523..108eeb3ad 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -73,7 +73,7 @@ public class CachedPlane public void setBlockIDWithMetadata(int y, Object[] blk) { if ( blk[0] == CachedPlane.this.matrixFrame ) - blk[0] = Platform.air; + blk[0] = Platform.AIR; ExtendedBlockStorage extendedBlockStorage = this.storage[y >> 4]; extendedBlockStorage.func_150818_a( this.x, y & 15, this.z, (Block) blk[0] ); @@ -205,8 +205,8 @@ public class CachedPlane if ( blk != null && blk.isAir( c.worldObj, te.xCoord, te.yCoord, te.zCoord ) && blk.isReplaceable( c.worldObj, te.xCoord, te.yCoord, te.zCoord ) ) { - c.worldObj.setBlock( te.xCoord, te.yCoord, te.zCoord, Platform.air ); - c.worldObj.notifyBlocksOfNeighborChange( te.xCoord, te.yCoord, te.zCoord, Platform.air ); + c.worldObj.setBlock( te.xCoord, te.yCoord, te.zCoord, Platform.AIR ); + c.worldObj.notifyBlocksOfNeighborChange( te.xCoord, te.yCoord, te.zCoord, Platform.AIR ); } else this.myColumns[te.xCoord - minX][te.zCoord - minZ].setSkip( te.yCoord ); diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 488e7522e..7e93baf3a 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -34,15 +34,15 @@ import appeng.core.AEConfig; public class StorageChunkProvider extends ChunkProviderGenerate { - final static Block[] blocks; + final static Block[] BLOCKS; static { - blocks = new Block[255 * 256]; + BLOCKS = new Block[255 * 256]; Block matrixFrame = AEApi.instance().blocks().blockMatrixFrame.block(); - for (int x = 0; x < blocks.length; x++) - blocks[x] = matrixFrame; + for (int x = 0; x < BLOCKS.length; x++) + BLOCKS[x] = matrixFrame; } @@ -62,7 +62,7 @@ public class StorageChunkProvider extends ChunkProviderGenerate @Override public Chunk provideChunk(int x, int z) { - Chunk chunk = new Chunk( this.w, blocks, x, z ); + Chunk chunk = new Chunk( this.w, BLOCKS, x, z ); byte[] biomes = chunk.getBiomeArray(); AEConfig config = AEConfig.instance; diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index d9786fcb7..ef6cec607 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -63,7 +63,7 @@ public class StorageHelper public void visit(int x, int y, int z) { Block blk = this.dst.getBlock( x, y, z ); - blk.onNeighborBlockChange( this.dst, x, y, z, Platform.air ); + blk.onNeighborBlockChange( this.dst, x, y, z, Platform.AIR ); } } @@ -317,10 +317,10 @@ public class StorageHelper } for (WorldCoord wc : cDst.updates) - cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.air ); + cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR ); for (WorldCoord wc : cSrc.updates) - cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.air ); + cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR ); this.transverseEdges( x - 1, y - 1, z - 1, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1, new TriggerUpdates( src ) ); this.transverseEdges( i - 1, j - 1, k - 1, i + scaleX + 1, j + scaleY + 1, k + scaleZ + 1, new TriggerUpdates( dst ) ); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 2f5654bdc..5d2f98252 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -58,22 +58,22 @@ import appeng.util.SettingsFrom; public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { - static private final HashMap>> handlers = new HashMap>>(); - static private final HashMap myItem = new HashMap(); + static private final HashMap>> HANDLERS = new HashMap>>(); + static private final HashMap ITEM_STACKS = new HashMap(); private ForgeDirection forward = ForgeDirection.UNKNOWN; private ForgeDirection up = ForgeDirection.UNKNOWN; - public static final ThreadLocal> dropNoItems = new ThreadLocal>(); + public static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal>(); public void disableDrops() { - dropNoItems.set( new WeakReference( this ) ); + DROP_NO_ITEMS.set( new WeakReference( this ) ); } public boolean dropItems() { - WeakReference what = dropNoItems.get(); + WeakReference what = DROP_NO_ITEMS.get(); return what == null || what.get() != this; } @@ -92,12 +92,12 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, static public void registerTileItem(Class c, ItemStackSrc wat) { - myItem.put( c, wat ); + ITEM_STACKS.put( c, wat ); } protected ItemStack getItemFromTile(Object obj) { - ItemStackSrc src = myItem.get( obj.getClass() ); + ItemStackSrc src = ITEM_STACKS.get( obj.getClass() ); if ( src == null ) return null; return src.stack( 1 ); @@ -112,11 +112,11 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, protected List getHandlerListFor(TileEventType type) { Class clz = this.getClass(); - EnumMap> handlerSet = handlers.get( clz ); + EnumMap> handlerSet = HANDLERS.get( clz ); if ( handlerSet == null ) { - handlers.put( clz, handlerSet = new EnumMap>( TileEventType.class ) ); + HANDLERS.put( clz, handlerSet = new EnumMap>( TileEventType.class ) ); for (Method m : clz.getMethods()) { diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index 9e19449c1..50f5951f1 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -25,9 +25,9 @@ import appeng.api.AEApi; public class TileCraftingStorageTile extends TileCraftingTile { - static final ItemStack stackStorage4k = AEApi.instance().blocks().blockCraftingStorage4k.stack( 1 ); - static final ItemStack stackStorage16k = AEApi.instance().blocks().blockCraftingStorage16k.stack( 1 ); - static final ItemStack stackStorage64k = AEApi.instance().blocks().blockCraftingStorage64k.stack( 1 ); + static final ItemStack STACK_4K_STORAGE = AEApi.instance().blocks().blockCraftingStorage4k.stack( 1 ); + static final ItemStack STACK_16K_STORAGE = AEApi.instance().blocks().blockCraftingStorage16k.stack( 1 ); + static final ItemStack STACK_64K_STORAGE = AEApi.instance().blocks().blockCraftingStorage64k.stack( 1 ); @Override protected ItemStack getItemFromTile(Object obj) @@ -35,11 +35,11 @@ public class TileCraftingStorageTile extends TileCraftingTile int storage = ((TileCraftingTile) obj).getStorageBytes() / 1024; if ( storage == 4 ) - return stackStorage4k; + return STACK_4K_STORAGE; if ( storage == 16 ) - return stackStorage16k; + return STACK_16K_STORAGE; if ( storage == 64 ) - return stackStorage64k; + return STACK_64K_STORAGE; return super.getItemFromTile( obj ); } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index 17898472c..aded1a90f 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -63,7 +63,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP public NBTTagCompound previousState = null; public boolean isCoreBlock = false; - static final ItemStack coProcessorStack = AEApi.instance().blocks().blockCraftingAccelerator.stack( 1 ); + static final ItemStack STACK_CO_PROCESSOR = AEApi.instance().blocks().blockCraftingAccelerator.stack( 1 ); @Override protected AENetworkProxy createProxy() @@ -75,7 +75,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP protected ItemStack getItemFromTile(Object obj) { if ( ((TileCraftingTile) obj).isAccelerator() ) - return coProcessorStack; + return STACK_CO_PROCESSOR; return super.getItemFromTile( obj ); } diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index b793ac357..225b57f57 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -77,13 +77,13 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade IGridTickable, ICraftingMachine, IPowerChannelState { - private static final int[] sides = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - private static final ItemStack assemblerStack = AEApi.instance().blocks().blockMolecularAssembler.stack( 1 ); + private static final int[] SIDES = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + private static final ItemStack STACK_ASSEMBLER = AEApi.instance().blocks().blockMolecularAssembler.stack( 1 ); private final InventoryCrafting craftingInv = new InventoryCrafting( new ContainerNull(), 3, 3 ); private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 9 + 2 ); private final IConfigManager settings = new ConfigManager( this ); - private final UpgradeInventory upgrades = new UpgradeInventory( assemblerStack, this, this.getUpgradeSlots() ); + private final UpgradeInventory upgrades = new UpgradeInventory( STACK_ASSEMBLER, this, this.getUpgradeSlots() ); private ForgeDirection pushDirection = ForgeDirection.UNKNOWN; private ItemStack myPattern = null; @@ -306,7 +306,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade @Override public int[] getAccessibleSlotsBySide(ForgeDirection whichSide) { - return sides; + return SIDES; } @Override diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index fa4dc1041..c240f1585 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -97,7 +97,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision public void setOrientation(ForgeDirection inForward, ForgeDirection inUp) { super.setOrientation( inForward, inUp ); - this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.air ); + this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.AIR ); } /** diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index d4e0320ad..00b470224 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -49,7 +49,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable public void setOrientation(ForgeDirection inForward, ForgeDirection inUp) { super.setOrientation( inForward, inUp ); - this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.air ); + this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.AIR ); } private void addItem(InventoryAdaptor sia, ItemStack output) diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index b2feb121d..1edb42eec 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -46,7 +46,7 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf { final int[] sides = new int[] { 0, 1 }; - static private final FluidTankInfo[] empty = new FluidTankInfo[] { new FluidTankInfo( null, 10 ) }; + static private final FluidTankInfo[] EMPTY = new FluidTankInfo[] { new FluidTankInfo( null, 10 ) }; final AppEngInternalInventory inv = new AppEngInternalInventory( this, 3 ); final ConfigManager cm = new ConfigManager( this ); @@ -241,7 +241,7 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return empty; + return EMPTY; } @Override diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index d2c79a1b9..4b1b2abea 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -78,9 +78,9 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, public long clientStart; - static final ItemStack inscriberStack = AEApi.instance().blocks().blockInscriber.stack( 1 ); + static final ItemStack STACK_INSCRIBER = AEApi.instance().blocks().blockInscriber.stack( 1 ); private final IConfigManager settings = new ConfigManager( this ); - private final UpgradeInventory upgrades = new UpgradeInventory( inscriberStack, this, this.getUpgradeSlots() ); + private final UpgradeInventory upgrades = new UpgradeInventory( STACK_INSCRIBER, this, this.getUpgradeSlots() ); @Override public AECableType getCableConnectionType(ForgeDirection dir) @@ -207,7 +207,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, if ( AEApi.instance().materials().materialNamePress.sameAsStack( itemstack ) ) return true; - for (ItemStack s : Inscribe.plates) + for (ItemStack s : Inscribe.PLATES ) if ( Platform.isSameItemPrecise( s, itemstack ) ) return true; } @@ -308,7 +308,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, } } - for (InscriberRecipe i : Inscribe.recipes) + for (InscriberRecipe i : Inscribe.RECIPES ) { boolean matchA = (PlateA == null && i.plateA == null) || (Platform.isSameItemPrecise( PlateA, i.plateA )) && // and... diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index c49a813cc..29319c109 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -153,7 +153,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl public void validate() { super.validate(); - TickHandler.instance.addInit( this ); + TickHandler.INSTANCE.addInit( this ); } @Override @@ -348,7 +348,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl return; } - this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.air ); + this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR ); } /** diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java index 8469318c0..ef8d7cb92 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java @@ -97,7 +97,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements Callable ItemStack cell = this.getStackInSlot( 0 ); if ( this.isSpatialCell( cell ) ) { - TickHandler.instance.addCallable( null, this );// this needs to be cross world synced. + TickHandler.INSTANCE.addCallable( null, this );// this needs to be cross world synced. } } } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 20930cc7d..ef44e13e1 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -101,11 +101,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan } - static final ChestNoHandler noHandler = new ChestNoHandler(); + static final ChestNoHandler NO_HANDLER = new ChestNoHandler(); - static final int[] sides = new int[] { 0 }; - static final int[] front = new int[] { 1 }; - static final int[] noSlots = new int[] { }; + static final int[] SIDES = new int[] { 0 }; + static final int[] FRONT = new int[] { 1 }; + static final int[] NO_SLOTS = new int[] { }; final AppEngInternalInventory inv = new AppEngInternalInventory( this, 2 ); final BaseActionSource mySrc = new MachineSource( this ); @@ -471,11 +471,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan { case FLUIDS: if ( this.fluidCell == null ) - throw noHandler; + throw NO_HANDLER; return this.fluidCell; case ITEMS: if ( this.itemCell == null ) - throw noHandler; + throw NO_HANDLER; return this.itemCell; default: } @@ -582,21 +582,21 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan public int[] getAccessibleSlotsBySide(ForgeDirection side) { if ( ForgeDirection.SOUTH == side ) - return front; + return FRONT; if ( this.isPowered() ) { try { if ( this.getHandler( StorageChannel.ITEMS ) != null ) - return sides; + return SIDES; } catch (ChestNoHandler e) { // nope! } } - return noSlots; + return NO_SLOTS; } @Override diff --git a/src/main/java/appeng/util/BlockUpdate.java b/src/main/java/appeng/util/BlockUpdate.java index 65682c6ba..8cc161cb4 100644 --- a/src/main/java/appeng/util/BlockUpdate.java +++ b/src/main/java/appeng/util/BlockUpdate.java @@ -39,7 +39,7 @@ public class BlockUpdate implements Callable public Object call() throws Exception { if ( this.w.blockExists( this.x, this.y, this.z ) ) - this.w.notifyBlocksOfNeighborChange( this.x, this.y, this.z, Platform.air ); + this.w.notifyBlocksOfNeighborChange( this.x, this.y, this.z, Platform.AIR ); return true; } diff --git a/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java index dd27e685e..44d3268ec 100644 --- a/src/main/java/appeng/util/ItemSorters.java +++ b/src/main/java/appeng/util/ItemSorters.java @@ -71,7 +71,7 @@ public class ItemSorters return 1; } - public static final Comparator ConfigBased_SortByName = new Comparator() { + public static final Comparator CONFIG_BASED_SORT_BY_NAME = new Comparator() { @Override public int compare(IAEItemStack o1, IAEItemStack o2) @@ -82,7 +82,7 @@ public class ItemSorters } }; - public static final Comparator ConfigBased_SortByMod = new Comparator() { + public static final Comparator CONFIG_BASED_SORT_BY_MOD = new Comparator() { @Override public int compare(IAEItemStack o1, IAEItemStack o2) @@ -104,7 +104,7 @@ public class ItemSorters } }; - public static final Comparator ConfigBased_SortBySize = new Comparator() { + public static final Comparator CONFIG_BASED_SORT_BY_SIZE = new Comparator() { @Override public int compare(IAEItemStack o1, IAEItemStack o2) @@ -115,13 +115,13 @@ public class ItemSorters } }; - public static final Comparator ConfigBased_SortByInvTweaks = new Comparator() { + public static final Comparator CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator() { @Override public int compare(IAEItemStack o1, IAEItemStack o2) { if ( api == null ) - return ConfigBased_SortByName.compare( o1, o2 ); + return CONFIG_BASED_SORT_BY_NAME.compare( o1, o2 ); int cmp = api.compareItems( o1.getItemStack(), o2.getItemStack() ); diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 16995b1a2..705cb5fec 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -141,28 +141,28 @@ import appeng.util.prioitylist.IPartitionList; public class Platform { - public static final Block air = Blocks.air; + public static final Block AIR = Blocks.air; public static final int DEF_OFFSET = 16; /* * random source, use it for item drop locations... */ - static private final Random rdnSrc = new Random(); + static private final Random RANDOM_GENERATOR = new Random(); public static Random getRandom() { - return rdnSrc; + return RANDOM_GENERATOR; } public static int getRandomInt() { - return Math.abs( rdnSrc.nextInt() ); + return Math.abs( RANDOM_GENERATOR.nextInt() ); } public static float getRandomFloat() { - return rdnSrc.nextFloat(); + return RANDOM_GENERATOR.nextFloat(); } /** @@ -929,19 +929,19 @@ public class Platform return false; } - private static final WeakHashMap fakePlayers = new WeakHashMap(); + private static final WeakHashMap FAKE_PLAYERS = new WeakHashMap(); public static EntityPlayer getPlayer(WorldServer w) { if ( w == null ) throw new NullPointerException(); - EntityPlayer wrp = fakePlayers.get( w ); + EntityPlayer wrp = FAKE_PLAYERS.get( w ); if ( wrp != null ) return wrp; EntityPlayer p = FakePlayerFactory.getMinecraft( w ); - fakePlayers.put( w, p ); + FAKE_PLAYERS.put( w, p ); return p; } @@ -990,7 +990,7 @@ public class Platform public static T pickRandom(Collection outs) { - int index = rdnSrc.nextInt( outs.size() ); + int index = RANDOM_GENERATOR.nextInt( outs.size() ); Iterator i = outs.iterator(); while (i.hasNext() && index-- > 0) i.next(); @@ -1204,10 +1204,10 @@ public class Platform } } - OreReference aOR = OreHelper.instance.isOre( a ); - OreReference bOR = OreHelper.instance.isOre( b ); + OreReference aOR = OreHelper.INSTANCE.isOre( a ); + OreReference bOR = OreHelper.INSTANCE.isOre( b ); - if ( OreHelper.instance.sameOre( aOR, bOR ) ) + if ( OreHelper.INSTANCE.sameOre( aOR, bOR ) ) return true; /* @@ -1339,7 +1339,7 @@ public class Platform public static long nanoTime() { - // if ( Configuration.instance.enableNetworkProfiler ) + // if ( Configuration.INSTANCE.enableNetworkProfiler ) // return System.nanoTime(); return 0; } @@ -1746,7 +1746,7 @@ public class Platform public static void notifyBlocksOfNeighbors(World worldObj, int xCoord, int yCoord, int zCoord) { if ( !worldObj.isRemote ) - TickHandler.instance.addCallable( worldObj, new BlockUpdate( worldObj, xCoord, yCoord, zCoord ) ); + TickHandler.INSTANCE.addCallable( worldObj, new BlockUpdate( worldObj, xCoord, yCoord, zCoord ) ); } public static boolean canRepair(AEFeature type, ItemStack a, ItemStack b) diff --git a/src/main/java/appeng/util/item/AEItemDef.java b/src/main/java/appeng/util/item/AEItemDef.java index babe2692b..f3573940d 100644 --- a/src/main/java/appeng/util/item/AEItemDef.java +++ b/src/main/java/appeng/util/item/AEItemDef.java @@ -57,8 +57,8 @@ public class AEItemDef public OreReference isOre; - static final AESharedNBT lowTag = new AESharedNBT( Integer.MIN_VALUE ); - static final AESharedNBT highTag = new AESharedNBT( Integer.MAX_VALUE ); + static final AESharedNBT LOW_TAG = new AESharedNBT( Integer.MIN_VALUE ); + static final AESharedNBT HIGH_TAG = new AESharedNBT( Integer.MAX_VALUE ); public AEItemDef(Item it) { this.item = it; diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 02dcc7fc3..31d7917db 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -110,7 +110,7 @@ public final class AEItemStack extends AEStack implements IAEItemS this.setCountRequestable( 0 ); this.def.reHash(); - this.def.isOre = OreHelper.instance.isOre( is ); + this.def.isOre = OreHelper.INSTANCE.isOre( is ); } public static AEItemStack create(Object a) @@ -401,7 +401,7 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public boolean sameOre(IAEItemStack is) { - return OreHelper.instance.sameOre( this, is ); + return OreHelper.INSTANCE.sameOre( this, is ); } @Override @@ -467,7 +467,7 @@ public final class AEItemStack extends AEStack implements IAEItemS { ItemStack o = (ItemStack) st; - OreHelper.instance.sameOre( this, o ); + OreHelper.INSTANCE.sameOre( this, o ); if ( o.getItem() == this.getItem() ) { @@ -555,7 +555,7 @@ public final class AEItemStack extends AEStack implements IAEItemS newDef.damageValue = newDef.displayDamage; } - newDef.tagCompound = AEItemDef.lowTag; + newDef.tagCompound = AEItemDef.LOW_TAG; newDef.reHash(); return bottom; } @@ -594,7 +594,7 @@ public final class AEItemStack extends AEStack implements IAEItemS newDef.damageValue = newDef.displayDamage; } - newDef.tagCompound = AEItemDef.highTag; + newDef.tagCompound = AEItemDef.HIGH_TAG; newDef.reHash(); return top; } diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index c35b76b5b..2907da282 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -139,14 +139,14 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound /* * Shared Tag Compound Cache. */ - private static final WeakHashMap> sharedTagCompounds = new WeakHashMap>(); + private static final WeakHashMap> SHARED_TAG_COMPOUND = new WeakHashMap>(); /* * Debug purposes. */ public static int sharedTagLoad() { - return sharedTagCompounds.size(); + return SHARED_TAG_COMPOUND.size(); } /* @@ -175,7 +175,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound SharedSearchObject sso = new SharedSearchObject( item, meta, tagCompound ); - WeakReference c = sharedTagCompounds.get( sso ); + WeakReference c = SHARED_TAG_COMPOUND.get( sso ); if ( c != null ) { SharedSearchObject cg = c.get(); @@ -193,7 +193,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound sso.shared = clone; clone.sso = sso; - sharedTagCompounds.put( sso, new WeakReference( sso ) ); + SHARED_TAG_COMPOUND.put( sso, new WeakReference( sso ) ); return clone; } diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 60b6e053b..4039d179b 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -30,7 +30,7 @@ import appeng.api.storage.data.IAEItemStack; public class OreHelper { - public static final OreHelper instance = new OreHelper(); + public static final OreHelper INSTANCE = new OreHelper(); static class ItemRef { diff --git a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java index c4d57b3ca..e044ba1e0 100644 --- a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java @@ -26,7 +26,7 @@ import appeng.api.storage.data.IAEStack; public class DefaultPriorityList> implements IPartitionList { - final static List nullList = new ArrayList(); + final static List NULL_LIST = new ArrayList(); @Override public boolean isListed(T input) @@ -43,7 +43,7 @@ public class DefaultPriorityList> implements IPartitionLis @Override public Iterable getItems() { - return nullList; + return NULL_LIST; } }