reorganize things

5 files changed, 37 insertions, 29 deletions

diff --git a/mods/vzxv/init.lua b/mods/vzxv/init.lua
index fd9e8ad..65e6130 100644
--- a/mods/vzxv/init.lua
+++ b/mods/vzxv/init.lua
@@ -1,35 +1,32 @@
-function mundane_block(name,visualname,tiles,settings)
+
+vzxv = {}
+
+function vzxv.mundane_block(name,visualname,tiles,settings)
 	settings = settings or {}
 	settings.description = visualname
 	if type(tiles)=="string" then tiles = {"vzxv"..tiles..".png"} end
-	if not tiles then tiles = {"vzxv"..name..".png"} end
+	if not tiles then tiles = {name:gsub(':','')..".png"} end
 	settings.tiles = tiles
-	minetest.register_node("vzxv:"..name, settings)
+	minetest.register_node(name, settings)
 end
 
-function slabs(name,visualname,tiles,settings)
+function vzxv.slabs(name,visualname,tiles,settings)
 	settings = settings or {}
-	mundane_block(name,visualname,tiles,settings)
+	vzxv.mundane_block(name,visualname,tiles,settings)
 	for i=1, 3 do
 		local newsettings = {}
 		for k, v in pairs(settings) do newsettings[k] = v end
 		newsettings.node_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.25*i-0.5, 0.5}}
 		newsettings.drawtype = "nodebox"
-		mundane_block(name..i,(i==2 and "1/2" or i.."/4")..visualname,tiles,newsettings)
+		vzxv.mundane_block(name..i,(i==2 and "1/2" or i.."/4")..visualname,tiles,newsettings)
 	end
 end
 
-mundane_block("stone","Stone")
-mundane_block("dirt","Dirt")
-slabs("sand","Sand","sand")
-slabs("moistdirt","Dirt","moistdirt")
-slabs("moistgrass","Grass",{"vzxvmoistgrass.png","vzxvmoistdirt.png","vzxvmoistgrass.png"})
-
-mundane_block("treedirt","Tree seed","moistdirt")
-mundane_block("root","Tree root",{"vzxvmoistdirt.png^vzxvroot.png"})
-mundane_block("trunk","Tree trunk", {
-	"vzxvlog.png","vzxvlog.png","vzxvbark.png"
-})
+vzxv.mundane_block("vzxv:stone","Stone")
+vzxv.mundane_block("vzxv:dirt","Dirt")
+vzxv.slabs("vzxv:sand","Sand","sand")
+vzxv.slabs("vzxv:moistdirt","Dirt","moistdirt")
+vzxv.slabs("vzxv:moistgrass","Grass",{"vzxvmoistgrass.png","vzxvmoistdirt.png","vzxvmoistgrass.png"})
 
 minetest.register_node("vzxv:water", {
 	description = "Water",
diff --git a/mods/vzxv_trees/init.lua b/mods/vzxv_trees/init.lua
new file mode 100644
index 0000000..5e60b9b
--- /dev/null
+++ b/mods/vzxv_trees/init.lua
@@ -0,0 +1,17 @@
+
+vzxv.mundane_block("vzxv_trees:seed","Tree seed","moistdirt")
+vzxv.mundane_block("vzxv_trees:root","Tree root",{"vzxvmoistdirt.png^vzxvroot.png"})
+vzxv.mundane_block("vzxv_trees:coreroot","Tree root",{"vzxvmoistdirt.png^vzxvroot.png"})
+vzxv.mundane_block("vzxv_trees:trunk","Tree trunk", {
+	"vzxvlog.png","vzxvlog.png","vzxvbark.png"
+})
+
+function vzxv.generate_tree(pos)
+	minetest.set_node(pos,{name="vzxv:moistdirt"})
+	local height = math.random(16,32)
+	for i=1, height do
+		local node = minetest.get_node({x=pos.x,y=pos.y+i,z=pos.z})
+		if node.name ~= "air" and node.name ~= "ignore" then return end
+		minetest.set_node({x=pos.x,y=pos.y+i,z=pos.z},{name="vzxv_trees:trunk"})
+	end
+end
diff --git a/mods/vzxv_trees/mod.conf b/mods/vzxv_trees/mod.conf
new file mode 100644
index 0000000..aede736
--- /dev/null
+++ b/mods/vzxv_trees/mod.conf
@@ -0,0 +1,3 @@
+name=vzxv_trees
+description = vzxv trees
+depends = vzxv
diff --git a/mods/vzxv_worldgen/init.lua b/mods/vzxv_worldgen/init.lua
index c3a61e6..65dd85d 100644
--- a/mods/vzxv_worldgen/init.lua
+++ b/mods/vzxv_worldgen/init.lua
@@ -6,7 +6,7 @@ local dirt = minetest.get_content_id("vzxv:moistdirt")
 local grass = minetest.get_content_id("vzxv:moistgrass")
 local water = minetest.get_content_id("vzxv:water")
 local sand = minetest.get_content_id("vzxv:sand")
-local tree = minetest.get_content_id("vzxv:treedirt")
+local tree = minetest.get_content_id("vzxv_trees:seed")
 
 local data = {}
 local dirt_height = 4
@@ -68,18 +68,9 @@ minetest.register_on_generated(function(minp,maxp,seed)
 	minetest.after(0,function()
 		minetest.fix_light(minp,maxp)
 		for i, v in ipairs(trees_tbg) do
-			generate_tree(v)
+			vzxv.generate_tree(v)
 		end
 		trees_tbg = {}
 	end)
 end)
 
-function generate_tree(pos)
-	minetest.set_node(pos,{name="vzxv:moistdirt"})
-	local height = math.random(16,32)
-	for i=1, height do
-		local node = minetest.get_node({x=pos.x,y=pos.y+i,z=pos.z})
-		if node.name ~= "air" and node.name ~= "ignore" then return end
-		minetest.set_node({x=pos.x,y=pos.y+i,z=pos.z},{name="vzxv:trunk"})
-	end
-end
\ No newline at end of file
diff --git a/mods/vzxv_worldgen/mod.conf b/mods/vzxv_worldgen/mod.conf
index fcc5347..f57e6c1 100644
--- a/mods/vzxv_worldgen/mod.conf
+++ b/mods/vzxv_worldgen/mod.conf
@@ -1,3 +1,3 @@
 name=vzxv_worldgen
 description = Worldgen of vzxv. Apioforms
-depends = vzxv
+depends = vzxv, vzxv_trees