From 4b6943de483fa91236ad9acad43eecdddb367e9d Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sat, 14 Sep 2019 18:37:47 +0200 Subject: [PATCH] print statement removed, recipe bugfix, heat exchanger bugfix --- energy_storage/heatexchanger.lua | 9 ++------- furnace/recipes.lua | 2 +- power/ta4_pipe.lua | 5 ++++- textures/techage_appl_arrow_white.png | Bin 0 -> 188 bytes textures/techage_appl_tes_core.png | Bin 222 -> 175 bytes 5 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 textures/techage_appl_arrow_white.png diff --git a/energy_storage/heatexchanger.lua b/energy_storage/heatexchanger.lua index 0ef0dcb..d93bb1f 100644 --- a/energy_storage/heatexchanger.lua +++ b/energy_storage/heatexchanger.lua @@ -114,7 +114,6 @@ local function charging(pos, mem, is_charging) end local function glowing(pos, mem, should_glow) - print("glowing", P2S(mem.win_pos), should_glow) if mem.win_pos then if should_glow then swap_node(mem.win_pos, "techage:glow_gravel") @@ -138,10 +137,8 @@ local function formspec(self, pos, mem) end local function can_start(pos, mem, state) - print("can_start") if turbine_cmnd(pos, "power") then local radius = inlet_cmnd(pos, "radius") - print("radius = "..radius) if radius then mem.capa_max = PWR_CAPA[tonumber(radius)] or 0 local owner = M(pos):get_string("owner") or "" @@ -152,7 +149,6 @@ local function can_start(pos, mem, state) end local function start_node(pos, mem, state) - print("start_node", P2S(pos)) mem.running = true mem.delivered = 0 mem.was_charging = true @@ -178,7 +174,6 @@ local State = techage.NodeStates:new({ }) local function node_timer(pos, elapsed) - print("node_timer1") local mem = tubelib2.get_mem(pos) if mem.running and turbine_cmnd(pos, "power") then mem.capa = mem.capa or 0 @@ -292,7 +287,7 @@ minetest.register_node("techage:heatexchanger1", { description = S("TA4 Heat Exchanger 1"), tiles = { -- up, down, right, left, back, front - "techage_hole_ta4.png", + "techage_hole_ta4.png^techage_appl_arrow_white.png", "techage_filling_ta4.png^techage_frame_ta4.png", "techage_filling_ta4.png^techage_frameB_ta4.png^techage_appl_hole_biogas.png", "techage_filling_ta4.png^techage_frameB_ta4.png^techage_appl_hole_biogas.png", @@ -325,7 +320,7 @@ techage.power.register_node({"techage:heatexchanger1"}, { power_network = Cable, }) -Cable:add_secondary_node_names({"techage:heatexchanger1", "techage:heatexchanger3"}) +Pipe:add_secondary_node_names({"techage:heatexchanger1", "techage:heatexchanger3"}) -- for logical communication techage.register_node({"techage:heatexchanger1"}, { diff --git a/furnace/recipes.lua b/furnace/recipes.lua index 4590e16..8a42707 100644 --- a/furnace/recipes.lua +++ b/furnace/recipes.lua @@ -135,7 +135,7 @@ techage.furnace.register_recipe({ output = "basic_materials:concrete_block 4", recipe = { "basic_materials:wet_cement", - "group:sand", + "default:sand", "default:gravel", "techage:steelmat", }, diff --git a/power/ta4_pipe.lua b/power/ta4_pipe.lua index b49e6d0..109a80c 100644 --- a/power/ta4_pipe.lua +++ b/power/ta4_pipe.lua @@ -32,7 +32,10 @@ local Pipe = tubelib2.Tube:new({ }) Pipe:register_on_tube_update(function(node, pos, out_dir, peer_pos, peer_in_dir) - minetest.registered_nodes[node.name].after_tube_update(node, pos, out_dir, peer_pos, peer_in_dir) + local ndef = minetest.registered_nodes[node.name] + if ndef and ndef.after_tube_update then + minetest.registered_nodes[node.name].after_tube_update(node, pos, out_dir, peer_pos, peer_in_dir) + end end) techage.BiogasPipe = Pipe diff --git a/textures/techage_appl_arrow_white.png b/textures/techage_appl_arrow_white.png new file mode 100644 index 0000000000000000000000000000000000000000..21934f6308bce12a2c23144809b8ed5fdd839eb7 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7a$D;Kb?2i11Zh|kH}&M z25w;xW@MN(M*=9wUgGKN%Kn&>Pe4&Mt89xDP{`BM#W5t}@Y^dFIT;K%oE;zkv%W35 zMM3lF-Fm~`1Qvz|;-R7D?=Q(J-Su5kEqm+EdX-2iiPk%-_J01om2KDIa3-HN`@#+e bhB9`J92w@K|DAV%hBA1%`njxgN@xNAmx?!Y literal 0 HcmV?d00001 diff --git a/textures/techage_appl_tes_core.png b/textures/techage_appl_tes_core.png index 10b9a4f8beaa10d93726585281ebb8c699033476..a0f164ac14d5e117aa2bd20e36ef72e42d4935de 100644 GIT binary patch delta 159 zcmcb|xSnx>L_H%j0|SHSmKWQB6id3JuOkD)#(wTUiL5|AV{wqX6T`Z5GB1G~&H|6f zVg?3oVGw3ym^DWND99Gz6XNQVS!ifzs8ObA1kzIy}>_gAMXUbqtCJV%EG8kXR@L_K?nr>`sfV@_TnF1Gan z&W%7-*`6+rArXg@6C_v{Cy4Zv9PsdHT)6OIy_b$f{Xd&H>ltiTED