From 44b4b9a4f8f8ba5921a3061da0ecb1f486e6a8a6 Mon Sep 17 00:00:00 2001
From: Emojigit <55009343+Emojigit@users.noreply.github.com>
Date: Sat, 24 Apr 2021 17:35:44 +0800
Subject: [PATCH] Block changes * Makes pathv7 stairs drops the default one *
 Makes pathv use `default:junglewood` instead on `pathv7:junglewood`

---
 init.lua  | 10 +++++-----
 nodes.lua | 27 +++++++++++++++++++--------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/init.lua b/init.lua
index ce6706e..2f820b6 100644
--- a/init.lua
+++ b/init.lua
@@ -104,7 +104,7 @@ dofile(minetest.get_modpath("pathv7") .. "/nodes.lua")
 
 -- Constants
 
-local c_wood    = minetest.get_content_id("pathv7:junglewood")
+local c_wood    = minetest.get_content_id("default:junglewood")
 local c_column  = minetest.get_content_id("pathv7:bridgewood")
 local c_stairn  = minetest.get_content_id("pathv7:stairn")
 local c_stairs  = minetest.get_content_id("pathv7:stairs")
@@ -194,7 +194,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	nobj_pathc  = nobj_pathc  or minetest.get_perlin_map(np_pathc,  chulens)
 	nobj_pathd  = nobj_pathd  or minetest.get_perlin_map(np_pathd,  chulens)
 	nobj_column = nobj_column or minetest.get_perlin_map(np_column, chulens)
-	
+
 	local nvals_base   = nobj_base  :get2dMap_flat(minpos, nbuf_base)
 	local nvals_alt    = nobj_alt   :get2dMap_flat(minpos, nbuf_alt)
 	local nvals_select = nobj_select:get2dMap_flat(minpos, nbuf_select)
@@ -203,7 +203,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local nvals_pathc  = nobj_pathc :get2dMap_flat(minpos, nbuf_pathc)
 	local nvals_pathd  = nobj_pathd :get2dMap_flat(minpos, nbuf_pathd)
 	local nvals_column = nobj_column:get2dMap_flat(minpos, nbuf_column)
-	
+
 	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
 	local area = VoxelArea:new({MinEdge = emin, MaxEdge = emax})
 	local data = vm:get_data(dbuf)
@@ -328,7 +328,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 							local nodid = data[vi]
 							if nodid ~= c_stone
 									and nodid ~= c_destone
-									and nodid ~= c_sastone then		
+									and nodid ~= c_sastone then
 								data[vi] = c_column
 							end
 							vi = vi + 1
@@ -429,7 +429,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 			ni = ni + 1
 		end
 	end
-	
+
 	vm:set_data(data)
 	vm:set_lighting({day = 0, night = 0})
 	vm:calc_lighting()
diff --git a/nodes.lua b/nodes.lua
index 4550330..c5ef41f 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -1,10 +1,4 @@
-minetest.register_node("pathv7:junglewood", {
-	description = "Mod jungle wood",
-	tiles = {"default_junglewood.png"},
-	is_ground_content = false,
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
-	sounds = default.node_sound_wood_defaults(),
-})
+minetest.register_alias("pathv7:junglewood","default:junglewood")
 
 minetest.register_node("pathv7:bridgewood", {
 	description = "Bridge wood",
@@ -29,10 +23,11 @@ minetest.register_node("pathv7:stairn", { -- stair rising to the north
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_junglewood",
 })
 
 minetest.register_node("pathv7:stairs", {
-	description = "Jungle wood stair S",
+	description = "Jungle Wood Stair S",
 	tiles = {"default_junglewood.png"},
 	drawtype = "nodebox",
 	paramtype = "light",
@@ -46,6 +41,7 @@ minetest.register_node("pathv7:stairs", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_junglewood",
 })
 
 minetest.register_node("pathv7:staire", {
@@ -63,6 +59,8 @@ minetest.register_node("pathv7:staire", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_junglewood",
+
 })
 
 minetest.register_node("pathv7:stairw", {
@@ -80,6 +78,8 @@ minetest.register_node("pathv7:stairw", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_junglewood",
+
 })
 
 minetest.register_node("pathv7:stairne", {
@@ -97,6 +97,7 @@ minetest.register_node("pathv7:stairne", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_outer_junglewood",
 })
 
 minetest.register_node("pathv7:stairnw", {
@@ -114,6 +115,7 @@ minetest.register_node("pathv7:stairnw", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_outer_junglewood",
 })
 
 minetest.register_node("pathv7:stairse", {
@@ -131,6 +133,7 @@ minetest.register_node("pathv7:stairse", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_outer_junglewood",
 })
 
 minetest.register_node("pathv7:stairsw", {
@@ -148,4 +151,12 @@ minetest.register_node("pathv7:stairsw", {
 		},
 	},
 	sounds = default.node_sound_wood_defaults(),
+	drop = "stairs:stair_outer_junglewood",
+})
+
+-- "pathv7:bridgewood","default:junglewood"
+minetest.register_craft({
+	output = "default:junglewood",
+	recipe = {"pathv7:bridgewood"},
+	type = "shapeless",
 })