diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 0000000..3c99a99 --- /dev/null +++ b/.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 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..9844933 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,8 @@ + +read_globals = { + "table.copy", + "minetest", + "default", + "unifieddyes", + "stairsplus", +} diff --git a/init.lua b/init.lua index ad21e55..76188b1 100644 --- a/init.lua +++ b/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" @@ -71,7 +68,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}) @@ -85,11 +82,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, 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}, + groups = { + snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=2, + not_in_creative_inventory=1, ud_param2_colorable = 1 + }, } ) end @@ -100,7 +100,7 @@ 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 @@ -165,7 +165,10 @@ 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, not_in_creative_inventory=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", on_dig = unifieddyes.on_dig, @@ -220,5 +223,3 @@ if minetest.get_modpath("signs_lib") then check_for_pole = true }) end - -print("[Colored Wood] Loaded!") diff --git a/mod.conf b/mod.conf index dcc6283..70e608e 100644 --- a/mod.conf +++ b/mod.conf @@ -1,6 +1,5 @@ name = coloredwood -title = Colored Wood -description = This mod provides a multitude of colors of wood, stairs and fences to Minetest, as per the palette outlined by my Unified Dyes mod. -depends = default,unifieddyes -optional_depends = moreblocks,signs_lib +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