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 b29ca14a..b4b77f21 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 e203470a..22f6c175 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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#RHU#*DxITOH+87Oh&gdh^0%>n2W}J7LP4sWTT&nl^9t{N-~O zuAIMk_58(a<}O^dcGK<+TlcM6zvIyHi#zw9*uLlJ-a}_5PoLk~IiY{@?8cVv`linA z{%La-EU#zz1LTSwo((8S2t%+SbG-@sT`&rna_NJrN|UO`DwNku_XSx#QDvv*2UTW@>! zBw0BHC1q7{aY-$0y%}?s%v-!#Sw+p*#N5=((!|ul%);8*)?w+YO{EoehfiMKy6doy zUy!eVa6oW)a9EUIK!~?*pof>=|NsB}0z+->oSa-doSfb59b9be9KC!3T->}I99M1`HQETv|@7_*yD^{8Vq~1NL>RfBifCHhlg4J$ot!D{)vt>tU=G?D`K0FC`=G-G&HIFMVd-e3kNe1#fGiJ55U397x>eryimEQ%3)+` z+O2xsBr=likY@|0;Nm^AwR?3A&z`KYahZdgOv1%OTXH!fCm9{xs8(lB zIKntRRz^XxAi*-AtkB^_1e?qYS8?`RJ@=N-OX0uYFp1@teGU z&~@8~4FZXLDmuy&Yd*~q>B~`?9gm6-$6d--#$j3#S;*)!%ne{RPe~%9;=%XZc#j$gI9&fE zH0Pm~h4hoo0|##|wq6}}P5(Yq{zv|T7wq?rC(29w{kMQW?DC=B-}MuA&0|b_&wnJR zcFU$)~4>nzkI@VwQYk@>=&6dP>25En)rt=@r^Uw-3c(#B0e+CA{=7<)z|za WU~T%WKQ#;t3=E#GelF{r5}E*@xWeK9 diff --git a/mods/ENTITIES/mcl_minecarts/models/cart.x b/mods/ENTITIES/mcl_minecarts/models/cart.x deleted file mode 100644 index 3325aafb..00000000 --- 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 zcmZ>AGIq%qVqjooU|?_x3Jum{fU=89i!<~L3=A0<7#i$RF+>Fe0|UeV|NsB{`MbF4 z3NbMFX6B_PCl-}}#2I$#6dV9Cm>3isVHjcvNECv7U4uQo2to`A3knJ5;fELuatadz z1H;$<`|TJQ80=UW81`o|n}V=CM5l&51H%J57KQ_0`5*uP+o8%|u!G9)1L<1AH3=J^a7Rh{&6iggO+cGe~%?AZ7 z)ZH-s3+zDhJP`LYeEI($fc(h-)_1_}_y7MO z_cQ$YFTY>owD5k7vk=U{u)z+b<|ou#4h98~oIR?1f<08;4kQl>ACN~7<|o*Hh3E%| z|HsG*upd4~R)EcBU|3-H7a|YR267)L{J?Gm*$u*M3=CjBApe2PhnNjgu3!(62Z@8? z2NZuu=I>)*0LkMs9~3?d>~OmeB!9pTxBrL7Y8U_XiTTm#2@(m~~Ss57YLsx3;4_&Ec zAG&fCD9zY1Ff`ag!e7B26#fu7m^{e*23y?e3lu*G@T5;r{y6|nH=y|a@c;k5kC7GN zv;j#!Ao&F_c?OU?C~bf+$lV|}gVGno{S0;>_ao`w2XZ?|9+YoE>Y@1?lm@|eK;+@} zV=*5dz998>Ap4Qbw}Y4sav!98fSM0V-{ABN3I7Flzy9wBr&Un+LDM&qe1k1JxO`Et z2l)e49uz+fwz$h5kUYqKQ2tl22l*d0{y^>r=?BSU3m=d?Og{q_{|VSb{0Pzyj{ki~ z=G!qafaF1G93&4elRgtb7GU5h$F|$~TZa#C%ZrgW?{9L5d-61DOw! z$L4=f`UI=o4@xVbe1PhHQ1~%05DI@n@rOJAfx;K$M{xOO_wTp zAb;4Qmd_CTA@bn#V~4H$0Hu3S{9vYEQ2gNYA4q-y!TJqiJ_FADjk|sV`43+IF@Wkn zjkCg_vJ+HK?uXQ$3844{VJz{>&;W{K-01_9Hu06OApgPSv4t;4egU+61%lZBcgY+LDpdai$9N`BtA7A`{%!jrAv85kS`e1&%nS1?x%qDgX%|6 z{DHy?lsUld&mZ9al>#`Ofa*s`-3XEfnGedJxcYw}c~JcclE_1`SW>GB7acFfcIaGcYiK_#n0s z0|NtSsKS7Ofx(!8fdRw^vCSA57)%)$7)%%#7|ah$1_p*e1_p)z1_p*; z1_lNYAH)u0U|?8&ThD1=Q&A`Br%)r0^;wLaLFr+asFr+dtFr+XrFr-8IAa)i5 z14AYQ149M_14A|g0|ST;V&^e1Fyt~YFyt^WFyu2ZFo5_Vb`b*uLm>kLLjeN=Loovb b1Bee|moYFflrk_dfJTMN85kHqd=MJ|CGcsQ literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_minecart.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_minecart.png new file mode 100644 index 0000000000000000000000000000000000000000..9750048b379a6ac1eb2f3ef670a9bf3051c6470d GIT binary patch literal 624 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{GLTW?*0l*qpqbfq}swz$e6&fq_9;Sy@L% zM@B~G|NsAJ+}b`XpMimawIs+d znBo8b{|ttgPTpr=V0`82;uuoFSaOkZ$!$Lw_76-9F?=Fk!u|i}Yrf>SVPIqEOJFEi zx!tbeUtYExPwtnk8JgTY&hfF<40E?IOgbgRkXW^hnT?TQnRW8iC%N%OeDe2eRD0PB zeO_$SG&xmS*~_+!RgLj?e8V43)(iZMD;V1!dvM5CKCn1g^l}f^E8g;lS+o7+!dhmi zO_*)AvN^KC=IP`dU!K!SXJ@C$-q;-Q=2POgnX}sTe$KaH{@!^bxBX<_Hr?H~_vA{I zez1~!a@&39Vm8&>*VooGA1M9Fa9pNYA;Ri(s=yV8!*<)bvc#7#?EX<}Egr!5;qcFd zS-%=yuVv!--uwBUd+i6am|&*+zvWNXXa4HjQ}ODL?2e>)nv&-OOB%k{e3=pzejw+p zfp5RgX={VPSJ_>0A#8UyMySmGoA}UGx4_orOUl;7Ba!(!HODHsci2Cg^Lr1^o8!9D z$yJxuFEE(++rUj`%E6y`XZLBWZ0``eqpkXM`~1~j&D}Xtk0<&nas3r3y_9wM!-0FN zPB*Hq7UMa5HtwW