From ad6fe4a4e50ae7cb33fbb5117c67f7e1ef75cf9a Mon Sep 17 00:00:00 2001 From: Zenon Seth Date: Sat, 18 Nov 2023 23:40:48 +0000 Subject: [PATCH] Add Autocrafter recipe; fix injection into Autocrafter --- api/crafter_auto.lua | 6 +----- logic/requester.lua | 4 ++-- registration/machines_api_reg.lua | 8 ++++++++ registration/node_recipes.lua | 9 +++++++++ textures/logistica_autocrafter.png | Bin 2572 -> 2248 bytes 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/api/crafter_auto.lua b/api/crafter_auto.lua index 921aec4..eaf42ac 100644 --- a/api/crafter_auto.lua +++ b/api/crafter_auto.lua @@ -82,7 +82,7 @@ end local function autocrafter_allow_metadata_inv_put(pos, listname, index, stack, player) if minetest.is_protected(pos, player:get_player_name()) then return 0 end - if listname == INV_CRAFT_RES or listname == INV_DST then return 0 end + if listname == INV_CRAFT_RES then return 0 end if listname == INV_CRAFT then local inv = minetest.get_meta(pos):get_inventory() local st = inv:get_stack(listname, index) @@ -171,7 +171,3 @@ function logistica.register_autocrafter(desc, name, tiles) minetest.register_node("logistica:"..lname, def) end - -logistica.register_autocrafter("Autocrafter", "autocrafter", { - "logistica_autocrafter.png" -}) \ No newline at end of file diff --git a/logic/requester.lua b/logic/requester.lua index f59027e..d804e5c 100644 --- a/logic/requester.lua +++ b/logic/requester.lua @@ -33,8 +33,8 @@ local function get_valid_requester_and_target_inventory(requesterPos) local targetPos = logistica.get_requester_target(requesterPos) if not targetPos then return end - -- exclude logistica nodes from this - if string.find(minetest.get_node(targetPos).name, "logistica:") then return end + -- exclude logistica machines from this + if logistica.is_machine(minetest.get_node(targetPos).name) then return end local targetInv = get_meta(targetPos):get_inventory() if not targetInv:get_list(targetList) then return end diff --git a/registration/machines_api_reg.lua b/registration/machines_api_reg.lua index fb48fec..dfd995d 100644 --- a/registration/machines_api_reg.lua +++ b/registration/machines_api_reg.lua @@ -11,6 +11,14 @@ logistica.register_access_point("Access Point", "access_point", { "logistica_access_point_front.png", }) +-------------------------------- +-- Autocrafter +-------------------------------- + +logistica.register_autocrafter("Autocrafter", "autocrafter", { + "logistica_autocrafter.png" +}) + -------------------------------- -- Cables -------------------------------- diff --git a/registration/node_recipes.lua b/registration/node_recipes.lua index 162e667..a98c93e 100644 --- a/registration/node_recipes.lua +++ b/registration/node_recipes.lua @@ -107,3 +107,12 @@ minetest.register_craft({ {L("silverin_plate"), "default:mese_crystal", L("silverin_plate")}, } }) + +minetest.register_craft({ + output = L("autocrafter"), + recipe = { + {L("silverin_plate"), "default:chest", L("silverin_plate")}, + {"", L("silverin_circuit"), ""}, + {L("silverin_plate"), "", L("silverin_plate")}, + } +}) diff --git a/textures/logistica_autocrafter.png b/textures/logistica_autocrafter.png index 5b1e99838745a22a9575176b18dfd818154d4ab5..c685c55c149dc9cda98288bd2bae600759984f2a 100644 GIT binary patch delta 488 zcmVIx;poF)@?B10)ACIx;poF)_310~i4ZGdeOhIx#Vm2?c2c z;o?U{vvvif0e=CQNkl5QM9HdUj^lXRoc}oj8em1ae4;NQg;}5Qzwh zfPhy!+w#9>Z)Rtv2`q$=g)91`mP((h>EZQ5DW%rxy|>ne5C8zM)~f0-3~k${l%~_^ ze!utL3xH2wzdI4j%zy#}D6l!l`NSE*SZapWT4OFxAAjD9h=lY)+ErG?pD>!n3}a>@ zVG^PYDkU3Z#9Aw(ct;=Ky~Y3Y`P)xQoKlj_W@9^PtN}2e&jIXqyKC?h$)=Q2xbJ&o zNQG|H13*?OowF=#Id~QMx!>!?gE-%iY}_iwITP zZo_S(!+$AC<&=_$h)xW5a$9L+g`>maAl`dtNQiH*G;@up_I)p>(A8lh)a6CNV}D$Mx<= z#L7?rN&rAmC;$Rbsc0R?yxnf;@y+8f48|B{ZZX^T`T6<&{yv1@oNL>5xm+$5i>7JT e>vh+4rIg?QknxNM^x7r>0000Foq}?2`+}41Zr4G zChTTxF7#3_y=Y{i5{Muaf)85J3L5>OAfad>>!C2QA6siFE0vkTLefazP+aHs#=oqR_d0^T1w;h{`PQegB93A5W>w&c#Y) zcHgH{uT4&;SzeEo1332OuZKVT$=aMThMaTEuqJTxLu;xffAgvpk;L^uSqmsJzSb)X z!h~knM}K0dF$O!G4iE6yi;tt^jzDEF41ICvg{|O#5Ey=VuyT)ld(ZZ}%euF$t+iy= z)4S$}pIuk0mV*ERa%(MsQo5CB01ynLkOe}hj+$SH<@HGn!*F7Bn^*D}Qb*hyXMcHp z_oE0v98dzM&t7@?$zgCb&uv%fqraV@tyU|iZh!h_<4S#@8U>FHt+}rxzr8+p?#7%S zirNE%K}lYiz5UINTZ-CJsYDTx6y)-y`tN_v_qt~8?^vgK+(_buB-ggvNKBgFthcYt zE?_~8F^GsRWJg|lBH$driHfiko*&szxWZEChmcX&Gq%xWd3RYSNkYbVk2i-#*R86p zt$#*W_xZY@H(`T^P>m7Y&OF58?Q9|II$?1d7Z36)39HsQ+ z7Z+a{-%^0vxN=}g)lSV!QYob_$Xnn2@xi65D0yXNm3sKzkAJ=U{nY}A7e$Qm6Q9o< z{_tmKS-0Co=Um^}cA_l=nRT(&1rQWWfOp3!iom0cHkJ8TtDY;OC_=3@$+G=BHV{JR z?MaL4-9K;WNNJaPW=_M!U^j%~88Fj*eQF&P~hP1BSyMk)1uzu9aK3=Alx sgb=>(FD@=tDizQ3+U<4_1lHRB081)e)6mnQ4gdfE07*qoM6N<$f^NBw9{>OV