Homedecor update

builder/build-mods.sh

@@ -46,7 +46,6 @@ mod_install decor homedecor_modpack/building_blocks #grate and marble in recipes
 mod_install decor homedecor_modpack/fake_fire
 # no inbox, itemframes
 mod_install decor homedecor_modpack/lavalamp
-mod_install decor homedecor_modpack/plasmascreen
 ## the homedecor blob was in whynot, therefore applied all at the first
 ## Next step is to check each mod for whynot rules
 # no 3d_extras
@@ -72,6 +71,7 @@ mod_install decor homedecor_modpack/homedecor_lighting
 mod_install decor homedecor_modpack/homedecor_misc
 mod_install decor homedecor_modpack/homedecor_office
 mod_install decor homedecor_modpack/homedecor_pictures_and_paintings
+mod_install decor homedecor_modpack/homedecor_plasmascreen
 mod_install decor homedecor_modpack/homedecor_roofing
 mod_install decor homedecor_modpack/homedecor_seating
 mod_install decor homedecor_modpack/homedecor_tables

builder/check-updates.sh

@@ -5,7 +5,6 @@ PROJ="$(realpath $(dirname $0)/..)" # Subgame dir (..)
 # Repositories points to non-default branch
 declare -A BRANCHES=(
 	[minetest_game]=origin/stable-5 # Stay on stable version
-	[homedecor_modpack]=63ad77e2    # No updates. See Bug #49
 	[libs/craftguide]=58e4516       # No updates. See Bug #53
 )
 

builder/mods_src/libs/whynot_compat/init.lua

@@ -133,3 +133,23 @@ minetest.register_craft({
 	},
 	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}},
 })
+
+--https://github.com/minetest-whynot/whynot-game/issues/49
+--https://github.com/mt-mods/homedecor_modpack/issues/17
+-- Add lost stairs and slabs back
+for _ , material in ipairs({ "Adobe", "fakegrass", "grate", "hardwood",
+		"Marble", "Roofing", "smoothglass", "Tar", "woodglass" }) do
+
+	local nodedef = minetest.registered_items["building_blocks:"..material]
+	stairs.register_stair_and_slab(
+			material,
+			nodedef.name,
+			table.copy(nodedef.groups),
+			table.copy(nodedef.tiles),
+			nodedef.description.." stair",
+			nodedef.description.." slab",
+			table.copy(nodedef.sounds),
+			false,
+			nodedef.description.." inner stair",
+			nodedef.description.." outer stair" )
+end

builder/mods_src/libs/whynot_compat/mod.conf

@@ -1,2 +1,2 @@
 name = whynot_compat
-optional_depends = bonemeal, food_basic, homedecor_tables, mtfoods, player_api, stairs
+depends = bonemeal, building_blocks, food_basic, homedecor_tables, mtfoods, player_api, stairs

mod_sources.txt

@@ -261,7 +261,7 @@ origin	https://github.com/Ezhh/abriglass/ (fetch)
 Mod: decor/abriglass
 
 origin	https://github.com/mt-mods/basic_materials (fetch)
-* (HEAD detached from d9e0698) 0893974 github luacheck workflow
+* (HEAD detached at d9e0698) d9e0698 add README file and documentation
 Mod: decor/basic_materials
 
 origin	https://github.com/Napiophelios/campfire (fetch)
@@ -322,11 +322,10 @@ Mod: decor/unifieddyes
 
 bell07	https://github.com/bell07/homedecor_modpack (fetch)
 origin	https://github.com/mt-mods/homedecor_modpack (fetch)
