From 06ca6d29ca9b739405af59deda54af9824f147d6 Mon Sep 17 00:00:00 2001 From: manmaed Date: Sun, 18 Aug 2024 19:05:05 +0100 Subject: [PATCH] add my own tags #12 --- .../24248c47e4f890e59c8abec99e4f37cb8e68e13f | 10 ++- .../tags/block/antiblock_bright_colors.json | 22 ++++++ .../tags/block/antiblock_with_borders.json | 28 ++++++++ .../tags/block/antiblock_without_borders.json | 28 ++++++++ .../tags/block/antiblock_wool_colors.json | 34 +++++++++ .../tags/block/mineable/pickaxe.json | 48 ++++++------- .../minecraft/tags/block/needs_iron_tool.json | 48 ++++++------- .../datagen/ModBlocksTagsProvider.java | 69 +++++++++++-------- .../antiblocksrechiseled/tag/ABRCTags.java | 21 ++++++ 9 files changed, 228 insertions(+), 80 deletions(-) create mode 100644 src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_bright_colors.json create mode 100644 src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_with_borders.json create mode 100644 src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_without_borders.json create mode 100644 src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_wool_colors.json create mode 100644 src/main/java/net/manmaed/antiblocksrechiseled/tag/ABRCTags.java diff --git a/src/generated/resources/.cache/24248c47e4f890e59c8abec99e4f37cb8e68e13f b/src/generated/resources/.cache/24248c47e4f890e59c8abec99e4f37cb8e68e13f index d836f50..83b87ae 100644 --- a/src/generated/resources/.cache/24248c47e4f890e59c8abec99e4f37cb8e68e13f +++ b/src/generated/resources/.cache/24248c47e4f890e59c8abec99e4f37cb8e68e13f @@ -1,7 +1,11 @@ -// 1.21 2024-08-13T13:26:44.6872745 Tags for minecraft:block mod id antiblocksrechiseled +// 1.21 2024-08-18T19:03:33.6779988 Tags for minecraft:block mod id antiblocksrechiseled +0e28f3b1d50e042f07a3b712c88bc2caab68968e data/antiblocksrechiseled/tags/block/antiblock_bright_colors.json +daa3875b6c723ed549d5b536e1f96a948c0e8476 data/antiblocksrechiseled/tags/block/antiblock_without_borders.json +a9bb53db5ca978058be3cdd8293b688fb437d902 data/antiblocksrechiseled/tags/block/antiblock_with_borders.json +84491f0873be093b737fd9267dd0ed606ed4ab51 data/antiblocksrechiseled/tags/block/antiblock_wool_colors.json 0298961f202469594d99d6749585a3df5e6c9654 data/minecraft/tags/block/buttons.json -e8a51ccff6897210007da67c225cacf32ce2af40 data/minecraft/tags/block/mineable/pickaxe.json -e8a51ccff6897210007da67c225cacf32ce2af40 data/minecraft/tags/block/needs_iron_tool.json +23f195bdbfc5ed4974c279bb937e7fc08975c3bd data/minecraft/tags/block/mineable/pickaxe.json +23f195bdbfc5ed4974c279bb937e7fc08975c3bd data/minecraft/tags/block/needs_iron_tool.json 51100bb256af613505c9d2a0caaae978dbf50452 data/minecraft/tags/block/pressure_plates.json 776e37935e00306758e40c7f1052089ff3243f50 data/minecraft/tags/block/slabs.json 35508908209834b62fe88bb6dea0018ef6fa2ded data/minecraft/tags/block/stairs.json diff --git a/src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_bright_colors.json b/src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_bright_colors.json new file mode 100644 index 0000000..8d7a2eb --- /dev/null +++ b/src/generated/resources/data/antiblocksrechiseled/tags/block/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/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_with_borders.json b/src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_with_borders.json new file mode 100644 index 0000000..d772f85 --- /dev/null +++ b/src/generated/resources/data/antiblocksrechiseled/tags/block/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/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_without_borders.json b/src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_without_borders.json new file mode 100644 index 0000000..56dee8d --- /dev/null +++ b/src/generated/resources/data/antiblocksrechiseled/tags/block/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/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_wool_colors.json b/src/generated/resources/data/antiblocksrechiseled/tags/block/antiblock_wool_colors.json new file mode 100644 index 0000000..b4b0248 --- /dev/null +++ b/src/generated/resources/data/antiblocksrechiseled/tags/block/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/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index b78609a..9456ca0 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,14 +1,5 @@ { "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:bright_white_border", "antiblocksrechiseled:bright_orange_border", "antiblocksrechiseled:bright_magenta_border", @@ -18,21 +9,15 @@ "antiblocksrechiseled:bright_green_border", "antiblocksrechiseled:bright_red_border", "antiblocksrechiseled:bright_black_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", + "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_border", "antiblocksrechiseled:wool_orange_border", "antiblocksrechiseled:wool_magenta_border", @@ -48,6 +33,21 @@ "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", "antiblocksrechiseled:slab_white_bright", "antiblocksrechiseled:slab_black", "antiblocksrechiseled:slab_orange_bright", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index b78609a..9456ca0 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -1,14 +1,5 @@ { "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:bright_white_border", "antiblocksrechiseled:bright_orange_border", "antiblocksrechiseled:bright_magenta_border", @@ -18,21 +9,15 @@ "antiblocksrechiseled:bright_green_border", "antiblocksrechiseled:bright_red_border", "antiblocksrechiseled:bright_black_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", + "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_border", "antiblocksrechiseled:wool_orange_border", "antiblocksrechiseled:wool_magenta_border", @@ -48,6 +33,21 @@ "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", "antiblocksrechiseled:slab_white_bright", "antiblocksrechiseled:slab_black", "antiblocksrechiseled:slab_orange_bright", diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java index 3ac8ff5..43440a4 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/datagen/ModBlocksTagsProvider.java @@ -2,6 +2,7 @@ import net.manmaed.antiblocksrechiseled.AntiBlocksReChiseled; import net.manmaed.antiblocksrechiseled.blocks.*; +import net.manmaed.antiblocksrechiseled.tag.ABRCTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.tags.BlockTags; @@ -14,17 +15,7 @@ public class ModBlocksTagsProvider extends BlockTagsProvider { - public static final Block[] BIGHT_BLOCKS = { - //Bright Colors - ABRCBrightColors.BRIGHT_WHITE.get(), - ABRCBrightColors.BRIGHT_ORANGE.get(), - ABRCBrightColors.BRIGHT_MAGENTA.get(), - ABRCBrightColors.BRIGHT_YELLOW.get(), - ABRCBrightColors.BRIGHT_CYAN.get(), - ABRCBrightColors.BRIGHT_BLUE.get(), - ABRCBrightColors.BRIGHT_GREEN.get(), - ABRCBrightColors.BRIGHT_RED.get(), - ABRCBrightColors.BRIGHT_BLACK.get(), + public static final Block[] BRIGHT_BLOCKS_WITH_BORDER = { ABRCBrightColors.BRIGHT_WHITE_BORDER.get(), ABRCBrightColors.BRIGHT_ORANGE_BORDER.get(), ABRCBrightColors.BRIGHT_MAGENTA_BORDER.get(), @@ -35,23 +26,20 @@ public class ModBlocksTagsProvider extends BlockTagsProvider { ABRCBrightColors.BRIGHT_RED_BORDER.get(), ABRCBrightColors.BRIGHT_BLACK_BORDER.get() }; - public static final Block[] WOOL_BLOCKS = { + public static final Block[] BRIGHT_BLOCKS_WITHOUT_BORDER = { + //Bright Colors + ABRCBrightColors.BRIGHT_WHITE.get(), + ABRCBrightColors.BRIGHT_ORANGE.get(), + ABRCBrightColors.BRIGHT_MAGENTA.get(), + ABRCBrightColors.BRIGHT_YELLOW.get(), + ABRCBrightColors.BRIGHT_CYAN.get(), + ABRCBrightColors.BRIGHT_BLUE.get(), + ABRCBrightColors.BRIGHT_GREEN.get(), + ABRCBrightColors.BRIGHT_RED.get(), + ABRCBrightColors.BRIGHT_BLACK.get() + }; + public static final Block[] WOOL_BLOCKS_WITH_BORDER = { //Wool Colors - ABRCWoolColors.WOOL_WHITE.get(), - ABRCWoolColors.WOOL_ORANGE.get(), - ABRCWoolColors.WOOL_MAGENTA.get(), - ABRCWoolColors.WOOL_LIGHT_BLUE.get(), - ABRCWoolColors.WOOL_YELLOW.get(), - ABRCWoolColors.WOOL_LIME.get(), - ABRCWoolColors.WOOL_PINK.get(), - ABRCWoolColors.WOOL_GRAY.get(), - ABRCWoolColors.WOOL_LIGHT_GRAY.get(), - ABRCWoolColors.WOOL_CYAN.get(), - ABRCWoolColors.WOOL_PURPLE.get(), - ABRCWoolColors.WOOL_BLUE.get(), - ABRCWoolColors.WOOL_BROWN.get(), - ABRCWoolColors.WOOL_GREEN.get(), - ABRCWoolColors.WOOL_RED.get(), ABRCWoolColors.WOOL_WHITE_BORDER.get(), ABRCWoolColors.WOOL_ORANGE_BORDER.get(), ABRCWoolColors.WOOL_MAGENTA_BORDER.get(), @@ -69,6 +57,25 @@ public class ModBlocksTagsProvider extends BlockTagsProvider { ABRCWoolColors.WOOL_RED_BORDER.get() }; + public static final Block[] WOOL_BLOCKS_WITHOUT_BORDER = { + //Wool Colors + ABRCWoolColors.WOOL_WHITE.get(), + ABRCWoolColors.WOOL_ORANGE.get(), + ABRCWoolColors.WOOL_MAGENTA.get(), + ABRCWoolColors.WOOL_LIGHT_BLUE.get(), + ABRCWoolColors.WOOL_YELLOW.get(), + ABRCWoolColors.WOOL_LIME.get(), + ABRCWoolColors.WOOL_PINK.get(), + ABRCWoolColors.WOOL_GRAY.get(), + ABRCWoolColors.WOOL_LIGHT_GRAY.get(), + ABRCWoolColors.WOOL_CYAN.get(), + ABRCWoolColors.WOOL_PURPLE.get(), + ABRCWoolColors.WOOL_BLUE.get(), + ABRCWoolColors.WOOL_BROWN.get(), + ABRCWoolColors.WOOL_GREEN.get(), + ABRCWoolColors.WOOL_RED.get() + }; + public static final Block[] SLABS = { //Slabs ABRCSlabs.SLAB_WHITE_BRIGHT.get(), @@ -181,11 +188,15 @@ public ModBlocksTagsProvider(PackOutput packOutput, CompletableFuture 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) { + return TagKey.create(BuiltInRegistries.BLOCK.key(), ResourceLocation.fromNamespaceAndPath(AntiBlocksReChiseled.MOD_ID, name)); + } +}