Convert roadworks markings to the new system

init.lua

@@ -30,7 +30,6 @@ dofile(streets.conf.modpath .. "/global.lua")
 -- Load mod files
 streets.load_submod("streets_roadsurface")
 streets.load_submod("streets_roadmarkings")
-streets.load_submod("streets_roadworks")
 streets.load_submod("streets_asphaltworkshop")
 streets.load_submod("streets_installations")
 streets.load_submod("streets_accessories")

streets_roadmarkings/init.lua

@@ -159,6 +159,13 @@ streets.register_road_marking({
   flip_required = true,
 })
 
+streets.register_road_marking({
+  name = "white_x",
+  friendlyname = "White X",
+  tex = "streets_cross.png",
+  flip_required = false,
+})
+
 streets.register_road_marking({
   name = "dashed_yellow_center_line",
   friendlyname = "Dashed Yellow Center Line",
@@ -312,3 +319,10 @@ streets.register_road_marking({
   tex = "streets_forbidden_yellow.png",
   flip_required = true,
 })
+
+streets.register_road_marking({
+  name = "yellow_x",
+  friendlyname = "Yellow X",
+  tex = "streets_cross_yellow.png",
+  flip_required = false,
+})

streets_roadworks/init.lua

@@ -1,113 +0,0 @@
---[[
-  ## StreetsMod 2.0 ##
-  Submod: roadworks
-  Optional: true
-]]
-
-minetest.register_node(":streets:rw_cross_yellow",{
-	description = "Roadworks: Cross",
-	tiles = {"streets_cross_yellow.png", "streets_transparent.png"},
-	drawtype = "nodebox",
-	paramtype = "light",
-	groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-	sunlight_propagates = true,
-	walkable = false,
-	inventory_image = "streets_cross_yellow.png",
-	wield_image = "streets_cross_yellow.png",
-  node_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.499, 0.5}}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
-})
-
-minetest.register_node(":streets:rw_line_solid_yellow",{
-  description = "Roadworks: Solid line",
-  tiles = {"streets_line_solid_yellow.png", "streets_rw_solid_curve.png", "streets_rw_solid_tjunction.png", "streets_rw_solid_crossing.png"},
-	drawtype = "raillike",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-	sunlight_propagates = true,
-	walkable = false,
-	inventory_image = "streets_line_solid_yellow.png",
-	wield_image = "streets_line_solid_yellow.png",
-	selection_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
-})
-
-minetest.register_node(":streets:rw_line_dashed_yellow",{
-  description = "Roadworks: Dashed line",
-  tiles = {"streets_line_dashed_yellow.png", "streets_rw_solid_curve.png", "streets_rw_solid_tjunction.png", "streets_rw_solid_crossing.png"},
-	drawtype = "raillike",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-	sunlight_propagates = true,
-	walkable = false,
-	inventory_image = "streets_line_dashed_yellow.png",
-	wield_image = "streets_line_dashed_yellow.png",
-	selection_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
-})
-
-minetest.register_node(":streets:rw_cross_white",{
-	description = "Roadworks: Cross",
-	tiles = {"streets_cross.png", "streets_transparent.png"},
-	drawtype = "nodebox",
-	paramtype = "light",
-	groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-	sunlight_propagates = true,
-	walkable = false,
-	inventory_image = "streets_cross.png",
-	wield_image = "streets_cross.png",
-  node_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.499, 0.5}}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
-})
-
-minetest.register_node(":streets:rw_line_solid_white",{
-  description = "Roadworks: Solid line",
-  tiles = {"streets_line_solid.png", "streets_rw_solid_curve.png", "streets_rw_solid_tjunction.png", "streets_rw_solid_crossing.png"},
-	drawtype = "raillike",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-	sunlight_propagates = true,
-	walkable = false,
-	inventory_image = "streets_line_solid.png",
-	wield_image = "streets_line_solid.png",
-	selection_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
-})
-
-minetest.register_node(":streets:rw_line_dashed_white",{
-  description = "Roadworks: Dashed line",
-  tiles = {"streets_line_dashed.png", "streets_rw_solid_curve.png", "streets_rw_solid_tjunction.png", "streets_rw_solid_crossing.png"},
-	drawtype = "raillike",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-	sunlight_propagates = true,
-	walkable = false,
-	inventory_image = "streets_line_dashed.png",
-	wield_image = "streets_line_dashed.png",
-	selection_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
-})