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/tile/crafting/TileCraftingStorageTile.java
+6 -6
View File
@@ -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 );
}
src/main/java/appeng/tile/crafting/TileCraftingTile.java
+2 -2
View File
@@ -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 );
}
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+4 -4
View File
@@ -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