From 709079f4075007d1384482289a0452fb80016a92 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 20 Jan 2017 21:09:29 +0100 Subject: [PATCH] Add saddle, fix mob texture names --- mods/default/tools.lua | 3 +-- mods/mcl_mobitems/init.lua | 7 +++++++ .../textures/mcl_mobitems_saddle.png} | Bin mods/mobs_mc/models/mobs_creeper.x | 2 +- mods/mobs_mc/models/mobs_skeleton.x | 2 +- mods/mobs_mc/models/mobs_villager.x | 2 +- mods/mobs_mc/pig.lua | 4 ++-- mods/mobs_mc/textures/bones_bottom.png | Bin 284 -> 0 bytes mods/mobs_mc/textures/bones_front.png | Bin 300 -> 0 bytes mods/mobs_mc/textures/bones_rear.png | Bin 306 -> 0 bytes mods/mobs_mc/textures/bones_side.png | Bin 289 -> 0 bytes mods/mobs_mc/textures/bones_top.png | Bin 279 -> 0 bytes 12 files changed, 13 insertions(+), 7 deletions(-) rename mods/{mobs_mc/textures/saddle.png => mcl_mobitems/textures/mcl_mobitems_saddle.png} (100%) delete mode 100644 mods/mobs_mc/textures/bones_bottom.png delete mode 100644 mods/mobs_mc/textures/bones_front.png delete mode 100644 mods/mobs_mc/textures/bones_rear.png delete mode 100644 mods/mobs_mc/textures/bones_side.png delete mode 100644 mods/mobs_mc/textures/bones_top.png 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 899ae3b38e8da8b76dc820adef3f455d693f21ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|I14-?iy0XB zj({-ZRBb+KpdfpRr>`sf9X1&;KFgb)GJcAsQ2VCpGdORp4-mZ3&!neW}c| z;Q4mFnRQ;5*q%06Z*XyuycV^3>$8pD=j}7ke97QlUvrqbDk{>=?&Q&sSE_yWamNf6 zT00tDxqVkWB+s}}!i3|o@U9oOe{>wog&88GRgIU|Z&*2RU)BSCRnGj0cj{g~xNxn3 z-;?h_3=`M=@NZes+hgt?=#7w7+2mO7X5yYSuXc^p=^8Ho4rT@Ma@(uLwXPZpM<1;A bdd|MPP%C7?Csi4s%Naaf{an^LB{Ts5VuWSD diff --git a/mods/mobs_mc/textures/bones_front.png b/mods/mobs_mc/textures/bones_front.png deleted file mode 100644 index 32612906527a9542d9ff2e18c9d3d5f9f01901dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x382FBWFymBhK53vJdx@v7EBhTb88HquyBoVfI@Wl)IEH9UES=OS zcvOMIIrd24oa;+vmOc2*Yx(=>I$MDz&P!GAb8pWn?h#D9`PEj30+lB$ z*%VRwW%ZF`8rr9WCwAV6(ms^BERJ=7{M8$cjX@uSo24BtaWgM1HQeaI)5v_}tZe6> z-X`gMa|aja)t0;7IUAZUdB6U4{O9kB&Y3TW_-`1qpb2`k@kHuVYeSmLo$ zOk&Qb*yDW%yLGfvro0cc57-gfP%}Z!{fXDi;&POu)V)+?f?G3%Z;a6CK(G%W#i(Z)jX4_s>aD4Jq w$DeoJmo5DLch$eSdFf0Wjb5G?_j}47BYgE&*5jgXpz9etUHx3vIVCg!0Kukr8vp`sf9X1&;Ub*bG-{%8`Hha1_hGASCC%j7oaCNe*CNg8OF|=V{@r?1U(#xR+Ycr7!c*lk)>U^RSdMr^ zOP*(&q}TLGQA)Dt;}V4qmU%Opp4gfAuUTVtbc%;$ck_CO;!TdG@9(|-{VmQ>Md{Ou zFX}sa1Va*c*6iBJI5Trcm-k2O|FI8GbG|zu&H8!Ek*&X;1>6iz+$qsyVRI||>T&Te iE-YUzH1Ci7$LKcu{kEj79)&>XGkCiCxvX`sf9X1&;KBJ!Mlt+lA8^7|-6-y;z;Uw)gRm{s?oKg}oO0drF>mc5Gn%(&20KNzk2X>5AwD zX(!yPv{o!_Z#eRiYxQ4E#;a^vo;wSTOg}PTw$(k!{6FiL#Ny13`4=u+Yv@*$h{@u# zm~(MH*X`|9S7-ShTeZN=>}4%~x!cPScexrz|A%@f8ZVU=9^d!vvcS~F6Fh~rhgihL XjvESIRaco0bTosftDnm{r-UW|gv4s+