From c952c779a4295cb040d4d65d87dc930d2a3a5b42 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Sat, 19 Oct 2024 16:21:25 +0200 Subject: [PATCH] Add more tags ( #1418 ) --- .../70af3238de42da66beb5f354425347f373dca837 | 14 ++++++++- .../74807d958079a027731c973b9550985af6711175 | 21 +++++++++++-- .../storage_blocks/diamatine_crystal.json | 5 ++++ .../storage_blocks/emeradic_crystal.json | 5 ++++ .../empowered_diamatine_crystal.json | 5 ++++ .../empowered_emeradic_crystal.json | 5 ++++ .../empowered_enori_crystal.json | 5 ++++ .../empowered_palis_crystal.json | 5 ++++ .../empowered_restonia_crystal.json | 5 ++++ .../empowered_void_crystal.json | 5 ++++ .../block/storage_blocks/enori_crystal.json | 5 ++++ .../block/storage_blocks/palis_crystal.json | 5 ++++ .../storage_blocks/restonia_crystal.json | 5 ++++ .../block/storage_blocks/void_crystal.json | 5 ++++ .../data/c/tags/item/bucket/canola_oil.json | 5 ++++ .../c/tags/item/bucket/crystallized_oil.json | 5 ++++ .../c/tags/item/bucket/empowered_oil.json | 5 ++++ .../tags/item/bucket/refined_canola_oil.json | 5 ++++ .../resources/data/c/tags/item/buckets.json | 8 +++++ .../{slimeballs.json => slime_balls.json} | 0 .../storage_blocks/diamatine_crystal.json | 5 ++++ .../item/storage_blocks/emeradic_crystal.json | 5 ++++ .../empowered_diamatine_crystal.json | 5 ++++ .../empowered_emeradic_crystal.json | 5 ++++ .../empowered_enori_crystal.json | 5 ++++ .../empowered_palis_crystal.json | 5 ++++ .../empowered_restonia_crystal.json | 5 ++++ .../empowered_void_crystal.json | 5 ++++ .../item/storage_blocks/enori_crystal.json | 5 ++++ .../item/storage_blocks/palis_crystal.json | 5 ++++ .../item/storage_blocks/restonia_crystal.json | 5 ++++ .../item/storage_blocks/void_crystal.json | 5 ++++ .../actuallyadditions/api/ActuallyTags.java | 30 ++++++++++++++++++- .../data/BlockTagsGenerator.java | 12 ++++++++ .../data/ItemTagsGenerator.java | 26 +++++++++++++++- 35 files changed, 246 insertions(+), 5 deletions(-) create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/diamatine_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/emeradic_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/empowered_diamatine_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/empowered_emeradic_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/empowered_enori_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/empowered_palis_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/empowered_restonia_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/empowered_void_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/enori_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/palis_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/restonia_crystal.json create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/void_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/bucket/canola_oil.json create mode 100644 src/generated/resources/data/c/tags/item/bucket/crystallized_oil.json create mode 100644 src/generated/resources/data/c/tags/item/bucket/empowered_oil.json create mode 100644 src/generated/resources/data/c/tags/item/bucket/refined_canola_oil.json create mode 100644 src/generated/resources/data/c/tags/item/buckets.json rename src/generated/resources/data/c/tags/item/{slimeballs.json => slime_balls.json} (100%) create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/diamatine_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/emeradic_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/empowered_diamatine_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/empowered_emeradic_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/empowered_enori_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/empowered_palis_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/empowered_restonia_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/empowered_void_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/enori_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/palis_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/restonia_crystal.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/void_crystal.json diff --git a/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 b/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 index a111f078e..ba2daba6d 100644 --- a/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 +++ b/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 @@ -1,10 +1,22 @@ -// 1.21.1 2024-08-11T19:30:01.8288198 Block Tags +// 1.21.1 2024-10-19T16:19:48.5749712 Block Tags 8665de82dd3d3a1351ce58f78108214f359104b0 data/actuallyadditions/tags/block/mineable/aio.json f7dc293929a2176bc6e428c765f6bf49fbeccdb5 data/actuallyadditions/tags/block/mineable/drill.json 3ce233e27b4d7db10e2d4832602ef5b2a57f9a65 data/c/tags/block/ores.json 2bcfae7c119b0b64170989e7d41b352a8d55ea43 data/c/tags/block/ores/black_quartz.json 2bcfae7c119b0b64170989e7d41b352a8d55ea43 data/c/tags/block/ores_in_ground/stone.json 6c9a3c952d8fad5bfd8a5ab0b76aeb0b930d1db9 data/c/tags/block/storage_blocks/black_quartz.json +02a18fabd2fe852ec9d6564242eaef8b58dd6517 data/c/tags/block/storage_blocks/diamatine_crystal.json +e38d81e8b3eef1f8a225b98891672f00942496e9 data/c/tags/block/storage_blocks/emeradic_crystal.json +bbce87d7a828d3e31abf1209cceb3c6084423678 data/c/tags/block/storage_blocks/empowered_diamatine_crystal.json +520350a8e9e7818642cc7d663396a1d3c238d9ec data/c/tags/block/storage_blocks/empowered_emeradic_crystal.json +9ad94fbd4cda9e4ad8c68078cc53b67eb4043160 data/c/tags/block/storage_blocks/empowered_enori_crystal.json +fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/block/storage_blocks/empowered_palis_crystal.json +4885ac9140dbf4f8af14cf61e6ec9e81b933b77b data/c/tags/block/storage_blocks/empowered_restonia_crystal.json +5a912b868ae8a193bc17f5c3f485e22818c3c06f data/c/tags/block/storage_blocks/empowered_void_crystal.json +741733f39fa70fc6a7a85f033088821af14971c6 data/c/tags/block/storage_blocks/enori_crystal.json +148cd937543fd58b196403c18839b2698bf87fdf data/c/tags/block/storage_blocks/palis_crystal.json +b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/block/storage_blocks/restonia_crystal.json +fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/block/storage_blocks/void_crystal.json 8dbaf9b7bd6774bc7c01a47a72b8a7fdaee51f87 data/minecraft/tags/block/mineable/axe.json 58c611cbaae2a0a5dd6f82f183b7d0f5dc2d09e6 data/minecraft/tags/block/mineable/pickaxe.json fab721a4fe7ece1d0e019ce36c4d2862f70ee53b data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 b/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 index d743013bf..9ccb674aa 100644 --- a/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 +++ b/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 @@ -1,9 +1,14 @@ -// 1.21.1 2024-08-11T19:30:01.8138177 Tags for minecraft:item mod id actuallyadditions +// 1.21.1 2024-10-19T16:16:57.3701064 Tags for minecraft:item mod id actuallyadditions 87327118c2f16da245b76de4fdcaab149456d9b8 data/actuallyadditions/tags/item/coffee_beans.json f3ee78cd8c9563bd1828de2b4b336735f289f9f2 data/actuallyadditions/tags/item/crystals.json 441008b49b4bab00125100fc969cb6582eff7271 data/actuallyadditions/tags/item/crystal_blocks.json 7e6e49c3eb5302af147a2d6ba439e83bd4831cbc data/actuallyadditions/tags/item/drills.json ae55da193b94fd6375c05d5aa46cafdda9d335cd data/actuallyadditions/tags/item/tiny_coals.json +dc377437805c7c5696b88c17454da7b856b9055e data/c/tags/item/buckets.json +ea53bfe045e7e533a13fa2fa8793cd7741e92902 data/c/tags/item/bucket/canola_oil.json +fb46ac4e564c749fcaa5ba1393ab33fcd91817f5 data/c/tags/item/bucket/crystallized_oil.json +e70a00f63e5f22e8f37d76d45bbadc66ff0e3598 data/c/tags/item/bucket/empowered_oil.json +3d76a9a33b8db313d2960468ef55ae7baf1d997f data/c/tags/item/bucket/refined_canola_oil.json 822a882fc0d985d819c32a1039616f999761fae3 data/c/tags/item/crops.json aaf3c8c818cc015e9c693e0bbf8f86da81f78285 data/c/tags/item/crops/canola.json 87327118c2f16da245b76de4fdcaab149456d9b8 data/c/tags/item/crops/coffee.json @@ -18,5 +23,17 @@ f29e7ca84f30d7b2d4b19ad10b62f56fc422378a data/c/tags/item/seeds/canola.json 87327118c2f16da245b76de4fdcaab149456d9b8 data/c/tags/item/seeds/coffee.json 4be6e9ebd0f4ea040587e7ff05c78270990889b8 data/c/tags/item/seeds/flax.json 27f7953be7073bc266bdf5a245658268d11a4252 data/c/tags/item/seeds/rice.json -da125442e98e78f6dac7e0c8f35a51503f5bb79d data/c/tags/item/slimeballs.json +da125442e98e78f6dac7e0c8f35a51503f5bb79d data/c/tags/item/slime_balls.json 6c9a3c952d8fad5bfd8a5ab0b76aeb0b930d1db9 data/c/tags/item/storage_blocks/black_quartz.json +02a18fabd2fe852ec9d6564242eaef8b58dd6517 data/c/tags/item/storage_blocks/diamatine_crystal.json +e38d81e8b3eef1f8a225b98891672f00942496e9 data/c/tags/item/storage_blocks/emeradic_crystal.json +bbce87d7a828d3e31abf1209cceb3c6084423678 data/c/tags/item/storage_blocks/empowered_diamatine_crystal.json +520350a8e9e7818642cc7d663396a1d3c238d9ec data/c/tags/item/storage_blocks/empowered_emeradic_crystal.json +9ad94fbd4cda9e4ad8c68078cc53b67eb4043160 data/c/tags/item/storage_blocks/empowered_enori_crystal.json +fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/item/storage_blocks/empowered_palis_crystal.json +4885ac9140dbf4f8af14cf61e6ec9e81b933b77b data/c/tags/item/storage_blocks/empowered_restonia_crystal.json +5a912b868ae8a193bc17f5c3f485e22818c3c06f data/c/tags/item/storage_blocks/empowered_void_crystal.json +741733f39fa70fc6a7a85f033088821af14971c6 data/c/tags/item/storage_blocks/enori_crystal.json +148cd937543fd58b196403c18839b2698bf87fdf data/c/tags/item/storage_blocks/palis_crystal.json +b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/item/storage_blocks/restonia_crystal.json +fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/item/storage_blocks/void_crystal.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/diamatine_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/diamatine_crystal.json new file mode 100644 index 000000000..9c13ba275 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/diamatine_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:diamatine_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/emeradic_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/emeradic_crystal.json new file mode 100644 index 000000000..3294e4da7 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/emeradic_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:emeradic_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/empowered_diamatine_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_diamatine_crystal.json new file mode 100644 index 000000000..9b703b6f6 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_diamatine_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_diamatine_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/empowered_emeradic_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_emeradic_crystal.json new file mode 100644 index 000000000..46a5139a3 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_emeradic_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_emeradic_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/empowered_enori_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_enori_crystal.json new file mode 100644 index 000000000..418f069ba --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_enori_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_enori_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/empowered_palis_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_palis_crystal.json new file mode 100644 index 000000000..33de9d69c --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_palis_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_palis_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/empowered_restonia_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_restonia_crystal.json new file mode 100644 index 000000000..224d9d3d5 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_restonia_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_restonia_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/empowered_void_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_void_crystal.json new file mode 100644 index 000000000..006756ef1 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/empowered_void_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_void_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/enori_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/enori_crystal.json new file mode 100644 index 000000000..d0963158e --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/enori_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:enori_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/palis_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/palis_crystal.json new file mode 100644 index 000000000..953020e81 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/palis_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:palis_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/restonia_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/restonia_crystal.json new file mode 100644 index 000000000..5e074efea --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/restonia_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:restonia_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/void_crystal.json b/src/generated/resources/data/c/tags/block/storage_blocks/void_crystal.json new file mode 100644 index 000000000..89616f2da --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/void_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:void_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bucket/canola_oil.json b/src/generated/resources/data/c/tags/item/bucket/canola_oil.json new file mode 100644 index 000000000..722283a6c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/bucket/canola_oil.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:canola_oil_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bucket/crystallized_oil.json b/src/generated/resources/data/c/tags/item/bucket/crystallized_oil.json new file mode 100644 index 000000000..d14729f8a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/bucket/crystallized_oil.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:crystallized_oil_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bucket/empowered_oil.json b/src/generated/resources/data/c/tags/item/bucket/empowered_oil.json new file mode 100644 index 000000000..f7c87871d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/bucket/empowered_oil.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_oil_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bucket/refined_canola_oil.json b/src/generated/resources/data/c/tags/item/bucket/refined_canola_oil.json new file mode 100644 index 000000000..28ddbafc4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/bucket/refined_canola_oil.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:refined_canola_oil_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/buckets.json b/src/generated/resources/data/c/tags/item/buckets.json new file mode 100644 index 000000000..1159c9da1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/buckets.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#c:bucket/canola_oil", + "#c:bucket/refined_canola_oil", + "#c:bucket/crystallized_oil", + "#c:bucket/empowered_oil" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/slimeballs.json b/src/generated/resources/data/c/tags/item/slime_balls.json similarity index 100% rename from src/generated/resources/data/c/tags/item/slimeballs.json rename to src/generated/resources/data/c/tags/item/slime_balls.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/diamatine_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/diamatine_crystal.json new file mode 100644 index 000000000..9c13ba275 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/diamatine_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:diamatine_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/emeradic_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/emeradic_crystal.json new file mode 100644 index 000000000..3294e4da7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/emeradic_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:emeradic_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/empowered_diamatine_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_diamatine_crystal.json new file mode 100644 index 000000000..9b703b6f6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_diamatine_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_diamatine_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/empowered_emeradic_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_emeradic_crystal.json new file mode 100644 index 000000000..46a5139a3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_emeradic_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_emeradic_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/empowered_enori_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_enori_crystal.json new file mode 100644 index 000000000..418f069ba --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_enori_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_enori_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/empowered_palis_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_palis_crystal.json new file mode 100644 index 000000000..33de9d69c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_palis_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_palis_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/empowered_restonia_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_restonia_crystal.json new file mode 100644 index 000000000..224d9d3d5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_restonia_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_restonia_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/empowered_void_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_void_crystal.json new file mode 100644 index 000000000..006756ef1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/empowered_void_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:empowered_void_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/enori_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/enori_crystal.json new file mode 100644 index 000000000..d0963158e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/enori_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:enori_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/palis_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/palis_crystal.json new file mode 100644 index 000000000..953020e81 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/palis_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:palis_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/restonia_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/restonia_crystal.json new file mode 100644 index 000000000..5e074efea --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/restonia_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:restonia_crystal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/void_crystal.json b/src/generated/resources/data/c/tags/item/storage_blocks/void_crystal.json new file mode 100644 index 000000000..89616f2da --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/void_crystal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:void_crystal_block" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java index 375e7448d..fc0f59425 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java @@ -38,6 +38,23 @@ public final class ActuallyTags { public static final TagKey GEMS_BLACK_QUARTZ = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "gems/black_quartz")); public static final TagKey ORES_BLACK_QUARTZ = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "ores/black_quartz")); public static final TagKey STORAGE_BLOCKS_BLACK_QUARTZ = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/black_quartz")); + public static final TagKey STORAGE_BLOCKS_RESTONIA_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/restonia_crystal")); + public static final TagKey STORAGE_BLOCKS_PALIS_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/palis_crystal")); + public static final TagKey STORAGE_BLOCKS_DIAMATINE_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/diamatine_crystal")); + public static final TagKey STORAGE_BLOCKS_VOID_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/void_crystal")); + public static final TagKey STORAGE_BLOCKS_EMERADIC_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/emeradic_crystal")); + public static final TagKey STORAGE_BLOCKS_ENORI_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/enori_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_RESTONIA_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_restonia_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_PALIS_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_palis_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_DIAMATINE_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_diamatine_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_VOID_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_void_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_EMERADIC_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_emeradic_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_ENORI_CRYSTAL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_enori_crystal")); + public static final TagKey BUCKET_CANOLA_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/canola_oil")); + public static final TagKey BUCKET_REFINED_CANOLA_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/refined_canola_oil")); + public static final TagKey BUCKET_CRYSTALLIZED_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/crystallized_oil")); + public static final TagKey BUCKET_EMPOWERED_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/empowered_oil")); + private static TagKey tag(String name) { return TagKey.create(Registries.ITEM, ActuallyAdditions.modLoc(name)); @@ -60,7 +77,18 @@ public final class ActuallyTags { public static final TagKey NEEDS_ENORI_TOOL = tag("needs_enori_tool"); public static final TagKey ORES_BLACK_QUARTZ = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "ores/black_quartz")); public static final TagKey STORAGE_BLOCKS_BLACK_QUARTZ = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/black_quartz")); - + public static final TagKey STORAGE_BLOCKS_RESTONIA_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/restonia_crystal")); + public static final TagKey STORAGE_BLOCKS_PALIS_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/palis_crystal")); + public static final TagKey STORAGE_BLOCKS_DIAMATINE_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/diamatine_crystal")); + public static final TagKey STORAGE_BLOCKS_VOID_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/void_crystal")); + public static final TagKey STORAGE_BLOCKS_EMERADIC_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/emeradic_crystal")); + public static final TagKey STORAGE_BLOCKS_ENORI_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/enori_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_RESTONIA_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_restonia_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_PALIS_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_palis_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_DIAMATINE_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_diamatine_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_VOID_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_void_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_EMERADIC_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_emeradic_crystal")); + public static final TagKey STORAGE_BLOCKS_EMPOWERED_ENORI_CRYSTAL = BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/empowered_enori_crystal")); private static TagKey tag(String name) { return TagKey.create(Registries.BLOCK, ActuallyAdditions.modLoc(name)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java index f0b7ef3df..e03801f27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java @@ -167,6 +167,18 @@ public class BlockTagsGenerator extends BlockTagsProvider { this.tag(Tags.Blocks.ORES).addTags(ActuallyTags.Blocks.ORES_BLACK_QUARTZ); this.tag(Tags.Blocks.ORES_IN_GROUND_STONE).add(ActuallyBlocks.BLACK_QUARTZ_ORE.get()); this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_RESTONIA_CRYSTAL).add(ActuallyBlocks.RESTONIA_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_PALIS_CRYSTAL).add(ActuallyBlocks.PALIS_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_DIAMATINE_CRYSTAL).add(ActuallyBlocks.DIAMATINE_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_VOID_CRYSTAL).add(ActuallyBlocks.VOID_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMERADIC_CRYSTAL).add(ActuallyBlocks.EMERADIC_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_ENORI_CRYSTAL).add(ActuallyBlocks.ENORI_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_RESTONIA_CRYSTAL).add(ActuallyBlocks.EMPOWERED_RESTONIA_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_PALIS_CRYSTAL).add(ActuallyBlocks.EMPOWERED_PALIS_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_DIAMATINE_CRYSTAL).add(ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_VOID_CRYSTAL).add(ActuallyBlocks.EMPOWERED_VOID_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_EMERADIC_CRYSTAL).add(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL.get()); + this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_ENORI_CRYSTAL).add(ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL.get()); } // /** diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index 38dec1cc3..947d3fc1b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -3,6 +3,7 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.api.ActuallyTags; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -44,7 +45,7 @@ public class ItemTagsGenerator extends ItemTagsProvider { ActuallyBlocks.DIAMATINE_CRYSTAL.getItem(), ActuallyBlocks.VOID_CRYSTAL.getItem(), ActuallyBlocks.EMERADIC_CRYSTAL.getItem(), ActuallyBlocks.ENORI_CRYSTAL.getItem()); - tag(Tags.Items.SLIMEBALLS) + tag(Tags.Items.SLIME_BALLS) .add(ActuallyItems.RICE_SLIMEBALL.get()); tag(ActuallyTags.Items.CROPS_RICE).add(ActuallyItems.RICE.get()); @@ -63,6 +64,29 @@ public class ItemTagsGenerator extends ItemTagsProvider { tag(ActuallyTags.Items.ORES_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ_ORE.getItem()); tag(Tags.Items.ORES).addTags(ActuallyTags.Items.ORES_BLACK_QUARTZ); tag(Tags.Items.ORES_IN_GROUND_STONE).add(ActuallyBlocks.BLACK_QUARTZ_ORE.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_RESTONIA_CRYSTAL).add(ActuallyBlocks.RESTONIA_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_PALIS_CRYSTAL).add(ActuallyBlocks.PALIS_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_DIAMATINE_CRYSTAL).add(ActuallyBlocks.DIAMATINE_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_VOID_CRYSTAL).add(ActuallyBlocks.VOID_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMERADIC_CRYSTAL).add(ActuallyBlocks.EMERADIC_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_ENORI_CRYSTAL).add(ActuallyBlocks.ENORI_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMPOWERED_RESTONIA_CRYSTAL).add(ActuallyBlocks.EMPOWERED_RESTONIA_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMPOWERED_PALIS_CRYSTAL).add(ActuallyBlocks.EMPOWERED_PALIS_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMPOWERED_DIAMATINE_CRYSTAL).add(ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMPOWERED_VOID_CRYSTAL).add(ActuallyBlocks.EMPOWERED_VOID_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMPOWERED_EMERADIC_CRYSTAL).add(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL.getItem()); + tag(ActuallyTags.Items.STORAGE_BLOCKS_EMPOWERED_ENORI_CRYSTAL).add(ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL.getItem()); + + tag(ActuallyTags.Items.BUCKET_CANOLA_OIL).add(InitFluids.CANOLA_OIL.getBucket()); + tag(ActuallyTags.Items.BUCKET_REFINED_CANOLA_OIL).add(InitFluids.REFINED_CANOLA_OIL.getBucket()); + tag(ActuallyTags.Items.BUCKET_CRYSTALLIZED_OIL).add(InitFluids.CRYSTALLIZED_OIL.getBucket()); + tag(ActuallyTags.Items.BUCKET_EMPOWERED_OIL).add(InitFluids.EMPOWERED_OIL.getBucket()); + tag(Tags.Items.BUCKETS).addTags( + ActuallyTags.Items.BUCKET_CANOLA_OIL, ActuallyTags.Items.BUCKET_REFINED_CANOLA_OIL, + ActuallyTags.Items.BUCKET_CRYSTALLIZED_OIL, ActuallyTags.Items.BUCKET_EMPOWERED_OIL + ); + } }