From ef6bc3e58f9a3cd282573fdd33306175bec93b6c 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 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 5b4eeaadb96b6ca0b83e37cbe6fc51f036cf0fab..d9fa10581242b9beee39dff746dc7aea1754d90f 100644 GIT binary patch literal 3945 zcmd^Cc~p~E7JpDvG!CL=QEFrn6(a?v;(!4PqJW5FkU$_71Qn4Amf*)K1QJ)4BKsmo zVh{v8vX><)>x@cR6s0ai7D1Abw1Dg+fe_~VP*BgD(>iB5(?9y1lanv^z59Om{_ef+ z-b5e7@0CY?i3R}3@3XNa03ZXu%7Epc!(Xn@%@gp~GB1k*766pRuaq1`!M|7d*&Ol* zU{y8pkzt9R8N$MK0al~{2l9!4;G>Wy@H=|aH$czVGeBd9-e2|p=6P|uC%l=z&(gv% z#BG=^4`H6KvgV`@tzgTQYDY{b5ibyB&N!zTv%M?x$nG!O*?dR(xnIU8bw&16EFoGv zdZ8pLxL-G0Sd(HTo|*D-F>0*;tXuBKlDk!!)5MbV6!W<%R#ST5^ENp@bIDYP`(A}> z;SUBAGkNPdt)1TdS%o{A_uHi7t@`mTZ_Ip0scaRU_OOBjZR3|ur&M){Qv{!{sXmhj zvW2x5lt91Eewk+{`3~9ZEr+(C4(8MCqJ3AFU3EtHMXE=TrsK_}Y~DZCy}D*6q<*coRlHc~x1C(k^u--4Y}Z#iV3WAV6}fkH>X(JiVp z*tV$U<+!AEbIA<*B{Oms%y32@38OiW-9a1<%LQ(>XfT$Fpc`y!m){taj9}ihG>T$B z(nFQf&&%$jSdmQw9@h<2ri>KyN^zVr?;^VW*m>(AK~bdd=+JA*N#5+w%pL=^f)|~t zso$}qdQ2z!b+P&KL6Q%dTp#%tF0YjlOi5eE^{)r(aH&N`Z)CMN<3J zq2}iBR$PQW!cA<9dIbeA%&Be!4L%8iQ1$7suj@I6-+FsFNU{z+^k{A_dN>xg4`%8Q z6p+JdxgP^z=0^oMm*W8o)t21PZ3@kYvaBbzm(hhYG%~(-|!}j6h>oZajc}|56<|hO*tWX z4?eDUKf?A^m~HvGTVGiOggZe{FZ5nq8xC~PT+Duaai1^=34fl*qWlVcmP-cbPbwg* zH*Di_6O!NiuN5?@wld3LTI2vi)Cr)H&9Rf|3%8MZb}Zf;MH9aMMx`O7#_b`|`qDzW zBgJmG`AfrNMo2=RvfXj&zAsYjFH?{Lc^l>S(lym@Q#kvm*4x6%v%F_LG*GMD5K;l( zUk*$1d_?~4Qd%q@#uAX(5)fqxNW26zfn5apqyvRcV1sJB3G5RVRoWKPjRiG!SXy8s z2M_yeD^qBoChS6K%#)c!9#uj4Fe5dyo0*C5MDj9y!$+1bsvd(jYq4 z#f$LO#cvb9@A6pGNX6j0DF4P%n*#iB81D7b*^&C!rE5&Yyw-G9!Frs?FpR zK!`Jpu=sjyD{XitY=>uG-elR54EC$CeG<0HejG4xoMZ)p;dQcLq!Izyity0kG0kXn&bu zsZ(9Y^BEDL5}oVqKIL@*agv@XRqFhlaCD}S%WdKFgisa8?mooBz-<9ei}19yG>Vp3 z!&w6Ru^*C(`3ytccF8SFMm4vozJ!!o-s3#k8B4^qySZU$Tf?lcyTsK$UW=s(u0Cde z|BvS8TyX57FHUNPr70#Q@0Yoc?tvuX1fac1J6$$P`7Td1djsHY@Or4#IsvU?!hJHC z37M{F4JSbwXCzs6rzY->(yqcMx~yJpl;3U$!qP|xf*rc=0+&kwWxJUeDnqGZ#isz( zID*i_V`s^Meq2mfQNptNbh#g-qRMmgGfWX~#V4D1$PJ7Kzu+19J1L!jj-TGh%oJ3r znhcy$7i?3;L3w!Gx!%^7vVtA%uT%Nsm&elRK``h~j^hsDPLheo=J`-Ixhj9eSa4| zndm+&XPA%Hm>DpDdvup>=n{qS}H!kGobeu44Ni@G}%t=$MHRK3en%OF+lo^V2PAn3EzT7wb zZA7@dTUYkArt4SxIB(Ksy5NK1m0FS;Kt}6h@cpwEu2dyZXwQV?2J>5pBP}mhAN3{}f zn9jh6=|fGrNd4Txh zEh7M(#p#XY6`T4&l#M+Kl^SBWT&DqKsC@CCLW-RHuStvkDVQpELed{g^NF>8Q!yB$ zKI!7>hun6WEO7qtfCSSEi_P|h9$37WhYP~ zAOS3bQHUTCzy%U~h+#*hmaQeI31A_tfv^P9dl4wi>&$cJjq{qB%)R`7{&T)_&Ue1^ z6LpMWu^zbv2>`%)D@#)n0KmXk81T`D;KPM_%L{z0p&UMX7yybAl;kH7;NR=~Eu8`Y z;FEIb3uBg3t-wXqKr_ccvY%IA@JZ?!!2hJrSAl!KIuod|fA2nn{s|udP}ZepZMEYbLGdgJBO4gIV>{1atemPQnr!NY0;GT(yRYeEP`pMos%%SkH}v6c3V&LW+d*<(fQ9i)lhivC(-ffhfia!jF&Kn*}@? zWM^!#0&@r1Nk~>6t54CjL5kFA&A1jqTzM|M-Mj1r$sm2xdfIlS@ZGquOWtgAC|w=N z-tAgWBd2QL=$IPlCqX&CXY1Gma1|`>I@RJ235Ei+j7_9 zUXLKD)gdzI>~^R?N24wqCL!=wSv(UiSqp-B4uZLRsz@Y7EukZW=uSUQ*ugH`Ao zswM8uXrjmjd1Wz6feJ zg|HHVMT|zK6Wms#FRXW^-45q9Uvt-F8x!OYLl&~MY$;y#Wh@*g=nhzA=J}W!qqWa% z6^>;0b@t3N(FM)c1Yz_lG+$vv(f?`VU6Sz^tk3&|M4i=e&}27PtgMYWr+1I4@tMI< zHZXD^2cQ-Svf!0n40ug7Isys!RXOjbPli-n%jbT)+!7$yz+PEm^jjH%NV+k9p({Yr zXxaa;$Zm7aXN!c5b8K|hp-*}I zEbHB(qrN{Jy^BG=JHW2z=wL7=GSVYs@;(^|NhbjVTtNmHZ!+AGZ8-EA&QK`2^2Yd# zw=|vOP6{k-CZ zHpreW=aUU24_~cq^hDb%nb+^s4(|M>TKQV_A+Y7saN)XGx-Zvuh&vFC*&p*QC^32g zayJst=6&NApEgkSRL4R6@amna$N>sk%pbHC=!8Gp-3yAt{{f(M62>thV5l>z&_H9O zpane&#{ZTAJzFFjg+6V}w{`w+TNpGN-HFFw6mv46e|scTJ~J`UTBVpCryxC&BtJ%g zbK@YG;EcsraTL70fN$~Wobp@%7AVKAMT~IkhfxnAK0Oi}8kGXCOut74h%|X-;&hFA zpgOHHWiSUAxp~MLXrT?erp0I%KT9mni953sG%HSnM|R85;Qml95TE<@adZ!$CT+$m z%0;?-`IywfZh1BZX7i zBa-F2d$XR z55%U0jgFsFW{n+cYZCSB>Nd*VnpBN*r;&b#Qii!@gJ2UVC*MrU`mOktd&HbRbMqV* zZF~7MT#K(BT3l12R>rc+7hB#o12bNiI6FqeIRmys92DL!BCC)Dj2$k}=I2pFHHF%; zR4vQ+(Ca#0;&U=o#eq}y@jbFJYnW+=9`XfM9>xP-g`wvEVx7tt9|MX^O4K8=R4Uii zzOjKlS@;17*twmpi`bxZyna+>1!FN-JQZUORI;52e-r8q=`VB$BA)EU9C0wsF10qX zI_ei{cAFO`wK(j0{%KK7+Ai@&;kp#1>(4_k9n7o`?sN_UbgR7@4|7Rr%q;9K3?1#y!e%FwAR{7nrvrc-Cw`%#h>ra#&V*A-?~*qF-HnyM%# z0k)H|3)#B?4NOinngQbOwk7c; z2dwk)V*~cv7nS_aL4>&ge8v3i(9X$*U8lu0!mI?h^ige#`TpNxoe9#;So|)wpwuIO ziq)@9kwRQ8{08q(Telz;?)>myT_1rC^To%5!TVRt8w4G?reB3u25TZV*uXq|#CY3+ z{s3)yMc0=kC5@Te6~%RaA*O8!Qv97@GBtak*uEiAh;p0A1m{JN>Rk1}uwB~4_}8hE z_Y;(ijezM-Mv0PD;&)B!&#s?mWLsZG=LKh=P3P~autm{xQ(v5Z5?z`heo5?Yt*WYeolu(b!D#FVGW0^P03%X_GnDa`;QzVr>Wbon X#`{~HI<~?P