diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index fafdf819..5c5ce027 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -49,19 +49,19 @@ public class ContainerInterface extends ContainerUpgradeable this.myDuality = te.getInterfaceDuality(); - for( int x = 0; x < 9; x++ ) + for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ ) { this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, this.invPlayer ) ); } - for( int x = 0; x < 8; x++ ) + for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ ) { - this.addSlotToContainer( new SlotFake( this.myDuality.getConfig(), x, 17 + 18 * x, 35 ) ); + this.addSlotToContainer( new SlotFake( this.myDuality.getConfig(), x, 8 + 18 * x, 35 ) ); } - for( int x = 0; x < 8; x++ ) + for( int x = 0; x < DualityInterface.NUMBER_OF_STORAGE_SLOTS; x++ ) { - this.addSlotToContainer( new SlotNormal( this.myDuality.getStorage(), x, 17 + 18 * x, 35 + 18 ) ); + this.addSlotToContainer( new SlotNormal( this.myDuality.getStorage(), x, 8 + 18 * x, 35 + 18 ) ); } } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index ad762d9f..8b2f3080 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -101,18 +101,22 @@ import com.google.common.collect.ImmutableSet; public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost, IPriorityHost { + public static final int NUMBER_OF_STORAGE_SLOTS = 9; + public static final int NUMBER_OF_CONFIG_SLOTS = 9; + public static final int NUMBER_OF_PATTERN_SLOTS = 9; + private static final Collection BAD_BLOCKS = new HashSet( 100 ); - final int[] sides = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 }; - final IAEItemStack[] requireWork = new IAEItemStack[] { null, null, null, null, null, null, null, null }; + final int[] sides = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + final IAEItemStack[] requireWork = new IAEItemStack[] { null, null, null, null, null, null, null, null, null }; final MultiCraftingTracker craftingTracker; final AENetworkProxy gridProxy; final IInterfaceHost iHost; final BaseActionSource mySource; final BaseActionSource interfaceRequestSource; final ConfigManager cm = new ConfigManager( this ); - final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 8 ); - final AppEngInternalInventory storage = new AppEngInternalInventory( this, 8 ); - final AppEngInternalInventory patterns = new AppEngInternalInventory( this, 9 ); + final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, NUMBER_OF_CONFIG_SLOTS ); + final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS ); + final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS ); final WrapperInvSlot slotInv = new WrapperInvSlot( this.storage ); final MEMonitorPassThrough items = new MEMonitorPassThrough( new NullInventory(), StorageChannel.ITEMS ); final MEMonitorPassThrough fluids = new MEMonitorPassThrough( new NullInventory(), StorageChannel.FLUIDS ); @@ -280,7 +284,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn boolean had = this.hasWorkToDo(); - for( int x = 0; x < 8; x++ ) + for( int x = 0; x < NUMBER_OF_CONFIG_SLOTS; x++ ) { this.updatePlan( x ); } @@ -617,7 +621,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { boolean didSomething = false; - for( int x = 0; x < 8; x++ ) + for( int x = 0; x < NUMBER_OF_STORAGE_SLOTS; x++ ) { if( this.requireWork[x] != null ) { diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png index 5b4eeaad..d9fa1058 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png differ