From 8135b176812bfb0249335c551873145fbcfb04bb Mon Sep 17 00:00:00 2001 From: rudzik8 Date: Sat, 30 Apr 2022 15:08:27 +0700 Subject: [PATCH] Add support for MineClone5's deepslate and update locales --- README.md | 2 +- api.lua | 2 ++ locale/mcl_decor.ru.tr | 3 ++- locale/template.txt | 3 ++- paths.lua | 38 +++++++++++++++++++++++++++++--------- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a13d2d0..a7f1712 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Dyed planks are 1x1 size blocks, acting like any other wood planks. Uses dye and ![Screenshot](https://i.ibb.co/PQrJWt7/Webp-net-gifmaker-6.gif "Crafting") ### Paths -This mod has 7 types of them: Gravel, Cobblestone, Stone, Granite, Andesite, Diorite and Netherrack 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:** diff --git a/api.lua b/api.lua index cb5c2f4..f47fab8 100644 --- a/api.lua +++ b/api.lua @@ -14,6 +14,8 @@ mcl_decor.sit = function(pos, _, player) mcl_title.set(player, "actionbar", {text=S("You have to stop moving before sitting down!"), color="white", stay=60}) return end + -- TODO: check distance and if the chair is occupied + -- (maybe needs a function refactor) player:move_to(pos) player:set_eye_offset({x = 0, y = -7, z = 0}, {x = 0, y = 0, z = 0}) player:set_physics_override(0, 0, 0) diff --git a/locale/mcl_decor.ru.tr b/locale/mcl_decor.ru.tr index 3a4ca28..e60bff0 100644 --- a/locale/mcl_decor.ru.tr +++ b/locale/mcl_decor.ru.tr @@ -11,7 +11,8 @@ Granite Path=Гранитовая дорожка Andesite Path=Андезитовая дорожка Diorite Path=Диоритовая дорожка Netherrack Path=Адская каменная дорожка -Rainbow Block=Радужный блок +Deepslate Path=Сланцевая дорожка +Cobbled Deepslate Path=Дроблёная сланцевая дорожка Table Lamp=Настольная лампа Oak Chair=Дубовый стул Acacia Chair=Стул из акации diff --git a/locale/template.txt b/locale/template.txt index d4a6983..3822e64 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -11,7 +11,8 @@ Granite Path= Andesite Path= Diorite Path= Netherrack Path= -Rainbow Block= +Deepslate Path= +Cobbled Deepslate Path= Table Lamp= Oak Chair= Acacia Chair= diff --git a/paths.lua b/paths.lua index fe74307..e5bb3d5 100644 --- a/paths.lua +++ b/paths.lua @@ -4,7 +4,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) --=-- API --=-- function mcl_decor.register_path(name, desc, material, tiles, sgroup, sounds) - minetest.register_node(name, { + minetest.register_node("mcl_decor:"..name.."_path", { description = desc, tiles = {tiles}, wield_image = "mcl_decor_path_alpha.png^"..tiles.."^" .. @@ -46,7 +46,7 @@ function mcl_decor.register_path(name, desc, material, tiles, sgroup, sounds) sounds = sounds }) minetest.register_craft({ - output = name.." 16", + output = "mcl_decor:"..name.."_path".." 16", recipe = { {material, "", material}, {"", material, ""}, @@ -59,7 +59,7 @@ end --=-- REGISTER --=-- mcl_decor.register_path( - "mcl_decor:gravel_path", + "gravel", S("Gravel Path"), "mcl_core:gravel", "default_gravel.png", @@ -67,7 +67,7 @@ mcl_decor.register_path( mcl_sounds.node_sound_dirt_defaults({footstep = {name="default_gravel_footstep", gain=0.45}}) ) mcl_decor.register_path( - "mcl_decor:cobble_path", + "cobble", S("Cobblestone Path"), "mcl_core:cobble", "default_cobble.png", @@ -75,7 +75,7 @@ mcl_decor.register_path( mcl_sounds.node_sound_stone_defaults() ) mcl_decor.register_path( - "mcl_decor:stone_path", + "stone", S("Stone Path"), "mcl_core:stone", "default_stone.png", @@ -83,7 +83,7 @@ mcl_decor.register_path( mcl_sounds.node_sound_stone_defaults() ) mcl_decor.register_path( - "mcl_decor:granite_path", + "granite", S("Granite Path"), "mcl_core:granite", "mcl_core_granite.png", @@ -91,7 +91,7 @@ mcl_decor.register_path( mcl_sounds.node_sound_stone_defaults() ) mcl_decor.register_path( - "mcl_decor:andesite_path", + "andesite", S("Andesite Path"), "mcl_core:andesite", "mcl_core_andesite.png", @@ -99,7 +99,7 @@ mcl_decor.register_path( mcl_sounds.node_sound_stone_defaults() ) mcl_decor.register_path( - "mcl_decor:diorite_path", + "diorite", S("Diorite Path"), "mcl_core:diorite", "mcl_core_diorite.png", @@ -107,10 +107,30 @@ mcl_decor.register_path( mcl_sounds.node_sound_stone_defaults() ) mcl_decor.register_path( - "mcl_decor:netherrack_path", + "netherrack", S("Netherrack Path"), "mcl_nether:netherrack", "mcl_nether_netherrack.png", "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