Changed Modules, New Features

diff --git a/generate_modules.lua b/generate_modules.lua
new file mode 100644 (file)
index 0000000..9613589
--- /dev/null
+++ b/generate_modules.lua
@@ -0,0 +1,13 @@
+local file = io.open("modules.txt", "w")
+file:write("return {")
+local modules = io.popen("ls src"):lines()
+for m in modules do
+       local files = io.popen("ls src/" .. m):lines()
+       file:write(m .. "={")
+       for f in files do
+               file:write("\"" .. string.gsub(f, ".lua", "") .. "\",")
+       end
+       file:write("},")
+end
+file:write("}")
+file:close()

diff --git a/init.lua b/init.lua
index 842cab82decddd1fb67bcc345594ce40101e2cca..ecf1b3af960b0082c151d21d0b0609b4c14bc95d 100755 (executable)
--- a/init.lua
+++ b/init.lua
@@ -18,12 +18,8 @@ end)
 
 minetest.register_privilege("skycraft", "Use Skycraft commands")
 
-local modules = {
-       common = {"common", "random" , "request"},
-       main = {"commands", "flower_spread", "lobby", "lucky_block", "mapgen", "money", "plots", "ranks", "spawns", "tpa", "trade"},
-       onload = {"lava_cooling", "lobby_load", "nether_portal", "sapling_mutation", "shop", "spawn", "void"}
-}
 local modpath = minetest.get_modpath("skycraft")
+local modules = minetest.deserialize(io.open(modpath .. "/modules.txt", "r"):read())
 local function load_module(m)
        for _, f in pairs(modules[m]) do
                dofile(modpath .. "/src/" .. m .. "/" .. f .. ".lua")

diff --git a/modules.txt b/modules.txt
new file mode 100644 (file)
index 0000000..a3e7f33
--- /dev/null
+++ b/modules.txt
@@ -0,0 +1 @@
+return {common={"common","random","request",},main={"commands","flower_spread","lobby","lucky_block","mapgen","money","plots","ranks","spawns","tpa","trade",},onload={"lava_cooling","lobby_load","monster_egg_stone_block","nether_portal","sapling_mutation","shop","spawn","void",},}
\ No newline at end of file

diff --git a/src/main/lucky_block.lua b/src/main/lucky_block.lua
index 93cc4c6282eafe2de332dec1788c65eb77ef10e3..f60ee63d66577358edf29a229509d477a84037c7 100644 (file)
--- a/src/main/lucky_block.lua
+++ b/src/main/lucky_block.lua
@@ -11,3 +11,13 @@ minetest.override_item("lucky_block:void_mirror", {
 minetest.register_alias_force("lucky_block:super_lucky_block", "lucky_block:lucky_block")
 
 minetest.clear_craft({output = "lucky_block:lucky_block"})
+
+local discs = {}
+for i=1, 8 do
+       table.insert(discs, "mcl_jukebox:record_" .. tostring(i))
+end
+
+lucky_block:add_blocks({
+       {"dro", {"mcl_core:dirt"}, 64},
+       {"dro", discs, 1}
+})

diff --git a/src/onload/monster_egg_stone_block.lua b/src/onload/monster_egg_stone_block.lua
new file mode 100644 (file)
index 0000000..cff547b
--- /dev/null
+++ b/src/onload/monster_egg_stone_block.lua
@@ -0,0 +1 @@
+minetest.override_item("mobs_mc:monster_egg_stone_block", { tiles = {"default_stone_brick.png"} }) 

diff --git a/src/onload/sapling_mutation.lua b/src/onload/sapling_mutation.lua
index 8b137891791fe96927ad78e64b0aad7bded08bdc..4b2f1d14eaee568e355268f7333aa9c287392b9c 100644 (file)
--- a/src/onload/sapling_mutation.lua
+++ b/src/onload/sapling_mutation.lua
@@ -1 +1,12 @@
+local trees = {"", "dark", "jungle", "acacia", "spruce", "birch"}
+for _, tree in pairs(trees) do
+       local item = "mcl_core:" .. tree .. "leaves"
+       local drop = minetest.registered_nodes[item].drop
+       for _, mutant_tree in pairs(trees) do
+               drop.items[#drop.items + 1] = {
+                       items = {"mcl_core:" .. mutant_tree .. "sapling"},
+                       rarity = 1000,
+               }
+       end
+end