diff --git a/mods/ENTITIES/mobs_mc/dolphin.lua b/mods/ENTITIES/mobs_mc/dolphin.lua index 153734c39..e2547a7be 100644 --- a/mods/ENTITIES/mobs_mc/dolphin.lua +++ b/mods/ENTITIES/mobs_mc/dolphin.lua @@ -49,7 +49,7 @@ local dolphin = { visual = "mesh", mesh = "extra_mobs_dolphin.b3d", textures = { - {"extra_mobs_dolphin.png"} + {"mobs_mc_dolphin.png"} }, sounds = { }, diff --git a/mods/ENTITIES/mobs_mc/hoglin+zoglin.lua b/mods/ENTITIES/mobs_mc/hoglin+zoglin.lua index 8f8590933..6b14e3ed8 100644 --- a/mods/ENTITIES/mobs_mc/hoglin+zoglin.lua +++ b/mods/ENTITIES/mobs_mc/hoglin+zoglin.lua @@ -27,7 +27,7 @@ local hoglin = { visual = "mesh", mesh = "extra_mobs_hoglin.b3d", textures = { { - "extra_mobs_hoglin.png", + "mobs_mc_hoglin.png", } }, visual_size = {x=3, y=3}, sounds = { @@ -91,7 +91,7 @@ mcl_mobs.register_mob("mobs_mc:hoglin", hoglin) local zoglin = table.copy(hoglin) zoglin.description = S("Zoglin") zoglin.fire_resistant = 1 -zoglin.textures = {"extra_mobs_zoglin.png"} +zoglin.textures = {"mobs_mc_zoglin.png"} zoglin.do_custom = function() return end @@ -109,7 +109,7 @@ baby_hoglin.xp_min = 20 baby_hoglin.xp_max = 20 baby_hoglin.visual_size = {x=hoglin.visual_size.x/2, y=hoglin.visual_size.y/2} textures = { { - "extra_mobs_hoglin.png", + "mobs_mc_hoglin.png", "extra_mobs_trans.png", } } baby_hoglin.walk_velocity = 1.2 diff --git a/mods/ENTITIES/mobs_mc/piglin.lua b/mods/ENTITIES/mobs_mc/piglin.lua index 27f5a72f4..e056b4033 100644 --- a/mods/ENTITIES/mobs_mc/piglin.lua +++ b/mods/ENTITIES/mobs_mc/piglin.lua @@ -56,7 +56,7 @@ local piglin = { spawn_in_group = 4, spawn_in_group_min = 2, textures = { { - "extra_mobs_piglin.png", + "mobs_mc_piglin.png", "mcl_bows_bow_2.png", } }, visual_size = {x=1, y=1}, @@ -185,7 +185,7 @@ mcl_mobs.register_mob("mobs_mc:piglin", piglin) local sword_piglin = table.copy(piglin) sword_piglin.description = S("Sword Piglin") sword_piglin.mesh = "extra_mobs_sword_piglin.b3d" -sword_piglin.textures = {"extra_mobs_piglin.png", "default_tool_goldsword.png"} +sword_piglin.textures = {"mobs_mc_piglin.png", "default_tool_goldsword.png"} sword_piglin.on_spawn = function(self) self.gold_items = 0 self.weapon = self.base_texture[2] @@ -357,7 +357,7 @@ piglin_brute.lava_damage = 0 piglin_brute.fire_damage = 0 piglin_brute.attack_animals = true piglin_brute.mesh = "extra_mobs_sword_piglin.b3d" -piglin_brute.textures = {"extra_mobs_piglin_brute.png", "default_tool_goldaxe.png", "extra_mobs_trans.png"} +piglin_brute.textures = {"mobs_mc_piglin_brute.png", "default_tool_goldaxe.png", "extra_mobs_trans.png"} piglin_brute.attack_type = "dogfight" piglin_brute.animation = { stand_speed = 30, diff --git a/mods/ENTITIES/mobs_mc/strider.lua b/mods/ENTITIES/mobs_mc/strider.lua index 142025e06..31aac1a24 100644 --- a/mods/ENTITIES/mobs_mc/strider.lua +++ b/mods/ENTITIES/mobs_mc/strider.lua @@ -26,7 +26,7 @@ local strider = { visual = "mesh", mesh = "extra_mobs_strider.b3d", textures = { { - "extra_mobs_strider.png", + "mobs_mc_strider.png", } }, visual_size = {x=3, y=3}, sounds = { @@ -69,10 +69,10 @@ local strider = { if minetest.find_node_near(self.object:get_pos(), 2, {"mcl_core:lava_source","mcl_core:lava_flowing","mcl_nether:nether_lava_source","mcl_nether:nether_lava_flowing"}) then self.walk_velocity = 2 self.run_velocity = 4 - self.base_texture[1] = "extra_mobs_strider.png" + self.base_texture[1] = "mobs_mc_strider.png" self.shaking = false else - self.base_texture[1] = "extra_mobs_strider_cold.png" + self.base_texture[1] = "mobs_mc_strider_cold.png" self.walk_velocity = .5 self.run_velocity = 1 self.shaking = true @@ -133,7 +133,7 @@ local strider = { local item = clicker:get_wielded_item() if item:get_name() == "mcl_mobitems:saddle" and self.saddle ~= "yes" then self.base_texture = { - "extra_mobs_strider.png", + "mobs_mc_strider.png", "mobs_mc_pig_saddle.png", -- saddle } self.object:set_properties({ @@ -201,7 +201,7 @@ baby_strider.collisionbox = {-.3, -0.01, -.3, .3, 0.94, .3} baby_strider.xp_min = 13 baby_strider.xp_max = 13 textures = { { - "extra_mobs_strider.png", + "mobs_mc_strider.png", "extra_mobs_trans.png", } } baby_strider.walk_velocity = 1.2 diff --git a/mods/ENTITIES/mobs_mc/tropical_fish.lua b/mods/ENTITIES/mobs_mc/tropical_fish.lua index 79b32bb8b..a102b64d5 100644 --- a/mods/ENTITIES/mobs_mc/tropical_fish.lua +++ b/mods/ENTITIES/mobs_mc/tropical_fish.lua @@ -47,11 +47,11 @@ local function set_textures(self) end self._base_color = base_colors[math.random(#base_colors)] self._pattern_color = pattern_colors[math.random(#pattern_colors)] - self._pattern = "extra_mobs_tropical_fish_pattern_"..self._type.."_"..math.random(6)..".png" + self._pattern = "mobs_mc_tropical_fish_pattern_"..self._type.."_"..math.random(6)..".png" end self.object:set_properties({ textures = { - "(extra_mobs_tropical_fish_"..self._type..".png^[colorize:"..self._base_color..":127)^("..self._pattern.."^[colorize:"..self._pattern_color..")", + "(mobs_mc_tropical_fish_"..self._type..".png^[colorize:"..self._base_color..":127)^("..self._pattern.."^[colorize:"..self._pattern_color..")", }, mesh="extra_mobs_tropical_fish_"..self._type..".b3d" }) @@ -72,7 +72,7 @@ local tropical_fish = { collisionbox = {-0.2, 0.0, -0.2, 0.2, 0.1, 0.2}, visual = "mesh", mesh = "extra_mobs_tropical_fish_a.b3d", - textures = { "extra_mobs_tropical_fish_a.png" }, -- to be populated on_spawn + textures = { "mobs_mc_tropical_fish_a.png" }, -- to be populated on_spawn sounds = {}, animation = { stand_start = 0, diff --git a/mods/ITEMS/mcl_colorblocks/init.lua b/mods/ITEMS/mcl_colorblocks/init.lua index 6eec8a9df..5112812cb 100644 --- a/mods/ITEMS/mcl_colorblocks/init.lua +++ b/mods/ITEMS/mcl_colorblocks/init.lua @@ -32,7 +32,7 @@ local cp_tt = S("Turns into concrete on water contact") minetest.register_node("mcl_colorblocks:hardened_clay", { description = S("Terracotta"), _doc_items_longdesc = S("Terracotta is a basic building material which comes in many different colors. This particular block is uncolored."), - tiles = {"hardened_clay.png"}, + tiles = {"mcl_colorblocks_hardened_clay.png"}, stack_max = 64, groups = {pickaxey=1, hardened_clay=1,building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -82,7 +82,7 @@ for _, row in ipairs(block.dyes) do _doc_items_longdesc = ldesc_hc, _doc_items_create_entry = create_entry, _doc_items_entry_name = ename_hc, - tiles = {"hardened_clay_stained_"..name..".png"}, + tiles = {"mcl_colorblocks_hardened_clay_stained_"..name..".png"}, groups = {pickaxey=1, hardened_clay=1,building_block=1, material_stone=1}, stack_max = 64, sounds = mcl_sounds.node_sound_stone_defaults(), diff --git a/mods/ITEMS/mcl_maps/colors.json b/mods/ITEMS/mcl_maps/colors.json index f69d5af8a..4f2311191 100644 --- a/mods/ITEMS/mcl_maps/colors.json +++ b/mods/ITEMS/mcl_maps/colors.json @@ -6169,7 +6169,7 @@ 229, 51 ], - "hardened_clay_stained_pink.png": [ + "mcl_colorblocks_hardened_clay_stained_pink.png": [ 164, 79, 76 @@ -6244,7 +6244,7 @@ 151, 151 ], - "hardened_clay_stained_white.png": [ + "mcl_colorblocks_hardened_clay_stained_white.png": [ 213, 197, 184 @@ -6269,17 +6269,17 @@ 150, 159 ], - "hardened_clay_stained_purple.png": [ + "mcl_colorblocks_hardened_clay_stained_purple.png": [ 81, 71, 123 ], - "hardened_clay_stained_brown.png": [ + "mcl_colorblocks_hardened_clay_stained_brown.png": [ 96, 69, 61 ], - "hardened_clay_stained_grey.png": [ + "mcl_colorblocks_hardened_clay_stained_grey.png": [ 110, 92, 85 @@ -6289,7 +6289,7 @@ 171, 25 ], - "hardened_clay_stained_blue.png": [ + "mcl_colorblocks_hardened_clay_stained_blue.png": [ 68, 91, 143 @@ -6299,17 +6299,17 @@ 225, 225 ], - "hardened_clay_stained_yellow.png": [ + "mcl_colorblocks_hardened_clay_stained_yellow.png": [ 177, 128, 51 ], - "hardened_clay_stained_light_blue.png": [ + "mcl_colorblocks_hardened_clay_stained_light_blue.png": [ 91, 128, 171 ], - "hardened_clay.png": [ + "mcl_colorblocks_hardened_clay.png": [ 143, 104, 87 @@ -6374,7 +6374,7 @@ 162, 204 ], - "hardened_clay_stained_orange.png": [ + "mcl_colorblocks_hardened_clay_stained_orange.png": [ 156, 95, 69 @@ -6389,17 +6389,17 @@ 148, 176 ], - "hardened_clay_stained_silver.png": [ + "mcl_colorblocks_hardened_clay_stained_silver.png": [ 149, 129, 117 ], - "hardened_clay_stained_red.png": [ + "mcl_colorblocks_hardened_clay_stained_red.png": [ 159, 81, 66 ], - "hardened_clay_stained_magenta.png": [ + "mcl_colorblocks_hardened_clay_stained_magenta.png": [ 150, 80, 85 @@ -6414,12 +6414,12 @@ 214, 215 ], - "hardened_clay_stained_green.png": [ + "mcl_colorblocks_hardened_clay_stained_green.png": [ 74, 101, 63 ], - "hardened_clay_stained_lime.png": [ + "mcl_colorblocks_hardened_clay_stained_lime.png": [ 105, 134, 73 @@ -6444,7 +6444,7 @@ 32, 159 ], - "hardened_clay_stained_cyan.png": [ + "mcl_colorblocks_hardened_clay_stained_cyan.png": [ 71, 107, 123 @@ -6484,7 +6484,7 @@ 98, 103 ], - "hardened_clay_stained_black.png": [ + "mcl_colorblocks_hardened_clay_stained_black.png": [ 69, 52, 46 @@ -9459,57 +9459,57 @@ 84, 65 ], - "wool_dark_grey.png": [ + "mcl_wool_dark_grey.png": [ 96, 87, 87 ], - "wool_grey.png": [ + "mcl_wool_grey.png": [ 143, 134, 134 ], - "wool_magenta.png": [ + "mcl_wool_magenta.png": [ 140, 85, 125 ], - "wool_black.png": [ + "mcl_wool_black.png": [ 45, 42, 42 ], - "wool_orange.png": [ + "mcl_wool_orange.png": [ 188, 106, 45 ], - "wool_blue.png": [ + "mcl_wool_blue.png": [ 43, 73, 125 ], - "wool_yellow.png": [ + "mcl_wool_yellow.png": [ 201, 163, 69 ], - "wool_pink.png": [ + "mcl_wool_pink.png": [ 171, 91, 108 ], - "wool_dark_green.png": [ + "mcl_wool_dark_green.png": [ 53, 91, 51 ], - "wool_brown.png": [ + "mcl_wool_brown.png": [ 86, 57, 43 ], - "wool_red.png": [ + "mcl_wool_red.png": [ 132, 42, 45 @@ -9519,7 +9519,7 @@ 130, 180 ], - "wool_cyan.png": [ + "mcl_wool_cyan.png": [ 30, 94, 113 @@ -9529,12 +9529,12 @@ 151, 76 ], - "wool_white.png": [ + "mcl_wool_white.png": [ 212, 199, 182 ], - "wool_violet.png": [ + "mcl_wool_violet.png": [ 77, 57, 102 diff --git a/mods/ITEMS/mcl_wool/init.lua b/mods/ITEMS/mcl_wool/init.lua index 65cbb8708..8e11badc6 100644 --- a/mods/ITEMS/mcl_wool/init.lua +++ b/mods/ITEMS/mcl_wool/init.lua @@ -13,20 +13,20 @@ local wool = {} -- colors available. When crafting, the last recipes will be checked first. wool.dyes = { -- name, texture, wool desc., carpet desc., dye, color_group - {"white", "wool_white", S("White Wool"), S("White Carpet"), nil, "unicolor_white"}, - {"grey", "wool_dark_grey", S("Grey Wool"), S("Grey Carpet"), "dark_grey", "unicolor_darkgrey"}, - {"silver", "wool_grey", S("Light Grey Wool"), S("Light Grey Carpet"), "grey", "unicolor_grey"}, - {"black", "wool_black", S("Black Wool"), S("Black Carpet"), "black", "unicolor_black"}, - {"red", "wool_red", S("Red Wool"), S("Red Carpet"), "red", "unicolor_red"}, - {"yellow", "wool_yellow", S("Yellow Wool"), S("Yellow Carpet"), "yellow", "unicolor_yellow"}, - {"green", "wool_dark_green", S("Green Wool"), S("Green Carpet"), "dark_green", "unicolor_dark_green"}, - {"cyan", "wool_cyan", S("Cyan Wool"), S("Cyan Carpet"), "cyan", "unicolor_cyan"}, - {"blue", "wool_blue", S("Blue Wool"), S("Blue Carpet"), "blue", "unicolor_blue"}, - {"magenta", "wool_magenta", S("Magenta Wool"), S("Magenta Carpet"), "magenta", "unicolor_red_violet"}, - {"orange", "wool_orange", S("Orange Wool"), S("Orange Carpet"), "orange", "unicolor_orange"}, - {"purple", "wool_violet", S("Purple Wool"), S("Purple Carpet"), "violet", "unicolor_violet"}, - {"brown", "wool_brown", S("Brown Wool"), S("Brown Carpet"), "brown", "unicolor_dark_orange"}, - {"pink", "wool_pink", S("Pink Wool"), S("Pink Carpet"), "pink", "unicolor_light_red"}, + {"white", "mcl_wool_white", S("White Wool"), S("White Carpet"), nil, "unicolor_white"}, + {"grey", "mcl_wool_dark_grey", S("Grey Wool"), S("Grey Carpet"), "dark_grey", "unicolor_darkgrey"}, + {"silver", "mcl_wool_grey", S("Light Grey Wool"), S("Light Grey Carpet"), "grey", "unicolor_grey"}, + {"black", "mcl_wool_black", S("Black Wool"), S("Black Carpet"), "black", "unicolor_black"}, + {"red", "mcl_wool_red", S("Red Wool"), S("Red Carpet"), "red", "unicolor_red"}, + {"yellow", "mcl_wool_yellow", S("Yellow Wool"), S("Yellow Carpet"), "yellow", "unicolor_yellow"}, + {"green", "mcl_wool_dark_green", S("Green Wool"), S("Green Carpet"), "dark_green", "unicolor_dark_green"}, + {"cyan", "mcl_wool_cyan", S("Cyan Wool"), S("Cyan Carpet"), "cyan", "unicolor_cyan"}, + {"blue", "mcl_wool_blue", S("Blue Wool"), S("Blue Carpet"), "blue", "unicolor_blue"}, + {"magenta", "mcl_wool_magenta", S("Magenta Wool"), S("Magenta Carpet"), "magenta", "unicolor_red_violet"}, + {"orange", "mcl_wool_orange", S("Orange Wool"), S("Orange Carpet"), "orange", "unicolor_orange"}, + {"purple", "mcl_wool_violet", S("Purple Wool"), S("Purple Carpet"), "violet", "unicolor_violet"}, + {"brown", "mcl_wool_brown", S("Brown Wool"), S("Brown Carpet"), "brown", "unicolor_dark_orange"}, + {"pink", "mcl_wool_pink", S("Pink Wool"), S("Pink Carpet"), "pink", "unicolor_light_red"}, {"lime", "mcl_wool_lime", S("Lime Wool"), S("Lime Carpet"), "green", "unicolor_green"}, {"light_blue", "mcl_wool_light_blue", S("Light Blue Wool"), S("Light Blue Carpet"), "lightblue", "unicolor_light_blue"}, } diff --git a/textures/hardened_clay.png b/textures/mcl_colorblocks_hardened_clay.png similarity index 100% rename from textures/hardened_clay.png rename to textures/mcl_colorblocks_hardened_clay.png diff --git a/textures/hardened_clay_stained_black.png b/textures/mcl_colorblocks_hardened_clay_stained_black.png similarity index 100% rename from textures/hardened_clay_stained_black.png rename to textures/mcl_colorblocks_hardened_clay_stained_black.png diff --git a/textures/hardened_clay_stained_blue.png b/textures/mcl_colorblocks_hardened_clay_stained_blue.png similarity index 100% rename from textures/hardened_clay_stained_blue.png rename to textures/mcl_colorblocks_hardened_clay_stained_blue.png diff --git a/textures/hardened_clay_stained_brown.png b/textures/mcl_colorblocks_hardened_clay_stained_brown.png similarity index 100% rename from textures/hardened_clay_stained_brown.png rename to textures/mcl_colorblocks_hardened_clay_stained_brown.png diff --git a/textures/hardened_clay_stained_cyan.png b/textures/mcl_colorblocks_hardened_clay_stained_cyan.png similarity index 100% rename from textures/hardened_clay_stained_cyan.png rename to textures/mcl_colorblocks_hardened_clay_stained_cyan.png diff --git a/textures/hardened_clay_stained_green.png b/textures/mcl_colorblocks_hardened_clay_stained_green.png similarity index 100% rename from textures/hardened_clay_stained_green.png rename to textures/mcl_colorblocks_hardened_clay_stained_green.png diff --git a/textures/hardened_clay_stained_grey.png b/textures/mcl_colorblocks_hardened_clay_stained_grey.png similarity index 100% rename from textures/hardened_clay_stained_grey.png rename to textures/mcl_colorblocks_hardened_clay_stained_grey.png diff --git a/textures/hardened_clay_stained_light_blue.png b/textures/mcl_colorblocks_hardened_clay_stained_light_blue.png similarity index 100% rename from textures/hardened_clay_stained_light_blue.png rename to textures/mcl_colorblocks_hardened_clay_stained_light_blue.png diff --git a/textures/hardened_clay_stained_lime.png b/textures/mcl_colorblocks_hardened_clay_stained_lime.png similarity index 100% rename from textures/hardened_clay_stained_lime.png rename to textures/mcl_colorblocks_hardened_clay_stained_lime.png diff --git a/textures/hardened_clay_stained_magenta.png b/textures/mcl_colorblocks_hardened_clay_stained_magenta.png similarity index 100% rename from textures/hardened_clay_stained_magenta.png rename to textures/mcl_colorblocks_hardened_clay_stained_magenta.png diff --git a/textures/hardened_clay_stained_orange.png b/textures/mcl_colorblocks_hardened_clay_stained_orange.png similarity index 100% rename from textures/hardened_clay_stained_orange.png rename to textures/mcl_colorblocks_hardened_clay_stained_orange.png diff --git a/textures/hardened_clay_stained_pink.png b/textures/mcl_colorblocks_hardened_clay_stained_pink.png similarity index 100% rename from textures/hardened_clay_stained_pink.png rename to textures/mcl_colorblocks_hardened_clay_stained_pink.png diff --git a/textures/hardened_clay_stained_purple.png b/textures/mcl_colorblocks_hardened_clay_stained_purple.png similarity index 100% rename from textures/hardened_clay_stained_purple.png rename to textures/mcl_colorblocks_hardened_clay_stained_purple.png diff --git a/textures/hardened_clay_stained_red.png b/textures/mcl_colorblocks_hardened_clay_stained_red.png similarity index 100% rename from textures/hardened_clay_stained_red.png rename to textures/mcl_colorblocks_hardened_clay_stained_red.png diff --git a/textures/hardened_clay_stained_silver.png b/textures/mcl_colorblocks_hardened_clay_stained_silver.png similarity index 100% rename from textures/hardened_clay_stained_silver.png rename to textures/mcl_colorblocks_hardened_clay_stained_silver.png diff --git a/textures/hardened_clay_stained_white.png b/textures/mcl_colorblocks_hardened_clay_stained_white.png similarity index 100% rename from textures/hardened_clay_stained_white.png rename to textures/mcl_colorblocks_hardened_clay_stained_white.png diff --git a/textures/hardened_clay_stained_yellow.png b/textures/mcl_colorblocks_hardened_clay_stained_yellow.png similarity index 100% rename from textures/hardened_clay_stained_yellow.png rename to textures/mcl_colorblocks_hardened_clay_stained_yellow.png diff --git a/textures/wool_black.png b/textures/mcl_wool_black.png similarity index 100% rename from textures/wool_black.png rename to textures/mcl_wool_black.png diff --git a/textures/wool_blue.png b/textures/mcl_wool_blue.png similarity index 100% rename from textures/wool_blue.png rename to textures/mcl_wool_blue.png diff --git a/textures/wool_brown.png b/textures/mcl_wool_brown.png similarity index 100% rename from textures/wool_brown.png rename to textures/mcl_wool_brown.png diff --git a/textures/wool_cyan.png b/textures/mcl_wool_cyan.png similarity index 100% rename from textures/wool_cyan.png rename to textures/mcl_wool_cyan.png diff --git a/textures/wool_dark_green.png b/textures/mcl_wool_dark_green.png similarity index 100% rename from textures/wool_dark_green.png rename to textures/mcl_wool_dark_green.png diff --git a/textures/wool_dark_grey.png b/textures/mcl_wool_dark_grey.png similarity index 100% rename from textures/wool_dark_grey.png rename to textures/mcl_wool_dark_grey.png diff --git a/textures/wool_grey.png b/textures/mcl_wool_grey.png similarity index 100% rename from textures/wool_grey.png rename to textures/mcl_wool_grey.png diff --git a/textures/wool_magenta.png b/textures/mcl_wool_magenta.png similarity index 100% rename from textures/wool_magenta.png rename to textures/mcl_wool_magenta.png diff --git a/textures/wool_orange.png b/textures/mcl_wool_orange.png similarity index 100% rename from textures/wool_orange.png rename to textures/mcl_wool_orange.png diff --git a/textures/wool_pink.png b/textures/mcl_wool_pink.png similarity index 100% rename from textures/wool_pink.png rename to textures/mcl_wool_pink.png diff --git a/textures/wool_red.png b/textures/mcl_wool_red.png similarity index 100% rename from textures/wool_red.png rename to textures/mcl_wool_red.png diff --git a/textures/wool_violet.png b/textures/mcl_wool_violet.png similarity index 100% rename from textures/wool_violet.png rename to textures/mcl_wool_violet.png diff --git a/textures/wool_white.png b/textures/mcl_wool_white.png similarity index 100% rename from textures/wool_white.png rename to textures/mcl_wool_white.png diff --git a/textures/wool_yellow.png b/textures/mcl_wool_yellow.png similarity index 100% rename from textures/wool_yellow.png rename to textures/mcl_wool_yellow.png diff --git a/textures/extra_mobs_dolphin.png b/textures/mobs_mc_dolphin.png similarity index 100% rename from textures/extra_mobs_dolphin.png rename to textures/mobs_mc_dolphin.png diff --git a/textures/extra_mobs_hoglin.png b/textures/mobs_mc_hoglin.png similarity index 100% rename from textures/extra_mobs_hoglin.png rename to textures/mobs_mc_hoglin.png diff --git a/textures/extra_mobs_piglin.png b/textures/mobs_mc_piglin.png similarity index 100% rename from textures/extra_mobs_piglin.png rename to textures/mobs_mc_piglin.png diff --git a/textures/extra_mobs_piglin_brute.png b/textures/mobs_mc_piglin_brute.png similarity index 100% rename from textures/extra_mobs_piglin_brute.png rename to textures/mobs_mc_piglin_brute.png diff --git a/textures/extra_mobs_strider.png b/textures/mobs_mc_strider.png similarity index 100% rename from textures/extra_mobs_strider.png rename to textures/mobs_mc_strider.png diff --git a/textures/extra_mobs_strider_cold.png b/textures/mobs_mc_strider_cold.png similarity index 100% rename from textures/extra_mobs_strider_cold.png rename to textures/mobs_mc_strider_cold.png diff --git a/textures/extra_mobs_tropical_fish_a.png b/textures/mobs_mc_tropical_fish_a.png similarity index 100% rename from textures/extra_mobs_tropical_fish_a.png rename to textures/mobs_mc_tropical_fish_a.png diff --git a/textures/extra_mobs_tropical_fish_b.png b/textures/mobs_mc_tropical_fish_b.png similarity index 100% rename from textures/extra_mobs_tropical_fish_b.png rename to textures/mobs_mc_tropical_fish_b.png diff --git a/textures/extra_mobs_tropical_fish_pattern_a_1.png b/textures/mobs_mc_tropical_fish_pattern_a_1.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_a_1.png rename to textures/mobs_mc_tropical_fish_pattern_a_1.png diff --git a/textures/extra_mobs_tropical_fish_pattern_a_2.png b/textures/mobs_mc_tropical_fish_pattern_a_2.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_a_2.png rename to textures/mobs_mc_tropical_fish_pattern_a_2.png diff --git a/textures/extra_mobs_tropical_fish_pattern_a_3.png b/textures/mobs_mc_tropical_fish_pattern_a_3.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_a_3.png rename to textures/mobs_mc_tropical_fish_pattern_a_3.png diff --git a/textures/extra_mobs_tropical_fish_pattern_a_4.png b/textures/mobs_mc_tropical_fish_pattern_a_4.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_a_4.png rename to textures/mobs_mc_tropical_fish_pattern_a_4.png diff --git a/textures/extra_mobs_tropical_fish_pattern_a_5.png b/textures/mobs_mc_tropical_fish_pattern_a_5.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_a_5.png rename to textures/mobs_mc_tropical_fish_pattern_a_5.png diff --git a/textures/extra_mobs_tropical_fish_pattern_a_6.png b/textures/mobs_mc_tropical_fish_pattern_a_6.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_a_6.png rename to textures/mobs_mc_tropical_fish_pattern_a_6.png diff --git a/textures/extra_mobs_tropical_fish_pattern_b_1.png b/textures/mobs_mc_tropical_fish_pattern_b_1.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_b_1.png rename to textures/mobs_mc_tropical_fish_pattern_b_1.png diff --git a/textures/extra_mobs_tropical_fish_pattern_b_2.png b/textures/mobs_mc_tropical_fish_pattern_b_2.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_b_2.png rename to textures/mobs_mc_tropical_fish_pattern_b_2.png diff --git a/textures/extra_mobs_tropical_fish_pattern_b_3.png b/textures/mobs_mc_tropical_fish_pattern_b_3.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_b_3.png rename to textures/mobs_mc_tropical_fish_pattern_b_3.png diff --git a/textures/extra_mobs_tropical_fish_pattern_b_4.png b/textures/mobs_mc_tropical_fish_pattern_b_4.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_b_4.png rename to textures/mobs_mc_tropical_fish_pattern_b_4.png diff --git a/textures/extra_mobs_tropical_fish_pattern_b_5.png b/textures/mobs_mc_tropical_fish_pattern_b_5.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_b_5.png rename to textures/mobs_mc_tropical_fish_pattern_b_5.png diff --git a/textures/extra_mobs_tropical_fish_pattern_b_6.png b/textures/mobs_mc_tropical_fish_pattern_b_6.png similarity index 100% rename from textures/extra_mobs_tropical_fish_pattern_b_6.png rename to textures/mobs_mc_tropical_fish_pattern_b_6.png diff --git a/textures/extra_mobs_zoglin.png b/textures/mobs_mc_zoglin.png similarity index 100% rename from textures/extra_mobs_zoglin.png rename to textures/mobs_mc_zoglin.png diff --git a/textures/extra_mobs_zombified_piglin.png b/textures/mobs_mc_zombified_piglin.png similarity index 100% rename from textures/extra_mobs_zombified_piglin.png rename to textures/mobs_mc_zombified_piglin.png diff --git a/tools/rename_textures_file.sh b/tools/rename_textures_file.sh new file mode 100755 index 000000000..4883c96bb --- /dev/null +++ b/tools/rename_textures_file.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Script to be used to help solving issue https://git.minetest.land/MineClone2/MineClone2/issues/3392 +# usage : ./rename_textures_file.sh PrefixNameToChange modeNameToUse +bad_mode_name=$1 +mod=$2 +HOME="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/.." + + +while read texture; do + #echo $texture + if [[ $texture = $bad_mode_name* ]] ; then + mv -- $HOME/textures/$texture $HOME/textures/${texture/$bad_mode_name/$mod} + grep -rl $texture $HOME/mods | xargs sed -i 's/'"$texture"'/'"${texture/$bad_mode_name/$mod}"'/g' + sed -i '/'"$texture"'/d' ../to_rename + fi +done < ../to_rename # This file has to be creating from the commands shown in ticket, or use example provided there