From f6e48e550e808e011562c4081d37c3c8fd78e2b5 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Fri, 3 Sep 2021 18:55:53 +0600 Subject: [PATCH 1/2] Added Matter capacitor parts. Added titanium ore stuff --- .../block/resource/deepslate_tritanium_ore.png | Bin 0 -> 283 bytes .../textures/block/resource/tritanium_ore.png | Bin 0 -> 285 bytes .../block/resource/tritanium_raw_block.png | Bin 0 -> 240 bytes .../item/component/matter_capacitor_parts.png | Bin 0 -> 260 bytes .../textures/item/component/matter_io_port.png | Bin 255 -> 260 bytes .../item/component/matter_transform_matrix.png | Bin 273 -> 271 bytes .../item/resources/tritanium_ore_clump.png | Bin 0 -> 263 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_raw_block.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ore_clump.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..1cff8f4670747feb3f2dcc59752182040481b240 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF3YjO}^y>Om)hUbgBvX0)y&QAK(Ov2xp)U;I{ zC-ZJSdPz!O=Wq3jJ?2RtCnP-E!@1(o54q~*O*5Dck9}L{tHSv1kl$a`gdsEv333IpT4k% XJ(9NgVI^t;bPMEd0&H|6f zVg?4j{UFR}!5XXr6zuSHaSV~TEPBq6ugO4y?LvQx!RNm%dv)U$+&B`s@*s1De}b0s zBG1DwSQg)lh`s-Xp(BrnGwW^cRj!omLn;3sSv}ildg1u$D+`rRd8gRgh?eYFndIBj zdHUEld8VI1|PWIcT=FyZM zk`pG~QQ6U_o!xLf<~7TuJ10FeszjV_+|=&w{nPtATR}Txp;_+}0hjbgTe~DWM4fPU%%6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png new file mode 100644 index 0000000000000000000000000000000000000000..3d368b089102892bfae6a640667699b8c1520ac6 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oz`#H;F|qpkdNnmQkLdr7LC+Hs5=>1^f$|$PtDXWW&XOR%;Qvs- z5bR$e1QIOph%9Dc;M)(vj25iHDnP+lPZ!4!jo{q=+k6cM9L|~<$N$%Fj9E4#MTfsr9X^9)@ZOlXLryY#v9;IU#PaT|Y?l3> pB|5&g4#xd{j z1{V{BC+wKy{6*V#`$5H0D=wq+oSS;?NsmA?~Rk!UV^ zW=TXrR47wzj$01EAP59`DRBP_cd2Mh)A>+#6awXk5_H&tfv|`!(XRyznGuhM70DR6 zde*IEB7$O02$T>QH+VYCK-nUEx<`v@i9n9sf?@HphN=?x7Q~8_iSzKk`t_y7MdkxG W1_V^#SamW00000NS%G}f0G|+78xQ~7rvACR&os_jp{=d$7n=^0S;)!oA4sv61o;L32LlEvZ)P{3 z5NCl$WHAE+-+mBgv|tTZ0Sab#x;Tbt1jqJ8^BpnZI8t%{{|VXVT~Vc<1aGo5omIC_ zZ29fl?;*a{pj*T$ExvV<<~Jvqc43ygSE8S{bTI1XaSC6$yF`E|{!YKQZj#TTj;Jfl vT)h`6OkW@J?pd%UZtec7`p^Hf%&cU1BE`I&Z*R|Ipq&h!u6{1-oD!M Date: Sat, 4 Sep 2021 03:53:32 +0600 Subject: [PATCH 2/2] Added a gravitational disruptor item model --- .../models/item/gravitational_disruptor.json | 186 ++++++++++++++++++ .../textures/item/gravitational_disruptor.png | Bin 0 -> 406 bytes .../item/gravitational_disruptor_effect.png | Bin 0 -> 1346 bytes .../gravitational_disruptor_effect.png.mcmeta | 1 + 4 files changed, 187 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/gravitational_disruptor.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png.mcmeta diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/gravitational_disruptor.json b/src/main/resources/assets/overdrive_that_matters/models/item/gravitational_disruptor.json new file mode 100644 index 000000000..37a2a9c27 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/gravitational_disruptor.json @@ -0,0 +1,186 @@ +{ + "textures": { + "charge": "overdrive_that_matters:item/gravitational_disruptor_effect", + "particle": "overdrive_that_matters:item/gravitational_disruptor", + "texture": "overdrive_that_matters:item/gravitational_disruptor" + }, + "elements": [ + { + "name": "shell", + "from": [5, 0, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#texture"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#texture"} + } + }, + { + "name": "shell", + "from": [5, 11, 5], + "to": [11, 14, 11], + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#texture"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#texture"} + } + }, + { + "name": "coreholder", + "from": [6, 3, 6], + "to": [10, 11, 10], + "faces": { + "north": {"uv": [12, 0, 16, 8], "texture": "#texture"}, + "east": {"uv": [12, 0, 16, 8], "texture": "#texture"}, + "south": {"uv": [12, 0, 16, 8], "texture": "#texture"}, + "west": {"uv": [12, 0, 16, 8], "texture": "#texture"}, + "up": {"uv": [8, 6, 12, 10], "texture": "#texture"}, + "down": {"uv": [8, 6, 12, 10], "texture": "#texture"} + } + }, + { + "name": "charge", + "from": [5.5, 3, 5.5], + "to": [10.5, 11, 10.5], + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#charge"}, + "east": {"uv": [12, 0, 16, 8], "texture": "#charge"}, + "south": {"uv": [8, 0, 12, 8], "texture": "#charge"}, + "west": {"uv": [4, 0, 8, 8], "texture": "#charge"}, + "up": {"uv": [8, 6, 12, 10], "texture": "#texture"}, + "down": {"uv": [8, 6, 12, 10], "texture": "#texture"} + } + }, + { + "name": "handle", + "from": [9, 14, 7], + "to": [10, 15, 9], + "faces": { + "north": {"uv": [8, 13, 9, 14], "texture": "#texture"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "south": {"uv": [11, 13, 12, 14], "texture": "#texture"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#texture"} + } + }, + { + "name": "handle", + "from": [6, 14, 7], + "to": [7, 15, 9], + "faces": { + "north": {"uv": [11, 13, 12, 14], "texture": "#texture"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "south": {"uv": [8, 13, 9, 14], "texture": "#texture"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#texture"} + } + }, + { + "name": "handle", + "from": [6, 15, 7], + "to": [10, 16, 9], + "faces": { + "north": {"uv": [8, 12, 12, 13], "texture": "#texture"}, + "east": {"uv": [12, 12, 14, 13], "texture": "#texture"}, + "south": {"uv": [8, 12, 12, 13], "texture": "#texture"}, + "west": {"uv": [12, 12, 14, 13], "texture": "#texture"}, + "up": {"uv": [8, 10, 12, 12], "texture": "#texture"}, + "down": {"uv": [8, 11, 12, 13], "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [10, -0.2, 4], + "to": [12, 14.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [11, 7, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [10, -0.2, 10], + "to": [12, 14.2, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [11, 7, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [4, -0.2, 10], + "to": [6, 14.2, 12], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [4, -0.2, 4], + "to": [6, 14.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [65, 0, 0], + "translation": [0, -4, -4.75], + "scale": [0.7, 0.7, 0.7] + }, + "thirdperson_lefthand": { + "rotation": [65, 0, 0], + "translation": [0, -4, -4.75], + "scale": [0.7, 0.7, 0.7] + }, + "firstperson_righthand": { + "translation": [0, 0, -1] + }, + "firstperson_lefthand": { + "translation": [0, 0, -1] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [0.8, 0.8, 0.8] + }, + "gui": { + "rotation": [45, 45, 0], + "translation": [0, 0.75, 0], + "scale": [0.9, 0.9, 0.9] + }, + "head": { + "translation": [0, 14.25, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor.png new file mode 100644 index 0000000000000000000000000000000000000000..97f5c3b210e89ce93f79d8f0f80d535963e47be1 GIT binary patch literal 406 zcmV;H0crk;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TT|2}PHf z@AV!e$6c#Gc-(g(ckjFJ&Ut^H)MVhLf6wDOdssBXVM4SS->qh8n)1Z=eL9DD+Wt^k zmi*CmT?)M(YZGA@Dn(Qj1)V`)F&3g^BO6s!b&4IBh~t>YJb#?CPf$2i6dg3rLd0VWDUobpAiN0cZ!DWf^P1nt_1DSA#WOT;5Pwj3@{KYG0$XnU0JO zmit>CvBCB5mA>~M^z}AwLd`oz;t-Dk+n-HmEH;J88=%{KS93{c0XF4EpmqNJkaSKS zK_`l$8l|T8htvjdL4OZ|^%jr^&{O|2x>Ykozm8>_7wxasyZ`_I07*qoM6N<$f}I_w AuK)l5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png b/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..9a441ec4828e7d0c3ba21e6d717ed1b3ad4c964d GIT binary patch literal 1346 zcmV-I1-<%-P)EK|00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!To5>S9h#s4Dqu?suY=G4ETN9KB@Kics32P^paH7j-80b$*|B5KtlmQR^H?7LjK+#| zER(Psq@Q8ftGJbYYsY)>kFtaO=Y`|u-)My%O6lU_SJ}zDv+iZ=A8Ds(KZ;7}QSW3= zvd7|kty(N->%UtDP(fMR(jy#*q`&sAk6~l zIGXpCs9LtMKxWUzGz$o5JE=t$W&tHcO0xj9Ohnce=S>s-#XEwG+a>51ZIEVxZFe5@ z01`dyO}!$;0&O43Ak6~VE8TE93gXD1?bvreU$~AKi3A^Ss<~46TQ|=?+B9LN*#?U79jsg zRf+}pmO&FW!~)cL&;yuCPqb1NVu9@HY<-ml(mmt-MH?v=aQ?InLM$*5MHZeHu+8~o zkY)iQK$-<)(f<7)%mUPT&;uYki4UB1l+F1JAbUq>k1u7gi3PIR*}9fckpa($e1a1GW z{lD?)^NYV>o@NkY0b=ZH$*};R4Du|HIDrd2>gwMMnk>lr!`mRm0yeA-NL8iZJGD|H zC$0X5nGDh_knTGVdH_@DfmX^wEWmFw2(th&2H25e0X`YjlqjXmERYUd=+Avhtln!e zKkgOb*LMsuNV5R(`k$H?6#wFHC?OWe9y*L=L;wH) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png.mcmeta new file mode 100644 index 000000000..b14454b15 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/item/gravitational_disruptor_effect.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "frametime": 1 } } \ No newline at end of file