daily checkpoint, not much improved, stairsplus still completely nonfunctional

README.md

@@ -68,6 +68,7 @@ Copyright © 2011-2020 Hugo Locurcio and contributors
 
 - More Blocks code is licensed under the zlib license, see
   [`LICENSE.md`](LICENSE.md) for details.
+- This is an altered version of the code which is not distributed by Hugo Locurcio.
 - Unless otherwise specified, More Blocks textures are licensed under
   [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/).
 

stairsplus/api/init.lua

@@ -0,0 +1,6 @@
+stairsplus.api = {}
+
+stairsplus.dofile("api", "shape")
+stairsplus.dofile("api", "node")
+stairsplus.dofile("api", "station")
+stairsplus.dofile("api", "recipe")

stairsplus/api/node.lua

@@ -0,0 +1 @@
+-- for registering variants of a specific node

stairsplus/api/recipe.lua

@@ -0,0 +1,3 @@
+-- for registering recipe schemas
+-- should register schemas w/ unified_inventory and i3 and whatever else,
+-- and hide the recipes for the individual nodes (possibly a setting for such)

stairsplus/api/shape.lua

@@ -0,0 +1,2 @@
+-- register shapes (e.g. 1/16 slab, 1/8 slab, 1/4 slab, etc)
+-- register shape groups (e.g. slab, stair, etc.)

stairsplus/api/station.lua

@@ -0,0 +1 @@
+-- for creating the circular saw and similar nodes

stairsplus/compat/init.lua

@@ -0,0 +1,3 @@
+
+-- unified_inventory, sfinv, i3
+

stairsplus/compat/legacy.lua

@@ -0,0 +1,3 @@
+-- legacy: register all the expected variants for e.g. default, wool, gloopblocks, etc.
+-- provide a configuration option to *disable* legacy. it must be enabled by default, to prevent breaking
+-- existing servers

stairsplus/compat/stairs.lua

@@ -0,0 +1 @@
+-- stairs compat: override what stairs does, and "fix" any stairs which were already registered...

stairsplus/crafting.lua

@@ -1,4 +1,4 @@
-
+local cm = stairsplus.resources.craft_materials
 
 if cm.steel_ingot then
 	if moreblocks.settings.circular_saw_crafting then

stairsplus/custom.lua

@@ -61,7 +61,6 @@ local subset = {
 }
 --]]
 
