From 764cc24f9bd9b1adb07a2c9d23df00da3d482864 Mon Sep 17 00:00:00 2001 From: mruncreative Date: Sun, 14 Apr 2024 14:06:36 +0200 Subject: [PATCH 1/7] changed torch to be plantlike, x-shaped instead of just a sprite and only use 1 texture instead of 3 and changed delayer to require only 3 textures from texturepacks instead of 13 changing the model to be a simple slab --- mesecons_delayer/init.lua | 33 +++--------------- .../textures/mesecons_delayer_1.png | Bin 0 -> 335 bytes .../textures/mesecons_delayer_2.png | Bin 0 -> 334 bytes .../textures/mesecons_delayer_3.png | Bin 0 -> 336 bytes .../textures/mesecons_delayer_4.png | Bin 0 -> 331 bytes .../textures/mesecons_delayer_ends_off.png | Bin 176 -> 0 bytes .../textures/mesecons_delayer_ends_on.png | Bin 187 -> 0 bytes .../textures/mesecons_delayer_off.png | Bin 0 -> 385 bytes .../textures/mesecons_delayer_off_1.png | Bin 448 -> 0 bytes .../textures/mesecons_delayer_off_2.png | Bin 449 -> 0 bytes .../textures/mesecons_delayer_off_3.png | Bin 448 -> 0 bytes .../textures/mesecons_delayer_off_4.png | Bin 446 -> 0 bytes .../textures/mesecons_delayer_on.png | Bin 0 -> 508 bytes .../textures/mesecons_delayer_on_1.png | Bin 541 -> 0 bytes .../textures/mesecons_delayer_on_2.png | Bin 541 -> 0 bytes .../textures/mesecons_delayer_on_3.png | Bin 541 -> 0 bytes .../textures/mesecons_delayer_on_4.png | Bin 538 -> 0 bytes .../textures/mesecons_delayer_sides_off.png | Bin 173 -> 0 bytes .../textures/mesecons_delayer_sides_on.png | Bin 181 -> 0 bytes mesecons_torch/init.lua | 8 ++--- .../textures/jeija_torches_off_ceiling.png | Bin 146 -> 0 bytes .../textures/jeija_torches_off_side.png | Bin 142 -> 0 bytes .../textures/jeija_torches_on_ceiling.png | Bin 147 -> 0 bytes .../textures/jeija_torches_on_side.png | Bin 139 -> 0 bytes modpack.conf | 4 +++ 25 files changed, 13 insertions(+), 32 deletions(-) create mode 100644 mesecons_delayer/textures/mesecons_delayer_1.png create mode 100644 mesecons_delayer/textures/mesecons_delayer_2.png create mode 100644 mesecons_delayer/textures/mesecons_delayer_3.png create mode 100644 mesecons_delayer/textures/mesecons_delayer_4.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_ends_off.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_ends_on.png create mode 100644 mesecons_delayer/textures/mesecons_delayer_off.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_off_1.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_off_2.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_off_3.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_off_4.png create mode 100644 mesecons_delayer/textures/mesecons_delayer_on.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_on_1.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_on_2.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_on_3.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_on_4.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_sides_off.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_sides_on.png delete mode 100644 mesecons_torch/textures/jeija_torches_off_ceiling.png delete mode 100644 mesecons_torch/textures/jeija_torches_off_side.png delete mode 100644 mesecons_torch/textures/jeija_torches_on_ceiling.png delete mode 100644 mesecons_torch/textures/jeija_torches_on_side.png diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index c4f4b87..2292848 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -27,20 +27,6 @@ local delaytime = { 0.1, 0.3, 0.5, 1.0 } for i = 1, 4 do -local boxes = { - { -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 }, -- the main slab - - { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 }, -- the jeweled "on" indicator - { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 }, - { -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 }, - { -3/16, -7/16, 2/16, 3/16, -26/64, 3/16 }, - { -2/16, -7/16, 3/16, 2/16, -26/64, 4/16 }, - - { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 }, -- the timer indicator - { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 }, -- the two wire stubs - { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 } -} - -- Delayer definition defaults local def = { drawtype = "nodebox", @@ -48,11 +34,11 @@ local def = { walkable = true, selection_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, + fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, }, node_box = { type = "fixed", - fixed = boxes + fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(1/16), 0.5} }, paramtype = "light", paramtype2 = "facedir", @@ -75,15 +61,10 @@ end local off_state = { description = S("Delayer"), tiles = { - "mesecons_delayer_off_"..tostring(i)..".png", + "mesecons_delayer_bottom.png^mesecons_delayer_off.png^mesecons_delayer_"..tostring(i)..".png", "mesecons_delayer_bottom.png", - "mesecons_delayer_ends_off.png", - "mesecons_delayer_ends_off.png", - "mesecons_delayer_sides_off.png", - "mesecons_delayer_sides_off.png" }, - inventory_image = "mesecons_delayer_off_1.png", - wield_image = "mesecons_delayer_off_1.png", + wield_image = "mesecons_delayer_bottom.png^mesecons_delayer_off.png^mesecons_delayer_1.png", groups = off_groups, on_punch = function(pos, node, puncher) if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then @@ -118,12 +99,8 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state) local on_state = { description = S("You hacker you"), tiles = { - "mesecons_delayer_on_"..tostring(i)..".png", + "mesecons_delayer_bottom.png^mesecons_delayer_on.png^mesecons_delayer_"..tostring(i)..".png", "mesecons_delayer_bottom.png", - "mesecons_delayer_ends_on.png", - "mesecons_delayer_ends_on.png", - "mesecons_delayer_sides_on.png", - "mesecons_delayer_sides_on.png" }, groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1}, on_punch = function(pos, node, puncher) diff --git a/mesecons_delayer/textures/mesecons_delayer_1.png b/mesecons_delayer/textures/mesecons_delayer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e49d2d8393ada85d1c8a0e3dcdd4a45fb57b44 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf)c~ImS0K$`03ytczH3z z#A?UJG9)B0r={^`XEWsG<>lw+7Zx%U78Vv2Nfj3tmy|G+lrWc+l#~KNnPgd6S$TPR zMFoFFMMY(0WmQ#Gb#--34MR;$O>HehZEbB`9YbB6PF1{IC$mkS zY%z6;`Lt;wGiGSanBh8S4%gzv+)I{NEnVupVT0A?&1Rc7d%Szopr09ul7S^xk5 literal 0 HcmV?d00001 diff --git a/mesecons_delayer/textures/mesecons_delayer_2.png b/mesecons_delayer/textures/mesecons_delayer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..5b52223c9063947ac369971ad2656c222643d2a8 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf)c~Im*HmFv1_nkT&-@yL8v}!v z7eh>}c5Ey|LIQJI8gF(sLtb89etv#oAwywdVNsD(adB};2}4Njywzjniw6(Q$baZre33hdL_4bPP_3=!as6Tl! z+vLd>Q>U0unNL*`ZojHL)ih+UIk%9lm S(vZnOSq4v6KbLh*2~7Zl<8Rae literal 0 HcmV?d00001 diff --git a/mesecons_delayer/textures/mesecons_delayer_3.png b/mesecons_delayer/textures/mesecons_delayer_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a9c017af9f4e5c157fc441bba151903220b6fca5 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf)c~ImS0K$`03ytczH3z z#A?UJG9)B0r={^`XEWsG<>lw+7Zx%U78Vv2Nfj3tmy|G+lrWc+l#~KNnPgd6S$TPR zMFoFFMMY(0WmQ#Gb#--34MR;$O>HehZEbB`9YbB6PF1{IC$mkS zY%z6;`Lt;wGiGSanBh8S4%gzv+)I{NEnVupVT0A?&1Rc7d%Slq)=NA?-6c!d16-gBr7nhVUl$0=+l$4YLL78M(Sy_2`c|`?( zMMXtrWo1=WRdscBO$|d$O-*erLv3wsT^&PRolaeyUR_;XeLX{cJ#T$|eM3V-VzTU$p*M^~3%S65eWuV`N%&!ma^lP9xHo@_C7 ziutr@A~R-a%$VUiXAalm#oSAlSS?-Zy N;OXk;vd$@?2>_dHZ3--!ZuA3IbW#|@_-El(X*w0^9y}4gbX0Kf`MU6lI awETyYZpOyxEIvRdFnGH9xvX9vQS-+oq- z_u)6cW$dXv_n7m}n{9VLe*4JdLKENQ?fMU-{e^YHD@$VCr={wgK4id?|KL#g>nXQ) l-aGAk*(Eeo|Gs?Jjp*jUo5{*@p+MI#c)I$ztaD0e0sus7NGJdR diff --git a/mesecons_delayer/textures/mesecons_delayer_off.png b/mesecons_delayer/textures/mesecons_delayer_off.png new file mode 100644 index 0000000000000000000000000000000000000000..8c9df5ba11962074eb2032bc19d629a2a45a1d33 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfr2wB0R|W<~Ak+LBgBt^bmls1! ztafZHLqY;`S{iS5HbY)sUVeUlVIf0dVPR2`RB>@}NeM$q33EwFNhuJNNtTtBm6w-S zRPa|+R8&@0R#jD1S6A26Fx1r4)YdZ8*4Eb5G1S%R)Ya+L)z#J4Gt}4f*4NiJG&D3e zGBh?eHZ?UhH#fJmw6wMgwze9ywzjsl3ADAfb#!!ebqRKLb@ld&_Vw{hny5c{GTY?I z7E`B~Pn#w(V}{0z8Lo5Ya4lZUy<~~i(xu)THdt-mY_@r`$NTq;yB;QA26~CHB*-tA z!Qt7BG$4nwz$3Dlfq`2Xgc%uT&5-~KdU(1xhDcmaPFNsSP*}9V_1Wzkmb+igQvT7` zlvA~C-M484jLhK%25sCC&MYAhnZlOoyjizStc%0h<%UJ<*&h?uCO#DiUo=mh;lOV$ VhllHgM1f{9c)I$ztaD0e0ss-Ri|YUY literal 0 HcmV?d00001 diff --git a/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mesecons_delayer/textures/mesecons_delayer_off_1.png deleted file mode 100644 index 20d9efc3d1cd0dff31e9b7185a25247892f626f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf`2e2~S0HVEjlqq9!OM#wCRRH( zmLVa5IW3JhJDVXdFE2kozp#*@u&}VGNUFHFxTJ)kq=dPoq@)xG$|TFm%F4^jD=PRa zDk>@~E32xis;jGOY8Yy2YHDj4YHMrj>KN+kbn5E#>gww1>ly0ndF$)z8yXrK8yOlK z8=IP%nwy(jT3T9L1zTGUT3cJ&+63C#+B!Nqy1E3ry1IIMMf>`ACQa0zJeh6sWQ(a& z%%@EgnK46S#thdvbGQ~S=3cVIYUxt%4I8XBZ#LV!+2j3t#`)|{PCzd)mIV0)GdMiE zkp|?<_jGX#k&x^?$SHQvK!o+e@+&r5MS3~xRxVjlIq&4Z>rakw-RZ8^5X=|S4Cg!= z95IXKxeAlyW`=8RoWJ(SUH3Slwx;Fc({E;*YomW`*iv!r?oPw+$q{S;tJdB)^k>b= z3$K$d&HuFdr{rXNEyfFfw)m#^TJk9IUz@bDZMOODu1Rt_z9OkbYZnGhptR-4`~ymdKI;Vst01WK1=Kufz diff --git a/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mesecons_delayer/textures/mesecons_delayer_off_2.png deleted file mode 100644 index 590d62f19e44ad21d4fe57cd703bef16ad862ddd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf`2e2~S0HVEjlqq9!OM#wCRRH( zmLVa5IW3JhJDVXdFE2kozp#*@u&}VGNUFHFxTJ)kq=dPoq@)xG$|TFm%F4^jD=PRa zDk>@~E32xis;jGOY8Yy2YHDj4YHMrj>KN+kbn5E#>gww1>ly0ndF$)z8yXrK8yOlK z8=IP%nwy(jT3T9L1zTGUT3cJ&+63C#+B!Nqy1E3ry1IIMMf>`ACQa0zJeh6sWQ(a& z%%@EgnK46S#thdvbGQ~S=3cVIYUxt%4I8XBZ#LV!+2j3t#`)|{PCzd)mIV0)GdMiE zkp|=}@N{tuk&x^?*e-R@K!okW{S|woy4+Z%hg=G(&j0l9{F83=0=|C>UAA~GiBT0f zy1|6=oaYatB)c`d!e1(F*Dai&8^O8w^xNFD-+dnvGC$^66eqtszJO^#O#H^ypOL{E z?;kD^_`Lb&%n9at%oqM_Is2r?lE+#6+N71sf(>@Bnxv=WE0Xs4?Zlvk?AmiL&6@lq pDoZ}h>S@~E32xis;jGOY8Yy2YHDj4YHMrj>KN+kbn5E#>gww1>ly0ndF$)z8yXrK8yOlK z8=IP%nwy(jT3T9L1zTGUT3cJ&+63C#+B!Nqy1E3ry1IIMMf>`ACQa0zJeh6sWQ(a& z%%@EgnK46S#thdvbGQ~S=3cVIYUxt%4I8XBZ#LV!+2j3t#`)|{PCzd)mIV0)GdMiE zkp|?<_jGX#k&x^?$SHQvK!o)|_!XP2BE1}TE0?UOoOkly^(RNT?sV5{2<8iEhI1Yb zj+n*rT!l$;GsCqu&R=`vu6vwNThns!={K{@wb4H|Y^k_*ccg@rJMg@uNO5Qc_^h=_=aiV=#6ij9pGj*bkH zkuQ^z29uLGm6SJ@mK2znD43W@I;Evcu&_F_vo^D{Nbm0fA$a8S00001 zbW%=J06^y0W&i*Hph-kQR2UhJ!G{{bFcb#RztpPLQX?X`q>`fc-sJt?$(KHXbMOx( z;%y@3I-z(5OOxQ7L?~kx!rC%H-}mzt3E6~|FuLA9W`1ak0G1Z7y1Ovuaq5-?=z8uryJW&9_EMMFA|w(VCOw oTIvv%8PEq3pa*n4uclm43q?HwN;j=< z^+GXWGI`|9>peEN2DCdrPNhTpiMTTDK#Cj9=KblquSk+7MrjH_sqle(enz` zb;HjI*-Sie)|wpbfBDC*@^+P<@g-34ExhkqZaBa^pZ8ZqgV`)I*tx0Y#AD-gmW^N0 zd-%>MO?eT9l((w@v|3+r+ya7~7`!Wf8k^M7VdZ=gV%r9P;>kM7wiAFMgu({*$rM#y(5pjuj?5i6+X1*q0>6i%CqZ)I~zD yllUyk|63;e?}3!fpw-G{S|Su!9gNNLES^84ajmEt`{a560000jhL8? zn3{)~nU9&7lA4-=nwpQBn}C~}jGLU0oScrGosXTJl%Af9pP+)EppT@agQTR6rKOCf zr-iGnMz^;ixVR#`yd%TKHO9sz#>Ya($0W$eBgn`k%F9X0%T&wDYs}0f%*|2E&O6P` zOwG z;^bHA>{aUQTKoHt0KudF00006bW%=J00jjF1qGT;y7B-30J2F$K~#9!jEw`{0zm-9 z=RPv fVPs}u!r@f_0!bT_b_xT800000NkvXXu0mjfXzByw diff --git a/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mesecons_delayer/textures/mesecons_delayer_on_2.png deleted file mode 100644 index 7984ef433f8f17eea84f43ecbd0d5c9fcfb88476..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 541 zcmV+&0^jhL8? zn3{)~nU9&7lA4-=nwpQBn}C~}jGLU0oScrGosXTJl%Af9pP+)EppT@agQTR6rKOCf zr-iGnMz^;ixVR#`yd%TKHO9sz#>Ya($0W$eBgn`k%F9X0%T&wDYs}0f%*|2E&O6P` zOwG z;^bHA>{aUQTKoHt0KudF00006bW%=J00jjF1qGT;y7B-30J2F$K~#9!jEw`{0zm-9 z=RjhL8? zn3{)~nU9&7lA4-=nwpQBn}C~}jGLU0oScrGosXTJl%Af9pP+)EppT@agQTR6rKOCf zr-iGnMz^;ixVR#`yd%TKHO9sz#>Ya($0W$eBgn`k%F9X0%T&wDYs}0f%*|2E&O6P` zOwG z;^bHA>{aUQTKoHt0KudF00006bW%=J00jjF1qGT;y7B-30J2F$K~#9!jEw`{0zm-9 z=RPv fVPs}u!r@f_0qPr(#tsx(00000NkvXXu0mjfac%^X diff --git a/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mesecons_delayer/textures/mesecons_delayer_on_4.png deleted file mode 100644 index 0386112c1101b66a79daeb18a7db40d7f7c400e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 538 zcmV+#0_FXQP)(^b8~Zbb#-=jc6WDoczAbsczAhvd3t(zdU|?$dwYF- zeSd#{fPjF3fq{a8f`fyDgoK2Jg@uNOhKGlTh=_=ZiHVh!jh2>-mz0N>myMX1jhLE; znVFB7nUb2Cf|{C-o11`}n~a;Bker;3ot=-Jos^!QjGv%_prDVWq=TfSj-{oHrl*Cg ztwy)EA-K3Ayu2gB#WlvpCC0}>$Hyed$Ro(eB+AQ4%F9&C%WKTcB+SiG%+5Q_%}mYC zH_gs$&d*WL&^*u3UC+>7(9vGe(@)dXZqwC4*4IPU*gDwSLfG0v+uU2--fQCHZsO!u z>g-kO>{|Q#kKy(-NdN!<26R$RQvd-00RaJoq#~pM006Q{L_t(|+F~FE0P3CwEQg^e z8r%FB+Zo$!YP)~``zWHrzT`cbhbKt4T zBMh!fvk{p#u8@>G@XlYi9TPHYo|+s*J-@<}GD&W5r+mIs|6f5gOdtJ6{rhF@anu^c zBSPZZg~2B&;P9i;BlDjdkeVU~>^;5Je{VxaNgjgWp#A9V0NX&y9+Iv(mZK`7SnQ!$ cj@dAE39-5w{CHava{vGU07*qoM6N<$f}W=chyVZp diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mesecons_delayer/textures/mesecons_delayer_sides_off.png deleted file mode 100644 index 2c60cbbb409b91ceaef7319c305942289a07682e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`C7v#hAr-fhByi-_m4!~% z?G1h7FJ;Vfo2Oxy^!z9Ll&>=xju$4}HaleCBEa%xd#?AK*SofC|5hvSSkdxU;sbP0l+XkK{J}&d diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mesecons_delayer/textures/mesecons_delayer_sides_on.png deleted file mode 100644 index 4927557a93ab9aa3e85a6377abb07a6b439a360e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`HJ&bxAr-fhByxq&s)5Ec73E9kM-m*K*k_whKFb7Iel;6hyUoHlr`X_FLQmthS#{aEg-#v+mxXyH gT68VC%K3FjkA8m0o}pi>FVdQ&MBb@03=vVlK=n! diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua index ab2df98..6469d7b 100644 --- a/mesecons_torch/init.lua +++ b/mesecons_torch/init.lua @@ -56,8 +56,8 @@ local torch_selectionbox = } minetest.register_node("mesecons_torch:mesecon_torch_off", { - drawtype = "torchlike", - tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"}, + drawtype = "plantlike", + tiles = {"jeija_torches_off.png"}, inventory_image = "jeija_torches_off.png", paramtype = "light", is_ground_content = false, @@ -75,8 +75,8 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", { }) minetest.register_node("mesecons_torch:mesecon_torch_on", { - drawtype = "torchlike", - tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"}, + drawtype = "plantlike", + tiles = {"jeija_torches_on.png"}, inventory_image = "jeija_torches_on.png", wield_image = "jeija_torches_on.png", paramtype = "light", diff --git a/mesecons_torch/textures/jeija_torches_off_ceiling.png b/mesecons_torch/textures/jeija_torches_off_ceiling.png deleted file mode 100644 index 033d2b404ba296b0ed9916c11323a07a165477ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^f;L~tmpGIl!ocwRn9=S9TAsx~TNpfD{an^LB{Ts5$E7>m diff --git a/mesecons_torch/textures/jeija_torches_on_side.png b/mesecons_torch/textures/jeija_torches_on_side.png deleted file mode 100644 index 895a4e32d3086675ee8dc6555ebc5e705880f341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq=GzM978H@B};ru5c%`_`}_a* z_t*cg|NrZy{mWVZ|NZ{|{QUg?@pkpU{{Q^D`v385XMV{)O#gcS{LKgT6IMU0w`YI* qKknM9|D3xXe1CsmK%6Jt0BD<&(eKi0cVvO4GkCiCxvX Date: Sun, 14 Apr 2024 14:19:36 +0200 Subject: [PATCH 2/7] reversed accidental change to modpack.conf --- modpack.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modpack.conf b/modpack.conf index 7ca71fd..5c56920 100644 --- a/modpack.conf +++ b/modpack.conf @@ -1,5 +1 @@ name = mesecons -release = 24168 -author = Jeija -description = Adds digital circuitry, including wires, buttons, lights, and even programmable controllers. -title = Mesecons From 557cdaadc7f938d99a2b0ef2245645697f812b88 Mon Sep 17 00:00:00 2001 From: mruncreative Date: Sun, 14 Apr 2024 16:22:46 +0200 Subject: [PATCH 3/7] removed separate LEDs for luacontroller since already contained in base mod it depends on --- mesecons_luacontroller/init.lua | 8 ++++---- .../textures/jeija_luacontroller_LED_A.png | Bin 2196 -> 0 bytes .../textures/jeija_luacontroller_LED_B.png | Bin 2188 -> 0 bytes .../textures/jeija_luacontroller_LED_C.png | Bin 2191 -> 0 bytes .../textures/jeija_luacontroller_LED_D.png | Bin 2200 -> 0 bytes 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png delete mode 100644 mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png delete mode 100644 mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png delete mode 100644 mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua index 90516c0..ece1593 100644 --- a/mesecons_luacontroller/init.lua +++ b/mesecons_luacontroller/init.lua @@ -818,16 +818,16 @@ for d = 0, 1 do local node_name = BASENAME..cid local top = "jeija_luacontroller_top.png" if a == 1 then - top = top.."^jeija_luacontroller_LED_A.png" + top = top.."^jeija_microcontroller_LED_A.png" end if b == 1 then - top = top.."^jeija_luacontroller_LED_B.png" + top = top.."^jeija_microcontroller_LED_B.png" end if c == 1 then - top = top.."^jeija_luacontroller_LED_C.png" + top = top.."^jeija_microcontroller_LED_C.png" end if d == 1 then - top = top.."^jeija_luacontroller_LED_D.png" + top = top.."^jeija_microcontroller_LED_D.png" end local groups diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png deleted file mode 100644 index c6182cc51b0edbe6554df4841dd285e107748ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2196 zcmb_cdrVVT7(Z=M3IhucD82?A4n#ocG~iYQ6{;|$A{re?px^`?mWMcoNFO4PjG`ei z6BiU8Q*pyt(UylmDPX0M&QY?_9mM zQM@tPPVtVw^h+O18JN2H>~QmmbX$W7w(fLW6XoWM3AXN9>4(Ygl~gMA>pfqsUAvY> zqeVqUMMp;`B_(BLW!2Qwh(w~gy1IsjhP!v~HZ?UhH#dvL;+B>ciA2)c+S=CE*52NJ z@7_JBRNB$e(b?JA-2;>=&^G{7gJ5tNs9%8Lm*9mKywm|L1au<+8U-U`V00Xe8NfIU z3`PJ?1EUE{qrij$^sOof)NgJ7GZ`^s^8RwoNvj)JT*8h-F?M15{~~{ry(_`2lc0;dDe6WB-r)9UW5tboj&3H}s0@WJk5Z+R;9=t5Rnbp*+OUBFFTL ziz1VafpxS-8qGLV!T$}akZPqK(vz3jCQ+h51{uHYwN@48Ar&L6$#p`NAv%+NaRSy& z`iP~=A^?6PAOf5#u;2kZfd6ptTkMhGb)z7U?Xx|9_W#+J?%PQ+Ya)fd->>oK|2pW` z^!Z_K(m=Qjd0@nij!OqKE@tQXI_xX7mv{o)T>tOI0ao1^a0pXpDk_@TZIRwr|N<@@&d#n=~df zMmWBp6fkh+Aewo=c`MMtdKL!_@6KjkmBC}I4f(yMs1!(Los5|Hm;T~*osx5?UZo%9 zn<$~YPksMS^--k=fSk5~SqYfMlBXv!MJal;yrkB&QQ6u^ui&CTcMmJ-V3>s#nKtRr zgW3S$P`X8i^}Hx0c?(A}>+OR`ind1?8?c1#!JZ=_?DBR?iegz#z@g&v%um>sU887> z>4g)=$t4G=W0tiVdv7NVVkv};r?EoH#d%3Ln@tNdh#=EGNTn#`T>H_f!)dDQ{^rD2 zmN``^klaWeJ&KKm6R})Zi2Rhe1ys$?|6wv<1?9y-a&2b=axg_pIAaz^_HkMvmAYc+P;}1xlAfdw`o&Q8S1BKzxecNal-18`g{->jH!1_EAnkCAE+)9aGirz-*h@g z-^aa#w0eDV7B#agkZJd`9x1w z5Z7r@NzdgKXms}z(pjv5&6F^aY2!|bmuo2Maky997eANH2cA51KhV;RJbyIrh0%ll zxJnKqFq+O;VqM@EAJ5sbHXWZOMvEzlj_bRDy6;x>u($QwlH|B;J)51gu WxZQF)|0IC}FbStKLT_$n=Klj^Xa5`k diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png deleted file mode 100644 index 04c2da07ce7a35638147c80031008c182d977b13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2188 zcmb_cdrXs86u&KlflDMD$`@@xwg7=q$NtrMgQTBsFTEuW>Y@7u-7!z%l0Cnxujd(Z249zVxK z?{r$|wh#c|6d4f~3jiJ-@xZ|jZn8hT{{jGqkJ+_1eC^t`>m!KkBRn@mcy9dCb7RzM zA4t1a`+Nm?jW6VA$X>owFW(riO_1Qa+iO#-7YPzv_jr>b?e+Ha^V|IO$Nv8Qfq{Xs zv9WP+aY;!@X=!P-wY8ToUlxf(4Gj&Ajg8IC%`Gi0VzF2vkw~S|*4Eaxwls-~1!HCSb>f>6r(pZzRxIRxd4^w{VonwB#7Pd*oc*(URV4#u1@M5fV9x_6sbj2ZJ0;#mdt2S8mA@ zatvL+IBx@B3BZQ{2Y~Yggshp1;FCMOq_T|dAj9Mf@Nd6QeSWzlq%oLtbJD4UPI1x| z=jn7>Ba?;s9g#R{lKbkh(vIPP!vljWr8NNehVto4BJqM;uGXRX-HkMilAS7L^Lsr?V`2GF6WePr8^Js^nZvs)tfeM^`9QF!tdA z_R~ePGFIqdquAKBffT`qG-8zN#dM0ZF1&gGNBb-J39A9;Jo&wVdDNZ#U zXI>WG52is7u|kf!1J|xu48&(CO)@ixN9+AaOOp zmdrf&e2ITn0`8q)+@`_?oJ>C0vR-X88!rlJzagChJ5f-u^pZwXD&!R*QE~EK`<`y* z!x?;)A^fWx zmuG_l!tIgXgwt}lghXZz2QXGCv&sBt4D5!RzQ#jg{2?n>%S;9m{2PX+FH=>9SeOzH zix<*D8$^s)1&{bp(w4bOiReB=m{`g^whNng1F+wlo8OrxjS0r}bO+y7cb^qj_lj!x z_LcI|3U1)m)B*NVr3y7Qb!hk$;&T_M4P4CY6p68O|AED^YrzBQE-!WtJ0Cb>7=w;X zpgfs5Z5VraX;uot_R4#!59tLkfFU_K;f#S*((9&>Ugu$;gWJhjs`PrhcwP^ctbkE5 z#Q571N!om6SZ4=RDEd#{2<$*+i@8Z_?AIcS+%e)cX8hfFOxzm9uz2^_(_xq!=d}Z- zeZ|`}WTh)?Zj%aqnNm{Yeo`=~!2YZXpqu)H)p|{@?4?YIE>p(mE7tUoWZPj)>fRa= zK)M>(=(NcXVkd3f9nmO3xAlnVym5@5quI|V9Y1jQtd^}t9~2_%o+*a79O(!1dY|PX zK6ip)sjC{Hv+d_r?JM}LA(aOKtsAYNx}w6=%Xbq|?^rnN)ZMTa+`lPAd@?P@=B)60 zl8MahiOkcX!dRX1e&Y{yV$__Yw=bJ9&L4@Pb)_6j~mhq7LlrcqAr#uyQ z7qns26P9y3NrgPV;KY0xC4@AKX*G&`+&qJ)j$?WM_X6<>+URFB08(UlbXfI{#2^0! DLhd9v diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png deleted file mode 100644 index 01f6ae48e9b0f279b03dd996ca74d503fe079ee3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2191 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 VSVZJ&y(Iv)q_~vW=AAhe{{oQ%0tf&A From fb82c8458bfc14cf6b91cbc21809ed6c3c05f741 Mon Sep 17 00:00:00 2001 From: mruncreative Date: Sun, 14 Apr 2024 17:05:57 +0200 Subject: [PATCH 4/7] changed delayer base texture to microcontroller bottom for more uniform look --- mesecons_delayer/init.lua | 10 +++++----- .../textures/mesecons_delayer_bottom.png | Bin 221 -> 0 bytes 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 mesecons_delayer/textures/mesecons_delayer_bottom.png diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index 2292848..7607bff 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -61,10 +61,10 @@ end local off_state = { description = S("Delayer"), tiles = { - "mesecons_delayer_bottom.png^mesecons_delayer_off.png^mesecons_delayer_"..tostring(i)..".png", - "mesecons_delayer_bottom.png", + "jeija_microcontroller_bottom.png^mesecons_delayer_off.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png", }, - wield_image = "mesecons_delayer_bottom.png^mesecons_delayer_off.png^mesecons_delayer_1.png", + wield_image = "jeija_microcontroller_bottom.png^mesecons_delayer_off.png^mesecons_delayer_1.png", groups = off_groups, on_punch = function(pos, node, puncher) if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then @@ -99,8 +99,8 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state) local on_state = { description = S("You hacker you"), tiles = { - "mesecons_delayer_bottom.png^mesecons_delayer_on.png^mesecons_delayer_"..tostring(i)..".png", - "mesecons_delayer_bottom.png", + "jeija_microcontroller_bottom.png^mesecons_delayer_on.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png", }, groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1}, on_punch = function(pos, node, puncher) diff --git a/mesecons_delayer/textures/mesecons_delayer_bottom.png b/mesecons_delayer/textures/mesecons_delayer_bottom.png deleted file mode 100644 index 2307b39f35641627a3b52f95a4bbf864fecb21ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAmUy~2hDb=V9&`*k;=se~;Q1}Z z@?&<~>E1=tQjTqV@l1S<+$)c&OA~*dn>~5|^>2sHZcob#Ics&MGb?@F@jU`%H#tvR zuVA{?I)g9eBC8Fj+nZ1^G4U^1KS~}4Fqa-uR7oy+!l>QD=5;c_EV_Q%$q0!ogG;QO zUo5+s7#Z5+Q_fv8ZGMsQLb$-#d&Z^Cuk&h@RNe@BzT+>Anepe?%53i$*Pro!;lH{t UBb%@9MFPm(p00i_>zopr0MY+h{r~^~ From 59487a424d3b608199c1dc258306a1c995f3dbb0 Mon Sep 17 00:00:00 2001 From: mruncreative Date: Sun, 14 Apr 2024 21:01:08 +0200 Subject: [PATCH 5/7] Reduced the amount of textures needed for pistons with texture modifiers. Will continue to work fine with all existing texturepacks. No change in graphics. --- mesecons_pistons/init.lua | 36 +++++++++--------- .../textures/mesecons_piston_bottom.png | Bin 738 -> 0 bytes .../textures/mesecons_piston_left.png | Bin 740 -> 0 bytes .../mesecons_piston_pusher_bottom.png | Bin 720 -> 0 bytes .../textures/mesecons_piston_pusher_left.png | Bin 733 -> 0 bytes .../textures/mesecons_piston_pusher_right.png | Bin 751 -> 0 bytes .../textures/mesecons_piston_right.png | Bin 733 -> 0 bytes 7 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 mesecons_pistons/textures/mesecons_piston_bottom.png delete mode 100644 mesecons_pistons/textures/mesecons_piston_left.png delete mode 100644 mesecons_pistons/textures/mesecons_piston_pusher_bottom.png delete mode 100644 mesecons_pistons/textures/mesecons_piston_pusher_left.png delete mode 100644 mesecons_pistons/textures/mesecons_piston_pusher_right.png delete mode 100644 mesecons_pistons/textures/mesecons_piston_right.png diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 3d75b35..274258e 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -270,9 +270,9 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { description = S("Piston"), tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_pusher_front.png" }, @@ -296,9 +296,9 @@ minetest.register_node("mesecons_pistons:piston_normal_on", { drawtype = "nodebox", tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_on_front.png" }, @@ -325,9 +325,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", { drawtype = "nodebox", tiles = { "mesecons_piston_pusher_top.png", - "mesecons_piston_pusher_bottom.png", - "mesecons_piston_pusher_left.png", - "mesecons_piston_pusher_right.png", + "mesecons_piston_pusher_top.png^[transform2", + "mesecons_piston_pusher_top.png^[transform3", + "mesecons_piston_pusher_top.png^[transform1", "mesecons_piston_pusher_back.png", "mesecons_piston_pusher_front.png" }, @@ -349,9 +349,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { description = S("Sticky Piston"), tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_pusher_front_sticky.png" }, @@ -375,9 +375,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", { drawtype = "nodebox", tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_on_front.png" }, @@ -404,9 +404,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", { drawtype = "nodebox", tiles = { "mesecons_piston_pusher_top.png", - "mesecons_piston_pusher_bottom.png", - "mesecons_piston_pusher_left.png", - "mesecons_piston_pusher_right.png", + "mesecons_piston_pusher_top.png^[transform2", + "mesecons_piston_pusher_top.png^[transform3", + "mesecons_piston_pusher_top.png^[transform1", "mesecons_piston_pusher_back.png", "mesecons_piston_pusher_front_sticky.png" }, diff --git a/mesecons_pistons/textures/mesecons_piston_bottom.png b/mesecons_pistons/textures/mesecons_piston_bottom.png deleted file mode 100644 index d4b2fbf3f6f7dbd9ceb210c20d882fc358192445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 738 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 P00000NkvXXu0mjf*85iq diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_right.png b/mesecons_pistons/textures/mesecons_piston_pusher_right.png deleted file mode 100644 index af86c0f13c12c6465e5fbe240f721db560c31ae8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 751 zcmV0gb z%Wl&^6b4|=#dZ?MO>8%5t_`J4X)7eu6`PhdyZ}o!6-&1CHQ2F2V#yOAAt5A?xGX9m z7W9%{Xp%MwiR0Lg?TPIfn_>Hn^lQ%f4>&kD*x!G2);Wg|w%Z$o5LuRIw(WcV?(Xiz z#W}_z#wZ}9QLlThgPuPweR=m9&$|j6BLBSH-s^sPRodM9@%Hfc*N4f;NBiRQ_TEzn z!M8Uro;-Vr9m~!risc5k!_#)Vh1aK(;TVl4MO{rnB4;uQOU>!jahzOMxg8Af)n%{M zY5)l{Ciru|R;&FaUL40uMKuf-f{P@5CC^Z{EU7L(2 zJKK4vu3{j^5G0I21UUi#y_=z?>A0j)pQKU1NaRS8 z#5x^kI9|ICyWM`mXp$tdEcweF9$}6~p6A1O5hOIi2&IBRNWdQ~b7olJ1Dsni$*p zTrOM$^SO^KE2GGx(J1r+A_O4`vpDAQX_}M`qu1}j-`~GdVn@CedgFy-*6Ot^NC5!4 zrmwf|$S9TJf+H6!MqwC238#)1xgI4H%}Ltt^-eBF)oQhKJ-9LLu{Hl|&Ny;OK*rDw zOet$^G?IunDmt!7MKO-xU@%y%=HqxKqVVqeDiB33Gzzc&TwwrMp`eFhgn*P^DiEX8 zXw{buW3mXaBvxuwh;XJ{QuC@~l=;rU;o;%Et*!BR!taOoKb=mMoWe(RU6*f$PtSkv h2SF~Im4_H82#5$F z&h5nacG7v+9nDJfoB#Y59UUDp#)iY8Wm)(4_nh-m$+GQECYz0;cr;qo<2bf$`}N-5 zx8q|nnM}TZ`Mg}Xf`B+rFvjD_B%jL#L5M}HudNLn=gr%9UJ!o&bnx!|M;t|wL`c1A zaUMysBoeWZ&qK?U!jd==MI1+=`#)sHI`%nkHaEg35E0IrnZ?{)x{JW~F+vJs-qQ0u zpAxERN~_gE2(Mx=7zi9K{V?GI&ySS81CkRZyk{O9cK z_VNm71fCO)CbK!>LdGkSKs1 z2Dv9t13gQA7y=*PsF)EG1)8S2ya_ z^{SO#(-0D<=wDr5<8q}!CAni?j;3=})%uSE!!Y9{d2l8HN4>#NlGR$H(Qda(Wvg1L zpu@vM*lf4kZ8n>5Li<*0^Yq7QHj`0R_2S}UYim16;**n;gM$yhfBpOii9~VX2&0u_ P00000NkvXXu0mjfaiLrA From eab3099a880c384c847b99721d5d8ec2683bf4e9 Mon Sep 17 00:00:00 2001 From: mruncreative Date: Sun, 21 Apr 2024 22:15:33 +0200 Subject: [PATCH 6/7] moved gate textures to base mesecon mod, made delayer look like a gate, removed dependency of gates on delayer --- .../textures/jeija_gate_off.png | Bin .../textures/jeija_gate_on.png | Bin .../textures/jeija_gate_side.png | Bin mesecons_delayer/init.lua | 22 ++++++++++++++---- mesecons_delayer/textures/jeija_delayer.png | Bin 0 -> 156 bytes .../textures/mesecons_delayer_1.png | Bin 335 -> 338 bytes .../textures/mesecons_delayer_2.png | Bin 334 -> 337 bytes .../textures/mesecons_delayer_3.png | Bin 336 -> 339 bytes .../textures/mesecons_delayer_4.png | Bin 331 -> 334 bytes .../textures/mesecons_delayer_off.png | Bin 385 -> 0 bytes .../textures/mesecons_delayer_on.png | Bin 508 -> 0 bytes mesecons_gates/mod.conf | 2 +- 12 files changed, 19 insertions(+), 5 deletions(-) rename {mesecons_gates => mesecons}/textures/jeija_gate_off.png (100%) rename {mesecons_gates => mesecons}/textures/jeija_gate_on.png (100%) rename {mesecons_gates => mesecons}/textures/jeija_gate_side.png (100%) create mode 100644 mesecons_delayer/textures/jeija_delayer.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_off.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_on.png diff --git a/mesecons_gates/textures/jeija_gate_off.png b/mesecons/textures/jeija_gate_off.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_off.png rename to mesecons/textures/jeija_gate_off.png diff --git a/mesecons_gates/textures/jeija_gate_on.png b/mesecons/textures/jeija_gate_on.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_on.png rename to mesecons/textures/jeija_gate_on.png diff --git a/mesecons_gates/textures/jeija_gate_side.png b/mesecons/textures/jeija_gate_side.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_side.png rename to mesecons/textures/jeija_gate_side.png diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index 7607bff..98ec48f 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -38,7 +38,10 @@ local def = { }, node_box = { type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(1/16), 0.5} + fixed = { + { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab + { -6/16, -7/16, -6/16, 6/16, -6/16, 6/16 } + }, }, paramtype = "light", paramtype2 = "facedir", @@ -60,11 +63,16 @@ end local off_state = { description = S("Delayer"), + inventory_image = "jeija_gate_off.png^jeija_delayer.png", + wield_image = "jeija_gate_off.png^jeija_delayer.png", tiles = { - "jeija_microcontroller_bottom.png^mesecons_delayer_off.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png^jeija_gate_off.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", "jeija_microcontroller_bottom.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", }, - wield_image = "jeija_microcontroller_bottom.png^mesecons_delayer_off.png^mesecons_delayer_1.png", groups = off_groups, on_punch = function(pos, node, puncher) if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then @@ -98,9 +106,15 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state) -- Activated delayer definition defaults local on_state = { description = S("You hacker you"), + inventory_image = "jeija_gate_on.png^jeija_delayer.png", + wield_image = "jeija_gate_on.png^jeija_delayer.png", tiles = { - "jeija_microcontroller_bottom.png^mesecons_delayer_on.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png^jeija_gate_on.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", "jeija_microcontroller_bottom.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", }, groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1}, on_punch = function(pos, node, puncher) diff --git a/mesecons_delayer/textures/jeija_delayer.png b/mesecons_delayer/textures/jeija_delayer.png new file mode 100644 index 0000000000000000000000000000000000000000..451f1c4d04d837feffe56169d24134d12d78f4a9 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0R?H{{R2qeE0k%Ad9gi z$S;_|;n|HeAcwQSBeIx*fm;}a85w5HkpK$nc)B=-a9mGLXkcC!x>`&@Sli)<(o$9) unQoH?ouzE73LBYDyo%bw5NjyIz+n4QfhlJI literal 0 HcmV?d00001 diff --git a/mesecons_delayer/textures/mesecons_delayer_1.png b/mesecons_delayer/textures/mesecons_delayer_1.png index f1e49d2d8393ada85d1c8a0e3dcdd4a45fb57b44..973d6849938b0ba73a6da9a6fdd46ab9b5fa5db2 100644 GIT binary patch delta 58 zcmX@lbctz#3dfBApAc6D28M~6S6SSbbg)ilV$_!lYnaL!+c4FHnSs@SL1f#d315LK O7(8A5T-G@yGywn-5fQ!s delta 55 zcmcb_be?H~3hUJXpAgrHI#*fb3={k&voh+-U2ABSjBQ}u&&I%zopr0R2)BumAu6 delta 54 zcmcb}bdG6)3hUJXpAgrHI#*c))zQ1_owF2L2yQLnbo-fv2mV J%Q~loCIAE$5vKqE diff --git a/mesecons_delayer/textures/mesecons_delayer_3.png b/mesecons_delayer/textures/mesecons_delayer_3.png index a9c017af9f4e5c157fc441bba151903220b6fca5..c8bf24e5efcc65248fee69546a7e27d85e81a023 100644 GIT binary patch delta 59 zcmcb>beU;_3dfBApAc6D28M~6S6SSbbg)ilV$_!pYnaOF+tAu-!py*OkwJ)S&FsfO OB@CXfelF{r5}E)dj}hwt delta 56 zcmcc2bb)Dt3hUJXpAgrHI#*fb3={k&voh+-Uu$TU^lg|axu1=JS&@NHSKDu<^%>Q1_q`N47}&kCwyc80#8>z Jmvv4FO#uJn5(5AL diff --git a/mesecons_delayer/textures/mesecons_delayer_off.png b/mesecons_delayer/textures/mesecons_delayer_off.png deleted file mode 100644 index 8c9df5ba11962074eb2032bc19d629a2a45a1d33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfr2wB0R|W<~Ak+LBgBt^bmls1! ztafZHLqY;`S{iS5HbY)sUVeUlVIf0dVPR2`RB>@}NeM$q33EwFNhuJNNtTtBm6w-S zRPa|+R8&@0R#jD1S6A26Fx1r4)YdZ8*4Eb5G1S%R)Ya+L)z#J4Gt}4f*4NiJG&D3e zGBh?eHZ?UhH#fJmw6wMgwze9ywzjsl3ADAfb#!!ebqRKLb@ld&_Vw{hny5c{GTY?I z7E`B~Pn#w(V}{0z8Lo5Ya4lZUy<~~i(xu)THdt-mY_@r`$NTq;yB;QA26~CHB*-tA z!Qt7BG$4nwz$3Dlfq`2Xgc%uT&5-~KdU(1xhDcmaPFNsSP*}9V_1Wzkmb+igQvT7` zlvA~C-M484jLhK%25sCC&MYAhnZlOoyjizStc%0h<%UJ<*&h?uCO#DiUo=mh;lOV$ VhllHgM1f{9c)I$ztaD0e0ss-Ri|YUY diff --git a/mesecons_delayer/textures/mesecons_delayer_on.png b/mesecons_delayer/textures/mesecons_delayer_on.png deleted file mode 100644 index d25a814b179198c6ee1ddc1c95bded12fc48ee6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmV8PEq3pa*n4uclm43q?HwN;j=< z^+GXWGI`|9>peEN2DCdrPNhTpiMTTDK#Cj9=KblquSk+7MrjH_sqle(enz` zb;HjI*-Sie)|wpbfBDC*@^+P<@g-34ExhkqZaBa^pZ8ZqgV`)I*tx0Y#AD-gmW^N0 zd-%>MO?eT9l((w@v|3+r+ya7~7`!Wf8k^M7VdZ=gV%r9P;>kM7wiAFMgu({*$rM#y(5pjuj?5i6+X1*q0>6i%CqZ)I~zD yllUyk|63;e?}3!fpw-G{S|Su!9gNNLES^84ajmEt`{a560000 Date: Fri, 26 Apr 2024 13:52:57 +0200 Subject: [PATCH 7/7] use luacontroller_LED instead of microcontroller_LED to prevent breaking the digistuff mod which inherits it. I hope no mods inherit microcontroller LED. --- ...ller_LED_A.png => jeija_luacontroller_LED_A.png} | Bin ...ller_LED_B.png => jeija_luacontroller_LED_B.png} | Bin ...ller_LED_C.png => jeija_luacontroller_LED_C.png} | Bin ...ller_LED_D.png => jeija_luacontroller_LED_D.png} | Bin mesecons_fpga/init.lua | 8 ++++---- mesecons_luacontroller/init.lua | 8 ++++---- mesecons_microcontroller/init.lua | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) rename mesecons/textures/{jeija_microcontroller_LED_A.png => jeija_luacontroller_LED_A.png} (100%) rename mesecons/textures/{jeija_microcontroller_LED_B.png => jeija_luacontroller_LED_B.png} (100%) rename mesecons/textures/{jeija_microcontroller_LED_C.png => jeija_luacontroller_LED_C.png} (100%) rename mesecons/textures/{jeija_microcontroller_LED_D.png => jeija_luacontroller_LED_D.png} (100%) diff --git a/mesecons/textures/jeija_microcontroller_LED_A.png b/mesecons/textures/jeija_luacontroller_LED_A.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_A.png rename to mesecons/textures/jeija_luacontroller_LED_A.png diff --git a/mesecons/textures/jeija_microcontroller_LED_B.png b/mesecons/textures/jeija_luacontroller_LED_B.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_B.png rename to mesecons/textures/jeija_luacontroller_LED_B.png diff --git a/mesecons/textures/jeija_microcontroller_LED_C.png b/mesecons/textures/jeija_luacontroller_LED_C.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_C.png rename to mesecons/textures/jeija_luacontroller_LED_C.png diff --git a/mesecons/textures/jeija_microcontroller_LED_D.png b/mesecons/textures/jeija_luacontroller_LED_D.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_D.png rename to mesecons/textures/jeija_luacontroller_LED_D.png diff --git a/mesecons_fpga/init.lua b/mesecons_fpga/init.lua index fe86ad4..0af9d1b 100644 --- a/mesecons_fpga/init.lua +++ b/mesecons_fpga/init.lua @@ -20,10 +20,10 @@ plg.register_nodes = function(template) -- build top texture string local texture = "jeija_fpga_top.png" - if a == 1 then texture = texture .. "^jeija_microcontroller_LED_A.png" end - if b == 1 then texture = texture .. "^jeija_microcontroller_LED_B.png" end - if c == 1 then texture = texture .. "^jeija_microcontroller_LED_C.png" end - if d == 1 then texture = texture .. "^jeija_microcontroller_LED_D.png" end + if a == 1 then texture = texture .. "^jeija_luacontroller_LED_A.png" end + if b == 1 then texture = texture .. "^jeija_luacontroller_LED_B.png" end + if c == 1 then texture = texture .. "^jeija_luacontroller_LED_C.png" end + if d == 1 then texture = texture .. "^jeija_luacontroller_LED_D.png" end ndef.tiles[1] = texture ndef.inventory_image = texture diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua index ece1593..90516c0 100644 --- a/mesecons_luacontroller/init.lua +++ b/mesecons_luacontroller/init.lua @@ -818,16 +818,16 @@ for d = 0, 1 do local node_name = BASENAME..cid local top = "jeija_luacontroller_top.png" if a == 1 then - top = top.."^jeija_microcontroller_LED_A.png" + top = top.."^jeija_luacontroller_LED_A.png" end if b == 1 then - top = top.."^jeija_microcontroller_LED_B.png" + top = top.."^jeija_luacontroller_LED_B.png" end if c == 1 then - top = top.."^jeija_microcontroller_LED_C.png" + top = top.."^jeija_luacontroller_LED_C.png" end if d == 1 then - top = top.."^jeija_microcontroller_LED_D.png" + top = top.."^jeija_luacontroller_LED_D.png" end local groups diff --git a/mesecons_microcontroller/init.lua b/mesecons_microcontroller/init.lua index d28df2b..3334f68 100644 --- a/mesecons_microcontroller/init.lua +++ b/mesecons_microcontroller/init.lua @@ -12,16 +12,16 @@ for d = 0, 1 do local nodename = "mesecons_microcontroller:microcontroller"..tostring(d)..tostring(c)..tostring(b)..tostring(a) local top = "jeija_microcontroller_top.png" if tostring(a) == "1" then - top = top.."^jeija_microcontroller_LED_A.png" + top = top.."^jeija_luacontroller_LED_A.png" end if tostring(b) == "1" then - top = top.."^jeija_microcontroller_LED_B.png" + top = top.."^jeija_luacontroller_LED_B.png" end if tostring(c) == "1" then - top = top.."^jeija_microcontroller_LED_C.png" + top = top.."^jeija_luacontroller_LED_C.png" end if tostring(d) == "1" then - top = top.."^jeija_microcontroller_LED_D.png" + top = top.."^jeija_luacontroller_LED_D.png" end local groups if tostring(d)..tostring(c)..tostring(b)..tostring(a) ~= "0000" then