Rename textures that clash with MTG

cactus, hotbar, some wools

mods/HUD/mcl_inventory/init.lua

@@ -135,8 +135,8 @@ minetest.register_on_joinplayer(function(player)
 	--set hotbar size
 	player:hud_set_hotbar_itemcount(9)
 	--add hotbar images
-	player:hud_set_hotbar_image("gui_hotbar.png")
- 	player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
+	player:hud_set_hotbar_image("mcl_inventory_hotbar.png")
+	player:hud_set_hotbar_selected_image("mcl_inventory_hotbar_selected.png")
 
 	if show_armor then
 		local set_player_armor_original = armor.set_player_armor

mods/ITEMS/mcl_core/nodes_cactuscane.lua

@@ -5,7 +5,7 @@ minetest.register_node("mcl_core:cactus", {
 	_doc_items_longdesc = "This is a piece of cactus commonly found in dry areas, especially deserts. Over time, cacti will grow up to 3 blocks high on sand or red sand. A cactus hurts living beings touching it with a damage of 1 HP every half second. When a cactus block is broken, all cactus blocks connected above it will break as well.",
 	_doc_items_usagehelp = "A cactus can only be placed on top of another cactus or any sand.",
 	drawtype = "nodebox",
-	tiles = {"default_cactus_top.png", "mcl_core_cactus_bottom.png", "default_cactus_side.png","default_cactus_side.png","default_cactus_side.png","default_cactus_side.png"},
+	tiles = {"mcl_core_cactus_top.png", "mcl_core_cactus_bottom.png", "mcl_core_cactus_side.png"},
 	is_ground_content = true,
 	stack_max = 64,
 	groups = {handy=1, attached_node=1, plant=1, deco_block=1, dig_by_piston=1, enderman_takable=1},

mods/ITEMS/mcl_wool/init.lua

@@ -9,49 +9,51 @@ local wool = {}
 -- colors, and then some recipes using more specific colors for a few non-base
 -- colors available. When crafting, the last recipes will be checked first.
 wool.dyes = {
-	{"white",      "white",		"White",      nil,		"basecolor_white"},
-	{"grey",       "dark_grey",	"Grey",       "dark_grey",	"unicolor_darkgrey"},
-	{"silver",     "grey",		"Light Grey", "grey",		"basecolor_grey"},
-	{"black",      "black",		"Black",      "black",		"basecolor_black"},
-	{"red",        "red",		"Red",        "red",		"basecolor_red"},
-	{"yellow",     "yellow",	"Yellow",     "yellow",		"basecolor_yellow"},
-	{"green",      "green",		"Green",      "dark_green",	"unicolor_dark_green"},
-	{"cyan",       "cyan",		"Cyan",       "cyan",		"basecolor_cyan"},
-	{"blue",       "blue",		"Blue",       "blue",		"basecolor_blue"},
-	{"magenta",    "magenta",	"Magenta",    "magenta",	"basecolor_magenta"},
-	{"orange",     "orange",	"Orange",     "orange",		"excolor_orange"},
-	{"purple",     "violet",	"Purple",     "violet",		"excolor_violet"},
-	{"brown",      "brown",		"Brown",      "brown",		"unicolor_dark_orange"},
-	{"pink",       "pink",		"Pink",       "pink",		"unicolor_light_red"},
-	{"lime",       "lime",		"Lime",       "green",		"basecolor_green"},
-	{"light_blue", "light_blue",	"Light Blue", "lightblue",	"unicolor_light_blue"},
+	-- name,       texture,               wool desc.,        carpet desc.,        dye,          color_group
+	{"white",      "wool_white",          "White Wool",      "White Carpet",      nil,          "basecolor_white"},
+	{"grey",       "wool_dark_grey",      "Grey Wool",       "Grey Carpet",       "dark_grey",  "unicolor_darkgrey"},
+	{"silver",     "wool_grey",           "Light Grey Wool", "Light Grey Carpet", "grey",       "basecolor_grey"},
+	{"black",      "wool_black",          "Black Wool",      "Black Carpet",      "black",      "basecolor_black"},
+	{"red",        "wool_red",            "Red Wool",        "Red Carpet",        "red",        "basecolor_red"},
+	{"yellow",     "wool_yellow",         "Yellow Wool",     "Yellow Carpet",     "yellow",     "basecolor_yellow"},
+	{"green",      "wool_dark_green",     "Green Wool",      "Green Carpet",      "dark_green", "unicolor_dark_green"},
+	{"cyan",       "wool_cyan",           "Cyan Wool",       "Cyan Carpet",       "cyan",       "basecolor_cyan"},
+	{"blue",       "wool_blue",           "Blue Wool",       "Blue Carpet",       "blue",       "basecolor_blue"},
+	{"magenta",    "wool_magenta",        "Magenta Wool",    "Magenta Carpet",    "magenta",    "basecolor_magenta"},
+	{"orange",     "wool_orange",         "Orange Wool",     "Orange Carpet",     "orange",     "excolor_orange"},
+	{"purple",     "wool_violet",         "Purple Wool",     "Purple Carpet",     "violet",     "excolor_violet"},
+	{"brown",      "wool_brown",          "Brown Wool",      "Brown Carpet",      "brown",      "unicolor_dark_orange"},
+	{"pink",       "wool_pink",           "Pink Wool",       "Pink Carpet",       "pink",       "unicolor_light_red"},
+	{"lime",       "mcl_wool_lime",       "Lime Wool",       "Lime Carpet",       "green",      "basecolor_green"},
+	{"light_blue", "mcl_wool_light_blue", "Light Blue Wool", "Light Blue Carpet", "lightblue",  "unicolor_light_blue"},
 }
 
 for _, row in ipairs(wool.dyes) do
 	local name = row[1]
 	local texture = row[2]
-	local desc = row[3]
-	local dye = row[4]
-	local color_group = row[5]
+	local desc_wool = row[3]
+	local desc_carpet = row[4]
+	local dye = row[5]
+	local color_group = row[6]
 	-- Node Definition
 		minetest.register_node("mcl_wool:"..name, {
-			description = desc.." Wool",
+			description = desc_wool,
 			_doc_items_longdesc = "Wool is a decorational block which comes in many different colors.",
 			stack_max = 64,
 			is_ground_content = false,
-			tiles = {"wool_"..texture..".png"},
+			tiles = {texture..".png"},
 			groups = {handy=1,shearsy_wool=1, flammable=1,wool=1,building_block=1},
 			sounds = mcl_sounds.node_sound_defaults(),
 			_mcl_hardness = 0.8,
 			_mcl_blast_resistance = 4,
 		})
 		minetest.register_node("mcl_wool:"..name.."_carpet", {
-			description = desc.." Carpet",
+			description = desc_carpet,
 			_doc_items_longdesc = "Carpets are thin floor covers which come in many different colors.",
 			walkable = false, -- See <https://minecraft.gamepedia.com/Materials>
 			is_ground_content = false,
-			tiles = {"wool_"..texture..".png"},
-			wield_image = "wool_"..texture..".png",
+			tiles = {texture..".png"},
+			wield_image = texture..".png",
 			wield_scale = { x=1, y=1, z=0.5 },
 			groups = {handy=1, carpet=1,attached_node=1,dig_by_water=1,deco_block=1},
 			sounds = mcl_sounds.node_sound_defaults(),

tools/Conversion_Table.csv

@@ -127,8 +127,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/items,apple.png,/mods/ITEMS/mcl_core/textures,default_apple.png,,,,,,,
 /assets/minecraft/textures/items,apple_golden.png,/mods/ITEMS/mcl_core/textures,mcl_core_apple_golden.png,,,,,,,
 /assets/minecraft/textures/blocks,brick.png,/mods/ITEMS/mcl_core/textures,default_brick.png,,,,,,,
-/assets/minecraft/textures/blocks,cactus_side.png,/mods/ITEMS/mcl_core/textures,default_cactus_side.png,,,,,,,
-/assets/minecraft/textures/blocks,cactus_top.png,/mods/ITEMS/mcl_core/textures,default_cactus_top.png,,,,,,,
+/assets/minecraft/textures/blocks,cactus_side.png,/mods/ITEMS/mcl_core/textures,mcl_core_cactus_side.png,,,,,,,
+/assets/minecraft/textures/blocks,cactus_top.png,/mods/ITEMS/mcl_core/textures,mcl_core_cactus_top.png,,,,,,,
 /assets/minecraft/textures/blocks,cactus_bottom.png,/mods/ITEMS/mcl_core/textures,mcl_core_cactus_bottom.png,,,,,,,
 /assets/minecraft/textures/items,brick.png,/mods/ITEMS/mcl_core/textures,default_clay_brick.png,,,,,,,
 /assets/minecraft/textures/items,clay_ball.png,/mods/ITEMS/mcl_core/textures,default_clay_lump.png,,,,,,,
@@ -578,10 +578,10 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,wool_colored_brown.png,/mods/ITEMS/mcl_wool/textures,wool_brown.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_cyan.png,/mods/ITEMS/mcl_wool/textures,wool_cyan.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_gray.png,/mods/ITEMS/mcl_wool/textures,wool_dark_grey.png,,,,,,,
-/assets/minecraft/textures/blocks,wool_colored_green.png,/mods/ITEMS/mcl_wool/textures,wool_green.png,,,,,,,
+/assets/minecraft/textures/blocks,wool_colored_green.png,/mods/ITEMS/mcl_wool/textures,wool_dark_green.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_silver.png,/mods/ITEMS/mcl_wool/textures,wool_grey.png,,,,,,,
-/assets/minecraft/textures/blocks,wool_colored_light_blue.png,/mods/ITEMS/mcl_wool/textures,wool_light_blue.png,,,,,,,
-/assets/minecraft/textures/blocks,wool_colored_lime.png,/mods/ITEMS/mcl_wool/textures,wool_lime.png,,,,,,,
+/assets/minecraft/textures/blocks,wool_colored_light_blue.png,/mods/ITEMS/mcl_wool/textures,mcl_wool_light_blue.png,,,,,,,
+/assets/minecraft/textures/blocks,wool_colored_lime.png,/mods/ITEMS/mcl_wool/textures,mcl_wool_lime.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_magenta.png,/mods/ITEMS/mcl_wool/textures,wool_magenta.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_orange.png,/mods/ITEMS/mcl_wool/textures,wool_orange.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_pink.png,/mods/ITEMS/mcl_wool/textures,wool_pink.png,,,,,,,
@@ -795,8 +795,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,shulker_top_yellow.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_yellow_shulker_box_top.png,,,,,,,y
 /assets/minecraft/textures/items,flower_pot.png,/mods/ITEMS/mcl_flowerpots/textures,mcl_flowerpots_flowerpot_inventory.png,,,,,,,
 /assets/minecraft/textures/blocks,flower_pot.png,/mods/ITEMS/mcl_flowerpots/textures,mcl_flowerpots_flowerpot.png,,,,,,,y
-/assets/minecraft/textures/gui,widgets.png,/mods/HUD/mcl_inventory/textures,gui_hotbar.png,0,0,182,22,0,0,y
-/assets/minecraft/textures/gui,widgets.png,/mods/HUD/mcl_inventory/textures,gui_hotbar_selected.png,0,22,24,24,0,0,y
+/assets/minecraft/textures/gui,widgets.png,/mods/HUD/mcl_inventory/textures,mcl_inventory_hotbar.png,0,0,182,22,0,0,y
+/assets/minecraft/textures/gui,widgets.png,/mods/HUD/mcl_inventory/textures,mcl_inventory_hotbar_selected.png,0,22,24,24,0,0,y
 /assets/minecraft/textures/blocks,bed_feet_end.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_red.png,,,,,,,
 /assets/minecraft/textures/blocks,bed_feet_side.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_r_red.png,,,,,,,
 /assets/minecraft/textures/blocks,bed_feet_top.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_top_bottom_red.png,,,,,,,