From 1e0f7618ba292bdba7dac43839a0157cc9374f5a Mon Sep 17 00:00:00 2001
From: teknomunk <teknomunk@protonmail.com>
Date: Tue, 19 Mar 2024 07:25:04 +0000
Subject: [PATCH] Remove bone meal definition in mcl_dye, make textures in
 mcl_cocoas match master branch

---
 mods/ITEMS/mcl_cocoas/init.lua | 18 --------------
 mods/ITEMS/mcl_dye/init.lua    | 43 ----------------------------------
 2 files changed, 61 deletions(-)

diff --git a/mods/ITEMS/mcl_cocoas/init.lua b/mods/ITEMS/mcl_cocoas/init.lua
index d23c06a7e..91026ce83 100644
--- a/mods/ITEMS/mcl_cocoas/init.lua
+++ b/mods/ITEMS/mcl_cocoas/init.lua
@@ -78,24 +78,14 @@ local podinfo = {
 	{	desc = S("Premature Cocoa Pod"),
 		longdesc = S("Cocoa pods grow on the side of jungle trees in 3 stages."),
 		tiles = {
-			"[combine:16x16:6,1=mcl_cocoas_cocoa_stage_0.png",
-			"[combine:16x16:6,11=mcl_cocoas_cocoa_stage_0.png",
 			"mcl_cocoas_cocoa_stage_0.png",
-			"mcl_cocoas_cocoa_stage_0.png^[transformFX",
-			"[combine:16x16:-5,0=mcl_cocoas_cocoa_stage_0.png",
-			"[combine:16x16:-5,0=mcl_cocoas_cocoa_stage_0.png",
 		},
 		n_box = {-0.125, -0.0625, 0.1875, 0.125, 0.25, 0.4375},
 		s_box = {-0.125, -0.0625, 0.1875, 0.125, 0.5,  0.5   },
 	},
 	{	desc = S("Medium Cocoa Pod"),
 		tiles = {
-			"[combine:16x16:5,1=mcl_cocoas_cocoa_stage_1.png",
-			"[combine:16x16:5,9=mcl_cocoas_cocoa_stage_1.png",
 			"mcl_cocoas_cocoa_stage_1.png",
-			"mcl_cocoas_cocoa_stage_1.png^[transformFX",
-			"[combine:16x16:-4,0=mcl_cocoas_cocoa_stage_1.png",
-			"[combine:16x16:-4,0=mcl_cocoas_cocoa_stage_1.png",
 		},
 		n_box = {-0.1875, -0.1875, 0.0625, 0.1875, 0.25, 0.4375},
 		s_box = {-0.1875, -0.1875, 0.0625, 0.1875, 0.5,  0.5   },
@@ -103,15 +93,7 @@ local podinfo = {
 	{	desc = S("Mature Cocoa Pod"),
 		longdesc = S("A mature cocoa pod grew on a jungle tree to its full size and it is ready to be harvested for cocoa beans. It won't grow any further."),
 		tiles = {
-		-- The following 2 textures were derived from the original
-		-- because the size of the top/bottom is slightly different :-(
-		-- TODO: Find a way to *only* use the base texture
-			"mcl_cocoas_cocoa_top_stage_2.png",
-			"mcl_cocoas_cocoa_top_stage_2.png^[transformFY",
 			"mcl_cocoas_cocoa_stage_2.png",
-			"mcl_cocoas_cocoa_stage_2.png^[transformFX",
-			"[combine:16x16:-3,0=mcl_cocoas_cocoa_stage_2.png",
-			"[combine:16x16:-3,0=mcl_cocoas_cocoa_stage_2.png",
 		},
 		n_box = {-0.25, -0.3125, -0.0625, 0.25, 0.25, 0.4375},
 		s_box = {-0.25, -0.3125, -0.0625, 0.25, 0.5,  0.5   },
diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua
index b8c5dbf26..4836435fc 100644
--- a/mods/ITEMS/mcl_dye/init.lua
+++ b/mods/ITEMS/mcl_dye/init.lua
@@ -128,49 +128,6 @@ function mcl_dye.register_on_bone_meal_apply(func)
 	mcl_bone_meal.register_on_bone_meal_apply(func)
 end
 
--- Bone meal item registration.
---
--- To be moved into its own mod.
---
-minetest.register_craftitem(":mcl_bone_meal:bone_meal", {
-	inventory_image = "mcl_bone_meal_bone_meal.png",
-	description = S("Bone Meal"),
-	_tt_help = S("Speeds up plant growth"),
-	_doc_items_longdesc = S("Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants."),
-	_doc_items_usagehelp = S("Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place."),
-	stack_max = 64,
-	on_place = function(itemstack, user, pointed_thing)
-		-- Use pointed node's on_rightclick function first, if present
-		local node = minetest.get_node(pointed_thing.under)
-		if user and not user:get_player_control().sneak then
-			if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-				return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
-			end
-		end
-
-		-- Use the bone meal on the ground
-		if (apply_bone_meal(pointed_thing, user) and (not minetest.is_creative_enabled(user:get_player_name()))) then
-			itemstack:take_item()
-		end
-		return itemstack
-	end,
-	_on_dispense = function(stack, pos, droppos, dropnode, dropdir)
-		-- Apply bone meal, if possible
-		local pointed_thing
-		if dropnode.name == "air" then
-			pointed_thing = { above = droppos, under = { x=droppos.x, y=droppos.y-1, z=droppos.z } }
-		else
-			pointed_thing = { above = pos, under = droppos }
-		end
-		local success = apply_bone_meal(pointed_thing, nil)
-		if success then
-			stack:take_item()
-		end
-		return stack
-	end,
-	_dispense_into_walkable = true
-})
-
 minetest.register_craft({
 	output = "mcl_bone_meal:bone_meal 3",
 	recipe = {{"mcl_mobitems:bone"}},