From 63692ea011eae2eb3fe3887661cbe85b1e9f942f Mon Sep 17 00:00:00 2001 From: Olivier Dragon Date: Mon, 8 Jul 2024 22:08:56 -0400 Subject: [PATCH] Revert "Update mesecons from upstream." This reverts commit 263c11ca1aa853f73319232dd7166980ae1eedda. --- builder/mods_src/mesecons/mesecons | 2 +- ..._A.png => jeija_microcontroller_LED_A.png} | Bin ..._B.png => jeija_microcontroller_LED_B.png} | Bin ..._C.png => jeija_microcontroller_LED_C.png} | Bin ..._D.png => jeija_microcontroller_LED_D.png} | Bin mods/mesecons/mesecons_delayer/init.lua | 53 ++++++++++-------- .../textures/jeija_delayer.png | Bin 149 -> 0 bytes .../textures/jeija_gate_off.png | Bin 84 -> 0 bytes .../textures/jeija_gate_on.png | Bin 84 -> 0 bytes .../textures/jeija_gate_side.png | Bin 136 -> 0 bytes .../textures/mesecons_delayer_1.png | Bin 338 -> 0 bytes .../textures/mesecons_delayer_2.png | Bin 337 -> 0 bytes .../textures/mesecons_delayer_3.png | Bin 339 -> 0 bytes .../textures/mesecons_delayer_4.png | Bin 334 -> 0 bytes .../textures/mesecons_delayer_bottom.png | Bin 0 -> 221 bytes .../textures/mesecons_delayer_ends_off.png | Bin 0 -> 176 bytes .../textures/mesecons_delayer_ends_on.png | Bin 0 -> 187 bytes .../textures/mesecons_delayer_off_1.png | Bin 0 -> 448 bytes .../textures/mesecons_delayer_off_2.png | Bin 0 -> 449 bytes .../textures/mesecons_delayer_off_3.png | Bin 0 -> 448 bytes .../textures/mesecons_delayer_off_4.png | Bin 0 -> 446 bytes .../textures/mesecons_delayer_on_1.png | Bin 0 -> 541 bytes .../textures/mesecons_delayer_on_2.png | Bin 0 -> 541 bytes .../textures/mesecons_delayer_on_3.png | Bin 0 -> 541 bytes .../textures/mesecons_delayer_on_4.png | Bin 0 -> 538 bytes .../textures/mesecons_delayer_sides_off.png | Bin 0 -> 173 bytes .../textures/mesecons_delayer_sides_on.png | Bin 0 -> 181 bytes mods/mesecons/mesecons_pistons/init.lua | 36 ++++++------ .../textures/mesecons_piston_bottom.png | Bin 0 -> 738 bytes .../textures/mesecons_piston_left.png | Bin 0 -> 740 bytes .../mesecons_piston_pusher_bottom.png | Bin 0 -> 720 bytes .../textures/mesecons_piston_pusher_left.png | Bin 0 -> 733 bytes .../textures/mesecons_piston_pusher_right.png | Bin 0 -> 751 bytes .../textures/mesecons_piston_right.png | Bin 0 -> 733 bytes mods/mesecons/mesecons_torch/init.lua | 8 +-- .../textures/jeija_torches_off_ceiling.png | Bin 0 -> 146 bytes .../textures/jeija_torches_off_side.png | Bin 0 -> 142 bytes .../textures/jeija_torches_on_ceiling.png | Bin 0 -> 147 bytes .../textures/jeija_torches_on_side.png | Bin 0 -> 139 bytes 39 files changed, 53 insertions(+), 46 deletions(-) rename mods/mesecons/mesecons/textures/{jeija_luacontroller_LED_A.png => jeija_microcontroller_LED_A.png} (100%) rename mods/mesecons/mesecons/textures/{jeija_luacontroller_LED_B.png => jeija_microcontroller_LED_B.png} (100%) rename mods/mesecons/mesecons/textures/{jeija_luacontroller_LED_C.png => jeija_microcontroller_LED_C.png} (100%) rename mods/mesecons/mesecons/textures/{jeija_luacontroller_LED_D.png => jeija_microcontroller_LED_D.png} (100%) delete mode 100644 mods/mesecons/mesecons_delayer/textures/jeija_delayer.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/jeija_gate_off.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/jeija_gate_on.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/jeija_gate_side.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_1.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_2.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_3.png delete mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_4.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_bottom.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_on.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_3.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_4.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_1.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_3.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png create mode 100644 mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png create mode 100644 mods/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png create mode 100644 mods/mesecons/mesecons_pistons/textures/mesecons_piston_left.png create mode 100644 mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png create mode 100644 mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_left.png create mode 100644 mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png create mode 100644 mods/mesecons/mesecons_pistons/textures/mesecons_piston_right.png create mode 100644 mods/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png create mode 100644 mods/mesecons/mesecons_torch/textures/jeija_torches_off_side.png create mode 100644 mods/mesecons/mesecons_torch/textures/jeija_torches_on_ceiling.png create mode 100644 mods/mesecons/mesecons_torch/textures/jeija_torches_on_side.png diff --git a/builder/mods_src/mesecons/mesecons b/builder/mods_src/mesecons/mesecons index 0c7bb316c..a82bac7b5 160000 --- a/builder/mods_src/mesecons/mesecons +++ b/builder/mods_src/mesecons/mesecons @@ -1 +1 @@ -Subproject commit 0c7bb316c7df0be7b99b492d2b22b84425c87b09 +Subproject commit a82bac7b5bb335e9b595ed3e004adbc18b7b7971 diff --git a/mods/mesecons/mesecons/textures/jeija_luacontroller_LED_A.png b/mods/mesecons/mesecons/textures/jeija_microcontroller_LED_A.png similarity index 100% rename from mods/mesecons/mesecons/textures/jeija_luacontroller_LED_A.png rename to mods/mesecons/mesecons/textures/jeija_microcontroller_LED_A.png diff --git a/mods/mesecons/mesecons/textures/jeija_luacontroller_LED_B.png b/mods/mesecons/mesecons/textures/jeija_microcontroller_LED_B.png similarity index 100% rename from mods/mesecons/mesecons/textures/jeija_luacontroller_LED_B.png rename to mods/mesecons/mesecons/textures/jeija_microcontroller_LED_B.png diff --git a/mods/mesecons/mesecons/textures/jeija_luacontroller_LED_C.png b/mods/mesecons/mesecons/textures/jeija_microcontroller_LED_C.png similarity index 100% rename from mods/mesecons/mesecons/textures/jeija_luacontroller_LED_C.png rename to mods/mesecons/mesecons/textures/jeija_microcontroller_LED_C.png diff --git a/mods/mesecons/mesecons/textures/jeija_luacontroller_LED_D.png b/mods/mesecons/mesecons/textures/jeija_microcontroller_LED_D.png similarity index 100% rename from mods/mesecons/mesecons/textures/jeija_luacontroller_LED_D.png rename to mods/mesecons/mesecons/textures/jeija_microcontroller_LED_D.png diff --git a/mods/mesecons/mesecons_delayer/init.lua b/mods/mesecons/mesecons_delayer/init.lua index ab0063e2f..c4f4b877b 100644 --- a/mods/mesecons/mesecons_delayer/init.lua +++ b/mods/mesecons/mesecons_delayer/init.lua @@ -27,6 +27,20 @@ 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", @@ -34,14 +48,11 @@ local def = { walkable = true, selection_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, + fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, }, node_box = { type = "fixed", - 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 } - }, + fixed = boxes }, paramtype = "light", paramtype2 = "facedir", @@ -63,17 +74,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^jeija_gate_output_off.png^jeija_gate_off.png^".. - "jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", - "jeija_microcontroller_bottom.png^jeija_gate_output_off.png", - "jeija_gate_side.png^jeija_gate_side_output_off.png", - "jeija_gate_side.png", - "jeija_gate_side.png", - "jeija_gate_side.png", + "mesecons_delayer_off_"..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", groups = off_groups, on_punch = function(pos, node, puncher) if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then @@ -107,16 +117,13 @@ 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^jeija_gate_output_on.png^jeija_gate_on.png^".. - "jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", - "jeija_microcontroller_bottom.png^jeija_gate_output_on.png", - "jeija_gate_side.png^jeija_gate_side_output_on.png", - "jeija_gate_side.png", - "jeija_gate_side.png", - "jeija_gate_side.png", + "mesecons_delayer_on_"..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/mods/mesecons/mesecons_delayer/textures/jeija_delayer.png b/mods/mesecons/mesecons_delayer/textures/jeija_delayer.png deleted file mode 100644 index e33fe12f5b39c11b425c295efdb016d1480a643d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0R?B{{R1P8ZOuZ>5 z`2{mLJiCzwvL>4nJa0`PlBg3pY5Tt@Z9l8qQb!g i49W*$I#{}rEEpJ0rO9(1c^<0^GThVE&t;ucLK6TmdnNt= diff --git a/mods/mesecons/mesecons_delayer/textures/jeija_gate_off.png b/mods/mesecons/mesecons_delayer/textures/jeija_gate_off.png deleted file mode 100644 index 2f77aeb1ffef41e12a05defe0e8f90bfbf493148..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`(w;7kAr-fhC2SH-g?#+K`iK|2R+?gQu&X%Q~loCID9L7`Olc diff --git a/mods/mesecons/mesecons_delayer/textures/jeija_gate_on.png b/mods/mesecons/mesecons_delayer/textures/jeija_gate_on.png deleted file mode 100644 index 406e4f6e76f44fc42bd3d64c76d42b886e2a861a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`(w;7kAr-fhC2Sttwf_5m$%DkS h11lI8v+>w4F!;1@-7sUO!ZDyS22WQ%mvv4FO#or}7@hzC diff --git a/mods/mesecons/mesecons_delayer/textures/jeija_gate_side.png b/mods/mesecons/mesecons_delayer/textures/jeija_gate_side.png deleted file mode 100644 index 1223b54d2ab495c651c17900056c103b58d29f42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UA{5@S9LnNlAo;@jez<`6<;p_cC zo*9SFT@3x?_Hd^%=aCh2lHwL6?&kToE!x6b!j0X%Y=@zxqx9_k7Cnj*D;CW;VXu)d kps{DkwWr6c)@bS2Pd@rVb>*x7D?wIxy85}Sb4q9e03rl2761SM diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_1.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_1.png deleted file mode 100644 index 973d6849938b0ba73a6da9a6fdd46ab9b5fa5db2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nzS0D`n1|Y)x8iN}HgO?XW zOssZnEJH#9b6Og2b~Zy^US58FeqkX)VPRoWkyLSUaY+e7NeOdFNl7UXlu4GAm6ey5 zS5)vD1Nf)z#J2*E7`D^VZkbH#9Uf zHZn9eHa0aiH8(f6w6wIg3bwWyw6?akwF$JfwRLoKbae@Kb#?XjiuU#KOq!@ac{1DN z$re+mm`|G~GGm6uj2W(T=5Q@u%)MlZ)zYQj8#Y*N-fXscv&Z}QjP6T1Sb<(*ED7=p zW^j0RBMr#mEbxddW?&SuEV%gfKtFDzszEG#T4k}57PE-7IsDPb-tDJcblGRd;C zvhwosiVFUUii*n0%BrfW>gwv68ityhn%Y{1+S=N>I)=JBow_=`y1KghdWQOX-un9b zhK7d5Mux`5#-^sG=H}*>mX_95!PZuT*4EaxHi5RbwvLXDt}el@uCCr*(Y`*ONfY%a zPiC7u*<$Jx^J&vWX3Wr-F~fDv9InNSxtA=lTDsJG!v?F(o6R>3p^r=85p>QL70(Y)*K0-ppd7FV~E7%D1Nf)z#J2*E7`D^VZkbH#9Uf zHZn9eHa0aiH8(f6w6wIg3bwWyw6?akwF$JfwRLoKbae@Kb#?XjiuU#KOq!@ac{1DN z$re+mm`|G~GGm6uj2W(T=5Q@u%)MlZ)zYQj8#Y*N-fXscv&Z}QjP6T1Sb<(*ED7=p zW^j0RBMr#mEbxddW?} zc5Ey|LIQJI8gF(sLtb89etv#oAwywdVNsD(adB};2}4Njywzjniw6(Q$baZre33hdL_4bPP_3=!as6Tl!+vLd> zQ>U0unE1=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~^~ literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png new file mode 100644 index 0000000000000000000000000000000000000000..9cbeb39497fc7f6491dfc5f9bc27f9bb2601aec9 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar-fhBy3--!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 literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png new file mode 100644 index 0000000000000000000000000000000000000000..20d9efc3d1cd0dff31e9b7185a25247892f626f1 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png new file mode 100644 index 0000000000000000000000000000000000000000..590d62f19e44ad21d4fe57cd703bef16ad862ddd GIT binary patch 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%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=RPv fVPs}u!r@f_0!bT_b_xT800000NkvXXu0mjfXzByw literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png new file mode 100644 index 0000000000000000000000000000000000000000..7984ef433f8f17eea84f43ecbd0d5c9fcfb88476 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png new file mode 100644 index 0000000000000000000000000000000000000000..0386112c1101b66a79daeb18a7db40d7f7c400e5 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png new file mode 100644 index 0000000000000000000000000000000000000000..2c60cbbb409b91ceaef7319c305942289a07682e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png new file mode 100644 index 0000000000000000000000000000000000000000..4927557a93ab9aa3e85a6377abb07a6b439a360e GIT binary patch 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! literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_pistons/init.lua b/mods/mesecons/mesecons_pistons/init.lua index 274258ee5..3d75b3531 100644 --- a/mods/mesecons/mesecons_pistons/init.lua +++ b/mods/mesecons/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_top.png^[transform2", - "mesecons_piston_top.png^[transform3", - "mesecons_piston_top.png^[transform1", + "mesecons_piston_bottom.png", + "mesecons_piston_left.png", + "mesecons_piston_right.png", "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_top.png^[transform2", - "mesecons_piston_top.png^[transform3", - "mesecons_piston_top.png^[transform1", + "mesecons_piston_bottom.png", + "mesecons_piston_left.png", + "mesecons_piston_right.png", "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_top.png^[transform2", - "mesecons_piston_pusher_top.png^[transform3", - "mesecons_piston_pusher_top.png^[transform1", + "mesecons_piston_pusher_bottom.png", + "mesecons_piston_pusher_left.png", + "mesecons_piston_pusher_right.png", "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_top.png^[transform2", - "mesecons_piston_top.png^[transform3", - "mesecons_piston_top.png^[transform1", + "mesecons_piston_bottom.png", + "mesecons_piston_left.png", + "mesecons_piston_right.png", "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_top.png^[transform2", - "mesecons_piston_top.png^[transform3", - "mesecons_piston_top.png^[transform1", + "mesecons_piston_bottom.png", + "mesecons_piston_left.png", + "mesecons_piston_right.png", "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_top.png^[transform2", - "mesecons_piston_pusher_top.png^[transform3", - "mesecons_piston_pusher_top.png^[transform1", + "mesecons_piston_pusher_bottom.png", + "mesecons_piston_pusher_left.png", + "mesecons_piston_pusher_right.png", "mesecons_piston_pusher_back.png", "mesecons_piston_pusher_front_sticky.png" }, diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..d4b2fbf3f6f7dbd9ceb210c20d882fc358192445 GIT binary patch literal 738 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 P00000NkvXXu0mjf*85iq literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png new file mode 100644 index 0000000000000000000000000000000000000000..af86c0f13c12c6465e5fbe240f721db560c31ae8 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_torch/init.lua b/mods/mesecons/mesecons_torch/init.lua index 6469d7b75..ab2df98d0 100644 --- a/mods/mesecons/mesecons_torch/init.lua +++ b/mods/mesecons/mesecons_torch/init.lua @@ -56,8 +56,8 @@ local torch_selectionbox = } minetest.register_node("mesecons_torch:mesecon_torch_off", { - drawtype = "plantlike", - tiles = {"jeija_torches_off.png"}, + drawtype = "torchlike", + tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.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 = "plantlike", - tiles = {"jeija_torches_on.png"}, + drawtype = "torchlike", + tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"}, inventory_image = "jeija_torches_on.png", wield_image = "jeija_torches_on.png", paramtype = "light", diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png new file mode 100644 index 0000000000000000000000000000000000000000..033d2b404ba296b0ed9916c11323a07a165477ff GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^f;L~tmpGIl!ocwRn9=S9TAsx~TNpfD{an^LB{Ts5$E7>m literal 0 HcmV?d00001 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_on_side.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_on_side.png new file mode 100644 index 0000000000000000000000000000000000000000..895a4e32d3086675ee8dc6555ebc5e705880f341 GIT binary patch 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