From 7d39136764c894cb4adc3f0726f1df5eb6a4926b Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Tue, 25 Oct 2022 18:03:51 +0200
Subject: [PATCH] Chainsaw: Partial rewrite, various improvements (#607)
---
technic/machines/register/cables.lua | 84 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua
index d65c399..b0a94d1 100644
--- a/technic/machines/register/cables.lua
+++ b/technic/machines/register/cables.lua
@@ -63,24 +63,24 @@
-- This is similar to check_node_subp
technic.cables[minetest.hash_node_position(pos)] = network_id
pos.visited = 1
- if technic.is_tier_cable(name, tier) then
+ if technic.is_tier_cable(node.name, tier) then
+ -- Found a cable
table.insert(network.all_nodes,pos)
elseif technic.machines[tier][node.name] then
- meta:set_string(tier.."_network",minetest.pos_to_string(sw_pos))
- if technic.machines[tier][node.name] == technic.producer then
- table.insert(network.PR_nodes,pos)
- elseif technic.machines[tier][node.name] == technic.receiver then
- table.insert(network.RE_nodes,pos)
- elseif technic.machines[tier][node.name] == technic.producer_receiver then
- table.insert(network.PR_nodes,pos)
- table.insert(network.RE_nodes,pos)
- elseif technic.machines[tier][node.name] == "SPECIAL" and
- (pos.x ~= sw_pos.x or pos.y ~= sw_pos.y or pos.z ~= sw_pos.z) and
- from_below then
- table.insert(network.SP_nodes,pos)
- elseif technic.machines[tier][node.name] == technic.battery then
- table.insert(network.BA_nodes,pos)
+ -- Found a machine
+ local eu_type = technic.machines[tier][node.name]
+ meta:set_string(tier.."_network", minetest.pos_to_string(sw_pos))
+ if eu_type == technic.producer then
+ table.insert(network.PR_nodes, pos)
+ elseif eu_type == technic.receiver then
+ table.insert(network.RE_nodes, pos)
+ elseif eu_type == technic.producer_receiver then
+ table.insert(network.PR_nodes, pos)
+ table.insert(network.RE_nodes, pos)
+ elseif eu_type == technic.battery then
+ table.insert(network.BA_nodes, pos)
end
+ -- Note: SPECIAL (i.e. switching station) is not traversed!
end
elseif dead_end and not placed then
-- Dead end removed, remove it from the network
@@ -115,6 +115,19 @@
end
end
end
+end
+
+local function item_place_override_node(itemstack, placer, pointed, node)
+ -- Call the default on_place function with a fake itemstack
+ local temp_itemstack = ItemStack(itemstack)
+ temp_itemstack:set_name(node.name)
+ local original_count = temp_itemstack:get_count()
+ temp_itemstack =
+ minetest.item_place(temp_itemstack, placer, pointed, node.param2) or
+ temp_itemstack
+ -- Remove the same number of items from the real itemstack
+ itemstack:take_item(original_count - temp_itemstack:get_count())
+ return itemstack
end
function technic.register_cable(tier, size)
@@ -202,22 +215,53 @@
if i == 1 then
def.on_place = function(itemstack, placer, pointed_thing)
local pointed_thing_diff = vector.subtract(pointed_thing.above, pointed_thing.under)
- local num
+ local num = 1
+ local changed
for k, v in pairs(pointed_thing_diff) do
if v ~= 0 then
+ changed = k
num = xyz[s(tostring(v):sub(-2, -2)..k)]
break
end
end
- minetest.set_node(pointed_thing.above, {name = "technic:"..ltier.."_cable_plate_"..num})
- if not (creative and creative.is_enabled_for(placer)) then
- itemstack:take_item()
+ local crtl = placer:get_player_control()
+ if (crtl.aux1 or crtl.sneak) and not (crtl.aux1 and crtl.sneak) and changed then
+ local fine_pointed = minetest.pointed_thing_to_face_pos(placer, pointed_thing)
+ fine_pointed = vector.subtract(fine_pointed, pointed_thing.above)
+ fine_pointed[changed] = nil
+ local ps = {}
+ for p, _ in pairs(fine_pointed) do
+ ps[#ps+1] = p
+ end
+ local bigger = (math.abs(fine_pointed[ps[1]]) > math.abs(fine_pointed[ps[2]]) and ps[1]) or ps[2]
+ if math.abs(fine_pointed[bigger]) < 0.3 then
+ num = num + 3
+ num = (num <= 6 and num) or num - 6
+ else
+ num = xyz[((fine_pointed[bigger] < 0 and "-") or "") .. bigger]
+ end
end
- return itemstack
+ return item_place_override_node(
+ itemstack, placer, pointed_thing,
+ {name = "technic:"..ltier.."_cable_plate_"..num}
+ )
end
else
def.groups.not_in_creative_inventory = 1
end
+ def.on_rotate = function(pos, node, user, mode, new_param2)
+ local dir = 0
+ if mode == screwdriver.ROTATE_FACE then -- left-click
+ dir = 1
+ elseif mode == screwdriver.ROTATE_AXIS then -- right-click
+ dir = -1
+ end
+ local num = tonumber(node.name:sub(-1))
+ num = num + dir
+ num = (num >= 1 and num) or num + 6
+ num = (num <= 6 and num) or num - 6
+ minetest.swap_node(pos, {name = "technic:"..ltier.."_cable_plate_"..num})
+ end
minetest.register_node("technic:"..ltier.."_cable_plate_"..i, def)
cable_tier["technic:"..ltier.."_cable_plate_"..i] = tier
end
--
Gitblit v1.8.0