From 034f6b947df5ca16b39d3a2e0d4ce688a2170a0a Mon Sep 17 00:00:00 2001 From: 1798643961 <1798643961@qq.com> Date: Wed, 16 Feb 2022 16:26:49 +0800 Subject: [PATCH 1/6] Some Chinese translate --- .../locale/mcl_explosions.zh_CN.tr | 2 ++ .../mcl_boats/locale/mcl_boats.zh_CN.tr | 12 +++++++++ .../locale/mcl_falling_nodes.zh_CN.tr | 3 +++ .../locale/mcl_structures.zh_CN.tr | 7 +++++ mods/MISC/findbiome/locale/findbiome.zh_CN.tr | 10 +++++++ .../mcl_commands/locale/mcl_commands.zh_CN.tr | 26 +++++++++++++++++++ mods/MISC/mcl_privs/locale/mcl_privs.zh_CN.tr | 2 ++ mods/MISC/mcl_wip/locale/mcl_wip.zh_CN.tr | 4 +++ .../mcl_hunger/locale/mcl_hunger.zh_CN.tr | 8 ++++++ .../locale/mcl_playerplus.zh_CN.tr | 3 +++ .../mcl_skins/locale/mcl_skins.zh_CN.tr | 13 ++++++++++ .../mcl_spawn/locale/mcl_spawn.zh_CN.tr | 4 +++ 12 files changed, 94 insertions(+) create mode 100644 mods/CORE/mcl_explosions/locale/mcl_explosions.zh_CN.tr create mode 100644 mods/ENTITIES/mcl_boats/locale/mcl_boats.zh_CN.tr create mode 100644 mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.zh_CN.tr create mode 100644 mods/MAPGEN/mcl_structures/locale/mcl_structures.zh_CN.tr create mode 100644 mods/MISC/findbiome/locale/findbiome.zh_CN.tr create mode 100644 mods/MISC/mcl_commands/locale/mcl_commands.zh_CN.tr create mode 100644 mods/MISC/mcl_privs/locale/mcl_privs.zh_CN.tr create mode 100644 mods/MISC/mcl_wip/locale/mcl_wip.zh_CN.tr create mode 100644 mods/PLAYER/mcl_hunger/locale/mcl_hunger.zh_CN.tr create mode 100644 mods/PLAYER/mcl_playerplus/locale/mcl_playerplus.zh_CN.tr create mode 100644 mods/PLAYER/mcl_skins/locale/mcl_skins.zh_CN.tr create mode 100644 mods/PLAYER/mcl_spawn/locale/mcl_spawn.zh_CN.tr diff --git a/mods/CORE/mcl_explosions/locale/mcl_explosions.zh_CN.tr b/mods/CORE/mcl_explosions/locale/mcl_explosions.zh_CN.tr new file mode 100644 index 000000000..664de1503 --- /dev/null +++ b/mods/CORE/mcl_explosions/locale/mcl_explosions.zh_CN.tr @@ -0,0 +1,2 @@ +# textdomain:mcl_explosions +@1 was caught in an explosion.=@1 困于爆炸. \ No newline at end of file diff --git a/mods/ENTITIES/mcl_boats/locale/mcl_boats.zh_CN.tr b/mods/ENTITIES/mcl_boats/locale/mcl_boats.zh_CN.tr new file mode 100644 index 000000000..691b61996 --- /dev/null +++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.zh_CN.tr @@ -0,0 +1,12 @@ +# textdomain: mcl_boats +Acacia Boat=金合欢木船 +Birch Boat=白桦木船 +Boat=船 +Boats are used to travel on the surface of water.=船是用来在水面上航行的. +Dark Oak Boat=黑色橡木船 +Jungle Boat=从林木船 +Oak Boat=橡木船 +Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=右键单击水源以放置船。右键单击船进入。使用[左]和[右]转向，[前]加速，[后]减速或向后移动。使用[潜行]离开船，击打船使其作为物品掉落。 +Spruce Boat=云杉船 +Water vehicle=水上交通工具 +Sneak to dismount=潜行以下船 diff --git a/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.zh_CN.tr b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.zh_CN.tr new file mode 100644 index 000000000..32decb0ef --- /dev/null +++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.zh_CN.tr @@ -0,0 +1,3 @@ +# textdomain: mcl_falling_nodes +@1 was smashed by a falling anvil.=@1 被落下的铁砧砸碎了. +@1 was smashed by a falling block.=@1 被落下的方块砸碎了. diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.zh_CN.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.zh_CN.tr new file mode 100644 index 000000000..fcb41621c --- /dev/null +++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.zh_CN.tr @@ -0,0 +1,7 @@ +# textdomain: mcl_structures +Generate a pre-defined structure near your position.=在你的位置附近生成一个预定的结构. +Structure placed.=结构被放置. +Village built. WARNING: Villages are experimental and might have bugs.=村庄建成了.警告：村庄是实验性的，可能有bug. +Error: No structure type given. Please use “/spawnstruct ”.=错误：没有给出结构类型。请使用 “/spawnstruct ”. +Error: Unknown structure type. Please use “/spawnstruct ”.=错误：未知结构类型。请使用 “/spawnstruct ”. +Use /help spawnstruct to see a list of avaiable types.= 使用 "/help spawnstruct "查看可用类型的列表. diff --git a/mods/MISC/findbiome/locale/findbiome.zh_CN.tr b/mods/MISC/findbiome/locale/findbiome.zh_CN.tr new file mode 100644 index 000000000..993ceed7d --- /dev/null +++ b/mods/MISC/findbiome/locale/findbiome.zh_CN.tr @@ -0,0 +1,10 @@ +# textdomain: findbiome +Find and teleport to biome=寻找以及传送至生物群系 +=<生物群系> +No player.=没有玩家. +Biome does not exist!=生物群系不存在. +Biome found at @1.=生物群系在 @1 被找到 +No biome found!=找不到生物群系. +List all biomes=生物群系列表信息 +No biomes.=没有生物群系. +Not supported. The “biomeinfo” mod is required for v6 mapgen support!=不支持. 生物群系信息模组需要v6 地图生成构造器支持！ diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.zh_CN.tr b/mods/MISC/mcl_commands/locale/mcl_commands.zh_CN.tr new file mode 100644 index 000000000..e9dbb1593 --- /dev/null +++ b/mods/MISC/mcl_commands/locale/mcl_commands.zh_CN.tr @@ -0,0 +1,26 @@ +# textdomain: mcl_commands +Players can't be killed right now, damage has been disabled.=现在不能杀死玩家，由于互相伤害被禁止. +Player @1 does not exist.=玩家 @1 不存在 +You are already dead=你已经死了 +@1 is already dead=@1 已经死了 +@1 committed suicide.=@1 尝试自杀 +@1 was killed by @2.=@1 被 @2 杀了. +[]=[<名字>] +Kill player or yourself=杀死其他玩家或者自己 +Can use /say=可以使用 /say +=<信息> +Send a message to every player=给每位玩家发消息 +Invalid usage, see /help @1.=无效的使用，请查看 /help @1. +,, =,, <节点字符串> +Set node at given position=设置节点在所给的位置 +Invalid node=无效的节点 +@1 spawned.=@1 生成. +Invalid parameters (see /help setblock)=无效参数 (请查看 /help setblock) +List bans=被禁止的列表 +Ban list: @1=禁止的列表: @1 +Show who is logged on=显示谁已登录 +Displays the world seed=显示世界生成种子 +Only peaceful mobs allowed!=只允许和平的生物！ +@1[]=@1[<名字>] +Set game mode for player or yourself=为玩家或你自己设置游戏模式 +Error: No game mode specified.=错误: 没有指定游戏模式. \ No newline at end of file diff --git a/mods/MISC/mcl_privs/locale/mcl_privs.zh_CN.tr b/mods/MISC/mcl_privs/locale/mcl_privs.zh_CN.tr new file mode 100644 index 000000000..c6880732e --- /dev/null +++ b/mods/MISC/mcl_privs/locale/mcl_privs.zh_CN.tr @@ -0,0 +1,2 @@ +# textdomain: mcl_privs +Can place and use advanced blocks like mob spawners, command blocks and barriers.=可以放置和使用高级块, 如怪物生成器、命令块和屏障. diff --git a/mods/MISC/mcl_wip/locale/mcl_wip.zh_CN.tr b/mods/MISC/mcl_wip/locale/mcl_wip.zh_CN.tr new file mode 100644 index 000000000..5a4a9f860 --- /dev/null +++ b/mods/MISC/mcl_wip/locale/mcl_wip.zh_CN.tr @@ -0,0 +1,4 @@ +# textdomain: mcl_wip +# WIP means “Work in Progress” +(WIP)=(半成品) +(Temporary)=(短暂的) diff --git a/mods/PLAYER/mcl_hunger/locale/mcl_hunger.zh_CN.tr b/mods/PLAYER/mcl_hunger/locale/mcl_hunger.zh_CN.tr new file mode 100644 index 000000000..09d6b88f6 --- /dev/null +++ b/mods/PLAYER/mcl_hunger/locale/mcl_hunger.zh_CN.tr @@ -0,0 +1,8 @@ +# textdomain: mcl_hunger +@1 succumbed to the poison.=@1 死于中毒. +Food=食物 +Saturation=饱食度 +%s: %.1f/%d=%s: %.1f/%d +Exhaust.=饥饿. +%s: %d/%d=%s: %d/%d +@1 starved to death.=@1 饿死了. diff --git a/mods/PLAYER/mcl_playerplus/locale/mcl_playerplus.zh_CN.tr b/mods/PLAYER/mcl_playerplus/locale/mcl_playerplus.zh_CN.tr new file mode 100644 index 000000000..2cdd41eb0 --- /dev/null +++ b/mods/PLAYER/mcl_playerplus/locale/mcl_playerplus.zh_CN.tr @@ -0,0 +1,3 @@ +# textdomain: mcl_playerplus +@1 suffocated to death.=@1 窒息而死. +@1 was prickled to death by a cactus.=@1 被仙人掌刺死. \ No newline at end of file diff --git a/mods/PLAYER/mcl_skins/locale/mcl_skins.zh_CN.tr b/mods/PLAYER/mcl_skins/locale/mcl_skins.zh_CN.tr new file mode 100644 index 000000000..4b903b619 --- /dev/null +++ b/mods/PLAYER/mcl_skins/locale/mcl_skins.zh_CN.tr @@ -0,0 +1,13 @@ +# textdomain: mcl_skins +[] []=[<玩家>] [<皮肤编号>] +Select player skin of yourself or another player=选择你自己的玩家皮肤或者其他玩家皮肤 +Insufficient or wrong parameters=参数不足或错误 +Player @1 not online!=玩家 @1 不在线 +You need the “server” privilege to change the skin of other players!=你需要“服务器”特权来改变其他玩家的皮肤！ +Invalid skin number! Valid numbers: 0 to @1=无效的皮肤编号！有效数字: 0到 @1 +Your skin has been set to: @1=您的皮肤已设置为: @1 +Your skin has been set to: @1 (@2)=您的皮肤已设置为: @1 (@2) +Skin of @1 set to: @2 (@3)=@1 的皮肤 已经设置为: @2 (@3) +Select player skin:=选择你的玩家皮肤 +@1 (@2)=@1 (@2) +Name: @1=名字: @1 diff --git a/mods/PLAYER/mcl_spawn/locale/mcl_spawn.zh_CN.tr b/mods/PLAYER/mcl_spawn/locale/mcl_spawn.zh_CN.tr new file mode 100644 index 000000000..596335087 --- /dev/null +++ b/mods/PLAYER/mcl_spawn/locale/mcl_spawn.zh_CN.tr @@ -0,0 +1,4 @@ +# textdomain: mcl_spawn +New respawn position set!=设置了新的重生点 +Respawn position cleared!=清除了重生点! +Your spawn bed was missing or blocked.=你的床已经丢失或者被阻挡。 \ No newline at end of file From aca900023ce082a53260318b1a9f16e5b1411a5f Mon Sep 17 00:00:00 2001 From: kabou Date: Wed, 16 Feb 2022 23:16:08 +0100 Subject: [PATCH 2/6] mcl_composters initial commit Implements a composter block with crafting recipe, and some more uncraftable blocks representing various stages of filling. Adds a list of items that can be used with the composter and the chances of these items adding a layer to the composter. Implements methods to add compostable items to the composter, to update the composter to various levels of compost and to harvest an item of bone meal when the composter is ready. Textures were taken from XSSheep/Nova_Wostra Pixel Perfection texture pack. --- mods/ITEMS/mcl_composters/init.lua | 339 ++++++++++++++++++ mods/ITEMS/mcl_composters/locale/template.txt | 7 + mods/ITEMS/mcl_composters/mod.conf | 5 + .../textures/mcl_composter_bottom.png | Bin 0 -> 395 bytes .../textures/mcl_composter_compost.png | Bin 0 -> 409 bytes .../textures/mcl_composter_ready.png | Bin 0 -> 582 bytes .../textures/mcl_composter_side.png | Bin 0 -> 267 bytes .../textures/mcl_composter_top.png | Bin 0 -> 397 bytes 8 files changed, 351 insertions(+) create mode 100644 mods/ITEMS/mcl_composters/init.lua create mode 100644 mods/ITEMS/mcl_composters/locale/template.txt create mode 100644 mods/ITEMS/mcl_composters/mod.conf create mode 100644 mods/ITEMS/mcl_composters/textures/mcl_composter_bottom.png create mode 100644 mods/ITEMS/mcl_composters/textures/mcl_composter_compost.png create mode 100644 mods/ITEMS/mcl_composters/textures/mcl_composter_ready.png create mode 100644 mods/ITEMS/mcl_composters/textures/mcl_composter_side.png create mode 100644 mods/ITEMS/mcl_composters/textures/mcl_composter_top.png diff --git a/mods/ITEMS/mcl_composters/init.lua b/mods/ITEMS/mcl_composters/init.lua new file mode 100644 index 000000000..d77fd4e31 --- /dev/null +++ b/mods/ITEMS/mcl_composters/init.lua @@ -0,0 +1,339 @@ +local S = minetest.get_translator(minetest.get_current_modname()) + +-- +-- Composter mod, adds composters. +-- +-- Copyleft 2022 by kabou +-- GNU General Public Licence 3.0 +-- + +local composter_description = S( + "Composter" +) +local composter_longdesc = S( + "Composters can convert various organic items into bonemeal." +) +local composter_usagehelp = S( + "Use organic items on the composter to fill it with layers of compost. " .. + "Every time an item is put in the composter, there is a chance that the " .. + "composter adds another layer of compost. Some items have a bigger chance " .. + "of adding an extra layer than other items. After filling up with 7 layers " .. + "of compost, the composter is full and bone meal can be retrieved from it. " .. + "Taking out the bone meal empties the composter." +) + +minetest.register_craft({ + output = "mcl_composters:composter", + recipe = { + {"group:wood_slab", "", "group:wood_slab"}, + {"group:wood_slab", "", "group:wood_slab"}, + {"group:wood_slab", "group:wood_slab", "group:wood_slab"}, + } +}) + +local compostability = { + ["mcl_cake:cake"] = 100, + ["mcl_farming:pumpkin_pie"] = 100, + + ["mcl_farming:potato_item_baked"] = 85, + ["mcl_farming:bread"] = 85, + ["mcl_farming:cookie"] = 85, + ["mcl_farming:hay_block"] = 85, + -- mushroom cap block have 64 variants, wtf!? + ["mcl_mushrooms:brown_mushroom_block_cap_111111"] = 85, + ["mcl_mushrooms:red_mushroom_block_cap_111111"] = 85, + ["mcl_nether:nether_wart_block"] = 85, + ["mcl_mushroom:warped_wart_block"] = 85, + + ["mcl_core:apple"] = 65, + -- missing: azalea + ["mcl_farming:beetroot_item"] = 65, + -- missing: big dripleaf + ["mcl_farming:carrot_item"] = 65, + -- what's up with cocoa beans? + ["mcl_dye:brown"] = 65, + ["mcl_flowers:fern"] = 65, + ["mcl_flowers:double_fern"] = 65, + ["mcl_flowers:allium"] = 65, + ["mcl_flowers:azure_bluet"] = 65, + ["mcl_flowers:blue_orchid"] = 65, + ["mcl_flowers:dandelion"] = 65, + ["mcl_flowers:lilac"] = 65, + ["mcl_flowers:oxeye_daisy"] = 65, + ["mcl_flowers:poppy"] = 65, + ["mcl_flowers:tulip_orange"] = 65, + ["mcl_flowers:tulip_pink"] = 65, + ["mcl_flowers:tulip_red"] = 65, + ["mcl_flowers:tulip_white"] = 65, + ["mcl_flowers:peony"] = 65, + ["mcl_flowers:rose_bush"] = 65, + ["mcl_flowers:sunflower"] = 65, + ["mcl_flowers:waterlily"] = 65, + -- missing: melon block? + -- missing: moss block? + -- mushroom aliases below? + ["mcl_farming:mushroom_brown"] = 65, + ["mcl_mushrooms:mushroom_brown"] = 65, + ["mcl_farming:mushroom_red"] = 65, + ["mcl_mushrooms:mushroom_red"] = 65, + ["mcl_mushrooms:brown_mushroom_block_stem_full"] = 65, + ["mcl_mushrooms:red_mushroom_block_stem_full"] = 65, + -- nether wart + ["mcl_farming:potato_item"] = 65, + ["mcl_farming:pumpkin"] = 65, + ["mcl_farming:pumpkin_face_light"] = 65, + ["mcl_ocean:sea_pickle_"] = 65, + ["mcl_mushroom:shroomlight"] = 65, + -- missing: spore blossom + ["mcl_farming:wheat_item"] = 65, + ["mcl_mushroom:crimson_fungus"] = 65, + ["mcl_mushroom:warped_fungus"] = 65, + ["mcl_mushroom:crimson_roots"] = 65, + ["mcl_mushroom:warped_roots"] = 65, + + ["mcl_core:cactus"] = 50, + ["mcl_ocean:dried_kelp_block"] = 50, + -- missing: flowering azalea leaves + -- missing: glow lichen + ["mcl_farming:melon_item"] = 50, + ["mcl_mushroom:nether_sprouts"] = 50, + ["mcl_core:reeds"] = 50, + ["mcl_flowers:double_grass"] = 50, + ["mcl_core:vine"] = 50, + -- missing: weeping vines + ["mcl_mushroom:twisting_vines"] = 50, + + ["mcl_flowers:tallgrass"] = 30, + ["mcl_farming:beetroot_seeds"] = 30, + ["mcl_core:dirt_with_grass"] = 30, + ["mcl_core:tallgrass"] = 30, + ["mcl_ocean:dried_kelp"] = 30, + ["mcl_ocean:kelp"] = 30, + ["mcl_core:leaves"] = 30, + ["mcl_core:acacialeaves"] = 30, + ["mcl_core:birchleaves"] = 30, + ["mcl_core:darkleaves"] = 30, + ["mcl_core:jungleleaves"] = 30, + ["mcl_core:spruceleaves"] = 30, + -- + ["mcl_farming:melon_seeds"] = 30, + -- missing: moss carpet + ["mcl_farming:pumpkin_seeds"] = 30, + ["mcl_core:sapling"] = 30, + ["mcl_core:acaciasapling"] = 30, + ["mcl_core:birchsapling"] = 30, + ["mcl_core:darksapling"] = 30, + ["mcl_core:junglesapling"] = 30, + ["mcl_core:spruceapling"] = 30, + ["mcl_ocean:seagrass"] = 30, + -- missing: small dripleaf + ["mcl_sweet_berry:sweet_berry"] = 30, + ["mcl_farming:sweet_berry"] = 30, + ["mcl_farming:wheat_seeds"] = 30, + +} + +local function composter_add_item(pos, node, player, itemstack, pointed_thing) + -- + -- handle filling the composter when rightclicked + -- as an on_rightclick handles, it returns an itemstack + -- + if not player or player:get_player_control().sneak then + return itemstack + end + if not itemstack and itemstack:is_empty() then + return itemstack + end + local itemname = itemstack:get_name() + local chance = compostability[itemname] + if chance then + if not minetest.is_creative_enabled(player:get_player_name()) then + itemstack:take_item() + end + -- calculate leveling up chance + local rand = math.random(0,100) + if chance >= rand then + -- get current compost level + local node_defs = minetest.registered_nodes[node.name] + local level = node_defs["_compost_level"] + -- spawn green particles above new layer + mcl_dye.add_bone_meal_particle(vector.add(pos, {x=0, y=level/8, z=0})) + -- TODO: play some sounds + -- update composter block + if level < 7 then + level = level + 1 + else + level = "ready" + end + minetest.swap_node(pos, {name = "mcl_composters:composter_" .. level}) + -- a full composter becomes ready for harvest after one second + -- the block will get updated by the node timer callback set in node reg def + if level == 7 then + local timer = minetest.get_node_timer(pos) + timer:start(1) + end + end + end + return itemstack +end + +local function composter_ready(pos) + -- + -- update the composter block to ready for harvesting + -- this function is a callback on_timer. + -- the timer is set in function 'composter_fill' when composter level is 7 + -- returns false in order to cancel further activity of the timer + -- + minetest.swap_node(pos, {name = "mcl_composters:composter_ready"}) + -- maybe spawn particles again? + -- TODO: play some sounds + return false +end + +local function composter_harvest(pos, node, player, itemstack, pointed_thing) + -- + -- handle harvesting bone meal from a ready composter when rightclicked + -- + if not player or player:get_player_control().sneak then + return + end + -- reset composter to empty + minetest.swap_node(pos, {name="mcl_composters:composter"}) + -- spawn bone meal item (wtf dye?! is this how the make white cocoa) + minetest.add_item(pos, "mcl_dye:white") + -- TODO play some sounds + +end + +local function composter_get_nodeboxes(level) + -- + -- Convenience function because the composter nodeboxes are very similar + -- + local top_y_tbl = {[0]=-7, -5, -3, -1, 1, 3, 5, 7} + local top_y = top_y_tbl[level] / 16 + return { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, -0.375, 0.5, 0.5}, -- Left wall + { 0.375, -0.5, -0.5, 0.5, 0.5, 0.5}, -- Right wall + {-0.375, -0.5, 0.375, 0.375, 0.5, 0.5}, -- Back wall + {-0.375, -0.5, -0.5, 0.375, 0.5, -0.375}, -- Front wall + {-0.5, -0.5, -0.5, 0.5, top_y, 0.5}, -- Bottom level + } + } +end + +local composter_wieldimg = minetest.inventorycube("mcl_composter_top.png", "mcl_composter_side.png", "mcl_composter_side.png") +-- +-- Register empty composter +-- This is the base model that is craftable and can be placed in an inventory +-- +minetest.register_node("mcl_composters:composter", { + description = composter_description, + _tt_help = S("Converts organic items into bonemeal"), + _doc_items_longdesc = composter_longdesc, + _doc_items_usagehelp = composter_usagehelp, + -- FIXME: mcl_composter_side.png is fugly. maybe somehow use minetest.inventorycube(img1, img2, img3) + -- eeeww, that is also ugly and weird + inventory_image = composter_wieldimg, + --inventory_image = "mcl_composter_side.png", + paramtype = "light", + drawtype = "nodebox", + node_box = composter_get_nodeboxes(0), + selection_box = {type = "regular"}, + tiles = { + "mcl_composter_bottom.png^mcl_composter_top.png", + "mcl_composter_bottom.png", + "mcl_composter_side.png" + }, + use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + is_ground_content = false, + groups = { + handy=1, material_wood=1, deco_block=1, dirtifier=1, + flammable=2, fire_encouragement=3, fire_flammability=4, + }, + sounds = mcl_sounds.node_sound_wood_defaults(), + _mcl_hardness = 2, + _mcl_blast_resistance = 2, + _compost_level = 0, + on_rightclick = composter_add_item +}) + +-- +-- Template function for composters with compost +-- For each fill level a custom node is registered +-- +local function register_filled_composter(level) + local id = "mcl_composters:composter_"..level + minetest.register_node(id, { + description = S("Composter") .. " (" .. level .. "/7 " .. S("filled") .. ")", + _doc_items_create_entry = false, + paramtype = "light", + drawtype = "nodebox", + node_box = composter_get_nodeboxes(level), + selection_box = {type = "regular"}, + tiles = { + "mcl_composter_compost.png^mcl_composter_top.png", + "mcl_composter_bottom.png", + "mcl_composter_side.png" + }, + use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + is_ground_content = false, + groups = { + handy=1, material_wood=1, deco_block=1, dirtifier=1, + not_in_creative_inventory=1, not_in_craft_guide=1, + flammable=2, fire_encouragement=3, fire_flammability=4, + comparator_signal=level + }, + sounds = mcl_sounds.node_sound_wood_defaults(), + drop = "mcl_composters:composter", + _mcl_hardness = 2, + _mcl_blast_resistance = 2, + _compost_level = level, + on_rightclick = composter_add_item, + on_timer = composter_ready + }) + + -- Add entry aliases for the Help + if minetest.get_modpath("doc") then + doc.add_entry_alias("nodes", "mcl_composters:composter", "nodes", id) + end +end + +-- +-- Register filled composters (7 levels) +-- +for level = 1, 7 do + register_filled_composter(level) +end + +-- +-- Register composter ready to be harvested +-- +minetest.register_node("mcl_composters:composter_ready", { + description = S("Composter") .. "(" .. S("ready for harvest") .. ")", + _doc_items_create_entry = false, + use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + paramtype = "light", + drawtype = "nodebox", + node_box = composter_get_nodeboxes(7), + selection_box = {type = "regular"}, + tiles = { + "mcl_composter_ready.png^mcl_composter_top.png", + "mcl_composter_bottom.png", + "mcl_composter_side.png" + }, + is_ground_content = false, + groups = { + handy=1, material_wood=1, deco_block=1, dirtifier=1, + not_in_creative_inventory=1, not_in_craft_guide=1, + flammable=2, fire_encouragement=3, fire_flammability=4, + comparator_signal=8 + }, + sounds = mcl_sounds.node_sound_wood_defaults(), + drop = "mcl_composters:composter", + _mcl_hardness = 2, + _mcl_blast_resistance = 2, + _compost_level = 7, + on_rightclick = composter_harvest +}) diff --git a/mods/ITEMS/mcl_composters/locale/template.txt b/mods/ITEMS/mcl_composters/locale/template.txt new file mode 100644 index 000000000..b882113c4 --- /dev/null +++ b/mods/ITEMS/mcl_composters/locale/template.txt @@ -0,0 +1,7 @@ +# textdomain: mcl_composters +Composter= +Composters can convert various organic items into bonemeal.= +Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost. Some items have a bigger chance of adding an extra layer than other items. After filling up with 7 layers of compost, the composter is full and bone meal can be retrieved from it. Taking out the bone meal empties the composter.= +filled= +ready for harvest= +Converts organic items into bonemeal= diff --git a/mods/ITEMS/mcl_composters/mod.conf b/mods/ITEMS/mcl_composters/mod.conf new file mode 100644 index 000000000..6ae5ff3e6 --- /dev/null +++ b/mods/ITEMS/mcl_composters/mod.conf @@ -0,0 +1,5 @@ +name = mcl_composters +author = kabou +description = composters +depends = mcl_core, mcl_sounds +optional_depends = doc diff --git a/mods/ITEMS/mcl_composters/textures/mcl_composter_bottom.png b/mods/ITEMS/mcl_composters/textures/mcl_composter_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..dc075789938b54b1f26881e9a101b71a6abc7fb0 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP-J2SJWoN?~e7zPGL2~QWt5R22T!H#~14Fu*ytaH5- z6;qM&|6>0a)j1P)6lMx4FfI~rX$s(2_t@j*!k(KJc{97;eyu9AS*?3*_0xv<8?B5C zCii7k{Ejj@Fgtv{+`M|NNs7+h+g`^vuQd_T?^(aGy0ZCy&GD~iYi*?CAAfu(y1m@r zVBfK_&peM`d#rE^^6tIH%5dQL^$@*-GP@1jnWF#Ns(1zWbm*m7i9M8N2r%(zI;rVl zrk{Q>#C39v`GP|C;%^K4udYau|Ft7Ow!=+p+p||iYg$781uwnS@VafYONgc71hrFH zJM$)#Tw#4#ux{3urKJx`#9y##U*7SiJVpG8>gu_NmvFC4(K31}-+5&TUR?6wdj_z*z{nlW&kTOT=zEFP4JS92ZL=aMmxt+E_o_=A_br2;IJptq zi){ki3qllxI5YT!(Yf%TI?f?tv_y4@5CxFd4MG$Qegb$dR{30Y`BJIbn!y8J!pI#) z!Z}0$+$CYO#P-jR$>mf-6jOt4UhwrjR%t50nPr)hSVTcn>~2ye7B)75h~O?5q6jHuF`@y9g~X%` zff!e?u&_}?qPC)y;wp&lPa#2Uf8QhbjTB~mbcpI9B zPhX<7=5h5k%9Zq6830;Am~5$9tEW7qlnNnu(P-k>20;kljp)xwYaCl9=ly@xFRV?e Ue>i!}+5i9m07*qoM6N<$g7W$OLjV8( literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_composters/textures/mcl_composter_side.png b/mods/ITEMS/mcl_composters/textures/mcl_composter_side.png new file mode 100644 index 0000000000000000000000000000000000000000..e70c05858a23413c1572b95eb0eb79d0d78660f3 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYm6sN`*41#gG|mrktBCSw zP4<~t9y7TzWo>`ng60e$iqEN!1uAAt@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nx zdx@v7EBj-1W@bK4$&T5KK%oLp7sn8e>%M0K1rHgBxLiES*vxFQCxGS2QOE6U5^=IA z?ChOQLfc#R-+ON?zIW@zU)vu~IJWS7!_0K=n-5ywEqPpb^i5Iot4*uh4rttIYEd=T z&bFF8L5%Z#?xf@QBa-G_pWGRKcd2@l_Q|yhv;9+Fvd25A$_hPg+y=Cp!PC{xWt~$( F698xdT!;Vw literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_composters/textures/mcl_composter_top.png b/mods/ITEMS/mcl_composters/textures/mcl_composter_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb9df7ee2f70e60bf6362ba509a8d3fd78342a3 GIT binary patch literal 397 zcmV;80doF{P)wOosYT3qKEF!)@g^6S zcfzx4D|xtok*n)Racw2HH&5c)O8Cx9q!t!U=m7xlpL4kcbNtfn3;6QyAyGJ)6gpYh zNWwP&U}%sAlT)zRX|af=8k!Wk5p~#`v+IY*MkTv`i2Ek=(MZGAoS#jVkmWyBCJlsc zJX(k Date: Thu, 17 Feb 2022 07:53:00 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E2=80=9Emods/CORE/mcl=5Fbubble=5Fcolumn/mo?= =?UTF-8?q?d.conf=E2=80=9C=20hinzuf=C3=BCgen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit added mod.conf --- mods/CORE/mcl_bubble_column/mod.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 mods/CORE/mcl_bubble_column/mod.conf diff --git a/mods/CORE/mcl_bubble_column/mod.conf b/mods/CORE/mcl_bubble_column/mod.conf new file mode 100644 index 000000000..9167bf062 --- /dev/null +++ b/mods/CORE/mcl_bubble_column/mod.conf @@ -0,0 +1 @@ +name = mcl_bubble_column \ No newline at end of file From ee56be722cb95b12a6a971048365b25d67ba2aac Mon Sep 17 00:00:00 2001 From: nikolaus-albinger Date: Thu, 17 Feb 2022 07:55:03 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E2=80=9Emods/ITEMS/mcl=5Fblackstone/mod.co?= =?UTF-8?q?nf=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mod.conf updated --- mods/ITEMS/mcl_blackstone/mod.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_blackstone/mod.conf b/mods/ITEMS/mcl_blackstone/mod.conf index 42c279a0c..99c247024 100644 --- a/mods/ITEMS/mcl_blackstone/mod.conf +++ b/mods/ITEMS/mcl_blackstone/mod.conf @@ -1 +1,2 @@ name = mcl_blackstone +depends = mcl_core,screwdriver,mcl_stairs,mclx_stairs,mcl_walls,mclx_fences,mcl_torches \ No newline at end of file From 668730380a60c781ae8528a4a8c86c0b98d808e2 Mon Sep 17 00:00:00 2001 From: nikolaus-albinger Date: Thu, 17 Feb 2022 07:55:36 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E2=80=9Emods/ITEMS/mcl=5Fblackstone/depend?= =?UTF-8?q?s.txt=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit depends.txt removed (deprecated) --- mods/ITEMS/mcl_blackstone/depends.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 mods/ITEMS/mcl_blackstone/depends.txt diff --git a/mods/ITEMS/mcl_blackstone/depends.txt b/mods/ITEMS/mcl_blackstone/depends.txt deleted file mode 100644 index c1ada2d4e..000000000 --- a/mods/ITEMS/mcl_blackstone/depends.txt +++ /dev/null @@ -1,7 +0,0 @@ -mcl_core -screwdriver -mcl_stairs -mclx_stairs -mcl_walls -mclx_fences -mcl_torches From 69df4f261dc4bea7ec1e613f305d24d971747c36 Mon Sep 17 00:00:00 2001 From: rudzik8 Date: Fri, 18 Feb 2022 20:58:25 +0700 Subject: [PATCH 6/6] Replace old weird sweet berry textures with the new ones by Nova_Wostra --- .../textures/mcl_farming_sweet_berry.png | Bin 462 -> 410 bytes .../textures/mcl_farming_sweet_berry_bush_0.png | Bin 318 -> 442 bytes .../textures/mcl_farming_sweet_berry_bush_1.png | Bin 759 -> 491 bytes .../textures/mcl_farming_sweet_berry_bush_2.png | Bin 800 -> 526 bytes .../textures/mcl_farming_sweet_berry_bush_3.png | Bin 858 -> 567 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry.png index 7c2349971a2e174a47503ff35b02042f9ac1fbc8..8323384fc833d751dcb0841ff5f15426608aae2d 100644 GIT binary patch delta 368 zcmV-$0gwL91DXSnBnkm@Qb$4nuFf3kks%X*32;bRa{vGf6951U69E94oEQKA0WV2J zK~y+TV;FG22&FN=3UmGcAo~8dZw!@}Z{t+Q1f@{`NVBn-7MQKb#l=vnrT{h!8^CG+ z$kwx`uEE*J0AzT(t}5I>xB(uye*eA8{J|3Me*Ok)glT@q2=M{TWyr3A8^Fv7Q3Nu7 zsQcCfMvx&OeCO96hPgNIGg@e={D-*=M8gb4@xtHl{~6vqe+XuS3^~lg!f=(DnE|Bv zj}|w>K?hBSv+qB`4F#!#8-T1CqydCM>=W1SFbX(pF^EXYgI#&qT@S7q1mFx1fN2sF z;A4pT`xh(*axN$uVc`R_=**gns4nnZvoeC)2-1umja$1mGQPa`0Pac{0Gk5R{OZFe zux1b+6ipzFAOH?9U|@p61T26C;4Xk^Mh587hz;PBK~813?gdyCj7vBufgxLSYGlrCMkzQ(GS>{s2L^VET(8AP03HC($nh5d_bAu$eZO&iBVf(l!`Peq5T*zKsqNq@3hpAX zEly6Q9y+>i?NtFF05A&RsP8t~7AM={)MFn8Tj5^dL4)JJ;}Z}pd41jHM#caD002ov JPDHLkV1m8qx8VQ) diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_0.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_0.png index 6f8c0d833dd5b5b8e805381bbaa837cc5714f15d..1f4839b8eed605455f522856ec6e1a91c874b753 100644 GIT binary patch delta 400 zcmV;B0dM}k0=ff`Bnkm@Qb$4nuFf3kks%X*32;bRa{vGf6951U69E94oEQKA0Z&Op zK~y+TV;BXvfk&?2e<%|#V1m+EfpwZS*bop6GSIusAHz^aC=CW61%JQ)XL$4cAp^S* z4_NHyyDwliFS{_qj>(%))Pn$q0LZ4#Ki|SNzPkDfEY2^<#qja@H-_6sZ=>kJFaQL9 zRIOG2gEWAEh@?CNGbcpZ%X<$P&aAnJ-2j;LpWc7Lz|Qd#EcWvUJA<^M1lRzOW|+5* z&N|Ad>tn`xdCRHaD5im&4>AA*e!PFrz#%9IW`hg_IUnjOW}qwnfhB+dZh%RMK0Jg$ zia`LEH;}^uOu*v&?z!s>%0`+XCK!NwVgu$45CF-8fSR=ynBLm8krD0!pr62ofSe98 z1mqQDZ-Ce!7l90v(~<;h28qKH640Mu_K(j$;5LCYgEWFMP#oqpm}U@wGeAIAPZngz uUkDFq051oa25E)?pcoU-|IqMaU;qHugqpr{P!VeY0000sy)2HBT|o0bqTskQ5g7cW#9G VKi1s$n6>}_002ovPDHLkV1i(VdO-jH diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_1.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_1.png index 2ac3c205d8de804a93cce796b342b78adf868f02..81c7eba9449a2a90550c41c9a0dc7f5a80902cd7 100644 GIT binary patch delta 450 zcmV;z0X_cr1?vNlBnkm@Qb$4nuFf3kks%X*32;bRa{vGf6951U69E94oEQKA0f0$F zK~y+TjZ-~K13?g-T!cF%iNpjkScpgjZ3NNkz*-Qr(BEKZ>yNPYZwR6&*jm_#1jMf* zL}NrRhM1T{^o~PT-*~(1#hmzx%-_P~EvFb11=eukpq?2!NyQeKiB96?9e%U=V0I z?^L_0F=?rA!!;ctHehaTMqp?#H^Ap?ZcIskzAcmInw(!8oN|$Wboq~WRWdCPM{XV+ zA7KIv%eC51K1Yx!1=4X40B*BMRyxgpIS6%CXFKO=j+4Bd7xEH7GZ3`~?u#cyF2wY= zhDj5%Q^ASYIJpKOO`No+Il_2DJ`1EnvTVXxDnX7q6v?$J*A7Ru3*5)oUMmh+NlP`t z3yvK(R1duZJU~Q~4h#T#9W^MCMk)o}SY4PG*;I-y%MUc1NyK)K3&Bkok$4bi0WOQR$)HfV!2kdN07*qoM6N<$g5GVsqW}N^ delta 716 zcmV;-0yF*V1NQ}xBp(E4K}|sb0I`n?{9y$E000JJOGiWi004dfB%3c9^pQRne*%X| zL_t(I%XQPuPh3?P$MMgdw|ik2hJiAcVks1MqP8(=>;|K8)5Ms#YD~H@Zrr#~lqd7pb-I4FyHw&ywD^L@_wJ%J~!#km`9 zZ>3$k7~>n8N1vM-{seVP>&e;Df8Ys+17z`@t=bjGtvRjUgeyos-KZ@?W5V5L;MBoayV1_92tX`HWOBZ|`Krom$EGP}NX&e-E$XA$k}> z4fV8z(Gatkv%3GW*^x)`*|KszrDWq@?Ewdv(DTEEbKOR%g#|pXF%FamteFBHgA+^?2 zA5g(xnLg>%Brz6MjYa2Fe_D}Jm?(saMklA7KQ@%z){QsO!pJG0jbE+oe5%=b-qXcL zri&d!Dy@|AU|XVXG^%17Kcb2Vxzn3#!pxTv?4K0f-OZCUmBOY{^w?)Khgd#f6A|i@5rQH^YY}k zcmwnOowmJtUMJqPb@+--ToPtJ^wNc|(M$gexHH`Efvf?V9Ed;w zH={6oSEg-O{jAexr$V|+iL->U0Fa2xi_2)7Hv8+o*Eb+re|<<&MOBzzA4WOIAAS3a z(G(~PAh~a_mjzI~;~OQ2uXq25$PToBjlVo**jMv;vbo*N6zMdM zet{V^Ao(~Dlpf7nDlRbAG@WYzzB0~6ts&m0GtEEp;5MYPP6tbXdNwUNhn;k zmYL%W@ueckv7X{-wsMx>?3lpP7E*bBIxP{qU|Ukj=CsLp(<@*Hut?Ga1%N(Kju`fJ zv0GoH?4T9liE-g|x#%YOOg$clY40@FIBACA&y>j(*s9eknT16zx)p{3D9jdXTdP46 b`wgORErYu1hWluNAO1>8m*Ic%a7Hl5q>;Mi~5Z-Aamo00CCgSm!4)>gIeVxcsFmzri79L3=f zRop?_*rV}3MjwmaL0)04mmua)+m1luwN$OeeDP_8wehAv42cjSx=?YX{U@!dvg`Lc z^<<;ZHiWJ$w>K#Rf9>RKe^v&Y0_#|cH>uY`IsyLz(aFV>>;FSF%idb5{NL>kFG=S`{j zry5Kx?R3n1yPBu5BcIxlPv6s#zTLT555h=@tGI~;l!ATfOXBe#f4*6r$wXm%bR=F> zuBJ59RBD0k-K0$NhA8^kQ+@AY3%mbD`DE&>c=)1cANUF{W8}+1>FBGEWUg5$WiMUd z89tdTl~tp>RQz4f^nZ?eu&)E5A8(!0kr|Rr9Mhj$ZGL+f%N91eRO%}p&Y#C>^N~^T zpCTpEjl*tkoDl|TOHrfz^-}%$@#pgIm|cETwN`R`;O%Cq8o~cGF^_(~ub;A8+YmMC np6I!NlIexhqDI4a)eG=9Lq-7@2qxvS00000NkvXXu0mjfx8Qi1 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_3.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_sweet_berry_bush_3.png index a473882f4dbfc1076b0e794db9c0cd80db295492..14d3ed5454ecd3cc7786eaaccaf5c8caa9cfe312 100644 GIT binary patch delta 526 zcmV+p0`dLY2Db!|Bnkm@Qb$4nuFf3kks%X*32;bRa{vGf6951U69E94oEQKA0nAB6 zK~y+TjZ-~HLQxbxnxu&e{uD(-NLeU^AVq^9O%W6|*ic(Ew7CWiO%Xw~IoDcCLs8M% z5Rp(2{Si|BL}+4}8ulI}Seu#o7Xo+9$ zg(yisO8YaR7*Z0z;&yv031IVPn+s5Xe7X5sgaoz*-3+ZB4LRW{lB9=1CIdRNnYdOb zLN-x=rIMb`Q>Pc)Igyn<2RYd8l?t%AMhlcR?{P zfX=AndHELTJ8*a%4Clg+27$$I@x+hjVNnCVbcu4fR2kesHT=E-W;2=KD*6a5R)flt z%&_i84J=$r%ac*}&y;-4QWT0sP_qWMeiun82|tP delta 816 zcmV-01JC@o1lk6WBp(E4K}|sb0I`n?{9y$E000JJOGiWirT`QG2J~ou(2+hDe*)@B zL_t(I%WacOXcG$*hQFC)CNc4*t)`CNc*%TVBmik`NT^s zoFvjq4kh()U9Yw((x#kK+nVbH(1E#t3rKK06a&m@z$`%N`>W(~r%&)Be+mohpK5;s z5Kpy4HuzuRpK%jt01CiNAPuOZt%L7UTx)82m)%5#*Fl-b*Ro3)YFS^TBj6>I4*-o1 ztB;GK8Qm0!Pc)o;FdCxoOGVF`ldkCP2@e7i@zlcC$96bH z)$-T?2Ov2C5%8}JmmL8bf4X``*IOf5iTQrxb;m9Txo_VRwk(!a40F;3i~&i}CW%0P ze?qMcCUfq6O~FY(Xx*&jT334u9kEFdK3Qju?*nsuPnZ(47$}H94(R1cGE#kKq|wp} zjvd4Llt0FF@nWy$DAQnf4lDZqXe|}qhrk5j2IOfC(zu-6QXb@#ej!R%=DRE`n z!@)tN<3ei1jn4s5w?yCt&<_j%s_=vRWMC1`hocm^-QD58OU=F8JX@D}GTT4rq*bpB z*QRB1AExv+u5cW5|MtiJq5G z^Xqu@ajmU`;ry0?e-+9VdWM|59b1Z53gn8N;||?&AM97