From a817c10a7f7f535996fbc554aa16487f283ee240 Mon Sep 17 00:00:00 2001 From: Ridanis Date: Wed, 22 Dec 2021 06:57:48 +0100 Subject: [PATCH] Armory Cabinet --- src/generated/resources/.cache/cache | 4 +- .../blockstates/armory_cabinet.json | 19 +++ .../models/item/armory_cabinet.json | 3 + .../loot_tables/blocks/armory_cabinet.json | 20 ++++ .../models/block/armory_cabinet.json | 108 ++++++++++++++++++ .../textures/blocks/armory_front.png | Bin 0 -> 3493 bytes 6 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json create mode 100644 src/generated/resources/assets/functionalstorage/models/item/armory_cabinet.json create mode 100644 src/generated/resources/data/functionalstorage/loot_tables/blocks/armory_cabinet.json create mode 100644 src/main/resources/assets/functionalstorage/models/block/armory_cabinet.json create mode 100644 src/main/resources/assets/functionalstorage/textures/blocks/armory_front.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 0fec225..f3b412a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,6 +1,7 @@ dd61bbc40a5253c9d8d429b1f4cc448babeb30c3 assets/functionalstorage/blockstates/acacia_1.json f4951baed89ad2ca24f9f0263b7ee1ddbd1b9954 assets/functionalstorage/blockstates/acacia_2.json b66cd5f8238b4a9e265a529ea79c7fff04978831 assets/functionalstorage/blockstates/acacia_4.json +a43045b707ae0bac4f3a429efd73225b10e5e02e assets/functionalstorage/blockstates/armory_cabinet.json 4dd1269478d41ea1e9f0512d9b574a007cb9f472 assets/functionalstorage/blockstates/birch_1.json b49e3fc2bb6fcfbf33a67d79b63abf679a00c92d assets/functionalstorage/blockstates/birch_2.json 9752c6d25170d36778b4733bfec81caaa3b586b1 assets/functionalstorage/blockstates/birch_4.json @@ -37,6 +38,7 @@ f768a7b0a4e49703c36318bd3da300640caaa295 assets/functionalstorage/models/item/ne 6414c7bf11830af3646da15cb16e601930f785bd data/functionalstorage/loot_tables/blocks/acacia_1.json f0235fd68df6fd2797155af3d56fbe57bef2f0b0 data/functionalstorage/loot_tables/blocks/acacia_2.json db076fb77db0c54a6c9f45307d8c173bf87fb7a9 data/functionalstorage/loot_tables/blocks/acacia_4.json +a44acb957c42b4dd555090ff1a216840159b2bc0 data/functionalstorage/loot_tables/blocks/armory_cabinet.json c0dc7923d7c7198d94d1a1f69b1d9b80546ad244 data/functionalstorage/loot_tables/blocks/birch_1.json acfc609efdd2d99d70276aff51cf237d1d979412 data/functionalstorage/loot_tables/blocks/birch_2.json 46ed8b5dc4b9ccf3b0f71646b7b3d8450be72d62 data/functionalstorage/loot_tables/blocks/birch_4.json @@ -85,4 +87,4 @@ ff234dac4f0b0b4f83ffa92f2d2fb1074c68df43 data/functionalstorage/recipes/spruce_4 bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json 8fc3f76a2c57eb4d80ce86947fabebe48fa6f692 data/functionalstorage/recipes/warped_2.json 7510a8ca1f1e3bb63f4c4f4add0bb6b713feaa0b data/functionalstorage/recipes/warped_4.json -d02963f7da0ca8877113c80cb1dd49d60069ff78 data/functionalstorage/tags/items/drawer.json +db0122948639b122cb0c1df7530996e9784356b0 data/functionalstorage/tags/items/drawer.json diff --git a/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json b/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json new file mode 100644 index 0000000..7c7e97f --- /dev/null +++ b/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json @@ -0,0 +1,19 @@ +{ + "variants": { + "subfacing=north": { + "model": "functionalstorage:block/armory_cabinet" + }, + "subfacing=south": { + "model": "functionalstorage:block/armory_cabinet", + "y": 180 + }, + "subfacing=west": { + "model": "functionalstorage:block/armory_cabinet", + "y": 270 + }, + "subfacing=east": { + "model": "functionalstorage:block/armory_cabinet", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/models/item/armory_cabinet.json b/src/generated/resources/assets/functionalstorage/models/item/armory_cabinet.json new file mode 100644 index 0000000..403d761 --- /dev/null +++ b/src/generated/resources/assets/functionalstorage/models/item/armory_cabinet.json @@ -0,0 +1,3 @@ +{ + "parent": "functionalstorage:block/armory_cabinet" +} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/loot_tables/blocks/armory_cabinet.json b/src/generated/resources/data/functionalstorage/loot_tables/blocks/armory_cabinet.json new file mode 100644 index 0000000..d12b27d --- /dev/null +++ b/src/generated/resources/data/functionalstorage/loot_tables/blocks/armory_cabinet.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "functionalstorage:armory_cabinet" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/functionalstorage/models/block/armory_cabinet.json b/src/main/resources/assets/functionalstorage/models/block/armory_cabinet.json new file mode 100644 index 0000000..edc45b3 --- /dev/null +++ b/src/main/resources/assets/functionalstorage/models/block/armory_cabinet.json @@ -0,0 +1,108 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "bottom": "functionalstorage:blocks/compacting_drawer_bottom", + "front": "functionalstorage:blocks/armory_front", + "particle": "functionalstorage:blocks/compacting_drawer_side", + "side": "functionalstorage:blocks/compacting_drawer_side", + "top": "functionalstorage:blocks/compacting_drawer_top" + }, + "elements": [ + { + "from": [1, 1, 0.5], + "to": [15, 15, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#front"}, + "down": {"uv": [0, 0, 14, 2], "texture": "#front"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#side", "cullface": "north"}, + "east": {"uv": [1, 1, 16, 15], "texture": "#side", "cullface": "east"}, + "west": {"uv": [0, 1, 15, 15], "texture": "#side"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#top"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#side", "cullface": "north"}, + "east": {"uv": [1, 1, 16, 15], "texture": "#side"}, + "west": {"uv": [0, 1, 15, 15], "texture": "#side", "cullface": "west"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [0, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "east": {"uv": [0, 1, 1, 15], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 1, 16, 15], "texture": "#side", "cullface": "south"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#side", "cullface": "west"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/functionalstorage/textures/blocks/armory_front.png b/src/main/resources/assets/functionalstorage/textures/blocks/armory_front.png new file mode 100644 index 0000000000000000000000000000000000000000..9dc3de91410577a9a6ca6667f0b24a22f7d633a8 GIT binary patch literal 3493 zcmcgvdu$X%7+*vqqG-ivsu8m;nv~GFoqgW!+M|J9u{9iEDN+nZ=VoVnD|ff+?)G{u zVo=f4#u!o5#8=`22@*(rKq875qt%M`4>6$DXHaW`h(?pzDC+FJDB9Bcyxi?$<~QGK ze&6@a-LZ7>;LNn=YNj;ixa%V>!&EGeUJF)kGZ zuEF!2ot=?RDdKqTyrAn;fXIs?pa|f1WdoE4S$}p}LY(;6v)#aUvTP_3C7q5S#!*v? zK4jdA*sNcQ6O9<3M=mc!VCYi;XyOXa?eNkCQ_eU+s7xOh ziomwUQ5en~2PJuX9B4RGfx1S6M^NB+t&Wo}lV@q!Hdd4(kgZu^XHBQmpA$M>T0r6` zATcf^5)ecn!d6NoK{P~VE))z1i_iq+rilXd2e8-*RYRe~laB*Crfqdi2sN=`IbH_Q zjk7bTo$zk9y`U|TFq*S|fU=l0$738dHDcSQp(O=Xfzc$uvMK;omo1W73#Q92@So zLB&&3QJ7ybPACnwg;Y&<6bGXsO?=1;;k7isa)S9|)626q4YA0vAzzGw{$;dwQ3F&( zk(AQ-Qaex5ZE>4M%`Y0Fj-FY0{7hKN!VEQ2ksC@+X`3x1rGaqK1st-I zm|SVt9%F+i7s{g8&J>}+Ist2oFyFC)PUMmK?KHv@W(7Z<@jl9(*mNs%Nh~**=(N0P{KgL;}lVOqTrfpov zENHY&1MFUAiBbF$uB0;#W5aP5wku1#=Wm#4sfU-`2l#~(B zG+hU>s9+UKSj0);&$7z#ldvj?Sg?R5ArdxQ1ay_25H-t`X|Kg3Dk|fzo=hblwYuO@ zF+BW<<5)nBI*-yI6o%*_H+-xdujxzWfKIZs9(wfnJ@>I0^r%1O=H~eP)|w4#Tb}7X zNvK-8VA{p6&lGCke067TXRdwjfyn7weyLtlkJjuRYqQ? zS)I$)_doQ-_n*AIDEH#5n{FF^^c;M~P+#@Jlh-|4JEdk*-&q~kY~ENsXYW1tj@&r! zj9b6^`wxCF9NQ}PO=B9btl9L^@PR}3jl9o1SF@?7>5Bg8r|kJ`@8R6+ z$3IO>W!G0NV5&aa@vuL*bJg5lZawTK+lPJ_`S_}ZOE&MTf9k*?<$;%Xy|yv2@3ra= zqJwMeE@B3Tq+8>c^rT)`bzbA=yN~SpmOqPme*d-i3u-d@$$wP!I{e|Jl-aP{ij zcHIBlk8A7Sy=-XLc7I^jnWqkYG;;Ll;e%6|vlBZ94_nV|dAj#YZ_(y`KOg<|;Coje z8D4|7J@Ss#SB>93^lNI{?&0OjZ+O)Is$(W|*Bb}7t~hUGc2CduOExH9yLGis_J@C@ Onj06#w=cNvmfrzpyO}Tm literal 0 HcmV?d00001