From 62887f81a7fd16d0fa8965f1faebc4b51565c9bd Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sun, 4 Sep 2022 13:15:48 +0200 Subject: [PATCH] add subtle dice-like indentations to Redstone I/O texture --- assets/redstone_io.xcf | Bin 0 -> 6306 bytes .../opencomputers/doc/en_US/block/redstone.md | 2 +- .../textures/blocks/RedstoneBottom.png | Bin 0 -> 415 bytes .../textures/blocks/RedstoneEast.png | Bin 0 -> 552 bytes .../textures/blocks/RedstoneNorth.png | Bin 0 -> 534 bytes .../textures/blocks/RedstoneSide.png | Bin 679 -> 0 bytes .../textures/blocks/RedstoneSouth.png | Bin 0 -> 539 bytes .../textures/blocks/RedstoneTop.png | Bin 534 -> 331 bytes .../textures/blocks/RedstoneWest.png | Bin 0 -> 546 bytes .../scala/li/cil/oc/common/block/Redstone.scala | 10 +++++----- 10 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 assets/redstone_io.xcf create mode 100644 src/main/resources/assets/opencomputers/textures/blocks/RedstoneBottom.png create mode 100644 src/main/resources/assets/opencomputers/textures/blocks/RedstoneEast.png create mode 100644 src/main/resources/assets/opencomputers/textures/blocks/RedstoneNorth.png delete mode 100644 src/main/resources/assets/opencomputers/textures/blocks/RedstoneSide.png create mode 100644 src/main/resources/assets/opencomputers/textures/blocks/RedstoneSouth.png create mode 100644 src/main/resources/assets/opencomputers/textures/blocks/RedstoneWest.png diff --git a/assets/redstone_io.xcf b/assets/redstone_io.xcf new file mode 100644 index 0000000000000000000000000000000000000000..59bae6f6085fac001849c0e26527ead7cb29dce4 GIT binary patch literal 6306 zcmeHLd011|5)X@neV1Jcpdyte5eoQ#AmCD$0u^upSwcu4LJ~{@1dv5>>3gyWJ}YPd zDb$L9N@=yYL0Jk~5KyopwMtPCk$n{i={ZTR#1=pO-aqf@_a@)mnKNhR+&xv11#-)426OWNFA^w-~)g)gt{1zi%}@?Uw~8& z21A=ssDxmWSuleV1WYK{U%ZmZiVh=TnDj78kcsR{axjq|MrUAF@`V{AIFNwB@_#rJ z&>gryHx9%9!EQD)oIs?|f-yKOXhpx#5;n{tXcQKPLL-Kdm@tA)CNoJa4BuZw7pQMK z!*5m>nFp1`A_Ngw1ZW3y5$m#dWK+X1kt7C_LZ>+xI}Pe)bl?_3a`2 zz^x=&Fe}6mkF$Os?;Vt&_i}b)P)IZufdys-hJMG$+ejdn5zyBQAZ>_W{SN<~^8to< zODxvnT`$=6{sHbGbQay*1y+;?s0@JQf`jj*hMTh}WU~2!6ScRP&lgO!2uWlJ8j=G7 zDYZi&(ccTCjFLdgQUp@2QXmyl1yY$Lkg7z1T-+#-Z#At;l9ZU9&k-_QUPhM)}84+do`__6aO zB{8qR21SUh6wC%f2w&| z$H$Nr!XW*vjA03XOz2u5$Oxo#l}H;wLx`^Q?+f$+lk@~)7of`m<(v8Y^u|*+@)Osg zP@N>Xao~Uq2BDQ?MbTl5XxYMb^DzOt3QlmIWOe8D*H{RFm3_Vbfe(TcP-Wean0a8? zXU6X7CR_0occD-(d(p2%BKXMCX@4tO_?C|e*<}bS0x1_E(nin|A}g1^Kp!y4y*~d0 z$X0939{FScT}N4|H7L{+Re}qA;9&$A!n%k^XYg@FaD->B0pS1U{Q%Ap@_%|iz<^j0 zlD{F+KqfE5QNDeFK46lEnNbfuvbZtpW|pI0mdeE8oJvaYb6Hwm+wzf2YGq0p>$epd<0|2#%#pkvsw|T+`Mp9*Ox$c8qsp%SdYAFqb(^aU)(%PR z8xac+%StfyEo%)4b83E(lXC&TC#DK(TJ7-9ug}RJs0`uw#_|-e-s{!s9giVh>G)Lq z^Z`p^z~oF^SMY#+li6WwNo$&knY#&zq6DC{XJI&=0y()l^&3+=~O#>DIc z%S=16a%ZW_<4sD>MHzD)Wx7iuiU(>dB8I+#2+LZMMGuF`LQd7c-nQSiXTg{c7Jca8|D>=kJsSO_axC1rs=U{d)8 zv9mdr*4A_Mtp=`JwiwBI_&DNd*=v|9{J2g3{!we-{1BGo)k8`wb+SrM=x)$HFx_Or zw0!CHH1NT)rrJwtpZTLkN_%av*ve+5ZRoodn^TYH?LL;0=g(PED<3$P)N1}!rzG*1 zU*??Vx*tKl3N#K9VkV1*lPG~>E>+38wSLFql@(;SI8Qt6SvyUjB@&Kl;il8Olr*Ah ze%4<}O?)at@czc1F|L->*x1O^)z;?PSXmwXR##aH6@UG9AD9I)WB#Vbqy)Wj^uzSS zj&~hd5RDHd{f6*k=ShuU@4_|$hA{nV$@6}%fdVGA0>sYd_NqL)*ZA%9aW%#5 zwoEE_8Q4-OykJ=~M|)+0DgON>eq)_>9`lQRrZXE1uDAA&HUVd zyt?XUctT_7$)y+Sez1tNJNIi}jb?1|_9FK}&&s~>s>OA_`O`+Examf-a~(U9l6Zl!dXf;H{Jh} z6O~=Vl@fK2!%ZhTMqWj6MqQ$B;YX(>(thpxl#{K^##NkMyvfbW3mZuePiOuzIFdd3 zg;G?xcZsx*sYc@~X1U(e(P($|Me)~4YAWz|!dL0e4b=OapLAcTE^RSY=qdYMyJ`J* zTe*W%IpI6b9kSba%`;^%YHm(%b(VZ*wyQBEC_14SY^%)?OS-2yvw@`;$J31g_`0jE z(T3@XL8~b@H5(4q2I5W`FHKWhk?nf?@)K$KoTEHros?~lwS>i_FxEc`DlQe1FBp#$kG7M%*qNOY@(>+M}@4TgUx nYYjO*;5-3o{3ek6Cjy6Xt!Ydx&<9MK(2r05zdZb}T^{}fjXg_4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/opencomputers/doc/en_US/block/redstone.md b/src/main/resources/assets/opencomputers/doc/en_US/block/redstone.md index 8978fc884..f963e5ee9 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/block/redstone.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/block/redstone.md @@ -4,6 +4,6 @@ The redstone I/O block can be used to remotely read and emit redstone signals. It behaves like a hybrid of a tier 1 and 2 [redstone card](../item/redstoneCard1.md): it can read and emit simple analog as well as bundled signals, but cannot read or emit wireless redstone signals. -When providing a side to the methods of the component exposed by this block, the directions are the global principal directions, i.e. it is recommended to use `sides.north`, `sides.east` and so on. +When providing a side to the methods of the component exposed by this block, the directions are the global principal directions of the world. The block's texture features subtle indentations corresponding to the numeric value of each side. Another way is to use the global values `sides.north`, `sides.east` and so on. Like the [redstone cards](../item/redstoneCard1.md), this block injects a signal into connected [computers](../general/computer.md) when the state of a redstone signal changes - both for analog as well as for bundled signals. This block can also be configured to wake up connected [computers](../general/computer.md) when a certain input strength is exceeded, allowing automated booting of [computers](../general/computer.md). diff --git a/src/main/resources/assets/opencomputers/textures/blocks/RedstoneBottom.png b/src/main/resources/assets/opencomputers/textures/blocks/RedstoneBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..31b32ebada722df04c532e297c5b2bb7323307ab GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf#sHrXS1~a$adB}82?shvn1FT zOLDA`p@RH7DEx2gVQsmcZK)7Vm$i}b~ecf3Tlm!LWc|DdF@0!6okL`By#~fRSIq(L&6L*9tuiVnfwd?!2At*Q&A?Qp&&rU4Fxbs@cAUYM{z!3 zqUuIEt#qQ@mUlR7K;S{P18_H!QBZV)QhDQa?Sw67>O}r zW~^2#qM0Eg6*=dOs*-cY-7zyl2>-DG$T=e-1A`Id`ue)Q7(&3zD!@p8xm3ek+Os`M#QN+G2*FfcPxO2ilkBi(u1 zL^j#@xXB!fFn<{)F9!gn zWMDAU1aAAx=K^mI0bfp0;XW+SIu4OG=32O&n>jPvtzF6MIt!SOn(A<_a4 zzU^uX%?xSV){l>mYmv;17$c<=R25Z4MCzq6-Xg+!y&f2hKkvpuN~r>-ln5HoFzoO5 q0vH(VM|n)fxl!OSS75D~aLDW(6|0F+XY)ELYlXJ==WU>X0vHJ1Ae>nr^5GuML5^%isxW| zON@7SU8cKZvmSRRBKWnHFcViE><9#yL3Zbd8JlUM*2*+ZNW$EmX__AFi$DSEfGZCI z*j*$(Zf8DJXT4qnFpeVtW@Z3P_sH)jN5FF1cqx$t*)kW=z?#&lyJ7&fK1guE#isD} zwjjZ4i2&Xuac#ypj+9cVwYE=e5=uwBkpLLfiUN2Qm0joz=4L>1p_J0S-ihGTvn{TG z7ar`;9{xB=w>>-jcYyylf2S$M?2$TW5EYB`me`$8!NR29KjWC-d=W&%pC+%+m_+ Y5B$+;)chReWdHyG07*qoM6N<$g3)^V*8l(j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/opencomputers/textures/blocks/RedstoneSide.png b/src/main/resources/assets/opencomputers/textures/blocks/RedstoneSide.png deleted file mode 100644 index c74056a4f0ed1c760c6f54f346dcc26ee8a5a43f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 679 zcmV;Y0$BZtP)EHxMHmH8nNX9STfLOgK0=F)=YGCnr);QYI!Q#TyAfKR-4$ zHat8$K|w**9SJ!(IjI^5Q&UqyLP9VwFh)j3!X64EBO|C82&x(gO-)TGC@4`;QB+h^ zGBPq%RaMm-3078C8yg$39t^S`43rlLnivPd9|}1-I>#LeB_$;~Iy#MwjYC61wzjsf z8VG`cg2NvQ78Vwhlaqphfy5vSNJvQ69SI;HAU-}m*B%OhfPkwS2*n!+!ypUC90?yE zA08eats4j;A|gskN|P4{!WsyBdwb*?2#JV^qZtT4KR$wjfyN;VuC1*%H#c7n1)-s# zc@qZ48wtT43aF^4BqSs=GBX_=9X≶~EGW8XB9Mn}dUc;~NOB90snZ%CuXRPLVqh| zaWZ>R-QLk}j%*2tRyy4JCAfL(Fq5@7F6MI1T$dM~%>ri#02-0_17v_m3xxa&FaRg29VdkK4)g#3 N002ovPDHLkV1kBL>3;wK diff --git a/src/main/resources/assets/opencomputers/textures/blocks/RedstoneSouth.png b/src/main/resources/assets/opencomputers/textures/blocks/RedstoneSouth.png new file mode 100644 index 0000000000000000000000000000000000000000..d867c631124ec6df2104421230f709b8ac1a7f5a GIT binary patch literal 539 zcmV+$0_6RPP)_Id!0m9pTGuFMh2yn=Jj?2 zAD(Y;4ZQGRoAKd~Wb75E4CSGLW@8Rg&V)NhM@O6-93Vsx&8jidf`C}|Ersrmx~_}e z-Q6}w?oQ5`S}SITnIWkaP4Sk*VzC$*Opn*LG+QTkk|ivS=a1(C7#Tc{@|4WSqdfsn dvoTF8z&|WLXvg%Sma5(SA91(O#C znVFfI7zd*n2&fqdsTv5X8VIWz2(BCmuNnxk9t^S`48a}>!Wsy|9ty%A3d0`?!ypU9 z90|lA3&k4<#TyC68wtiC3&$J@#~lgC9SO|L%+(wT)*T7f9e)bf9SPSS3gH_F;T#C# z8VKVX2;>_G!S>aA0001XNklOj{Kupe-)U zD^)6oRrfQ5+>$O8atQw->Wczg{20000!NI}d8wgWVQ^LZ+RaI5U9SJEZDJm)| z;T#AkC@9t)3Qtc@CnqPx8wplcR@NN})f@?^83@3@z^NJts(%^?!X65*8VDL18o?e4 z#vu#i8VIo-3??QflNSfX#KhMg3d6(0E_IKGLtDHg1~*%GVRm)B_{cpc zi7(w`ws_qRtxZ>=k8(O0!c#bEtw{_)>GoICy8d>18tYJ_IkUNawDUaAMXR{OEJpkB y6duw=V;V5JgP;&3rz%rK=>zmm*#ptP00RJ~bPk!;-vl}U0000b*W5QM)O$=;%TKtQsXtHKcAA|SlT<+tzy@)`tW_Xc-dKxDw>!~szL+gnL91iF=t z6>UkYo^Exw^nLF<>s7QQT{~X%~-fq<-m;dpd1zB+sO&5)v67R0PfB>j#a0_@-Fcg=(|AY#`U&f z(K*@^hWq;_)6CFGkD1}_{Mrks!f$tG0s^Q)G~0O$qY2El<>Zp?Nm9mlZ^1F8!- z=jQdyolnp9xB{M=Gs8LT0zZRtkd2)3!vm_;9E2EgGfq!W`FwngAUNKvs*x6O@a@o2 zXl6*?_dcJ`TanC+7$c<=R25Z4MB1e(-Xg-~t<807*qoM6N<$f>K-hr~m)} literal 0 HcmV?d00001 diff --git a/src/main/scala/li/cil/oc/common/block/Redstone.scala b/src/main/scala/li/cil/oc/common/block/Redstone.scala index 126f1ee82..de013ba60 100644 --- a/src/main/scala/li/cil/oc/common/block/Redstone.scala +++ b/src/main/scala/li/cil/oc/common/block/Redstone.scala @@ -11,12 +11,12 @@ import net.minecraft.world.World class Redstone extends RedstoneAware { override protected def customTextures = Array( + Some("RedstoneBottom"), Some("RedstoneTop"), - Some("RedstoneTop"), - Some("RedstoneSide"), - Some("RedstoneSide"), - Some("RedstoneSide"), - Some("RedstoneSide") + Some("RedstoneNorth"), + Some("RedstoneSouth"), + Some("RedstoneWest"), + Some("RedstoneEast") ) // ----------------------------------------------------------------------- //