From b4bcc4c99ed53f955330cecd7d477d14e48d83f1 Mon Sep 17 00:00:00 2001 From: sonicSMASH <111550219+sonicSMASH@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:56:01 -0800 Subject: [PATCH 1/5] Add `check_for_pole` to some poles This enables signs from the street_signs mod to use this mod's poles as a pole to correctly attach to. --- streets_poles/init.lua | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/streets_poles/init.lua b/streets_poles/init.lua index 68a04e9..ecb9e61 100644 --- a/streets_poles/init.lua +++ b/streets_poles/init.lua @@ -11,7 +11,7 @@ minetest.register_node(":streets:bigpole", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -39,7 +39,9 @@ minetest.register_node(":streets:bigpole", { [3] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0 }, ["t"] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 } - } + }, + check_for_pole = true + }) minetest.register_craft({ @@ -58,7 +60,7 @@ minetest.register_node(":streets:bigpole_short", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -85,7 +87,8 @@ minetest.register_node(":streets:bigpole_short", { [3] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0 }, ["t"] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - } + }, + check_for_pole = true }) minetest.register_craft({ @@ -103,7 +106,7 @@ minetest.register_node(":streets:bigpole_edge", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -131,7 +134,8 @@ minetest.register_node(":streets:bigpole_edge", { [3] = { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0 }, ["t"] = { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0 } - } + }, + check_for_pole = true }) minetest.register_craft({ @@ -158,7 +162,7 @@ minetest.register_node(":streets:bigpole_tjunction", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -186,7 +190,8 @@ minetest.register_node(":streets:bigpole_tjunction", { [3] = { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1 }, ["t"] = { 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0 } - } + }, + check_for_pole = true }) minetest.register_craft({ @@ -204,7 +209,7 @@ minetest.register_node(":streets:bigpole_corner", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -233,7 +238,8 @@ minetest.register_node(":streets:bigpole_corner", { [3] = { 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0 }, ["t"] = { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0 } - } + }, + check_for_pole = true }) minetest.register_craft({ @@ -252,7 +258,7 @@ minetest.register_node(":streets:bigpole_four_side_junction", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -300,7 +306,7 @@ minetest.register_node(":streets:bigpole_cross", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -348,7 +354,7 @@ minetest.register_node(":streets:bigpole_five_side_junction", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -395,7 +401,7 @@ minetest.register_node(":streets:bigpole_all_sides", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, + groups = { cracky = 1, level = 2, bigpole = 1 }, node_box = { type = "fixed", fixed = { @@ -424,7 +430,8 @@ minetest.register_node(":streets:bigpole_all_sides", { [3] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, ["t"] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } - } + }, + check_for_pole = true }) minetest.register_craft({ From 1a481df63bc29f4c500ebecea51addba3fc09cf6 Mon Sep 17 00:00:00 2001 From: sonicSMASH <111550219+sonicSMASH@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:59:51 -0800 Subject: [PATCH 2/5] Update mod.conf --- mod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.conf b/mod.conf index 2692ff1..fb0114d 100644 --- a/mod.conf +++ b/mod.conf @@ -1,7 +1,7 @@ name = streets title = Streets depends = default, stairs, ts_workshop, dye -optional_depends = creative, xpanes, stairsplus, moreblocks, digilines, concrete +optional_depends = creative, xpanes, stairsplus, moreblocks, digilines, concrete, signs_lib license = MIT version = 2.0.1 author = webdesigner97 From 1da3b8918beb3a9ace7e5a77a0aad0db9b1fc0ed Mon Sep 17 00:00:00 2001 From: sonicSMASH <111550219+sonicSMASH@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:41:43 -0800 Subject: [PATCH 3/5] Update streets_poles/init.lua Co-authored-by: SmallJoker --- streets_poles/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streets_poles/init.lua b/streets_poles/init.lua index ecb9e61..c898bac 100644 --- a/streets_poles/init.lua +++ b/streets_poles/init.lua @@ -40,7 +40,7 @@ minetest.register_node(":streets:bigpole", { ["t"] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, ["b"] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 } }, - check_for_pole = true + check_for_pole = true -- allows street_signs to use this as a pole to attach signs }) From afa4027cdc06fe31063bc1f532dea1f60ed3754b Mon Sep 17 00:00:00 2001 From: sonicSMASH <111550219+sonicSMASH@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:44:53 -0800 Subject: [PATCH 4/5] Change version I am untrained in version numbers, an explanation to why it goes from 2.0.1 to 2.1.0 would be nice --- mod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.conf b/mod.conf index fb0114d..5317119 100644 --- a/mod.conf +++ b/mod.conf @@ -3,7 +3,7 @@ title = Streets depends = default, stairs, ts_workshop, dye optional_depends = creative, xpanes, stairsplus, moreblocks, digilines, concrete, signs_lib license = MIT -version = 2.0.1 +version = 2.1.0 author = webdesigner97 forum = https://forum.minetest.net/viewtopic.php?t=2984 description = Adds modern roads to Minetest. From 7ffab6e6b9a96a80a22b72f87a2df9a0fb93619d Mon Sep 17 00:00:00 2001 From: sonicSMASH <111550219+sonicSMASH@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:47:57 -0800 Subject: [PATCH 5/5] Undo removing `not_blocking_trains` --- streets_poles/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streets_poles/init.lua b/streets_poles/init.lua index c898bac..d0c303b 100644 --- a/streets_poles/init.lua +++ b/streets_poles/init.lua @@ -11,7 +11,7 @@ minetest.register_node(":streets:bigpole", { drawtype = "nodebox", tiles = { "streets_pole.png" }, sunlight_propagates = true, - groups = { cracky = 1, level = 2, bigpole = 1 }, + groups = { cracky = 1, level = 2, bigpole = 1, not_blocking_trains = 1}, node_box = { type = "fixed", fixed = {