From acfeee7b9b855edaeff250bdb5877b0135277133 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 23 Jan 2022 21:34:35 +0100 Subject: [PATCH] Refactored Tag Constants --- .../ru/bclib/api/tag/CommonBlockTags.java | 22 ++++++++++++ .../java/ru/bclib/api/tag/CommonItemTags.java | 19 ++++++++++ .../java/ru/bclib/api/tag/NamedBlockTags.java | 35 +++++++++++++++++++ .../bclib/api/tag/NamedCommonBlockTags.java | 23 ++++++++++++ .../ru/bclib/api/tag/NamedCommonItemTags.java | 20 +++++++++++ .../java/ru/bclib/api/tag/NamedItemTags.java | 30 ++++++++++++++++ .../ru/bclib/api/tag/NamedMineableTags.java | 13 +++++++ .../java/ru/bclib/api/tag/NamedToolTags.java | 13 +++++++ .../java/ru/bclib/api/{ => tag}/TagAPI.java | 0 9 files changed, 175 insertions(+) create mode 100644 src/main/java/ru/bclib/api/tag/CommonBlockTags.java create mode 100644 src/main/java/ru/bclib/api/tag/CommonItemTags.java create mode 100644 src/main/java/ru/bclib/api/tag/NamedBlockTags.java create mode 100644 src/main/java/ru/bclib/api/tag/NamedCommonBlockTags.java create mode 100644 src/main/java/ru/bclib/api/tag/NamedCommonItemTags.java create mode 100644 src/main/java/ru/bclib/api/tag/NamedItemTags.java create mode 100644 src/main/java/ru/bclib/api/tag/NamedMineableTags.java create mode 100644 src/main/java/ru/bclib/api/tag/NamedToolTags.java rename src/main/java/ru/bclib/api/{ => tag}/TagAPI.java (100%) diff --git a/src/main/java/ru/bclib/api/tag/CommonBlockTags.java b/src/main/java/ru/bclib/api/tag/CommonBlockTags.java new file mode 100644 index 00000000..0a849b84 --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/CommonBlockTags.java @@ -0,0 +1,22 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.level.block.Block; +import ru.bclib.api.tag.TagAPI.TagNamed; + +public class CommonBlockTags { + public static final TagNamed BARREL = TagAPI.makeCommonBlockTag("barrel"); + public static final TagNamed BOOKSHELVES = TagAPI.makeCommonBlockTag("bookshelves"); + public static final TagNamed CHEST = TagAPI.makeCommonBlockTag("chest"); + public static final TagNamed END_STONES = TagAPI.makeCommonBlockTag("end_stones"); + public static final TagNamed IMMOBILE = TagAPI.makeCommonBlockTag("immobile"); + public static final TagNamed LEAVES = TagAPI.makeCommonBlockTag("leaves"); + public static final TagNamed NETHERRACK = TagAPI.makeCommonBlockTag("netherrack"); + public static final TagNamed NETHER_MYCELIUM = TagAPI.makeCommonBlockTag("nether_mycelium"); + public static final TagNamed NETHER_PORTAL_FRAME = TagAPI.makeCommonBlockTag("nether_pframe"); + public static final TagNamed NETHER_STONES = TagAPI.makeCommonBlockTag("nether_stones"); + public static final TagNamed SAPLINGS = TagAPI.makeCommonBlockTag("saplings"); + public static final TagNamed SOUL_GROUND = TagAPI.makeCommonBlockTag("soul_ground"); + public static final TagNamed WOODEN_BARREL = TagAPI.makeCommonBlockTag("wooden_barrels"); + public static final TagNamed WOODEN_CHEST = TagAPI.makeCommonBlockTag("wooden_chests"); + public static final TagNamed WORKBENCHES = TagAPI.makeCommonBlockTag("workbench"); +} diff --git a/src/main/java/ru/bclib/api/tag/CommonItemTags.java b/src/main/java/ru/bclib/api/tag/CommonItemTags.java new file mode 100644 index 00000000..9fb7bfd4 --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/CommonItemTags.java @@ -0,0 +1,19 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.item.Item; +import ru.bclib.api.tag.TagAPI.TagNamed; + +public class CommonItemTags { + public final static TagNamed HAMMERS = TagAPI.makeCommonItemTag("hammers"); + public static final TagNamed BARREL = TagAPI.makeCommonItemTag("barrel"); + public static final TagNamed CHEST = TagAPI.makeCommonItemTag("chest"); + public static final TagNamed SHEARS = TagAPI.makeCommonItemTag("shears"); + public static final TagNamed FURNACES = TagAPI.makeCommonItemTag("furnaces"); + public static final TagNamed IRON_INGOTS = TagAPI.makeCommonItemTag("iron_ingots"); + public static final TagNamed LEAVES = TagAPI.makeCommonItemTag("leaves"); + public static final TagNamed SAPLINGS = TagAPI.makeCommonItemTag("saplings"); + public static final TagNamed SOUL_GROUND = TagAPI.makeCommonItemTag("soul_ground"); + public static final TagNamed WOODEN_BARREL = TagAPI.makeCommonItemTag("wooden_barrels"); + public static final TagNamed WOODEN_CHEST = TagAPI.makeCommonItemTag("wooden_chests"); + public static final TagNamed WORKBENCHES = TagAPI.makeCommonItemTag("workbench"); +} diff --git a/src/main/java/ru/bclib/api/tag/NamedBlockTags.java b/src/main/java/ru/bclib/api/tag/NamedBlockTags.java new file mode 100644 index 00000000..b551ec2a --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/NamedBlockTags.java @@ -0,0 +1,35 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.level.block.Block; +import ru.bclib.api.tag.TagAPI.TagLocation; + +public class NamedBlockTags { + public static final TagLocation ANVIL = new TagLocation<>("anvil"); + public static final TagLocation BUTTONS = new TagLocation<>("buttons"); + public static final TagLocation CLIMBABLE = new TagLocation<>("climbable"); + public static final TagLocation DOORS = new TagLocation<>("doors"); + public static final TagLocation FENCES = new TagLocation<>("fences"); + public static final TagLocation FENCE_GATES = new TagLocation<>("fence_gates"); + public static final TagLocation LEAVES = new TagLocation<>("leaves"); + public static final TagLocation LOGS = new TagLocation<>("logs"); + public static final TagLocation LOGS_THAT_BURN = new TagLocation<>("logs_that_burn"); + public static final TagLocation NYLIUM = new TagLocation<>("nylium"); + public static final TagLocation PLANKS = new TagLocation<>("planks"); + public static final TagLocation PRESSURE_PLATES = new TagLocation<>("pressure_plates"); + public static final TagLocation SAPLINGS = new TagLocation<>("saplings"); + public static final TagLocation SIGNS = new TagLocation<>("signs"); + public static final TagLocation SLABS = new TagLocation<>("slabs"); + public static final TagLocation STAIRS = new TagLocation<>("stairs"); + public static final TagLocation STONE_PRESSURE_PLATES = new TagLocation<>("stone_pressure_plates"); + public static final TagLocation TRAPDOORS = new TagLocation<>("trapdoors"); + public static final TagLocation WALLS = new TagLocation<>("walls"); + public static final TagLocation WOODEN_BUTTONS = new TagLocation<>("wooden_buttons"); + public static final TagLocation WOODEN_DOORS = new TagLocation<>("wooden_doors"); + public static final TagLocation WOODEN_FENCES = new TagLocation<>("wooden_fences"); + public static final TagLocation WOODEN_PRESSURE_PLATES = new TagLocation<>("wooden_pressure_plates"); + public static final TagLocation WOODEN_SLABS = new TagLocation<>("wooden_slabs"); + public static final TagLocation WOODEN_STAIRS = new TagLocation<>("wooden_stairs"); + public static final TagLocation WOODEN_TRAPDOORS = new TagLocation<>("wooden_trapdoors"); + public static final TagLocation SOUL_FIRE_BASE_BLOCKS = new TagLocation<>("soul_fire_base_blocks"); + public static final TagLocation SOUL_SPEED_BLOCKS = new TagLocation<>("soul_speed_blocks"); +} diff --git a/src/main/java/ru/bclib/api/tag/NamedCommonBlockTags.java b/src/main/java/ru/bclib/api/tag/NamedCommonBlockTags.java new file mode 100644 index 00000000..5914e25c --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/NamedCommonBlockTags.java @@ -0,0 +1,23 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.level.block.Block; +import ru.bclib.api.tag.TagAPI.TagLocation; + +public class NamedCommonBlockTags { + public static final TagLocation BARREL = new TagLocation<>("c", "barrel"); + public static final TagLocation BOOKSHELVES = new TagLocation<>("c", "bookshelves"); + public static final TagLocation CHEST = new TagLocation<>("c", "chest"); + public static final TagLocation END_STONES = new TagLocation<>("c", "end_stones"); + public static final TagLocation IMMOBILE = new TagLocation<>("c", "immobile"); + public static final TagLocation LEAVES = new TagLocation<>("c", "leaves"); + public static final TagLocation NETHERRACK = new TagLocation<>("c", "netherrack"); + public static final TagLocation NETHER_MYCELIUM = new TagLocation<>("c", "nether_mycelium"); + public static final TagLocation NETHER_PORTAL_FRAME = new TagLocation<>("c", "nether_pframe"); + public static final TagLocation NETHER_STONES = new TagLocation<>("c", "nether_stones"); + public static final TagLocation SAPLINGS = new TagLocation<>("c", "saplings"); + public static final TagLocation SOUL_GROUND = new TagLocation<>("c", "soul_ground"); + public static final TagLocation WOODEN_BARREL = new TagLocation<>("c", "wooden_barrels"); + public static final TagLocation WOODEN_CHEST = new TagLocation<>("c", "wooden_chests"); + public static final TagLocation WORKBENCHES = new TagLocation<>("c", "workbench"); + public static final TagLocation DRAGON_IMMUNE = new TagLocation<>("c", "dragon_immune"); +} diff --git a/src/main/java/ru/bclib/api/tag/NamedCommonItemTags.java b/src/main/java/ru/bclib/api/tag/NamedCommonItemTags.java new file mode 100644 index 00000000..ddb52cfb --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/NamedCommonItemTags.java @@ -0,0 +1,20 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.item.Item; +import ru.bclib.api.tag.TagAPI.TagLocation; + +public class NamedCommonItemTags { + // Common Item Tags + public static final TagLocation BARREL = new TagLocation<>("c", "barrel"); + public static final TagLocation CHEST = new TagLocation<>("c", "chest"); + public static final TagLocation FURNACES = new TagLocation<>("c", "furnaces"); + public static final TagLocation HAMMERS = new TagLocation<>("c", "hammers"); + public static final TagLocation IRON_INGOTS = new TagLocation<>("c", "iron_ingots"); + public static final TagLocation LEAVES = new TagLocation<>("c", "leaves"); + public static final TagLocation SAPLINGS = new TagLocation<>("c", "saplings"); + public static final TagLocation SHEARS = new TagLocation<>("c", "shears"); + public static final TagLocation SOUL_GROUND = new TagLocation<>("c", "soul_ground"); + public static final TagLocation WOODEN_BARREL = new TagLocation<>("c", "wooden_barrels"); + public static final TagLocation WOODEN_CHEST = new TagLocation<>("c", "wooden_chests"); + public static final TagLocation WORKBENCHES = new TagLocation<>("c", "workbench"); +} diff --git a/src/main/java/ru/bclib/api/tag/NamedItemTags.java b/src/main/java/ru/bclib/api/tag/NamedItemTags.java new file mode 100644 index 00000000..7d644f7e --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/NamedItemTags.java @@ -0,0 +1,30 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.item.Item; +import ru.bclib.api.tag.TagAPI.TagLocation; + +public class NamedItemTags { + public static final TagLocation BUTTONS = new TagLocation<>("buttons"); + public static final TagLocation DOORS = new TagLocation<>("doors"); + public static final TagLocation FENCES = new TagLocation<>("fences"); + public static final TagLocation FENCE_GATES = new TagLocation<>("fence_gates"); + public static final TagLocation LEAVES = new TagLocation<>("leaves"); + public static final TagLocation LOGS = new TagLocation<>("logs"); + public static final TagLocation LOGS_THAT_BURN = new TagLocation<>("logs_that_burn"); + public static final TagLocation PLANKS = new TagLocation<>("planks"); + public static final TagLocation PRESSURE_PLATES = new TagLocation<>("pressure_plates"); + public static final TagLocation SAPLINGS = new TagLocation<>("saplings"); + public static final TagLocation SHEARS = new TagLocation<>("shears"); + public static final TagLocation SIGNS = new TagLocation<>("signs"); + public static final TagLocation SLABS = new TagLocation<>("slabs"); + public static final TagLocation STAIRS = new TagLocation<>("stairs"); + public static final TagLocation STONE_PRESSURE_PLATES = new TagLocation<>("stone_pressure_plates"); + public static final TagLocation TRAPDOORS = new TagLocation<>("trapdoors"); + public static final TagLocation WOODEN_BUTTONS = new TagLocation<>("wooden_buttons"); + public static final TagLocation WOODEN_DOORS = new TagLocation<>("wooden_doors"); + public static final TagLocation WOODEN_FENCES = new TagLocation<>("wooden_fences"); + public static final TagLocation WOODEN_PRESSURE_PLATES = new TagLocation<>("wooden_pressure_plates"); + public static final TagLocation WOODEN_SLABS = new TagLocation<>("wooden_slabs"); + public static final TagLocation WOODEN_STAIRS = new TagLocation<>("wooden_stairs"); + public static final TagLocation WOODEN_TRAPDOORS = new TagLocation<>("wooden_trapdoors"); +} diff --git a/src/main/java/ru/bclib/api/tag/NamedMineableTags.java b/src/main/java/ru/bclib/api/tag/NamedMineableTags.java new file mode 100644 index 00000000..78a2c97a --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/NamedMineableTags.java @@ -0,0 +1,13 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.level.block.Block; +import ru.bclib.api.tag.TagAPI.TagLocation; + +public class NamedMineableTags { + public static final TagLocation AXE = new TagLocation<>("mineable/axe"); + public static final TagLocation HOE = new TagLocation<>("mineable/hoe"); + public static final TagLocation PICKAXE = new TagLocation<>("mineable/pickaxe"); + public static final TagLocation SHEARS = new TagLocation<>("fabric", "mineable/shears"); + public static final TagLocation SHOVEL = new TagLocation<>("mineable/shovel"); + public static final TagLocation SWORD = new TagLocation<>("fabric", "mineable/sword"); +} diff --git a/src/main/java/ru/bclib/api/tag/NamedToolTags.java b/src/main/java/ru/bclib/api/tag/NamedToolTags.java new file mode 100644 index 00000000..349f81e5 --- /dev/null +++ b/src/main/java/ru/bclib/api/tag/NamedToolTags.java @@ -0,0 +1,13 @@ +package ru.bclib.api.tag; + +import net.minecraft.world.item.Item; +import ru.bclib.api.tag.TagAPI.TagLocation; + +public class NamedToolTags { + public static final TagLocation FABRIC_AXES = new TagLocation<>("fabric", "axes"); + public static final TagLocation FABRIC_HOES = new TagLocation<>("fabric", "hoes"); + public static final TagLocation FABRIC_PICKAXES = new TagLocation<>("fabric", "pickaxes"); + public static final TagLocation FABRIC_SHEARS = new TagLocation<>("fabric", "shears"); + public static final TagLocation FABRIC_SHOVELS = new TagLocation<>("fabric", "shovels"); + public static final TagLocation FABRIC_SWORDS = new TagLocation<>("fabric", "swords"); +} diff --git a/src/main/java/ru/bclib/api/TagAPI.java b/src/main/java/ru/bclib/api/tag/TagAPI.java similarity index 100% rename from src/main/java/ru/bclib/api/TagAPI.java rename to src/main/java/ru/bclib/api/tag/TagAPI.java