From d2edc75407ba18c3648b33adbc9f95f23fffeb2e Mon Sep 17 00:00:00 2001 From: kabou Date: Thu, 22 Dec 2022 18:10:59 +0100 Subject: [PATCH] Separate blue dye from lapis lazuli. * Add craftitem "mcl_core:lapis". * Add texture for blue dye item. * Add crafting recipe for blue dye. * Add legacy conversion recipe. * Update dyes table. * Update translations. * Update lapis block crafting recipes. * Update lapis ore drops. * Update dungeon and shipwreck loot. * Update enchanting table input. * Update villager trade. --- mods/ENTITIES/mobs_mc/villager.lua | 2 +- mods/ITEMS/mcl_core/crafting.lua | 10 +++++----- mods/ITEMS/mcl_core/craftitems.lua | 8 ++++++++ mods/ITEMS/mcl_core/locale/mcl_core.de.tr | 2 ++ mods/ITEMS/mcl_core/locale/mcl_core.es.tr | 2 ++ mods/ITEMS/mcl_core/locale/mcl_core.fr.tr | 4 +++- mods/ITEMS/mcl_core/locale/mcl_core.pl.tr | 2 ++ mods/ITEMS/mcl_core/locale/mcl_core.ru.tr | 2 ++ mods/ITEMS/mcl_core/locale/mcl_core.zh_TW.tr | 2 ++ mods/ITEMS/mcl_core/locale/template.txt | 4 +++- mods/ITEMS/mcl_core/nodes_base.lua | 10 +++++----- mods/ITEMS/mcl_core/textures/mcl_core_lapis.png | Bin 0 -> 169 bytes mods/ITEMS/mcl_deepslate/init.lua | 12 ++++++------ mods/ITEMS/mcl_dye/init.lua | 10 +++++++++- mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr | 2 +- mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr | 2 +- mods/ITEMS/mcl_dye/locale/template.txt | 2 +- mods/ITEMS/mcl_dye/textures/mcl_dye_blue.png | Bin 169 -> 193 bytes mods/ITEMS/mcl_enchanting/engine.lua | 8 ++++---- mods/MAPGEN/mcl_structures/shipwrecks.lua | 2 +- mods/MAPGEN/tsm_railcorridors/gameconfig.lua | 2 +- 25 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_lapis.png diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index bf2a07d51..9215416b8 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -479,7 +479,7 @@ local professions = { }, { { { "mcl_core:gold_ingot", 3, 3 }, E1 }, - { E1, { "mcl_dye:blue", 1, 1 } }, + { E1, { "mcl_core:lapis", 1, 1 } }, }, { { { "mcl_mobitems:rabbit_foot", 2, 2 }, E1 }, diff --git a/mods/ITEMS/mcl_core/crafting.lua b/mods/ITEMS/mcl_core/crafting.lua index df456cbdc..c98f0969a 100644 --- a/mods/ITEMS/mcl_core/crafting.lua +++ b/mods/ITEMS/mcl_core/crafting.lua @@ -298,14 +298,14 @@ minetest.register_craft({ minetest.register_craft({ output = "mcl_core:lapisblock", recipe = { - {"mcl_dye:blue", "mcl_dye:blue", "mcl_dye:blue"}, - {"mcl_dye:blue", "mcl_dye:blue", "mcl_dye:blue"}, - {"mcl_dye:blue", "mcl_dye:blue", "mcl_dye:blue"}, + {"mcl_core:lapis", "mcl_core:lapis", "mcl_core:lapis"}, + {"mcl_core:lapis", "mcl_core:lapis", "mcl_core:lapis"}, + {"mcl_core:lapis", "mcl_core:lapis", "mcl_core:lapis"}, } }) minetest.register_craft({ - output = "mcl_dye:blue 9", + output = "mcl_core:lapis 9", recipe = { {"mcl_core:lapisblock"}, } @@ -482,7 +482,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", - output = "mcl_dye:blue", + output = "mcl_core:lapis", recipe = "mcl_core:stone_with_lapis", cooktime = 10, }) diff --git a/mods/ITEMS/mcl_core/craftitems.lua b/mods/ITEMS/mcl_core/craftitems.lua index 94575baca..32a5f7cbc 100644 --- a/mods/ITEMS/mcl_core/craftitems.lua +++ b/mods/ITEMS/mcl_core/craftitems.lua @@ -101,6 +101,14 @@ minetest.register_craftitem("mcl_core:emerald", { groups = { craftitem=1 }, }) +minetest.register_craftitem("mcl_core:lapis", { + description = S("Lapis Lazuli"), + _doc_items_longdesc = S("Lapis Lazuli are required for enchanting items on an enchanting table."), + inventory_image = "mcl_core_lapis.png", + stack_max = 64, + groups = { craftitem=1 }, +}) + minetest.register_craftitem("mcl_core:brick", { description = S("Brick"), _doc_items_longdesc = S("Bricks are used to craft brick blocks."), diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr index b064cebbe..f8a441fdc 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.de.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.de.tr @@ -130,6 +130,8 @@ Jungle Wood=Dschungelholz Jungle Wood Planks=Dschungelholzplanken Jungle leaves are grown from jungle trees.=Dschungelblätter wachsen an Dschungelbäumen. Ladder=Leiter +Lapis Lazuli=Lapislazuli +Lapis Lazuli are required for enchanting items on an enchanting table.=Lapislazuli werden zum Verzaubern von Gegenständen auf einem Zaubertisch benötigt. Lapis Lazuli Block=Lapislazuliblock Lapis Lazuli Ore=Lapislazulierz Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Lapislazulierz ist das Erz von Lapislazuli. Es kann relativ selten in Ansammlungen in der Nähe des Weltbodens gefunden werden. diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr index 1937babd3..0f8656520 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.es.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.es.tr @@ -130,6 +130,8 @@ Jungle Wood=Tronco de jungla Jungle Wood Planks=Madera de jungla Jungle leaves are grown from jungle trees.=Las hojas de jungla se cultivan de los árboles de jungla. Ladder=Escalera +Lapis Lazuli=Lapislázuli +Lapis Lazuli are required for enchanting items on an enchanting table.=Los lapislázuli son necesarios para encantar objetos en una mesa de encantamiento. Lapis Lazuli Block=Bloque de lapislázuli Lapis Lazuli Ore=Mena de lapislázuli Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=El mineral de lapislázuli es el mineral de lapislázuli. Rara vez se puede encontrar en grupos, se encuentra cerca del fondo del mundo. diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr index b48f9310f..ad6c09b08 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.fr.tr @@ -130,6 +130,8 @@ Jungle Wood=Bûche d'Acajou Jungle Wood Planks=Planches d'Acajou Jungle leaves are grown from jungle trees.=Les feuilles d'Acajou sont cultivées à partir d'arbres d'Acajou. Ladder=Échelle +Lapis Lazuli=Lapis Lazuli +Lapis Lazuli are required for enchanting items on an enchanting table.=Les lapis-lazuli sont nécessaires pour enchanter des objets sur une table d'enchantement. Lapis Lazuli Block=Bloc de Lapis-Lazuli Lapis Lazuli Ore=Minerai de Lapis-Lazuli Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Le minerai de lapis-lazuli produit du lapis-lazuli. Il peut être rarement trouvé dans des filons près du fond du monde. @@ -283,4 +285,4 @@ Grows on sand or dirt next to water=Pousse sur le sable ou la terre près de l'e Stackable=Empilable Crying Obsidian=Obsidienne pleureuse Crying obsidian is a luminous obsidian that can generate as part of ruined portals.=L'obsidienne pleureuse est une obsidienne luminause qui peut être générée dans les portails en ruine. -Enchanted Golden Apple=Pomme dorée enchantée \ No newline at end of file +Enchanted Golden Apple=Pomme dorée enchantée diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr index 68dfbd3d0..8e9d7cf8f 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.pl.tr @@ -130,6 +130,8 @@ Jungle Wood=Tropikalne drewno Jungle Wood Planks=Tropikalne deski Jungle leaves are grown from jungle trees.=Tropikalne liście rosną na tropikalnych drzewach. Ladder=Drabina +Lapis Lazuli=Lazuryt +Lapis Lazuli are required for enchanting items on an enchanting table.=Lapis Lazuli są wymagane do zaklinania przedmiotów na zaklinającym stole. Lapis Lazuli Block=Blok lazurytu Lapis Lazuli Ore=Ruda lazurytu Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Ruda lazurytu jest rzadko występującym blokiem, który można znaleźć w grupach przy dnie świata. diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr index 2d5b5462c..831795792 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.ru.tr @@ -130,6 +130,8 @@ Jungle Wood=Дерево джунглей Jungle Wood Planks=Доски из дерева джунглей Jungle leaves are grown from jungle trees.=Листва дерева джунглей произрастает на деревьях джунглей. Ladder=Лестница +Lapis Lazuli=Ляпис-лазурь +Lapis Lazuli are required for enchanting items on an enchanting table.=Лазурит требуется для зачарования предметов на столе зачаровывания. Lapis Lazuli Block=Ляпис-лазурный блок Lapis Lazuli Ore=Ляпис-лазурная руда Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Ляпис-лазурная руда это руда ляпис-лазури. Она изредка встречается в виде скоплений вблизи дна мира. diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.zh_TW.tr b/mods/ITEMS/mcl_core/locale/mcl_core.zh_TW.tr index 177341846..0e8280c6e 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.zh_TW.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.zh_TW.tr @@ -129,6 +129,8 @@ Jungle Wood=叢林原木 Jungle Wood Planks=叢林木材 Jungle leaves are grown from jungle trees.=叢林樹葉是由叢林樹生長出來的。 Ladder=梯子 +Lapis Lazuli=青金石 +Lapis Lazuli are required for enchanting items on an enchanting table.=为附魔台上的物品附魔需要青金石。 Lapis Lazuli Block=青金石磚 Lapis Lazuli Ore=青金石礦 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=青金石礦是青金石的礦石。在世界底部附近能發現成群的和稀有的青金石礦。 diff --git a/mods/ITEMS/mcl_core/locale/template.txt b/mods/ITEMS/mcl_core/locale/template.txt index cd4b9b463..a7798b9cd 100644 --- a/mods/ITEMS/mcl_core/locale/template.txt +++ b/mods/ITEMS/mcl_core/locale/template.txt @@ -130,6 +130,8 @@ Jungle Wood= Jungle Wood Planks= Jungle leaves are grown from jungle trees.= Ladder= +Lapis Lazuli= +Lapis Lazuli are required for enchanting items on an enchanting table.= Lapis Lazuli Block= Lapis Lazuli Ore= Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.= @@ -283,4 +285,4 @@ Grows on sand or dirt next to water= Stackable= Crying Obsidian= Crying obsidian is a luminous obsidian that can generate as part of ruined portals.= -Enchanted Golden Apple= \ No newline at end of file +Enchanted Golden Apple= diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index 22ea20b77..476bdf9ce 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -187,11 +187,11 @@ minetest.register_node("mcl_core:stone_with_lapis", { drop = { max_items = 1, items = { - {items = {"mcl_dye:blue 8"},rarity = 5}, - {items = {"mcl_dye:blue 7"},rarity = 5}, - {items = {"mcl_dye:blue 6"},rarity = 5}, - {items = {"mcl_dye:blue 5"},rarity = 5}, - {items = {"mcl_dye:blue 4"}}, + {items = {"mcl_core:lapis 8"},rarity = 5}, + {items = {"mcl_core:lapis 7"},rarity = 5}, + {items = {"mcl_core:lapis 6"},rarity = 5}, + {items = {"mcl_core:lapis 5"},rarity = 5}, + {items = {"mcl_core:lapis 4"}}, } }, sounds = mcl_sounds.node_sound_stone_defaults(), diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_lapis.png b/mods/ITEMS/mcl_core/textures/mcl_core_lapis.png new file mode 100644 index 0000000000000000000000000000000000000000..e0e3023075fce96f8d13cdc4fd89f75fc2356b8a GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=8gu#sB~RSC3p8(R9E% zdrQlb%L=ZuWo$YNZf`vXlx8jo@(Tvizsio>15#F=E{-7;jL8WCEevd`izE)|H7!eM z%j`;+q1X|a^D0M(BWcU_B_`rcqTOuHBHbjs_fD9Jpj3Pk?5W~qx z&?NxKaCUKV2?a5X1eHu&L7JQdg-k+03}!`T*8s4A&aR0f0> z?g1$)PZ!6K3dZCFfffcf)kPAA^qQ6>v}JZB%uwtI%z2d~#F4aR`w|oJCedy-XOZp} jb0>*MjV!)x46F=VTlm}EC0;iGO=0kK^>bP0l+XkKpja?c diff --git a/mods/ITEMS/mcl_enchanting/engine.lua b/mods/ITEMS/mcl_enchanting/engine.lua index 46a05abf9..fa6dea353 100644 --- a/mods/ITEMS/mcl_enchanting/engine.lua +++ b/mods/ITEMS/mcl_enchanting/engine.lua @@ -520,7 +520,7 @@ function mcl_enchanting.show_enchanting_formspec(player) local table_slots = mcl_enchanting.get_table_slots(player, itemstack, num_bookshelves) for i, slot in ipairs(table_slots) do any_enchantment = any_enchantment or slot - local enough_lapis = inv:contains_item("enchanting_lapis", ItemStack({name = "mcl_dye:blue", count = i})) + local enough_lapis = inv:contains_item("enchanting_lapis", ItemStack({name = "mcl_core:lapis", count = i})) local enough_levels = slot and slot.level_requirement <= player_levels local can_enchant = (slot and enough_lapis and enough_levels) local ending = (can_enchant and "" or "_off") @@ -555,7 +555,7 @@ function mcl_enchanting.handle_formspec_fields(player, formname, fields) local meta = player:get_meta() local num_bookshelfes = meta:get_int("mcl_enchanting:num_bookshelves") local itemstack = inv:get_stack("enchanting_item", 1) - local cost = ItemStack({name = "mcl_dye:blue", count = button_pressed}) + local cost = ItemStack({name = "mcl_core:lapis", count = button_pressed}) if not inv:contains_item("enchanting_lapis", cost) then return end @@ -608,7 +608,7 @@ function mcl_enchanting.allow_inventory_action(player, action, inventory, invent if action == "move" then local listname = inventory_info.to_list local stack = inventory:get_stack(inventory_info.from_list, inventory_info.from_index) - if stack:get_name() == "mcl_dye:blue" and listname ~= "enchanting_item" then + if stack:get_name() == "mcl_core:lapis" and listname ~= "enchanting_item" then local count = stack:get_count() local old_stack = inventory:get_stack("enchanting_lapis", 1) if old_stack:get_name() ~= "" then @@ -631,7 +631,7 @@ function mcl_enchanting.on_inventory_action(player, action, inventory, inventory if action == "move" and inventory_info.to_list == "enchanting" then local stack = inventory:get_stack("enchanting", 1) local result_list - if stack:get_name() == "mcl_dye:blue" then + if stack:get_name() == "mcl_core:lapis" then result_list = "enchanting_lapis" stack:add_item(inventory:get_stack("enchanting_lapis", 1)) else diff --git a/mods/MAPGEN/mcl_structures/shipwrecks.lua b/mods/MAPGEN/mcl_structures/shipwrecks.lua index 38f790cb6..a9c48e0b5 100644 --- a/mods/MAPGEN/mcl_structures/shipwrecks.lua +++ b/mods/MAPGEN/mcl_structures/shipwrecks.lua @@ -149,7 +149,7 @@ mcl_structures.register_structure("shipwreck",{ { itemstring = "mcl_core:iron_ingot", weight = 90, amount_min = 1, amount_max = 5 }, { itemstring = "mcl_core:iron_nugget", weight = 50, amount_min = 1, amount_max = 10 }, { itemstring = "mcl_core:emerald", weight = 40, amount_min = 1, amount_max = 5 }, - { itemstring = "mcl_dye:blue", weight = 20, amount_min = 1, amount_max = 10 }, + { itemstring = "mcl_core:lapis", weight = 20, amount_min = 1, amount_max = 10 }, { itemstring = "mcl_core:gold_ingot", weight = 10, amount_min = 1, amount_max = 5 }, { itemstring = "mcl_core:gold_nugget", weight = 10, amount_min = 1, amount_max = 10 }, { itemstring = "mcl_experience:bottle", weight = 5, amount_min = 1, amount_max = 1 }, diff --git a/mods/MAPGEN/tsm_railcorridors/gameconfig.lua b/mods/MAPGEN/tsm_railcorridors/gameconfig.lua index 3ada3052f..4a27586a2 100644 --- a/mods/MAPGEN/tsm_railcorridors/gameconfig.lua +++ b/mods/MAPGEN/tsm_railcorridors/gameconfig.lua @@ -92,7 +92,7 @@ function tsm_railcorridors.get_treasures(pr) { itemstring = "mcl_farming:melon_seeds", weight = 10, amount_min = 2, amount_max = 4 }, { itemstring = "mcl_farming:pumpkin_seeds", weight = 10, amount_min = 2, amount_max = 4 }, { itemstring = "mcl_core:iron_ingot", weight = 10, amount_min = 1, amount_max = 5 }, - { itemstring = "mcl_dye:blue", weight = 5, amount_min = 4, amount_max = 9 }, + { itemstring = "mcl_core:lapis", weight = 5, amount_min = 4, amount_max = 9 }, { itemstring = "mesecons:redstone", weight = 5, amount_min = 4, amount_max = 9 }, { itemstring = "mcl_core:gold_ingot", weight = 5, amount_min = 1, amount_max = 3 }, { itemstring = "mcl_core:diamond", weight = 3, amount_min = 1, amount_max = 2 },