diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_sheep.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_sheep.b3d deleted file mode 100644 index 34dd9d532f..0000000000 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_sheep.b3d and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepfur.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepfur.b3d index 34dd9d532f..1db15ddba3 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepfur.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepfur.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepnaked.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepnaked.b3d deleted file mode 100644 index 78c9ea2448..0000000000 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_sheepnaked.b3d and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua index bfc8ac0f47..8f56f7b4d1 100644 --- a/mods/ENTITIES/mobs_mc/sheep.lua +++ b/mods/ENTITIES/mobs_mc/sheep.lua @@ -32,9 +32,14 @@ if minetest.get_modpath("mcl_wool") ~= nil then end local sheep_texture = function(color_group) - return {"mobs_mc_sheep.png^(mobs_mc_sheep_fur.png^[colorize:"..colors[color_group][2]..")"} + return { + "mobs_mc_sheep_fur.png^[colorize:"..colors[color_group][2], + "mobs_mc_sheep.png", + } end +local gotten_texture = { "blank.png", "mobs_mc_sheep.png" } + --mcsheep mobs:register_mob("mobs_mc:sheep", { type = "animal", @@ -46,8 +51,8 @@ mobs:register_mob("mobs_mc:sheep", { visual = "mesh", visual_size = {x=3, y=3}, mesh = "mobs_mc_sheepfur.b3d", - gotten_mesh = "mobs_mc_sheepnaked.b3d", textures = { sheep_texture("unicolor_white") }, + gotten_texture = gotten_texture, color = "unicolor_white", makes_footstep_sound = true, walk_velocity = 1, @@ -90,18 +95,15 @@ mobs:register_mob("mobs_mc:sheep", { end self.gotten = false self.drops = { - {name = mobs_mc.items.mutton_raw, - chance = 1, - min = 1, - max = 2,}, - {name = colors[self.color][1], - chance = 1, - min = 1, - max = 1,}, + {name = mobs_mc.items.mutton_raw, + chance = 1, + min = 1, + max = 2,}, + {name = colors[self.color][1], + chance = 1, + min = 1, + max = 1,}, } - self.object:set_properties({ - mesh = "mobs_mc_sheepfur.b3d", - }) end, -- Set random color on spawn @@ -159,8 +161,9 @@ mobs:register_mob("mobs_mc:sheep", { self.color = "unicolor_white" end minetest.add_item(pos, ItemStack(colors[self.color][1].." "..math.random(1,3))) + self.base_texture = gotten_texture self.object:set_properties({ - mesh = "mobs_mc_sheepnaked.b3d", + textures = self.base_texture, }) if not minetest.settings:get_bool("creative_mode") then item:add_wear(mobs_mc.misc.shears_wear) diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep.png index 50b0e18ab7..13496a3c51 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep_fur.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep_fur.png index 0c25e27218..fa447031d0 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep_fur.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_sheep_fur.png differ diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index e43022731e..7de853b709 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -718,8 +718,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/entity/rabbit,toast.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_rabbit_toast.png,,,,,,, /assets/minecraft/textures/entity/rabbit,white.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_rabbit_white.png,,,,,,, /assets/minecraft/textures/entity/rabbit,white_splotched.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_rabbit_white_splotched.png,,,,,,, -/assets/minecraft/textures/entity/sheep,sheep_fur.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_sheep_fur.png,,,,,,,y -/assets/minecraft/textures/entity/sheep,sheep.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_sheep.png,,,,,,,y +/assets/minecraft/textures/entity/sheep,sheep_fur.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_sheep_fur.png,,,,,,, +/assets/minecraft/textures/entity/sheep,sheep.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_sheep.png,,,,,,, /assets/minecraft/textures/entity/shulker,shulker_black.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_shulker_black.png,,,,,,,y /assets/minecraft/textures/entity/shulker,shulker_blue.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_shulker_blue.png,,,,,,,y /assets/minecraft/textures/entity/shulker,shulker_brown.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_shulker_brown.png,,,,,,,y