From 45cfb8c06a17ebdf526043ddec0be6fb0246e835 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 10 Jul 2016 19:02:43 +0200 Subject: [PATCH] Several models / texture tweaks --- .../refinedstorage/block/BlockInterface.java | 5 +++++ .../refinedstorage/block/BlockSolderer.java | 2 +- .../tile/TileWirelessTransmitter.java | 5 +++++ .../refinedstorage/blockstates/interface.json | 12 +++++++++--- .../textures/blocks/16k_storage_block.png | Bin 820 -> 795 bytes .../textures/blocks/1k_storage_block.png | Bin 810 -> 784 bytes .../textures/blocks/4k_storage_block.png | Bin 817 -> 803 bytes .../textures/blocks/64k_storage_block.png | Bin 800 -> 769 bytes .../textures/blocks/creative_storage_block.png | Bin 833 -> 808 bytes .../textures/blocks/grid_disconnected.png | Bin 726 -> 726 bytes .../textures/blocks/interface_connected.png | Bin 0 -> 785 bytes ...interface.png => interface_disconnected.png} | Bin 791 -> 791 bytes 12 files changed, 20 insertions(+), 4 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{interface.png => interface_disconnected.png} (91%) diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index 77be4f4d5..9200f7802 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -31,6 +31,11 @@ public class BlockInterface extends BlockNode { return true; } + @Override + public boolean hasConnectivityState() { + return true; + } + @Override public EnumPlacementType getPlacementType() { return null; diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 3a8b377bb..b3f81f07a 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -69,6 +69,6 @@ public class BlockSolderer extends BlockNode { @Override public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + return EnumPlacementType.HORIZONTAL; } } diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 098900c02..b92221410 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -68,6 +68,11 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm return upgrades; } + @Override + public boolean canConduct() { + return false; + } + @Override public T getCapability(Capability capability, EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { diff --git a/src/main/resources/assets/refinedstorage/blockstates/interface.json b/src/main/resources/assets/refinedstorage/blockstates/interface.json index bbe118c50..028bd4033 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/interface.json +++ b/src/main/resources/assets/refinedstorage/blockstates/interface.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "refinedstorage:blocks/interface" + "all": "refinedstorage:blocks/interface_disconnected" } }, "variants": { @@ -12,8 +12,14 @@ "transform": "forge:default-block" } ], - "normal": { - "model": "cube_all" + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/interface_connected" + } + }, + "false": { + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png index 91b0eb20ef161bd025630b8ae96004cf5283fe76..9b007f0b4e9cbe3f1ae6c705a2307f19d4365b37 100755 GIT binary patch delta 712 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 delta 727 zcmV;|0x12E2C4>-JPN`901m*;>mp*eg_VLUk(&r8a#3nYa0$}1iAGWbp;3`)V%ju*F>3taFX};)XHMpF z<~?uD48n1nUS~BJNTZRQpQlOE<8ZJv&04H3hy>xrO*R}S^+r;!x6aL3klAcsTg@eZ z62)Y?l*#U8vtKSQuKO3)XT9H7SAUbqVmw}mMACw=8I5dcbvOdyU@#VqZUDoB*k-TO z@AdlU=Qo|sSuB1i#} zXy!O>6=ZmRJseK{yS=sB8Hb&5xfWsa@bDPqV;mRZxHZ3@pV7QSFq+LDqWBGfiN)f4 zcB5w}dUBvA8j*y%+5G;BD7Mt<2?SN@^`_Wp!TR8!MG&4x8UgoqbZ0}*R#7~Etk(`} zwFWRTr9qREv$cAoE*@5Pzk-a};<&e=JIJ=9X9uDvW~kk4K|;OOn1Tzcv59=4SSnRZ zqhoZIbxQ>oq}h2o9V>2tgNUT@$vZWqhj+vQ4SAAsd63|#OA zWHL39%he!BQQjBcQAm6${+!Q>+&vi~UtIJ&{)@}mF%002ov JPDHLkV1fu-XLA4m diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png index 4f42da99428eb5cfefa8ad0399e545fea3c95bea..5bd206ac914d238b131715bf65f9fe96761b03a8 100755 GIT binary patch delta 721 zcmV;?0xtcr2BQX$Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCx4VlL_t(IPbHG= zPTF7;$DiwP$^~F~ErLMgB?zchps8Ei z<1*s~n8o;EA9g)ENb>7RpZ_`Me@>eR5kw{)P0r1c^Yi4=5=D}^Wv#luy?vxN-ZfhvTdhxEar5){kE>siD52{|_4;AC+)&lM zN_iI)1jdr2RVur{Frn>1!`0Qz_4R!uLTFkWsHnTD+E$b;P*6BLS1Q#@r7c;8STB|| zP%bZTzg>I}h2oo=+hA8HR0QG8+L{~)L{T)lsH!cs)~c2pm48YToFb8hv$Koy^UFYB zR#V&0lXVy_EBee#1O}_?sof&QcadLcrO-fE|*u5HBl^!VvXnJKyVhp z0|Y}+uP+!1$DkVhGoimG^khPhrcn=$PeZg=oDdOA>2~`@Z(taMlam3@Z=%PEA%7;& z!??Ji8pdh2bAQ_D^Z>6vhhU2@CP7d@H2MQ5=yrO3 zXuzkuF1HVG;2w{6CeO?0b`0H*p_?&u_o66P?RNJF9QQgL9yB%OXW7^5>k7w}cus}{ z3}IQ3VG1lK!VxU;d5K{}n$E+=Ads@zJWcZqBa9*_2Y(0ekB>jQTs}CCV4;B#tX3DY z*<5g8(rMdwwy`|t=BfYcC@Nu^ej$t?UR1ZplPzz(ac8yqLWdeG2pzSZ^i zs3DVKvs4}~B9-OrcF%AnGL?f%IwX@LQ?%1LU9UGAjeQJr!nOcKv7jdsSqtVwX0zRF zwqcmVVlKfk%nq&qjJ8^F02aoqpgS&Y4#EKyC`y2lQzw6~Nkl`tl(!xl=kq84KpvXa~CBY#`(osOKJw~(aMYIR#IZiCSdl^`6r-h|_%Mn`Hi#@Sf| znwx(!udQa{@jRC-q|$ro^v8>f>+Z$%S?9;q)h~|A$6~o~ILWe`k?@8}jUx~a1fr41 z2GHM#ZgyJTPN#c*e$#55MWb0D!fvo^HWXS{scK#jc*Mo+%A+U;KR z^n0_}URjBQ-12h7=lig@$V^YGky<^+vT1*IExj5}Mj|OtIyyQ9PEOj#$IU34eRAf& zoC$GLQ!1oX&iehUAj2^0p%C}`_SS5st!CP8UxdN^{X>9>`u$vH*?>vq1ly5d^WEP9IJC z7Z%>S-2sS~%50@lTO5~7#xu}uGSN1R2Ogru=9Wsw`jJS&36Hdo$q5%9izi8Au~agd z0U#}4vCyy%zet3QAfZqy6iP5mCKAapObUhoSc}DS00LuTSeIc!nGll<4~zc;*Pk^` Td-gxM00000NkvXXu0mjf<6C0j diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png index d120a0729aa76c34eb9fa85595a53d0b09ee7a83..770e2656c3248dbd498c0b4600f50cf1406057d2 100755 GIT binary patch delta 686 zcmV;f0#W^-27v~UJPN@801m+cxRGn^kwzzfe@R3^R5(v1k_}JVP!xvm?_uS$2m+Ch zAfTc^VTjPxVg)OuFrYMIMMS1?bIUdoECG^bF>#BVW6_x{OZMaTBFWQ}-uImIp3~-% zXfzcG#aC9C)m3I=Bh4_m%}qX?=40_K#6%(+T}wryOk|abMB?FajI6IeZ#GU34==QT z_UlgfUAOxl7LULF-cSDoLs3n;XtmC3wYH+1)N9932#h63t=EsiETNvDVLE+$c=#6# zMpd;3>dLXA^s3bZC?pVADVJO2@_{TPwn}9c%H7@XFSkGa{z#>A2)kmjUMRfW*^#~8 z5DA6W6{V{*yNz1AUhlvu7+kx)zP-7Bx$}CLRi*bdS;KI-sx2)AiO&}n#RhC-`Jh_W z91c%OYRZy|_fn~8x4R@+6~&q;HU&ZU`j!bE;PZ!EZl6C8MsFC&2=94E4Dk>f=iVUf>EEGuTSd3+3kl*#0?S%GB>^9bea z?9Jun2fN*k;~WkRY{6u*6SLWWjti4avQNB7CbLkFj!t^#7gzwP84R09Y{lal{3rr7 zmn&e0?d?6Dm#`ihI-OUV)|)q^Qd}mT$3;wMc#Fk3TZu{Ja7kyRa!ev?vn{q-op$?_ zqHNd}q|+SqSS(|tY{X!&7z}2LvKoyvMOokqFxq6I0T!lA(5;lgYM{&+&z_n70}xIV U+J*yC2mk;807*qoM6N<$f+8G24FCWD delta 717 zcmV;;0y6!92A~FzJPN`901mkkHZz004y-XI!HgWURh zA{2TT2ylywI;7K?c|Ol?=eOe7L?Q=&N@r)6z{SPj{JfXsi_gvim~$~O;!u<5KOAy{L>I0kT`v&?7*D8vgW~0++w1C-vc@3JI zTWU00O|eru`T#O!i*wQnM9~k5qQ~0pE;KY7t$8@0nwc$@%9TpJQmxl(Cq@IgiaG(* zp^+FwUyMeoQm$7H>xYL&$JK^X`4Y{{%+vJ7+FFcZB0+|`y}g4NCKF{a5GI@&jqdzG z&hHQVe5}XgSE*hhh2n+F<@b1hf<9kpQV+`2gM(_Vb^^e30u2XzA(>2#RdP6kLuCBgim@vf474~zveL*N@(*@|Z z*=U!;4-e7dViby(<47dog-1HZ=7oz-rL(D2E}Ja?kQQ(_Xjq3|B*msUkwl`9NaPr% zluA_?rT{|#tYtD40D&Udb< diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png index 7390afd4b43b6b3ba82e03a9933a81204f99a967..550df8c68536a017a5c52177a5991e4960281f87 100755 GIT binary patch delta 725 zcmV;`0xJE%2B-#*JPN=701m(bYSxJfkwzzfrb$FWR5(v1l3j1oU=+tsjEmXDF8va$ zytab@882bLHa4IjW2JUw3|4`HKxxK0#u#pyPNR}A2qW=g$xN0kGtNb$@xl*ajGtiM zsnH9)@XDCX!$^KT>GMC&`JdC~fX^59x&u>F^z<}6Hy5Gl*!(;niSYiw0>)sF@y&#P zeLmVdO?$lokH-(Qv$x8nt+lmXrFy?se^jqOMvL=TZ(p9iak+hpvRkR_6be;I+AJ0} zPysZ~WaMIT1L-H^O)NM)JwH2p?{fKMxq%d=4M}R`^Q)+U(>ayRRKu9?Hb<*^~Z~ppL3VMS`U4_eKGX0wBst#+_joXu9J)jrsJ__W)7mP!@A0{p%hh6{k9&&gyS#df!c z7h27Z6${8QGi9_OdeUSvPs9`ACxDOdVC3frT>Fp~N;;i!07;tldJ~L|Svl^`@^YT% zvk6|r1UBI~fn`%1FW?a^;_(cB%L)t=$BzM&qR}|RBv>{%h^TCDKiJ!QLQxhx4&bnW zO=>h0XtfkBOen-&aXS=ZP+ec&Z0zjf0GR4Sv%%m(AP~hL1*pbiNt|JEafRnII35<% zYWEbSF(?R!xo9Mgix`RWI-RLM5*>`;lJ*J5=pbV-j8`hPYITbs3^*-75{YoA`~6Wh zVE~m%r&4JNLa$bn1ffG$1Y2t~B!UAI8r1cKO0OccqobPt9+njq55GpU00000NkvXX Hu0mjfBj!|i delta 750 zcmV5x`yoSRKWBH3s>mq@N9lTQy0PTB`2d#yLe$M2)jY&e_=1mX;{7z`}P_un-dd!bMo2r>%{llJ@PWikyK9aZ{#VV`fFrlE!(`$9Xf z8qMZWefM>}-kh0EC~a-+0y{g+?d^Jq zNnbff!JPI-hlgcIDjoB9WF$fF?Gbb(OUXM!L* z+SM9tD3>Zja6sHQkj`XtxneF~EEd*PO8gT-=Wo&NpSRJC4=NRr%NBDh#g&!SwR}k= z>PLNjLnQfVYRXShJ{LtF9v(q|47Hk2DlxT&Xt$4?F52nzIvgIG%_$b&Lqg$Qi^XZP zxf~AnbzRQpmzVQ}!a4xMYe+cYaP#>RBoIhIk{}#cJRk^LEVdMjEke#rrT|MFa0iB2 z^?D1B*NY&Q-R>qy&&0$-it<9dL~1FKSc*o|@kk1G8w{kyX?IU>lfZvX%Q07*qoM6N<$g7qt9`v3p{ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png index 31d89c7616b2b907503b65dcf1dfe1338a96f6a9..909631862288b987bac5b13c8dccbb8965bfd022 100644 GIT binary patch delta 21 dcmcb{dX0604c7q%2EGG~S=Tx_H@Zz=0svGI2X_Df delta 21 dcmcb{dX0604c9>i2EK!gJ0@no-RL%f2>@7j2uJ_` diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png new file mode 100755 index 0000000000000000000000000000000000000000..24d133c7e8c038d84c6497421255d891980034a4 GIT binary patch literal 785 zcmV+s1Md8ZP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;(#7eog=Y0)k0IK~y+TB~pu0+E5hC_dv*lfIKpRB7#~J z5)ngSA`mG!La7iL5wTJ$%3>8oCGjzxNJ#6O()xNT9#0ZmTe~N%Z)aylw`YFskNf=}=jUec z+&pbx_j*>hYjiq;EnV;H zC;gBR9odg#dv-JaZ44*I@b3EiPuqF`BM7T#UT<^-Axeb9@oKe&RKehf@d(npkv+3v zyLqy#2N=Nk{X(^RqG|O|c#Xh^cAECt>*Wn&Vwv~z`P+Q{`ttJn{QMV;X-rVkv_`2^ z^LPRTx>PEy>S4?851HmHzOaZ9E- z9gQAs`w<3|R2cGQit-RN?ZJcD*~yb6OOkGqWd5%#MSE!4>vS?pkgOruJDt=&f%7yH=PrB# P00000NkvXXu0mjf0%c&e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png similarity index 91% rename from src/main/resources/assets/refinedstorage/textures/blocks/interface.png rename to src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png index ac9291c8cbb1b999c0c378651fdbfb89471c8b96..e3fa3c48db984c6e81fd3b35287bddb9c1d9e8a9 100755 GIT binary patch delta 21 dcmbQvHl1yP4cC4K2EP4_7OcT48{IB40RTe91{?qY delta 21 dcmbQvHl1yP4c7q%2EGG~S=Tx_H@aP90su