From 2ca0e286fe43bd82bc8c635bd49e1bc780b26145 Mon Sep 17 00:00:00 2001
From: Michieal <michieal@apophissoft.com>
Date: Wed, 1 Feb 2023 23:49:04 -0500
Subject: [PATCH] Removed old commented code to prevent accidental re-enabling,
 and put the todo into the correct spot.

---
 mods/ITEMS/mcl_copper/functions.lua | 108 +---------------------------
 mods/ITEMS/mcl_copper/nodes.lua     |   2 -
 2 files changed, 1 insertion(+), 109 deletions(-)

diff --git a/mods/ITEMS/mcl_copper/functions.lua b/mods/ITEMS/mcl_copper/functions.lua
index ccb374214..c7cdb6472 100644
--- a/mods/ITEMS/mcl_copper/functions.lua
+++ b/mods/ITEMS/mcl_copper/functions.lua
@@ -86,107 +86,6 @@ local stairs = {
 	{"stair", "weathered", "", "exposed_cut"},
 }]]
 
---[[
-local function anti_oxidation_particles(pointed_thing)
-	local pos = pointed_thing.under
-	minetest.add_particlespawner({
-		amount = 8,
-		time = 1,
-		minpos = {x = pos.x - 1, y = pos.y - 1, z = pos.z - 1},
-		maxpos = {x = pos.x + 1, y = pos.y + 1, z = pos.z + 1},
-		minvel = {x = 0, y = 0, z = 0},
-		maxvel = {x = 0, y = 0, z = 0},
-		minacc = {x = 0, y = 0, z = 0},
-		maxacc = {x = 0, y = 0, z = 0},
-		minexptime = 0.5,
-		maxexptime = 1,
-		minsize = 1,
-		maxsize = 2.5,
-		collisiondetection = false,
-		vertical = false,
-		texture = "mcl_copper_anti_oxidation_particle.png",
-		glow = 5,
-	})
-end
-
-local function add_wear(placer, itemstack)
-	if not minetest.is_creative_enabled(placer:get_player_name()) then
-		local tool = itemstack:get_name()
-		local wear = mcl_autogroup.get_wear(tool, "axey")
-		itemstack:add_wear(wear)
-	end
-end
-
-local function anti_oxidation(itemstack, placer, pointed_thing)
-    if pointed_thing.type ~= "node" then return end
-
-	local node = minetest.get_node(pointed_thing.under)
-    local noddef = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name]
-
-    if not placer:get_player_control().sneak and noddef.on_rightclick then
-        return minetest.item_place(itemstack, placer, pointed_thing)
-    end
-
-    if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then
-        minetest.record_protection_violation(pointed_thing.under, placer:get_player_name())
-        return itemstack
-    end
-
-    if noddef._mcl_stripped_variant == nil then
-		for _, c in pairs(stairs) do
-			if noddef.name == "mcl_stairs:"..c[1].."_copper_"..c[2].."_cut"..c[3] then
-				minetest.swap_node(pointed_thing.under, {name="mcl_stairs:"..c[1].."_copper_"..c[4], param2=node.param2})
-				anti_oxidation_particles(pointed_thing)
-				add_wear(placer, itemstack)
-			end
-		end
-		if noddef._mcl_anti_oxidation_variant ~= nil then
-			minetest.swap_node(pointed_thing.under, {name=noddef._mcl_anti_oxidation_variant, param2=node.param2})
-			anti_oxidation_particles(pointed_thing)
-			add_wear(placer, itemstack)
-		end
-	elseif noddef._mcl_stripped_variant ~= nil then
-		minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_variant, param2=node.param2})
-		add_wear(placer, itemstack)
-	else
-		return itemstack
-	end
-    return itemstack
-end
-
-local function register_axe_override(axe_name)
-	minetest.override_item("mcl_tools:axe_"..axe_name, {
-		on_place = anti_oxidation,
-	})
-end]]
-
---[[ Commented out for now because there the discussion how to handle this is ongoing
-local stonelike = {"mcl_core:stone", "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite"}
-if not deepslate_mod then
-	if minetest.settings:get_bool("mcl_generate_ores", true) then
-		minetest.register_ore({
-			ore_type       = "scatter",
-			ore            = "mcl_copper:stone_with_copper",
-			wherein        = stonelike,
-			clust_scarcity = 830,
-			clust_num_ores = 5,
-			clust_size     = 3,
-			y_min          = mcl_vars.mg_overworld_min,
-			y_max          = mcl_worlds.layer_to_y(39),
-		})
-		minetest.register_ore({
-			ore_type       = "scatter",
-			ore            = "mcl_copper:stone_with_copper",
-			wherein        = stonelike,
-			clust_scarcity = 1660,
-			clust_num_ores = 4,
-			clust_size     = 2,
-			y_min          = mcl_worlds.layer_to_y(40),
-			y_max          = mcl_worlds.layer_to_y(63),
-		})
-	end
-end
---]]
 local block_oxidation = {
 	{ "", "_exposed" },
 	{ "_cut", "_exposed_cut" },
@@ -223,11 +122,6 @@ end
 
 for _, s in pairs(stair_oxidation) do
 	register_oxidation_abm("Copper oxidation", "mcl_stairs:" .. s[1] .. "_copper_" .. s[2], "mcl_stairs:" .. s[1] .. "_copper_" .. s[3])
+	-- TODO: Make stairs and slabs be waxable / scrapable. Place the Node overrides here, just like they are on the copper nodes, and it will work properly. May need to update mcl_honey to call the waxing function for stairs and slabs.
 end
 
---local axes = {"wood", "stone", "iron", "gold", "diamond"}
---[[
-for _, axe in pairs(axes) do
-	register_axe_override(axe)
-end
-]]
diff --git a/mods/ITEMS/mcl_copper/nodes.lua b/mods/ITEMS/mcl_copper/nodes.lua
index c0246de41..ca3f563cf 100644
--- a/mods/ITEMS/mcl_copper/nodes.lua
+++ b/mods/ITEMS/mcl_copper/nodes.lua
@@ -350,5 +350,3 @@ mcl_stairs.register_stair("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_o
 	S("Waxed Stairs of Oxidized Cut Copper"),
 	nil, 6, nil,
 	"woodlike")
-
--- TODO: Make stairs and slabs be waxable / scrapable.