diff --git a/CHANGELOG.md b/CHANGELOG.md index 661e602..9b4df34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [Jun 11th - **STILL UNDER DEVELOPMENT** 2024] Update: Smithing Update +## [Jul 11th - Jul 12th 2024] Update: Smithing Update - Updated Unified Inventory and Mobs Redo - Added furnaces @@ -10,13 +10,13 @@ - Fire now spreads instead of just sitting there and damaging entities. - Add terracotta that I forgot to add in the "Adventure and Magic Update" -## [Jun 10th 2024] Minor Update: Fence Update +## [Jul 10th 2024] Minor Update: Fence Update - Added fences - Humans no longer spawn below sea-level - Fix birch forests being too small -## [Jun 10th 2024] Update: Cave Update +## [Jul 10th 2024] Update: Cave Update - Added andesite and granite - Added various gemstones and metals diff --git a/mods/pyutest_core/blocks.lua b/mods/pyutest_core/blocks.lua index 9f8094d..9ef5823 100644 --- a/mods/pyutest_core/blocks.lua +++ b/mods/pyutest_core/blocks.lua @@ -71,7 +71,7 @@ PyuTestCore.make_building_blocks = function (name, desc, tex, colortint, cgroups groups = groups, econf = econf }) - + minetest.register_node(id_block, PyuTestCore.util.tableconcat({ description = Translate(desc.." Block"), tiles = tex, @@ -217,7 +217,8 @@ PyuTestCore.make_building_blocks("pyutest_core:wooden_log", "Oak Wooden Log", { block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY, acid_vulnerable = 1, wooden_log = 1, - flammable = 1 + flammable = 1, + fuel = 1 }, { is_ground_content = false, }) @@ -230,7 +231,8 @@ PyuTestCore.make_building_blocks("pyutest_core:savanna_wooden_log", "Savanna Woo block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY, acid_vulnerable = 1, wooden_log = 1, - flammable = 1 + flammable = 1, + fuel = 1 }, { is_ground_content = false, }) @@ -243,7 +245,8 @@ PyuTestCore.make_building_blocks("pyutest_core:birch_wooden_log", "Birch Wooden block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY, acid_vulnerable = 1, wooden_log = 1, - flammable = 1 + flammable = 1, + fuel = 1 }, { is_ground_content = false, }) @@ -256,7 +259,8 @@ PyuTestCore.make_building_blocks("pyutest_core:cherry_wooden_log", "Cherry Woode block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY, acid_vulnerable = 1, wooden_log = 1, - flammable = 1 + flammable = 1, + fuel = 1 }, { is_ground_content = false, }) @@ -264,7 +268,8 @@ PyuTestCore.make_building_blocks("pyutest_core:cherry_wooden_log", "Cherry Woode PyuTestCore.make_building_blocks("pyutest_core:wooden", "Wooden", {"wood.png"}, nil, { block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY, acid_vulnerable = 1, - flammable = 1 + flammable = 1, + fuel = 1 }, {is_ground_content = false}) PyuTestCore.make_building_blocks("pyutest_core:snow", "Snow", {"snow.png"}, nil, { diff --git a/mods/pyutest_core/crafts.lua b/mods/pyutest_core/crafts.lua index 5cd3719..c100d20 100644 --- a/mods/pyutest_core/crafts.lua +++ b/mods/pyutest_core/crafts.lua @@ -201,6 +201,14 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "pyutest_core:clay_block 4", + recipe = { + {"pyutest_core:clay", "pyutest_core:clay"}, + {"pyutest_core:clay", "pyutest_core:clay"} + } +}) + minetest.register_craft({ type = "cooking", output = "pyutest_core:glass", diff --git a/mods/pyutest_core/init.lua b/mods/pyutest_core/init.lua index bcd9215..06843da 100644 --- a/mods/pyutest_core/init.lua +++ b/mods/pyutest_core/init.lua @@ -1,12 +1,12 @@ Translate = minetest.get_translator("pyutest_core") PyuTestCore = { - BLOCK_BREAKABLE_INSTANT = 7, - BLOCK_BREAKABLE_NORMAL = 6, - BLOCK_BREAKABLE_CHOPPY = 5, - BLOCK_BREAKABLE_MIDDLE = 4, - BLOCK_BREAKABLE_LONG = 3, - BLOCK_BREAKABLE_VERYLONG = 2, - BLOCK_BREAKABLE_FOREVER = 1, + BLOCK_BREAKABLE_INSTANT = 7, -- Flowers, Torches, etc. + BLOCK_BREAKABLE_NORMAL = 6, -- Grass, Dirt, Gravel, etc. + BLOCK_BREAKABLE_CHOPPY = 5, -- Wood + BLOCK_BREAKABLE_MIDDLE = 4, -- Stone, Coal, etc. + BLOCK_BREAKABLE_LONG = 3, -- Iron, Zinc, etc. + BLOCK_BREAKABLE_VERYLONG = 2, -- Obsidian, etc. + BLOCK_BREAKABLE_FOREVER = 1, -- Barriers. } PyuTestCore.get_schem_path = function (name) diff --git a/mods/pyutest_core/overrides.lua b/mods/pyutest_core/overrides.lua index ef79de5..59e1a3b 100644 --- a/mods/pyutest_core/overrides.lua +++ b/mods/pyutest_core/overrides.lua @@ -14,6 +14,10 @@ minetest.override_item("pyutest_core:leaves_block", { } }) +minetest.override_item("pyutest_core:clay_block", { + drop = "pyutest_core:clay 3" +}) + minetest.override_item("pyutest_core:coal_lump", { groups = { fuel = 1 diff --git a/mods/pyutest_core/textures/terracotta.png b/mods/pyutest_core/textures/terracotta.png new file mode 100644 index 0000000..7efee0c Binary files /dev/null and b/mods/pyutest_core/textures/terracotta.png differ diff --git a/mods/pyutest_core/wool.lua b/mods/pyutest_core/wool.lua index 40dae63..28f4bf8 100644 --- a/mods/pyutest_core/wool.lua +++ b/mods/pyutest_core/wool.lua @@ -1,5 +1,10 @@ -PyuTestCore.make_colored_blocks = function(name, desc, color) +PyuTestCore.make_colored_blocks = function(name, desc, color) PyuTestCore.make_building_blocks(name.."_wool", desc.." Wool", {"wool.png"}, color or "white") + PyuTestCore.make_building_blocks(name.."_terracotta", desc .. " Terracotta", { + "terracotta.png" + }, color or "white", { + block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE + }) PyuTestCore.make_item(name.."_dye", desc.." Dye", {}, "dye.png", { color = color or "white" @@ -14,6 +19,15 @@ PyuTestCore.make_colored_blocks = function(name, desc, color) name.."_dye" } }) + + minetest.register_craft({ + output = name.."_terracotta_block", + type = "shapeless", + recipe = { + "pyutest_core:white_terracotta_block", + name.."_dye" + } + }) end PyuTestCore.make_colored_blocks("pyutest_core:white", "White", "white") @@ -25,13 +39,36 @@ minetest.register_craft({ } }) -PyuTestCore.make_colored_blocks("pyutest_core:black", "Black", "black") -PyuTestCore.make_colored_blocks("pyutest_core:brown", "Brown", "saddlebrown") +minetest.register_craft({ + type = "cooking", + output = "pyutest_core:white_terracotta_block", + recipe = "pyutest_core:clay_block" +}) -PyuTestCore.make_colored_blocks("pyutest_core:red", "Red", "red") -PyuTestCore.make_colored_blocks("pyutest_core:orange", "Orange", "orange") -PyuTestCore.make_colored_blocks("pyutest_core:yellow", "Yellow", "yellow") -PyuTestCore.make_colored_blocks("pyutest_core:green", "Green", "green") -PyuTestCore.make_colored_blocks("pyutest_core:blue", "Blue", "blue") -PyuTestCore.make_colored_blocks("pyutest_core:purple", "Purple", "purple") -PyuTestCore.make_colored_blocks("pyutest_core:pink", "Pink", "pink") +local colors = { + white = {"White", nil}, + black = {"Black", "black"}, + brown = {"Brown", "saddlebrown"}, + red = {"Red", "indianred"}, + orange = {"Orange", "coral"}, + yellow = {"Yellow", "khaki"}, + green = {"Green", "olivedrab"}, + blue = {"Blue", "cornflowerblue"}, + purple = {"Purple", "plum"}, + pink = {"Pink", "pink"} +} + +for k, v in pairs(colors) do + PyuTestCore.make_colored_blocks("pyutest_core:"..k, v[1], v[2]) +end + +-- PyuTestCore.make_colored_blocks("pyutest_core:black", "Black", "black") +-- PyuTestCore.make_colored_blocks("pyutest_core:brown", "Brown", "saddlebrown") +-- +-- PyuTestCore.make_colored_blocks("pyutest_core:red", "Red", "red") +-- PyuTestCore.make_colored_blocks("pyutest_core:orange", "Orange", "orange") +-- PyuTestCore.make_colored_blocks("pyutest_core:yellow", "Yellow", "yellow") +-- PyuTestCore.make_colored_blocks("pyutest_core:green", "Green", "green") +-- PyuTestCore.make_colored_blocks("pyutest_core:blue", "Blue", "blue") +-- PyuTestCore.make_colored_blocks("pyutest_core:purple", "Purple", "purple") +-- PyuTestCore.make_colored_blocks("pyutest_core:pink", "Pink", "pink")