Merge remote-tracking branch 'upstream/master'

* add pane variants of the octagon glass nodes (single, double and offset)
* fix some indent issues
* added dark glass pane

Co-authored-by: BuckarooBanzay <BuckarooBanzay@users.noreply.github.com>

README.md

@@ -4,6 +4,7 @@
 
 ![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
 ![](https://github.com/D00Med/scifi_nodes/workflows/integration-test/badge.svg)
+[![ContentDB](https://content.minetest.net/packages/D00Med/scifi_nodes/shields/downloads/)](https://content.minetest.net/packages/D00Med/scifi_nodes/)
 
 Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 

crafts.lua

@@ -1282,10 +1282,13 @@ minetest.register_craft({
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
+-- with modified recipe
 minetest.register_craft({
-    output = 'scifi_nodes:windowpanel 4',
+    output = 'scifi_nodes:windowpanel',
     recipe = {
-        {"scifi_nodes:glass","",""}
+        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"","",""}
     }
 })
 
@@ -1680,7 +1683,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'scifi_nodes:stripes2top 3',
     recipe = {
-        {"scifi_nodes:black","scifi_noedes:black","scifi_nodes:black"},
+        {"scifi_nodes:black","scifi_nodes:black","scifi_nodes:black"},
         {"default:silver_sand","default:silver_sand","default:silver_sand"}
     }
 })
@@ -1692,4 +1695,3 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
-

init.lua

@@ -20,4 +20,6 @@ dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
+dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")
+minetest.log("action", "[scifi_nodes] loaded.")

nodeboxes.lua

@@ -475,6 +475,12 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		type = "wallmounted",
 		fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
 	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
+		}
+	},
 	paramtype2 = "wallmounted",
 	light_source = default.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
@@ -1080,10 +1086,9 @@ minetest.register_node("scifi_nodes:itemholder", {
 		local meta = minetest.get_meta(pos)
 		if name == meta:get_string("owner") or
 				minetest.check_player_privs(name, "protection_bypass") then
-			local wield_item = clicker:get_wielded_item():get_name()
 			local taken = item:take_item()
 			if taken and not taken:is_empty() then
-				minetest.add_item(pos, wield_item)
+				minetest.add_item(pos, taken:to_string())
 				return item
 			end
 		end

octagon_panes.lua

@@ -0,0 +1,111 @@
+
+local function register(basename, description, texture)
+  local nodename_single = "scifi_nodes:" .. basename .. "_pane"
+  local nodename_double = "scifi_nodes:" .. basename .. "_pane_double"
+  local nodename_offset = "scifi_nodes:" .. basename .. "_pane_offset"
+  local recipe_ingredient = "scifi_nodes:" .. basename
+
+  -- single height
+  minetest.register_node(nodename_single, {
+    description = description,
+    drawtype = "nodebox",
+    tiles = {
+      texture
+    },
+    wield_image = texture,
+    paramtype = "light",
+    paramtype2 = "facedir",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    node_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.03125, 0.5, 0.5, 0.03125}},
+    },
+    selection_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
+    },
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
+    use_texture_alpha = true,
+    sounds = default.node_sound_glass_defaults()
+  })
+
+  -- double height
+  minetest.register_node(nodename_double, {
+    description = description,
+    drawtype = "nodebox",
+    tiles = {
+      texture
+    },
+    wield_image = texture,
+    paramtype = "light",
+    paramtype2 = "facedir",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    node_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.03125, 0.5, 1.5, 0.03125}},
+    },
+    selection_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
+    },
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
+    use_texture_alpha = true,
+    sounds = default.node_sound_glass_defaults()
+  })
+
+  -- single height with offset
+  minetest.register_node(nodename_offset, {
+    description = description,
+    drawtype = "nodebox",
+    tiles = {
+      texture
+    },
+    wield_image = texture,
+    paramtype = "light",
+    paramtype2 = "facedir",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    node_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, 0.96875, 0.5, 0.5, 1.03125}},
+    },
+    selection_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
+    },
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
+    use_texture_alpha = true,
+    sounds = default.node_sound_glass_defaults()
+  })
+
+  -- register recipes
+
+  minetest.register_craft({
+    output = nodename_single .. " 16",
+    recipe = {
+      {recipe_ingredient}
+    },
+  })
+
+  minetest.register_craft({
+    output = nodename_double .. " 16",
+    recipe = {
+      {recipe_ingredient},
+      {recipe_ingredient}
+    },
+  })
+
+  minetest.register_craft({
+    output = nodename_offset,
+    type = "shapeless",
+    recipe = {nodename_single},
+  })
+end
+
+register("octrng", "Orange Octagon Glass pane", "scifi_nodes_octrng.png")
+register("octgrn", "Green Octagon Glass pane", "scifi_nodes_octgrn.png")
+register("octbl", "Blue Octagon Glass pane", "scifi_nodes_octbl.png")
+register("octppl", "Purple Octagon Glass pane", "scifi_nodes_octppl.png")
+register("glass", "Dark Glass pane", "scifi_nodes_glass.png")