From b64a447b125f1bac818b1d123b7442d3559db765 Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 15 Feb 2023 14:55:41 -0500 Subject: [PATCH] Did what I should have done to begin with: changed _mcl_copper_waxed_variant to _mcl_waxed_variant so that it intuitively applies to more than just copper. --- mods/ITEMS/mcl_copper/functions.lua | 4 ++-- mods/ITEMS/mcl_copper/nodes.lua | 16 ++++++++-------- mods/ITEMS/mcl_honey/init.lua | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mods/ITEMS/mcl_copper/functions.lua b/mods/ITEMS/mcl_copper/functions.lua index b28c57644..ab91a5d74 100644 --- a/mods/ITEMS/mcl_copper/functions.lua +++ b/mods/ITEMS/mcl_copper/functions.lua @@ -51,7 +51,7 @@ for i = 1, #stair_oxidization do minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized }) def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. stair_oxidization[i][2] - minetest.override_item(def, { _mcl_copper_waxed_variant = def_variant_waxed }) + minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed }) -- slabs def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1] @@ -59,7 +59,7 @@ for i = 1, #stair_oxidization do minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized }) def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. slab_oxidization[i][1] - minetest.override_item(def, { _mcl_copper_waxed_variant = def_variant_waxed }) + minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed }) end -- Set up scraped variants. diff --git a/mods/ITEMS/mcl_copper/nodes.lua b/mods/ITEMS/mcl_copper/nodes.lua index c6f03c74f..3441422c9 100644 --- a/mods/ITEMS/mcl_copper/nodes.lua +++ b/mods/ITEMS/mcl_copper/nodes.lua @@ -35,7 +35,7 @@ minetest.register_node("mcl_copper:block", { _mcl_blast_resistance = 6, _mcl_hardness = 3, _mcl_oxidized_variant = "mcl_copper:block_exposed", - _mcl_copper_waxed_variant = "mcl_copper:waxed_block", + _mcl_waxed_variant = "mcl_copper:waxed_block", }) minetest.register_node("mcl_copper:waxed_block", { @@ -60,7 +60,7 @@ minetest.register_node("mcl_copper:block_exposed", { _mcl_blast_resistance = 6, _mcl_hardness = 5, _mcl_oxidized_variant = "mcl_copper:block_weathered", - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_exposed", + _mcl_waxed_variant = "mcl_copper:waxed_block_exposed", _mcl_stripped_variant = "mcl_copper:block", }) @@ -86,7 +86,7 @@ minetest.register_node("mcl_copper:block_weathered", { _mcl_blast_resistance = 6, _mcl_hardness = 5, _mcl_oxidized_variant = "mcl_copper:block_oxidized", - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_weathered", + _mcl_waxed_variant = "mcl_copper:waxed_block_weathered", _mcl_stripped_variant = "mcl_copper:block_exposed", }) @@ -111,7 +111,7 @@ minetest.register_node("mcl_copper:block_oxidized", { sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 6, _mcl_hardness = 5, - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_oxidized", + _mcl_waxed_variant = "mcl_copper:waxed_block_oxidized", _mcl_stripped_variant = "mcl_copper:block_weathered", }) @@ -137,7 +137,7 @@ minetest.register_node("mcl_copper:block_cut", { _mcl_blast_resistance = 6, _mcl_hardness = 5, _mcl_oxidized_variant = "mcl_copper:block_cut_exposed", - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_cut", + _mcl_waxed_variant = "mcl_copper:waxed_block_cut", }) minetest.register_node("mcl_copper:waxed_block_cut", { @@ -161,7 +161,7 @@ minetest.register_node("mcl_copper:block_exposed_cut", { sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 6, _mcl_hardness = 5, - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_exposed_cut", + _mcl_waxed_variant = "mcl_copper:waxed_block_exposed_cut", _mcl_oxidized_variant = "mcl_copper:block_cut_weathered", _mcl_stripped_variant = "mcl_copper:block_cut", }) @@ -189,7 +189,7 @@ minetest.register_node("mcl_copper:block_weathered_cut", { _mcl_hardness = 5, _mcl_stripped_variant = "mcl_copper:block_exposed_cut", _mcl_oxidized_variant = "mcl_copper:block_cut_oxidized", - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_weathered_cut", + _mcl_waxed_variant = "mcl_copper:waxed_block_weathered_cut", }) minetest.register_node("mcl_copper:waxed_block_weathered_cut", { @@ -214,7 +214,7 @@ minetest.register_node("mcl_copper:block_oxidized_cut", { _mcl_blast_resistance = 6, _mcl_hardness = 5, _mcl_stripped_variant = "mcl_copper:block_weathered_cut", - _mcl_copper_waxed_variant = "mcl_copper:waxed_block_oxidized_cut", + _mcl_waxed_variant = "mcl_copper:waxed_block_oxidized_cut", }) minetest.register_node("mcl_copper:waxed_block_oxidized_cut", { diff --git a/mods/ITEMS/mcl_honey/init.lua b/mods/ITEMS/mcl_honey/init.lua index e4b403875..7b1719780 100644 --- a/mods/ITEMS/mcl_honey/init.lua +++ b/mods/ITEMS/mcl_honey/init.lua @@ -16,8 +16,8 @@ function mcl_honey.wax_block(pos, node, player, itemstack) local def = minetest.registered_nodes[node.name] - if def and def._mcl_copper_waxed_variant then - node.name = def._mcl_copper_waxed_variant + if def and def._mcl_waxed_variant then + node.name = def._mcl_waxed_variant end minetest.set_node(pos, node)