mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-08-18 21:14:11 +02:00
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.
This commit is contained in:
parent
7311071303
commit
d2edc75407
@ -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 },
|
||||
|
@ -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,
|
||||
})
|
||||
|
@ -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."),
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
Enchanted Golden Apple=Pomme dorée enchantée
|
||||
|
@ -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.
|
||||
|
@ -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.=Ляпис-лазурная руда это руда ляпис-лазури. Она изредка встречается в виде скоплений вблизи дна мира.
|
||||
|
@ -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.=青金石礦是青金石的礦石。在世界底部附近能發現成群的和稀有的青金石礦。
|
||||
|
@ -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=
|
||||
Enchanted Golden Apple=
|
||||
|
@ -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(),
|
||||
|
BIN
mods/ITEMS/mcl_core/textures/mcl_core_lapis.png
Normal file
BIN
mods/ITEMS/mcl_core/textures/mcl_core_lapis.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 169 B |
@ -89,11 +89,11 @@ end
|
||||
|
||||
local lapis_drops = {
|
||||
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" } }
|
||||
}
|
||||
}
|
||||
|
||||
@ -103,7 +103,7 @@ local deepslate_ores = {
|
||||
{ "Gold", "mcl_raw_ores:raw_gold", "mcl_core:gold_ingot", 4, 0 },
|
||||
{ "Emerald", "mcl_core:emerald", "mcl_core:emerald", 4, 6 },
|
||||
{ "Diamond", "mcl_core:diamond", "mcl_core:diamond", 4, 4 },
|
||||
{ "Lapis Lazuli", lapis_drops, "mcl_dye:blue", 3, 6 },
|
||||
{ "Lapis Lazuli", lapis_drops, "mcl_core:lapis", 3, 6 },
|
||||
}
|
||||
|
||||
for _, p in pairs(deepslate_ores) do
|
||||
|
@ -72,7 +72,7 @@ dyelocal.dyes = {
|
||||
{"dark_grey", "dye_dark_grey", S("Grey Dye"), {dye=1, craftitem=1, basecolor_grey=1, excolor_darkgrey=1, unicolor_darkgrey=1}},
|
||||
{"black", "mcl_dye_black", S("Black Dye"), {dye=1, craftitem=1, basecolor_black=1, excolor_black=1, unicolor_black=1}},
|
||||
{"violet", "dye_violet", S("Purple Dye"), {dye=1, craftitem=1, basecolor_magenta=1, excolor_violet=1, unicolor_violet=1}},
|
||||
{"blue", "mcl_dye_blue", S("Lapis Lazuli"), {dye=1, craftitem=1, basecolor_blue=1, excolor_blue=1, unicolor_blue=1}},
|
||||
{"blue", "mcl_dye_blue", S("Blue Dye"), {dye=1, craftitem=1, basecolor_blue=1, excolor_blue=1, unicolor_blue=1}},
|
||||
{"lightblue", "mcl_dye_light_blue", S("Light Blue Dye"), {dye=1, craftitem=1, basecolor_blue=1, excolor_blue=1, unicolor_light_blue=1}},
|
||||
{"cyan", "dye_cyan", S("Cyan Dye"), {dye=1, craftitem=1, basecolor_cyan=1, excolor_cyan=1, unicolor_cyan=1}},
|
||||
{"dark_green", "dye_dark_green", S("Cactus Green"),{dye=1, craftitem=1, basecolor_green=1, excolor_green=1, unicolor_dark_green=1}},
|
||||
@ -512,6 +512,10 @@ minetest.register_craft({
|
||||
output = "mcl_dye:yellow 2",
|
||||
recipe = {{"mcl_flowers:sunflower"}},
|
||||
})
|
||||
minetest.register_craft({
|
||||
output = "mcl_dye:blue",
|
||||
recipe = {{"mcl_core:lapis"}},
|
||||
})
|
||||
minetest.register_craft({
|
||||
output = "mcl_dye:lightblue",
|
||||
recipe = {{"mcl_flowers:blue_orchid"}},
|
||||
@ -581,3 +585,7 @@ minetest.register_craft({
|
||||
output = "mcl_mobitems:ink_sac",
|
||||
recipe = {{"mcl_dye:black"}},
|
||||
})
|
||||
minetest.register_craft({
|
||||
output = "mcl_core:lapis",
|
||||
recipe = {{"mcl_dye:blue"}},
|
||||
})
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=Hellgrauer Farbstoff
|
||||
Grey Dye=Grauer Farbstoff
|
||||
Black Dye=Schwarzer Farbstoff
|
||||
Purple Dye=Violetter Farbstoff
|
||||
Lapis Lazuli=Lapislazuli
|
||||
Blue Dye=Blaue Farbstoff
|
||||
Light Blue Dye=Hellblauer Farbstoff
|
||||
Cyan Dye=Türkiser Farbstoff
|
||||
Cactus Green=Kaktusgrün
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=Tinte gris claro
|
||||
Grey Dye=Tinte gris
|
||||
Black Dye=Tinte negro
|
||||
Purple Dye=Tinte púrpura
|
||||
Lapis Lazuli=Lapislázuli
|
||||
Blue Dye=Tinte azul
|
||||
Light Blue Dye=Tinte azul claro
|
||||
Cyan Dye=Tinte cian
|
||||
Cactus Green=Tinte verde
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=Teinture Gris Clair
|
||||
Grey Dye=Teinture Gris
|
||||
Black Dye=Teinture Noire
|
||||
Purple Dye=Teinture Violette
|
||||
Lapis Lazuli=Lapis Lazuli
|
||||
Blue Dye=Teinture Bleu
|
||||
Light Blue Dye=Teinture Bleu Clair
|
||||
Cyan Dye=Teinture Cyan
|
||||
Cactus Green=Cactus Vert
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=Jasnoszara farba
|
||||
Grey Dye=Szara farba
|
||||
Black Dye=Czarny farba
|
||||
Purple Dye=Fioletowa farba
|
||||
Lapis Lazuli=Lazuryt
|
||||
Blue Dye=Niebieska farba
|
||||
Light Blue Dye=Jasnoniebieska farba
|
||||
Cyan Dye=Błękitna farba
|
||||
Cactus Green=Kaktusowa zieleń
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=Светло-серый краситель
|
||||
Grey Dye=Серый краситель
|
||||
Black Dye=Чёрный краситель
|
||||
Purple Dye=Пурпурный краситель
|
||||
Lapis Lazuli=Ляпис-лазурь
|
||||
Blue Dye=голубой краситель
|
||||
Light Blue Dye=Светло-голубой краситель
|
||||
Cyan Dye=Голубой краситель
|
||||
Cactus Green=Зелень кактуса
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=淺灰色染料
|
||||
Grey Dye=灰色染料
|
||||
Black Dye=黑色染料
|
||||
Purple Dye=紫色染料
|
||||
Lapis Lazuli=青金石
|
||||
Blue Dye=藍色染料
|
||||
Light Blue Dye=淺藍色染料
|
||||
Cyan Dye=青色染料
|
||||
Cactus Green=仙人掌綠
|
||||
|
@ -4,7 +4,7 @@ Light Grey Dye=
|
||||
Grey Dye=
|
||||
Black Dye=
|
||||
Purple Dye=
|
||||
Lapis Lazuli=
|
||||
Blue Dye=
|
||||
Light Blue Dye=
|
||||
Cyan Dye=
|
||||
Cactus Green=
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 193 B |
@ -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
|
||||
|
@ -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 },
|
||||
|
@ -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 },
|
||||
|
Loading…
Reference in New Issue
Block a user