fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed constants

Browse Source
This commit is contained in:
thatsIch
2015-01-01 22:13:10 +01:00
parent e0175bac98
commit 52c512635d
118 changed files with 511 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/misc/ItemEncodedPattern.java
+3 -3
View File
@@ -134,11 +134,11 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
}
// rather simple client side caching.
static final WeakHashMap<ItemStack, ItemStack> simpleCache = new WeakHashMap<ItemStack, ItemStack>();
static final WeakHashMap<ItemStack, ItemStack> SIMPLE_CACHE = new WeakHashMap<ItemStack, ItemStack>();
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;
}
src/main/java/appeng/items/parts/ItemFacade.java
+1 -1
View File
@@ -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
src/main/java/appeng/items/tools/ToolNetworkTool.java
+1 -1
View File
@@ -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;
}
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+5 -5
View File
@@ -82,7 +82,7 @@ import appeng.util.item.AEItemStack;
public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem
{
final static Map<Integer, AEColor> oreToColor = new HashMap<Integer, AEColor>();
final static Map<Integer, AEColor> ORE_TO_COLOR = new HashMap<Integer, AEColor>();
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;
}
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+5 -5
View File
@@ -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
{
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+1 -1
View File
@@ -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 )
{
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
+1 -1
View File
@@ -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;
}