diff --git a/README.md b/README.md index 1cf146a..1798395 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ https://forum.minetest.net/viewtopic.php?id=8890 Changelog: +- 1.2 - Add 'stairsplus_clay_compatibility' setting. +- 1.1 - Remove 0.4.x compatibility to better support 5.x mods - 1.0 - Re-Added glazed terracotta blocks when you cook baked clay in furnace (thanks Amara2_MK), added support for sofar's flowerpot mod, missing glazed textures re-coloured by firefox. - 0.9 - Baked clay now works in the technic cnc machine - 0.8 - Cooking clay block in furnace gives natural baked clay which you can dye @@ -23,3 +25,5 @@ Lucky Blocks: 10 Note: Under settings you will find 'colored_clay_compatibility' switch that when enabled will register aliases for the older colored clay mod and it's stairplus stairs. + +You will also find the 'stairsplus_clay_compatibility' setting that is enabled by default for older worlds that switched from default stairs mod to stairsplus. It can be disabled for brand new worlds only using stairsplus mod though. diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 2a83a65..0000000 --- a/depends.txt +++ /dev/null @@ -1,6 +0,0 @@ -default -stairs -moreblocks? -lucky_block? -technic_cnc? -flowerpot? diff --git a/description.txt b/description.txt deleted file mode 100644 index b469a1b..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds the ability to bake clay into blocks and colour them with dye. \ No newline at end of file diff --git a/flowers.lua b/flowers.lua index 8d5d5f2..0bdeea7 100644 --- a/flowers.lua +++ b/flowers.lua @@ -1,3 +1,6 @@ +-- 5.x translation +S = minetest.get_translator("bakedclay") + local flowers = { {"delphinium", "Blue Delphinium", {-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_cyan = 1}}, @@ -22,7 +25,7 @@ local function add_simple_flower(name, desc, box, f_groups) f_groups.attached_node = 1 minetest.register_node("bakedclay:" .. name, { - description = desc, + description = S(desc), drawtype = "plantlike", waving = 1, tiles = {"baked_clay_" .. name .. ".png"}, @@ -32,7 +35,7 @@ local function add_simple_flower(name, desc, box, f_groups) paramtype = "light", walkable = false, buildable_to = true, - stack_max = 99, +-- stack_max = 99, groups = f_groups, sounds = default.node_sound_leaves_defaults(), selection_box = {type = "fixed", fixed = box} @@ -115,3 +118,11 @@ minetest.register_decoration({ spawn_by = "group:water", num_spawn_by = 1 }) + +-- flowerpot mod +if minetest.get_modpath("flowerpot") then + flowerpot.register_node("bakedclay:delphinium") + flowerpot.register_node("bakedclay:thistle") + flowerpot.register_node("bakedclay:lazarus") + flowerpot.register_node("bakedclay:mannagrass") +end diff --git a/init.lua b/init.lua index d0620a9..54c958b 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,7 @@ +-- 5.x translation +S = minetest.get_translator("bakedclay") --- Baked Clay by TenPlus1 - +-- list of clay colours local clay = { {"natural", "Natural"}, {"white", "White"}, @@ -20,22 +21,26 @@ local clay = { {"dark_green", "Dark Green"} } +-- check mod support local techcnc_mod = minetest.get_modpath("technic_cnc") local stairs_mod = minetest.get_modpath("stairs") local stairsplus_mod = minetest.get_modpath("moreblocks") and minetest.global_exists("stairsplus") +local stairsplus_compat = minetest.settings:get_bool("stairsplus_clay_compatibility") ~= false + +-- scroll through colours for _, clay in pairs(clay) do - -- node + -- register node minetest.register_node("bakedclay:" .. clay[1], { - description = clay[2] .. " Baked Clay", + description = S(clay[2] .. " Baked Clay"), tiles = {"baked_clay_" .. clay[1] ..".png"}, groups = {cracky = 3, bakedclay = 1}, sounds = default.node_sound_stone_defaults() }) - -- craft recipe + -- register craft recipe if clay[1] ~= "natural" then minetest.register_craft({ @@ -59,14 +64,17 @@ for _, clay in pairs(clay) do sounds = default.node_sound_stone_defaults() }) - stairsplus:register_alias_all("bakedclay", clay[1], - "bakedclay", "baked_clay_" .. clay[1]) + if stairsplus_compat then - minetest.register_alias("stairs:slab_bakedclay_".. clay[1], - "bakedclay:slab_baked_clay_" .. clay[1]) + stairsplus:register_alias_all("bakedclay", clay[1], + "bakedclay", "baked_clay_" .. clay[1]) - minetest.register_alias("stairs:stair_bakedclay_".. clay[1], - "bakedclay:stair_baked_clay_" .. clay[1]) + minetest.register_alias("stairs:slab_bakedclay_".. clay[1], + "bakedclay:slab_baked_clay_" .. clay[1]) + + minetest.register_alias("stairs:stair_bakedclay_".. clay[1], + "bakedclay:stair_baked_clay_" .. clay[1]) + end -- stairs redo elseif stairs_mod and stairs.mod then @@ -88,13 +96,16 @@ for _, clay in pairs(clay) do default.node_sound_stone_defaults()) end - -- register bakedclay for use in technic_cnc mod + -- register bakedclay for use in technic_cnc mod after all mods loaded if techcnc_mod then - technic_cnc.register_all("bakedclay:" .. clay[1], - {cracky = 3, not_in_creative_inventory = 1}, - {"baked_clay_" .. clay[1] .. ".png"}, - clay[2] .. " Baked Clay") + core.register_on_mods_loaded(function() + + technic_cnc.register_all("bakedclay:" .. clay[1], + {cracky = 3, not_in_creative_inventory = 1}, + {"baked_clay_" .. clay[1] .. ".png"}, + clay[2] .. " Baked Clay") + end) end end @@ -106,7 +117,7 @@ for _, clay in pairs(clay) do local texture = "baked_clay_terracotta_" .. clay[1] ..".png" minetest.register_node("bakedclay:terracotta_" .. clay[1], { - description = clay[2] .. " Glazed Terracotta", + description = S(clay[2] .. " Glazed Terracotta"), tiles = { texture .. "", texture .. "", @@ -183,14 +194,6 @@ if minetest.settings:get_bool("colored_clay_compatibility") == true then end end --- flowerpot mod -if minetest.get_modpath("flowerpot") then - flowerpot.register_node("bakedclay:delphinium") - flowerpot.register_node("bakedclay:thistle") - flowerpot.register_node("bakedclay:lazarus") - flowerpot.register_node("bakedclay:mannagrass") -end - -- get mod path local path = minetest.get_modpath("bakedclay") diff --git a/license.txt b/license.txt index 532dbe2..9019798 100644 --- a/license.txt +++ b/license.txt @@ -21,8 +21,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Textures by TenPlus1 (CC0) unless listed below + Textures by Amara2_MK (Creative Commons) https://www.curseforge.com/minecraft/texture-packs/glazed-terracotta-revamp baked_clay_terracotta*.png Missing gray, light gray, black and green textures re-coloured by Firefox. + +Textures by Timbits (CC-BY-SA 3.0) + baked_clay_lazarus.png + baked_clay_delphinium.png + baked_clay_mannagrass.png + baked_clay_thistle.png diff --git a/mod.conf b/mod.conf index d6afa41..6aabb44 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = bakedclay depends = default -optional_depends = stairs, moreblocks, lucky_block, technic_cnc, flowerpot +optional_depends = stairs, moreblocks, lucky_block, flowerpot description = Adds the ability to bake clay into blocks and colour them with dye. diff --git a/settingtypes.txt b/settingtypes.txt index bdd2a13..657f965 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,2 +1,5 @@ # Registers compatibility aliases with the older colored_clay mod colored_clay_compatibility (Colored Clay Compatibility) bool false + +# Registers compatibility aliases in older worlds for StairsPlus mod +stairsplus_clay_compatibility (StairsPlus Stair Compatibility) bool true