-* (HEAD detached from 694bfe5f) 63ad77e2 make beds sleepable https://github.com/mt-mods/homedecor_modpack/issues/13
+* (HEAD detached at 694bfe5f) 694bfe5f namespace plasmascreen and inbox (#22)
 Mod: homedecor_modpack/building_blocks
 Mod: homedecor_modpack/fake_fire
 Mod: homedecor_modpack/lavalamp
-Mod: homedecor_modpack/plasmascreen
 Mod: homedecor_modpack/homedecor_bathroom
 Mod: homedecor_modpack/homedecor_bedroom
 Mod: homedecor_modpack/homedecor_books
@@ -349,6 +348,7 @@ Mod: homedecor_modpack/homedecor_lighting
 Mod: homedecor_modpack/homedecor_misc
 Mod: homedecor_modpack/homedecor_office
 Mod: homedecor_modpack/homedecor_pictures_and_paintings
+Mod: homedecor_modpack/homedecor_plasmascreen
 Mod: homedecor_modpack/homedecor_roofing
 Mod: homedecor_modpack/homedecor_seating
 Mod: homedecor_modpack/homedecor_tables

mods/decor/basic_materials/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sound_api_core"]
+	path = sound_api_core
+	url = https://github.com/mt-mods/sound_api_core.git

mods/decor/basic_materials/.luacheckrc

@@ -1,30 +1,7 @@
-std = "lua51+minetest"
-unused_args = false
-allow_defined_top = true
-max_line_length = 999
-
-stds.minetest = {
-	read_globals = {
-		"DIR_DELIM",
-		"minetest",
-		"core",
-		"dump",
-		"vector",
-		"nodeupdate",
-		"VoxelManip",
-		"VoxelArea",
-		"PseudoRandom",
-		"ItemStack",
-		"default",
-		table = {
-			fields = {
-				"copy",
-			},
-		},
-	}
+globals = {
+    "minetest", "basic_materials",
 }
 
 read_globals = {
-	"default",
-	"moreores",
-}
+    "default",
+}

mods/decor/basic_materials/README.md

@@ -0,0 +1,30 @@
+# Basic Materials mod
+
+mod that adds basic material nodes and items
+
+## Install
+
+### Option 1: use content tab in minetest
+
+* click the content tab
+* search for basic materials
+* click install on basic materials
+
+### Option 2: download from [ContentDB](https://content.minetest.net/packages/VanessaE/basic_materials/)
+
+* click the above link or search for basic materials on ContentDB
+* select the download button on the basic materials page
+* extract the zip downloaded from the previous step
+* place in your mods folder
+
+### Option 3: use git
+
+* `git clone https://github.com/mt-mods/basic_materials.git`
+* `cd basic_materials`
+* `git submodule init`
+* `git submodule update`
+
+to update please use the following commands starting inside the mod directory
+
+* `git submodule sync`
+* `git submodule update`

mods/decor/basic_materials/aliases.lua

@@ -0,0 +1,34 @@
+minetest.register_alias("homedecor:plastic_sheeting", "basic_materials:plastic_sheet")
+minetest.register_alias("homedecor:plastic_strips",   "basic_materials:plastic_strip")
+minetest.register_alias("homedecor:empty_spool",      "basic_materials:empty_spool")
+minetest.register_alias("homedecor:oil_extract",      "basic_materials:oil_extract")
+minetest.register_alias("homedecor:paraffin",         "basic_materials:paraffin")
+minetest.register_alias("homedecor:plastic_base",     "basic_materials:paraffin")
+minetest.register_alias("homedecor:terracotta_base",  "basic_materials:terracotta_base")
+minetest.register_alias("gloopblocks:wet_cement",     "basic_materials:wet_cement")
+minetest.register_alias("gloopblocks:cement",         "basic_materials:cement_block")
+minetest.register_alias("technic:concrete",           "basic_materials:concrete_block")
+minetest.register_alias("homedecor:ic",                     "basic_materials:ic")
+minetest.register_alias("homedecor:motor",                  "basic_materials:motor")
+minetest.register_alias("technic:motor",                    "basic_materials:motor")
+minetest.register_alias("homedecor:heating_element",        "basic_materials:heating_element")
+minetest.register_alias("homedecor:power_crystal",          "basic_materials:energy_crystal_simple")
+minetest.register_alias("homedecor:copper_wire",           "basic_materials:copper_wire")
+minetest.register_alias("technic:fine_copper_wire",        "basic_materials:copper_wire")
+minetest.register_alias("technic:fine_silver_wire",        "basic_materials:silver_wire")
+minetest.register_alias("technic:fine_gold_wire",          "basic_materials:gold_wire")
+minetest.register_alias("homedecor:steel_wire",            "basic_materials:steel_wire")
+minetest.register_alias("homedecor:brass_ingot",           "basic_materials:brass_ingot")
+minetest.register_alias("technic:brass_ingot",             "basic_materials:brass_ingot")
+minetest.register_alias("technic:brass_block",             "basic_materials:brass_block")
+minetest.register_alias("homedecor:copper_strip",          "basic_materials:copper_strip")
+minetest.register_alias("homedecor:steel_strip",           "basic_materials:steel_strip")
+minetest.register_alias("homedecor:chainlink_brass",       "basic_materials:chainlink_brass")
+minetest.register_alias("chains:chain",                    "basic_materials:chain_steel")
+minetest.register_alias("chains:chain_brass",              "basic_materials:chain_brass")
+minetest.register_alias("pipeworks:gear",                  "basic_materials:gear_steel")
+minetest.register_alias("technic:rebar",                  "basic_materials:steel_bar")
+
+minetest.register_alias_force("mesecons_materials:silicon", "basic_materials:silicon")
+minetest.register_alias_force("glooptest:chainlink",       "basic_materials:chainlink_steel")
+minetest.register_alias_force("homedecor:chainlink_steel", "basic_materials:chainlink_steel")

mods/decor/basic_materials/craftitems.lua

@@ -0,0 +1,130 @@
+local S = minetest.get_translator("basic_materials")
+
+minetest.register_craftitem("basic_materials:plastic_sheet", {
+	description = S("Plastic sheet"),
+	inventory_image = "basic_materials_plastic_sheet.png",
+})
+
+minetest.register_craftitem("basic_materials:plastic_strip", {
+	description = S("Plastic strips"),
+	groups = { strip = 1 },
+	inventory_image = "basic_materials_plastic_strip.png",
+})
+
+minetest.register_craftitem("basic_materials:empty_spool", {
+	description = S("Empty wire spool"),
+	inventory_image = "basic_materials_empty_spool.png"
+})
+
+minetest.register_craftitem("basic_materials:oil_extract", {
+	description = S("Oil extract"),
+	inventory_image = "basic_materials_oil_extract.png",
+})
+
+minetest.register_craftitem("basic_materials:paraffin", {
+	description = S("Unprocessed paraffin"),
+	inventory_image = "basic_materials_paraffin.png",
+})
+
+minetest.register_craftitem("basic_materials:terracotta_base", {
+	description = S("Uncooked Terracotta Base"),
+	inventory_image = "basic_materials_terracotta_base.png",
+})
+
+minetest.register_craftitem("basic_materials:wet_cement", {
+	description = S("Wet Cement"),
+	inventory_image = "basic_materials_wet_cement.png",
+})
+
+minetest.register_craftitem("basic_materials:silicon", {
+	description = S("Silicon lump"),
+	inventory_image = "basic_materials_silicon.png",
+})
+
+minetest.register_craftitem("basic_materials:ic", {
+	description = S("Simple Integrated Circuit"),
+	inventory_image = "basic_materials_ic.png",
+})
+
+minetest.register_craftitem("basic_materials:motor", {
+	description = S("Simple Motor"),
+	inventory_image = "basic_materials_motor.png",
+})
+
+minetest.register_craftitem("basic_materials:heating_element", {
+	description = S("Heating element"),
+	inventory_image = "basic_materials_heating_element.png",
+})
+
+minetest.register_craftitem("basic_materials:energy_crystal_simple", {
+	description = S("Simple energy crystal"),
+	inventory_image = "basic_materials_energy_crystal.png",
+})
+
+minetest.register_craftitem("basic_materials:steel_wire", {
+	description = S("Spool of steel wire"),
+	groups = { wire = 1 },
+	inventory_image = "basic_materials_steel_wire.png"
+})
+
+minetest.register_craftitem("basic_materials:copper_wire", {
+	description = S("Spool of copper wire"),
+	groups = { wire = 1 },
+	inventory_image = "basic_materials_copper_wire.png"
+})
+
+minetest.register_craftitem("basic_materials:silver_wire", {
+	description = S("Spool of silver wire"),
+	groups = { wire = 1 },
+	inventory_image = "basic_materials_silver_wire.png"
+})
+
+minetest.register_craftitem("basic_materials:gold_wire", {
+	description = S("Spool of gold wire"),
+	groups = { wire = 1 },
+	inventory_image = "basic_materials_gold_wire.png"
+})
+
+minetest.register_craftitem("basic_materials:steel_strip", {
+	description = S("Steel Strip"),
+	groups = { strip = 1 },
+	inventory_image = "basic_materials_steel_strip.png"
+})
+
+minetest.register_craftitem("basic_materials:copper_strip", {
+	description = S("Copper Strip"),
+	groups = { strip = 1 },
+	inventory_image = "basic_materials_copper_strip.png"
+})
+
+minetest.register_craftitem("basic_materials:steel_bar", {
+	description = S("Steel Bar"),
+	inventory_image = "basic_materials_steel_bar.png",
+})
+
+minetest.register_craftitem("basic_materials:chainlink_brass", {
+	description = S("Chainlinks (brass)"),
+	groups = { chainlinks = 1 },
+	inventory_image = "basic_materials_chainlink_brass.png"
+})
+
+minetest.register_craftitem("basic_materials:chainlink_steel", {
+	description = S("Chainlinks (steel)"),
+	groups = { chainlinks = 1 },
+	inventory_image = "basic_materials_chainlink_steel.png"
+})
+
+minetest.register_craftitem("basic_materials:brass_ingot", {
+	description = S("Brass Ingot"),
+	inventory_image = "basic_materials_brass_ingot.png",
+})
+
+minetest.register_craftitem("basic_materials:gear_steel", {
+	description = S("Steel gear"),
+	inventory_image = "basic_materials_gear_steel.png"
+})
+
+minetest.register_craftitem("basic_materials:padlock", {
+	description = S("Padlock"),
+	inventory_image = "basic_materials_padlock.png"
+})