From c131fdfd706f5fbc051ef16bb7d3e82d7a7f4401 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 15 Aug 2017 13:20:11 +0200 Subject: [PATCH] Use minecart model by 22i --- mods/ENTITIES/mcl_minecarts/README.txt | 21 +- mods/ENTITIES/mcl_minecarts/init.lua | 6 +- mods/ENTITIES/mcl_minecarts/models/cart.png | Bin 1502 -> 0 bytes mods/ENTITIES/mcl_minecarts/models/cart.x | 339 ------------------ .../models/mcl_minecarts_minecart.b3d | Bin 0 -> 4727 bytes .../textures/mcl_minecarts_minecart.png | Bin 0 -> 624 bytes 6 files changed, 9 insertions(+), 357 deletions(-) delete mode 100644 mods/ENTITIES/mcl_minecarts/models/cart.png delete mode 100644 mods/ENTITIES/mcl_minecarts/models/cart.x create mode 100644 mods/ENTITIES/mcl_minecarts/models/mcl_minecarts_minecart.b3d create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_minecart.png diff --git a/mods/ENTITIES/mcl_minecarts/README.txt b/mods/ENTITIES/mcl_minecarts/README.txt index b29ca14a5b..b4b77f21c1 100644 --- a/mods/ENTITIES/mcl_minecarts/README.txt +++ b/mods/ENTITIES/mcl_minecarts/README.txt @@ -4,34 +4,25 @@ Based on the mod "boost_carts" by Krock. Target: Run smoothly and do not use too much CPU. TODO: -- Make minecart smaller - Minecraft-like physics -- Change minecart model and textures - Add activator rail - Add more rail textures - Add loaded minecarts License of source code: ----------------------- -WTFPL - -License of media (textures, sounds and models): ------------------------------------------------ MIT License -Authors of media files: +Authors/licenses of media files: ----------------------- -Zeg9: - cart.x -kingoscargames: - cart.png +Minecart model: + 22i (GPLv3) -Wuzzy (based on Faithful 1.11): +Wuzzy (based on Pixel Perfection 1.11, MIT License): carts_rail_crossing_pwr.png carts_rail_curved_pwr.png carts_rail_t_junction_pwr.png -Vattic et al. (Faithful 1.11 resource pack): - carts_rail.png - carts_rail_pwr.png +Other texture files (CC BY-SA 3.0: + XSSheep diff --git a/mods/ENTITIES/mcl_minecarts/init.lua b/mods/ENTITIES/mcl_minecarts/init.lua index e203470ae1..22f6c175d4 100644 --- a/mods/ENTITIES/mcl_minecarts/init.lua +++ b/mods/ENTITIES/mcl_minecarts/init.lua @@ -15,11 +15,11 @@ dofile(mcl_minecarts.modpath.."/rails.lua") mcl_minecarts.cart = { physical = false, - collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, + collisionbox = {-10/16., -0.5, -10/16, 10/16, 0.25, 10/16}, visual = "mesh", - mesh = "cart.x", + mesh = "mcl_minecarts_minecart.b3d", visual_size = {x=1, y=1}, - textures = {"cart.png"}, + textures = {"mcl_minecarts_minecart.png"}, _driver = nil, _punched = false, -- used to re-send _velocity and position diff --git a/mods/ENTITIES/mcl_minecarts/models/cart.png b/mods/ENTITIES/mcl_minecarts/models/cart.png deleted file mode 100644 index 8a710a91eb7c8ea902972f7c583bdc53696fcbcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1502 zcmV<41tI#0P)+ z)85_V?#RyA)!XL2!_BF!wxp@CmYSlOou!_ls-~;6p{A~pm7S23oRyiOl9ryEpQoLn zsh^{(pQEgup{lL2yRfyss;{`h$I-dJ$hW-3y~50sm!E}+kdKp_frN{Hf{BZdmYkrc zeu0RMk(e178yFZG8X6oM93C1Q9UL7Wnx3YirLCo@v8SuEsjan+lA4T=m#D3_jggrv zEH5xIG%_lzjg*3hjfabp9UdSeBPACX z87eC-n4F}ZqpKq%CNnfQH8wdkH8?gnJ3BoHa0pxK}1JMO+-gZKte@5KSDx8M>aP*JUu}(H8(Oe zHc3lQM@mgMI6ON%Krb;fK2Tlv000CTNklad z$Fw#urvCr`GL_LMPY&qb;MMuglV#cVioM$FIp@!}wCnl(z*FJc`o`L3e`|YZcke>W zZF_&;a-uki(k$e;#zk3{(jG`VDa+!3IkE%K^EZO+APn7TU#al6wpLRvnX9^Ks-|t3>vK`H z?E!JR`pA19e%?OpABFGKgXlqUTU)&h%c;a>W<+XcjHCyHIfzwho%O=-yQr>lM*>cSz*>1n2 z{w8tcIRBC?&(iDOvi06O&Q*4NQu3VsbCT>hjjnsvf5zt=Jz^jPqOfnMgz70Uj5N5_ z@_PT&OGtvr{^aqMVBDytBteqZ&&@r#YuxuE9s>7#xmULVzz69=RN)k>ZUep_G0$@z zKNke6+km7m;ktYfLlV_(;5I~El51Tf{fz21V7!Kc5T0jjiRw1MwD_HEmUL08?k8MB zupETF3L({P;4$}W#@tnLylukjHb4UJAI=20 z24-p;UvY>#Bu%T^z~4KPlSxQgbsqo{6fkE(Qmfm5d>2#Sh7H9q5J1=R5}e^GI2+`N zz`@z0JF8aKFW&-h@egq52j0hF9~k}qpbu8l!j1cXkh-1$Veb#bY<;xK-1CFg^)%c& zgnZoVgQx1()v8BeTs-gbfdss~y6#~>Fn9hyf}Y>rdrg4>)2<&70=wX{)>_7oclw|h zZG5z0?l5NjdY2EtE=Vd-Fy_Cv{{R3XgII(y*53AmFUg(Yt!JA2d;kCd07*qoM6N<$ Ef}ps<;s5{u diff --git a/mods/ENTITIES/mcl_minecarts/models/cart.x b/mods/ENTITIES/mcl_minecarts/models/cart.x deleted file mode 100644 index 3325aafbc2..0000000000 --- a/mods/ENTITIES/mcl_minecarts/models/cart.x +++ /dev/null @@ -1,339 +0,0 @@ -xof 0303txt 0032 - -Frame Root { - FrameTransformMatrix { - 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 0.000000, 1.000000, 0.000000, - 0.000000, 1.000000,-0.000000, 0.000000, - 0.000000, 0.000000, 0.000000, 1.000000;; - } - Frame Cube { - FrameTransformMatrix { - 5.000000, 0.000000,-0.000000, 0.000000, - -0.000000, 3.535534, 3.535534, 0.000000, - 0.000000,-3.535534, 3.535534, 0.000000, - 0.000000,-3.000000, 3.000000, 1.000000;; - } - Mesh { //Cube_001 Mesh - 72; - -1.000000; 1.000000;-1.000000;, - -1.000000;-1.000000;-1.000000;, - 1.000000;-1.000000;-1.000000;, - 1.000000; 1.000000;-1.000000;, - -0.833334;-1.000000; 1.000000;, - -1.000000;-1.000000; 1.000000;, - -1.000000;-0.833333; 1.000000;, - -0.833334;-0.833333; 1.000000;, - -1.000000;-1.000000;-1.000000;, - -1.000000;-1.000000; 1.000000;, - 0.999999;-1.000001; 1.000000;, - 1.000000;-1.000000;-1.000000;, - 0.999999;-1.000001; 1.000000;, - 0.833332;-1.000000; 1.000000;, - 0.833333;-0.833334; 1.000000;, - 1.000000;-0.833334; 1.000000;, - 0.833332;-1.000000; 1.000000;, - -0.833334;-1.000000; 1.000000;, - -0.833334;-0.833333; 1.000000;, - 0.833333;-0.833334; 1.000000;, - 1.000000; 0.833333; 1.000000;, - 0.833334; 0.833333; 1.000000;, - 0.833334; 1.000000; 1.000000;, - 1.000000; 0.999999; 1.000000;, - 1.000000;-0.833334; 1.000000;, - 0.833333;-0.833334; 1.000000;, - 0.833334; 0.833333; 1.000000;, - 1.000000; 0.833333; 1.000000;, - 0.833334; 0.833333; 1.000000;, - -0.833333; 0.833333; 1.000000;, - -0.833333; 1.000000; 1.000000;, - 0.833334; 1.000000; 1.000000;, - 0.833334; 0.833333;-0.800000;, - -0.833333; 0.833333;-0.800000;, - -0.833333; 0.833333; 1.000000;, - 0.833334; 0.833333; 1.000000;, - -0.833333; 0.833333; 1.000000;, - -1.000000; 0.833333; 1.000000;, - -1.000000; 1.000000; 1.000000;, - -0.833333; 1.000000; 1.000000;, - -0.833334;-0.833333; 1.000000;, - -1.000000;-0.833333; 1.000000;, - -1.000000; 0.833333; 1.000000;, - -0.833333; 0.833333; 1.000000;, - 0.833333;-0.833334;-0.800000;, - -0.833334;-0.833333;-0.800000;, - -0.833333; 0.833333;-0.800000;, - 0.833334; 0.833333;-0.800000;, - -0.833333; 0.833333;-0.800000;, - -0.833334;-0.833333;-0.800000;, - -0.833334;-0.833333; 1.000000;, - -0.833333; 0.833333; 1.000000;, - -0.833334;-0.833333;-0.800000;, - 0.833333;-0.833334;-0.800000;, - 0.833333;-0.833334; 1.000000;, - -0.833334;-0.833333; 1.000000;, - 0.833333;-0.833334;-0.800000;, - 0.833334; 0.833333;-0.800000;, - 0.833334; 0.833333; 1.000000;, - 0.833333;-0.833334; 1.000000;, - -1.000000; 1.000000;-1.000000;, - -1.000000; 1.000000; 1.000000;, - -1.000000;-1.000000; 1.000000;, - -1.000000;-1.000000;-1.000000;, - -1.000000; 1.000000; 1.000000;, - -1.000000; 1.000000;-1.000000;, - 1.000000; 1.000000;-1.000000;, - 1.000000; 0.999999; 1.000000;, - 1.000000;-1.000000;-1.000000;, - 0.999999;-1.000001; 1.000000;, - 1.000000; 0.999999; 1.000000;, - 1.000000; 1.000000;-1.000000;; - 18; - 4;0;1;2;3;, - 4;4;5;6;7;, - 4;8;9;10;11;, - 4;12;13;14;15;, - 4;16;17;18;19;, - 4;20;21;22;23;, - 4;24;25;26;27;, - 4;28;29;30;31;, - 4;32;33;34;35;, - 4;36;37;38;39;, - 4;40;41;42;43;, - 4;44;45;46;47;, - 4;48;49;50;51;, - 4;52;53;54;55;, - 4;56;57;58;59;, - 4;60;61;62;63;, - 4;64;65;66;67;, - 4;68;69;70;71;; - MeshNormals { //Cube_001 Normals - 72; - 0.000000; 0.000000;-1.000000;, - 0.000000; 0.000000;-1.000000;, - 0.000000; 0.000000;-1.000000;, - 0.000000; 0.000000;-1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - -0.000000;-1.000000;-0.000000;, - -0.000000;-1.000000;-0.000000;, - -0.000000;-1.000000;-0.000000;, - -0.000000;-1.000000;-0.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - -0.000000;-1.000000; 0.000000;, - -0.000000;-1.000000; 0.000000;, - -0.000000;-1.000000; 0.000000;, - -0.000000;-1.000000; 0.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 0.000000;-0.000000; 1.000000;, - 1.000000;-0.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - -1.000000; 0.000000; 0.000000;, - -1.000000; 0.000000; 0.000000;, - -1.000000; 0.000000; 0.000000;, - -1.000000; 0.000000; 0.000000;, - -1.000000; 0.000000;-0.000000;, - -1.000000; 0.000000;-0.000000;, - -1.000000; 0.000000;-0.000000;, - -1.000000; 0.000000;-0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 0.000000; 1.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;, - 1.000000;-0.000000; 0.000000;; - 18; - 4;0;1;2;3;, - 4;4;5;6;7;, - 4;8;9;10;11;, - 4;12;13;14;15;, - 4;16;17;18;19;, - 4;20;21;22;23;, - 4;24;25;26;27;, - 4;28;29;30;31;, - 4;32;33;34;35;, - 4;36;37;38;39;, - 4;40;41;42;43;, - 4;44;45;46;47;, - 4;48;49;50;51;, - 4;52;53;54;55;, - 4;56;57;58;59;, - 4;60;61;62;63;, - 4;64;65;66;67;, - 4;68;69;70;71;; - } //End of Cube_001 Normals - MeshMaterialList { //Cube_001 Material List - 1; - 18; - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0;; - Material Material { - 0.640000; 0.640000; 0.640000; 1.000000;; - 96.078431; - 0.500000; 0.500000; 0.500000;; - 0.000000; 0.000000; 0.000000;; - TextureFilename {"cart.png";} - } - } //End of Cube_001 Material List - MeshTextureCoords { //Cube_001 UV Coordinates - 72; - 0.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 1.000000;, - 0.000000; 1.000000;, - 0.031250; 0.500000;, - -0.000000; 0.500000;, - -0.000000; 0.468750;, - 0.031250; 0.468750;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.500000;, - 0.468750; 0.468750;, - 0.500000; 0.468750;, - 0.500000; 0.500000;, - 0.468750; 0.500000;, - 0.031250; 0.468750;, - 0.468750; 0.468750;, - 0.468750; 0.500000;, - 0.031250; 0.500000;, - 0.468750; 0.000000;, - 0.500000; 0.000000;, - 0.500000; 0.031250;, - 0.468750; 0.031250;, - 0.468750; 0.031250;, - 0.500000; 0.031250;, - 0.500000; 0.468750;, - 0.468750; 0.468750;, - 0.468750; 0.031250;, - 0.031250; 0.031250;, - 0.031250; 0.000000;, - 0.468750; 0.000000;, - 1.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 0.031250; 0.031250;, - 0.000000; 0.031250;, - 0.000000; 0.000000;, - 0.031250; 0.000000;, - 0.031250; 0.468750;, - -0.000000; 0.468750;, - 0.000000; 0.031250;, - 0.031250; 0.031250;, - 0.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 1.000000;, - 0.000000; 1.000000;, - 1.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.500000;, - 1.000000; 0.000000;, - 1.000000; 0.500000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 0.500000; 0.500000;, - 0.500000; 0.000000;, - 1.000000; 0.000000;, - 1.000000; 0.500000;; - } //End of Cube_001 UV Coordinates - } //End of Cube_001 Mesh - } //End of Cube -} //End of Root Frame -AnimationSet { - Animation { - {Cube} - AnimationKey { //Position - 2; - 4; - 0;3; 0.000000, 0.000000, 0.000000;;, - 1;3; 0.000000, 3.000000, 3.000000;;, - 2;3; 0.000000,-3.000000, 3.000000;;, - 3;3; 0.000000,-3.000000, 3.000000;;; - } - AnimationKey { //Rotation - 0; - 4; - 0;4; -1.000000, 0.000000, 0.000000, 0.000000;;, - 1;4; -0.923880,-0.382683,-0.000000, 0.000000;;, - 2;4; -0.923880, 0.382683, 0.000000, 0.000000;;, - 3;4; -0.923880, 0.382683, 0.000000, 0.000000;;; - } - AnimationKey { //Scale - 1; - 4; - 0;3; 5.000000, 5.000000, 5.000000;;, - 1;3; 5.000000, 5.000000, 5.000000;;, - 2;3; 5.000000, 5.000000, 5.000000;;, - 3;3; 5.000000, 5.000000, 5.000000;;; - } - } -} //End of AnimationSet diff --git a/mods/ENTITIES/mcl_minecarts/models/mcl_minecarts_minecart.b3d b/mods/ENTITIES/mcl_minecarts/models/mcl_minecarts_minecart.b3d new file mode 100644 index 0000000000000000000000000000000000000000..692e606d2945ef635da51d0cd2b47beef537fd15 GIT binary patch literal 4727 zcma)=TXPge6vtaoM2w2Y`z`A|B48BpzB3XN1vLYqMm&h+VX>(f1%oZK;W;OgsZ$9ec@J9vVU%2e&iNYtmW5%i`{m{kX;)>``G%O0*2@}&Ul{ZohZN5?PhD`zwtcE zS9m!?U#_{U^Ch3nnIGl66Lqi3rGGZRV(V+cw*Fv$IX3(BOHe*9N8~;I3TLjDR_C|k z`Xgq4xPbkG^79!nkiP6vcTDz0-8RbaPWE@VEBnJg$j8r(w#R=pgz!t0|K)l&hK6MM zTKQ7$@=Ws5_f`E%`9+%_`Kq>Ui_ksvQ60Fe#<}UH{G(hfv!&G ze&b&^>(h@-+Q0u3pStx6^4r1xSf6sp{a#xi!}6PskJ(S%6Ng5A zxjUxZ8P1LJ>__|yfw;w3vA=T9e|!fK_JyE*qxsjNXYr>kZNT_5b0jaC7XL=B_?xVh zOMlT!*O%olU7y-Nome-lmHmO8sx;q>>r9xE4$onV~fSl>l?rHv-n*f=Qrpxz5U^Gi+`z~ z332~PN1Pt>Q~F<(KiO9_-M@7%pUcLWhUyKj(kp0X4EOTe0 zSW zO5PfJzIl9-`#XI;$-mzD7gFaV=}P1`6ta)?6ZN4?*Y#KPKOJB5-}xMle=UFM^Uvzf;-mi5yC1lItH1R5YWX+0^|!wBgV;)5G}HRc{93z(7eDE* z%a8Pz_y4N;vHDB*f9VflQ_NwUAJ4z?j6{T7=acTwjaVl-A6Mn&{*CwRcuyRZ>wK-B zKWzQ<_oM79zb~r%SAQy+>HZ;ktS?6OkE_3LtpBFtXZ?3!ZqNMhG0WcoaP0yyz|9NiYtca$dClJ+TdJ z1y4IK`dOfVRZM^#&WnB?>;%t&7n~RUGI$BR2wrhsv=XM`eHFyb?erw$F7O(79f%kG z2ABp@;7#X6zXkSy-QaEKMehYO;2p5fdC_y=T`&vgofo|yEP@5_p7WwV00+SP;6vv{ ze*!)RAAwJu7yTJH2$sMhAYSwr;4t_ceCfRCW8f$_0={xy^l|VF_!^vWUi32f7Muj9 QoEQBaI0H_D@0}O@A0_ZaaKf$YEBUm5uSNq+P9i-00005 zbW%=J0RR9005Q_Z-v9ss>PbXFRCob&(E+5}P8^twP+~|3`1XCI{=-u0FufQ0AYHj0|o&AraNPmiiwJVxB1(&rx)M_k8q}T35hq%`i=mEXzAEQR-`o zUQ`C%u~;OV{bAunEpRK(MjVvE z`EJd=D5-~t7ThZ(<+q=!N`s4R8sm{oA`1N!b<%3X@W9@x%Yh}U77WA9Udc~+1@!bt z-$#Z63VPv)>!r^cV&N~Qkp&Nz%SFj8R!8Cj<>oN=q7L+9?+HD*s({%^f9iBS&-A~T zO7&|Xa04YIa}EjW?EeiUPGFBLp|nh3ba!NiPV2xP-Pi$L6#xLPp-Brms|{2D0000< KMNUMnLSTZN=?pgj literal 0 HcmV?d00001