From 7364f7d2d81099183eeee606a224d977a1e2542c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 2 Mar 2023 05:41:13 +0600 Subject: [PATCH] Tritanium shield, exosuit upgrade modules texture update --- .../models/item/tritanium_shield.json | 147 ++++++++++++++++++ .../item/tritanium_shield_blocking.json | 139 +++++++++++++++++ .../textures/block/tritanium_anvil.png | Bin 0 -> 500 bytes .../textures/block/tritanium_anvil_top.png | Bin 0 -> 461 bytes .../item/exosuit_crafting_upgrade.png | Bin 243 -> 273 bytes .../item/exosuit_inventory_upgrade.png | Bin 245 -> 279 bytes .../exosuit_inventory_upgrade_creative.png | Bin 236 -> 290 bytes 7 files changed, 286 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/tritanium_anvil.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/tritanium_anvil_top.png diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield.json b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield.json new file mode 100644 index 000000000..2a49c326d --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield.json @@ -0,0 +1,147 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "0": "overdrive_that_matters:item/tritanium_shield", + "particle": "overdrive_that_matters:item/tritanium_shield" + }, + "elements": [ + { + "from": [5, 7, 5], + "to": [11, 9, 11], + "faces": { + "north": {"uv": [8, 1.5, 8.5, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 8.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [10, 1.5, 10.5, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 0, 9, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 3, 8.5, 1.5], "texture": "#0"}, + "down": {"uv": [8, 1.5, 6.5, 3], "texture": "#0"} + } + }, + { + "from": [11, 2, -3], + "to": [12, 14, 19], + "faces": { + "north": {"uv": [0.25, 0.25, 3.25, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 0.25, 3.25, 5.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [3.25, 0, 6.25, 0.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [3.5, 0.25, 6.5, 5.75], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0.25, 5.75, 0, 0.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.5, 0.25, 3.25, 5.75], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11.6, 12, -4], + "to": [12.6, 13, 20], + "faces": { + "north": {"uv": [0, 9.5, 0.25, 9.75], "texture": "#0"}, + "east": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 15.75, 0.25, 16], "texture": "#0"}, + "west": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"}, + "down": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"} + } + }, + { + "from": [11.6, 3, -4], + "to": [12.6, 4, 20], + "faces": { + "north": {"uv": [0, 9.5, 0.25, 9.75], "texture": "#0"}, + "east": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 15.75, 0.25, 16], "texture": "#0"}, + "west": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"}, + "down": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"} + } + }, + { + "from": [11.6, 4, -1.1], + "to": [12.6, 12, -0.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "from": [11.6, 4, -3.1], + "to": [12.6, 12, -2.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "from": [11.6, 4, 16.1], + "to": [12.6, 12, 17.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "from": [11.6, 4, 18.1], + "to": [12.6, 12, 19.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [90, 0, 0], + "translation": [0, -2, 4] + }, + "thirdperson_lefthand": { + "rotation": [90, 0, 180], + "translation": [0, -2, 4] + }, + "firstperson_righthand": { + "rotation": [90, -5, -90], + "translation": [-1.75, -7, 4] + }, + "firstperson_lefthand": { + "rotation": [90, -5, 90], + "translation": [-1.75, -7, 4] + }, + "ground": { + "rotation": [90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [91, -9, 115], + "translation": [1, -0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "fixed": { + "rotation": [90, 0, -90], + "translation": [0, 0, 0.5], + "scale": [0.5, 0.5, 0.5] + } + }, + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "overdrive_that_matters:item/tritanium_shield_blocking" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json new file mode 100644 index 000000000..ee8421417 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json @@ -0,0 +1,139 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "0": "overdrive_that_matters:item/tritanium_shield", + "particle": "overdrive_that_matters:item/tritanium_shield" + }, + "elements": [ + { + "from": [5, 7, 5], + "to": [11, 9, 11], + "faces": { + "north": {"uv": [8, 1.5, 8.5, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 8.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [10, 1.5, 10.5, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 0, 9, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 3, 8.5, 1.5], "texture": "#0"}, + "down": {"uv": [8, 1.5, 6.5, 3], "texture": "#0"} + } + }, + { + "from": [11, 2, -3], + "to": [12, 14, 19], + "faces": { + "north": {"uv": [0.25, 0.25, 3.25, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 0.25, 3.25, 5.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [3.25, 0, 6.25, 0.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [3.5, 0.25, 6.5, 5.75], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0.25, 5.75, 0, 0.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.5, 0.25, 3.25, 5.75], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11.6, 12, -4], + "to": [12.6, 13, 20], + "faces": { + "north": {"uv": [0, 9.5, 0.25, 9.75], "texture": "#0"}, + "east": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 15.75, 0.25, 16], "texture": "#0"}, + "west": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"}, + "down": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"} + } + }, + { + "from": [11.6, 4, 18.1], + "to": [12.6, 12, 19.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "from": [11.6, 3, -4], + "to": [12.6, 4, 20], + "faces": { + "north": {"uv": [0, 9.5, 0.25, 9.75], "texture": "#0"}, + "east": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 15.75, 0.25, 16], "texture": "#0"}, + "west": {"uv": [0, 9.75, 0.25, 15.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"}, + "down": {"uv": [0, 9.75, 0.25, 15.75], "texture": "#0"} + } + }, + { + "from": [11.6, 4, 16.1], + "to": [12.6, 12, 17.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "from": [11.6, 4, -1.1], + "to": [12.6, 12, -0.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "from": [11.6, 4, -3.1], + "to": [12.6, 12, -2.1], + "faces": { + "north": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.25, 10, 2.25, 10.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [90, 39, -40], + "translation": [1, -2, 0] + }, + "thirdperson_lefthand": { + "rotation": [90, 0, 180], + "translation": [0, -2, 4] + }, + "firstperson_righthand": { + "rotation": [90, -5, -90], + "translation": [-1.75, -7, 4] + }, + "firstperson_lefthand": { + "rotation": [90, -5, 90], + "translation": [-1.75, -7, 4] + }, + "ground": { + "rotation": [90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [91, -9, 115], + "translation": [1, -0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "fixed": { + "rotation": [90, 0, -90], + "translation": [0, 0, 0.5], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/tritanium_anvil.png b/src/main/resources/assets/overdrive_that_matters/textures/block/tritanium_anvil.png new file mode 100644 index 0000000000000000000000000000000000000000..3d489f5fa1e0560ff213168fbf19a4eadcf7414b GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STO-)ThLP8P}64cbxV)LtVoBGT9XE)AT5t5QCCnx6~60NPRomSZb zR9@>h5vZGiuO!GX_&+jWa6NG61W<;vz$3C4sNgUNGak=hkpgsprKgKyh=u>!NwUrF|YtjOWlfJ#$8-M*d|Bo1+Z!_#KGObuuQQPaeK%lkD*u!3Er`Qg{N!i8PIm*rSARpcgKP!HJEIVbO7wZr`B6HeED zzp&uJUFT`X7rEJR+z?K!Nb2|easA!g4Gor!hI2A^wzI0t2>sEYzK@^VgX4eU#^m;! z|79I#{JH;7DgA$WMf;ck9u`7mEgY5M_phxtyKmRTPEx4PsxmNfjo@$KWR te-AZw$$URxengASHII?g{>{6;+<~v;ygy{!=LQBJgQu&X%Q~loCIB>X#FPL4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_crafting_upgrade.png b/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_crafting_upgrade.png index 14e1e9fe3f3388cedeecc511846bd31d50791a99..ab31babfcfb3ef91c8486ceb9a67ad44cf1a620b 100644 GIT binary patch delta 216 zcmey&IFV_BW4&B}Pl#(^VBm@sD{kJrdC&I0n3z~oQ?y!pa(=^qpKhVQJ>m2A?U%PgaSRx)_H`njxg HN@xNA1>94e delta 165 zcmbQp^qFyjqos6!Pl#(^V4#?oSbcr{J=_0>O&=5#6!`pSFf}!0U|?W*y88u?;w%aB z3;quU48i^tLKEvG5`8>f978mMOS>KU4k&Q2xTZe+udm0;eM`;n+o6<ug23uxud}BVa{DX9X;!XBAow_I8YgAkvHx?#-V_@%OF$(_4^a^Mj NgQu&X%Q~loCIIG2L!STu diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_inventory_upgrade.png b/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_inventory_upgrade.png index 193a436a51169329bbf4d667e38189e4c9329b56..4d127ba2c6491e8628f4ba2b36390b382ba1777b 100644 GIT binary patch delta 201 zcmey$IGt&NqoZPgPl#(^VBm@sD{kJrdD!&9J=_0cVq#5AO{S)%YHDge{~3VbU~KC< zAjMr0$`ba4#P2#!4$DAb_9!4j~*<-bl`PxcwDh<)AUAos`njxgN@xNAm3ma# delta 188 zcmbQv^p$afW4&B}Pl#(^V4#?oSbcqcK|#S`(+Br#|NH!B2n!1{H8o{mU}*AHYy(nU zB|(0{|6zb((;1!fKvB*DkH}&M2EP3u%xJ+HtO6AD@^oz;VRkmDd0N z8@d(VTFg7MQab3P_@hmW6t}hJCnoEgw*A$UN=YnJVaPj}evg?e^`dk_plkgaSXOP%{jmUOEQ6=3pUXO@geCx_mPmsD diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_inventory_upgrade_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_inventory_upgrade_creative.png index 81826e77f3802ac1341d073359d930084d370cde..e81bd8a990ac6cbf65175981a93a71d7838b9c28 100644 GIT binary patch delta 233 zcmaFExQJFSdvWgFuM>8tC#9u4jo-V$?re;UbMYrfXWp-V&pCHVi3zjuDdq({ zlT2V-aksoxDnXESM{W}5{Rh5kf{nTi6TW^;k|GI+ZBxvX}>h delta 179 zcmZ3)^oDVQW4%OxPl)S=RN)d0mcL))Z%r3IZ2I7y?SG&D3_!4dR~;je;wTC73;quQ z4ELJ%Mgqk+3p^r=85sEXgD|57Yp@DX(9_e!F+?MHZl5FH0R;}0g*Tr5w|}R^();q{ z&bJ0?UGg2L``RkZ{oepCH*QDbP0l+XkKiyla|