Merge remote-tracking branch 'upstream/master'

closes #1

.github/workflows/luacheck.yml

@@ -0,0 +1,10 @@
+name: luacheck
+on: [push, pull_request]
+jobs:
+  luacheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Luacheck
+        uses: lunarmodules/luacheck@master

.gitignore

@@ -1 +0,0 @@
-*~

.luacheckrc

@@ -0,0 +1,8 @@
+
+read_globals = {
+	"table.copy",
+	"minetest",
+	"default",
+	"unifieddyes",
+	"stairsplus",
+}

depends.txt

@@ -1,3 +0,0 @@
-default
-unifieddyes
-moreblocks?

description.txt

@@ -1 +0,0 @@
-This mod provides a multitude of colors of wood, sticks, and fences to Minetest, as per the palette outlined by my Unified Dyes mod.

init.lua

@@ -7,11 +7,9 @@
 -- All materials are flammable and can be used as fuel.
 
 
-coloredwood = {}
-
-coloredwood.enable_stairsplus = true
+local enable_stairsplus = true
 if minetest.settings:get_bool("coloredwood_enable_stairsplus") == false or not minetest.get_modpath("moreblocks") then
-	coloredwood.enable_stairsplus = false
+	enable_stairsplus = false
 end
 
 -- helper functions
@@ -28,7 +26,6 @@ local function is_stairsplus(name, colorized)
 
 	local class = string.sub(name, a+1, b-1) -- from colon to underscore is the class
 	local shape = ""
-	local rest
 	local colorshape
 
 	if class == "stair"
@@ -51,6 +48,10 @@ end
 
 -- the actual nodes!
 
+local groups = table.copy(minetest.registered_items["default:wood"].groups)
+groups.ud_param2_colorable = 1
+groups.not_in_creative_inventory=1
+
 minetest.register_node("coloredwood:wood_block", {
 	description = "Colored wooden planks",
 	tiles = { "coloredwood_base.png" },
@@ -59,7 +60,8 @@ minetest.register_node("coloredwood:wood_block", {
 	palette = "unifieddyes_palette_extended.png",
 	walkable = true,
 	sunlight_propagates = false,
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2, not_in_creative_inventory=1, ud_param2_colorable = 1},
+	groups = groups,
+	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
 })
 
@@ -67,7 +69,7 @@ for _, color in ipairs(unifieddyes.HUES_WITH_GREY) do
 
 	-- moreblocks/stairsplus support
 
-	if coloredwood.enable_stairsplus then
+	if enable_stairsplus then
 
 	--	stairsplus:register_all(modname, subname, recipeitem, {fields})
 
@@ -81,10 +83,14 @@ for _, color in ipairs(unifieddyes.HUES_WITH_GREY) do
 				paramtype = "light",
 				paramtype2 = "colorfacedir",
 				palette = "unifieddyes_palette_"..color.."s.png",
-				after_place_node = function(pos, placer, itemstack, pointed_thing)
+				after_place_node = function(_, placer, itemstack, pointed_thing)
 					minetest.rotate_node(itemstack, placer, pointed_thing)
 				end,
-				groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2, not_in_creative_inventory=1, ud_param2_colorable = 1},
+				on_dig = unifieddyes.on_dig,
+				groups = {
+					snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=2,
+					not_in_creative_inventory=1, ud_param2_colorable = 1
+				},
 			}
 		)
 	end
@@ -95,7 +101,12 @@ local coloredwood_cuts = {}
 -- force settings for stairsplus default wood stair/slab/etc nodes
 -- and fix other stuff for colored versions of stairsplus nodes
 
-if coloredwood.enable_stairsplus then
+if enable_stairsplus then
+
+	local groups2 = table.copy(minetest.registered_items["default:wood"].groups)
+	groups2.wood = nil
+	groups2.ud_param2_colorable = 1
+	groups2.not_in_creative_inventory=1
 
 	for _, i in pairs(minetest.registered_nodes) do
 
@@ -106,23 +117,17 @@ if coloredwood.enable_stairsplus then
 		  or chk == "moreblocks:panel_woo"
 		  or chk == "moreblocks:micro_woo"
 		  or chk == "moreblocks:slope_woo"
-		  and not string.find(i.name, "wood_tile") then
-
-			local class = string.sub(i.name, 12, 15)
-			local shape = string.sub(i.name, 22)
-
+		and not string.find(i.name, "wood_tile") then
+			
 			table.insert(coloredwood_cuts, i.name)
 
-			if chk ~= "moreblocks:slab_wood" then
-				class = string.sub(i.name, 12, 16)
-				shape = string.sub(i.name, 23)
-			end
-
+			local class, shape = is_stairsplus(i.name, false)
 			minetest.override_item(i.name, {
-				groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1, not_in_creative_inventory=1, ud_param2_colorable = 1},
+				groups = groups2,
 				paramtype2 = "colorfacedir",
 				palette = "unifieddyes_palette_greys.png",
-				airbrush_replacement_node = "coloredwood:"..class.."_wood_grey_"..shape
+				airbrush_replacement_node = "coloredwood:"..class.."_wood_grey"..shape,
+				drop = "moreblocks:"..class.."_wood"..shape,
 			})
 		end
 	end
@@ -147,10 +152,13 @@ for _, mname in ipairs(coloredwood_cuts) do
 	})
 end
 
+groups = table.copy(minetest.registered_items["default:wood"].groups)
+groups.ud_param2_colorable = 1
+
 minetest.override_item("default:wood", {
 	palette = "unifieddyes_palette_extended.png",
 	airbrush_replacement_node = "coloredwood:wood_block",
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1, ud_param2_colorable = 1},
+	groups = groups,
 })
 
 default.register_fence("coloredwood:fence", {
@@ -158,14 +166,22 @@ default.register_fence("coloredwood:fence", {
 	texture = "coloredwood_fence_base.png",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, ud_param2_colorable = 1},
+	groups = {
+		choppy = 2, oddly_breakable_by_hand = 2, flammable = 2,
+		ud_param2_colorable = 1, not_in_creative_inventory=1
+	},
 	sounds = default.node_sound_wood_defaults(),
-	material = "coloredwood:wood_block"
+	material = "coloredwood:wood_block",
+	on_dig = unifieddyes.on_dig,
 })
 
+groups = table.copy(minetest.registered_items["default:fence_wood"].groups)
+groups.ud_param2_colorable = 1
+
 minetest.override_item("default:fence_wood", {
 	palette = "unifieddyes_palette_extended.png",
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, ud_param2_colorable = 1}
+	airbrush_replacement_node = "coloredwood:fence",
+	groups = groups
 })
 
 -- Crafts
@@ -203,4 +219,8 @@ unifieddyes.register_color_craft({
 	}
 })
 
-print("[Colored Wood] Loaded!")
+if minetest.get_modpath("signs_lib") then
+	minetest.override_item("coloredwood:fence", {
+		check_for_pole = true
+	})
+end

mod.conf

@@ -1 +1,5 @@
 name = coloredwood
+description = Provides a multitude of colors of wood, stairs, and fences.
+depends = default, unifieddyes
+optional_depends = moreblocks, signs_lib
+min_minetest_version = 5.2.0