From a2ccae3bdb246e675312290faabad8b5e11ebc9f Mon Sep 17 00:00:00 2001 From: manmaed Date: Fri, 18 Oct 2024 13:20:48 +0100 Subject: [PATCH] Tags for Items Fabric #12 --- .../2d16cbe6083dd79e54b5ae19531df512900109a0 | 2 +- .../5d03a55d352bf1b2559e7c345159ed1241927870 | 12 + .../7b75f45ff90ceefe49032067c502d7ce98f48c85 | 4 +- .../ca6219310499f381e68bd7e773f143200b34e443 | 10 +- .../f89d78b15f20726288293339aec05c8571d3a133 | 2 +- .../tags/block/antiblock_buttons.json | 28 +++ .../tags/block/antiblock_pressure_plates.json | 28 +++ .../tags/block/antiblock_slabs.json | 28 +++ .../tags/block/antiblock_stairs.json | 28 +++ .../tags/item/antiblock_bright_colors.json | 22 ++ .../tags/item/antiblock_buttons.json | 28 +++ .../tags/item/antiblock_pressure_plates.json | 28 +++ .../tags/item/antiblock_slabs.json | 28 +++ .../tags/item/antiblock_stairs.json | 28 +++ .../tags/item/antiblock_with_borders.json | 28 +++ .../tags/item/antiblock_without_borders.json | 28 +++ .../tags/item/antiblock_wool_colors.json | 34 +++ .../data/minecraft/tags/item/buttons.json | 28 +++ .../data/minecraft/tags/item/slabs.json | 28 +++ .../data/minecraft/tags/item/stairs.json | 28 +++ .../datagen/ABRCDataGeneration.java | 9 +- .../datagen/ModBlocksTagsProvider.java | 4 + .../datagen/ModItemsTagsProvider.java | 207 ++++++++++++++++++ .../antiblocksrechiseled/tag/ABRCTags.java | 33 ++- 24 files changed, 690 insertions(+), 13 deletions(-) create mode 100644 src/main/generated/.cache/5d03a55d352bf1b2559e7c345159ed1241927870 create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_buttons.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_pressure_plates.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_slabs.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_stairs.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_bright_colors.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_buttons.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_pressure_plates.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_slabs.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_stairs.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_with_borders.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_without_borders.json create mode 100644 src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_wool_colors.json create mode 100644 src/main/generated/data/minecraft/tags/item/buttons.json create mode 100644 src/main/generated/data/minecraft/tags/item/slabs.json create mode 100644 src/main/generated/data/minecraft/tags/item/stairs.json create mode 100644 src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModItemsTagsProvider.java diff --git a/src/main/generated/.cache/2d16cbe6083dd79e54b5ae19531df512900109a0 b/src/main/generated/.cache/2d16cbe6083dd79e54b5ae19531df512900109a0 index 59d7442..2cd5a4c 100644 --- a/src/main/generated/.cache/2d16cbe6083dd79e54b5ae19531df512900109a0 +++ b/src/main/generated/.cache/2d16cbe6083dd79e54b5ae19531df512900109a0 @@ -1,2 +1,2 @@ -// 1.21 2024-08-18T19:12:18.5846372 AntiBlocksReChiseled/Language (en_us) +// 1.21 2024-10-18T13:19:05.1991036 AntiBlocksReChiseled/Language (en_us) 8d70b54d13ddfbf36a1ef14a936a27b06898a326 assets\antiblocksrechiseled\lang\en_us.json diff --git a/src/main/generated/.cache/5d03a55d352bf1b2559e7c345159ed1241927870 b/src/main/generated/.cache/5d03a55d352bf1b2559e7c345159ed1241927870 new file mode 100644 index 0000000..27b0143 --- /dev/null +++ b/src/main/generated/.cache/5d03a55d352bf1b2559e7c345159ed1241927870 @@ -0,0 +1,12 @@ +// 1.21 2024-10-18T13:19:05.2001031 AntiBlocksReChiseled/Tags for minecraft:item +35508908209834b62fe88bb6dea0018ef6fa2ded data\minecraft\tags\item\stairs.json +a9bb53db5ca978058be3cdd8293b688fb437d902 data\antiblocksrechiseled\tags\item\antiblock_with_borders.json +51100bb256af613505c9d2a0caaae978dbf50452 data\antiblocksrechiseled\tags\item\antiblock_pressure_plates.json +0298961f202469594d99d6749585a3df5e6c9654 data\minecraft\tags\item\buttons.json +776e37935e00306758e40c7f1052089ff3243f50 data\antiblocksrechiseled\tags\item\antiblock_slabs.json +0298961f202469594d99d6749585a3df5e6c9654 data\antiblocksrechiseled\tags\item\antiblock_buttons.json +35508908209834b62fe88bb6dea0018ef6fa2ded data\antiblocksrechiseled\tags\item\antiblock_stairs.json +84491f0873be093b737fd9267dd0ed606ed4ab51 data\antiblocksrechiseled\tags\item\antiblock_wool_colors.json +daa3875b6c723ed549d5b536e1f96a948c0e8476 data\antiblocksrechiseled\tags\item\antiblock_without_borders.json +776e37935e00306758e40c7f1052089ff3243f50 data\minecraft\tags\item\slabs.json +0e28f3b1d50e042f07a3b712c88bc2caab68968e data\antiblocksrechiseled\tags\item\antiblock_bright_colors.json diff --git a/src/main/generated/.cache/7b75f45ff90ceefe49032067c502d7ce98f48c85 b/src/main/generated/.cache/7b75f45ff90ceefe49032067c502d7ce98f48c85 index 8ea1101..6c0161a 100644 --- a/src/main/generated/.cache/7b75f45ff90ceefe49032067c502d7ce98f48c85 +++ b/src/main/generated/.cache/7b75f45ff90ceefe49032067c502d7ce98f48c85 @@ -1,4 +1,4 @@ -// 1.21 2024-08-18T19:12:18.5886359 AntiBlocksReChiseled/Block Loot Tables +// 1.21 2024-10-18T13:19:05.2041023 AntiBlocksReChiseled/Block Loot Tables ffce4113e490404d8910638d720ccbb9204f0b88 data\antiblocksrechiseled\loot_table\blocks\wool_lime_border.json 52d530435392533e1d9908683285bdd83145a585 data\antiblocksrechiseled\loot_table\blocks\stair_green_bright.json cfd1be38f4241b85b23b49ede12a1576f2f8c730 data\antiblocksrechiseled\loot_table\blocks\slab_light_gray_wool.json @@ -127,8 +127,8 @@ f0085b10a9b452bd43e0e293abbc6f20b435c7c7 data\antiblocksrechiseled\loot_table\bl 9a345b5549bee89daf415d0b7bd26b95a30abe12 data\antiblocksrechiseled\loot_table\blocks\stair_purple_wool.json 4ec0ac0da3f7770f69fa5c3e31b5b60850598aa6 data\antiblocksrechiseled\loot_table\blocks\bright_blue.json 01f40cdfbc083c77860662542d0618eb5147c09f data\antiblocksrechiseled\loot_table\blocks\slab_lime_wool.json -350531c7d2a505bd9588eec4f44a46df930ad4b4 data\antiblocksrechiseled\loot_table\blocks\wool_gray_border.json a2b3f912aec9c74135336c966ba4648fa17f0376 data\antiblocksrechiseled\loot_table\blocks\stair_orange_bright.json +350531c7d2a505bd9588eec4f44a46df930ad4b4 data\antiblocksrechiseled\loot_table\blocks\wool_gray_border.json 96a3336f965d27de514ff44b00b2a4f56fcab96d data\antiblocksrechiseled\loot_table\blocks\stair_lime_wool.json 47164d7aa3b02a6d5a540349f1748c9e9d3f5132 data\antiblocksrechiseled\loot_table\blocks\pressure_plate_wool_light_blue.json 1f6afb1d4cf3dd90fcbfaa74287edd35ce9397b1 data\antiblocksrechiseled\loot_table\blocks\pressure_plate_bright_green.json diff --git a/src/main/generated/.cache/ca6219310499f381e68bd7e773f143200b34e443 b/src/main/generated/.cache/ca6219310499f381e68bd7e773f143200b34e443 index 9e9bb40..a374965 100644 --- a/src/main/generated/.cache/ca6219310499f381e68bd7e773f143200b34e443 +++ b/src/main/generated/.cache/ca6219310499f381e68bd7e773f143200b34e443 @@ -1,11 +1,15 @@ -// 1.21 2024-08-18T19:12:18.5846372 AntiBlocksReChiseled/Tags for minecraft:block -23f195bdbfc5ed4974c279bb937e7fc08975c3bd data\minecraft\tags\block\needs_iron_tool.json +// 1.21 2024-10-18T13:19:05.1981027 AntiBlocksReChiseled/Tags for minecraft:block 51100bb256af613505c9d2a0caaae978dbf50452 data\minecraft\tags\block\pressure_plates.json 0e28f3b1d50e042f07a3b712c88bc2caab68968e data\antiblocksrechiseled\tags\block\antiblock_bright_colors.json -776e37935e00306758e40c7f1052089ff3243f50 data\minecraft\tags\block\slabs.json 35508908209834b62fe88bb6dea0018ef6fa2ded data\minecraft\tags\block\stairs.json +51100bb256af613505c9d2a0caaae978dbf50452 data\antiblocksrechiseled\tags\block\antiblock_pressure_plates.json 84491f0873be093b737fd9267dd0ed606ed4ab51 data\antiblocksrechiseled\tags\block\antiblock_wool_colors.json +776e37935e00306758e40c7f1052089ff3243f50 data\antiblocksrechiseled\tags\block\antiblock_slabs.json daa3875b6c723ed549d5b536e1f96a948c0e8476 data\antiblocksrechiseled\tags\block\antiblock_without_borders.json 0298961f202469594d99d6749585a3df5e6c9654 data\minecraft\tags\block\buttons.json +23f195bdbfc5ed4974c279bb937e7fc08975c3bd data\minecraft\tags\block\needs_iron_tool.json +0298961f202469594d99d6749585a3df5e6c9654 data\antiblocksrechiseled\tags\block\antiblock_buttons.json +776e37935e00306758e40c7f1052089ff3243f50 data\minecraft\tags\block\slabs.json +35508908209834b62fe88bb6dea0018ef6fa2ded data\antiblocksrechiseled\tags\block\antiblock_stairs.json a9bb53db5ca978058be3cdd8293b688fb437d902 data\antiblocksrechiseled\tags\block\antiblock_with_borders.json 23f195bdbfc5ed4974c279bb937e7fc08975c3bd data\minecraft\tags\block\mineable\pickaxe.json diff --git a/src/main/generated/.cache/f89d78b15f20726288293339aec05c8571d3a133 b/src/main/generated/.cache/f89d78b15f20726288293339aec05c8571d3a133 index b417971..325a199 100644 --- a/src/main/generated/.cache/f89d78b15f20726288293339aec05c8571d3a133 +++ b/src/main/generated/.cache/f89d78b15f20726288293339aec05c8571d3a133 @@ -1,4 +1,4 @@ -// 1.21 2024-08-18T19:12:18.5856366 AntiBlocksReChiseled/Recipes +// 1.21 2024-10-18T13:19:05.2001031 AntiBlocksReChiseled/Recipes ddf936ab22cfcd91984ac2fe0cb3dffa326ccb49 data\antiblocksrechiseled\advancement\recipes\building_blocks\full_to_border_bright_magenta.json 44ed0221c13864e3ce229a912587d1795f7754dd data\antiblocksrechiseled\advancement\recipes\building_blocks\full_to_border_wool_purple.json 2c6b7369fcfe300ad0fc604c1aaece9155696ed0 data\antiblocksrechiseled\recipe\bright_cyan_stairs.json diff --git a/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_buttons.json b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_buttons.json new file mode 100644 index 0000000..6e3c89d --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_buttons.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:button_bright_white", + "antiblocksrechiseled:button_bright_orange", + "antiblocksrechiseled:button_bright_magenta", + "antiblocksrechiseled:button_bright_yellow", + "antiblocksrechiseled:button_bright_cyan", + "antiblocksrechiseled:button_bright_blue", + "antiblocksrechiseled:button_bright_green", + "antiblocksrechiseled:button_bright_red", + "antiblocksrechiseled:button_bright_black", + "antiblocksrechiseled:button_wool_white", + "antiblocksrechiseled:button_wool_orange", + "antiblocksrechiseled:button_wool_magenta", + "antiblocksrechiseled:button_wool_light_blue", + "antiblocksrechiseled:button_wool_yellow", + "antiblocksrechiseled:button_wool_lime", + "antiblocksrechiseled:button_wool_pink", + "antiblocksrechiseled:button_wool_gray", + "antiblocksrechiseled:button_wool_light_gray", + "antiblocksrechiseled:button_wool_cyan", + "antiblocksrechiseled:button_wool_purple", + "antiblocksrechiseled:button_wool_blue", + "antiblocksrechiseled:button_wool_brown", + "antiblocksrechiseled:button_wool_green", + "antiblocksrechiseled:button_wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_pressure_plates.json b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_pressure_plates.json new file mode 100644 index 0000000..f9f3906 --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_pressure_plates.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:pressure_plate_bright_white", + "antiblocksrechiseled:pressure_plate_bright_orange", + "antiblocksrechiseled:pressure_plate_bright_magenta", + "antiblocksrechiseled:pressure_plate_bright_yellow", + "antiblocksrechiseled:pressure_plate_bright_cyan", + "antiblocksrechiseled:pressure_plate_bright_blue", + "antiblocksrechiseled:pressure_plate_bright_green", + "antiblocksrechiseled:pressure_plate_bright_red", + "antiblocksrechiseled:pressure_plate_bright_black", + "antiblocksrechiseled:pressure_plate_wool_white", + "antiblocksrechiseled:pressure_plate_wool_orange", + "antiblocksrechiseled:pressure_plate_wool_magenta", + "antiblocksrechiseled:pressure_plate_wool_light_blue", + "antiblocksrechiseled:pressure_plate_wool_yellow", + "antiblocksrechiseled:pressure_plate_wool_lime", + "antiblocksrechiseled:pressure_plate_wool_pink", + "antiblocksrechiseled:pressure_plate_wool_gray", + "antiblocksrechiseled:pressure_plate_wool_light_gray", + "antiblocksrechiseled:pressure_plate_wool_cyan", + "antiblocksrechiseled:pressure_plate_wool_purple", + "antiblocksrechiseled:pressure_plate_wool_blue", + "antiblocksrechiseled:pressure_plate_wool_brown", + "antiblocksrechiseled:pressure_plate_wool_green", + "antiblocksrechiseled:pressure_plate_wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_slabs.json b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_slabs.json new file mode 100644 index 0000000..3c17e1a --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_slabs.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:slab_white_bright", + "antiblocksrechiseled:slab_black", + "antiblocksrechiseled:slab_orange_bright", + "antiblocksrechiseled:slab_magenta_bright", + "antiblocksrechiseled:slab_yellow_bright", + "antiblocksrechiseled:slab_cyan_bright", + "antiblocksrechiseled:slab_blue_bright", + "antiblocksrechiseled:slab_green_bright", + "antiblocksrechiseled:slab_red_bright", + "antiblocksrechiseled:slab_white_wool", + "antiblocksrechiseled:slab_orange_wool", + "antiblocksrechiseled:slab_magenta_wool", + "antiblocksrechiseled:slab_light_blue_wool", + "antiblocksrechiseled:slab_yellow_wool", + "antiblocksrechiseled:slab_lime_wool", + "antiblocksrechiseled:slab_pink_wool", + "antiblocksrechiseled:slab_gray_wool", + "antiblocksrechiseled:slab_light_gray_wool", + "antiblocksrechiseled:slab_cyan_wool", + "antiblocksrechiseled:slab_purple_wool", + "antiblocksrechiseled:slab_blue_wool", + "antiblocksrechiseled:slab_brown_wool", + "antiblocksrechiseled:slab_green_wool", + "antiblocksrechiseled:slab_red_wool" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_stairs.json b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_stairs.json new file mode 100644 index 0000000..9871a1c --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/block/antiblock_stairs.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:stair_white_bright", + "antiblocksrechiseled:stair_black", + "antiblocksrechiseled:stair_orange_bright", + "antiblocksrechiseled:stair_magenta_bright", + "antiblocksrechiseled:stair_yellow_bright", + "antiblocksrechiseled:stair_cyan_bright", + "antiblocksrechiseled:stair_blue_bright", + "antiblocksrechiseled:stair_green_bright", + "antiblocksrechiseled:stair_red_bright", + "antiblocksrechiseled:stair_white_wool", + "antiblocksrechiseled:stair_orange_wool", + "antiblocksrechiseled:stair_magenta_wool", + "antiblocksrechiseled:stair_light_blue_wool", + "antiblocksrechiseled:stair_yellow_wool", + "antiblocksrechiseled:stair_lime_wool", + "antiblocksrechiseled:stair_pink_wool", + "antiblocksrechiseled:stair_gray_wool", + "antiblocksrechiseled:stair_light_gray_wool", + "antiblocksrechiseled:stair_cyan_wool", + "antiblocksrechiseled:stair_purple_wool", + "antiblocksrechiseled:stair_blue_wool", + "antiblocksrechiseled:stair_brown_wool", + "antiblocksrechiseled:stair_green_wool", + "antiblocksrechiseled:stair_red_wool" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_bright_colors.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_bright_colors.json new file mode 100644 index 0000000..8d7a2eb --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_bright_colors.json @@ -0,0 +1,22 @@ +{ + "values": [ + "antiblocksrechiseled:bright_white_border", + "antiblocksrechiseled:bright_orange_border", + "antiblocksrechiseled:bright_magenta_border", + "antiblocksrechiseled:bright_yellow_border", + "antiblocksrechiseled:bright_cyan_border", + "antiblocksrechiseled:bright_blue_border", + "antiblocksrechiseled:bright_green_border", + "antiblocksrechiseled:bright_red_border", + "antiblocksrechiseled:bright_black_border", + "antiblocksrechiseled:bright_white_border", + "antiblocksrechiseled:bright_orange_border", + "antiblocksrechiseled:bright_magenta_border", + "antiblocksrechiseled:bright_yellow_border", + "antiblocksrechiseled:bright_cyan_border", + "antiblocksrechiseled:bright_blue_border", + "antiblocksrechiseled:bright_green_border", + "antiblocksrechiseled:bright_red_border", + "antiblocksrechiseled:bright_black_border" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_buttons.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_buttons.json new file mode 100644 index 0000000..6e3c89d --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_buttons.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:button_bright_white", + "antiblocksrechiseled:button_bright_orange", + "antiblocksrechiseled:button_bright_magenta", + "antiblocksrechiseled:button_bright_yellow", + "antiblocksrechiseled:button_bright_cyan", + "antiblocksrechiseled:button_bright_blue", + "antiblocksrechiseled:button_bright_green", + "antiblocksrechiseled:button_bright_red", + "antiblocksrechiseled:button_bright_black", + "antiblocksrechiseled:button_wool_white", + "antiblocksrechiseled:button_wool_orange", + "antiblocksrechiseled:button_wool_magenta", + "antiblocksrechiseled:button_wool_light_blue", + "antiblocksrechiseled:button_wool_yellow", + "antiblocksrechiseled:button_wool_lime", + "antiblocksrechiseled:button_wool_pink", + "antiblocksrechiseled:button_wool_gray", + "antiblocksrechiseled:button_wool_light_gray", + "antiblocksrechiseled:button_wool_cyan", + "antiblocksrechiseled:button_wool_purple", + "antiblocksrechiseled:button_wool_blue", + "antiblocksrechiseled:button_wool_brown", + "antiblocksrechiseled:button_wool_green", + "antiblocksrechiseled:button_wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_pressure_plates.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_pressure_plates.json new file mode 100644 index 0000000..f9f3906 --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_pressure_plates.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:pressure_plate_bright_white", + "antiblocksrechiseled:pressure_plate_bright_orange", + "antiblocksrechiseled:pressure_plate_bright_magenta", + "antiblocksrechiseled:pressure_plate_bright_yellow", + "antiblocksrechiseled:pressure_plate_bright_cyan", + "antiblocksrechiseled:pressure_plate_bright_blue", + "antiblocksrechiseled:pressure_plate_bright_green", + "antiblocksrechiseled:pressure_plate_bright_red", + "antiblocksrechiseled:pressure_plate_bright_black", + "antiblocksrechiseled:pressure_plate_wool_white", + "antiblocksrechiseled:pressure_plate_wool_orange", + "antiblocksrechiseled:pressure_plate_wool_magenta", + "antiblocksrechiseled:pressure_plate_wool_light_blue", + "antiblocksrechiseled:pressure_plate_wool_yellow", + "antiblocksrechiseled:pressure_plate_wool_lime", + "antiblocksrechiseled:pressure_plate_wool_pink", + "antiblocksrechiseled:pressure_plate_wool_gray", + "antiblocksrechiseled:pressure_plate_wool_light_gray", + "antiblocksrechiseled:pressure_plate_wool_cyan", + "antiblocksrechiseled:pressure_plate_wool_purple", + "antiblocksrechiseled:pressure_plate_wool_blue", + "antiblocksrechiseled:pressure_plate_wool_brown", + "antiblocksrechiseled:pressure_plate_wool_green", + "antiblocksrechiseled:pressure_plate_wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_slabs.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_slabs.json new file mode 100644 index 0000000..3c17e1a --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_slabs.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:slab_white_bright", + "antiblocksrechiseled:slab_black", + "antiblocksrechiseled:slab_orange_bright", + "antiblocksrechiseled:slab_magenta_bright", + "antiblocksrechiseled:slab_yellow_bright", + "antiblocksrechiseled:slab_cyan_bright", + "antiblocksrechiseled:slab_blue_bright", + "antiblocksrechiseled:slab_green_bright", + "antiblocksrechiseled:slab_red_bright", + "antiblocksrechiseled:slab_white_wool", + "antiblocksrechiseled:slab_orange_wool", + "antiblocksrechiseled:slab_magenta_wool", + "antiblocksrechiseled:slab_light_blue_wool", + "antiblocksrechiseled:slab_yellow_wool", + "antiblocksrechiseled:slab_lime_wool", + "antiblocksrechiseled:slab_pink_wool", + "antiblocksrechiseled:slab_gray_wool", + "antiblocksrechiseled:slab_light_gray_wool", + "antiblocksrechiseled:slab_cyan_wool", + "antiblocksrechiseled:slab_purple_wool", + "antiblocksrechiseled:slab_blue_wool", + "antiblocksrechiseled:slab_brown_wool", + "antiblocksrechiseled:slab_green_wool", + "antiblocksrechiseled:slab_red_wool" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_stairs.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_stairs.json new file mode 100644 index 0000000..9871a1c --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_stairs.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:stair_white_bright", + "antiblocksrechiseled:stair_black", + "antiblocksrechiseled:stair_orange_bright", + "antiblocksrechiseled:stair_magenta_bright", + "antiblocksrechiseled:stair_yellow_bright", + "antiblocksrechiseled:stair_cyan_bright", + "antiblocksrechiseled:stair_blue_bright", + "antiblocksrechiseled:stair_green_bright", + "antiblocksrechiseled:stair_red_bright", + "antiblocksrechiseled:stair_white_wool", + "antiblocksrechiseled:stair_orange_wool", + "antiblocksrechiseled:stair_magenta_wool", + "antiblocksrechiseled:stair_light_blue_wool", + "antiblocksrechiseled:stair_yellow_wool", + "antiblocksrechiseled:stair_lime_wool", + "antiblocksrechiseled:stair_pink_wool", + "antiblocksrechiseled:stair_gray_wool", + "antiblocksrechiseled:stair_light_gray_wool", + "antiblocksrechiseled:stair_cyan_wool", + "antiblocksrechiseled:stair_purple_wool", + "antiblocksrechiseled:stair_blue_wool", + "antiblocksrechiseled:stair_brown_wool", + "antiblocksrechiseled:stair_green_wool", + "antiblocksrechiseled:stair_red_wool" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_with_borders.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_with_borders.json new file mode 100644 index 0000000..d772f85 --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_with_borders.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:bright_white_border", + "antiblocksrechiseled:bright_orange_border", + "antiblocksrechiseled:bright_magenta_border", + "antiblocksrechiseled:bright_yellow_border", + "antiblocksrechiseled:bright_cyan_border", + "antiblocksrechiseled:bright_blue_border", + "antiblocksrechiseled:bright_green_border", + "antiblocksrechiseled:bright_red_border", + "antiblocksrechiseled:bright_black_border", + "antiblocksrechiseled:wool_white_border", + "antiblocksrechiseled:wool_orange_border", + "antiblocksrechiseled:wool_magenta_border", + "antiblocksrechiseled:wool_light_blue_border", + "antiblocksrechiseled:wool_yellow_border", + "antiblocksrechiseled:wool_lime_border", + "antiblocksrechiseled:wool_pink_border", + "antiblocksrechiseled:wool_gray_border", + "antiblocksrechiseled:wool_light_gray_border", + "antiblocksrechiseled:wool_cyan_border", + "antiblocksrechiseled:wool_purple_border", + "antiblocksrechiseled:wool_blue_border", + "antiblocksrechiseled:wool_brown_border", + "antiblocksrechiseled:wool_green_border", + "antiblocksrechiseled:wool_red_border" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_without_borders.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_without_borders.json new file mode 100644 index 0000000..56dee8d --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_without_borders.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:bright_white", + "antiblocksrechiseled:bright_orange", + "antiblocksrechiseled:bright_magenta", + "antiblocksrechiseled:bright_yellow", + "antiblocksrechiseled:bright_cyan", + "antiblocksrechiseled:bright_blue", + "antiblocksrechiseled:bright_green", + "antiblocksrechiseled:bright_red", + "antiblocksrechiseled:bright_black", + "antiblocksrechiseled:wool_white", + "antiblocksrechiseled:wool_orange", + "antiblocksrechiseled:wool_magenta", + "antiblocksrechiseled:wool_light_blue", + "antiblocksrechiseled:wool_yellow", + "antiblocksrechiseled:wool_lime", + "antiblocksrechiseled:wool_pink", + "antiblocksrechiseled:wool_gray", + "antiblocksrechiseled:wool_light_gray", + "antiblocksrechiseled:wool_cyan", + "antiblocksrechiseled:wool_purple", + "antiblocksrechiseled:wool_blue", + "antiblocksrechiseled:wool_brown", + "antiblocksrechiseled:wool_green", + "antiblocksrechiseled:wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_wool_colors.json b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_wool_colors.json new file mode 100644 index 0000000..b4b0248 --- /dev/null +++ b/src/main/generated/data/antiblocksrechiseled/tags/item/antiblock_wool_colors.json @@ -0,0 +1,34 @@ +{ + "values": [ + "antiblocksrechiseled:wool_white_border", + "antiblocksrechiseled:wool_orange_border", + "antiblocksrechiseled:wool_magenta_border", + "antiblocksrechiseled:wool_light_blue_border", + "antiblocksrechiseled:wool_yellow_border", + "antiblocksrechiseled:wool_lime_border", + "antiblocksrechiseled:wool_pink_border", + "antiblocksrechiseled:wool_gray_border", + "antiblocksrechiseled:wool_light_gray_border", + "antiblocksrechiseled:wool_cyan_border", + "antiblocksrechiseled:wool_purple_border", + "antiblocksrechiseled:wool_blue_border", + "antiblocksrechiseled:wool_brown_border", + "antiblocksrechiseled:wool_green_border", + "antiblocksrechiseled:wool_red_border", + "antiblocksrechiseled:wool_white", + "antiblocksrechiseled:wool_orange", + "antiblocksrechiseled:wool_magenta", + "antiblocksrechiseled:wool_light_blue", + "antiblocksrechiseled:wool_yellow", + "antiblocksrechiseled:wool_lime", + "antiblocksrechiseled:wool_pink", + "antiblocksrechiseled:wool_gray", + "antiblocksrechiseled:wool_light_gray", + "antiblocksrechiseled:wool_cyan", + "antiblocksrechiseled:wool_purple", + "antiblocksrechiseled:wool_blue", + "antiblocksrechiseled:wool_brown", + "antiblocksrechiseled:wool_green", + "antiblocksrechiseled:wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/buttons.json b/src/main/generated/data/minecraft/tags/item/buttons.json new file mode 100644 index 0000000..6e3c89d --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/buttons.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:button_bright_white", + "antiblocksrechiseled:button_bright_orange", + "antiblocksrechiseled:button_bright_magenta", + "antiblocksrechiseled:button_bright_yellow", + "antiblocksrechiseled:button_bright_cyan", + "antiblocksrechiseled:button_bright_blue", + "antiblocksrechiseled:button_bright_green", + "antiblocksrechiseled:button_bright_red", + "antiblocksrechiseled:button_bright_black", + "antiblocksrechiseled:button_wool_white", + "antiblocksrechiseled:button_wool_orange", + "antiblocksrechiseled:button_wool_magenta", + "antiblocksrechiseled:button_wool_light_blue", + "antiblocksrechiseled:button_wool_yellow", + "antiblocksrechiseled:button_wool_lime", + "antiblocksrechiseled:button_wool_pink", + "antiblocksrechiseled:button_wool_gray", + "antiblocksrechiseled:button_wool_light_gray", + "antiblocksrechiseled:button_wool_cyan", + "antiblocksrechiseled:button_wool_purple", + "antiblocksrechiseled:button_wool_blue", + "antiblocksrechiseled:button_wool_brown", + "antiblocksrechiseled:button_wool_green", + "antiblocksrechiseled:button_wool_red" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/slabs.json b/src/main/generated/data/minecraft/tags/item/slabs.json new file mode 100644 index 0000000..3c17e1a --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/slabs.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:slab_white_bright", + "antiblocksrechiseled:slab_black", + "antiblocksrechiseled:slab_orange_bright", + "antiblocksrechiseled:slab_magenta_bright", + "antiblocksrechiseled:slab_yellow_bright", + "antiblocksrechiseled:slab_cyan_bright", + "antiblocksrechiseled:slab_blue_bright", + "antiblocksrechiseled:slab_green_bright", + "antiblocksrechiseled:slab_red_bright", + "antiblocksrechiseled:slab_white_wool", + "antiblocksrechiseled:slab_orange_wool", + "antiblocksrechiseled:slab_magenta_wool", + "antiblocksrechiseled:slab_light_blue_wool", + "antiblocksrechiseled:slab_yellow_wool", + "antiblocksrechiseled:slab_lime_wool", + "antiblocksrechiseled:slab_pink_wool", + "antiblocksrechiseled:slab_gray_wool", + "antiblocksrechiseled:slab_light_gray_wool", + "antiblocksrechiseled:slab_cyan_wool", + "antiblocksrechiseled:slab_purple_wool", + "antiblocksrechiseled:slab_blue_wool", + "antiblocksrechiseled:slab_brown_wool", + "antiblocksrechiseled:slab_green_wool", + "antiblocksrechiseled:slab_red_wool" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/stairs.json b/src/main/generated/data/minecraft/tags/item/stairs.json new file mode 100644 index 0000000..9871a1c --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/stairs.json @@ -0,0 +1,28 @@ +{ + "values": [ + "antiblocksrechiseled:stair_white_bright", + "antiblocksrechiseled:stair_black", + "antiblocksrechiseled:stair_orange_bright", + "antiblocksrechiseled:stair_magenta_bright", + "antiblocksrechiseled:stair_yellow_bright", + "antiblocksrechiseled:stair_cyan_bright", + "antiblocksrechiseled:stair_blue_bright", + "antiblocksrechiseled:stair_green_bright", + "antiblocksrechiseled:stair_red_bright", + "antiblocksrechiseled:stair_white_wool", + "antiblocksrechiseled:stair_orange_wool", + "antiblocksrechiseled:stair_magenta_wool", + "antiblocksrechiseled:stair_light_blue_wool", + "antiblocksrechiseled:stair_yellow_wool", + "antiblocksrechiseled:stair_lime_wool", + "antiblocksrechiseled:stair_pink_wool", + "antiblocksrechiseled:stair_gray_wool", + "antiblocksrechiseled:stair_light_gray_wool", + "antiblocksrechiseled:stair_cyan_wool", + "antiblocksrechiseled:stair_purple_wool", + "antiblocksrechiseled:stair_blue_wool", + "antiblocksrechiseled:stair_brown_wool", + "antiblocksrechiseled:stair_green_wool", + "antiblocksrechiseled:stair_red_wool" + ] +} \ No newline at end of file diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ABRCDataGeneration.java b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ABRCDataGeneration.java index 33aa82d..7da0257 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ABRCDataGeneration.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ABRCDataGeneration.java @@ -2,13 +2,20 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; public class ABRCDataGeneration implements DataGeneratorEntrypoint { @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { FabricDataGenerator.Pack generator = fabricDataGenerator.createPack(); //generator.addProvider(ModModelProvider::new); - generator.addProvider(ModBlocksTagsProvider::new); + generator.addProvider(((output, registriesFuture) -> { + ModBlocksTagsProvider blocksTagsProvider = new ModBlocksTagsProvider(output, registriesFuture); + generator.addProvider((out, future) -> new ModItemsTagsProvider(out, future, blocksTagsProvider)); + return blocksTagsProvider; + })); + /*generator.addProvider(ModBlocksTagsProvider::new); + generator.addProvider(ModItemsTagsProvider::new);*/ generator.addProvider(ModLangProvider::new); generator.addProvider(ModLootTablesProvider::new); generator.addProvider(ModRecipeProvider::new); diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java index 4b82392..28d890e 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java @@ -192,6 +192,10 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { getOrCreateTagBuilder(BlockTags.STAIRS).add(STAIRS); getOrCreateTagBuilder(BlockTags.SLABS).add(SLABS); getOrCreateTagBuilder(BlockTags.PRESSURE_PLATES).add(PRESSURE_PLATES); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_BUTTONS).add(BUTTONS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_STAIRS).add(STAIRS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_SLABS).add(SLABS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_PRESSURE_PLATES).add(PRESSURE_PLATES); getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_WITHOUT_BORDERS).add(BRIGHT_BLOCKS_WITHOUT_BORDER).add(WOOL_BLOCKS_WITHOUT_BORDER); getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_WITH_BORDERS).add(BRIGHT_BLOCKS_WITH_BORDER).add(WOOL_BLOCKS_WITH_BORDER); getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_WOOL_COLORS).add(WOOL_BLOCKS_WITH_BORDER).add(WOOL_BLOCKS_WITHOUT_BORDER); diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModItemsTagsProvider.java b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModItemsTagsProvider.java new file mode 100644 index 0000000..83d2692 --- /dev/null +++ b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModItemsTagsProvider.java @@ -0,0 +1,207 @@ +package net.manmaed.antiblocksrechiseled.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.manmaed.antiblocksrechiseled.blocks.*; +import net.manmaed.antiblocksrechiseled.tag.ABRCTags; +import net.minecraft.block.Block; +import net.minecraft.data.server.tag.ItemTagProvider; +import net.minecraft.item.Item; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class ModItemsTagsProvider extends FabricTagProvider.ItemTagProvider { + + public ModItemsTagsProvider(FabricDataOutput output, CompletableFuture completableFuture, @Nullable BlockTagProvider blockTagProvider) { + super(output, completableFuture, blockTagProvider); + } + + public static final Item[] BRIGHT_BLOCKS_WITH_BORDER = { + ABRCBrightColors.BRIGHT_WHITE_BORDER_ITEM, + ABRCBrightColors.BRIGHT_ORANGE_BORDER_ITEM, + ABRCBrightColors.BRIGHT_MAGENTA_BORDER_ITEM, + ABRCBrightColors.BRIGHT_YELLOW_BORDER_ITEM, + ABRCBrightColors.BRIGHT_CYAN_BORDER_ITEM, + ABRCBrightColors.BRIGHT_BLUE_BORDER_ITEM, + ABRCBrightColors.BRIGHT_GREEN_BORDER_ITEM, + ABRCBrightColors.BRIGHT_RED_BORDER_ITEM, + ABRCBrightColors.BRIGHT_BLACK_BORDER_ITEM + }; + public static final Item[] BRIGHT_BLOCKS_WITHOUT_BORDER = { + //Bright Colors + ABRCBrightColors.BRIGHT_WHITE_ITEM, + ABRCBrightColors.BRIGHT_ORANGE_ITEM, + ABRCBrightColors.BRIGHT_MAGENTA_ITEM, + ABRCBrightColors.BRIGHT_YELLOW_ITEM, + ABRCBrightColors.BRIGHT_CYAN_ITEM, + ABRCBrightColors.BRIGHT_BLUE_ITEM, + ABRCBrightColors.BRIGHT_GREEN_ITEM, + ABRCBrightColors.BRIGHT_RED_ITEM, + ABRCBrightColors.BRIGHT_BLACK_ITEM + }; + public static final Item[] WOOL_BLOCKS_WITH_BORDER = { + //Wool Colors + ABRCWoolColors.WOOL_WHITE_BORDER_ITEM, + ABRCWoolColors.WOOL_ORANGE_BORDER_ITEM, + ABRCWoolColors.WOOL_MAGENTA_BORDER_ITEM, + ABRCWoolColors.WOOL_LIGHT_BLUE_BORDER_ITEM, + ABRCWoolColors.WOOL_YELLOW_BORDER_ITEM, + ABRCWoolColors.WOOL_LIME_BORDER_ITEM, + ABRCWoolColors.WOOL_PINK_BORDER_ITEM, + ABRCWoolColors.WOOL_GRAY_BORDER_ITEM, + ABRCWoolColors.WOOL_LIGHT_GRAY_BORDER_ITEM, + ABRCWoolColors.WOOL_CYAN_BORDER_ITEM, + ABRCWoolColors.WOOL_PURPLE_BORDER_ITEM, + ABRCWoolColors.WOOL_BLUE_BORDER_ITEM, + ABRCWoolColors.WOOL_BROWN_BORDER_ITEM, + ABRCWoolColors.WOOL_GREEN_BORDER_ITEM, + ABRCWoolColors.WOOL_RED_BORDER_ITEM + }; + + public static final Item[] WOOL_BLOCKS_WITHOUT_BORDER = { + //Wool Colors + ABRCWoolColors.WOOL_WHITE_ITEM, + ABRCWoolColors.WOOL_ORANGE_ITEM, + ABRCWoolColors.WOOL_MAGENTA_ITEM, + ABRCWoolColors.WOOL_LIGHT_BLUE_ITEM, + ABRCWoolColors.WOOL_YELLOW_ITEM, + ABRCWoolColors.WOOL_LIME_ITEM, + ABRCWoolColors.WOOL_PINK_ITEM, + ABRCWoolColors.WOOL_GRAY_ITEM, + ABRCWoolColors.WOOL_LIGHT_GRAY_ITEM, + ABRCWoolColors.WOOL_CYAN_ITEM, + ABRCWoolColors.WOOL_PURPLE_ITEM, + ABRCWoolColors.WOOL_BLUE_ITEM, + ABRCWoolColors.WOOL_BROWN_ITEM, + ABRCWoolColors.WOOL_GREEN_ITEM, + ABRCWoolColors.WOOL_RED_ITEM + }; + + public static final Item[] SLABS = { + //Slabs + ABRCSlabs.SLAB_WHITE_BRIGHT_ITEM, + ABRCSlabs.SLAB_BLACK_ITEM, + ABRCSlabs.SLAB_ORANGE_BRIGHT_ITEM, + ABRCSlabs.SLAB_MAGENTA_BRIGHT_ITEM, + ABRCSlabs.SLAB_YELLOW_BRIGHT_ITEM, + ABRCSlabs.SLAB_CYAN_BRIGHT_ITEM, + ABRCSlabs.SLAB_BLUE_BRIGHT_ITEM, + ABRCSlabs.SLAB_GREEN_BRIGHT_ITEM, + ABRCSlabs.SLAB_RED_BRIGHT_ITEM, + ABRCSlabs.SLAB_WHITE_WOOL_ITEM, + ABRCSlabs.SLAB_ORANGE_WOOL_ITEM, + ABRCSlabs.SLAB_MAGENTA_WOOL_ITEM, + ABRCSlabs.SLAB_LIGHT_BLUE_WOOL_ITEM, + ABRCSlabs.SLAB_YELLOW_WOOL_ITEM, + ABRCSlabs.SLAB_LIME_WOOL_ITEM, + ABRCSlabs.SLAB_PINK_WOOL_ITEM, + ABRCSlabs.SLAB_GRAY_WOOL_ITEM, + ABRCSlabs.SLAB_LIGHT_GRAY_WOOL_ITEM, + ABRCSlabs.SLAB_CYAN_WOOL_ITEM, + ABRCSlabs.SLAB_PURPLE_WOOL_ITEM, + ABRCSlabs.SLAB_BLUE_WOOL_ITEM, + ABRCSlabs.SLAB_BROWN_WOOL_ITEM, + ABRCSlabs.SLAB_GREEN_WOOL_ITEM, + ABRCSlabs.SLAB_RED_WOOL_ITEM + }; + public static final Item[] STAIRS = { + //Stairs + ABRCStairs.STAIR_WHITE_BRIGHT_ITEM, + ABRCStairs.STAIR_BLACK_ITEM, + ABRCStairs.STAIR_ORANGE_BRIGHT_ITEM, + ABRCStairs.STAIR_MAGENTA_BRIGHT_ITEM, + ABRCStairs.STAIR_YELLOW_BRIGHT_ITEM, + ABRCStairs.STAIR_CYAN_BRIGHT_ITEM, + ABRCStairs.STAIR_BLUE_BRIGHT_ITEM, + ABRCStairs.STAIR_GREEN_BRIGHT_ITEM, + ABRCStairs.STAIR_RED_BRIGHT_ITEM, + ABRCStairs.STAIR_WHITE_WOOL_ITEM, + ABRCStairs.STAIR_ORANGE_WOOL_ITEM, + ABRCStairs.STAIR_MAGENTA_WOOL_ITEM, + ABRCStairs.STAIR_LIGHT_BLUE_WOOL_ITEM, + ABRCStairs.STAIR_YELLOW_WOOL_ITEM, + ABRCStairs.STAIR_LIME_WOOL_ITEM, + ABRCStairs.STAIR_PINK_WOOL_ITEM, + ABRCStairs.STAIR_GRAY_WOOL_ITEM, + ABRCStairs.STAIR_LIGHT_GRAY_WOOL_ITEM, + ABRCStairs.STAIR_CYAN_WOOL_ITEM, + ABRCStairs.STAIR_PURPLE_WOOL_ITEM, + ABRCStairs.STAIR_BLUE_WOOL_ITEM, + ABRCStairs.STAIR_BROWN_WOOL_ITEM, + ABRCStairs.STAIR_GREEN_WOOL_ITEM, + ABRCStairs.STAIR_RED_WOOL_ITEM + }; + public static final Item[] BUTTONS = { + ABRCButtons.BUTTON_BRIGHT_WHITE_ITEM, + ABRCButtons.BUTTON_BRIGHT_ORANGE_ITEM, + ABRCButtons.BUTTON_BRIGHT_MAGENTA_ITEM, + ABRCButtons.BUTTON_BRIGHT_YELLOW_ITEM, + ABRCButtons.BUTTON_BRIGHT_CYAN_ITEM, + ABRCButtons.BUTTON_BRIGHT_BLUE_ITEM, + ABRCButtons.BUTTON_BRIGHT_GREEN_ITEM, + ABRCButtons.BUTTON_BRIGHT_RED_ITEM, + ABRCButtons.BUTTON_BRIGHT_BLACK_ITEM, + ABRCButtons.BUTTON_WOOL_WHITE_ITEM, + ABRCButtons.BUTTON_WOOL_ORANGE_ITEM, + ABRCButtons.BUTTON_WOOL_MAGENTA_ITEM, + ABRCButtons.BUTTON_WOOL_LIGHT_BLUE_ITEM, + ABRCButtons.BUTTON_WOOL_YELLOW_ITEM, + ABRCButtons.BUTTON_WOOL_LIME_ITEM, + ABRCButtons.BUTTON_WOOL_PINK_ITEM, + ABRCButtons.BUTTON_WOOL_GRAY_ITEM, + ABRCButtons.BUTTON_WOOL_LIGHT_GRAY_ITEM, + ABRCButtons.BUTTON_WOOL_CYAN_ITEM, + ABRCButtons.BUTTON_WOOL_PURPLE_ITEM, + ABRCButtons.BUTTON_WOOL_BLUE_ITEM, + ABRCButtons.BUTTON_WOOL_BROWN_ITEM, + ABRCButtons.BUTTON_WOOL_GREEN_ITEM, + ABRCButtons.BUTTON_WOOL_RED_ITEM + }; + public static final Item[] PRESSURE_PLATES = { + //Pressure Plates + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_WHITE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_ORANGE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_MAGENTA_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_YELLOW_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_CYAN_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_BLUE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_GREEN_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_RED_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_BRIGHT_BLACK_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_WHITE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_ORANGE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_MAGENTA_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_LIGHT_BLUE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_YELLOW_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_LIME_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_PINK_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_GRAY_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_LIGHT_GRAY_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_CYAN_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_PURPLE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_BLUE_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_BROWN_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_GREEN_ITEM, + ABRCPressurePlates.PRESSURE_PLATE_WOOL_RED_ITEM + }; + + @Override + protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { + getOrCreateTagBuilder(ItemTags.BUTTONS).add(BUTTONS); + getOrCreateTagBuilder(ItemTags.STAIRS).add(STAIRS); + getOrCreateTagBuilder(ItemTags.SLABS).add(SLABS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_BUTTONS_ITEM).add(BUTTONS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_STAIRS_ITEM).add(STAIRS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_SLABS_ITEM).add(SLABS); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_PRESSURE_PLATES_ITEM).add(PRESSURE_PLATES); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_WITHOUT_BORDERS_ITEM).add(BRIGHT_BLOCKS_WITHOUT_BORDER).add(WOOL_BLOCKS_WITHOUT_BORDER); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_WITH_BORDERS_ITEM).add(BRIGHT_BLOCKS_WITH_BORDER).add(WOOL_BLOCKS_WITH_BORDER); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_WOOL_COLORS_ITEM).add(WOOL_BLOCKS_WITH_BORDER).add(WOOL_BLOCKS_WITHOUT_BORDER); + getOrCreateTagBuilder(ABRCTags.ANTIBLOCK_BRIGHT_COLORS_ITEM).add(BRIGHT_BLOCKS_WITH_BORDER).add(BRIGHT_BLOCKS_WITH_BORDER); + + } +} diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/tag/ABRCTags.java b/src/main/java/net/manmaed/antiblocksrechiseled/tag/ABRCTags.java index f7c9799..337e068 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/tag/ABRCTags.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/tag/ABRCTags.java @@ -2,6 +2,7 @@ import net.manmaed.antiblocksrechiseled.AntiBlocksReChiseled; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.registry.BuiltinRegistries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; @@ -11,11 +12,33 @@ public class ABRCTags { - public static final TagKey ANTIBLOCK_WITHOUT_BORDERS = create("antiblock_without_borders"); - public static final TagKey ANTIBLOCK_WITH_BORDERS = create("antiblock_with_borders"); - public static final TagKey ANTIBLOCK_BRIGHT_COLORS = create("antiblock_bright_colors"); - public static final TagKey ANTIBLOCK_WOOL_COLORS= create("antiblock_wool_colors"); - private static TagKey create(String name) { + public static final TagKey ANTIBLOCK_WITHOUT_BORDERS = createBlockTag("antiblock_without_borders"); + public static final TagKey ANTIBLOCK_WITH_BORDERS = createBlockTag("antiblock_with_borders"); + + public static final TagKey ANTIBLOCK_BRIGHT_COLORS = createBlockTag("antiblock_bright_colors"); + public static final TagKey ANTIBLOCK_WOOL_COLORS = createBlockTag("antiblock_wool_colors"); + + public static final TagKey ANTIBLOCK_BUTTONS = createBlockTag("antiblock_buttons"); + public static final TagKey ANTIBLOCK_STAIRS = createBlockTag("antiblock_stairs"); + public static final TagKey ANTIBLOCK_SLABS = createBlockTag("antiblock_slabs"); + public static final TagKey ANTIBLOCK_PRESSURE_PLATES = createBlockTag("antiblock_pressure_plates"); + + //Item + public static final TagKey ANTIBLOCK_WITHOUT_BORDERS_ITEM = createItemTag("antiblock_without_borders"); + public static final TagKey ANTIBLOCK_WITH_BORDERS_ITEM = createItemTag("antiblock_with_borders"); + + public static final TagKey ANTIBLOCK_BRIGHT_COLORS_ITEM = createItemTag("antiblock_bright_colors"); + public static final TagKey ANTIBLOCK_WOOL_COLORS_ITEM = createItemTag("antiblock_wool_colors"); + + public static final TagKey ANTIBLOCK_BUTTONS_ITEM = createItemTag("antiblock_buttons"); + public static final TagKey ANTIBLOCK_STAIRS_ITEM = createItemTag("antiblock_stairs"); + public static final TagKey ANTIBLOCK_SLABS_ITEM = createItemTag("antiblock_slabs"); + public static final TagKey ANTIBLOCK_PRESSURE_PLATES_ITEM = createItemTag("antiblock_pressure_plates"); + private static TagKey createBlockTag(String name) { return TagKey.of(RegistryKeys.BLOCK, Identifier.of(AntiBlocksReChiseled.MOD_ID, name)); } + + private static TagKey createItemTag(String name) { + return TagKey.of(RegistryKeys.ITEM, Identifier.of(AntiBlocksReChiseled.MOD_ID, name)); + } }