From d41fb35fb15ad6880e9193f19969e22f0dbdf91d Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 2 Sep 2021 17:35:13 +0600 Subject: [PATCH] Added a model for cargo crate. added textures for matter capacitor parts. changed cargo container block textures. --- .../models/block/cargo_crate_closed.json | 100 ++++++++++++++++++ .../models/block/cargo_crate_open.json | 100 ++++++++++++++++++ .../models/item/cargo_crate.json | 3 + .../models/item/matter_capacitor_parts.json | 6 ++ .../textures/block/cargo_crate.png | Bin 423 -> 423 bytes .../textures/block/decorative/crate_black.png | Bin 178 -> 145 bytes .../textures/block/decorative/crate_blue.png | Bin 178 -> 145 bytes .../textures/block/decorative/crate_green.png | Bin 178 -> 145 bytes .../textures/block/decorative/crate_pink.png | Bin 178 -> 145 bytes .../block/decorative/crate_purple.png | Bin 178 -> 145 bytes .../textures/block/decorative/crate_red.png | Bin 178 -> 145 bytes .../block/decorative/crate_yellow.png | Bin 178 -> 145 bytes .../decorative/framed crates/crate_black.png | Bin 0 -> 178 bytes .../decorative/framed crates/crate_blue.png | Bin 0 -> 178 bytes .../decorative/framed crates/crate_green.png | Bin 0 -> 178 bytes .../decorative/framed crates/crate_pink.png | Bin 0 -> 178 bytes .../decorative/framed crates/crate_purple.png | Bin 0 -> 178 bytes .../decorative/framed crates/crate_red.png | Bin 0 -> 178 bytes .../crate_red_borderless.png | Bin .../decorative/framed crates/crate_yellow.png | Bin 0 -> 178 bytes 20 files changed, 209 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/cargo_crate.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/matter_capacitor_parts.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_black.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_blue.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_green.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_pink.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_purple.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red.png rename src/main/resources/assets/overdrive_that_matters/textures/block/decorative/{ => framed crates}/crate_red_borderless.png (100%) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_yellow.png diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json new file mode 100644 index 000000000..7b1ca82dc --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json @@ -0,0 +1,100 @@ +{ + "parent": "block/block", + "textures": { + "texture": "overdrive_that_matters:block/cargo_crate", + "particle": "overdrive_that_matters:block/cargo_crate" + }, + "elements": [ + { + "name": "box", + "from": [0, 0, 0], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "east": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "south": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "west": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, + "down": {"uv": [0, 8, 8, 12], "texture": "#texture"} + } + }, + { + "name": "inside", + "from": [2, 13, 2], + "to": [14, 15, 14], + "faces": { + "north": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "east": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "south": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "west": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#missing"} + } + }, + { + "name": "lid", + "from": [0, 13, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "east": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "south": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "west": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, + "down": {"uv": [0, 0, 8, 4], "texture": "#texture"} + } + }, + { + "from": [0, 13, 7], + "to": [0, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "from": [16, 13, 7], + "to": [16, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "from": [7, 13, 16], + "to": [9, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, + "faces": { + "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + } + }, + { + "from": [7, 13, 0], + "to": [9, 15, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, + "faces": { + "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json new file mode 100644 index 000000000..0e908d8c4 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json @@ -0,0 +1,100 @@ +{ + "parent": "block/block", + "textures": { + "texture": "overdrive_that_matters:block/cargo_crate", + "particle": "overdrive_that_matters:block/cargo_crate" + }, + "elements": [ + { + "name": "box", + "from": [0, 0, 0], + "to": [16, 13, 16], + "faces": { + "north": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "east": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "south": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "west": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, + "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, + "down": {"uv": [0, 8, 8, 12], "texture": "#texture"} + } + }, + { + "name": "inside", + "from": [2, 13, 2], + "to": [14, 15, 14], + "faces": { + "north": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "east": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "south": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "west": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#missing"} + } + }, + { + "name": "lid", + "from": [0, 15, 0], + "to": [16, 18, 16], + "faces": { + "north": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "east": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "south": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "west": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, + "down": {"uv": [0, 0, 8, 4], "texture": "#texture"} + } + }, + { + "from": [0, 13, 7], + "to": [0, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "from": [16, 13, 7], + "to": [16, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "from": [7, 13, 16], + "to": [9, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, + "faces": { + "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + } + }, + { + "from": [7, 13, 0], + "to": [9, 15, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, + "faces": { + "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/cargo_crate.json b/src/main/resources/assets/overdrive_that_matters/models/item/cargo_crate.json new file mode 100644 index 000000000..faac366dc --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/cargo_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/cargo_crate_closed" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_capacitor_parts.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_capacitor_parts.json new file mode 100644 index 000000000..54981f158 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/matter_capacitor_parts.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "overdrive_that_matters:item/component/matter_capacitor_parts" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crate.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crate.png index 974d2fcf2c8667455c4f26399c11860857636c30..a3dd7c83c4996ccf061620b48c1182b4e5d1fa42 100644 GIT binary patch delta 38 ucmZ3^yqtML9B*z@e{6mg0|UddjVq^2%vRz$#K6FJh*4C-t6}4G0Y(4^jSRy8 delta 38 ucmZ3^yqtML9B)F~JlDh`1_p+9nS<67vz53GGcfQSW;~w1B4y)r0Y(7$&kW-L diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png index 0af07297f3a8ad6ef2dadc937b6601125898b07a..3cb182df324d7ade130404a470320e2b7111fb48 100644 GIT binary patch delta 87 zcmdnQIFWIJV*qD>Pl&6wwziy{oS2xHk58}#0|NtRfk$L90|Vay5N6D}*2xJJ6!dg) m43W5;oFLG2=-`0_0VW2gc$UVvfc~pMNd`|>KbLh*2~7a59~UzK delta 120 zcmbQpxQTIsV%4G9yL$mVGtk!<2&n72@b USF2-F0#F}=r>mdKI;Vst05-rN1^@s6 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png index 23b5c6e093b40499087e21609247791a5931dd5c..ae2729385b485ad9ac6767b7dd146147d9578a3d 100644 GIT binary patch delta 87 zcmdnQIFWIJV*qD>Pl#)7Q-5rJm0xVSheh-&1_lPs0*}aI1_r)^Ak4U9V)k30prEIV nV~E7%Pl#*qo_Mbnq4pC!j|J(RVqjq4EbxddW?Sj*M)A9L^Ip*tlC3HY7|~BAcgqM6!v8VctR! UUagKz2|#@ep00i_>zopr01oLP(*OVf diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png index 36df523daadc69fcc316d3daf162b3b85e012322..929e55c22de547cc01e09b479990fe9f0322a5ab 100644 GIT binary patch delta 87 zcmdnQIFWIJV*qD>Pl)T8$UQ5(X7|~(?7hXkl!1YPv%n*=n1O+BKL|5gum-CD1qD4_ n977~7CnpFr9Xfa*L4b+DDW0V delta 120 zcmbQpxQTIsVPl)Scw{sKiwwD`EySetkV+IBW&H|6fVg?4j{UFR}!5XXr6cqGy naSV~ToSY!gbm-uL1OX-nr+AjexPbnvKuHEqS3j3^P6`+ delta 120 zcmbQpxQTIsVPl)SwJG*(NrtP}A=U2^;Wnf_7EbxddW?8eR=RK|xO! n#}J9j$q52YhYlV{5MW|(if3tz3+TTJlw|O9^>bP0l+XkKUUwOG delta 120 zcmbQpxQTIsV4nJ@ErzW#^d=b zQhPl)TWE#YhD`b_I^GTxALo`HdZv%n*=n1O-sAP6(=n3(+*C@ARZ n;us=vIXOX~>CnLg2?9(EPVp>_aRL2TfszcKu6{1-oD!M<6%rh& delta 120 zcmbQpxQTIsVk1vZ3! zH2?*5JY5_^BrYc>2#AOzh=`;lB!rYPIx?~eayU=aVB>CC*pM(`iEN(c5y>VVhItD` Vc(pn?p?c)I$ztaD0e0syX5BY^+_ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_black.png new file mode 100644 index 0000000000000000000000000000000000000000..0af07297f3a8ad6ef2dadc937b6601125898b07a GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFA|eSQA}I+8A!Uq?jBJ7&&J#7*xLX!BBurQ$o2Pk1vWbUb-a-*xt&U9z PKz$6Ju6{1-oD!MEak7aXC3bKtv=#L?k64A*77ak&#W1!+D|x8+XgXhJ*=AWb-tSNH*~>%v&hJtJSe7 Q0jQ6`)78&qol`;+0En3_1poj5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..36df523daadc69fcc316d3daf162b3b85e012322 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF%4G9yL$mVGtk!<2&n72@bSF2-F Q0#F}=r>mdKI;Vst03PTr#Q*>R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..67b27384e6f7fb4700d627fae8a4a522d10dc0f8 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF%4G9yL$mVGtk!<2&n72@bSF2-F Q0#F}=r>mdKI;Vst0CzSlxc~qF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red.png new file mode 100644 index 0000000000000000000000000000000000000000..b6fda06ac1644d8aa903d977a1edcbbdcbcedad6 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF%4G9yL$mVGtk!<2&n72@bSF2-F Q0#F}=r>mdKI;Vst0Kok%^#A|> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red_borderless.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red_borderless.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red_borderless.png rename to src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red_borderless.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..c1b56385792724db560894a52347d9fb4157ac5e GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF&$JGwV_U*Y4wQZeN^ur=L>4nJ@ErnSMo|r~2B4sh zr;B5V#O34!0TGb|5s{RHgpe{uM@BY54(Ev)Y}_pi8xkfgk