From 73c906804b114bc959ed03d1dd476ea7017a5a8b Mon Sep 17 00:00:00 2001 From: PaulGoersCode <102575758+PaulGoersCode@users.noreply.github.com> Date: Fri, 24 Mar 2023 01:01:05 -0500 Subject: [PATCH] Pumpkin Trio Updates Updated name of 'jacklantern_trio' to 'carved_pumpkin_trio'. Added 'jack_o_lantern_trio' model and 'small jack_o_lantern' texture. --- .../models/block/carved_pumpkin_trio.json | 80 ++++++++++++++++++ .../models/block/jack_o_lantern_trio.json | 80 ++++++++++++++++++ .../textures/block/small_jack_o_lantern.png | Bin 0 -> 1298 bytes 3 files changed, 160 insertions(+) create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/small_jack_o_lantern.png diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json b/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json new file mode 100644 index 0000000..d5bf035 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/carved_pumpkin_trio.json @@ -0,0 +1,80 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "block/oak_planks", + "2": "hyperlighting:block/small_carved_pumpkin", + "3": "block/hay_block_top", + "particle": "block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json b/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json new file mode 100644 index 0000000..1e01842 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/jack_o_lantern_trio.json @@ -0,0 +1,80 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "block/oak_planks", + "2": "hyperlighting:block/small_jack_o_lantern", + "3": "block/hay_block_top", + "particle": "block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/small_jack_o_lantern.png b/Common/src/main/resources/assets/hyperlighting/textures/block/small_jack_o_lantern.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf7395ae7cda3abc42f2856a2dba6b8c30dc54f GIT binary patch literal 1298 zcmV+t1?~EYP)2!bMrxVihah{SV^P!YZ1<~+RjzK4@H;7gSBveP;VWwUB0KQKl;Or09i*{LfNH|h1)%5Rq)RzSF=3Gi@ zpX`1dlEjG-CQFTFN>qtTH6^pZeIsAKSt{buN7Ds`ic!x!;N!PqoL-f2nCF&~o z-+4O5*r?Y%7=yNZ*L@y#(_fLCCSFBvG_}Ysbg#kjSyRhy z!O1#=ZY|B$z9heFpJBk$5p-ps=Mp*=y{x{^IlO`Ns{Eo0*xrFbx!=9?2@*JH5)NC- zD*ylh32;bRa{vGf5&!@T5&_cPe*6Fc14~InK~z{r?N&W#Q&AK?d405$phIbt*r(}` zQKS?x7OfP5?O=zx2nC@I4ld%LRNMrI&hA}YlxE71f(8N|S|uW-h-0XYjTTfo6hcTT z*7KeF?#oR~`);6Jqz7(t?>Xn4@BH2KUSxT;f1j92l^P|zUTlTTv)(uHHdud9>4P8b z>7jVcX?hm?d#|gJz-XI|lQ`E)SendpD?fduj}rZ?&x>631atsit=Ipta~QCeIdtX{ zVa+_4rfZW^Rx(sxE2?hhzNkR>CZkO1KJfusqg>zWqO>nV{m}HX8kvIo6-wn+I8yMej<>Mo5B zcM||LkOqfi;Nd@vBm)?k`MYmve59KS3pq5C7JR38|1Mj6h}ZXRg~TuC`c zs5>~3tP)MtX`U~}*q|E>6zG+UMa#JC)to|hDM&A({Zb;jm?V1fM7`;PuD5ux*uyq7 zU1>gc0_jB-=Ck}V=L~?BHui#2NUt0N$sCX_=Liuk(!QYPlI%fpQ@8}ulo>A35t0kz zQU)gdA%OPEs^;p0GR&RkhFtX zCX>+e6>AF)z2Jky96oxFi~tzt<4Auej-KeAWZ)zN|8EBV0!d|bkF-oPz5oCK07*qo IM6N<$f`y1>JOBUy literal 0 HcmV?d00001