code tidy

This commit is contained in:
tenplus1 2021-04-20 10:46:04 +01:00
parent 9b0572ce6c
commit f7cc7bb4ed
2 changed files with 62 additions and 44 deletions

View File

@ -3,7 +3,7 @@
minetest.register_craftitem("pigiron:iron_ingot", { minetest.register_craftitem("pigiron:iron_ingot", {
description = "Iron Ingot", description = "Iron Ingot",
inventory_image = "pigiron_iron_ingot.png", inventory_image = "pigiron_iron_ingot.png"
}) })
-- Remove Iron Lump -> Steel Ingot Recipe -- Remove Iron Lump -> Steel Ingot Recipe
@ -18,7 +18,7 @@ minetest.clear_craft({
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = "pigiron:iron_ingot", output = "pigiron:iron_ingot",
recipe = "default:iron_lump", recipe = "default:iron_lump"
}) })
-- Pig Iron Block -- Pig Iron Block
@ -28,7 +28,7 @@ minetest.register_node("pigiron:iron_block", {
tiles = {"pigiron_iron_block.png"}, tiles = {"pigiron_iron_block.png"},
is_ground_content = false, is_ground_content = false,
groups = {cracky = 1}, groups = {cracky = 1},
sounds = default.node_sound_metal_defaults(), sounds = default.node_sound_metal_defaults()
}) })
minetest.register_craft({ minetest.register_craft({
@ -36,14 +36,14 @@ minetest.register_craft({
recipe = { recipe = {
{"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"}, {"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"},
{"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"}, {"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"},
{"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"}, {"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "pigiron:iron_ingot 9", output = "pigiron:iron_ingot 9",
type = "shapeless", --type = "shapeless",
recipe = {"pigiron:iron_block"} recipe = {{"pigiron:iron_block"}}
}) })
-- Rusted Pig Iron Block -- Rusted Pig Iron Block
@ -53,7 +53,7 @@ minetest.register_node("pigiron:rusted_iron_block", {
tiles = {"pigiron_rusted_iron_block.png"}, tiles = {"pigiron_rusted_iron_block.png"},
is_ground_content = false, is_ground_content = false,
groups = {cracky = 1}, groups = {cracky = 1},
sounds = default.node_sound_metal_defaults(), sounds = default.node_sound_metal_defaults()
}) })
minetest.register_craft({ minetest.register_craft({
@ -61,7 +61,7 @@ minetest.register_craft({
recipe = { recipe = {
{"pigiron:iron_block", "pigiron:iron_block", "pigiron:iron_block"}, {"pigiron:iron_block", "pigiron:iron_block", "pigiron:iron_block"},
{"pigiron:iron_block", "bucket:bucket_water", "pigiron:iron_block"}, {"pigiron:iron_block", "bucket:bucket_water", "pigiron:iron_block"},
{"pigiron:iron_block", "pigiron:iron_block", "pigiron:iron_block"}, {"pigiron:iron_block", "pigiron:iron_block", "pigiron:iron_block"}
}, },
replacements = { replacements = {
{"bucket:bucket_water", "bucket:bucket_empty"} {"bucket:bucket_water", "bucket:bucket_empty"}
@ -84,7 +84,7 @@ if not minetest.get_modpath("ethereal") then
minetest.register_craftitem("pigiron:charcoal_lump", { minetest.register_craftitem("pigiron:charcoal_lump", {
description = "Lump of Charcoal", description = "Lump of Charcoal",
inventory_image = "pigiron_charcoal_lump.png", inventory_image = "pigiron_charcoal_lump.png"
}) })
-- Tree -> Charcoal Recipe -- Tree -> Charcoal Recipe
@ -101,7 +101,7 @@ if not minetest.get_modpath("ethereal") then
minetest.register_craft({ minetest.register_craft({
type = "fuel", type = "fuel",
recipe = "pigiron:charcoal_lump", recipe = "pigiron:charcoal_lump",
burntime = 10, burntime = 10
}) })
-- Charcoal Torch Recipe -- Charcoal Torch Recipe
@ -110,7 +110,7 @@ if not minetest.get_modpath("ethereal") then
output = "default:torch 4", output = "default:torch 4",
recipe = { recipe = {
{"pigiron:charcoal_lump"}, {"pigiron:charcoal_lump"},
{"group:stick"}, {"group:stick"}
} }
}) })
@ -125,15 +125,16 @@ end -- END If Ethereal
minetest.register_craftitem("pigiron:iron_charcoal_mix", { minetest.register_craftitem("pigiron:iron_charcoal_mix", {
description = "Iron and Charcoal Mix", description = "Iron and Charcoal Mix",
inventory_image = "pigiron_iron_ingot.png^pigiron_charcoal_lump.png", inventory_image = "pigiron_iron_ingot.png^pigiron_charcoal_lump.png"
}) })
minetest.register_craft({ minetest.register_craft({
output = "pigiron:iron_charcoal_mix", output = "pigiron:iron_charcoal_mix",
type = "shapeless", --type = "shapeless",
recipe = { recipe = {
"pigiron:iron_ingot", "pigiron:charcoal_lump", {"", "pigiron:charcoal_lump", ""},
"pigiron:charcoal_lump", "pigiron:charcoal_lump" {"pigiron:charcoal_lump", "pigiron:iron_ingot", "pigiron:charcoal_lump"},
{"", "pigiron:charcoal_lump", ""}
} }
}) })
@ -151,8 +152,11 @@ minetest.register_craft({
minetest.register_abm({ minetest.register_abm({
label = "Rust Iron Block", label = "Rust Iron Block",
nodenames = { nodenames = {
"pigiron:iron_block", "stairs:slab_iron_block", "pigiron:iron_block",
"stairs:stair_iron_block" "stairs:slab_iron_block",
"stairs:stair_iron_block",
"stairs:stair_inner_iron_block",
"stairs:stair_outer_iron_block"
}, },
neighbors = {"group:water"}, neighbors = {"group:water"},
interval = 20, interval = 20,
@ -161,14 +165,27 @@ minetest.register_abm({
action = function(pos, node) action = function(pos, node)
if node.name == "pigiron:iron_block" then if node.name == "pigiron:iron_block" then
minetest.set_node(pos, {name = "pigiron:rusted_iron_block"})
minetest.swap_node(pos, {name = "pigiron:rusted_iron_block"})
elseif node.name == "stairs:slab_iron_block" then elseif node.name == "stairs:slab_iron_block" then
minetest.set_node(pos, {name = "stairs:slab_rusted_iron_block",
minetest.swap_node(pos, {name = "stairs:slab_rusted_iron_block",
param2 = node.param2}) param2 = node.param2})
elseif node.name == "stairs:stair_iron_block" then elseif node.name == "stairs:stair_iron_block" then
minetest.set_node(pos, {name = "stairs:stair_rusted_iron_block",
minetest.swap_node(pos, {name = "stairs:stair_rusted_iron_block",
param2 = node.param2})
elseif node.name == "stairs:stair_inner_iron_block" then
minetest.swap_node(pos, {name = "stairs:stair_inner_rusted_iron_block",
param2 = node.param2})
elseif node.name == "stairs:stair_outer_iron_block" then
minetest.swap_node(pos, {name = "stairs:stair_outer_rusted_iron_block",
param2 = node.param2}) param2 = node.param2})
end end
end end

View File

@ -16,7 +16,7 @@ minetest.register_tool("pigiron:pick_iron", {
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 3},
}, },
groups = {pickaxe = 1}, groups = {pickaxe = 1},
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"}
}) })
minetest.register_craft({ minetest.register_craft({
@ -24,7 +24,7 @@ minetest.register_craft({
recipe = { recipe = {
{"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"}, {"pigiron:iron_ingot", "pigiron:iron_ingot", "pigiron:iron_ingot"},
{"", "group:stick", ""}, {"", "group:stick", ""},
{"", "group:stick", ""}, {"", "group:stick", ""}
} }
}) })
@ -46,7 +46,7 @@ minetest.register_tool("pigiron:shovel_iron", {
damage_groups = {fleshy = 2}, damage_groups = {fleshy = 2},
}, },
groups = {shovel = 1}, groups = {shovel = 1},
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"}
}) })
minetest.register_craft({ minetest.register_craft({
@ -54,7 +54,7 @@ minetest.register_craft({
recipe = { recipe = {
{"pigiron:iron_ingot"}, {"pigiron:iron_ingot"},
{"group:stick"}, {"group:stick"},
{"group:stick"}, {"group:stick"}
} }
}) })
@ -75,7 +75,7 @@ minetest.register_tool("pigiron:axe_iron", {
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 3},
}, },
groups = {axe = 1}, groups = {axe = 1},
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"}
}) })
minetest.register_craft({ minetest.register_craft({
@ -83,7 +83,7 @@ minetest.register_craft({
recipe = { recipe = {
{"pigiron:iron_ingot", "pigiron:iron_ingot"}, {"pigiron:iron_ingot", "pigiron:iron_ingot"},
{"pigiron:iron_ingot", "group:stick"}, {"pigiron:iron_ingot", "group:stick"},
{"", "group:stick"}, {"", "group:stick"}
} }
}) })
@ -104,7 +104,7 @@ minetest.register_tool("pigiron:sword_iron", {
damage_groups = {fleshy = 5}, damage_groups = {fleshy = 5},
}, },
groups = {sword = 1}, groups = {sword = 1},
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"}
}) })
minetest.register_craft({ minetest.register_craft({
@ -112,7 +112,7 @@ minetest.register_craft({
recipe = { recipe = {
{"pigiron:iron_ingot"}, {"pigiron:iron_ingot"},
{"pigiron:iron_ingot"}, {"pigiron:iron_ingot"},
{"group:stick"}, {"group:stick"}
} }
}) })
@ -130,6 +130,7 @@ if minetest.get_modpath("farming") then
-- Toolranks support if farming redo active -- Toolranks support if farming redo active
if farming and farming.mod if farming and farming.mod
and minetest.get_modpath("toolranks") then and minetest.get_modpath("toolranks") then
minetest.override_item("farming:hoe_iron", { minetest.override_item("farming:hoe_iron", {
original_description = "Iron Hoe", original_description = "Iron Hoe",
description = toolranks.create_description("Iron Hoe")}) description = toolranks.create_description("Iron Hoe")})
@ -149,8 +150,8 @@ minetest.override_item("default:pick_steel", {
uses = 20, maxlevel = 2 uses = 20, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 4}
}, }
}) })
minetest.override_item("default:pick_bronze", { minetest.override_item("default:pick_bronze", {
@ -163,8 +164,8 @@ minetest.override_item("default:pick_bronze", {
uses = 20, maxlevel = 2 uses = 20, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 4}
}, }
}) })
minetest.override_item("default:shovel_steel", { minetest.override_item("default:shovel_steel", {
@ -177,8 +178,8 @@ minetest.override_item("default:shovel_steel", {
uses = 25, maxlevel = 2 uses = 25, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 3}
}, }
}) })
minetest.override_item("default:shovel_bronze", { minetest.override_item("default:shovel_bronze", {
@ -191,8 +192,8 @@ minetest.override_item("default:shovel_bronze", {
uses = 30, maxlevel = 2 uses = 30, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 3}
}, }
}) })
minetest.override_item("default:axe_steel", { minetest.override_item("default:axe_steel", {
@ -205,8 +206,8 @@ minetest.override_item("default:axe_steel", {
uses = 20, maxlevel = 2 uses = 20, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 4}
}, }
}) })
minetest.override_item("default:axe_bronze", { minetest.override_item("default:axe_bronze", {
@ -219,8 +220,8 @@ minetest.override_item("default:axe_bronze", {
uses = 20, maxlevel = 2 uses = 20, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 4}
}, }
}) })
minetest.override_item("default:sword_steel", { minetest.override_item("default:sword_steel", {
@ -233,8 +234,8 @@ minetest.override_item("default:sword_steel", {
uses = 25, maxlevel = 2 uses = 25, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 6}, damage_groups = {fleshy = 6}
}, }
}) })
minetest.override_item("default:sword_bronze", { minetest.override_item("default:sword_bronze", {
@ -247,8 +248,8 @@ minetest.override_item("default:sword_bronze", {
uses = 30, maxlevel = 2 uses = 30, maxlevel = 2
}, },
}, },
damage_groups = {fleshy = 6}, damage_groups = {fleshy = 6}
}, }
}) })
-- Add [toolranks] mod support if found -- Add [toolranks] mod support if found