--- luacheck: no unused
 local function register_custom_subset(subset, modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_custom_subset(subset, modname, subname, recipeitem, {
 		groups = groups,

stairsplus/init.lua

@@ -6,20 +6,40 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 -- Nodes will be called <modname>:{stair,slab,panel,micro,slope}_<subname>
+local modname = minetest.get_current_modname()
+local modpath = minetest.get_modpath(modname)
+local S = minetest.get_translator(modname)
 
-local modpath = minetest.get_modpath("moreblocks") .. "/stairsplus"
+stairsplus = {
+	version = {3, 0, 0},
+	fork = "minetest_mods",
 
-stairsplus = {}
-stairsplus.expect_infinite_stacks = false
+	modname = modname,
+	modpath = modpath,
+
+	S = S,
+
+	has = {
+		basic_materials = minetest.get_modpath("basic_materials"),
+		default = minetest.get_modpath("default"),
+		gloopblocks = minetest.get_modpath("gloopblocks"),
+		stairs = minetest.get_modpath("stairs"),
+		technic = minetest.get_modpath("technic"),
+		prefab = minetest.get_modpath("prefab"),
+		wool = minetest.get_modpath("wool"),
+	},
+
+	log = function(level, messagefmt, ...)
+		return minetest.log(level, ("[%s] %s"):format(modname, messagefmt:format(...)))
+	end,
+
+	dofile = function(...)
+		return dofile(table.concat({modpath, ...}, DIR_DELIM) .. ".lua")
+	end,
+}
 
 stairsplus.shapes_list = {}
 
-if
-not minetest.get_modpath("unified_inventory")
-	and minetest.settings:get_bool("creative_mode")
-then
-	stairsplus.expect_infinite_stacks = true
-end
 
 function stairsplus:prepare_groups(groups)
 	local result = {}
@@ -30,9 +50,11 @@ function stairsplus:prepare_groups(groups)
 			end
 		end
 	end
-	if not moreblocks.config.stairsplus_in_creative_inventory then
+
+	if not stairsplus.settings.in_creative_inventory then
 		result.not_in_creative_inventory = 1
 	end
+
 	return result
 end
 
@@ -59,7 +81,6 @@ function stairsplus:register_alias_force_all(modname_old, subname_old, modname_n
 	self:register_micro_alias_force(modname_old, subname_old, modname_new, subname_new)
 end
 
--- luacheck: no unused
 local function register_stair_slab_panel_micro(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_all(modname, subname, recipeitem, {
 		groups = groups,

stairsplus/locale/stairsplus.de.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # German translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.es.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # Spanish translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.fr.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # French translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.it.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # Italian translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.pl.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # Polish translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.ru.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # Russian translation for MOREBLOCKS minetest mod.
 # Copyright (C) 2018 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.template.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 #: circular_saw.lua
 

stairsplus/locale/stairsplus.zh_CN.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # zh_CN translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/locale/stairsplus.zh_TW.tr

@@ -1,4 +1,4 @@
-# textdomain: moreblocks
+# textdomain: stairsplus
 
 # zh_TW translation for More Blocks.
 # Copyright © 2011-2020 Hugo Locurcio and contributors

stairsplus/microblocks.lua

@@ -7,7 +7,6 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 -- Node will be called <modname>:micro_<subname>
 
--- luacheck: no unused
 local function register_micro(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_micro(modname, subname, recipeitem, {
 		groups = groups,

stairsplus/panels.lua

@@ -7,7 +7,6 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 -- Node will be called <modname>:panel_<subname>
 
--- luacheck: no unused
 local function register_panel(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_panel(modname, subname, recipeitem, {
 		groups = groups,

stairsplus/resources/craft_materials.lua

@@ -0,0 +1,9 @@
+local table_set_all = stairsplus.util.table_set_all
+
+stairsplus.resources.craft_materials = {}
+
+if stairsplus.has.default then
+	table_set_all(stairsplus.resources.craft_materials, {
+		steel_ingot = "default:steel_ingot",
+	})
+end

stairsplus/resources/init.lua

@@ -0,0 +1,4 @@
+stairsplus.resources = {}
+
+stairsplus.dofile("resources", "craft_materials")
+stairsplus.dofile("resources", "sounds")

stairsplus/resources/sounds.lua

@@ -0,0 +1,9 @@
+local table_set_all = moreblocks.util.table_set_all
+
+moreblocks.resources.sounds = {}
+
+if moreblocks.has.default then
+	table_set_all(moreblocks.resources.sounds, {
+		wood = default.node_sound_wood_defaults(),
+	})
+end

stairsplus/settings.lua

@@ -1,4 +1,7 @@
 stairsplus.settings = {
 	in_creative_inventory = minetest.settings:get_bool("stairsplus.in_creative_inventory", false),
-	circular_saw_crafting = minetest.settings:get_bool("stairsplus.circular_saw_crafting", true)
+	circular_saw_crafting = minetest.settings:get_bool("stairsplus.circular_saw_crafting", true),
+	expect_infinite_stacks = minetest.settings:get_bool("stairsplus.expect_infinite_stacks",
+		minetest.settings:get_bool("creative_mode", false)
+	)
 }

stairsplus/slabs.lua

@@ -7,7 +7,6 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 -- Node will be called <modname>:slab_<subname>
 
--- luacheck: no unused
 local function register_slab(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_slab(modname, subname, recipeitem, {
 		groups = groups,

stairsplus/slopes.lua

@@ -7,7 +7,6 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 -- Node will be called <modname>:slope_<subname>
 
--- luacheck: no unused
 local function register_slope(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_slope(modname, subname, recipeitem, {
 		groups = groups,

stairsplus/stairs.lua

@@ -7,7 +7,6 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 -- Node will be called <modname>:stair_<subname>
 
--- luacheck: no unused
 local function register_stair(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_stair(modname, subname, recipeitem, {
 		groups = groups,