diff options
| author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-03-15 03:07:49 -0400 |
|---|---|---|
| committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-03-15 03:07:49 -0400 |
| commit | f5df30ddb8e38d9891eef2ef0763f67afdda498c (patch) | |
| tree | 971a5ed9e5d5b5de609a199db54b1e00452457e1 | |
| parent | 6c701f9b7cf88fcb026a8f38d8852bd8a54412c7 (diff) | |
| download | dreambuilder_modpack-f5df30ddb8e38d9891eef2ef0763f67afdda498c.tar dreambuilder_modpack-f5df30ddb8e38d9891eef2ef0763f67afdda498c.tar.gz dreambuilder_modpack-f5df30ddb8e38d9891eef2ef0763f67afdda498c.tar.bz2 dreambuilder_modpack-f5df30ddb8e38d9891eef2ef0763f67afdda498c.tar.xz dreambuilder_modpack-f5df30ddb8e38d9891eef2ef0763f67afdda498c.zip | |
update moreblocks and gloopblocks
| -rw-r--r-- | gloopblocks/init.lua | 45 | ||||
| -rw-r--r-- | moreblocks/depends.txt | 1 | ||||
| -rw-r--r-- | moreblocks/stairsplus/registrations.lua | 37 |
3 files changed, 38 insertions, 45 deletions
diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua index 0d14764..3a8e396 100644 --- a/gloopblocks/init.lua +++ b/gloopblocks/init.lua @@ -15,26 +15,6 @@ else S = function(s) return s end
end
--- misc stuff
-
-local colorlist = {
- {"white", "White"},
- {"grey", "Grey"},
- {"black", "Black"},
- {"red", "Red"},
- {"yellow", "Yellow"},
- {"green", "Green"},
- {"cyan", "Cyan"},
- {"blue", "Blue"},
- {"magenta", "Magenta"},
- {"orange", "Orange"},
- {"violet", "Violet"},
- {"brown", "Brown"},
- {"pink", "Pink"},
- {"dark_grey", "Dark Grey"},
- {"dark_green", "Dark Green"},
-}
-
-- Nodes
minetest.register_node("gloopblocks:rainbow_block", {
@@ -335,19 +315,6 @@ if minetest.get_modpath("moreblocks") then sunlight_propagates = true,
})
- for i in ipairs(colorlist) do
- local color = colorlist[i][1]
- local colordesc = colorlist[i][2]
-
- stairsplus:register_all("wool", color, "wool:"..color, {
- description = colordesc.." Wool",
- tiles = {"wool_"..color..".png"},
- groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1,not_in_creative_inventory=1},
- sounds = default.node_sound_defaults(),
- sunlight_propagates = true,
- })
- end
-
if minetest.get_modpath("caverealms") then
stairsplus:register_all("caverealms", "glow_crystal", "caverealms:glow_crystal", {
description = "Glow Crystal",
@@ -528,18 +495,6 @@ elseif minetest.get_modpath("stairs") then "Rainbow Block Slab",
default.node_sound_defaults())
- for i in ipairs(colorlist) do
- local color = colorlist[i][1]
- local colordesc = colorlist[i][2]
-
- stairs.register_stair_and_slab("wool_"..color, "wool:"..color,
- {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
- {"wool_"..color..".png"},
- "Wool Stair ("..colordesc..")",
- "Wool Slab ("..colordesc..")",
- default.node_sound_defaults())
- end
-
if minetest.setting_getbool("gloopblocks_mossy_conversion") ~= false then
gloopblocks_register_mossy_conversion({
diff --git a/moreblocks/depends.txt b/moreblocks/depends.txt index 8f1c124..74e8624 100644 --- a/moreblocks/depends.txt +++ b/moreblocks/depends.txt @@ -1,3 +1,4 @@ default
intllib?
farming?
+wool?
diff --git a/moreblocks/stairsplus/registrations.lua b/moreblocks/stairsplus/registrations.lua index be08b43..065bc9d 100644 --- a/moreblocks/stairsplus/registrations.lua +++ b/moreblocks/stairsplus/registrations.lua @@ -74,3 +74,40 @@ for _, name in pairs(default_nodes) do }) end end + +-- wool registrations + +if minetest.get_modpath("wool") then + + local colorlist = { + {"white", "White Wool"}, + {"grey", "Grey Wool"}, + {"black", "Black Wool"}, + {"red", "Red Wool"}, + {"yellow", "Yellow Wool"}, + {"green", "Green Wool"}, + {"cyan", "Cyan Wool"}, + {"blue", "Blue Wool"}, + {"magenta", "Magenta Wool"}, + {"orange", "Orange Wool"}, + {"violet", "Violet Wool"}, + {"brown", "Brown Wool"}, + {"pink", "Pink Wool"}, + {"dark_grey", "Dark Grey Wool"}, + {"dark_green", "Dark Green Wool"}, + } + + for i in ipairs(colorlist) do + local color = colorlist[i][1] + local colordesc = colorlist[i][2] + + stairsplus:register_all("wool", color, "wool:"..color, { + description = colordesc, + tiles = {"wool_"..color..".png"}, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3, + flammable=3,wool=1,not_in_creative_inventory=1}, + sounds = default.node_sound_defaults(), + sunlight_propagates = true, + }) + end +end |