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 f4d7e382..bab033d5 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 a18ae0d0..4eef6e1a 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 37979e75..f2f0409e 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 1b6e2d75..552d5362 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 cc3cc6fa..e6cdaa18 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 511d7c31..d7149067 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!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z`$AH z5n0T@z;^_M8K-LVNi#4ou$OrHy0YJ4lM&;yeA*>w&cML1&eO#)L}Oy_q(Q$eYWxYynW`GFB!b+YYsD4MMb*Voje-y zO0};(?wG+sYe%Cix9^IFT8{=!4Z>&)IhuYK1KLq$gTe~DWM4fVuWSD 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!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z`&N| z?e4+=20xv5*E29Ma29w(7BevL9RXp+soH$f3=9nHC7!;n?048?#5mOKZtMo>SmWv9 z7@{$;bW)?>Q3Vd?*du{+t}m5Y_TV?KP)kltLXrB(A*m);P`%vn#IMxO7S8p^n27L@}mUg(r&AhbKaH9uL zBlD57vYmf=o22v29bBAOTkd-2Y-qmZ{rcPSpT93UXTBif?^WK2+S$i%7|O3deOh#P uRrt%*6EvBY|BelfUmoN(@kj>SaXoweaN)k44ofy`glX=O&z`&N| z?e4+=20xv5*E29Ma29w(7BevL9RXp+soH$f3=9nHC7!;n?048?#JE(aKJTbuU|`tf z>EaloF)?*gBd?1hhjZkSz&Y2K$~?R9X!CRRiwYtd30tluot9Yqect&!!N(UZPgwbW zv#C#z#}bd7ViI#c#UAfF*sY_TGUa`keZY>;hMEa-?oYgC7Poy?Zd_%{`dqN|lezq+ zU%n2d{;~3Y#)=EFPMvyl`QVg<^Rb2sd#ny8a6XdR7t7D^YH#TM4Zp$?jGpk`TlB*G zH{15Ag5#5?I{v)#zHH&|zpMVu%}Zz6X!P>DxZhLu7~!kGvK|+8gS_kM>gTe~DWM4f D!KQZ` diff --git a/mods/mobs_mc/textures/bones_side.png b/mods/mobs_mc/textures/bones_side.png deleted file mode 100644 index 88fdfddf37a5a5189fa6cdd5247aabf4dd8a8286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z`$AH z5n0T@z;^_M8K-LVNi#4ou$OrHy0YJ4lM&;U%U=6^J_7^8W=|K#5RHkclNtq&DsVVQ zwgk?(zSQcBd(ixk=H*{E2y{54q?tUMliaiGTBKQhNod5)zgv&$OIpou`=P{Mc&c2+ zy6R2@%Mp)g$@6TJ^qM{?N=X)dT%ypyGH*uH6FU?CHEXPnPVtcJZeH(Dyvfn@{k_+} zzr{JKD1BP-MSUlaU`XQ5nq4~?XJ+o`^8RT3Klb5i&UXi-SwC+%vh~-qfScioJ0+Sd qY;J{LJud#mh2_hI=KZn%7~N*S-k44ofy`glX=O&z`$AH z5n0T@z;^_M8K-LVNi#4ou$OrHy0YJ4lM&-HDvCIMXxws}{JKy{zRgcY7J)E?48||4{ElMHXY7#J8lUHx3vIVCg!0EEP9=Kufz