From fac34260d509f851138be5f8b8b3be55106afea9 Mon Sep 17 00:00:00 2001 From: Christofmeg <4357405+Christofmeg@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:00:52 +0100 Subject: [PATCH 1/3] Update .gitignore --- .gitignore | 5 +- .../03e4de26f1265135874f8cdcaebc09d9c08eb42b | 3 - .../15b6275091e1d61ba43a63172e99581ffd5ac41e | 52 ----------------- .../424df6c0265e09414e636289f261813cd93f4aa2 | 41 ------------- .../67cce32b1c3cbbcb1f646605f4914e3f196986c2 | 41 ------------- .../75bcd4dba6ca7d365462b0ec45e291d1056349c4 | 3 - .../7b7965c95f0313555fafc7c653e689cdb94b8fca | 1 - .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 2 - .../f4bc6a534340ffb17710ab19bf013aa0d2f1f9d9 | 34 ----------- .../f9cb23f3fae476fec1477498167593d13822f357 | 57 ------------------- 10 files changed, 4 insertions(+), 235 deletions(-) delete mode 100644 src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b delete mode 100644 src/generated/resources/.cache/15b6275091e1d61ba43a63172e99581ffd5ac41e delete mode 100644 src/generated/resources/.cache/424df6c0265e09414e636289f261813cd93f4aa2 delete mode 100644 src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 delete mode 100644 src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 delete mode 100644 src/generated/resources/.cache/7b7965c95f0313555fafc7c653e689cdb94b8fca delete mode 100644 src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 delete mode 100644 src/generated/resources/.cache/f4bc6a534340ffb17710ab19bf013aa0d2f1f9d9 delete mode 100644 src/generated/resources/.cache/f9cb23f3fae476fec1477498167593d13822f357 diff --git a/.gitignore b/.gitignore index 97ab8fcc..f3093a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,10 +17,13 @@ out logs build .gradle +.cache # other eclipse +.vscode run +runs classes -/includedMods/ +/includedMods/ \ No newline at end of file diff --git a/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b deleted file mode 100644 index f52d0e93..00000000 --- a/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ /dev/null @@ -1,3 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6950886 Tags for minecraft:item -246122fe97612d7cabc70aec28eb4cd0c96853f2 data/functionalstorage/tags/items/drawer.json -a6cf5364934bad4e060980a3c7f3c091ad90a585 data/functionalstorage/tags/items/ignore_crafting_check.json diff --git a/src/generated/resources/.cache/15b6275091e1d61ba43a63172e99581ffd5ac41e b/src/generated/resources/.cache/15b6275091e1d61ba43a63172e99581ffd5ac41e deleted file mode 100644 index 33e46935..00000000 --- a/src/generated/resources/.cache/15b6275091e1d61ba43a63172e99581ffd5ac41e +++ /dev/null @@ -1,52 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6971068 Item Models: functionalstorage -05946c7f40bf42b62f86e70d637524afd795cad2 assets/functionalstorage/models/item/acacia_1.json -9e4990cfbaa0ce0612d18b497169377fe24ee704 assets/functionalstorage/models/item/acacia_2.json -648c9170a8c4c6068d0fdcf1ff7f6bf387902f3c assets/functionalstorage/models/item/acacia_4.json -66a8231f4c429210ad93689ceaee2833140ed9e5 assets/functionalstorage/models/item/armory_cabinet.json -1da9d1cae2a22e77a75251c65776ddd761bd70b8 assets/functionalstorage/models/item/birch_1.json -8e39971ae403c2b5db817118b8cecea603633d5a assets/functionalstorage/models/item/birch_2.json -a45f12012b6bfc60ab69556aeb322e7306b91508 assets/functionalstorage/models/item/birch_4.json -5d318e863add84269fe30c1eaff1262f3f882cb1 assets/functionalstorage/models/item/collector_upgrade.json -60c7503ece603a05378f597f6bd0d9fc389f946f assets/functionalstorage/models/item/compacting_drawer.json -54cb60dc243859b1eb6c46bb2477a70b4b3e9851 assets/functionalstorage/models/item/compacting_framed_drawer.json -ea2033c10f43b9494d31e7b6bd4eb52d0343c2b4 assets/functionalstorage/models/item/controller_extension.json -3b8a0d8b75c8eeacfedbd38755e755cedbbc7703 assets/functionalstorage/models/item/copper_upgrade.json -dc3b1084ae34da6e6e15f5e9ac9c93113a698a97 assets/functionalstorage/models/item/creative_vending_upgrade.json -1ae8c4c98ff5d75ecea11734070b3ab233af1345 assets/functionalstorage/models/item/crimson_1.json -27a486a4198591506803a31a2ed907532c49d50d assets/functionalstorage/models/item/crimson_2.json -21560233c80a7297a3b7583531fb61e2fdb1ba54 assets/functionalstorage/models/item/crimson_4.json -1c9fe1b99ad83963f5518d7b0434d3e4997b52b2 assets/functionalstorage/models/item/dark_oak_1.json -645bbc030bb9b3302456ce30a092f573a4c4b47b assets/functionalstorage/models/item/dark_oak_2.json -1f78b3d52906fff466e989db8241d9b429cf4018 assets/functionalstorage/models/item/dark_oak_4.json -4c2e48c2ea6f371cef6978f4078fcd47c308f8b5 assets/functionalstorage/models/item/diamond_upgrade.json -f38d71d3c646813c0aa9fcf150a112e55794a8ec assets/functionalstorage/models/item/ender_drawer.json -bba3316482f0dd30047a7e9c8bbb08c44f870384 assets/functionalstorage/models/item/fluid_1.json -2f5a6d944c5a2d9c03f6f7f4ee94388105411fe7 assets/functionalstorage/models/item/fluid_2.json -10be4f77784cdb63e9d8e76f2e7ca1dd6e278334 assets/functionalstorage/models/item/fluid_4.json -9738e07cee8d5bedcf48316dfcf31f6b0707a3b7 assets/functionalstorage/models/item/framed_1.json -62dfcf3bf7e57c537aea4de7ff9a668b3139abc1 assets/functionalstorage/models/item/framed_2.json -32c5b556220102e2364d0305f122201115490377 assets/functionalstorage/models/item/framed_4.json -a198e6f98105cd16ac71a242daffcc8a0150e2ba assets/functionalstorage/models/item/gold_upgrade.json -7c9e07a88447529640caaacc5f65aad2d40d1b81 assets/functionalstorage/models/item/iron_downgrade.json -be463c39ed5a88017a44e3bfe294ca317495d4f0 assets/functionalstorage/models/item/jungle_1.json -b7b2e1fc0dcaa65a1094aa75135594f39ee3be8f assets/functionalstorage/models/item/jungle_2.json -5278bc31b73994114749fc4358f76daa2a3cb5ad assets/functionalstorage/models/item/jungle_4.json -64a63ff34a7b26d8b4abb54f9695ff14438c3a04 assets/functionalstorage/models/item/mangrove_1.json -7e2305655601a83a88b088b0b353f1475d149897 assets/functionalstorage/models/item/mangrove_2.json -d4965b7385543f8125ba2f217f3340cc79652762 assets/functionalstorage/models/item/mangrove_4.json -b769bcf6c724ed06934c87b46f4b0002fdc5fa5f assets/functionalstorage/models/item/netherite_upgrade.json -c47402657897519b8d24fe05c24d8cf5206b8b66 assets/functionalstorage/models/item/oak_1.json -9458b801c7bad92adf86503d4521c2e691b3dd51 assets/functionalstorage/models/item/oak_2.json -73e39b73006b327944a64b71868453432b8cabe8 assets/functionalstorage/models/item/oak_4.json -f8a391ef1bd1165e4146fdce9e26c5e148cb6c10 assets/functionalstorage/models/item/puller_upgrade.json -5c3d1bb1721ef875dd0b838d2362234891128783 assets/functionalstorage/models/item/pusher_upgrade.json -2dd88009a044be860f02b5696d83b0fcdd011d9f assets/functionalstorage/models/item/redstone_upgrade.json -d6f8f4ccd5e6bdc362dea5ffc2f3b0126b3dd7d0 assets/functionalstorage/models/item/simple_compacting_drawer.json -bfcda282f9a0a050e6a35b59b7ef298d8c21ad28 assets/functionalstorage/models/item/spruce_1.json -a5092df002d1882ba7356af656ffe4449c2ae014 assets/functionalstorage/models/item/spruce_2.json -13d086813dc0e5718e4230916adb8450b7936f1b assets/functionalstorage/models/item/spruce_4.json -5bd00337dc6cf933ed30d732d0bf9508f131d0b6 assets/functionalstorage/models/item/storage_controller.json -5876bfaf42de81f7e8663c471a344b304c5ecd69 assets/functionalstorage/models/item/void_upgrade.json -4badf56ac1f6481fd6c0f3fa567a3a487174ca54 assets/functionalstorage/models/item/warped_1.json -6f8ace0f1dea778a37713406e926fd202182acee assets/functionalstorage/models/item/warped_2.json -8c149579d323bf3b96f00ef0e044aecbc99accd0 assets/functionalstorage/models/item/warped_4.json diff --git a/src/generated/resources/.cache/424df6c0265e09414e636289f261813cd93f4aa2 b/src/generated/resources/.cache/424df6c0265e09414e636289f261813cd93f4aa2 deleted file mode 100644 index f4c47582..00000000 --- a/src/generated/resources/.cache/424df6c0265e09414e636289f261813cd93f4aa2 +++ /dev/null @@ -1,41 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6960912 Block States: functionalstorage -b1f76f1b67016350af532beb6de3ffdc4d9a07be assets/functionalstorage/blockstates/acacia_1.json -a4e462d9775fd4aefa673952d4d69f9d90b2e823 assets/functionalstorage/blockstates/acacia_2.json -ecd77b58fb3d746ab8e2109adf686ea01cf5d96a assets/functionalstorage/blockstates/acacia_4.json -611fcec5632ed34fa02392ac05db5092f812e145 assets/functionalstorage/blockstates/armory_cabinet.json -b4bd79ced4b045c8ee3ab7b55d60b60e5dd84cd1 assets/functionalstorage/blockstates/birch_1.json -198b1a434549cba5fb2fe38fc8a1335087c88786 assets/functionalstorage/blockstates/birch_2.json -fd7cd6e88f86852eabd6518fce74f8d78f2ef00e assets/functionalstorage/blockstates/birch_4.json -e42120a3e0de0bf7a63d4140adc19104c1088609 assets/functionalstorage/blockstates/compacting_drawer.json -ab46fef5c59fc4765caba76dd3c34f561ea77b6c assets/functionalstorage/blockstates/compacting_framed_drawer.json -4e2d2269a1c4b01c15a45f8a613df037a66f9f4c assets/functionalstorage/blockstates/controller_extension.json -bf74191dff7b702545e3202071681579dbb1c4d5 assets/functionalstorage/blockstates/crimson_1.json -9f4fa8e5cb265ff273dfc6a8373330ab3c314f0c assets/functionalstorage/blockstates/crimson_2.json -0921caa2d9df77cc8774785612276f6fe1793bd4 assets/functionalstorage/blockstates/crimson_4.json -be7b43133f176da875f3a80ad8e0abab71f9371f assets/functionalstorage/blockstates/dark_oak_1.json -ce80c28816ac64a0c44d92f83933953b48bc9de4 assets/functionalstorage/blockstates/dark_oak_2.json -2edf712accf2a73e810dfbb0459267a0b086045a assets/functionalstorage/blockstates/dark_oak_4.json -9e7ca3edca81c30d137fcc6a8cff0056e0f7aaec assets/functionalstorage/blockstates/ender_drawer.json -c7a4f280c91658f95c9a056ce3d827e7e59f6cdf assets/functionalstorage/blockstates/fluid_1.json -972ffc2aa3f78dc936745aa4206aeccbed8bc836 assets/functionalstorage/blockstates/fluid_2.json -e7cad5481c2b9b809adf1f670eb4a08dd19b7d38 assets/functionalstorage/blockstates/fluid_4.json -b66e872170929f7d24af6720167749014a9cd16f assets/functionalstorage/blockstates/framed_1.json -ea5c1b0de1f8102d561e1669a42b4ae9145d4b8c assets/functionalstorage/blockstates/framed_2.json -251a4112ccff54b28ef878d0f31b320c7cf12c11 assets/functionalstorage/blockstates/framed_4.json -ae3be1b76f15453d6905a0ac71d240df0ce3d868 assets/functionalstorage/blockstates/jungle_1.json -cbdc987476f1ce53a615b66ec645235d506d4cca assets/functionalstorage/blockstates/jungle_2.json -6b8180e22e6d2a12803e2577dc53d186cdc95103 assets/functionalstorage/blockstates/jungle_4.json -5e2e3aa86e3866d6856e8906aae506bed6e9bb09 assets/functionalstorage/blockstates/mangrove_1.json -886160527e9a610f2fce60022168299735e50075 assets/functionalstorage/blockstates/mangrove_2.json -be5ed1859166cc324b2935d509572dc6f8e114f4 assets/functionalstorage/blockstates/mangrove_4.json -f47b30927e7b46a35f2273f67f8333ab4cc2e889 assets/functionalstorage/blockstates/oak_1.json -29c84d44a7b8e80a47c97ee891f7e15519f7ca17 assets/functionalstorage/blockstates/oak_2.json -7ce5d921723c7d0f45ed6fdf58436a61b19dde23 assets/functionalstorage/blockstates/oak_4.json -944cf78adff114b16702265055e66f1e5c7719b5 assets/functionalstorage/blockstates/simple_compacting_drawer.json -c53e0a691dd74cb9a6d60ebf825a7b7895382f31 assets/functionalstorage/blockstates/spruce_1.json -cbc78a9d7d6691b4ddf1dd633e2d693b4b751595 assets/functionalstorage/blockstates/spruce_2.json -e6d6962cc3719731bc798dcf1757a0c5bcf9099c assets/functionalstorage/blockstates/spruce_4.json -d8793fced21dfcc03797981e78ed6a1fcbac46c7 assets/functionalstorage/blockstates/storage_controller.json -5ef745db265d4cc0851fc282107ce9824d8c5e82 assets/functionalstorage/blockstates/warped_1.json -bf2be562e2df9d990ee4227c4725ca8bd661fde4 assets/functionalstorage/blockstates/warped_2.json -926d27679902445e3a48a04adbd15ac82035936f assets/functionalstorage/blockstates/warped_4.json diff --git a/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 deleted file mode 100644 index d3c293e2..00000000 --- a/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ /dev/null @@ -1,41 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6950886 LootTables -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/acacia_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/acacia_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/acacia_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/armory_cabinet.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/birch_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/birch_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/birch_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/compacting_drawer.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/compacting_framed_drawer.json -474d681bb0de23894958b41108c737164f4cbb66 data/functionalstorage/loot_tables/blocks/controller_extension.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/crimson_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/crimson_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/crimson_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/dark_oak_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/dark_oak_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/dark_oak_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/ender_drawer.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/fluid_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/fluid_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/fluid_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/framed_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/framed_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/framed_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/jungle_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/jungle_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/jungle_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/mangrove_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/mangrove_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/mangrove_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/oak_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/oak_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/oak_4.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/simple_compacting_drawer.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/spruce_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/spruce_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/spruce_4.json -1b701217f96f14170a7b95f8ed75826dd74a74cf data/functionalstorage/loot_tables/blocks/storage_controller.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/warped_1.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/warped_2.json -1d4929d7d6176f60e5ea991a577527ed251ef375 data/functionalstorage/loot_tables/blocks/warped_4.json diff --git a/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 deleted file mode 100644 index 9e1f2628..00000000 --- a/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ /dev/null @@ -1,3 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6930889 Tags for minecraft:block -246122fe97612d7cabc70aec28eb4cd0c96853f2 data/minecraft/tags/blocks/mineable/axe.json -8e6d491aff305684a23edc85e87dcba04122a21b data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/generated/resources/.cache/7b7965c95f0313555fafc7c653e689cdb94b8fca b/src/generated/resources/.cache/7b7965c95f0313555fafc7c653e689cdb94b8fca deleted file mode 100644 index 4af42c2e..00000000 --- a/src/generated/resources/.cache/7b7965c95f0313555fafc7c653e689cdb94b8fca +++ /dev/null @@ -1 +0,0 @@ -// 1.19.2 2022-10-04T01:15:12.4128905 Block Model Item Generator (functionalstorage) diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 deleted file mode 100644 index 6efb3eb9..00000000 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ /dev/null @@ -1,2 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.69843 Languages: en_us -4923ed56412c825520255d1c1fe08293aea1497e assets/functionalstorage/lang/en_us.json diff --git a/src/generated/resources/.cache/f4bc6a534340ffb17710ab19bf013aa0d2f1f9d9 b/src/generated/resources/.cache/f4bc6a534340ffb17710ab19bf013aa0d2f1f9d9 deleted file mode 100644 index dc102633..00000000 --- a/src/generated/resources/.cache/f4bc6a534340ffb17710ab19bf013aa0d2f1f9d9 +++ /dev/null @@ -1,34 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6940891 Block Models: functionalstorage -6d54a3aeb1cd5d36308305bace660178e8e562d6 assets/functionalstorage/models/block/acacia_1_locked.json -8d6752b49bcf17192815d02c04f79887e7adc30a assets/functionalstorage/models/block/acacia_2_locked.json -11acc40b9bb8ff8a3c99c8f4251056924f686400 assets/functionalstorage/models/block/acacia_4_locked.json -5dcdd98da7378079e4567a3559c5431696cc0f55 assets/functionalstorage/models/block/birch_1_locked.json -d3e027927571ce7d34bf4d011f61c8b82053b50f assets/functionalstorage/models/block/birch_2_locked.json -1d9a2c88248d5cb6792541dd2f06a160d544cbb0 assets/functionalstorage/models/block/birch_4_locked.json -4f608c3a1541dab05fcdadd91fb123fa312f7db6 assets/functionalstorage/models/block/compacting_drawer_locked.json -188d03838b8d0759e470ec8c94229e5ca579b269 assets/functionalstorage/models/block/crimson_1_locked.json -356212cec06b595a53118ff336c418f8bad10221 assets/functionalstorage/models/block/crimson_2_locked.json -cf5cedd21bc165b4f6f31a0e6a42807a81725c14 assets/functionalstorage/models/block/crimson_4_locked.json -92e9b7a80a0e6ed9fa5a378c624fca09d718491d assets/functionalstorage/models/block/dark_oak_1_locked.json -93dc6d016e8744000316d326b75d5e080c55815a assets/functionalstorage/models/block/dark_oak_2_locked.json -ca06f44b8efc1377efc4bdd0c80f3522a829406e assets/functionalstorage/models/block/dark_oak_4_locked.json -a2c4563156a818264d7047bf03c2ad9436519c45 assets/functionalstorage/models/block/ender_drawer_locked.json -18d0c1c5c116cc1478eae8a5fc9929418f98e292 assets/functionalstorage/models/block/fluid_1_locked.json -8d67ce67098574f901f9b759b96b63d944bb73b6 assets/functionalstorage/models/block/fluid_2_locked.json -e23e95b0e5f4ae1796fd3b48c05409d32694cd08 assets/functionalstorage/models/block/fluid_4_locked.json -840fbdd137e187d872ec4fd61620080f5b21f456 assets/functionalstorage/models/block/jungle_1_locked.json -1430f12c060903c753569a3c0dfed7c74a433eb7 assets/functionalstorage/models/block/jungle_2_locked.json -d059b5d3f663e00a229fb433efce31a6e2b7f46d assets/functionalstorage/models/block/jungle_4_locked.json -9c1843a0aac684eb2708d5d3c932f6d683b1243a assets/functionalstorage/models/block/mangrove_1_locked.json -222e0f2e34277efc08ba383d865669daf0b379f9 assets/functionalstorage/models/block/mangrove_2_locked.json -425bc1f8413939ad51cfb4f5972f905404d10e3e assets/functionalstorage/models/block/mangrove_4_locked.json -9f780946e48fd6f34003ed84242483c9f706db0c assets/functionalstorage/models/block/oak_1_locked.json -d35a517f7b6b7f3278d588d767110e1ffd4de2aa assets/functionalstorage/models/block/oak_2_locked.json -d1645c52b03b76a8ae9b145d1af73c0a34629dff assets/functionalstorage/models/block/oak_4_locked.json -0e6fb68e682c5ea2b6002097505b8b600e4cde4d assets/functionalstorage/models/block/simple_compacting_drawer_locked.json -0d02c3473a2fede484a134918d73d1d67572e08a assets/functionalstorage/models/block/spruce_1_locked.json -bd634037f8695e67dff884393526dc120f6870b0 assets/functionalstorage/models/block/spruce_2_locked.json -2051671b7479f1a5a858a415ede795d1b91ca703 assets/functionalstorage/models/block/spruce_4_locked.json -2a9333d355e80323ac090def24d9d8daef073dd5 assets/functionalstorage/models/block/warped_1_locked.json -0f21daf61d3ade96c3f44123db1997b58723fe56 assets/functionalstorage/models/block/warped_2_locked.json -addf3ad8a930caeb421b1fba7a5dd1ce4f556826 assets/functionalstorage/models/block/warped_4_locked.json diff --git a/src/generated/resources/.cache/f9cb23f3fae476fec1477498167593d13822f357 b/src/generated/resources/.cache/f9cb23f3fae476fec1477498167593d13822f357 deleted file mode 100644 index 48a4b57c..00000000 --- a/src/generated/resources/.cache/f9cb23f3fae476fec1477498167593d13822f357 +++ /dev/null @@ -1,57 +0,0 @@ -// 1.19.2 2023-01-01T21:28:56.6971068 Titanium Recipe -f1f858c5c729d3265eca96a08ccc173c60e68cf0 data/functionalstorage/advancements/recipes/functionalstorage/netherite_upgrade.json -b05cf8697ddf7bd71f6ca3d498da0426928c7744 data/functionalstorage/recipes/acacia_1.json -918f07592884a21aeb8ee99d7f6df3f50e89766f data/functionalstorage/recipes/acacia_2.json -1ba3dd42f2c3c72dbab5ec922da9d548964c9b8c data/functionalstorage/recipes/acacia_4.json -a5d88b83aff99d3354cc0920afd7a74075fb728c data/functionalstorage/recipes/armory_cabinet.json -764b61b22c4bf20a83eaab55653a7e15c47310e0 data/functionalstorage/recipes/birch_1.json -9cd3903557b7a20acaa614aab4f57f6e225b6dec data/functionalstorage/recipes/birch_2.json -d615b78a38926f320de5073c9184fff0fec77a18 data/functionalstorage/recipes/birch_4.json -9768796c95017979d5d5c96000098973b110e487 data/functionalstorage/recipes/collector_upgrade.json -e260c361500b5848f4a66b093823dd227cdefc37 data/functionalstorage/recipes/compacting_drawer.json -3158ffaee870ca81d73931dfda31dc5e133c2033 data/functionalstorage/recipes/compacting_framed_drawer.json -68add4727371f706183b981e3d35c1007bb7cec8 data/functionalstorage/recipes/configuration_tool.json -c42ecb784a04eb7673f8daea010d6d3578e751fd data/functionalstorage/recipes/controller_extension.json -9c75b4019a42198bf69cb60d2c5228d45ed9fad8 data/functionalstorage/recipes/copper_upgrade.json -26c92bc8de907d3c8d05926992567031f120894e data/functionalstorage/recipes/crimson_1.json -0503e95a862c1ce30becf39afc4dd3b59502578a data/functionalstorage/recipes/crimson_2.json -6bd305381faaee95fee26854662d62a56753e1a8 data/functionalstorage/recipes/crimson_4.json -798000f396ae6a6a8b06634975e1d7d942780a17 data/functionalstorage/recipes/dark_oak_1.json -9787293c5c3aa3e732f3e51c3ddd689f9dd355d5 data/functionalstorage/recipes/dark_oak_2.json -df09c6a962115cdea083aa6791bef37539e242cd data/functionalstorage/recipes/dark_oak_4.json -30b58c315653f3514e0eab3bc80dec0f29259f5c data/functionalstorage/recipes/diamond_upgrade.json -305304dba1d65f021ee05a76963b8ba019e63d19 data/functionalstorage/recipes/ender_drawer.json -61972caaa84d29ec5d66dafd3fc03e363dd39db9 data/functionalstorage/recipes/fluid_1.json -db5eb614b6454d6d7909f982b545a3ee1c109a4f data/functionalstorage/recipes/fluid_2.json -8450e869abb3fa9c1a5fb91bfe9149d7d09ce2ca data/functionalstorage/recipes/fluid_4.json -559d3ce38de9db21b4efc149df540d5994e54ef6 data/functionalstorage/recipes/framed_1.json -2a3031c093185599c255f3eebc44826227175c20 data/functionalstorage/recipes/framed_2.json -84bbe14ee7ac9fc3b99e6983dcdb85e1edca02d8 data/functionalstorage/recipes/framed_4.json -2e32282452f9eb21781b5826fbc069cdcf024e8c data/functionalstorage/recipes/gold_upgrade.json -2f4045d1a674e9db42e3f9062a7aa955fb2a3670 data/functionalstorage/recipes/iron_downgrade.json -583772a4b82747eb81f03ac177eae39ebe06f85f data/functionalstorage/recipes/jungle_1.json -4275d8701b145680db5cd53b6f6f052f31b5c35a data/functionalstorage/recipes/jungle_2.json -fa4750083e4b00d01848063580a021dd8de764b8 data/functionalstorage/recipes/jungle_4.json -05cf4048ea3c11037dbbb6bfc08118736634c7d9 data/functionalstorage/recipes/linking_tool.json -78ad7b1b8cd73ecd0b4a0c65b69fae7da89bcc92 data/functionalstorage/recipes/mangrove_1.json -4cc18e8d2f2565e7f009bca897aad5c0ab1a2f28 data/functionalstorage/recipes/mangrove_2.json -24899ffd15c504117802bb645d909b2deb1bd128 data/functionalstorage/recipes/mangrove_4.json -084c82ddcba8536a46fed93cd3a8f616d35ea264 data/functionalstorage/recipes/netherite_upgrade.json -136cee300d457caa7da0777c5c889e694bb86291 data/functionalstorage/recipes/oak_1.json -df58568b4f4c18b1b28d0a45e89f2ba4578c460d data/functionalstorage/recipes/oak_2.json -71f2e100a2cbde9c316b208cafd82b37f77cabe0 data/functionalstorage/recipes/oak_4.json -0de95dd6b296113d17cfa06e01c7d5cb368920e6 data/functionalstorage/recipes/oak_drawer_alternate_x1.json -a79a3ec456db3fc56d8d5c717c264ee13c4bbdd9 data/functionalstorage/recipes/oak_drawer_alternate_x2.json -8403295aabf2b1d12a60da483bbb0788b4759e05 data/functionalstorage/recipes/oak_drawer_alternate_x4.json -5f9576e04f3d22c25bf24b1c6d73380a646b5e5f data/functionalstorage/recipes/puller_upgrade.json -a6530183b52eebec5dbe7e4aa8b2fed73ff8aafe data/functionalstorage/recipes/pusher_upgrade.json -1f978597c015995d4665be0337ba3c9253a99a6b data/functionalstorage/recipes/redstone_upgrade.json -a8a010edcaa5dd5b433a50e9f9db83cfd5f23bd2 data/functionalstorage/recipes/simple_compacting_drawer.json -a84afe1c311bdde26ab919ee9d02f6ccd96dfcb8 data/functionalstorage/recipes/spruce_1.json -648fc89e40c56a1abc03ef2f736f82c0950b792a data/functionalstorage/recipes/spruce_2.json -98fbe14751894faf856430cb708d9af702b3d37f data/functionalstorage/recipes/spruce_4.json -a4809bc6a7e5ac496d7b4f4902b7211b781d2ef1 data/functionalstorage/recipes/storage_controller.json -7617186c8d064e6fdc326dceec53eeb97ef14cf8 data/functionalstorage/recipes/void_upgrade.json -c0bfd6206a4ba9dbe798c4373eb2810918e3db2f data/functionalstorage/recipes/warped_1.json -54efe2b08d6ff91c858587f9f7bdbf6d22441866 data/functionalstorage/recipes/warped_2.json -0e855bb7dede233d191bbc33cf72f4b93906a282 data/functionalstorage/recipes/warped_4.json From efd6d6d4ae48edd32ef776b4d3a4bb2b6a8b404e Mon Sep 17 00:00:00 2001 From: Christofmeg <4357405+Christofmeg@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:35:53 +0100 Subject: [PATCH 2/3] runData --- .../blockstates/acacia_1.json | 44 ++++++------ .../blockstates/acacia_2.json | 44 ++++++------ .../blockstates/acacia_4.json | 44 ++++++------ .../blockstates/armory_cabinet.json | 18 ++--- .../blockstates/birch_1.json | 44 ++++++------ .../blockstates/birch_2.json | 44 ++++++------ .../blockstates/birch_4.json | 44 ++++++------ .../blockstates/compacting_drawer.json | 44 ++++++------ .../blockstates/compacting_framed_drawer.json | 44 ++++++------ .../blockstates/controller_extension.json | 18 ++--- .../blockstates/crimson_1.json | 44 ++++++------ .../blockstates/crimson_2.json | 44 ++++++------ .../blockstates/crimson_4.json | 44 ++++++------ .../blockstates/dark_oak_1.json | 44 ++++++------ .../blockstates/dark_oak_2.json | 44 ++++++------ .../blockstates/dark_oak_4.json | 44 ++++++------ .../blockstates/ender_drawer.json | 44 ++++++------ .../blockstates/fluid_1.json | 44 ++++++------ .../blockstates/fluid_2.json | 44 ++++++------ .../blockstates/fluid_4.json | 44 ++++++------ .../blockstates/framed_1.json | 44 ++++++------ .../blockstates/framed_2.json | 44 ++++++------ .../blockstates/framed_4.json | 44 ++++++------ .../blockstates/jungle_1.json | 44 ++++++------ .../blockstates/jungle_2.json | 44 ++++++------ .../blockstates/jungle_4.json | 44 ++++++------ .../blockstates/mangrove_1.json | 42 ----------- .../blockstates/mangrove_2.json | 42 ----------- .../blockstates/mangrove_4.json | 42 ----------- .../functionalstorage/blockstates/oak_1.json | 44 ++++++------ .../functionalstorage/blockstates/oak_2.json | 44 ++++++------ .../functionalstorage/blockstates/oak_4.json | 44 ++++++------ .../blockstates/simple_compacting_drawer.json | 44 ++++++------ .../blockstates/spruce_1.json | 44 ++++++------ .../blockstates/spruce_2.json | 44 ++++++------ .../blockstates/spruce_4.json | 44 ++++++------ .../blockstates/storage_controller.json | 18 ++--- .../blockstates/warped_1.json | 44 ++++++------ .../blockstates/warped_2.json | 44 ++++++------ .../blockstates/warped_4.json | 44 ++++++------ .../assets/functionalstorage/lang/en_us.json | 3 - ...ove_2_locked.json => framed_1_locked.json} | 2 +- ...ove_4_locked.json => framed_2_locked.json} | 2 +- ...ove_1_locked.json => framed_4_locked.json} | 2 +- .../models/item/mangrove_1.json | 3 - .../models/item/mangrove_2.json | 3 - .../models/item/mangrove_4.json | 3 - .../functionalstorage/netherite_upgrade.json | 20 +++--- .../blocks/controller_extension.json | 12 ++-- .../loot_tables/blocks/mangrove_1.json | 3 - .../loot_tables/blocks/mangrove_2.json | 3 - .../loot_tables/blocks/mangrove_4.json | 3 - .../blocks/storage_controller.json | 12 ++-- .../functionalstorage/recipes/acacia_1.json | 24 +++---- .../functionalstorage/recipes/acacia_2.json | 28 ++++---- .../functionalstorage/recipes/acacia_4.json | 28 ++++---- .../recipes/armory_cabinet.json | 24 +++---- .../functionalstorage/recipes/birch_1.json | 24 +++---- .../functionalstorage/recipes/birch_2.json | 28 ++++---- .../functionalstorage/recipes/birch_4.json | 28 ++++---- .../recipes/collector_upgrade.json | 30 ++++---- .../recipes/compacting_drawer.json | 30 ++++---- .../recipes/compacting_framed_drawer.json | 30 ++++---- .../recipes/configuration_tool.json | 30 ++++---- .../recipes/controller_extension.json | 24 +++---- .../recipes/copper_upgrade.json | 24 +++---- .../functionalstorage/recipes/crimson_1.json | 24 +++---- .../functionalstorage/recipes/crimson_2.json | 28 ++++---- .../functionalstorage/recipes/crimson_4.json | 28 ++++---- .../functionalstorage/recipes/dark_oak_1.json | 24 +++---- .../functionalstorage/recipes/dark_oak_2.json | 28 ++++---- .../functionalstorage/recipes/dark_oak_4.json | 28 ++++---- .../recipes/diamond_upgrade.json | 24 +++---- .../recipes/ender_drawer.json | 24 +++---- .../functionalstorage/recipes/fluid_1.json | 24 +++---- .../functionalstorage/recipes/fluid_2.json | 28 ++++---- .../functionalstorage/recipes/fluid_4.json | 28 ++++---- .../functionalstorage/recipes/framed_1.json | 24 +++---- .../functionalstorage/recipes/framed_2.json | 28 ++++---- .../functionalstorage/recipes/framed_4.json | 28 ++++---- .../recipes/gold_upgrade.json | 24 +++---- .../recipes/iron_downgrade.json | 24 +++---- .../functionalstorage/recipes/jungle_1.json | 24 +++---- .../functionalstorage/recipes/jungle_2.json | 28 ++++---- .../functionalstorage/recipes/jungle_4.json | 28 ++++---- .../recipes/linking_tool.json | 30 ++++---- .../functionalstorage/recipes/mangrove_1.json | 37 ---------- .../functionalstorage/recipes/mangrove_2.json | 38 ---------- .../functionalstorage/recipes/mangrove_4.json | 38 ---------- .../recipes/netherite_upgrade.json | 6 +- .../data/functionalstorage/recipes/oak_1.json | 24 +++---- .../data/functionalstorage/recipes/oak_2.json | 28 ++++---- .../data/functionalstorage/recipes/oak_4.json | 28 ++++---- .../recipes/oak_drawer_alternate_x1.json | 24 +++---- .../recipes/oak_drawer_alternate_x2.json | 28 ++++---- .../recipes/oak_drawer_alternate_x4.json | 28 ++++---- .../recipes/puller_upgrade.json | 24 +++---- .../recipes/pusher_upgrade.json | 30 ++++---- .../recipes/redstone_upgrade.json | 24 +++---- .../recipes/simple_compacting_drawer.json | 30 ++++---- .../functionalstorage/recipes/spruce_1.json | 24 +++---- .../functionalstorage/recipes/spruce_2.json | 28 ++++---- .../functionalstorage/recipes/spruce_4.json | 28 ++++---- .../recipes/storage_controller.json | 24 +++---- .../recipes/void_upgrade.json | 24 +++---- .../functionalstorage/recipes/warped_1.json | 24 +++---- .../functionalstorage/recipes/warped_2.json | 28 ++++---- .../functionalstorage/recipes/warped_4.json | 28 ++++---- .../functionalstorage/tags/items/drawer.json | 1 + .../tags/items/ignore_crafting_check.json | 1 + .../minecraft/tags/blocks/mineable/axe.json | 19 ++--- .../tags/blocks/mineable/pickaxe.json | 1 + .../models/block/framed_1_locked.json | 63 ----------------- .../models/block/framed_2_locked.json | 70 ------------------- .../models/block/framed_4_locked.json | 70 ------------------- 115 files changed, 1493 insertions(+), 1952 deletions(-) delete mode 100644 src/generated/resources/assets/functionalstorage/blockstates/mangrove_1.json delete mode 100644 src/generated/resources/assets/functionalstorage/blockstates/mangrove_2.json delete mode 100644 src/generated/resources/assets/functionalstorage/blockstates/mangrove_4.json rename src/generated/resources/assets/functionalstorage/models/block/{mangrove_2_locked.json => framed_1_locked.json} (59%) rename src/generated/resources/assets/functionalstorage/models/block/{mangrove_4_locked.json => framed_2_locked.json} (59%) rename src/generated/resources/assets/functionalstorage/models/block/{mangrove_1_locked.json => framed_4_locked.json} (59%) delete mode 100644 src/generated/resources/assets/functionalstorage/models/item/mangrove_1.json delete mode 100644 src/generated/resources/assets/functionalstorage/models/item/mangrove_2.json delete mode 100644 src/generated/resources/assets/functionalstorage/models/item/mangrove_4.json delete mode 100644 src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_1.json delete mode 100644 src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_2.json delete mode 100644 src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_4.json delete mode 100644 src/generated/resources/data/functionalstorage/recipes/mangrove_1.json delete mode 100644 src/generated/resources/data/functionalstorage/recipes/mangrove_2.json delete mode 100644 src/generated/resources/data/functionalstorage/recipes/mangrove_4.json delete mode 100644 src/main/resources/assets/functionalstorage/models/block/framed_1_locked.json delete mode 100644 src/main/resources/assets/functionalstorage/models/block/framed_2_locked.json delete mode 100644 src/main/resources/assets/functionalstorage/models/block/framed_4_locked.json diff --git a/src/generated/resources/assets/functionalstorage/blockstates/acacia_1.json b/src/generated/resources/assets/functionalstorage/blockstates/acacia_1.json index 9f298850..8725a7c5 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/acacia_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/acacia_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/acacia_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/acacia_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/acacia_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/acacia_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/acacia_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/acacia_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/acacia_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/acacia_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/acacia_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/acacia_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/acacia_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/acacia_2.json b/src/generated/resources/assets/functionalstorage/blockstates/acacia_2.json index 60912f1c..b1bfa1ea 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/acacia_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/acacia_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/acacia_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/acacia_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/acacia_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/acacia_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/acacia_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/acacia_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/acacia_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/acacia_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/acacia_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/acacia_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/acacia_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/acacia_4.json b/src/generated/resources/assets/functionalstorage/blockstates/acacia_4.json index 11fffc58..c1180994 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/acacia_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/acacia_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/acacia_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/acacia_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/acacia_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/acacia_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/acacia_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/acacia_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/acacia_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/acacia_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/acacia_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/acacia_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/acacia_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json b/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json index 362f0b37..ddbceda5 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/armory_cabinet.json @@ -1,23 +1,23 @@ { "variants": { - "subfacing=east": { - "model": "functionalstorage:block/armory_cabinet", - "uvlock": true, - "y": 90 - }, "subfacing=north": { "model": "functionalstorage:block/armory_cabinet", "uvlock": true }, "subfacing=south": { "model": "functionalstorage:block/armory_cabinet", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true }, "subfacing=west": { "model": "functionalstorage:block/armory_cabinet", - "uvlock": true, - "y": 270 + "y": 270, + "uvlock": true + }, + "subfacing=east": { + "model": "functionalstorage:block/armory_cabinet", + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/birch_1.json b/src/generated/resources/assets/functionalstorage/blockstates/birch_1.json index 916ad38b..375c585f 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/birch_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/birch_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/birch_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/birch_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/birch_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/birch_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/birch_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/birch_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/birch_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/birch_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/birch_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/birch_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/birch_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/birch_2.json b/src/generated/resources/assets/functionalstorage/blockstates/birch_2.json index 3dfd2e46..e36ee868 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/birch_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/birch_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/birch_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/birch_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/birch_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/birch_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/birch_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/birch_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/birch_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/birch_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/birch_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/birch_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/birch_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/birch_4.json b/src/generated/resources/assets/functionalstorage/blockstates/birch_4.json index 1621f185..b898583f 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/birch_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/birch_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/birch_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/birch_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/birch_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/birch_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/birch_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/birch_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/birch_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/birch_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/birch_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/birch_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/birch_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/compacting_drawer.json b/src/generated/resources/assets/functionalstorage/blockstates/compacting_drawer.json index 983f5b8a..a4afd993 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/compacting_drawer.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/compacting_drawer.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/compacting_drawer", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/compacting_drawer", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/compacting_drawer_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/compacting_drawer", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/compacting_drawer_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/compacting_drawer", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/compacting_drawer_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/compacting_drawer_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/compacting_drawer_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/compacting_drawer", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/compacting_drawer_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/compacting_framed_drawer.json b/src/generated/resources/assets/functionalstorage/blockstates/compacting_framed_drawer.json index afec6da9..60de067e 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/compacting_framed_drawer.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/compacting_framed_drawer.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/compacting_framed_drawer", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/compacting_framed_drawer", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/compacting_framed_drawer_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/compacting_framed_drawer", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/compacting_framed_drawer_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/compacting_framed_drawer", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/compacting_framed_drawer_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/compacting_framed_drawer_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/compacting_framed_drawer_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/compacting_framed_drawer", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/compacting_framed_drawer_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/controller_extension.json b/src/generated/resources/assets/functionalstorage/blockstates/controller_extension.json index 0858ca9f..a67f47f8 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/controller_extension.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/controller_extension.json @@ -1,23 +1,23 @@ { "variants": { - "subfacing=east": { - "model": "functionalstorage:block/controller_extension", - "uvlock": true, - "y": 90 - }, "subfacing=north": { "model": "functionalstorage:block/controller_extension", "uvlock": true }, "subfacing=south": { "model": "functionalstorage:block/controller_extension", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true }, "subfacing=west": { "model": "functionalstorage:block/controller_extension", - "uvlock": true, - "y": 270 + "y": 270, + "uvlock": true + }, + "subfacing=east": { + "model": "functionalstorage:block/controller_extension", + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/crimson_1.json b/src/generated/resources/assets/functionalstorage/blockstates/crimson_1.json index b08ce1e5..9c3aa3cc 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/crimson_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/crimson_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/crimson_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/crimson_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/crimson_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/crimson_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/crimson_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/crimson_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/crimson_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/crimson_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/crimson_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/crimson_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/crimson_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/crimson_2.json b/src/generated/resources/assets/functionalstorage/blockstates/crimson_2.json index 8869445b..761a895e 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/crimson_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/crimson_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/crimson_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/crimson_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/crimson_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/crimson_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/crimson_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/crimson_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/crimson_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/crimson_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/crimson_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/crimson_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/crimson_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/crimson_4.json b/src/generated/resources/assets/functionalstorage/blockstates/crimson_4.json index 832e4192..a0a607ec 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/crimson_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/crimson_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/crimson_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/crimson_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/crimson_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/crimson_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/crimson_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/crimson_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/crimson_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/crimson_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/crimson_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/crimson_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/crimson_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_1.json b/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_1.json index 87ec60cf..121cf993 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/dark_oak_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/dark_oak_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/dark_oak_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/dark_oak_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/dark_oak_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/dark_oak_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/dark_oak_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/dark_oak_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/dark_oak_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/dark_oak_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/dark_oak_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_2.json b/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_2.json index 550382d8..3872c7c3 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/dark_oak_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/dark_oak_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/dark_oak_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/dark_oak_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/dark_oak_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/dark_oak_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/dark_oak_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/dark_oak_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/dark_oak_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/dark_oak_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/dark_oak_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_4.json b/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_4.json index 19c16c4a..57f1bc5c 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/dark_oak_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/dark_oak_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/dark_oak_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/dark_oak_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/dark_oak_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/dark_oak_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/dark_oak_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/dark_oak_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/dark_oak_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/dark_oak_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/dark_oak_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/dark_oak_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/ender_drawer.json b/src/generated/resources/assets/functionalstorage/blockstates/ender_drawer.json index b456aac9..951acc9e 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/ender_drawer.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/ender_drawer.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/ender_drawer", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/ender_drawer", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/ender_drawer_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/ender_drawer", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/ender_drawer_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/ender_drawer", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/ender_drawer_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/ender_drawer_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/ender_drawer_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/ender_drawer", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/ender_drawer_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/fluid_1.json b/src/generated/resources/assets/functionalstorage/blockstates/fluid_1.json index 10cf6177..a775fa85 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/fluid_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/fluid_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/fluid_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/fluid_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/fluid_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/fluid_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/fluid_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/fluid_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/fluid_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/fluid_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/fluid_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/fluid_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/fluid_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/fluid_2.json b/src/generated/resources/assets/functionalstorage/blockstates/fluid_2.json index e47ff136..0c46e133 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/fluid_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/fluid_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/fluid_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/fluid_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/fluid_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/fluid_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/fluid_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/fluid_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/fluid_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/fluid_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/fluid_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/fluid_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/fluid_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/fluid_4.json b/src/generated/resources/assets/functionalstorage/blockstates/fluid_4.json index 53e72dc4..fbac57c3 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/fluid_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/fluid_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/fluid_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/fluid_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/fluid_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/fluid_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/fluid_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/fluid_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/fluid_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/fluid_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/fluid_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/fluid_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/fluid_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/framed_1.json b/src/generated/resources/assets/functionalstorage/blockstates/framed_1.json index c06ef151..d65f33a2 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/framed_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/framed_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/framed_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/framed_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/framed_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/framed_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/framed_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/framed_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/framed_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/framed_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/framed_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/framed_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/framed_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/framed_2.json b/src/generated/resources/assets/functionalstorage/blockstates/framed_2.json index d4f9c3c2..dc67f368 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/framed_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/framed_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/framed_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/framed_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/framed_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/framed_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/framed_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/framed_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/framed_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/framed_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/framed_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/framed_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/framed_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/framed_4.json b/src/generated/resources/assets/functionalstorage/blockstates/framed_4.json index b4274ba8..8365a8f7 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/framed_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/framed_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/framed_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/framed_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/framed_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/framed_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/framed_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/framed_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/framed_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/framed_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/framed_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/framed_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/framed_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/jungle_1.json b/src/generated/resources/assets/functionalstorage/blockstates/jungle_1.json index dc1be234..d64841db 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/jungle_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/jungle_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/jungle_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/jungle_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/jungle_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/jungle_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/jungle_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/jungle_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/jungle_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/jungle_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/jungle_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/jungle_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/jungle_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/jungle_2.json b/src/generated/resources/assets/functionalstorage/blockstates/jungle_2.json index c08fe1a4..a6541025 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/jungle_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/jungle_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/jungle_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/jungle_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/jungle_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/jungle_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/jungle_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/jungle_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/jungle_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/jungle_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/jungle_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/jungle_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/jungle_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/jungle_4.json b/src/generated/resources/assets/functionalstorage/blockstates/jungle_4.json index 284abea7..cbcdd049 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/jungle_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/jungle_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/jungle_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/jungle_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/jungle_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/jungle_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/jungle_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/jungle_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/jungle_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/jungle_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/jungle_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/jungle_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/jungle_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/mangrove_1.json b/src/generated/resources/assets/functionalstorage/blockstates/mangrove_1.json deleted file mode 100644 index a7947b8a..00000000 --- a/src/generated/resources/assets/functionalstorage/blockstates/mangrove_1.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/mangrove_1", - "uvlock": true, - "y": 90 - }, - "locked=false,subfacing=north": { - "model": "functionalstorage:block/mangrove_1", - "uvlock": true - }, - "locked=false,subfacing=south": { - "model": "functionalstorage:block/mangrove_1", - "uvlock": true, - "y": 180 - }, - "locked=false,subfacing=west": { - "model": "functionalstorage:block/mangrove_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/mangrove_1_locked", - "uvlock": true, - "y": 90 - }, - "locked=true,subfacing=north": { - "model": "functionalstorage:block/mangrove_1_locked", - "uvlock": true - }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/mangrove_1_locked", - "uvlock": true, - "y": 180 - }, - "locked=true,subfacing=west": { - "model": "functionalstorage:block/mangrove_1_locked", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/mangrove_2.json b/src/generated/resources/assets/functionalstorage/blockstates/mangrove_2.json deleted file mode 100644 index 6755a855..00000000 --- a/src/generated/resources/assets/functionalstorage/blockstates/mangrove_2.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/mangrove_2", - "uvlock": true, - "y": 90 - }, - "locked=false,subfacing=north": { - "model": "functionalstorage:block/mangrove_2", - "uvlock": true - }, - "locked=false,subfacing=south": { - "model": "functionalstorage:block/mangrove_2", - "uvlock": true, - "y": 180 - }, - "locked=false,subfacing=west": { - "model": "functionalstorage:block/mangrove_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/mangrove_2_locked", - "uvlock": true, - "y": 90 - }, - "locked=true,subfacing=north": { - "model": "functionalstorage:block/mangrove_2_locked", - "uvlock": true - }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/mangrove_2_locked", - "uvlock": true, - "y": 180 - }, - "locked=true,subfacing=west": { - "model": "functionalstorage:block/mangrove_2_locked", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/mangrove_4.json b/src/generated/resources/assets/functionalstorage/blockstates/mangrove_4.json deleted file mode 100644 index f5a44793..00000000 --- a/src/generated/resources/assets/functionalstorage/blockstates/mangrove_4.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/mangrove_4", - "uvlock": true, - "y": 90 - }, - "locked=false,subfacing=north": { - "model": "functionalstorage:block/mangrove_4", - "uvlock": true - }, - "locked=false,subfacing=south": { - "model": "functionalstorage:block/mangrove_4", - "uvlock": true, - "y": 180 - }, - "locked=false,subfacing=west": { - "model": "functionalstorage:block/mangrove_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/mangrove_4_locked", - "uvlock": true, - "y": 90 - }, - "locked=true,subfacing=north": { - "model": "functionalstorage:block/mangrove_4_locked", - "uvlock": true - }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/mangrove_4_locked", - "uvlock": true, - "y": 180 - }, - "locked=true,subfacing=west": { - "model": "functionalstorage:block/mangrove_4_locked", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/oak_1.json b/src/generated/resources/assets/functionalstorage/blockstates/oak_1.json index 8acb4283..7b61d98e 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/oak_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/oak_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/oak_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/oak_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/oak_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/oak_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/oak_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/oak_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/oak_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/oak_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/oak_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/oak_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/oak_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/oak_2.json b/src/generated/resources/assets/functionalstorage/blockstates/oak_2.json index 54e6a9f1..551894bb 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/oak_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/oak_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/oak_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/oak_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/oak_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/oak_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/oak_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/oak_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/oak_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/oak_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/oak_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/oak_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/oak_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/oak_4.json b/src/generated/resources/assets/functionalstorage/blockstates/oak_4.json index 611ab78d..8ebf0325 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/oak_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/oak_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/oak_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/oak_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/oak_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/oak_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/oak_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/oak_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/oak_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/oak_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/oak_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/oak_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/oak_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/simple_compacting_drawer.json b/src/generated/resources/assets/functionalstorage/blockstates/simple_compacting_drawer.json index 71f27fc8..dd8a032b 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/simple_compacting_drawer.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/simple_compacting_drawer.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/simple_compacting_drawer", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/simple_compacting_drawer", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/simple_compacting_drawer_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/simple_compacting_drawer", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/simple_compacting_drawer_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/simple_compacting_drawer", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/simple_compacting_drawer_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/simple_compacting_drawer_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/simple_compacting_drawer_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/simple_compacting_drawer", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/simple_compacting_drawer_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/spruce_1.json b/src/generated/resources/assets/functionalstorage/blockstates/spruce_1.json index ee432fa0..89061b31 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/spruce_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/spruce_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/spruce_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/spruce_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/spruce_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/spruce_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/spruce_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/spruce_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/spruce_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/spruce_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/spruce_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/spruce_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/spruce_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/spruce_2.json b/src/generated/resources/assets/functionalstorage/blockstates/spruce_2.json index 6da56dcf..b2b2374b 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/spruce_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/spruce_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/spruce_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/spruce_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/spruce_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/spruce_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/spruce_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/spruce_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/spruce_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/spruce_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/spruce_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/spruce_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/spruce_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/spruce_4.json b/src/generated/resources/assets/functionalstorage/blockstates/spruce_4.json index 3ae403e7..27adc405 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/spruce_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/spruce_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/spruce_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/spruce_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/spruce_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/spruce_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/spruce_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/spruce_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/spruce_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/spruce_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/spruce_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/spruce_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/spruce_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/storage_controller.json b/src/generated/resources/assets/functionalstorage/blockstates/storage_controller.json index effb9628..eb0db83d 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/storage_controller.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/storage_controller.json @@ -1,23 +1,23 @@ { "variants": { - "subfacing=east": { - "model": "functionalstorage:block/storage_controller", - "uvlock": true, - "y": 90 - }, "subfacing=north": { "model": "functionalstorage:block/storage_controller", "uvlock": true }, "subfacing=south": { "model": "functionalstorage:block/storage_controller", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true }, "subfacing=west": { "model": "functionalstorage:block/storage_controller", - "uvlock": true, - "y": 270 + "y": 270, + "uvlock": true + }, + "subfacing=east": { + "model": "functionalstorage:block/storage_controller", + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/warped_1.json b/src/generated/resources/assets/functionalstorage/blockstates/warped_1.json index d5fea499..11cf778e 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/warped_1.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/warped_1.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/warped_1", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/warped_1", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/warped_1_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/warped_1", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/warped_1_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/warped_1", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/warped_1_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/warped_1_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/warped_1_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/warped_1", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/warped_1_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/warped_2.json b/src/generated/resources/assets/functionalstorage/blockstates/warped_2.json index fd161cf1..d743f1c4 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/warped_2.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/warped_2.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/warped_2", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/warped_2", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/warped_2_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/warped_2", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/warped_2_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/warped_2", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/warped_2_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/warped_2_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/warped_2_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/warped_2", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/warped_2_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/blockstates/warped_4.json b/src/generated/resources/assets/functionalstorage/blockstates/warped_4.json index 38e22827..fe38728d 100644 --- a/src/generated/resources/assets/functionalstorage/blockstates/warped_4.json +++ b/src/generated/resources/assets/functionalstorage/blockstates/warped_4.json @@ -1,42 +1,42 @@ { "variants": { - "locked=false,subfacing=east": { - "model": "functionalstorage:block/warped_4", - "uvlock": true, - "y": 90 - }, "locked=false,subfacing=north": { "model": "functionalstorage:block/warped_4", "uvlock": true }, + "locked=true,subfacing=north": { + "model": "functionalstorage:block/warped_4_locked", + "uvlock": true + }, "locked=false,subfacing=south": { "model": "functionalstorage:block/warped_4", - "uvlock": true, - "y": 180 + "y": 180, + "uvlock": true + }, + "locked=true,subfacing=south": { + "model": "functionalstorage:block/warped_4_locked", + "y": 180, + "uvlock": true }, "locked=false,subfacing=west": { "model": "functionalstorage:block/warped_4", - "uvlock": true, - "y": 270 - }, - "locked=true,subfacing=east": { - "model": "functionalstorage:block/warped_4_locked", - "uvlock": true, - "y": 90 + "y": 270, + "uvlock": true }, - "locked=true,subfacing=north": { + "locked=true,subfacing=west": { "model": "functionalstorage:block/warped_4_locked", + "y": 270, "uvlock": true }, - "locked=true,subfacing=south": { - "model": "functionalstorage:block/warped_4_locked", - "uvlock": true, - "y": 180 + "locked=false,subfacing=east": { + "model": "functionalstorage:block/warped_4", + "y": 90, + "uvlock": true }, - "locked=true,subfacing=west": { + "locked=true,subfacing=east": { "model": "functionalstorage:block/warped_4_locked", - "uvlock": true, - "y": 270 + "y": 90, + "uvlock": true } } } \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/lang/en_us.json b/src/generated/resources/assets/functionalstorage/lang/en_us.json index d233d877..8fc9cc4f 100644 --- a/src/generated/resources/assets/functionalstorage/lang/en_us.json +++ b/src/generated/resources/assets/functionalstorage/lang/en_us.json @@ -25,9 +25,6 @@ "block.functionalstorage.jungle_1": "Jungle Drawer (1x1)", "block.functionalstorage.jungle_2": "Jungle Drawer (1x2)", "block.functionalstorage.jungle_4": "Jungle Drawer (2x2)", - "block.functionalstorage.mangrove_1": "Mangrove Drawer (1x1)", - "block.functionalstorage.mangrove_2": "Mangrove Drawer (1x2)", - "block.functionalstorage.mangrove_4": "Mangrove Drawer (2x2)", "block.functionalstorage.oak_1": "Oak Drawer (1x1)", "block.functionalstorage.oak_2": "Oak Drawer (1x2)", "block.functionalstorage.oak_4": "Oak Drawer (2x2)", diff --git a/src/generated/resources/assets/functionalstorage/models/block/mangrove_2_locked.json b/src/generated/resources/assets/functionalstorage/models/block/framed_1_locked.json similarity index 59% rename from src/generated/resources/assets/functionalstorage/models/block/mangrove_2_locked.json rename to src/generated/resources/assets/functionalstorage/models/block/framed_1_locked.json index b201cd06..6346d279 100644 --- a/src/generated/resources/assets/functionalstorage/models/block/mangrove_2_locked.json +++ b/src/generated/resources/assets/functionalstorage/models/block/framed_1_locked.json @@ -1,5 +1,5 @@ { - "parent": "functionalstorage:block/mangrove_2", + "parent": "functionalstorage:block/framed_1", "textures": { "lock_icon": "functionalstorage:blocks/lock" } diff --git a/src/generated/resources/assets/functionalstorage/models/block/mangrove_4_locked.json b/src/generated/resources/assets/functionalstorage/models/block/framed_2_locked.json similarity index 59% rename from src/generated/resources/assets/functionalstorage/models/block/mangrove_4_locked.json rename to src/generated/resources/assets/functionalstorage/models/block/framed_2_locked.json index 9320ea29..f039cf19 100644 --- a/src/generated/resources/assets/functionalstorage/models/block/mangrove_4_locked.json +++ b/src/generated/resources/assets/functionalstorage/models/block/framed_2_locked.json @@ -1,5 +1,5 @@ { - "parent": "functionalstorage:block/mangrove_4", + "parent": "functionalstorage:block/framed_2", "textures": { "lock_icon": "functionalstorage:blocks/lock" } diff --git a/src/generated/resources/assets/functionalstorage/models/block/mangrove_1_locked.json b/src/generated/resources/assets/functionalstorage/models/block/framed_4_locked.json similarity index 59% rename from src/generated/resources/assets/functionalstorage/models/block/mangrove_1_locked.json rename to src/generated/resources/assets/functionalstorage/models/block/framed_4_locked.json index 52cfe0dd..9ac95981 100644 --- a/src/generated/resources/assets/functionalstorage/models/block/mangrove_1_locked.json +++ b/src/generated/resources/assets/functionalstorage/models/block/framed_4_locked.json @@ -1,5 +1,5 @@ { - "parent": "functionalstorage:block/mangrove_1", + "parent": "functionalstorage:block/framed_4", "textures": { "lock_icon": "functionalstorage:blocks/lock" } diff --git a/src/generated/resources/assets/functionalstorage/models/item/mangrove_1.json b/src/generated/resources/assets/functionalstorage/models/item/mangrove_1.json deleted file mode 100644 index 510a5d00..00000000 --- a/src/generated/resources/assets/functionalstorage/models/item/mangrove_1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "functionalstorage:block/mangrove_1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/models/item/mangrove_2.json b/src/generated/resources/assets/functionalstorage/models/item/mangrove_2.json deleted file mode 100644 index 08c0e090..00000000 --- a/src/generated/resources/assets/functionalstorage/models/item/mangrove_2.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "functionalstorage:block/mangrove_2" -} \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/models/item/mangrove_4.json b/src/generated/resources/assets/functionalstorage/models/item/mangrove_4.json deleted file mode 100644 index 48f0460f..00000000 --- a/src/generated/resources/assets/functionalstorage/models/item/mangrove_4.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "functionalstorage:block/mangrove_4" -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/advancements/recipes/functionalstorage/netherite_upgrade.json b/src/generated/resources/data/functionalstorage/advancements/recipes/functionalstorage/netherite_upgrade.json index a52e8b02..9949c051 100644 --- a/src/generated/resources/data/functionalstorage/advancements/recipes/functionalstorage/netherite_upgrade.json +++ b/src/generated/resources/data/functionalstorage/advancements/recipes/functionalstorage/netherite_upgrade.json @@ -1,7 +1,13 @@ { "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "functionalstorage:netherite_upgrade" + ] + }, "criteria": { "has_netherite_ingot": { + "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -10,14 +16,13 @@ ] } ] - }, - "trigger": "minecraft:inventory_changed" + } }, "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "functionalstorage:netherite_upgrade" - }, - "trigger": "minecraft:recipe_unlocked" + } } }, "requirements": [ @@ -25,10 +30,5 @@ "has_netherite_ingot", "has_the_recipe" ] - ], - "rewards": { - "recipes": [ - "functionalstorage:netherite_upgrade" - ] - } + ] } \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/loot_tables/blocks/controller_extension.json b/src/generated/resources/data/functionalstorage/loot_tables/blocks/controller_extension.json index 4e5f82e4..aaac8db2 100644 --- a/src/generated/resources/data/functionalstorage/loot_tables/blocks/controller_extension.json +++ b/src/generated/resources/data/functionalstorage/loot_tables/blocks/controller_extension.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { + "rolls": 1.0, "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], "entries": [ { "type": "minecraft:item", "name": "functionalstorage:controller_extension" } ], - "rolls": 1.0 + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_1.json b/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_1.json deleted file mode 100644 index 68701f9f..00000000 --- a/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "minecraft:block" -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_2.json b/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_2.json deleted file mode 100644 index 68701f9f..00000000 --- a/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_2.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "minecraft:block" -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_4.json b/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_4.json deleted file mode 100644 index 68701f9f..00000000 --- a/src/generated/resources/data/functionalstorage/loot_tables/blocks/mangrove_4.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "minecraft:block" -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/loot_tables/blocks/storage_controller.json b/src/generated/resources/data/functionalstorage/loot_tables/blocks/storage_controller.json index 57195d1a..cd3b3f4d 100644 --- a/src/generated/resources/data/functionalstorage/loot_tables/blocks/storage_controller.json +++ b/src/generated/resources/data/functionalstorage/loot_tables/blocks/storage_controller.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { + "rolls": 1.0, "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], "entries": [ { "type": "minecraft:item", "name": "functionalstorage:storage_controller" } ], - "rolls": 1.0 + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/recipes/acacia_1.json b/src/generated/resources/data/functionalstorage/recipes/acacia_1.json index 2b0840e3..1c3e4d3a 100644 --- a/src/generated/resources/data/functionalstorage/recipes/acacia_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/acacia_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:acacia_1" + "item": "functionalstorage:acacia_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:acacia_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:acacia_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:acacia_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/acacia_2.json b/src/generated/resources/data/functionalstorage/recipes/acacia_2.json index fc5bfd1e..a328f772 100644 --- a/src/generated/resources/data/functionalstorage/recipes/acacia_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/acacia_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:acacia_2" + "item": "functionalstorage:acacia_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:acacia_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:acacia_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:acacia_2" + "item": "functionalstorage:acacia_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/acacia_4.json b/src/generated/resources/data/functionalstorage/recipes/acacia_4.json index 46dfd72c..04b555a7 100644 --- a/src/generated/resources/data/functionalstorage/recipes/acacia_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/acacia_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:acacia_4" + "item": "functionalstorage:acacia_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:acacia_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:acacia_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:acacia_4" + "item": "functionalstorage:acacia_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/armory_cabinet.json b/src/generated/resources/data/functionalstorage/recipes/armory_cabinet.json index 9c96c4af..af070803 100644 --- a/src/generated/resources/data/functionalstorage/recipes/armory_cabinet.json +++ b/src/generated/resources/data/functionalstorage/recipes/armory_cabinet.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:armory_cabinet" + "item": "functionalstorage:armory_cabinet", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "ICI", + "CDC", + "IBI" + ], "key": { + "I": { + "tag": "forge:stone" + }, "B": { "tag": "forge:ingots/netherite" }, @@ -24,16 +32,8 @@ }, "D": { "item": "minecraft:comparator" - }, - "I": { - "tag": "forge:stone" } }, - "pattern": [ - "ICI", - "CDC", - "IBI" - ], "result": { "item": "functionalstorage:armory_cabinet" } diff --git a/src/generated/resources/data/functionalstorage/recipes/birch_1.json b/src/generated/resources/data/functionalstorage/recipes/birch_1.json index 03c2f590..e7f4ceeb 100644 --- a/src/generated/resources/data/functionalstorage/recipes/birch_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/birch_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:birch_1" + "item": "functionalstorage:birch_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:birch_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:birch_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:birch_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/birch_2.json b/src/generated/resources/data/functionalstorage/recipes/birch_2.json index af295f78..330d075c 100644 --- a/src/generated/resources/data/functionalstorage/recipes/birch_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/birch_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:birch_2" + "item": "functionalstorage:birch_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:birch_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:birch_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:birch_2" + "item": "functionalstorage:birch_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/birch_4.json b/src/generated/resources/data/functionalstorage/recipes/birch_4.json index 2e90080e..dcf777b3 100644 --- a/src/generated/resources/data/functionalstorage/recipes/birch_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/birch_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:birch_4" + "item": "functionalstorage:birch_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:birch_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:birch_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:birch_4" + "item": "functionalstorage:birch_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/collector_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/collector_upgrade.json index d03a5845..5d1a518a 100644 --- a/src/generated/resources/data/functionalstorage/recipes/collector_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/collector_upgrade.json @@ -4,36 +4,36 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:collector_upgrade" + "item": "functionalstorage:collector_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "RDR", + "IBI" + ], "key": { - "B": { - "item": "minecraft:hopper" - }, - "D": { - "tag": "functionalstorage:drawer" - }, "I": { "tag": "forge:stone" }, + "B": { + "item": "minecraft:hopper" + }, "R": { "tag": "forge:dusts/redstone" + }, + "D": { + "tag": "functionalstorage:drawer" } }, - "pattern": [ - "IBI", - "RDR", - "IBI" - ], "result": { "item": "functionalstorage:collector_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/compacting_drawer.json b/src/generated/resources/data/functionalstorage/recipes/compacting_drawer.json index 2d29b519..89f355b7 100644 --- a/src/generated/resources/data/functionalstorage/recipes/compacting_drawer.json +++ b/src/generated/resources/data/functionalstorage/recipes/compacting_drawer.json @@ -4,36 +4,36 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:compacting_drawer" + "item": "functionalstorage:compacting_drawer", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "PDP", + "SIS" + ], "key": { + "S": { + "item": "minecraft:stone" + }, + "P": { + "item": "minecraft:piston" + }, "D": { "tag": "functionalstorage:drawer" }, "I": { "tag": "forge:ingots/iron" - }, - "P": { - "item": "minecraft:piston" - }, - "S": { - "item": "minecraft:stone" } }, - "pattern": [ - "SSS", - "PDP", - "SIS" - ], "result": { "item": "functionalstorage:compacting_drawer" } diff --git a/src/generated/resources/data/functionalstorage/recipes/compacting_framed_drawer.json b/src/generated/resources/data/functionalstorage/recipes/compacting_framed_drawer.json index 2da88e6d..49df4d54 100644 --- a/src/generated/resources/data/functionalstorage/recipes/compacting_framed_drawer.json +++ b/src/generated/resources/data/functionalstorage/recipes/compacting_framed_drawer.json @@ -4,18 +4,29 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:compacting_framed_drawer" + "item": "functionalstorage:compacting_framed_drawer", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "PDP", + "SIS" + ], "key": { + "S": { + "item": "minecraft:iron_nugget" + }, + "P": { + "item": "minecraft:piston" + }, "D": [ { "item": "functionalstorage:framed_1" @@ -29,19 +40,8 @@ ], "I": { "tag": "forge:ingots/iron" - }, - "P": { - "item": "minecraft:piston" - }, - "S": { - "item": "minecraft:iron_nugget" } }, - "pattern": [ - "SSS", - "PDP", - "SIS" - ], "result": { "item": "functionalstorage:compacting_framed_drawer" } diff --git a/src/generated/resources/data/functionalstorage/recipes/configuration_tool.json b/src/generated/resources/data/functionalstorage/recipes/configuration_tool.json index 06f1717a..3d149919 100644 --- a/src/generated/resources/data/functionalstorage/recipes/configuration_tool.json +++ b/src/generated/resources/data/functionalstorage/recipes/configuration_tool.json @@ -4,36 +4,36 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:configuration_tool" + "item": "functionalstorage:configuration_tool", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "PPG", + "PDG", + "PEP" + ], "key": { + "P": { + "item": "minecraft:paper" + }, + "G": { + "tag": "forge:ingots/gold" + }, "D": { "tag": "functionalstorage:drawer" }, "E": { "item": "minecraft:emerald" - }, - "G": { - "tag": "forge:ingots/gold" - }, - "P": { - "item": "minecraft:paper" } }, - "pattern": [ - "PPG", - "PDG", - "PEP" - ], "result": { "item": "functionalstorage:configuration_tool" } diff --git a/src/generated/resources/data/functionalstorage/recipes/controller_extension.json b/src/generated/resources/data/functionalstorage/recipes/controller_extension.json index f7da4b1c..b80a97fc 100644 --- a/src/generated/resources/data/functionalstorage/recipes/controller_extension.json +++ b/src/generated/resources/data/functionalstorage/recipes/controller_extension.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:controller_extension" + "item": "functionalstorage:controller_extension", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "CDC", + "IBI" + ], "key": { + "I": { + "tag": "forge:stone" + }, "B": { "tag": "forge:storage_blocks/quartz" }, @@ -24,16 +32,8 @@ }, "D": { "item": "minecraft:repeater" - }, - "I": { - "tag": "forge:stone" } }, - "pattern": [ - "IBI", - "CDC", - "IBI" - ], "result": { "item": "functionalstorage:controller_extension" } diff --git a/src/generated/resources/data/functionalstorage/recipes/copper_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/copper_upgrade.json index 6b086ea3..23cfd077 100644 --- a/src/generated/resources/data/functionalstorage/recipes/copper_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/copper_upgrade.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:copper_upgrade" + "item": "functionalstorage:copper_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "CDC", + "IBI" + ], "key": { + "I": { + "item": "minecraft:copper_ingot" + }, "B": { "item": "minecraft:copper_block" }, @@ -24,16 +32,8 @@ }, "D": { "tag": "functionalstorage:drawer" - }, - "I": { - "item": "minecraft:copper_ingot" } }, - "pattern": [ - "IBI", - "CDC", - "IBI" - ], "result": { "item": "functionalstorage:copper_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/crimson_1.json b/src/generated/resources/data/functionalstorage/recipes/crimson_1.json index 71627439..d8aca117 100644 --- a/src/generated/resources/data/functionalstorage/recipes/crimson_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/crimson_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:crimson_1" + "item": "functionalstorage:crimson_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:crimson_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:crimson_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:crimson_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/crimson_2.json b/src/generated/resources/data/functionalstorage/recipes/crimson_2.json index ce804582..7b996a71 100644 --- a/src/generated/resources/data/functionalstorage/recipes/crimson_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/crimson_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:crimson_2" + "item": "functionalstorage:crimson_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:crimson_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:crimson_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:crimson_2" + "item": "functionalstorage:crimson_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/crimson_4.json b/src/generated/resources/data/functionalstorage/recipes/crimson_4.json index c549ba87..b79986d5 100644 --- a/src/generated/resources/data/functionalstorage/recipes/crimson_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/crimson_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:crimson_4" + "item": "functionalstorage:crimson_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:crimson_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:crimson_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:crimson_4" + "item": "functionalstorage:crimson_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/dark_oak_1.json b/src/generated/resources/data/functionalstorage/recipes/dark_oak_1.json index 09b6710b..afd7cfe1 100644 --- a/src/generated/resources/data/functionalstorage/recipes/dark_oak_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/dark_oak_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:dark_oak_1" + "item": "functionalstorage:dark_oak_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:dark_oak_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:dark_oak_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:dark_oak_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/dark_oak_2.json b/src/generated/resources/data/functionalstorage/recipes/dark_oak_2.json index f2e98395..c8798906 100644 --- a/src/generated/resources/data/functionalstorage/recipes/dark_oak_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/dark_oak_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:dark_oak_2" + "item": "functionalstorage:dark_oak_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:dark_oak_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:dark_oak_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:dark_oak_2" + "item": "functionalstorage:dark_oak_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/dark_oak_4.json b/src/generated/resources/data/functionalstorage/recipes/dark_oak_4.json index 7c413bd3..578c6617 100644 --- a/src/generated/resources/data/functionalstorage/recipes/dark_oak_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/dark_oak_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:dark_oak_4" + "item": "functionalstorage:dark_oak_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:dark_oak_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:dark_oak_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:dark_oak_4" + "item": "functionalstorage:dark_oak_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/diamond_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/diamond_upgrade.json index 75b2c40c..971c89bb 100644 --- a/src/generated/resources/data/functionalstorage/recipes/diamond_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/diamond_upgrade.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:diamond_upgrade" + "item": "functionalstorage:diamond_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "CDC", + "IBI" + ], "key": { + "I": { + "tag": "forge:gems/diamond" + }, "B": { "tag": "forge:storage_blocks/diamond" }, @@ -24,16 +32,8 @@ }, "D": { "item": "functionalstorage:gold_upgrade" - }, - "I": { - "tag": "forge:gems/diamond" } }, - "pattern": [ - "IBI", - "CDC", - "IBI" - ], "result": { "item": "functionalstorage:diamond_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json b/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json index 0e31a457..7b7c63e7 100644 --- a/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json +++ b/src/generated/resources/data/functionalstorage/recipes/ender_drawer.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:ender_drawer" + "item": "functionalstorage:ender_drawer", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "PPP", + "LCL", + "PPP" + ], "key": { + "P": { + "tag": "minecraft:planks" + }, "C": { "tag": "forge:chests/ender" }, "L": { "tag": "functionalstorage:drawer" - }, - "P": { - "tag": "minecraft:planks" } }, - "pattern": [ - "PPP", - "LCL", - "PPP" - ], "result": { "item": "functionalstorage:ender_drawer" } diff --git a/src/generated/resources/data/functionalstorage/recipes/fluid_1.json b/src/generated/resources/data/functionalstorage/recipes/fluid_1.json index 17e74be2..47afed4b 100644 --- a/src/generated/resources/data/functionalstorage/recipes/fluid_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/fluid_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:fluid_1" + "item": "functionalstorage:fluid_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "item": "minecraft:bucket" - }, - "P": { - "tag": "minecraft:planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "tag": "minecraft:planks" + }, + "C": { + "item": "minecraft:bucket" + } + }, "result": { "item": "functionalstorage:fluid_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/fluid_2.json b/src/generated/resources/data/functionalstorage/recipes/fluid_2.json index d29d3bf3..9aa247c3 100644 --- a/src/generated/resources/data/functionalstorage/recipes/fluid_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/fluid_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:fluid_2" + "item": "functionalstorage:fluid_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "item": "minecraft:bucket" - }, - "P": { - "tag": "minecraft:planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "tag": "minecraft:planks" + }, + "C": { + "item": "minecraft:bucket" + } + }, "result": { - "count": 2, - "item": "functionalstorage:fluid_2" + "item": "functionalstorage:fluid_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/fluid_4.json b/src/generated/resources/data/functionalstorage/recipes/fluid_4.json index 89ef9baf..9de189c7 100644 --- a/src/generated/resources/data/functionalstorage/recipes/fluid_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/fluid_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:fluid_4" + "item": "functionalstorage:fluid_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "item": "minecraft:bucket" - }, - "P": { - "tag": "minecraft:planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "tag": "minecraft:planks" + }, + "C": { + "item": "minecraft:bucket" + } + }, "result": { - "count": 4, - "item": "functionalstorage:fluid_4" + "item": "functionalstorage:fluid_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/framed_1.json b/src/generated/resources/data/functionalstorage/recipes/framed_1.json index 4638e39f..de3af52d 100644 --- a/src/generated/resources/data/functionalstorage/recipes/framed_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/framed_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:framed_1" + "item": "functionalstorage:framed_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:iron_nugget" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:iron_nugget" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:framed_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/framed_2.json b/src/generated/resources/data/functionalstorage/recipes/framed_2.json index b5cf37ad..e8487a26 100644 --- a/src/generated/resources/data/functionalstorage/recipes/framed_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/framed_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:framed_2" + "item": "functionalstorage:framed_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:iron_nugget" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:iron_nugget" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:framed_2" + "item": "functionalstorage:framed_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/framed_4.json b/src/generated/resources/data/functionalstorage/recipes/framed_4.json index 5c297ae8..96b46f43 100644 --- a/src/generated/resources/data/functionalstorage/recipes/framed_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/framed_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:framed_4" + "item": "functionalstorage:framed_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:iron_nugget" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:iron_nugget" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:framed_4" + "item": "functionalstorage:framed_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/gold_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/gold_upgrade.json index 75f27ade..6bf61cd3 100644 --- a/src/generated/resources/data/functionalstorage/recipes/gold_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/gold_upgrade.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:gold_upgrade" + "item": "functionalstorage:gold_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "CDC", + "BIB" + ], "key": { + "I": { + "tag": "forge:ingots/gold" + }, "B": { "tag": "forge:storage_blocks/gold" }, @@ -24,16 +32,8 @@ }, "D": { "item": "functionalstorage:copper_upgrade" - }, - "I": { - "tag": "forge:ingots/gold" } }, - "pattern": [ - "IBI", - "CDC", - "BIB" - ], "result": { "item": "functionalstorage:gold_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/iron_downgrade.json b/src/generated/resources/data/functionalstorage/recipes/iron_downgrade.json index 2297d866..59a7de3e 100644 --- a/src/generated/resources/data/functionalstorage/recipes/iron_downgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/iron_downgrade.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:iron_downgrade" + "item": "functionalstorage:iron_downgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "D": { - "tag": "functionalstorage:drawer" - }, - "I": { - "tag": "forge:ingots/iron" - } - }, "pattern": [ "III", "IDI", "III" ], + "key": { + "I": { + "tag": "forge:ingots/iron" + }, + "D": { + "tag": "functionalstorage:drawer" + } + }, "result": { "item": "functionalstorage:iron_downgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/jungle_1.json b/src/generated/resources/data/functionalstorage/recipes/jungle_1.json index 1e73b800..ee400460 100644 --- a/src/generated/resources/data/functionalstorage/recipes/jungle_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/jungle_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:jungle_1" + "item": "functionalstorage:jungle_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:jungle_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:jungle_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:jungle_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/jungle_2.json b/src/generated/resources/data/functionalstorage/recipes/jungle_2.json index c916a62d..26288de7 100644 --- a/src/generated/resources/data/functionalstorage/recipes/jungle_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/jungle_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:jungle_2" + "item": "functionalstorage:jungle_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:jungle_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:jungle_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:jungle_2" + "item": "functionalstorage:jungle_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/jungle_4.json b/src/generated/resources/data/functionalstorage/recipes/jungle_4.json index 830bb5d1..d14c552b 100644 --- a/src/generated/resources/data/functionalstorage/recipes/jungle_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/jungle_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:jungle_4" + "item": "functionalstorage:jungle_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:jungle_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:jungle_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:jungle_4" + "item": "functionalstorage:jungle_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/linking_tool.json b/src/generated/resources/data/functionalstorage/recipes/linking_tool.json index 3bdbb0f4..21508f8b 100644 --- a/src/generated/resources/data/functionalstorage/recipes/linking_tool.json +++ b/src/generated/resources/data/functionalstorage/recipes/linking_tool.json @@ -4,36 +4,36 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:linking_tool" + "item": "functionalstorage:linking_tool", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "PPG", + "PDG", + "PEP" + ], "key": { + "P": { + "item": "minecraft:paper" + }, + "G": { + "tag": "forge:ingots/gold" + }, "D": { "tag": "functionalstorage:drawer" }, "E": { "item": "minecraft:diamond" - }, - "G": { - "tag": "forge:ingots/gold" - }, - "P": { - "item": "minecraft:paper" } }, - "pattern": [ - "PPG", - "PDG", - "PEP" - ], "result": { "item": "functionalstorage:linking_tool" } diff --git a/src/generated/resources/data/functionalstorage/recipes/mangrove_1.json b/src/generated/resources/data/functionalstorage/recipes/mangrove_1.json deleted file mode 100644 index 865f5668..00000000 --- a/src/generated/resources/data/functionalstorage/recipes/mangrove_1.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:and", - "values": [ - { - "type": "forge:item_exists", - "item": "functionalstorage:mangrove_1" - } - ] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:mangrove_planks" - } - }, - "pattern": [ - "PPP", - "PCP", - "PPP" - ], - "result": { - "item": "functionalstorage:mangrove_1" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/recipes/mangrove_2.json b/src/generated/resources/data/functionalstorage/recipes/mangrove_2.json deleted file mode 100644 index 5fbf8a0a..00000000 --- a/src/generated/resources/data/functionalstorage/recipes/mangrove_2.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:and", - "values": [ - { - "type": "forge:item_exists", - "item": "functionalstorage:mangrove_2" - } - ] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:mangrove_planks" - } - }, - "pattern": [ - "PCP", - "PPP", - "PCP" - ], - "result": { - "count": 2, - "item": "functionalstorage:mangrove_2" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/recipes/mangrove_4.json b/src/generated/resources/data/functionalstorage/recipes/mangrove_4.json deleted file mode 100644 index eea533c6..00000000 --- a/src/generated/resources/data/functionalstorage/recipes/mangrove_4.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:and", - "values": [ - { - "type": "forge:item_exists", - "item": "functionalstorage:mangrove_4" - } - ] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:mangrove_planks" - } - }, - "pattern": [ - "CPC", - "PPP", - "CPC" - ], - "result": { - "count": 4, - "item": "functionalstorage:mangrove_4" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/functionalstorage/recipes/netherite_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/netherite_upgrade.json index 71e5e26c..5e1a68ab 100644 --- a/src/generated/resources/data/functionalstorage/recipes/netherite_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/netherite_upgrade.json @@ -1,11 +1,11 @@ { "type": "minecraft:smithing", - "addition": { - "item": "minecraft:netherite_ingot" - }, "base": { "item": "functionalstorage:diamond_upgrade" }, + "addition": { + "item": "minecraft:netherite_ingot" + }, "result": { "item": "functionalstorage:netherite_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/oak_1.json b/src/generated/resources/data/functionalstorage/recipes/oak_1.json index cb316444..afbbeb69 100644 --- a/src/generated/resources/data/functionalstorage/recipes/oak_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/oak_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:oak_1" + "item": "functionalstorage:oak_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:oak_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:oak_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:oak_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/oak_2.json b/src/generated/resources/data/functionalstorage/recipes/oak_2.json index 15d976cb..2ed141a4 100644 --- a/src/generated/resources/data/functionalstorage/recipes/oak_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/oak_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:oak_2" + "item": "functionalstorage:oak_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:oak_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:oak_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:oak_2" + "item": "functionalstorage:oak_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/oak_4.json b/src/generated/resources/data/functionalstorage/recipes/oak_4.json index 04bd1c09..992256b9 100644 --- a/src/generated/resources/data/functionalstorage/recipes/oak_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/oak_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:oak_4" + "item": "functionalstorage:oak_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:oak_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:oak_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:oak_4" + "item": "functionalstorage:oak_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x1.json b/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x1.json index 8925e7ab..bd4f5115 100644 --- a/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x1.json +++ b/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:oak_1" + "item": "functionalstorage:oak_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "type": "functionalstorage:woodless" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "type": "functionalstorage:woodless" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:oak_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x2.json b/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x2.json index 80db0cc0..bb15c7b4 100644 --- a/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x2.json +++ b/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:oak_2" + "item": "functionalstorage:oak_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "type": "functionalstorage:woodless" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "type": "functionalstorage:woodless" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:oak_2" + "item": "functionalstorage:oak_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x4.json b/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x4.json index f798ff98..e423ba62 100644 --- a/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x4.json +++ b/src/generated/resources/data/functionalstorage/recipes/oak_drawer_alternate_x4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:oak_4" + "item": "functionalstorage:oak_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "type": "functionalstorage:woodless" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "type": "functionalstorage:woodless" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:oak_4" + "item": "functionalstorage:oak_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/puller_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/puller_upgrade.json index 00336e38..a2da0aab 100644 --- a/src/generated/resources/data/functionalstorage/recipes/puller_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/puller_upgrade.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:puller_upgrade" + "item": "functionalstorage:puller_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "ICI", + "IDI", + "IBI" + ], "key": { + "I": { + "tag": "forge:stone" + }, "B": { "tag": "forge:dusts/redstone" }, @@ -24,16 +32,8 @@ }, "D": { "tag": "functionalstorage:drawer" - }, - "I": { - "tag": "forge:stone" } }, - "pattern": [ - "ICI", - "IDI", - "IBI" - ], "result": { "item": "functionalstorage:puller_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/pusher_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/pusher_upgrade.json index 545e2095..6c058815 100644 --- a/src/generated/resources/data/functionalstorage/recipes/pusher_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/pusher_upgrade.json @@ -4,36 +4,36 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:pusher_upgrade" + "item": "functionalstorage:pusher_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "IDI", + "IRI" + ], "key": { - "B": { - "tag": "forge:dusts/redstone" - }, - "D": { - "tag": "functionalstorage:drawer" - }, "I": { "tag": "forge:stone" }, + "B": { + "tag": "forge:dusts/redstone" + }, "R": { "item": "minecraft:hopper" + }, + "D": { + "tag": "functionalstorage:drawer" } }, - "pattern": [ - "IBI", - "IDI", - "IRI" - ], "result": { "item": "functionalstorage:pusher_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/redstone_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/redstone_upgrade.json index 5e07fff3..693aea5f 100644 --- a/src/generated/resources/data/functionalstorage/recipes/redstone_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/redstone_upgrade.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:redstone_upgrade" + "item": "functionalstorage:redstone_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "CDC", + "IBI" + ], "key": { + "I": { + "item": "minecraft:redstone" + }, "B": { "item": "minecraft:redstone_block" }, @@ -24,16 +32,8 @@ }, "D": { "tag": "functionalstorage:drawer" - }, - "I": { - "item": "minecraft:redstone" } }, - "pattern": [ - "IBI", - "CDC", - "IBI" - ], "result": { "item": "functionalstorage:redstone_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/simple_compacting_drawer.json b/src/generated/resources/data/functionalstorage/recipes/simple_compacting_drawer.json index 7d501757..ff67a017 100644 --- a/src/generated/resources/data/functionalstorage/recipes/simple_compacting_drawer.json +++ b/src/generated/resources/data/functionalstorage/recipes/simple_compacting_drawer.json @@ -4,36 +4,36 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:simple_compacting_drawer" + "item": "functionalstorage:simple_compacting_drawer", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SDP", + "SIS" + ], "key": { + "S": { + "item": "minecraft:stone" + }, + "P": { + "item": "minecraft:piston" + }, "D": { "tag": "functionalstorage:drawer" }, "I": { "tag": "forge:ingots/iron" - }, - "P": { - "item": "minecraft:piston" - }, - "S": { - "item": "minecraft:stone" } }, - "pattern": [ - "SSS", - "SDP", - "SIS" - ], "result": { "item": "functionalstorage:simple_compacting_drawer" } diff --git a/src/generated/resources/data/functionalstorage/recipes/spruce_1.json b/src/generated/resources/data/functionalstorage/recipes/spruce_1.json index cd16ce52..0bee2c11 100644 --- a/src/generated/resources/data/functionalstorage/recipes/spruce_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/spruce_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:spruce_1" + "item": "functionalstorage:spruce_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:spruce_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:spruce_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:spruce_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/spruce_2.json b/src/generated/resources/data/functionalstorage/recipes/spruce_2.json index 124018a6..75f652df 100644 --- a/src/generated/resources/data/functionalstorage/recipes/spruce_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/spruce_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:spruce_2" + "item": "functionalstorage:spruce_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:spruce_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:spruce_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:spruce_2" + "item": "functionalstorage:spruce_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/spruce_4.json b/src/generated/resources/data/functionalstorage/recipes/spruce_4.json index 7020af44..ea084bf6 100644 --- a/src/generated/resources/data/functionalstorage/recipes/spruce_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/spruce_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:spruce_4" + "item": "functionalstorage:spruce_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:spruce_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:spruce_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:spruce_4" + "item": "functionalstorage:spruce_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/storage_controller.json b/src/generated/resources/data/functionalstorage/recipes/storage_controller.json index 68452437..e2baf4c4 100644 --- a/src/generated/resources/data/functionalstorage/recipes/storage_controller.json +++ b/src/generated/resources/data/functionalstorage/recipes/storage_controller.json @@ -4,18 +4,26 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:storage_controller" + "item": "functionalstorage:storage_controller", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", + "pattern": [ + "IBI", + "CDC", + "IBI" + ], "key": { + "I": { + "tag": "forge:stone" + }, "B": { "tag": "forge:storage_blocks/quartz" }, @@ -24,16 +32,8 @@ }, "D": { "item": "minecraft:comparator" - }, - "I": { - "tag": "forge:stone" } }, - "pattern": [ - "IBI", - "CDC", - "IBI" - ], "result": { "item": "functionalstorage:storage_controller" } diff --git a/src/generated/resources/data/functionalstorage/recipes/void_upgrade.json b/src/generated/resources/data/functionalstorage/recipes/void_upgrade.json index b6b916a8..ba6f0725 100644 --- a/src/generated/resources/data/functionalstorage/recipes/void_upgrade.json +++ b/src/generated/resources/data/functionalstorage/recipes/void_upgrade.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:void_upgrade" + "item": "functionalstorage:void_upgrade", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "D": { - "tag": "functionalstorage:drawer" - }, - "I": { - "tag": "forge:obsidian" - } - }, "pattern": [ "III", "IDI", "III" ], + "key": { + "I": { + "tag": "forge:obsidian" + }, + "D": { + "tag": "functionalstorage:drawer" + } + }, "result": { "item": "functionalstorage:void_upgrade" } diff --git a/src/generated/resources/data/functionalstorage/recipes/warped_1.json b/src/generated/resources/data/functionalstorage/recipes/warped_1.json index 3d29b7ec..008173d0 100644 --- a/src/generated/resources/data/functionalstorage/recipes/warped_1.json +++ b/src/generated/resources/data/functionalstorage/recipes/warped_1.json @@ -4,30 +4,30 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:warped_1" + "item": "functionalstorage:warped_1", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:warped_planks" - } - }, "pattern": [ "PPP", "PCP", "PPP" ], + "key": { + "P": { + "item": "minecraft:warped_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { "item": "functionalstorage:warped_1" } diff --git a/src/generated/resources/data/functionalstorage/recipes/warped_2.json b/src/generated/resources/data/functionalstorage/recipes/warped_2.json index df6dfca1..32e7c9dc 100644 --- a/src/generated/resources/data/functionalstorage/recipes/warped_2.json +++ b/src/generated/resources/data/functionalstorage/recipes/warped_2.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:warped_2" + "item": "functionalstorage:warped_2", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:warped_planks" - } - }, "pattern": [ "PCP", "PPP", "PCP" ], + "key": { + "P": { + "item": "minecraft:warped_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 2, - "item": "functionalstorage:warped_2" + "item": "functionalstorage:warped_2", + "count": 2 } } } diff --git a/src/generated/resources/data/functionalstorage/recipes/warped_4.json b/src/generated/resources/data/functionalstorage/recipes/warped_4.json index d5f68223..702be097 100644 --- a/src/generated/resources/data/functionalstorage/recipes/warped_4.json +++ b/src/generated/resources/data/functionalstorage/recipes/warped_4.json @@ -4,33 +4,33 @@ { "conditions": [ { - "type": "forge:and", "values": [ { - "type": "forge:item_exists", - "item": "functionalstorage:warped_4" + "item": "functionalstorage:warped_4", + "type": "forge:item_exists" } - ] + ], + "type": "forge:and" } ], "recipe": { "type": "minecraft:crafting_shaped", - "key": { - "C": { - "tag": "forge:chests/wooden" - }, - "P": { - "item": "minecraft:warped_planks" - } - }, "pattern": [ "CPC", "PPP", "CPC" ], + "key": { + "P": { + "item": "minecraft:warped_planks" + }, + "C": { + "tag": "forge:chests/wooden" + } + }, "result": { - "count": 4, - "item": "functionalstorage:warped_4" + "item": "functionalstorage:warped_4", + "count": 4 } } } diff --git a/src/generated/resources/data/functionalstorage/tags/items/drawer.json b/src/generated/resources/data/functionalstorage/tags/items/drawer.json index fd0de549..9e05415a 100644 --- a/src/generated/resources/data/functionalstorage/tags/items/drawer.json +++ b/src/generated/resources/data/functionalstorage/tags/items/drawer.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "functionalstorage:oak_2", "functionalstorage:spruce_2", diff --git a/src/generated/resources/data/functionalstorage/tags/items/ignore_crafting_check.json b/src/generated/resources/data/functionalstorage/tags/items/ignore_crafting_check.json index 649c1763..22b48dd8 100644 --- a/src/generated/resources/data/functionalstorage/tags/items/ignore_crafting_check.json +++ b/src/generated/resources/data/functionalstorage/tags/items/ignore_crafting_check.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "minecraft:clay", "minecraft:clay_ball", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index bc095d40..9e05415a 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,14 +1,6 @@ { + "replace": false, "values": [ - "functionalstorage:oak_4", - "functionalstorage:spruce_4", - "functionalstorage:birch_4", - "functionalstorage:jungle_4", - "functionalstorage:acacia_4", - "functionalstorage:dark_oak_4", - "functionalstorage:crimson_4", - "functionalstorage:warped_4", - "functionalstorage:framed_4", "functionalstorage:oak_2", "functionalstorage:spruce_2", "functionalstorage:birch_2", @@ -18,6 +10,15 @@ "functionalstorage:crimson_2", "functionalstorage:warped_2", "functionalstorage:framed_2", + "functionalstorage:oak_4", + "functionalstorage:spruce_4", + "functionalstorage:birch_4", + "functionalstorage:jungle_4", + "functionalstorage:acacia_4", + "functionalstorage:dark_oak_4", + "functionalstorage:crimson_4", + "functionalstorage:warped_4", + "functionalstorage:framed_4", "functionalstorage:oak_1", "functionalstorage:spruce_1", "functionalstorage:birch_1", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 9716f150..81030fdc 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "functionalstorage:compacting_drawer", "functionalstorage:storage_controller", diff --git a/src/main/resources/assets/functionalstorage/models/block/framed_1_locked.json b/src/main/resources/assets/functionalstorage/models/block/framed_1_locked.json deleted file mode 100644 index 8a81f60e..00000000 --- a/src/main/resources/assets/functionalstorage/models/block/framed_1_locked.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "parent": "minecraft:block/block", - "loader": "functionalstorage:framedblock", - "children": { - "lock": { - "parent": "functionalstorage:block/lock", - "textures": { - "lock_icon": "functionalstorage:blocks/lock" - } - }, - "front": { - "parent": "functionalstorage:block/front", - "textures": { - "front": "functionalstorage:blocks/framed_front_1" - } - }, - "side": { - "parent": "functionalstorage:block/side", - "textures": { - "side": "functionalstorage:blocks/framed_side" - } - } - }, - "item_render_order": [ - "lock", - "front", - "side" - ], - "textures": { - "particle": "functionalstorage:blocks/framed_front_1" - }, - "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, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 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/models/block/framed_2_locked.json b/src/main/resources/assets/functionalstorage/models/block/framed_2_locked.json deleted file mode 100644 index 92454d9b..00000000 --- a/src/main/resources/assets/functionalstorage/models/block/framed_2_locked.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "parent": "minecraft:block/block", - "loader": "functionalstorage:framedblock", - "children": { - "lock": { - "parent": "functionalstorage:block/lock", - "textures": { - "lock_icon": "functionalstorage:blocks/lock" - } - }, - "front": { - "parent": "functionalstorage:block/front", - "textures": { - "front": "functionalstorage:blocks/framed_front_1" - } - }, - "side": { - "parent": "functionalstorage:block/side", - "textures": { - "side": "functionalstorage:blocks/framed_side" - } - }, - "front_divider" : { - "parent": "functionalstorage:block/divider_2", - "textures": { - "front_divider": "functionalstorage:blocks/framed_side" - } - } - }, - "item_render_order": [ - "lock", - "front_divider", - "front", - "side" - ], - "textures": { - "particle": "functionalstorage:blocks/framed_front_1" - }, - "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, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 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/models/block/framed_4_locked.json b/src/main/resources/assets/functionalstorage/models/block/framed_4_locked.json deleted file mode 100644 index 69ee8308..00000000 --- a/src/main/resources/assets/functionalstorage/models/block/framed_4_locked.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "parent": "minecraft:block/block", - "loader": "functionalstorage:framedblock", - "children": { - "lock": { - "parent": "functionalstorage:block/lock", - "textures": { - "lock_icon": "functionalstorage:blocks/lock" - } - }, - "front": { - "parent": "functionalstorage:block/front", - "textures": { - "front": "functionalstorage:blocks/framed_front_1" - } - }, - "side": { - "parent": "functionalstorage:block/side", - "textures": { - "side": "functionalstorage:blocks/framed_side" - } - }, - "front_divider" : { - "parent": "functionalstorage:block/divider_4", - "textures": { - "front_divider": "functionalstorage:blocks/framed_side" - } - } - }, - "item_render_order": [ - "lock", - "front_divider", - "front", - "side" - ], - "textures": { - "particle": "functionalstorage:blocks/framed_front_1" - }, - "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, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 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 From eb302e85e4bb9186a3ea19d5ee50285fbdbd6dd2 Mon Sep 17 00:00:00 2001 From: Christofmeg <4357405+Christofmeg@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:40:26 +0100 Subject: [PATCH 3/3] [18.2] Armory Cabinet providers for Jade and TOP Displays a simple number that shows how many items that are currently stored in the Armory Cabinet --- build.gradle | 11 ++--- gradle.properties | 4 +- .../assets/functionalstorage/lang/en_us.json | 1 + .../compat/jade/ArmoryComponentProvider.java | 42 +++++++++++++++++++ .../compat/jade/FSJadePlugin.java | 19 +++++++++ .../compat/top/FunctionalArmoryProvider.java | 36 ++++++++++++++++ .../compat/{ => top}/TOPPlugin.java | 4 +- .../data/FunctionalStorageLangProvider.java | 1 + 8 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/buuz135/functionalstorage/compat/jade/ArmoryComponentProvider.java create mode 100644 src/main/java/com/buuz135/functionalstorage/compat/jade/FSJadePlugin.java create mode 100644 src/main/java/com/buuz135/functionalstorage/compat/top/FunctionalArmoryProvider.java rename src/main/java/com/buuz135/functionalstorage/compat/{ => top}/TOPPlugin.java (83%) diff --git a/build.gradle b/build.gradle index 0b82cc10..9b4da5c5 100644 --- a/build.gradle +++ b/build.gradle @@ -91,13 +91,14 @@ repositories { } dependencies { - - minecraft 'net.minecraftforge:forge:1.18.2-40.1.19' + minecraft 'net.minecraftforge:forge:1.18.2-40.3.0' implementation fg.deobf (project.dependencies.create('com.hrznstudio:titanium:1.18.2-3.5.6-38')) - compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.180:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.180") + compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") + runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") runtimeOnly fg.deobf("curse.maven:refined-storage-243076:3712882") - implementation fg.deobf("curse.maven:the-one-probe-245211:3671753") + compileOnly fg.deobf("curse.maven:jade-324717:5079263") + implementation fg.deobf("curse.maven:the-one-probe-245211:3965688") + runtimeOnly fg.deobf("curse.maven:applied-energistics-2-223794:4733112") //implementation fg.deobf("curse.maven:allthecompressed-514045:3723881") //runtimeOnly fg.deobf("curse.maven:create-328085:3600402") //runtimeOnly fg.deobf("curse.maven:flywheel-486392:3600401") diff --git a/gradle.properties b/gradle.properties index de8af274..2e1fa36c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mc_version=1.19.2 -jei_version=11.2.0.254 +mc_version=1.18.2 +jei_version=10.2.1.1005 mekanism_version=10.3.5.474 \ No newline at end of file diff --git a/src/generated/resources/assets/functionalstorage/lang/en_us.json b/src/generated/resources/assets/functionalstorage/lang/en_us.json index 8fc9cc4f..c3cfc7eb 100644 --- a/src/generated/resources/assets/functionalstorage/lang/en_us.json +++ b/src/generated/resources/assets/functionalstorage/lang/en_us.json @@ -36,6 +36,7 @@ "block.functionalstorage.warped_1": "Warped Drawer (1x1)", "block.functionalstorage.warped_2": "Warped Drawer (1x2)", "block.functionalstorage.warped_4": "Warped Drawer (2x2)", + "config.jade.plugin_functionalstorage.armory": "Functional Storage Armory", "configurationtool.configmode": "Config Mode: ", "configurationtool.configmode.locking": "Locking", "configurationtool.configmode.toggle_numbers": "Hide/Show Amounts", diff --git a/src/main/java/com/buuz135/functionalstorage/compat/jade/ArmoryComponentProvider.java b/src/main/java/com/buuz135/functionalstorage/compat/jade/ArmoryComponentProvider.java new file mode 100644 index 00000000..4b0d19d8 --- /dev/null +++ b/src/main/java/com/buuz135/functionalstorage/compat/jade/ArmoryComponentProvider.java @@ -0,0 +1,42 @@ +package com.buuz135.functionalstorage.compat.jade; + +import com.buuz135.functionalstorage.FunctionalStorage; +import com.buuz135.functionalstorage.block.config.FunctionalStorageConfig; +import com.buuz135.functionalstorage.block.tile.ArmoryCabinetTile; +import mcp.mobius.waila.api.BlockAccessor; +import mcp.mobius.waila.api.IComponentProvider; +import mcp.mobius.waila.api.IServerDataProvider; +import mcp.mobius.waila.api.ITooltip; +import mcp.mobius.waila.api.config.IPluginConfig; +import mcp.mobius.waila.impl.ui.ElementHelper; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.phys.Vec2; + +public enum ArmoryComponentProvider implements IComponentProvider, IServerDataProvider { + INSTANCE; + public static final String ID = FunctionalStorage.MOD_ID + "." + "armory"; + + @Override + public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPluginConfig iPluginConfig) { + var helper = ElementHelper.INSTANCE; + if (blockAccessor.getBlockEntity() instanceof ArmoryCabinetTile) { + if (blockAccessor.getServerData().contains(ID)) { + int count = blockAccessor.getServerData().getInt(ID); + iTooltip.add(helper.text(Component.nullToEmpty(count + " / " + FunctionalStorageConfig.ARMORY_CABINET_SIZE)).translate(new Vec2(4, (.86f * 18 - 10) / 2))); + } + } + } + + @Override + public void appendServerData(CompoundTag data, ServerPlayer serverPlayer, Level level, BlockEntity blockEntity, boolean b) { + if (blockEntity instanceof ArmoryCabinetTile armory) { + long count = armory.handler.stackList.stream().filter(stack -> !stack.isEmpty()).count(); + data.putLong(ID, count); + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/buuz135/functionalstorage/compat/jade/FSJadePlugin.java b/src/main/java/com/buuz135/functionalstorage/compat/jade/FSJadePlugin.java new file mode 100644 index 00000000..5d2ddf82 --- /dev/null +++ b/src/main/java/com/buuz135/functionalstorage/compat/jade/FSJadePlugin.java @@ -0,0 +1,19 @@ +package com.buuz135.functionalstorage.compat.jade; + +import com.buuz135.functionalstorage.FunctionalStorage; +import com.buuz135.functionalstorage.block.ArmoryCabinetBlock; +import com.buuz135.functionalstorage.block.tile.ArmoryCabinetTile; +import mcp.mobius.waila.api.*; + +@WailaPlugin(value = FunctionalStorage.MOD_ID) +public class FSJadePlugin implements IWailaPlugin { + @Override + public void registerClient(IWailaClientRegistration registration) { + registration.registerComponentProvider(ArmoryComponentProvider.INSTANCE, TooltipPosition.HEAD, ArmoryCabinetBlock.class); + } + + @Override + public void register(IWailaCommonRegistration registration) { + registration.registerBlockDataProvider(ArmoryComponentProvider.INSTANCE, ArmoryCabinetTile.class); + } +} \ No newline at end of file diff --git a/src/main/java/com/buuz135/functionalstorage/compat/top/FunctionalArmoryProvider.java b/src/main/java/com/buuz135/functionalstorage/compat/top/FunctionalArmoryProvider.java new file mode 100644 index 00000000..b9d42bb3 --- /dev/null +++ b/src/main/java/com/buuz135/functionalstorage/compat/top/FunctionalArmoryProvider.java @@ -0,0 +1,36 @@ +package com.buuz135.functionalstorage.compat.top; + +import com.buuz135.functionalstorage.FunctionalStorage; +import com.buuz135.functionalstorage.block.config.FunctionalStorageConfig; +import com.buuz135.functionalstorage.block.tile.ArmoryCabinetTile; +import mcjty.theoneprobe.api.*; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +import java.util.function.Function; + +public class FunctionalArmoryProvider implements IProbeInfoProvider { + + public static final Function REGISTER = iTheOneProbe -> { + iTheOneProbe.registerProvider(new FunctionalArmoryProvider()); + return null; + }; + + @Override + public ResourceLocation getID() { + return new ResourceLocation(FunctionalStorage.MOD_ID, "armory"); + } + + @Override + public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, BlockState blockState, IProbeHitData iProbeHitData) { + BlockEntity blockEntity = level.getBlockEntity(iProbeHitData.getPos()); + if (blockEntity instanceof ArmoryCabinetTile armory) { + long count = armory.handler.stackList.stream().filter(stack -> !stack.isEmpty()).count(); + iProbeInfo.vertical().mcText(Component.nullToEmpty(count + " / " + FunctionalStorageConfig.ARMORY_CABINET_SIZE)); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/buuz135/functionalstorage/compat/TOPPlugin.java b/src/main/java/com/buuz135/functionalstorage/compat/top/TOPPlugin.java similarity index 83% rename from src/main/java/com/buuz135/functionalstorage/compat/TOPPlugin.java rename to src/main/java/com/buuz135/functionalstorage/compat/top/TOPPlugin.java index 529c4d85..775802f6 100644 --- a/src/main/java/com/buuz135/functionalstorage/compat/TOPPlugin.java +++ b/src/main/java/com/buuz135/functionalstorage/compat/top/TOPPlugin.java @@ -1,6 +1,5 @@ -package com.buuz135.functionalstorage.compat; +package com.buuz135.functionalstorage.compat.top; -import com.buuz135.functionalstorage.compat.top.FunctionalDrawerProvider; import com.hrznstudio.titanium.annotation.plugin.FeaturePlugin; import com.hrznstudio.titanium.event.handler.EventManager; import com.hrznstudio.titanium.plugin.FeaturePluginInstance; @@ -14,6 +13,7 @@ public class TOPPlugin implements FeaturePluginInstance { public void execute(PluginPhase phase) { if (phase == PluginPhase.CONSTRUCTION) { EventManager.mod(InterModEnqueueEvent.class).process(interModEnqueueEvent -> { + InterModComms.sendTo("theoneprobe", "getTheOneProbe", () -> FunctionalArmoryProvider.REGISTER); InterModComms.sendTo("theoneprobe", "getTheOneProbe", () -> FunctionalDrawerProvider.REGISTER); }).subscribe(); } diff --git a/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java b/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java index 4261442d..70340869 100644 --- a/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java +++ b/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java @@ -85,5 +85,6 @@ protected void addTranslations() { this.add("gui.functionalstorage.amount", "Amount: "); this.add("gui.functionalstorage.slot", "Slot: "); this.add("gui.functionalstorage.fluid", "Fluid: "); + this.add("config.jade.plugin_functionalstorage.armory", "Functional Storage Armory"); } }