From 11e43ffe134f6483905b18662a544dec384b231c Mon Sep 17 00:00:00 2001
From: Cedric Haase <cedrichaase@mailbox.org>
Date: Wed, 06 Jan 2021 18:12:51 +0100
Subject: [PATCH] nuclear_reactor: Add error messages on start failure (#574)
---
technic/machines/supply_converter.lua | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua
index 8ae4dd4..24601c6 100644
--- a/technic/machines/supply_converter.lua
+++ b/technic/machines/supply_converter.lua
@@ -11,6 +11,8 @@
local S = technic.getter
+local cable_entry = "^technic_cable_connection_overlay.png"
+
local function set_supply_converter_formspec(meta)
local formspec = "size[5,2.25]"..
"field[0.3,0.5;2,1;power;"..S("Input Power")..";"..meta:get_int("power").."]"
@@ -70,6 +72,9 @@
receptor = {action = function() end},
effector = {
action = function(pos, node, channel, msg)
+ if type(msg) ~= "string" then
+ return
+ end
local meta = minetest.get_meta(pos)
if channel ~= meta:get_string("channel") then
return
@@ -88,7 +93,7 @@
meta:set_int("enabled", 1)
elseif msg == "toggle" then
local onn = meta:get_int("enabled")
- onn = -(onn-1) -- Mirror onn with pivot 0.5, so switch between 1 and 0.
+ onn = 1-onn -- Mirror onn with pivot 0.5, so switch between 1 and 0.
meta:set_int("enabled", onn)
elseif msg:sub(1, 5) == "power" then
local power = tonumber(msg:sub(7))
@@ -101,6 +106,8 @@
meta:set_int("power", power)
elseif msg:sub(1, 12) == "mesecon_mode" then
meta:set_int("mesecon_mode", tonumber(msg:sub(14)))
+ else
+ return
end
set_supply_converter_formspec(meta)
end
@@ -142,7 +149,9 @@
meta:set_int(from.."_EU_supply", 0)
meta:set_int(to.."_EU_demand", 0)
meta:set_int(to.."_EU_supply", input * remain)
- meta:set_string("infotext", S("@1 (@2 @3 -> @4 @5)", machine_name, technic.pretty_num(input), from, technic.pretty_num(input * remain), to))
+ meta:set_string("infotext", S("@1 (@2 @3 -> @4 @5)", machine_name,
+ technic.EU_string(input), from,
+ technic.EU_string(input * remain), to))
else
meta:set_string("infotext", S("%s Has Bad Cabling"):format(machine_name))
if to then
@@ -158,9 +167,14 @@
minetest.register_node("technic:supply_converter", {
description = S("Supply Converter"),
- tiles = {"technic_supply_converter_top.png", "technic_supply_converter_bottom.png",
- "technic_supply_converter_side.png", "technic_supply_converter_side.png",
- "technic_supply_converter_side.png", "technic_supply_converter_side.png"},
+ tiles = {
+ "technic_supply_converter_tb.png"..cable_entry,
+ "technic_supply_converter_tb.png"..cable_entry,
+ "technic_supply_converter_side.png",
+ "technic_supply_converter_side.png",
+ "technic_supply_converter_side.png",
+ "technic_supply_converter_side.png"
+ },
groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
technic_machine=1, technic_all_tiers=1},
connect_sides = {"top", "bottom"},
@@ -187,10 +201,11 @@
minetest.register_craft({
output = 'technic:supply_converter 1',
recipe = {
- {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'},
+ {'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'},
{'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'},
{'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'},
- }
+ },
+ replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, },
})
for tier, machines in pairs(technic.machines) do
--
Gitblit v1.8.0