From 7bd8cf3f59367d1360eda46b2a7bfa1918bf7505 Mon Sep 17 00:00:00 2001 From: yueh Date: Tue, 8 Sep 2015 00:19:05 +0200 Subject: [PATCH] Changed the interface to 9 slots to be consistent with every other machine --- .../implementations/ContainerInterface.java | 10 +++++----- .../java/appeng/helpers/DualityInterface.java | 18 +++++++++++------- .../textures/guis/interface.png | Bin 4000 -> 3945 bytes 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index 71dbd054f..565d33c3a 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -50,19 +50,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 87f69c4af..5f77fe652 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -100,18 +100,22 @@ import appeng.util.item.AEItemStack; 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 ); @@ -279,7 +283,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 ); } @@ -616,7 +620,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 5b4eeaadb96b6ca0b83e37cbe6fc51f036cf0fab..d9fa10581242b9beee39dff746dc7aea1754d90f 100644 GIT binary patch literal 3945 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4mJh`hM1xiX$%YuEa{HEjtmSN`?>!lvNA9* za29w(7BevL?FM1S<3FyLF)%Pll(rIsj|=o#plrnVZT zGBEHx_jGX#sfc?!m$yjfDxcfq>2El1uy0VW`!*@GC6uu;e45pbtgXxP<8NNP@jPU1 z)2oj)`_=~5YX)`x{Lr$#qx_NXqVIdAnE(9sH9Ok;*nZ|a?3>o_+NSs|bbWJ;{oifJ zPfRbpdXBxo{?FIz@$UTdYLC92IOnPKN_3z9R*f=|! z>p{DGUBtJ3`+ql{{@UD=ulv8EE#~#Ax&9x`+izT4&8oovp(`-2Xj*>H_N`aXE&nmw z`HcoxJ4il|Yk{Bj{73nG8yAZ>%q_D!dS52VU9-XJZB5sH%Oib345hbziqsc($S!4g zwdJ$szh?s0USL=JIjdMUg=xiQJO+LbVR)>&cB`=#OjmjcT-OS?GXmkxSPXVXI9Eb- zL-@y?AP-kBWr*|QV)!@}WV^A}MP8+{$sjvdxR`g`IIG9HVQw>%Lyc>`P09Iv&$do^ zzxw_^%f}nD*3J$5*zES^#oG3~4{sjUWIp}Kq%PoAtjZCR%e3Y(rT z`7JdJ^X=>7f)t)d6cw@VpZ-0BLHe;-R91TMp9PU;l24vod*)-cC*zgO0TjruZTPf& z%aIpbeH-WeD4jUxHq`k!UGgT~lKb^0eXhbM^5r7?j@p8IFS1#SPE=-1QFM#f{;_un z!>cWuHR~?8%P**Sc37CT=)}i!PY}X4*){I{`rv|L-J-CQhw@|4{A8xW@RH7vmZazr0jXa!Z(N7{-<0T2!Q6{3kAm;kv})JDJx- z?K8waM~rl_7jKy(TIa|V6`=$SsDijI(f`A5_c}-dDCqsz@qWu|Xe<+uI>*n?&;NLS z{QiHx-|v68LD2f=)6>(BxBq`WzkV5m+D*A%%Yzsy!h;yD!2D$Q|dzHSgPwtqg{}H5EjrGHhY5DxRsz2Hb zFJ^DvSJLm zUK}QpR+Lhxw0+Ktt&-Nya^zoViCPvd^RsNafBGiV3zPVVQ=fn8{WxuIS?tHgOCg_v zYs3D0K5xIgXwm#@%BL=eiWXf@doyEm?Sj=IPfpCVdddL` zrUjR4TEpj^Ha`|!cB}L#yH~KQ{nm81I;DU-s)Xlut_PZr-#+J3`1Q<~>xs;5-FAvo zY#F%a3IVoRZl;UF5)(7^h>mH5)`>O{)P@kS~59fB)ZYzdLO=bA?)d z`u=?J^)#DP6YY0dJ)S1K*X;54QzvhT<%rG~p8L256ax>IzI(0}YWdIZH1~tk)Ae^} zhpVV>kM=81=YFs^B8~ynv`*4ws1Xlh*eJrVE$pB0(=NMqrW?D@F4@AcX#Oqh)qmRD zOa6NNzg%Ums=muE`?$={*oUE@2GZ%2i}UyXi<@fs!lF;I|My#_3H%Oq?DeicWxvgo z`8oH^30+YBStaxH?#t?P6WO(cCV;XbsB*g(@g<%AaCPvz_~R3dk5#Q>Sj3;|);K5m z4ZGI=ROn2P##qvP*YSvQ=M&}QABWVv%HxD8o~ zq?kap`nqRh5Q8?X^%jxdGZiV8t&-P>9O!!TB!@_5EN556!j#+YQAN7iq5K^r!@-;f(y3H96C=QFK%eEC7)j{X0B zy)OU$lD%h!W!ZEljYpS{_sbtvR4yxdqr+csIA2aqZeLygaZ7>o9Qp^AtJnSU`}f}Z k=ZCp04733aLUuJj?3+_=M6a2$P!D8>r>mdKI;Vst0Ce$uFaQ7m literal 4000 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