From b8150d6961d44996bac611a9031a1a0458acec55 Mon Sep 17 00:00:00 2001
From: IamPyu <pyucreates@tutamail.com>
Date: Fri, 13 Dec 2024 16:43:30 -0600
Subject: [PATCH] Doors accept an electric input now and add Dispensers

---
 CHANGELOG.md                                  |   4 +-
 mods/ITEMS/pyutest_blocks/api/doors.lua       |   7 ++-
 mods/ITEMS/pyutest_buckets/init.lua           |   8 +++
 .../pyutest_electricity/devices/dropper.lua   |  56 ++++++++++++++++++
 textures/pyutest-dispenser.png                | Bin 0 -> 200 bytes
 5 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 textures/pyutest-dispenser.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8334d34..cc19c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,9 @@ Notable Game Changes:
 - Improved command system and added Command Blocks
 - Added many new commands, while also improving some builtin Luanti ones.
 - Redesign the electricity system using a system similar to [Age of Mending's](https://content.luanti.org/packages/Sumianvoice/pmb_core/) wiring system
-- New electricity devices like the Dropper
+- New electricity devices:
+    - Dropper
+    - Dispenser
 
 Other Game Changes:
 
diff --git a/mods/ITEMS/pyutest_blocks/api/doors.lua b/mods/ITEMS/pyutest_blocks/api/doors.lua
index dbed136..49c2b4b 100644
--- a/mods/ITEMS/pyutest_blocks/api/doors.lua
+++ b/mods/ITEMS/pyutest_blocks/api/doors.lua
@@ -34,6 +34,10 @@ local function on_rightclick(pos, node, clicker)
   }, {pos = pos})
 end
 
+local function electricity_input(pos, node, sender_pos)
+  on_rightclick(pos, node)
+end
+
 PyuTest.make_door = function(name, desc, craftitem, texture, groups, extra)
   local e = extra or {}
 
@@ -53,7 +57,8 @@ PyuTest.make_door = function(name, desc, craftitem, texture, groups, extra)
     collision_box = PyuTest.DOOR_NODEBOX,
 
     after_place_node = after_place_node,
-    on_rightclick = on_rightclick
+    on_rightclick = on_rightclick,
+    __on_electricity_input = electricity_input,
   }, e))
 
   local id_windowless = name .. "_windowless"
diff --git a/mods/ITEMS/pyutest_buckets/init.lua b/mods/ITEMS/pyutest_buckets/init.lua
index c1ddbab..d541a3c 100644
--- a/mods/ITEMS/pyutest_buckets/init.lua
+++ b/mods/ITEMS/pyutest_buckets/init.lua
@@ -52,6 +52,14 @@ PyuTest.make_liquid_bucket = function(name, desc, source, color)
       PyuTest.give_item_or_drop(ItemStack("pyutest_buckets:bucket"), placer:get_inventory(), "main", placer:get_pos())
       core.set_node(pos, { name = source })
     end,
+
+    __on_dispense = function (pos, itemstack)
+      itemstack:take_item()
+      
+      -- TODO: Eject liquid
+
+      return itemstack
+    end
   })
 
   core.override_item(source, {
diff --git a/mods/ITEMS/pyutest_electricity/devices/dropper.lua b/mods/ITEMS/pyutest_electricity/devices/dropper.lua
index d85a3d2..03b2e79 100644
--- a/mods/ITEMS/pyutest_electricity/devices/dropper.lua
+++ b/mods/ITEMS/pyutest_electricity/devices/dropper.lua
@@ -53,3 +53,59 @@ core.register_craft({
     {"group:cobble", "pyutest_ores:zinc_ingot", "group:cobble"}
   }
 })
+
+local function dispense_stack(pos, itemstack)
+  local name = itemstack:get_name()
+  local def = core.registered_items[name]
+
+  if def.__on_dispense then
+    itemstack = def.__on_dispense(pos, itemstack) or itemstack
+  else
+    local it = itemstack:take_item()
+    PyuTest.drop_item(pos, it)
+  end
+
+  return itemstack
+end
+
+PyuTest.make_electricity_device("pyutest_electricity:dispenser", "Dispenser", {
+  cracky = PyuTest.BLOCK_NORMAL
+}, {"pyutest-dispenser.png"}, nil, {
+  on_construct = function (pos)
+    local meta = core.get_meta(pos)
+    local inventory = meta:get_inventory()
+    inventory:set_size("items", 3 * 3)
+    meta:set_string("formspec", dropper_formspec(pos))
+  end,
+  on_destruct = function(pos)
+    local drops = {}
+    PyuTest.get_inventory_drops(pos, "items", drops)
+
+    for _, v in pairs(drops) do
+      core.add_item(pos, v)
+    end
+  end,
+  _pyutest_blast_resistance = 3
+}, function (pos, node, sender_pos)
+  local meta = core.get_meta(pos)
+  local inv = meta:get_inventory()
+
+  for i = 1, inv:get_size("items") do
+    local stack = inv:get_stack("items", i)
+
+    if stack:get_count() > 0 then
+      local it = dispense_stack(pos, stack)
+      inv:set_stack("items", i, stack)
+      break
+    end
+  end
+end)
+
+core.register_craft({
+  output = "pyutest_electricity:dispenser",
+  recipe = {
+    {"group:cobble", "group:cobble", "group:cobble"},
+    {"group:cobble", "pyutest_ores:copper_ingot", "group:cobble"},
+    {"group:cobble", "pyutest_ores:zinc_ingot", "group:cobble"}
+  }
+})
diff --git a/textures/pyutest-dispenser.png b/textures/pyutest-dispenser.png
new file mode 100644
index 0000000000000000000000000000000000000000..a541f5d04d377ba72d92abf4f0be125350e9c100
GIT binary patch
literal 200
zcmV;(05|`MP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0001wNkl<ZIE~Gd
zK?=Yi3<S5*i{J3NkpI6UkhkR6o&v2=u<fM_0TCyzx^Att10S@<KtvvastN!oZ{RDl
z&lbcEJ<zMn;9Bdg`i7z8AYe1Q&69+xCMRVD1^_b~IvF0}iGJ2VMBwfqnHG|SyQfP`
zuOK2&)zoAJCkMTgYt4c*P2y_23y@>GqF}bK-}waFbVB~(So!1t0000<MNUMnLSTZ=
Cf>GoE

literal 0
HcmV?d00001