From 5a32f4595d6fec0a284d19286af7f9e9bfad888d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikita=20Wi=C5=9Bniewski=20=F0=9F=A4=8D=F0=9F=92=99?= =?UTF-8?q?=F0=9F=A4=8D?= Date: Thu, 29 Sep 2022 20:16:21 +0700 Subject: [PATCH] Prepare for pushing into master (fixes #11, #12) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add mcl_mangrove support, update support for crimson and warped wooden stuff and for deepslate paths, clean-up README and something else I gorgor 💀 --- README.md | 118 +++-------------------------------------- hedges.lua | 1 + locale/mcl_decor.ru.tr | 10 ++++ locale/template.txt | 10 ++++ mod.conf | 8 +-- paths.lua | 39 +++++++------- wooden.lua | 18 +++---- 7 files changed, 57 insertions(+), 147 deletions(-) diff --git a/README.md b/README.md index b6d75b5..07aaa73 100644 --- a/README.md +++ b/README.md @@ -1,132 +1,26 @@ -# MineClone2 Furniture and decorations mod [mcl_decor] (W.I.P.) -Adds more decoration and furniture blocks to MineClone 2 (5) +# MineClone2 Furniture and decorations mod [mcl_decor] +Adds more decoration and furniture blocks to MineClone 2 [![ContentDB](https://content.minetest.net/packages/rudzik8/mcl_decor/shields/downloads/)](https://content.minetest.net/packages/rudzik8/mcl_decor/) ![Screenshot](screenshot_big.png "Screenshot") -## Blocks - -### Armchairs -Armchairs are 1x1 size blocks, on which you can sit by right-click! Uses wool and sticks for crafting. 16 colors available! - -**Screenshot:** - -![Screenshot](https://i.ibb.co/fNXWDQh/screenshot-20220324-135852.png "16 armchairs") - -**Craft (has mirrored variant too):** - -![Screenshot](https://i.ibb.co/3YhDML4/Webp-net-gifmaker-2.gif "Crafting") - -### Chairs -Chairs are small blocks made out of wood, on which you can sit by right-click! Uses sticks and wood planks for crafting. 6 *(+2 with MCL5)* types available! - -**Screenshot:** - -![Screenshot](https://i.ibb.co/rcG3D0N/screenshot-20220324-141118.png "6 chairs") - -**Craft (has mirrored variant too):** - -![Screenshot](https://i.ibb.co/dJ84rPT/Webp-net-gifmaker-3.gif "Crafting") - -### Tables -This mod has 2 types of tables: Regular Table (4 small legs in one block) and Slab Table (1 leg in one block, can be expanded by using wood slabs and more slab tables). -Regular Tables are 1x1 size blocks made out of wood. Slab tables are 1x1 size blocks made out of wood too, but they look like if wood slab was combined with wood fence in one block. -Every table uses sticks and wood planks for crafting. - -**Screenshot:** - -![Screenshot](https://i.ibb.co/6D6xv4d/screenshot-20220324-143209.png "12 various tables") - -**Craft:** - -![Screenshot](https://i.ibb.co/rcNTLTC/Webp-net-gifmaker-5.gif "Crafting (regular ones)") - -### Dyed Planks -Dyed planks are 1x1 size blocks, acting like any other wood planks. Uses dye and any wood plank for crafting. 16 colors available! - -**Screenshot:** - -![Screenshot](https://i.ibb.co/dWFC1R6/screenshot-20220324-150234.png "16 dyed planks") - -**Craft (shapeless):** - -![Screenshot](https://i.ibb.co/PQrJWt7/Webp-net-gifmaker-6.gif "Crafting") - -### Paths -This mod has 7 (+2 with MCL5) types of them: Gravel, Cobblestone, Stone, Granite, Andesite, Diorite and Netherrack paths. If mcl_deepslate (MCL5 mod) enabled, there will be added Deepslate and Cobbled Deepslate paths as well. -Paths are nearly carpet size blocks, on which you can walk. Uses corresponding for its' type material for crafting. - -**Screenshot:** - -![Screenshot](https://i.ibb.co/kgqwhW2/screenshot-20220324-155134.png "7 paths") - -**Craft:** - -![Screenshot](https://i.ibb.co/G53JJhG/Webp-net-gifmaker-7.gif "Crafting") - -### Hedges -This mod has 6 types of them: Oak, Dark Oak, Jungle, Acacia, Spruce and Birch paths. -Hedges are like normal wooden fences, but made out from leaves. -Uses corresponding for its' type leaf and sticks for crafting. - -**Screenshot:** - -*Will be soon...* - -**Craft:** - -*Will be soon...* - -### Coalquartz Tile -Coalquartz tile is 1x1 size block, that looks and acts like coal and quartz blocks were combined. Uses coal and quartz items for crafting. Has slab and stair variants too! - -**Screenshot:** - -![Screenshot](https://i.ibb.co/j6hwy4J/screenshot-20220324-161814.png "Coalquartz slab, blocks and stair") - -**Craft (has mirrored variant too):** - -![Screenshot](https://i.ibb.co/Nrvy89T/screenshot-20220324-161942.png "Crafting") - -### Table Lamp -Table lamp is 1x1 size block, that emits light. Uses wool, stone and torch for crafting. - -**Screenshot:** - -![Screenshot](https://i.ibb.co/sRJy8DF/screenshot-20220324-163824.png "Table lamp on a birch table") - -**Craft:** - -![Screenshot](https://i.ibb.co/LrJq4vg/screenshot-20220324-165553.png "Crafting") - -### Curtains -Curtains are "wallmounted" blocks, which you can open or close by right-click! Uses wool, sticks and iron ingots for crafting. 16 colors available! - -**Screenshot:** - -![Screenshot](https://i.ibb.co/PxHScLG/Webp-net-gifmaker-8.gif "16 curtains, placed on glass") - -**Craft:** - -![Screenshot](https://i.ibb.co/Z1yfSvP/Webp-net-gifmaker-9.gif "Crafting") - ## Contributing (how can I help?) ### Translate the mod -Just fork this repo, copy "template.txt" and paste as "mcl_decor.XX.tr", where XX is your 2-letter language code (for example, "de" for German/**De**utsch). After that, you can open that file and translate strings to your language. +Just fork this repo, copy "template.txt" and paste as "mcl_decor.XX.tr" where XX is your 2-letter language code (for example, "de" for German/Deutsch). After that, you can open that file and translate strings to your language. After the work is done you need to create a pull request, and if it has no problems - I'll merge it! ### Report bugs Yes! Via "Issues" tab in this repo. I can't fix everything though, but if you found something in my mod that looks like a bug - report it. -### Share mod with friends and make reviews! -On ContentDB of course. Reviews can motivate me to continue updating this mod! +### Share mod with friends and make reviews +On ContentDB of course. Reviews motivate me to continue updating this mod. Also, you can star this repo on MeseHub as well! ### Help me with the code -I'm not a very good coder, more like a novice (combining practice and theory at once), so if you can - please, fix some bugs or maybe even add something via pull requests! +I'm not a very good coder so if you can - please, fix some bugs or maybe even add something via pull requests! **Thanks.** diff --git a/hedges.lua b/hedges.lua index ecf14ac..40770bb 100644 --- a/hedges.lua +++ b/hedges.lua @@ -23,6 +23,7 @@ mcl_decor.register_hedge("jungle", S("Jungle Hedge"), "mcl_core:jungleleaves", " mcl_decor.register_hedge("acacia", S("Acacia Hedge"), "mcl_core:acacialeaves", "default_acacia_leaves.png") mcl_decor.register_hedge("spruce", S("Spruce Hedge"), "mcl_core:spruceleaves", "mcl_core_leaves_spruce.png") mcl_decor.register_hedge("birch", S("Birch Hedge"), "mcl_core:birchleaves", "mcl_core_leaves_birch.png") +mcl_decor.register_hedge("mangrove", S("Mangrove Hedge"), "mcl_mangrove:mangroveleaves", "mcl_mangrove_leaves.png") minetest.register_craft({ type = "fuel", diff --git a/locale/mcl_decor.ru.tr b/locale/mcl_decor.ru.tr index e60bff0..c3361a3 100644 --- a/locale/mcl_decor.ru.tr +++ b/locale/mcl_decor.ru.tr @@ -20,6 +20,7 @@ Birch Chair=Берёзовый стул Dark Oak Chair=Стул из тёмного дуба Jungle Chair=Стул из тропического дерева Spruce Chair=Еловый стул +Mangrove Chair=Мангровый стул Crimson Chair=Багровый стул Warped Chair=Искажённый стул Oak Table=Дубовый стол @@ -28,6 +29,7 @@ Birch Table=Берёзовый стол Dark Oak Table=Стол из тёмного дуба Jungle Table=Стол из тропического дерева Spruce Table=Еловый стол +Mangrove Table=Мангровый стол Crimson Table=Багровый стол Warped Table=Искажённый стол Oak Slab Table=Дубовый полублочный стол @@ -36,8 +38,16 @@ Jungle Slab Table=Полублочный стол из тропического Spruce Slab Table=Еловый полублочный стол Acacia Slab Table=Полублочный стол из акации Birch Slab Table=Берёзовый полублочный стол +Mangrove Slab Table=Мангровый полублочный стол Crimson Slab Table=Багровый полублочный стол Warped Slab Table=Искажённый полублочный стол +Oak Hedge=Дубовая живая изгородь +Dark Oak Hedge=Живая изгородь из тёмного дуба +Jungle Hedge=Живая изгородь из тропического дерева +Acacia Hedge=Живая изгородь из акации +Spruce Hedge=Еловая живая изгородь +Birch Hedge=Берёзовая живая изгородь +Mangrove Hedge=Мангровая живая изгородь White Planks=Белые доски Grey Planks=Серые доски Light Grey Planks=Светло-серые доски diff --git a/locale/template.txt b/locale/template.txt index 3822e64..73d36f6 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -20,6 +20,7 @@ Birch Chair= Dark Oak Chair= Jungle Chair= Spruce Chair= +Mangrove Chair= Crimson Chair= Warped Chair= Oak Table= @@ -28,6 +29,7 @@ Birch Table= Dark Oak Table= Jungle Table= Spruce Table= +Mangrove Table= Crimson Table= Warped Table= Oak Slab Table= @@ -36,8 +38,16 @@ Jungle Slab Table= Spruce Slab Table= Acacia Slab Table= Birch Slab Table= +Mangrove Slab Table= Crimson Slab Table= Warped Slab Table= +Oak Hedge= +Dark Oak Hedge= +Jungle Hedge= +Acacia Hedge= +Spruce Hedge= +Birch Hedge= +Mangrove Hedge= White Planks= Grey Planks= Light Grey Planks= diff --git a/mod.conf b/mod.conf index 613454d..afac279 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ -title = MineClone2 Furniture and decorations mod +title = MineClone Furniture and decorations name = mcl_decor -description = Adds more decoration and furniture blocks to MineClone 2 (5) -depends = mcl_core, mcl_torches, mcl_player, mcl_sounds, mcl_dye, mcl_nether, mcl_stairs, mcl_title, mcl_fences -optional_depends = mcl_cozy, mcl_mushroom, mcl_deepslate +description = Adds more decoration and furniture blocks to MineClone 2 +depends = mcl_core, mcl_torches, mcl_player, mcl_sounds, mcl_dye, mcl_nether, mcl_stairs, mcl_title, mcl_fences, mcl_mangrove, mcl_deepslate, mcl_crimson +optional_depends = mcl_cozy diff --git a/paths.lua b/paths.lua index ed60e87..f95eb0a 100644 --- a/paths.lua +++ b/paths.lua @@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) ---=-- API --=-- +-- API function mcl_decor.register_path(name, desc, material, tiles, sgroup, sounds) minetest.register_node("mcl_decor:"..name.."_path", { description = desc, @@ -57,6 +57,7 @@ end +-- REGISTER mcl_decor.register_path( "gravel", S("Gravel Path"), @@ -113,23 +114,19 @@ mcl_decor.register_path( "pickaxey", mcl_sounds.node_sound_stone_defaults() ) - --- support for MineClone 5 -if minetest.get_modpath("mcl_deepslate") then - mcl_decor.register_path( - "deepslate", - S("Deepslate Path"), - "mcl_deepslate:deepslate", - "mcl_deepslate_top.png", - "pickaxey", - mcl_sounds.node_sound_stone_defaults() - ) - mcl_decor.register_path( - "deepslate_cobbled", - S("Cobbled Deepslate Path"), - "mcl_deepslate:deepslate_cobbled", - "mcl_cobbled_deepslate.png", - "pickaxey", - mcl_sounds.node_sound_stone_defaults() - ) -end +mcl_decor.register_path( + "deepslate", + S("Deepslate Path"), + "mcl_deepslate:deepslate", + "mcl_deepslate_top.png", + "pickaxey", + mcl_sounds.node_sound_stone_defaults() +) +mcl_decor.register_path( + "deepslate_cobbled", + S("Cobbled Deepslate Path"), + "mcl_deepslate:deepslate_cobbled", + "mcl_cobbled_deepslate.png", + "pickaxey", + mcl_sounds.node_sound_stone_defaults() +) diff --git a/wooden.lua b/wooden.lua index 9ed2439..6db78ec 100644 --- a/wooden.lua +++ b/wooden.lua @@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) ---=-- API --=-- +-- API function mcl_decor.register_chair_and_table(name, desc, desc2, material, tiles, group) if group == nil then group = {handy=1, axey=1, attached_node=1, material_wood=1, deco_block=1, flammable=-1} @@ -148,24 +148,22 @@ end +-- REGISTER mcl_decor.register_chair_and_table("wooden", S("Oak Chair"), S("Oak Table"), "mcl_core:wood", "default_wood.png") mcl_decor.register_chair_and_table("dark_oak", S("Dark Oak Chair"), S("Dark Oak Table"), "mcl_core:darkwood", "mcl_core_planks_big_oak.png") mcl_decor.register_chair_and_table("jungle", S("Jungle Chair"), S("Jungle Table"), "mcl_core:junglewood", "default_junglewood.png") mcl_decor.register_chair_and_table("spruce", S("Spruce Chair"), S("Spruce Table"), "mcl_core:sprucewood", "mcl_core_planks_spruce.png") mcl_decor.register_chair_and_table("acacia", S("Acacia Chair"), S("Acacia Table"), "mcl_core:acaciawood", "default_acacia_wood.png") mcl_decor.register_chair_and_table("birch", S("Birch Chair"), S("Birch Table"), "mcl_core:birchwood", "mcl_core_planks_birch.png") +mcl_decor.register_chair_and_table("mangrove", S("Mangrove Chair"), S("Mangrove Table"), "mcl_mangrove:mangrove_wood", "mcl_mangrove_planks.png") +mcl_decor.register_chair_and_table("crimson", S("Crimson Chair"), S("Crimson Table"), "mcl_crimson:crimson_hyphae_wood", "crimson_hyphae_wood.png") +mcl_decor.register_chair_and_table("warped", S("Warped Chair"), S("Warped Table"), "mcl_crimson:warped_hyphae_wood", "warped_hyphae_wood.png") mcl_decor.register_slab_table("wooden", S("Oak Slab Table"), "mcl_core:wood", "default_wood.png") mcl_decor.register_slab_table("dark_oak", S("Dark Oak Slab Table"), "mcl_core:darkwood", "mcl_core_planks_big_oak.png") mcl_decor.register_slab_table("jungle", S("Jungle Slab Table"), "mcl_core:junglewood", "default_junglewood.png") mcl_decor.register_slab_table("spruce", S("Spruce Slab Table"), "mcl_core:sprucewood", "mcl_core_planks_spruce.png") mcl_decor.register_slab_table("acacia", S("Acacia Slab Table"), "mcl_core:acaciawood", "default_acacia_wood.png") -mcl_decor.register_slab_table("birch", S("Birch Slab Table"), "mcl_core:birchwood", "mcl_core_planks_birch.png") - --- support for MineClone 5 -if minetest.get_modpath("mcl_mushroom") then - mcl_decor.register_chair_and_table("crimson", S("Crimson Chair"), S("Crimson Table"), "mcl_mushroom:crimson_hyphae_wood", "crimson_hyphae_wood.png", "1") - mcl_decor.register_chair_and_table("warped", S("Warped Chair"), S("Warped Table"), "mcl_mushroom:warped_hyphae_wood", "warped_hyphae_wood.png", "1") - mcl_decor.register_slab_table("crimson", S("Crimson Slab Table"), "mcl_mushroom:crimson_hyphae_wood", "crimson_hyphae_wood.png", "1") - mcl_decor.register_slab_table("warped", S("Warped Slab Table"), "mcl_mushroom:warped_hyphae_wood", "warped_hyphae_wood.png", "1") -end +mcl_decor.register_slab_table("mangrove", S("Mangrove Slab Table"), "mcl_mangrove:mangrove_wood", "mcl_mangrove_planks.png") +mcl_decor.register_slab_table("crimson", S("Crimson Slab Table"), "mcl_crimson:crimson_hyphae_wood", "crimson_hyphae_wood.png") +mcl_decor.register_slab_table("warped", S("Warped Slab Table"), "mcl_crimson:warped_hyphae_wood", "warped_hyphae_wood.png")