From a1f212dc4d952d7bb147f5e59e600c5ad84b9791 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 9 Jul 2016 18:09:56 +0200 Subject: [PATCH] Controller Texs --- .../refinedstorage/block/BlockController.java | 2 +- .../refinedstorage/block/BlockDiskDrive.java | 2 +- .../java/refinedstorage/tile/TileDiskDrive.java | 2 +- .../tile/controller/TileController.java | 2 +- .../refinedstorage/blockstates/controller.json | 5 ----- .../textures/blocks/controller_1.png | Bin 699 -> 450 bytes .../textures/blocks/controller_2.png | Bin 731 -> 451 bytes .../textures/blocks/controller_3.png | Bin 731 -> 449 bytes .../textures/blocks/controller_4.png | Bin 729 -> 454 bytes .../textures/blocks/controller_5.png | Bin 728 -> 453 bytes .../textures/blocks/controller_6.png | Bin 729 -> 453 bytes .../textures/blocks/controller_7.png | Bin 728 -> 455 bytes .../textures/blocks/controller_8.png | Bin 455 -> 0 bytes 13 files changed, 4 insertions(+), 9 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index 78b742047..8b0fad77c 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -28,7 +28,7 @@ import java.util.List; public class BlockController extends BlockBase { public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); - public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 8); + public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 7); public BlockController() { super("controller"); diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java index 5f0bdc9d5..3399c96ea 100755 --- a/src/main/java/refinedstorage/block/BlockDiskDrive.java +++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java @@ -37,7 +37,7 @@ public class BlockDiskDrive extends BlockNode { @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { return super.getActualState(state, world, pos) - .withProperty(STORED, ((TileDiskDrive) world.getTileEntity(pos)).getStoredForDisplay()); + .withProperty(STORED, ((TileDiskDrive) world.getTileEntity(pos)).getStoredForScaledDisplay()); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index b9a86af62..cc5972dfb 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -270,7 +270,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag return (int) Math.floor((stored / storedMax) * 7f); } - public int getStoredForDisplay() { + public int getStoredForScaledDisplay() { return stored; } diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index cee802070..6ed1ef35e 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -662,7 +662,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } public int getEnergyScaledForDisplay() { - return getEnergyScaled(8); + return getEnergyScaled(7); } public int getEnergyScaledForComparator() { diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json index 081716e07..3fdb5566c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json @@ -55,11 +55,6 @@ "textures": { "front": "refinedstorage:blocks/controller_7" } - }, - "8": { - "textures": { - "front": "refinedstorage:blocks/controller_8" - } } }, "type": { diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png index dc40db41bd150609c559fa789e3bf4958bc00fa9..c4049f7c0268695c11981e061b1f319d9df9dfff 100644 GIT binary patch delta 366 zcmV-!0g?W@1;PW6Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4lNklQhU~sK%H)dDAxSId9(_ z3BznKxbpo}sc{%iqbQH#95t{Gf*YkQV@cC;wc0^dJ=XQJWx0I#$!L@bHCUmh1KPde zpdSRm^`W@5j1B)4ZZ`D?o?M=EdNY2R?kTbUGFI z+me33-|>K+Cjz}*N;u&J ztR)i>&W)v_ZQsy$5ugLx_4>)u?JyipBuTU-^g{$V>fUhB4@)pZFZA<7z*w>njsZ*i zl&Fmd)QlH3*pl0?<3xu0l>P}78E-vs-|T0YdB!2F2oVM5-{AY{7m2E5Xb5gyl>h($ M07*qoM6N<$f}wY;J^%m! delta 619 zcmV-x0+jv21G@!~B#|)~3cmmV4!;371ydxEQzm}`IY~r8R5(v1lCf**P!z^5ynp5W zIcifR#EL|M1c|W*c{mgYhYr%gK^z<$BtwSakfB3x2$Dxdup|<&Bq7*9g7k@%lEFFe zOZ+A0a=7>V&be?dc?B9m&qCJ?!`S5LOC9SHU{}v1nx-ul3xbHl_yUqka!sz+>-l`X zAijUj$de?&$>DH_<2XEovLX{zRUOA^TSd`=L)?+Y#A7)8xy)AtWJgW`BRrgwK~ zv6$PAsQBUgFm~eRv3?FbF)3YnY}vnNG-bHbpOv zS<+zmRKXYzJ!{IX-jYhDtb=GxVmSxxLb-iBqa?-~~{GR8!d$(4r zLH06wA;aO&TxSN$w$aBh%{p6mA@bat0iC_TgJ5l%BNztH1MO8~7{;=#YNfK&mz94? zWxsc9+uA#OV55>{Ltre8!C*l8{XRwr(RRCKXa;?&)hcp~`PKn042q^13>so0NfL%# zE|=5a1S=j$nJz)P>sXJ!Myt=Xf7EiY#ODd7vJ^ zZ2{V1Z#J7rqC|Ke^KFWvi2GrE%0ZPI=#PU8G5bWZ`5!f)-YAl_rm_G4002ovPDHLk FV1j1;CB*;$ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png index 2b272658b24d161a59ea9119380c973168a3a6ce..7f89eb51c5098a7f6faa6384ec37a9cc27788566 100644 GIT binary patch delta 367 zcmV-#0g(RN1;Yc7Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4mNkl$Ei4HYPFJrfpJ!ZJH((LF(`0#xHJI(^W+HIP5OFGiMJY zzMqUnH?A8iHTC^@5Ts$4q8iqocc+wLDsh}|HU}t*=dye?tk+LJnM@L)1}ju|K>If= z+6SI@yIMVl>i;sZnrOneuwdRCQ;N{LYs2|j`}w&+Dr$Sp%>bm2xv!4WPj2RCKNgf>=>Gnhxlq0@I4)z` zcD+$2jb;P0IF5ULeT5Xoe3mc$oR{x>%5jwERm(41{zs}(xg^zU6{V?k>gDAnl}h#d z{d795+`V7eOL}++L!ka%9vmD%c2&J1l}g3#2L*qgo-oI^}?6$_pF^rK$h`002ovPDHLkV1ibIJJ|pL diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png index a9d310c125543f1453d85ccc58851f52ef0ecf37..9006af00ee740a8894706a8ad57da5f840f2e2a0 100644 GIT binary patch delta 365 zcmV-z0h0dP1;GQ5Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4kNkl7pu-)tGMAt1W34Hn|Y7-&ok{(M~gYDs0)7?Uq2ZPVU+dU7QQ z(#ho7brav82f;E7vna|?4QtQ4^?k!!lBC$}S}4oss(LkSw@*Kr%~GKTD^zzthc_(L z1JAqJY#vZ)1RUoo&wuZW;?a<0^?F^eRuzoLk?K&_@2K1f(BW`+(^%z!4}V)aT?+hd zNj>22ctFo%fzc?m{Ah569$9i+0Xmc=iM3X3jZP_Ng{Bt*zP}jWusBMoYXwLNC!Bz> zq$9$)wv;!`2ijc<(1GoK|6&++m`)cG$I24goe6L>ykVgpU`mEw%F>B|wqzh24VL

a00000 LNkvXXu0mjfJ07V& delta 651 zcmV;60(AYs1KS0VB#|)~3cmmV4!;371ydxEQzm}`SxH1eR5(v9QcY{(P!xSIe`S77 zwH67nQj{P;Vyr<*I@PqM(1mp2LR@s=Lb7lXq!XrPCL=V=1hon-#6^)HQl_zuQMz#9 za(Hu+&dEKOOYXTJa38q`4A2Z{nwDh^LzrC?z6;>58AuGn=yW;+bf4XKVEew^ZFjrf zX0v~J2fYpA?RJaIVzF>t_j&QGwKbya`gA(Yg%AY6_1r?f02GTS`Ft1^3b}j^q2oMh znnpl0fYkSWLC84^2WeSfmcM$6v4St%2FCOJWHM>BS_E_)N5~1UFE80_)^Qfdo!%~$ zJCE+~(@3QJ&4Z!iljGFub<$`w#^Z4&lX-s$3ntSE;7+*~Q&R~(nI zZM$*PAUDk$%;Gq1KA%I1Vm`~4f4){8e9Cc@=T*zESpG+B*S`DSCbZR!6rBbQE zV31Cym4~-WdrgmzVF=XU>!YJ1$gXSGq*|@ogP`E=m|%`&+v!wV`Q=^q{}-tJwc3AM zLol%I8Vb}a)wnlUmZf!)OeDHyH<3t`?YGLKUm5!9a9tVrFbJ%!rK&1X6a^=Qh_Zxb zSjlE@j&8CT<*E$kw-<53IYOU7K?Zt=*=)N2J1y* zQ6LflqkDUMh|vfIdPkS#Qm~TN!utr()-+r`B>Dl^7Qk5iYc`vbC=s5=eY2t{Vn6s& l2z2=X<|7e63_elJ{sSE#$!b9mw@v^6002ovPDHLkV1mU~HS_=g diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png index f138e3c8b149e1d5c66f4af12c5e6ded2fb46ce3..af95a9f02179a224370bc22e6c126e43db723bd3 100644 GIT binary patch delta 370 zcmV-&0ge9I1;zuABnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4pNkl5@l2?}3e_FZ z?hOm|z;!QIt6Nkmfq!1_JWX%1?9PxR<#Jgr76l9jq3TeUFQ{A#&|$ZG)>!3%5AQ7< z&jtRrq#p2hJfNqMK))YYel)m34=lZZ2+$$VNvyVNYjjE}EA;bC!1Jcv8x{vCHMIaK z;e-<~mUKio*Ot<%dPSQv0XneVZXXTZ4x`ajqDWann-c+!x=%MO)C0`WOIbP+(3T8@ zqrp;}61DMw>hYomTXOq#oXD_E>7P)M@m2%(O*_NPGY)A*h$t}s8pnyh0A4$74pYAL Q{Qv*}07*qoM6N<$f)kjcs{jB1 delta 649 zcmV;40(Skz1K9-fFY#q&cx2xEfceNhpu)AlHBHy`VF<0KA@%_L)dGpCs@-mv!0oxc1~%)>cC+1X zecyjy!yO-dv)Ldso6T(7p3mlTM<$A*OsCUa2$p4S$1daxK(Tm|&xfo~$mMgOmh~#j zGJ&H3q^|3-Y|fflNDIoc{M8ZF6=LZ&Fot0!lS#YXCUDEL*c|)5SY)$V%bFo~dbq4pQ_caNWET1X)=}k^Oq!(Nz*h_sg(Hm zQ8m2kPye#-gGkTb@$oTa*Y#^stJMrMDEK!fn4=p;Dwz_Woa(@bS0_xDoxY721&%@J*^jy$IHe?<;ATGU1{i5Ocw@$-qR&XBBChbgb?j$LQ^#6 zCK8FW{_p2x9cvDof2LBs=zQ8A%!mq(8HYbB1HfQ%gU!t3Dq zA`t|k)9FN`(cLF<6g^UuP9zdN8T@fR9ok=pOGM!%FbE)nm=udeybkoHC>VwHBGCwN zcnFUi92|h75ek&9A_%2mCAp3F5uzi@xP0j72Vh$OWAU%mYVjOT7zX#vavX>K5KAG@ jWe?0pA^;bB9GCqMgZ9oEb~y>y00000NkvXXu0mjfGZ8&s diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png index be1b3745950d1fc70247fd21e93c2a76df762a0e..65418c59763f02101a2bd87df694b7b0a8949d34 100644 GIT binary patch delta 369 zcmV-%0gnFI1;qo9Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4oNkl{n@x@;F;RA(Z9J#4M2_50_Z7b!Ifg866^hhdBwSo{8^QkIECQM%bwkY)FI{%BdR?|w2I&V(AQP}2cz z-*C_meE(v#xJCNmjLMY&9d^4XgHs;(@ZQq# zT;Oj@`T>8(1Nv4Abh{(Rj{#Tcfu;8k0Xk$EiB(Q*gGni2g?_#YC^c>0a5zY*t^`O4 zC!Bz_WFo@3v6PhM3tFEF(1GoC`(SBz7!0N|9&1ZzeIme7`%Z>~et;QzX-h`}#*&3_ z3|MMXqBb5-GhWnSOK!i86B#xs{SzuO-g@A^X=a#t#v!c;5e4So;Cay(k@s&-N^nJ# P00000NkvXXu0mjfMK+}w delta 648 zcmV;30(bqz1K0(SB#|)~3cmmV4!;371ydxEQzm}`R!KxbR5(v1QqODRU=aOa|CRl7 zTCqroNHK^6i4lX8bgOBNr3dN3gLv@ZL2~dAq#L$nHx(M%tW9OhOOB zdf3C_zQmWA;gNas1Lh-lfCkq?*LA}%MiKOZjyM4DR}UqcruF-M0(Tb92eA3rY&YBO zHVA)$54anEZ#Elb=JUDZIE(p0=_y22)!A&8kHB%9<2uDc5h#^T3WbOji}^wx)V5z0 zMImrBfYkFmj?3F~8);EpRld5Cwni-9gvPS$bUN*Jy993AHkaq#mdji&XWMh+PH$Gy zt-H6%x6sh>)wY|>CTX==lgT8T%`T&Y>1=-res=qI{$qWvuP^RBMCtoFlgXN<*=n~) zyVJ(3OeQni5lB(Y=Ge;pTlK-K8eZ+umyM9@Q}y~4X*3!rO*82~e@Qx>wk(Tb80q1? zX8N_C!R0Ujk)QnI<73FK8`q>>ubWm_@NYse$1qJM%}9@K?b)wc!KD?*&%QkLA+Uc; zvw;HnO4jZ)nx=P6l1e5A`XHH1R?PS6i&q_a^2o1R9t;9wV92seBuT;vA==S|rfAGf zrBY|Z)y3F@RS`!ap(q-MhL{L~fMX{TiQQ*{hzF9O65`OQj9uy1S{l0{8N29(*C7Zc zB8p{QGcpFQYw}3I?$V iJun}M5PbOYeC|IRnax>RbMsID0000r$TA~ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png index 0581bb16edf0a2caa006f738667f54dfa4c1356b..99770062ae637c3bb608cf41a56f69b57c5685fa 100644 GIT binary patch delta 369 zcmV-%0gnFJ1;qo9Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4oNklS6ooJND!!BJwltYGCN7>#B!nP^LBb1cA7_fCd`et;QzX-h`}#*&3_ z3|MMYqBb5-GhWnSOK!i86B)KC{SzuO-g@A^X=j*u#v!c;5e4So;Cb;E=CX4z)D(GA P00000NkvXXu0mjfEPARH delta 649 zcmV;40(Sky1K9fBYJo&m)n2bh;P%4a0Nc%Wx83b_ zzVCl;;EoTz-ENVY&*!#nFXjumD-%UgX0uuD0G4HK$1daxK(Tn1&mUN!kjv*lE$da5 zWdcV7NL|-u*_<`EkQS6>`HLf}YsAuBU<|`dr_)ZSL*SNWu{n12_Lj|NEo+Y4`Q1{y zcaB#68W=jhT2`acAkAiTGMQvDna_KIg6V&33Vw0Fy8OPr)YeyzE~5Btola*A!)Uge zq}6U=Ryv)Y?FpnPX0lBAaaDP8E4o{K_9Q(Z$5gF$L+bT9N|UMNpT8uTOq!;dN~Of7 z_p0GlfBM%0A4K}$B@zk9ZtJ(CR;w9iQ1EX;Fh@6xR5B$#JJq3AHT`STmxi7+@F0IM z4Wo_%=|)l?RGOyu4HA#V`dU90iL_|@<2_f3kgr;cB zjmP5`gXPuOg;fwo0ih@whlZH&Jda~XqtX3Gf`|tarJ};XE{`4Y*IFDq0U0~!h1bFJ zMIs17x7&?GBKr^IG;*pa-EcT^HvDmYKC(ZJmWaYjU=TnCF)0>{cpd0XQ7{VYg(G3$ zjwb2Vh$OWAU%uZu1;Z7zX#vavX>K5K9N3 j%MqB5L;x=MI4=7i_i4;eaE;oL00000NkvXXu0mjfgnKba diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png index be02bc5425f4f283b64b39174e88ee7b9b696436..7e798a96e906ef7a3ff44430201c703e9b97a58b 100755 GIT binary patch delta 371 zcmV-(0gV3G1;+!BBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv4qNkl3CX%Mbdfh---d5GUWwpBb$!IhaYOq30 z2ef;`K|ctBv*q#%J%3UHz1~TlUlzr+CClo?qMpwy==T%dp{^fMPYKXryL~V?<$(`> zTY6Rke_PTI_&XlZS0&(ivE#>pD|FA&+q(cA%96wyr?$bQl(RxVUIfB$+P&ehmy&7( zNC_vLfVE^I!nv`O?{-h9Iu@V<+s)?A((N!DPGvmSmQZylz)(^5hJ${98G30;2Li^D zg>Vd5YEz;%9#Au0)L=_)zm5|bwkiD+Dl*=B;J#>Qn0dw_tq2hX=HKA^=_eKybbeQJ R)~Wyi002ovPDHLkV1oQyrcVF> delta 648 zcmV;30(bq#1K0(SB#|)~3cmmV4!;371ydxEQzm}`R!KxbR5(v1QqODJa1{T-{+0bX zRxA=CQWPgaV#FXNT{W$-^dLQW5Dy+?NDdx?bYU%PDl~MNraC-`haPee8L^E?@F2{? z4#RyCKY8!*A@B2k!26PWK!t08Ynra>;}F_FLmUA3s|6BORr~!uf!j-a18g_j-FCOz z`M!U@fjd65G>2uj$JGifl}$TPzYJEm@ni(E$da5 zWdcV7NL|-u*}S!|kQS6x<*OsAYsB(xU<|{|X0vX$OW>Aev3d5>p5$^l%UU3JcDoYq zoP$-q1%{5Vmep)FNvqYGPN&&y_DfhWo6mp1&+pzY9@ZDy`ts356u+-CnXF+Lt#*sF zJ8jI$WHR$TffU6|j;TDpRiE6d?$(|?Ne{>&Rj*%@Mx%k!R66zNFG;0RrfH_rY4Pd3 zW_Y!q{?*V2k$!k5Cnu2IG;T<}UN_93;NO&Bj&2y~R9bv?Y9p^^`d6kejXY`SL12Fx zMgs-XwWQvwG)?cDB$-GIv_T?~s2K0n7q>cgrLk8vT^I!VK$j$mh@yxSLbRs|P0^T} zOeW8VtILTCt0ImALQymh4Kd+)9>U5f3Cz#f70=nK1H zL=c2tuNRBO_8-V`>{wBH(P->+^!spZY=0iF5QUe(Ab<>FQYw}3I?$VCS4Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;(#7eog=Y0XRuSK~y+Tjgn1H!!QtqN8&0RfZMQcswQbe zQUYyhlPXf1rYQ&sh2Iq?V#Qt9ut4TBj!bG0Li+S%TlUQJ(?}G}27^=IPs4B$MHg|L zB}s-FSO>v*7+NNhrp0>QKv~{a)xBl4y7|dyG!tsDLQMy>d&5CL2!gZa@(Mjt0=?cz zo?jNlwI$2y#iE|iE9mzV-Jz}@QBMibVY_`WIOTy4e_MK10)Jc55BNJC&{rkkd9mZi zfGc#*(%ZWL9mVd5YEz;%9#Au0)L=_)zm5|b xwkiD+Dl*=B;J#>Qn0dw_tq2hX=HKA^=_eKybbeQJ)~Wyi002ovPDHLkV1jBgwhaIP