From d1bf386b80aea6d70b6a015198a77fd40ced04fe Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 21 Jul 2019 06:37:17 -0400 Subject: [PATCH 1/2] Use Unified Dyes on_dig where needed (#506) Requires Unified Dyes commit 9ff40a7f or later --- extranodes/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extranodes/init.lua b/extranodes/init.lua index b8c3093..e554b63 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -177,17 +177,20 @@ if minetest.get_modpath("unifieddyes") then unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) end iclip_def.groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1} + iclip_def.on_dig = unifieddyes.on_dig iclipfence_def.paramtype2 = "color" iclipfence_def.palette = "unifieddyes_palette_extended.png" iclipfence_def.on_construct = unifieddyes.on_construct iclipfence_def.groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1, ud_param2_colorable = 1} + iclipfence_def.on_dig = unifieddyes.on_dig sclip_def.paramtype2 = "colorwallmounted" sclip_def.palette = "unifieddyes_palette_colorwallmounted.png" sclip_def.after_place_node = function(pos, placer, itemstack, pointed_thing) unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) end + sclip_def.on_dig = unifieddyes.on_dig sclip_def.groups = {choppy=1, cracky=1, ud_param2_colorable = 1} end From bb05ff8fd210fc9fac0b521f15e755380e6916d3 Mon Sep 17 00:00:00 2001 From: coil <51716565+coil0@users.noreply.github.com> Date: Sun, 21 Jul 2019 10:40:57 +0000 Subject: [PATCH 2/2] Reject constructor in constructor slot inventories (#505) --- technic/machines/other/constructor.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/technic/machines/other/constructor.lua b/technic/machines/other/constructor.lua index 0a62a7c..e7b1f67 100644 --- a/technic/machines/other/constructor.lua +++ b/technic/machines/other/constructor.lua @@ -118,6 +118,12 @@ local function make_off(mark) end end +local function allow_inventory_put(pos, listname, index, stack, player) + if stack and minetest.get_item_group(stack:get_name(), "technic_constructor") == 1 then + return 0 + end + return technic.machine_inventory_put(pos, listname, index, stack, player) +end local function make_constructor(mark, length) minetest.register_node("technic:constructor_mk"..mark.."_off", { @@ -129,7 +135,8 @@ local function make_constructor(mark, length) "technic_constructor_back.png", "technic_constructor_front_off.png"}, paramtype2 = "facedir", - groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon = 2}, + groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, + mesecon = 2, technic_constructor = 1}, mesecons = {effector = {action_on = make_on(mark, length)}}, sounds = default.node_sound_stone_defaults(), on_construct = function(pos) @@ -160,7 +167,7 @@ local function make_constructor(mark, length) end return true end, - allow_metadata_inventory_put = technic.machine_inventory_put, + allow_metadata_inventory_put = allow_inventory_put, allow_metadata_inventory_take = technic.machine_inventory_take, allow_metadata_inventory_move = technic.machine_inventory_move, on_rotate = screwdriver.rotate_simple @@ -176,10 +183,10 @@ local function make_constructor(mark, length) paramtype2 = "facedir", drop = "technic:constructor_mk"..mark.."_off", groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, - mesecon=2, not_in_creative_inventory=1}, + mesecon=2, not_in_creative_inventory=1, technic_constructor=1}, mesecons= {effector = {action_off = make_off(mark)}}, sounds = default.node_sound_stone_defaults(), - allow_metadata_inventory_put = technic.machine_inventory_put, + allow_metadata_inventory_put = allow_inventory_put, allow_metadata_inventory_take = technic.machine_inventory_take, allow_metadata_inventory_move = technic.machine_inventory_move, on_rotate = false