diff --git a/src/main/java/ru/bclib/BCLib.java b/src/main/java/ru/bclib/BCLib.java index ab732c72..7b1d4dd7 100644 --- a/src/main/java/ru/bclib/BCLib.java +++ b/src/main/java/ru/bclib/BCLib.java @@ -4,7 +4,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.resources.ResourceLocation; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.TagAPI; import ru.bclib.api.WorldDataAPI; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.dataexchange.DataExchangeAPI; diff --git a/src/main/java/ru/bclib/api/PostInitAPI.java b/src/main/java/ru/bclib/api/PostInitAPI.java index ef7f61d3..cdf17eb1 100644 --- a/src/main/java/ru/bclib/api/PostInitAPI.java +++ b/src/main/java/ru/bclib/api/PostInitAPI.java @@ -8,7 +8,8 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Registry; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.TagAPI; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.blocks.BaseBarrelBlock; import ru.bclib.blocks.BaseChestBlock; diff --git a/src/main/java/ru/bclib/api/tag/TagAPI.java b/src/main/java/ru/bclib/api/tag/TagAPI.java index fefeeaeb..3c055087 100644 --- a/src/main/java/ru/bclib/api/tag/TagAPI.java +++ b/src/main/java/ru/bclib/api/tag/TagAPI.java @@ -1,4 +1,4 @@ -package ru.bclib.api; +package ru.bclib.api.tag; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -28,144 +28,6 @@ public class TagAPI { private static final Map> TAGS_BLOCK = Maps.newConcurrentMap(); private static final Map> TAGS_ITEM = Maps.newConcurrentMap(); - // LOCATIONS // - - // Mineable Block Tags - public static final TagLocation NAMED_MINEABLE_AXE = new TagLocation<>("mineable/axe"); - public static final TagLocation NAMED_MINEABLE_HOE = new TagLocation<>("mineable/hoe"); - public static final TagLocation NAMED_MINEABLE_PICKAXE = new TagLocation<>("mineable/pickaxe"); - public static final TagLocation NAMED_MINEABLE_SHEARS = new TagLocation<>("fabric", "mineable/shears"); - public static final TagLocation NAMED_MINEABLE_SHOVEL = new TagLocation<>("mineable/shovel"); - public static final TagLocation NAMED_MINEABLE_SWORD = new TagLocation<>("fabric", "mineable/sword"); - - // Fabric Tools - public static final TagLocation NAMED_FABRIC_AXES = new TagLocation<>("fabric", "axes"); - public static final TagLocation NAMED_FABRIC_HOES = new TagLocation<>("fabric", "hoes"); - public static final TagLocation NAMED_FABRIC_PICKAXES = new TagLocation<>("fabric", "pickaxes"); - public static final TagLocation NAMED_FABRIC_SHEARS = new TagLocation<>("fabric", "shears"); - public static final TagLocation NAMED_FABRIC_SHOVELS = new TagLocation<>("fabric", "shovels"); - public static final TagLocation NAMED_FABRIC_SWORDS = new TagLocation<>("fabric", "swords"); - - // Vanilla Block Tags - public static final TagLocation NAMED_BLOCK_ANVIL = new TagLocation<>("anvil"); - public static final TagLocation NAMED_BLOCK_BUTTONS = new TagLocation<>("buttons"); - public static final TagLocation NAMED_BLOCK_CLIMBABLE = new TagLocation<>("climbable"); - public static final TagLocation NAMED_BLOCK_DOORS = new TagLocation<>("doors"); - public static final TagLocation NAMED_BLOCK_FENCES = new TagLocation<>("fences"); - public static final TagLocation NAMED_BLOCK_FENCE_GATES = new TagLocation<>("fence_gates"); - public static final TagLocation NAMED_BLOCK_LEAVES = new TagLocation<>("leaves"); - public static final TagLocation NAMED_BLOCK_LOGS = new TagLocation<>("logs"); - public static final TagLocation NAMED_BLOCK_LOGS_THAT_BURN = new TagLocation<>("logs_that_burn"); - public static final TagLocation NAMED_BLOCK_NYLIUM = new TagLocation<>("nylium"); - public static final TagLocation NAMED_BLOCK_PLANKS = new TagLocation<>("planks"); - public static final TagLocation NAMED_BLOCK_PRESSURE_PLATES = new TagLocation<>("pressure_plates"); - public static final TagLocation NAMED_BLOCK_SAPLINGS = new TagLocation<>("saplings"); - public static final TagLocation NAMED_BLOCK_SIGNS = new TagLocation<>("signs"); - public static final TagLocation NAMED_BLOCK_SLABS = new TagLocation<>("slabs"); - public static final TagLocation NAMED_BLOCK_STAIRS = new TagLocation<>("stairs"); - public static final TagLocation NAMED_BLOCK_STONE_PRESSURE_PLATES = new TagLocation<>("stone_pressure_plates"); - public static final TagLocation NAMED_BLOCK_TRAPDOORS = new TagLocation<>("trapdoors"); - public static final TagLocation NAMED_BLOCK_WALLS = new TagLocation<>("walls"); - public static final TagLocation NAMED_BLOCK_WOODEN_BUTTONS = new TagLocation<>("wooden_buttons"); - public static final TagLocation NAMED_BLOCK_WOODEN_DOORS = new TagLocation<>("wooden_doors"); - public static final TagLocation NAMED_BLOCK_WOODEN_FENCES = new TagLocation<>("wooden_fences"); - public static final TagLocation NAMED_BLOCK_WOODEN_PRESSURE_PLATES = new TagLocation<>("wooden_pressure_plates"); - public static final TagLocation NAMED_BLOCK_WOODEN_SLABS = new TagLocation<>("wooden_slabs"); - public static final TagLocation NAMED_BLOCK_WOODEN_STAIRS = new TagLocation<>("wooden_stairs"); - public static final TagLocation NAMED_BLOCK_WOODEN_TRAPDOORS = new TagLocation<>("wooden_trapdoors"); - public static final TagLocation NAMED_SOUL_FIRE_BASE_BLOCKS = new TagLocation<>("soul_fire_base_blocks"); - public static final TagLocation NAMED_SOUL_SPEED_BLOCKS = new TagLocation<>("soul_speed_blocks"); - - // Vanilla Item Tags - public static final TagLocation NAMED_ITEM_BUTTONS = new TagLocation<>("buttons"); - public static final TagLocation NAMED_ITEM_DOORS = new TagLocation<>("doors"); - public static final TagLocation NAMED_ITEM_FENCES = new TagLocation<>("fences"); - public static final TagLocation NAMED_ITEM_FENCE_GATES = new TagLocation<>("fence_gates"); - public static final TagLocation NAMED_ITEM_LEAVES = new TagLocation<>("leaves"); - public static final TagLocation NAMED_ITEM_LOGS = new TagLocation<>("logs"); - public static final TagLocation NAMED_ITEM_LOGS_THAT_BURN = new TagLocation<>("logs_that_burn"); - public static final TagLocation NAMED_ITEM_PLANKS = new TagLocation<>("planks"); - public static final TagLocation NAMED_ITEM_PRESSURE_PLATES = new TagLocation<>("pressure_plates"); - public static final TagLocation NAMED_ITEM_SAPLINGS = new TagLocation<>("saplings"); - public static final TagLocation NAMED_ITEM_SHEARS = new TagLocation<>("shears"); - public static final TagLocation NAMED_ITEM_SIGNS = new TagLocation<>("signs"); - public static final TagLocation NAMED_ITEM_SLABS = new TagLocation<>("slabs"); - public static final TagLocation NAMED_ITEM_STAIRS = new TagLocation<>("stairs"); - public static final TagLocation NAMED_ITEM_STONE_PRESSURE_PLATES = new TagLocation<>("stone_pressure_plates"); - public static final TagLocation NAMED_ITEM_TRAPDOORS = new TagLocation<>("trapdoors"); - public static final TagLocation NAMED_ITEM_WOODEN_BUTTONS = new TagLocation<>("wooden_buttons"); - public static final TagLocation NAMED_ITEM_WOODEN_DOORS = new TagLocation<>("wooden_doors"); - public static final TagLocation NAMED_ITEM_WOODEN_FENCES = new TagLocation<>("wooden_fences"); - public static final TagLocation NAMED_ITEM_WOODEN_PRESSURE_PLATES = new TagLocation<>("wooden_pressure_plates"); - public static final TagLocation NAMED_ITEM_WOODEN_SLABS = new TagLocation<>("wooden_slabs"); - public static final TagLocation NAMED_ITEM_WOODEN_STAIRS = new TagLocation<>("wooden_stairs"); - public static final TagLocation NAMED_ITEM_WOODEN_TRAPDOORS = new TagLocation<>("wooden_trapdoors"); - - // Common Block Tags - public static final TagLocation NAMED_BLOCK_DRAGON_IMMUNE = new TagLocation<>("c", "dragon_immune"); - public static final TagLocation NAMED_COMMON_BLOCK_BARREL = new TagLocation<>("c", "barrel"); - public static final TagLocation NAMED_COMMON_BLOCK_BOOKSHELVES = new TagLocation<>("c", "bookshelves"); - public static final TagLocation NAMED_COMMON_BLOCK_CHEST = new TagLocation<>("c", "chest"); - public static final TagLocation NAMED_COMMON_BLOCK_END_STONES = new TagLocation<>("c", "end_stones"); - public static final TagLocation NAMED_COMMON_BLOCK_IMMOBILE = new TagLocation<>("c", "immobile"); - public static final TagLocation NAMED_COMMON_BLOCK_LEAVES = new TagLocation<>("c", "leaves"); - public static final TagLocation NAMED_COMMON_BLOCK_NETHERRACK = new TagLocation<>("c", "netherrack"); - public static final TagLocation NAMED_COMMON_BLOCK_NETHER_MYCELIUM = new TagLocation<>("c", "nether_mycelium"); - public static final TagLocation NAMED_COMMON_BLOCK_NETHER_PORTAL_FRAME = new TagLocation<>("c", "nether_pframe"); - public static final TagLocation NAMED_COMMON_BLOCK_NETHER_STONES = new TagLocation<>("c", "nether_stones"); - public static final TagLocation NAMED_COMMON_BLOCK_SAPLINGS = new TagLocation<>("c", "saplings"); - public static final TagLocation NAMED_COMMON_BLOCK_SOUL_GROUND = new TagLocation<>("c", "soul_ground"); - public static final TagLocation NAMED_COMMON_BLOCK_WOODEN_BARREL = new TagLocation<>("c", "wooden_barrels"); - public static final TagLocation NAMED_COMMON_BLOCK_WOODEN_CHEST = new TagLocation<>("c", "wooden_chests"); - public static final TagLocation NAMED_COMMON_BLOCK_WORKBENCHES = new TagLocation<>("c", "workbench"); - - // Common Item Tags - public static final TagLocation NAMED_COMMON_ITEM_BARREL = new TagLocation<>("c", "barrel"); - public static final TagLocation NAMED_COMMON_ITEM_CHEST = new TagLocation<>("c", "chest"); - public static final TagLocation NAMED_COMMON_ITEM_FURNACES = new TagLocation<>("c", "furnaces"); - public static final TagLocation NAMED_COMMON_ITEM_HAMMERS = new TagLocation<>("c", "hammers"); - public static final TagLocation NAMED_COMMON_ITEM_IRON_INGOTS = new TagLocation<>("c", "iron_ingots"); - public static final TagLocation NAMED_COMMON_ITEM_LEAVES = new TagLocation<>("c", "leaves"); - public static final TagLocation NAMED_COMMON_ITEM_SAPLINGS = new TagLocation<>("c", "saplings"); - public static final TagLocation NAMED_COMMON_ITEM_SHEARS = new TagLocation<>("c", "shears"); - public static final TagLocation NAMED_COMMON_ITEM_SOUL_GROUND = new TagLocation<>("c", "soul_ground"); - public static final TagLocation NAMED_COMMON_ITEM_WOODEN_BARREL = new TagLocation<>("c", "wooden_barrels"); - public static final TagLocation NAMED_COMMON_ITEM_WOODEN_CHEST = new TagLocation<>("c", "wooden_chests"); - public static final TagLocation NAMED_COMMON_ITEM_WORKBENCHES = new TagLocation<>("c", "workbench"); - - // TAGS // - - // Common Block Tags - public static final TagNamed COMMON_BLOCK_BARREL = makeCommonBlockTag("barrel"); - public static final TagNamed COMMON_BLOCK_BOOKSHELVES = makeCommonBlockTag("bookshelves"); - public static final TagNamed COMMON_BLOCK_CHEST = makeCommonBlockTag("chest"); - public static final TagNamed COMMON_BLOCK_END_STONES = makeCommonBlockTag("end_stones"); - public static final TagNamed COMMON_BLOCK_IMMOBILE = makeCommonBlockTag("immobile"); - public static final TagNamed COMMON_BLOCK_LEAVES = makeCommonBlockTag("leaves"); - public static final TagNamed COMMON_BLOCK_NETHERRACK = makeCommonBlockTag("netherrack"); - public static final TagNamed COMMON_BLOCK_NETHER_MYCELIUM = makeCommonBlockTag("nether_mycelium"); - public static final TagNamed COMMON_BLOCK_NETHER_PORTAL_FRAME = makeCommonBlockTag("nether_pframe"); - public static final TagNamed COMMON_BLOCK_NETHER_STONES = makeCommonBlockTag("nether_stones"); - public static final TagNamed COMMON_BLOCK_SAPLINGS = makeCommonBlockTag("saplings"); - public static final TagNamed COMMON_BLOCK_SOUL_GROUND = makeCommonBlockTag("soul_ground"); - public static final TagNamed COMMON_BLOCK_WOODEN_BARREL = makeCommonBlockTag("wooden_barrels"); - public static final TagNamed COMMON_BLOCK_WOODEN_CHEST = makeCommonBlockTag("wooden_chests"); - public static final TagNamed COMMON_BLOCK_WORKBENCHES = makeCommonBlockTag("workbench"); - - // Common Item Tags - public final static TagNamed COMMON_ITEM_HAMMERS = makeCommonItemTag("hammers"); - public static final TagNamed COMMON_ITEM_BARREL = makeCommonItemTag("barrel"); - public static final TagNamed COMMON_ITEM_CHEST = makeCommonItemTag("chest"); - public static final TagNamed COMMON_ITEM_SHEARS = makeCommonItemTag("shears"); - public static final TagNamed COMMON_ITEM_FURNACES = makeCommonItemTag("furnaces"); - public static final TagNamed COMMON_ITEM_IRON_INGOTS = makeCommonItemTag("iron_ingots"); - public static final TagNamed COMMON_ITEM_LEAVES = makeCommonItemTag("leaves"); - public static final TagNamed COMMON_ITEM_SAPLINGS = makeCommonItemTag("saplings"); - public static final TagNamed COMMON_ITEM_SOUL_GROUND = makeCommonItemTag("soul_ground"); - public static final TagNamed COMMON_ITEM_WOODEN_BARREL = makeCommonItemTag("wooden_barrels"); - public static final TagNamed COMMON_ITEM_WOODEN_CHEST = makeCommonItemTag("wooden_chests"); - public static final TagNamed COMMON_ITEM_WORKBENCHES = makeCommonItemTag("workbench"); - /** * Get or create {@link Tag.Named}. * @@ -239,11 +101,11 @@ public class TagAPI { * Initializes basic tags. Should be called only in BCLib main class. */ public static void init() { - addBlockTag(COMMON_BLOCK_BOOKSHELVES.getName(), Blocks.BOOKSHELF); - addBlockTag(COMMON_BLOCK_CHEST.getName(), Blocks.CHEST); - addItemTag(COMMON_ITEM_CHEST.getName(), Items.CHEST); - addItemTag(COMMON_ITEM_IRON_INGOTS.getName(), Items.IRON_INGOT); - addItemTag(COMMON_ITEM_FURNACES.getName(), Blocks.FURNACE); + addBlockTag(CommonBlockTags.BOOKSHELVES.getName(), Blocks.BOOKSHELF); + addBlockTag(CommonBlockTags.CHEST.getName(), Blocks.CHEST); + addItemTag(CommonItemTags.CHEST.getName(), Items.CHEST); + addItemTag(CommonItemTags.IRON_INGOTS.getName(), Items.IRON_INGOT); + addItemTag(CommonItemTags.FURNACES.getName(), Blocks.FURNACE); } /** diff --git a/src/main/java/ru/bclib/blocks/BaseDoorBlock.java b/src/main/java/ru/bclib/blocks/BaseDoorBlock.java index 09cab9cb..6c8609e2 100644 --- a/src/main/java/ru/bclib/blocks/BaseDoorBlock.java +++ b/src/main/java/ru/bclib/blocks/BaseDoorBlock.java @@ -19,8 +19,9 @@ import net.minecraft.world.level.block.state.properties.DoorHingeSide; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; import net.minecraft.world.level.storage.loot.LootContext; import org.jetbrains.annotations.Nullable; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedBlockTags; +import ru.bclib.api.tag.NamedItemTags; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.models.BasePatterns; import ru.bclib.client.models.ModelsHelper; import ru.bclib.client.models.PatternsHelper; @@ -151,8 +152,8 @@ public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, Blo @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(TagAPI.NAMED_BLOCK_DOORS); - itemTags.add(TagAPI.NAMED_ITEM_DOORS); + blockTags.add(NamedBlockTags.DOORS); + itemTags.add(NamedItemTags.DOORS); } protected enum DoorType implements StringRepresentable { diff --git a/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java b/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java index fd2a95d8..46b8ce93 100644 --- a/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java @@ -15,8 +15,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedBlockTags; +import ru.bclib.api.tag.NamedItemTags; +import ru.bclib.api.tag.NamedMineableTags; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.BlockModelProvider; import ru.bclib.interfaces.RenderLayerProvider; @@ -93,9 +95,9 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS); - blockTags.add(TagAPI.NAMED_MINEABLE_HOE); - blockTags.add(TagAPI.NAMED_BLOCK_LEAVES); - itemTags.add(TagAPI.NAMED_ITEM_LEAVES); + blockTags.add(NamedMineableTags.SHEARS); + blockTags.add(NamedMineableTags.HOE); + blockTags.add(NamedBlockTags.LEAVES); + itemTags.add(NamedItemTags.LEAVES); } } diff --git a/src/main/java/ru/bclib/blocks/BasePlantBlock.java b/src/main/java/ru/bclib/blocks/BasePlantBlock.java index 85eece06..e469ccd7 100644 --- a/src/main/java/ru/bclib/blocks/BasePlantBlock.java +++ b/src/main/java/ru/bclib/blocks/BasePlantBlock.java @@ -32,8 +32,8 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedMineableTags; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.models.BasePatterns; import ru.bclib.client.models.ModelsHelper; import ru.bclib.client.models.PatternsHelper; @@ -170,7 +170,7 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS); - blockTags.add(TagAPI.NAMED_MINEABLE_HOE); + blockTags.add(NamedMineableTags.SHEARS); + blockTags.add(NamedMineableTags.HOE); } } diff --git a/src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java b/src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java index 919e7cd4..1862427f 100644 --- a/src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java +++ b/src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java @@ -7,8 +7,10 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedBlockTags; +import ru.bclib.api.tag.NamedItemTags; +import ru.bclib.api.tag.NamedMineableTags; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.RenderLayerProvider; import ru.bclib.interfaces.TagProvider; @@ -56,9 +58,9 @@ public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerPr @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS); - blockTags.add(TagAPI.NAMED_MINEABLE_HOE); - blockTags.add(TagAPI.NAMED_BLOCK_LEAVES); - itemTags.add(TagAPI.NAMED_ITEM_LEAVES); + blockTags.add(NamedMineableTags.SHEARS); + blockTags.add(NamedMineableTags.HOE); + blockTags.add(NamedBlockTags.LEAVES); + itemTags.add(NamedItemTags.LEAVES); } } \ No newline at end of file diff --git a/src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java b/src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java index 293627c3..486b96ac 100644 --- a/src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java +++ b/src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java @@ -31,8 +31,8 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedMineableTags; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.RenderLayerProvider; import ru.bclib.interfaces.TagProvider; @@ -161,7 +161,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS); - blockTags.add(TagAPI.NAMED_MINEABLE_HOE); + blockTags.add(NamedMineableTags.SHEARS); + blockTags.add(NamedMineableTags.HOE); } } diff --git a/src/main/java/ru/bclib/blocks/UpDownPlantBlock.java b/src/main/java/ru/bclib/blocks/UpDownPlantBlock.java index 483006de..f58e5526 100644 --- a/src/main/java/ru/bclib/blocks/UpDownPlantBlock.java +++ b/src/main/java/ru/bclib/blocks/UpDownPlantBlock.java @@ -25,8 +25,8 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedMineableTags; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.RenderLayerProvider; import ru.bclib.interfaces.TagProvider; @@ -107,7 +107,7 @@ public abstract class UpDownPlantBlock extends BaseBlockNotFull implements Rende @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS); - blockTags.add(TagAPI.NAMED_MINEABLE_HOE); + blockTags.add(NamedMineableTags.SHEARS); + blockTags.add(NamedMineableTags.HOE); } } diff --git a/src/main/java/ru/bclib/complexmaterials/ComplexMaterial.java b/src/main/java/ru/bclib/complexmaterials/ComplexMaterial.java index b4a3f633..022e5eaf 100644 --- a/src/main/java/ru/bclib/complexmaterials/ComplexMaterial.java +++ b/src/main/java/ru/bclib/complexmaterials/ComplexMaterial.java @@ -10,6 +10,7 @@ import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import org.jetbrains.annotations.Nullable; +import ru.bclib.api.tag.TagAPI; import ru.bclib.complexmaterials.entry.BlockEntry; import ru.bclib.complexmaterials.entry.ItemEntry; import ru.bclib.complexmaterials.entry.RecipeEntry; @@ -103,7 +104,7 @@ public abstract class ComplexMaterial { protected void initFlammable(FlammableBlockRegistry registry) {} /** - * Adds custom block tag for this {@link ComplexMaterial}, tag can be created with {@link ru.bclib.api.TagAPI} or you can use one of already created tags. + * Adds custom block tag for this {@link ComplexMaterial}, tag can be created with {@link TagAPI} or you can use one of already created tags. * @param tag {@link Tag.Named} for {@link Block} */ protected void addBlockTag(Tag.Named tag) { @@ -112,7 +113,7 @@ public abstract class ComplexMaterial { } /** - * Adds custom iten tag for this {@link ComplexMaterial}, tag can be created with {@link ru.bclib.api.TagAPI} or you can use one of already created tags. + * Adds custom iten tag for this {@link ComplexMaterial}, tag can be created with {@link TagAPI} or you can use one of already created tags. * @param tag {@link Tag.Named} for {@link Item} */ protected void addItemTag(Tag.Named tag) { diff --git a/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java b/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java index a0c405dc..7d99b3d2 100644 --- a/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java +++ b/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java @@ -10,8 +10,12 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MaterialColor; import ru.bclib.BCLib; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.NamedBlockTags; +import ru.bclib.api.tag.NamedCommonBlockTags; +import ru.bclib.api.tag.NamedCommonItemTags; +import ru.bclib.api.tag.NamedItemTags; +import ru.bclib.api.tag.TagAPI; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.blocks.BaseBarkBlock; import ru.bclib.blocks.BaseBarrelBlock; import ru.bclib.blocks.BaseBlock; @@ -101,85 +105,85 @@ public class WoodenComplexMaterial extends ComplexMaterial { addBlockEntry( new BlockEntry(BLOCK_STRIPPED_LOG, (complexMaterial, settings) -> new BaseRotatedPillarBlock(settings)) - .setBlockTags(TagAPI.NAMED_BLOCK_LOGS, TagAPI.NAMED_BLOCK_LOGS_THAT_BURN, tagBlockLog) - .setItemTags(TagAPI.NAMED_ITEM_LOGS, TagAPI.NAMED_ITEM_LOGS_THAT_BURN, tagItemLog) + .setBlockTags(NamedBlockTags.LOGS, NamedBlockTags.LOGS_THAT_BURN, tagBlockLog) + .setItemTags(NamedItemTags.LOGS, NamedItemTags.LOGS_THAT_BURN, tagItemLog) ); addBlockEntry( new BlockEntry(BLOCK_STRIPPED_BARK, (complexMaterial, settings) -> new BaseBarkBlock(settings)) - .setBlockTags(TagAPI.NAMED_BLOCK_LOGS, TagAPI.NAMED_BLOCK_LOGS_THAT_BURN, tagBlockLog) - .setItemTags(TagAPI.NAMED_ITEM_LOGS, TagAPI.NAMED_ITEM_LOGS_THAT_BURN, tagItemLog) + .setBlockTags(NamedBlockTags.LOGS, NamedBlockTags.LOGS_THAT_BURN, tagBlockLog) + .setItemTags(NamedItemTags.LOGS, NamedItemTags.LOGS_THAT_BURN, tagItemLog) ); addBlockEntry( new BlockEntry(BLOCK_LOG, (complexMaterial, settings) -> new BaseStripableLogBlock(woodColor, getBlock(BLOCK_STRIPPED_LOG))) - .setBlockTags(TagAPI.NAMED_BLOCK_LOGS, TagAPI.NAMED_BLOCK_LOGS_THAT_BURN, tagBlockLog) - .setItemTags(TagAPI.NAMED_ITEM_LOGS, TagAPI.NAMED_ITEM_LOGS_THAT_BURN, tagItemLog) + .setBlockTags(NamedBlockTags.LOGS, NamedBlockTags.LOGS_THAT_BURN, tagBlockLog) + .setItemTags(NamedItemTags.LOGS, NamedItemTags.LOGS_THAT_BURN, tagItemLog) ); addBlockEntry( new BlockEntry(BLOCK_BARK, (complexMaterial, settings) -> new StripableBarkBlock(woodColor, getBlock(BLOCK_STRIPPED_BARK))) - .setBlockTags(TagAPI.NAMED_BLOCK_LOGS, TagAPI.NAMED_BLOCK_LOGS_THAT_BURN, tagBlockLog) - .setItemTags(TagAPI.NAMED_ITEM_LOGS, TagAPI.NAMED_ITEM_LOGS_THAT_BURN, tagItemLog) + .setBlockTags(NamedBlockTags.LOGS, NamedBlockTags.LOGS_THAT_BURN, tagBlockLog) + .setItemTags(NamedItemTags.LOGS, NamedItemTags.LOGS_THAT_BURN, tagItemLog) ); addBlockEntry(new BlockEntry(BLOCK_PLANKS, (complexMaterial, settings) -> new BaseBlock(settings)) - .setBlockTags(TagAPI.NAMED_BLOCK_PLANKS) - .setItemTags(TagAPI.NAMED_ITEM_PLANKS)); + .setBlockTags(NamedBlockTags.PLANKS) + .setItemTags(NamedItemTags.PLANKS)); addBlockEntry(new BlockEntry(BLOCK_STAIRS, (complexMaterial, settings) -> new BaseStairsBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_WOODEN_STAIRS, TagAPI.NAMED_BLOCK_STAIRS) - .setItemTags(TagAPI.NAMED_ITEM_WOODEN_STAIRS, TagAPI.NAMED_ITEM_STAIRS)); + .setBlockTags(NamedBlockTags.WOODEN_STAIRS, NamedBlockTags.STAIRS) + .setItemTags(NamedItemTags.WOODEN_STAIRS, NamedItemTags.STAIRS)); addBlockEntry(new BlockEntry(BLOCK_SLAB, (complexMaterial, settings) -> new BaseSlabBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_WOODEN_SLABS, TagAPI.NAMED_BLOCK_SLABS) - .setItemTags(TagAPI.NAMED_ITEM_WOODEN_SLABS, TagAPI.NAMED_ITEM_SLABS)); + .setBlockTags(NamedBlockTags.WOODEN_SLABS, NamedBlockTags.SLABS) + .setItemTags(NamedItemTags.WOODEN_SLABS, NamedItemTags.SLABS)); addBlockEntry(new BlockEntry(BLOCK_FENCE, (complexMaterial, settings) -> new BaseFenceBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_FENCES, TagAPI.NAMED_BLOCK_WOODEN_FENCES) - .setItemTags(TagAPI.NAMED_ITEM_FENCES, TagAPI.NAMED_ITEM_WOODEN_FENCES)); + .setBlockTags(NamedBlockTags.FENCES, NamedBlockTags.WOODEN_FENCES) + .setItemTags(NamedItemTags.FENCES, NamedItemTags.WOODEN_FENCES)); addBlockEntry(new BlockEntry(BLOCK_GATE, (complexMaterial, settings) -> new BaseGateBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_FENCE_GATES)); + .setBlockTags(NamedBlockTags.FENCE_GATES)); addBlockEntry(new BlockEntry(BLOCK_BUTTON, (complexMaterial, settings) -> new BaseWoodenButtonBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_BUTTONS, TagAPI.NAMED_BLOCK_WOODEN_BUTTONS) - .setItemTags(TagAPI.NAMED_ITEM_BUTTONS, TagAPI.NAMED_ITEM_WOODEN_BUTTONS)); + .setBlockTags(NamedBlockTags.BUTTONS, NamedBlockTags.WOODEN_BUTTONS) + .setItemTags(NamedItemTags.BUTTONS, NamedItemTags.WOODEN_BUTTONS)); addBlockEntry(new BlockEntry(BLOCK_PRESSURE_PLATE, (complexMaterial, settings) -> new WoodenPressurePlateBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_PRESSURE_PLATES, TagAPI.NAMED_BLOCK_WOODEN_PRESSURE_PLATES) - .setItemTags(TagAPI.NAMED_ITEM_WOODEN_PRESSURE_PLATES)); + .setBlockTags(NamedBlockTags.PRESSURE_PLATES, NamedBlockTags.WOODEN_PRESSURE_PLATES) + .setItemTags(NamedItemTags.WOODEN_PRESSURE_PLATES)); addBlockEntry(new BlockEntry(BLOCK_TRAPDOOR, (complexMaterial, settings) -> new BaseTrapdoorBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_TRAPDOORS, TagAPI.NAMED_BLOCK_WOODEN_TRAPDOORS) - .setItemTags(TagAPI.NAMED_ITEM_TRAPDOORS, TagAPI.NAMED_ITEM_WOODEN_TRAPDOORS)); + .setBlockTags(NamedBlockTags.TRAPDOORS, NamedBlockTags.WOODEN_TRAPDOORS) + .setItemTags(NamedItemTags.TRAPDOORS, NamedItemTags.WOODEN_TRAPDOORS)); addBlockEntry(new BlockEntry(BLOCK_DOOR, (complexMaterial, settings) -> new BaseDoorBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_DOORS, TagAPI.NAMED_BLOCK_WOODEN_DOORS) - .setItemTags(TagAPI.NAMED_ITEM_DOORS, TagAPI.NAMED_ITEM_WOODEN_DOORS)); + .setBlockTags(NamedBlockTags.DOORS, NamedBlockTags.WOODEN_DOORS) + .setItemTags(NamedItemTags.DOORS, NamedItemTags.WOODEN_DOORS)); addBlockEntry(new BlockEntry(BLOCK_LADDER, (complexMaterial, settings) -> new BaseLadderBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_CLIMBABLE)); + .setBlockTags(NamedBlockTags.CLIMBABLE)); addBlockEntry(new BlockEntry(BLOCK_SIGN, (complexMaterial, settings) -> new BaseSignBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_BLOCK_SIGNS) - .setItemTags(TagAPI.NAMED_ITEM_SIGNS)); + .setBlockTags(NamedBlockTags.SIGNS) + .setItemTags(NamedItemTags.SIGNS)); } final protected void initStorage(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) { addBlockEntry(new BlockEntry(BLOCK_CHEST, (complexMaterial, settings) -> new BaseChestBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_COMMON_BLOCK_CHEST, TagAPI.NAMED_COMMON_BLOCK_WOODEN_CHEST) - .setItemTags(TagAPI.NAMED_COMMON_ITEM_CHEST, TagAPI.NAMED_COMMON_ITEM_WOODEN_CHEST)); + .setBlockTags(NamedCommonBlockTags.CHEST, NamedCommonBlockTags.WOODEN_CHEST) + .setItemTags(NamedCommonItemTags.CHEST, NamedCommonItemTags.WOODEN_CHEST)); addBlockEntry(new BlockEntry(BLOCK_BARREL, (complexMaterial, settings) -> new BaseBarrelBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_COMMON_BLOCK_BARREL, TagAPI.NAMED_COMMON_BLOCK_WOODEN_BARREL) - .setItemTags(TagAPI.NAMED_COMMON_ITEM_BARREL, TagAPI.NAMED_COMMON_ITEM_WOODEN_BARREL)); + .setBlockTags(NamedCommonBlockTags.BARREL, NamedCommonBlockTags.WOODEN_BARREL) + .setItemTags(NamedCommonItemTags.BARREL, NamedCommonItemTags.WOODEN_BARREL)); } final protected void initDecorations(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) { addBlockEntry(new BlockEntry(BLOCK_CRAFTING_TABLE, (complexMaterial, settings) -> new BaseCraftingTableBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_COMMON_BLOCK_WORKBENCHES) - .setItemTags(TagAPI.NAMED_COMMON_ITEM_WORKBENCHES)); + .setBlockTags(NamedCommonBlockTags.WORKBENCHES) + .setItemTags(NamedCommonItemTags.WORKBENCHES)); addBlockEntry(new BlockEntry(BLOCK_BOOKSHELF, (complexMaterial, settings) -> new BaseBookshelfBlock(getBlock(BLOCK_PLANKS))) - .setBlockTags(TagAPI.NAMED_COMMON_BLOCK_BOOKSHELVES)); + .setBlockTags(NamedCommonBlockTags.BOOKSHELVES)); addBlockEntry(new BlockEntry(BLOCK_COMPOSTER, (complexMaterial, settings) -> new BaseComposterBlock(getBlock(BLOCK_PLANKS)))); } diff --git a/src/main/java/ru/bclib/complexmaterials/entry/BlockEntry.java b/src/main/java/ru/bclib/complexmaterials/entry/BlockEntry.java index 7cf1e105..e168ab3f 100644 --- a/src/main/java/ru/bclib/complexmaterials/entry/BlockEntry.java +++ b/src/main/java/ru/bclib/complexmaterials/entry/BlockEntry.java @@ -4,8 +4,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.TagAPI; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.complexmaterials.ComplexMaterial; import ru.bclib.registry.BlockRegistry; diff --git a/src/main/java/ru/bclib/complexmaterials/entry/ItemEntry.java b/src/main/java/ru/bclib/complexmaterials/entry/ItemEntry.java index 83b63b5c..e5beff4e 100644 --- a/src/main/java/ru/bclib/complexmaterials/entry/ItemEntry.java +++ b/src/main/java/ru/bclib/complexmaterials/entry/ItemEntry.java @@ -3,8 +3,8 @@ package ru.bclib.complexmaterials.entry; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import ru.bclib.api.TagAPI; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.TagAPI; +import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.complexmaterials.ComplexMaterial; import ru.bclib.registry.ItemRegistry; diff --git a/src/main/java/ru/bclib/interfaces/TagProvider.java b/src/main/java/ru/bclib/interfaces/TagProvider.java index 19cb8380..24d38380 100644 --- a/src/main/java/ru/bclib/interfaces/TagProvider.java +++ b/src/main/java/ru/bclib/interfaces/TagProvider.java @@ -2,7 +2,7 @@ package ru.bclib.interfaces; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import ru.bclib.api.TagAPI.TagLocation; +import ru.bclib.api.tag.TagAPI.TagLocation; import java.util.List; diff --git a/src/main/java/ru/bclib/items/tool/BaseShearsItem.java b/src/main/java/ru/bclib/items/tool/BaseShearsItem.java index aedc9c19..002b46bf 100644 --- a/src/main/java/ru/bclib/items/tool/BaseShearsItem.java +++ b/src/main/java/ru/bclib/items/tool/BaseShearsItem.java @@ -5,7 +5,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.ShearsItem; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonItemTags; public class BaseShearsItem extends ShearsItem { public BaseShearsItem(Properties properties) { @@ -13,12 +13,12 @@ public class BaseShearsItem extends ShearsItem { } public static boolean isShear(ItemStack tool){ - return tool.is(Items.SHEARS) | tool.is(TagAPI.COMMON_ITEM_SHEARS) || tool.is(FabricToolTags.SHEARS); + return tool.is(Items.SHEARS) | tool.is(CommonItemTags.SHEARS) || tool.is(FabricToolTags.SHEARS); } public static boolean isShear(ItemStack itemStack, Item item){ if (item == Items.SHEARS){ - return itemStack.is(item) | itemStack.is(TagAPI.COMMON_ITEM_SHEARS) || itemStack.is(FabricToolTags.SHEARS); + return itemStack.is(item) | itemStack.is(CommonItemTags.SHEARS) || itemStack.is(FabricToolTags.SHEARS); } else { return itemStack.is(item); } diff --git a/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java b/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java index ba00620e..3b6d8fad 100644 --- a/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java +++ b/src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.state.BlockState; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonBlockTags; @Mixin(EnchantmentTableBlock.class) public abstract class EnchantingTableBlockMixin extends Block { @@ -20,6 +20,6 @@ public abstract class EnchantingTableBlockMixin extends Block { target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z")//, ) private boolean bclib_isBookshelf(BlockState state, Block block) { - return block == Blocks.BOOKSHELF ? state.is(TagAPI.COMMON_BLOCK_BOOKSHELVES) : state.is(block); + return block == Blocks.BOOKSHELF ? state.is(CommonBlockTags.BOOKSHELVES) : state.is(block); } } diff --git a/src/main/java/ru/bclib/mixin/common/CraftingMenuMixin.java b/src/main/java/ru/bclib/mixin/common/CraftingMenuMixin.java index a71468f9..e07bcfcd 100644 --- a/src/main/java/ru/bclib/mixin/common/CraftingMenuMixin.java +++ b/src/main/java/ru/bclib/mixin/common/CraftingMenuMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonBlockTags; @Mixin(CraftingMenu.class) public abstract class CraftingMenuMixin { @@ -23,7 +23,7 @@ public abstract class CraftingMenuMixin { private void bclib_stillValid(Player player, CallbackInfoReturnable info) { if (access.evaluate((world, pos) -> { BlockState state = world.getBlockState(pos); - return state.getBlock() instanceof CraftingTableBlock || state.is(TagAPI.COMMON_BLOCK_WORKBENCHES); + return state.getBlock() instanceof CraftingTableBlock || state.is(CommonBlockTags.WORKBENCHES); }, true)) { info.setReturnValue(true); } diff --git a/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java b/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java index 1386ca45..75ac69b6 100644 --- a/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java +++ b/src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java @@ -9,7 +9,7 @@ import net.minecraft.world.level.block.state.BlockState; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonBlockTags; @Mixin(EnchantmentMenu.class) public abstract class EnchantmentMenuMixin extends AbstractContainerMenu { @@ -22,6 +22,6 @@ public abstract class EnchantmentMenuMixin extends AbstractContainerMenu { target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z")//, ) private boolean bclib_isBookshelf(BlockState state, Block block) { - return block == Blocks.BOOKSHELF ? state.is(TagAPI.COMMON_BLOCK_BOOKSHELVES) : state.is(block); + return block == Blocks.BOOKSHELF ? state.is(CommonBlockTags.BOOKSHELVES) : state.is(block); } } diff --git a/src/main/java/ru/bclib/mixin/common/PistonBaseBlockMixin.java b/src/main/java/ru/bclib/mixin/common/PistonBaseBlockMixin.java index ffe03b63..046557ce 100644 --- a/src/main/java/ru/bclib/mixin/common/PistonBaseBlockMixin.java +++ b/src/main/java/ru/bclib/mixin/common/PistonBaseBlockMixin.java @@ -9,13 +9,13 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonBlockTags; @Mixin(PistonBaseBlock.class) public class PistonBaseBlockMixin { @Inject(method="isPushable", at=@At("HEAD"), cancellable = true) private static void bclib_isPushable(BlockState blockState, Level level, BlockPos blockPos, Direction direction, boolean bl, Direction direction2, CallbackInfoReturnable cir){ - if (blockState.is(TagAPI.COMMON_BLOCK_IMMOBILE)){ + if (blockState.is(CommonBlockTags.IMMOBILE)){ cir.setReturnValue(false); cir.cancel(); } diff --git a/src/main/java/ru/bclib/mixin/common/PortalShapeMixin.java b/src/main/java/ru/bclib/mixin/common/PortalShapeMixin.java index 47f6bf0d..c9ba4e48 100644 --- a/src/main/java/ru/bclib/mixin/common/PortalShapeMixin.java +++ b/src/main/java/ru/bclib/mixin/common/PortalShapeMixin.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.portal.PortalShape; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonBlockTags; @Mixin(PortalShape.class) public class PortalShapeMixin { @@ -28,6 +28,6 @@ public class PortalShapeMixin { } private static boolean be_FRAME(StatePredicate FRAME, BlockState state, BlockGetter getter, BlockPos pos){ - return state.is(TagAPI.COMMON_BLOCK_NETHER_PORTAL_FRAME) || FRAME.test(state, getter, pos); + return state.is(CommonBlockTags.NETHER_PORTAL_FRAME) || FRAME.test(state, getter, pos); } } diff --git a/src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java b/src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java index 4d89c067..a5fd7f45 100644 --- a/src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java +++ b/src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.TagAPI; import java.util.Map; diff --git a/src/main/java/ru/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java b/src/main/java/ru/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java index 2e10fa3a..566f6ed0 100644 --- a/src/main/java/ru/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java +++ b/src/main/java/ru/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonItemTags; import java.util.Set; @@ -24,7 +24,7 @@ public abstract class ItemPredicateBuilderMixin { @Inject(method = "matches", at = @At("HEAD"), cancellable = true) void bclib_of(ItemStack itemStack, CallbackInfoReturnable cir) { if (this.items != null && this.items.size() == 1 && this.items.contains(Items.SHEARS)) { - if (itemStack.is(TagAPI.COMMON_ITEM_SHEARS) || itemStack.is(FabricToolTags.SHEARS)){ + if (itemStack.is(CommonItemTags.SHEARS) || itemStack.is(FabricToolTags.SHEARS)){ cir.setReturnValue(true); } } diff --git a/src/main/java/ru/bclib/recipes/AnvilRecipe.java b/src/main/java/ru/bclib/recipes/AnvilRecipe.java index dbd18769..28343417 100644 --- a/src/main/java/ru/bclib/recipes/AnvilRecipe.java +++ b/src/main/java/ru/bclib/recipes/AnvilRecipe.java @@ -24,7 +24,7 @@ import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; import ru.bclib.BCLib; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonItemTags; import ru.bclib.config.PathConfig; import ru.bclib.interfaces.UnknownReceipBookCategory; import ru.bclib.util.ItemUtil; @@ -116,7 +116,7 @@ public class AnvilRecipe implements Recipe, UnknownReceipBookCategory public boolean matches(Container craftingInventory) { ItemStack hammer = craftingInventory.getItem(1); - if (hammer.isEmpty() || !TagAPI.COMMON_ITEM_HAMMERS.contains(hammer.getItem())) { + if (hammer.isEmpty() || !CommonItemTags.HAMMERS.contains(hammer.getItem())) { return false; } ItemStack material = craftingInventory.getItem(0); @@ -140,7 +140,7 @@ public class AnvilRecipe implements Recipe, UnknownReceipBookCategory @Override public NonNullList getIngredients() { NonNullList defaultedList = NonNullList.create(); - defaultedList.add(Ingredient.of(TagAPI.COMMON_ITEM_HAMMERS + defaultedList.add(Ingredient.of(CommonItemTags.HAMMERS .getValues() .stream() .filter(hammer -> ((TieredItem) hammer).getTier().getLevel() >= toolLevel) diff --git a/src/main/java/ru/bclib/recipes/CraftingRecipes.java b/src/main/java/ru/bclib/recipes/CraftingRecipes.java index 73b92f23..adfb59ae 100644 --- a/src/main/java/ru/bclib/recipes/CraftingRecipes.java +++ b/src/main/java/ru/bclib/recipes/CraftingRecipes.java @@ -4,7 +4,7 @@ import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import ru.bclib.BCLib; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonItemTags; import ru.bclib.config.Configs; public class CraftingRecipes { @@ -12,23 +12,23 @@ public class CraftingRecipes { GridRecipe.make(BCLib.MOD_ID, "tag_smith_table", Blocks.SMITHING_TABLE) .setShape("II", "##", "##") .addMaterial('#', ItemTags.PLANKS) - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_cauldron", Blocks.CAULDRON) .setShape("I I", "I I", "III") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_hopper", Blocks.HOPPER) .setShape("I I", "ICI", " I ") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) - .addMaterial('C', TagAPI.COMMON_ITEM_CHEST) + .addMaterial('I', CommonItemTags.IRON_INGOTS) + .addMaterial('C', CommonItemTags.CHEST) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_piston", Blocks.PISTON) .setShape("WWW", "CIC", "CDC") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .addMaterial('D', Items.REDSTONE) .addMaterial('C', Items.COBBLESTONE) .addMaterial('W', ItemTags.PLANKS) @@ -37,50 +37,50 @@ public class CraftingRecipes { GridRecipe.make(BCLib.MOD_ID, "tag_rail", Blocks.RAIL) .setOutputCount(16) .setShape("I I", "ISI", "I I") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .addMaterial('S', Items.STICK) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_stonecutter", Blocks.STONECUTTER) .setShape(" I ", "SSS") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .addMaterial('S', Items.STONE) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_bucket", Items.BUCKET) .setShape("I I", " I ") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_compass", Items.COMPASS) .setShape(" I ", "IDI", " I ") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .addMaterial('D', Items.REDSTONE) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_minecart", Items.MINECART) .setShape("I I", "III") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_shield", Items.SHIELD) .setShape("WIW", "WWW", " W ") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) + .addMaterial('I', CommonItemTags.IRON_INGOTS) .addMaterial('W', ItemTags.PLANKS) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_hopper", Blocks.HOPPER) .setShape("I I", "ICI", " I ") - .addMaterial('I', TagAPI.COMMON_ITEM_IRON_INGOTS) - .addMaterial('C', TagAPI.COMMON_ITEM_CHEST) + .addMaterial('I', CommonItemTags.IRON_INGOTS) + .addMaterial('C', CommonItemTags.CHEST) .checkConfig(Configs.RECIPE_CONFIG) .build(); GridRecipe.make(BCLib.MOD_ID, "tag_shulker_box", Blocks.SHULKER_BOX) .setShape("S", "C", "S") .addMaterial('S', Items.SHULKER_SHELL) - .addMaterial('C', TagAPI.COMMON_ITEM_CHEST) + .addMaterial('C', CommonItemTags.CHEST) .checkConfig(Configs.RECIPE_CONFIG) .build(); } diff --git a/src/main/java/ru/bclib/registry/BlockRegistry.java b/src/main/java/ru/bclib/registry/BlockRegistry.java index 6e64bdd6..a349a046 100644 --- a/src/main/java/ru/bclib/registry/BlockRegistry.java +++ b/src/main/java/ru/bclib/registry/BlockRegistry.java @@ -8,7 +8,12 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.NamedBlockTags; +import ru.bclib.api.tag.NamedCommonBlockTags; +import ru.bclib.api.tag.NamedCommonItemTags; +import ru.bclib.api.tag.NamedItemTags; +import ru.bclib.api.tag.NamedMineableTags; +import ru.bclib.api.tag.TagAPI; import ru.bclib.blocks.BaseLeavesBlock; import ru.bclib.blocks.BaseOreBlock; import ru.bclib.blocks.FeatureSaplingBlock; @@ -44,20 +49,20 @@ public class BlockRegistry extends BaseRegistry { if (block instanceof BaseLeavesBlock){ TagAPI.addBlockTags( block, - TagAPI.NAMED_BLOCK_LEAVES, - TagAPI.NAMED_COMMON_BLOCK_LEAVES, - TagAPI.NAMED_MINEABLE_HOE, - TagAPI.NAMED_MINEABLE_SHEARS + NamedBlockTags.LEAVES, + NamedCommonBlockTags.LEAVES, + NamedMineableTags.HOE, + NamedMineableTags.SHEARS ); if (item != null){ - TagAPI.addItemTags(item, TagAPI.NAMED_COMMON_ITEM_LEAVES, TagAPI.NAMED_ITEM_LEAVES); + TagAPI.addItemTags(item, NamedCommonItemTags.LEAVES, NamedItemTags.LEAVES); } } else if (block instanceof BaseOreBlock){ - TagAPI.addBlockTags(block, TagAPI.NAMED_MINEABLE_PICKAXE); + TagAPI.addBlockTags(block, NamedMineableTags.PICKAXE); } else if (block instanceof FeatureSaplingBlock){ - TagAPI.addBlockTags(block, TagAPI.NAMED_COMMON_BLOCK_SAPLINGS, TagAPI.NAMED_BLOCK_SAPLINGS); + TagAPI.addBlockTags(block, NamedCommonBlockTags.SAPLINGS, NamedBlockTags.SAPLINGS); if (item != null){ - TagAPI.addItemTags(item, TagAPI.NAMED_COMMON_ITEM_SAPLINGS, TagAPI.NAMED_ITEM_SAPLINGS); + TagAPI.addItemTags(item, NamedCommonItemTags.SAPLINGS, NamedItemTags.SAPLINGS); } } diff --git a/src/main/java/ru/bclib/registry/ItemRegistry.java b/src/main/java/ru/bclib/registry/ItemRegistry.java index 43c9554b..5d46ca92 100644 --- a/src/main/java/ru/bclib/registry/ItemRegistry.java +++ b/src/main/java/ru/bclib/registry/ItemRegistry.java @@ -20,7 +20,9 @@ import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.SpawnEggItem; import net.minecraft.world.item.SwordItem; import net.minecraft.world.level.block.DispenserBlock; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.NamedCommonItemTags; +import ru.bclib.api.tag.NamedToolTags; +import ru.bclib.api.tag.TagAPI; import ru.bclib.config.PathConfig; import ru.bclib.items.BaseDiscItem; import ru.bclib.items.BaseDrinkItem; @@ -69,22 +71,22 @@ public class ItemRegistry extends BaseRegistry { registerItem(itemId, item); if (item instanceof ShovelItem) { - TagAPI.addItemTag(TagAPI.NAMED_FABRIC_SHOVELS, item); + TagAPI.addItemTag(NamedToolTags.FABRIC_SHOVELS, item); } else if (item instanceof SwordItem) { - TagAPI.addItemTag(TagAPI.NAMED_FABRIC_SWORDS, item); + TagAPI.addItemTag(NamedToolTags.FABRIC_SWORDS, item); } else if (item instanceof BasePickaxeItem) { - TagAPI.addItemTag(TagAPI.NAMED_FABRIC_PICKAXES, item); + TagAPI.addItemTag(NamedToolTags.FABRIC_PICKAXES, item); } else if (item instanceof BaseAxeItem) { - TagAPI.addItemTag(TagAPI.NAMED_FABRIC_AXES, item); + TagAPI.addItemTag(NamedToolTags.FABRIC_AXES, item); } else if (item instanceof BaseHoeItem) { - TagAPI.addItemTag(TagAPI.NAMED_FABRIC_HOES, item); + TagAPI.addItemTag(NamedToolTags.FABRIC_HOES, item); } else if (item instanceof BaseShearsItem) { - TagAPI.addItemTags(item, TagAPI.NAMED_FABRIC_SHEARS, TagAPI.NAMED_COMMON_ITEM_SHEARS); + TagAPI.addItemTags(item, NamedToolTags.FABRIC_SHEARS, NamedCommonItemTags.SHEARS); DispenserBlock.registerBehavior(item.asItem(), new ShearsDispenseItemBehavior()); } diff --git a/src/main/java/ru/bclib/world/features/NBTStructureFeature.java b/src/main/java/ru/bclib/world/features/NBTStructureFeature.java index 8f1d6590..35b645dc 100644 --- a/src/main/java/ru/bclib/world/features/NBTStructureFeature.java +++ b/src/main/java/ru/bclib/world/features/NBTStructureFeature.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; -import ru.bclib.api.TagAPI; +import ru.bclib.api.tag.CommonBlockTags; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.util.BlocksHelper; import ru.bclib.world.processors.DestructionStructureProcessor; @@ -180,7 +180,7 @@ public abstract class NBTStructureFeature extends DefaultFeature { } private boolean isTerrain(BlockState state) { - return state.is(TagAPI.COMMON_BLOCK_END_STONES) || state.is(TagAPI.COMMON_BLOCK_NETHER_STONES); + return state.is(CommonBlockTags.END_STONES) || state.is(CommonBlockTags.NETHER_STONES); } protected BoundingBox makeBox(BlockPos pos) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 420a79b0..3dec1004 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "bclib", - "version": "${version}", + "version": "1.3.0", "name": "BCLib", "description": "A library for BetterX team mods", "authors": [