From 00f61dfb81100094b64de06ca4e1ef73ef8bcd47 Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Fri, 30 Jan 2015 05:09:20 +0100
Subject: [PATCH] rewrite extractor dye recipes, adding a few dyes and making it work better with the dye mod also preventing any issues if it is being run in a game without it
---
technic/machines/register/cables.lua | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua
index 8da650b..7abdfcb 100644
--- a/technic/machines/register/cables.lua
+++ b/technic/machines/register/cables.lua
@@ -1,6 +1,7 @@
-technic.cables = {}
+local S = technic.getter
+technic.cables = {}
function technic.register_cable(tier, size)
local ltier = string.lower(tier)
@@ -21,7 +22,7 @@
end
minetest.register_node("technic:"..ltier.."_cable"..id, {
- description = tier.." Cable",
+ description = S("%s Cable"):format(tier),
tiles = {"technic_"..ltier.."_cable.png"},
inventory_image = "technic_"..ltier.."_cable_wield.png",
wield_image = "technic_"..ltier.."_cable_wield.png",
@@ -58,15 +59,11 @@
end
end
-
minetest.register_on_placenode(function(pos, node)
for tier, machine_list in pairs(technic.machines) do
- for machine_name, _ in pairs(machine_list) do
- if node.name == machine_name then
- technic.update_cables(pos, tier, true)
- technic.networks = {}
- return
- end
+ if machine_list[node.name] ~= nil then
+ technic.update_cables(pos, tier, true)
+ technic.networks = {}
end
end
end)
@@ -74,16 +71,12 @@
minetest.register_on_dignode(function(pos, node)
for tier, machine_list in pairs(technic.machines) do
- for machine_name, _ in pairs(machine_list) do
- if node.name == machine_name then
- technic.update_cables(pos, tier, true)
- technic.networks = {}
- return
- end
+ if machine_list[node.name] ~= nil then
+ technic.update_cables(pos, tier, true)
+ technic.networks = {}
end
end
end)
-
function technic.get_cable_id(links)
return (links[6] * 1) + (links[5] * 2)
@@ -137,7 +130,11 @@
function technic.cables_should_connect(pos1, pos2, tier)
local name = minetest.get_node(pos2).name
- if technic.is_tier_cable(name, tier) then
+ if name == "technic:switching_station" then
+ return pos2.y == pos1.y + 1 and "machine" or false
+ elseif name == "technic:supply_converter" then
+ return math.abs(pos2.y - pos1.y) == 1 and "machine" or false
+ elseif technic.is_tier_cable(name, tier) then
return "cable"
elseif technic.machines[tier][name] then
return "machine"
@@ -151,7 +148,7 @@
local box_center = {-size, -size, -size, size, size, size}
local box_y1 = {-size, -size, -size, size, 0.5, size} -- y+
local box_x1 = {-size, -size, -size, 0.5, size, size} -- x+
- local box_z1 = {-size, -size, size, size, size, 0.5} -- z+
+ local box_z1 = {-size, -size, size, size, size, 0.5} -- z+
local box_z2 = {-size, -size, -0.5, size, size, size} -- z-
local box_y2 = {-size, -0.5, -size, size, size, size} -- y-
local box_x2 = {-0.5, -size, -size, size, size, size} -- x-
--
Gitblit v1.8.0