diff --git a/mods/default/tools.lua b/mods/default/tools.lua index f4d7e382b..bab033d57 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -412,8 +412,7 @@ minetest.register_tool("default:pole", { elseif r == 4 then itemname = "mobs:naming_tag" elseif r == 5 then - itemname = "flowers:dandelion" - -- TODO itemname = "mobs:saddle" + itemname = "mcl_mobitems:saddle" elseif r == 6 then itemname = "flowers:waterlily" end diff --git a/mods/mcl_mobitems/init.lua b/mods/mcl_mobitems/init.lua index a18ae0d0e..4eef6e1a2 100644 --- a/mods/mcl_mobitems/init.lua +++ b/mods/mcl_mobitems/init.lua @@ -192,6 +192,13 @@ minetest.register_craftitem("mcl_mobitems:rabbit_foot", { stack_max = 64, }) +minetest.register_craftitem("mcl_mobitems:saddle", { + description = "Saddle", + wield_image = "mcl_mobitems_saddle.png", + inventory_image = "mcl_mobitems_saddle.png", + stack_max = 1, +}) + ----------- -- Crafting ----------- diff --git a/mods/mobs_mc/textures/saddle.png b/mods/mcl_mobitems/textures/mcl_mobitems_saddle.png similarity index 100% rename from mods/mobs_mc/textures/saddle.png rename to mods/mcl_mobitems/textures/mcl_mobitems_saddle.png diff --git a/mods/mobs_mc/models/mobs_creeper.x b/mods/mobs_mc/models/mobs_creeper.x index 37979e75b..f2f0409e1 100644 --- a/mods/mobs_mc/models/mobs_creeper.x +++ b/mods/mobs_mc/models/mobs_creeper.x @@ -543,7 +543,7 @@ Frame Root { 96.078431; 0.500000; 0.500000; 0.500000;; 0.000000; 0.000000; 0.000000;; - TextureFilename {"creeper.png";} + TextureFilename {"mobs_creeper.png";} } } // End of Creeper material list XSkinMeshHeader { diff --git a/mods/mobs_mc/models/mobs_skeleton.x b/mods/mobs_mc/models/mobs_skeleton.x index 1b6e2d757..552d5362c 100644 --- a/mods/mobs_mc/models/mobs_skeleton.x +++ b/mods/mobs_mc/models/mobs_skeleton.x @@ -551,7 +551,7 @@ Frame Root { 96.078431; 0.500000; 0.500000; 0.500000;; 0.000000; 0.000000; 0.000000;; - TextureFilename {"skeleton.png";} + TextureFilename {"mobs_skeleton.png";} } } // End of Cube_001 material list XSkinMeshHeader { diff --git a/mods/mobs_mc/models/mobs_villager.x b/mods/mobs_mc/models/mobs_villager.x index cc3cc6fa1..e6cdaa186 100644 --- a/mods/mobs_mc/models/mobs_villager.x +++ b/mods/mobs_mc/models/mobs_villager.x @@ -556,7 +556,7 @@ Frame Root { 96.078431; 0.500000; 0.500000; 0.500000;; 0.000000; 0.000000; 0.000000;; - TextureFilename {"farmer.png";} + TextureFilename {"mobs_farmer.png";} } } // End of Cube_001 material list XSkinMeshHeader { diff --git a/mods/mobs_mc/pig.lua b/mods/mobs_mc/pig.lua index 511d7c319..d71490673 100644 --- a/mods/mobs_mc/pig.lua +++ b/mods/mobs_mc/pig.lua @@ -58,7 +58,7 @@ mobs:register_mob("mobs_mc:pig", { end local item = clicker:get_wielded_item() - if item:get_name() == "mobs:saddle" and self.saddle ~= "yes" then + if item:get_name() == "mcl_mobitems:saddle" and self.saddle ~= "yes" then self.object:set_properties({ textures = {"mobs_pig_with_saddle.png"}, }) @@ -69,7 +69,7 @@ mobs:register_mob("mobs_mc:pig", { chance = 1, min = 1, max = 3,}, - {name = "mobs:saddle", + {name = "mcl_mobitems:saddle", chance = 1, min = 1, max = 1,}, diff --git a/mods/mobs_mc/textures/bones_bottom.png b/mods/mobs_mc/textures/bones_bottom.png deleted file mode 100644 index 899ae3b38..000000000 Binary files a/mods/mobs_mc/textures/bones_bottom.png and /dev/null differ diff --git a/mods/mobs_mc/textures/bones_front.png b/mods/mobs_mc/textures/bones_front.png deleted file mode 100644 index 326129065..000000000 Binary files a/mods/mobs_mc/textures/bones_front.png and /dev/null differ diff --git a/mods/mobs_mc/textures/bones_rear.png b/mods/mobs_mc/textures/bones_rear.png deleted file mode 100644 index bf66d5f38..000000000 Binary files a/mods/mobs_mc/textures/bones_rear.png and /dev/null differ diff --git a/mods/mobs_mc/textures/bones_side.png b/mods/mobs_mc/textures/bones_side.png deleted file mode 100644 index 88fdfddf3..000000000 Binary files a/mods/mobs_mc/textures/bones_side.png and /dev/null differ diff --git a/mods/mobs_mc/textures/bones_top.png b/mods/mobs_mc/textures/bones_top.png deleted file mode 100644 index 08b156db6..000000000 Binary files a/mods/mobs_mc/textures/bones_top.png and /dev/null differ