Add first try of code for smithing table (Thanks to Fleckenstein), add _mcl_upgradable and _mcl_upgrade_item to every diamond tool/armor piece
parent
39ce3592e6
commit
180d1f1140
|
@ -81,6 +81,8 @@ minetest.register_tool("mcl_armor:helmet_diamond",{
|
||||||
},
|
},
|
||||||
on_place = armor.on_armor_use,
|
on_place = armor.on_armor_use,
|
||||||
on_secondary_use = armor.on_armor_use,
|
on_secondary_use = armor.on_armor_use,
|
||||||
|
_mcl_upgradeable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_armor:helmet_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_armor:helmet_netherite",{
|
minetest.register_tool("mcl_armor:helmet_netherite",{
|
||||||
|
@ -173,6 +175,8 @@ minetest.register_tool("mcl_armor:chestplate_diamond",{
|
||||||
},
|
},
|
||||||
on_place = armor.on_armor_use,
|
on_place = armor.on_armor_use,
|
||||||
on_secondary_use = armor.on_armor_use,
|
on_secondary_use = armor.on_armor_use,
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgradeitem = "mcl_armor:chestplate_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_armor:chestplate_netherite",{
|
minetest.register_tool("mcl_armor:chestplate_netherite",{
|
||||||
|
@ -265,6 +269,8 @@ minetest.register_tool("mcl_armor:leggings_diamond",{
|
||||||
},
|
},
|
||||||
on_place = armor.on_armor_use,
|
on_place = armor.on_armor_use,
|
||||||
on_secondary_use = armor.on_armor_use,
|
on_secondary_use = armor.on_armor_use,
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_armor:leggings_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_armor:leggings_netherite",{
|
minetest.register_tool("mcl_armor:leggings_netherite",{
|
||||||
|
@ -356,6 +362,8 @@ minetest.register_tool("mcl_armor:boots_diamond",{
|
||||||
},
|
},
|
||||||
on_place = armor.on_armor_use,
|
on_place = armor.on_armor_use,
|
||||||
on_secondary_use = armor.on_armor_use,
|
on_secondary_use = armor.on_armor_use,
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_armor:boots_diamond"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_armor:boots_chain", {
|
minetest.register_tool("mcl_armor:boots_chain", {
|
||||||
|
|
|
@ -256,6 +256,8 @@ minetest.register_tool("mcl_farming:hoe_diamond", {
|
||||||
_mcl_diggroups = {
|
_mcl_diggroups = {
|
||||||
hoey = { speed = 8, level = 5, uses = 1562 }
|
hoey = { speed = 8, level = 5, uses = 1562 }
|
||||||
},
|
},
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_tools:hoe_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
|
|
|
@ -1,41 +1,150 @@
|
||||||
|
--[[
|
||||||
|
By EliasFleckenstein03 and Code-Sploit
|
||||||
|
]]
|
||||||
|
|
||||||
|
--[[
|
||||||
|
Netherite item / node strings
|
||||||
|
|
||||||
|
Nodes:
|
||||||
|
|
||||||
|
Ancient Debris mcl_nether:ancient_debris
|
||||||
|
Netherite Ingot mcl_nether:netherite_ingot
|
||||||
|
Netherite Scrap mcl_nether:netherite_scrap
|
||||||
|
Netherite Block mcl_nether:netheriteblock
|
||||||
|
|
||||||
|
Items:
|
||||||
|
|
||||||
|
Netherite Sword mcl_tools:sword_netherite
|
||||||
|
Netherite Pickaxe mcl_tools:pick_netherite
|
||||||
|
Netherite Axe mcl_tools:axe_netherite
|
||||||
|
Netherite Shovel mcl_tools:shovel_netherite
|
||||||
|
Netherite Hoe mcl_farming:hoe_netherite
|
||||||
|
|
||||||
|
Netherite Helmet mcl_armor:helmet_netherite
|
||||||
|
Netherite Chestplate mcl_armor:chestplate_netherite
|
||||||
|
Netherite Leggings mcl_armor:leggings_netherite
|
||||||
|
Netherite Boots mcl_armor:boots_netherite
|
||||||
|
]]
|
||||||
|
|
||||||
|
local S = minetest.get_translator("mcl_smithing_table")
|
||||||
|
mcl_smithing_table = {}
|
||||||
|
|
||||||
|
-- Function to upgrade diamond tool/armor to netherite tool/armor
|
||||||
|
function mcl_smithing_table.upgrade_item(itemstack)
|
||||||
|
itemstack = ItemStack(itemstack) -- Copy the stack
|
||||||
|
|
||||||
|
local def = itemstack:get_definition()
|
||||||
|
|
||||||
|
if not def or not def._mcl_upgradeable then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local itemname = itemstack:get_name()
|
||||||
|
|
||||||
|
local upgrade_item = def._mcl_upgrade_item or itemname:gsub("diamond", "netherite")
|
||||||
|
|
||||||
|
if upgrade_item == itemname then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
itemstack:set_name(upgrade_item)
|
||||||
|
|
||||||
|
-- Reload the ToolTips of the tool
|
||||||
|
|
||||||
|
tt.reload_itemstack_description(itemstack)
|
||||||
|
|
||||||
|
-- Only return itemstack if upgrade was successfull
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Badly copied over from mcl_anvils
|
||||||
|
|
||||||
local formspec = "size[9,9]" ..
|
local formspec = "size[9,9]" ..
|
||||||
"label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, "Inventory")) .. "]" ..
|
"label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Inventory"))) .. "]" ..
|
||||||
"list[current_player;main;0,4.5;9,3;9]" ..
|
"list[current_player;main;0,4.5;9,3;9]" ..
|
||||||
mcl_formspec.get_itemslot_bg(0,4.5,9,3) ..
|
mcl_formspec.get_itemslot_bg(0,4.5,9,3) ..
|
||||||
"list[current_player;main;0,7.74;9,1;]" ..
|
"list[current_player;main;0,7.74;9,1;]" ..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.74,9,1) ..
|
mcl_formspec.get_itemslot_bg(0,7.74,9,1) ..
|
||||||
"list[context;input;1,2.5;1,1;]" ..
|
"list[context;diamond_item;1,2.5;1,1;]" ..
|
||||||
mcl_formspec.get_itemslot_bg(1,2.5,1,1) ..
|
mcl_formspec.get_itemslot_bg(1,2.5,1,1) ..
|
||||||
"list[context;input;4,2.5;1,1;1]" ..
|
"list[context;netherite;4,2.5;1,1;]" ..
|
||||||
mcl_formspec.get_itemslot_bg(4,2.5,1,1) ..
|
mcl_formspec.get_itemslot_bg(4,2.5,1,1) ..
|
||||||
"list[context;output;8,2.5;1,1;]" ..
|
"list[context;upgraded_item;8,2.5;1,1;]" ..
|
||||||
mcl_formspec.get_itemslot_bg(8,2.5,1,1) ..
|
mcl_formspec.get_itemslot_bg(8,2.5,1,1) ..
|
||||||
"label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, "Upgrade Gear")) .. "]" ..
|
"label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Upgrade Gear"))) .. "]" ..
|
||||||
"button[7,0.7;2,1;name_button;" .. minetest.formspec_escape("Upgrade Gear") .. "]" ..
|
|
||||||
"listring[context;output]"..
|
"listring[context;output]"..
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[context;input]"..
|
"listring[context;input]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
|
|
||||||
|
local function reset_upgraded_item(pos)
|
||||||
|
local inv = minetest.get_meta(pos):get_inventory()
|
||||||
|
local upgraded_item
|
||||||
|
|
||||||
local function upgrade(itemstack)
|
if inv:get_stack("netherite", 1):get_name() == "mcl_nether:netherite_ingot" then
|
||||||
itemstack:set_name(itemstack:get_name():gsub("diamond", "netherite"))
|
upgraded_item = mcl_smithing_table.upgrade_item(inv:get_stack("diamond_item", 1))
|
||||||
|
end
|
||||||
|
|
||||||
|
inv:set_stack("upgraded_item", 1, upgraded_item)
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_node("mcl_smithing_table:table", {
|
minetest.register_node("mcl_smithing_table:table", {
|
||||||
description = "Smithing table",
|
description = S("Smithing table"),
|
||||||
|
-- ToDo: Add _doc_items_longdesc and _doc_items_usagehelp
|
||||||
|
|
||||||
stack_max = 64,
|
stack_max = 64,
|
||||||
groups = {pickaxey = 2, deco_block = true},
|
groups = {pickaxey = 2, deco_block = 1},
|
||||||
|
|
||||||
tiles = {
|
tiles = {
|
||||||
"mcl_smithing_table_top.png", "mcl_smithing_table_front.png", "mcl_smithing_table_side.png",
|
"mcl_smithing_table_top.png", "mcl_smithing_table_front.png", "mcl_smithing_table_side.png",
|
||||||
"mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_side.png",
|
"mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_side.png"
|
||||||
"mcl_smithing_table_side.png", "mcl_smithing_table_side.png", "mcl_smithing_table_bottom.png"
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
sounds = mcl_sounds.node_sound_metal_defaults(),
|
||||||
|
|
||||||
on_construct = function(pos)
|
on_construct = function(pos)
|
||||||
minetest.get_meta(pos):set_string("formspec", formspec)
|
local meta = minetest.get_meta(pos)
|
||||||
|
meta:set_string("formspec", formspec)
|
||||||
|
|
||||||
|
local inv = meta:get_inventory()
|
||||||
|
|
||||||
|
inv:set_size("diamond_item", 1)
|
||||||
|
inv:set_size("netherite", 1)
|
||||||
|
inv:set_size("upgraded_item", 1)
|
||||||
|
end,
|
||||||
|
|
||||||
|
allow_metadata_inventory_put = function(pos, listname, index, stack, player)
|
||||||
|
if listname == "diamond_item" and mcl_smithing_table.upgrade_item(stack) or listname == "netherite" and stack:get_name() == "mcl_nether:netherite_ingot" then
|
||||||
|
return stack:get_count()
|
||||||
|
end
|
||||||
|
|
||||||
|
return 0
|
||||||
|
end,
|
||||||
|
|
||||||
|
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
|
||||||
|
return 0
|
||||||
|
end,
|
||||||
|
|
||||||
|
on_metadata_inventory_put = reset_upgraded_item,
|
||||||
|
|
||||||
|
on_metadata_inventory_take = function(pos, listname, index, stack, player)
|
||||||
|
local inv = minetest.get_meta(pos):get_inventory()
|
||||||
|
|
||||||
|
local function take_item(listname)
|
||||||
|
local itemstack = inv:get_stack(listname, 1)
|
||||||
|
itemstack:take_item()
|
||||||
|
inv:set_stack(listname, 1, itemstack)
|
||||||
|
end
|
||||||
|
|
||||||
|
if listname == "upgraded_item" then
|
||||||
|
take_item("diamond_item")
|
||||||
|
take_item("netherite")
|
||||||
|
|
||||||
|
-- ToDo: make epic sound
|
||||||
|
minetest.sound_play("mcl_smithing_table_upgrade", {pos = pos, max_hear_distance = 16})
|
||||||
|
end
|
||||||
|
|
||||||
|
reset_upgraded_item(pos)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
_mcl_blast_resistance = 2.5,
|
_mcl_blast_resistance = 2.5,
|
||||||
|
|
|
@ -173,6 +173,8 @@ minetest.register_tool("mcl_tools:pick_diamond", {
|
||||||
_mcl_diggroups = {
|
_mcl_diggroups = {
|
||||||
pickaxey = { speed = 8, level = 5, uses = 1562 }
|
pickaxey = { speed = 8, level = 5, uses = 1562 }
|
||||||
},
|
},
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_tools:pick_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_tools:pick_netherite", {
|
minetest.register_tool("mcl_tools:pick_netherite", {
|
||||||
|
@ -370,6 +372,8 @@ minetest.register_tool("mcl_tools:shovel_diamond", {
|
||||||
_mcl_diggroups = {
|
_mcl_diggroups = {
|
||||||
shovely = { speed = 8, level = 5, uses = 1562 }
|
shovely = { speed = 8, level = 5, uses = 1562 }
|
||||||
},
|
},
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_tools:shovel_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_tools:shovel_netherite", {
|
minetest.register_tool("mcl_tools:shovel_netherite", {
|
||||||
|
@ -546,6 +550,8 @@ minetest.register_tool("mcl_tools:axe_diamond", {
|
||||||
_mcl_diggroups = {
|
_mcl_diggroups = {
|
||||||
axey = { speed = 8, level = 5, uses = 1562 }
|
axey = { speed = 8, level = 5, uses = 1562 }
|
||||||
},
|
},
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_tools:axe_netherite"
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_tool("mcl_tools:axe_netherite", {
|
minetest.register_tool("mcl_tools:axe_netherite", {
|
||||||
|
@ -670,6 +676,8 @@ minetest.register_tool("mcl_tools:sword_diamond", {
|
||||||
swordy = { speed = 8, level = 5, uses = 1562 },
|
swordy = { speed = 8, level = 5, uses = 1562 },
|
||||||
swordy_cobweb = { speed = 8, level = 5, uses = 1562 }
|
swordy_cobweb = { speed = 8, level = 5, uses = 1562 }
|
||||||
},
|
},
|
||||||
|
_mcl_upgradable = true,
|
||||||
|
_mcl_upgrade_item = "mcl_tools:sword_netherite"
|
||||||
})
|
})
|
||||||
minetest.register_tool("mcl_tools:sword_netherite", {
|
minetest.register_tool("mcl_tools:sword_netherite", {
|
||||||
description = S("Netherite Sword"),
|
description = S("Netherite Sword"),
|
||||||
|
|
Loading…
Reference in New Issue