diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java index a6bf3d44..ae106d33 100644 --- a/src/main/java/org/betterx/bclib/BCLib.java +++ b/src/main/java/org/betterx/bclib/BCLib.java @@ -18,7 +18,7 @@ import org.betterx.bclib.registry.BaseBlockEntities; import org.betterx.bclib.registry.BaseRegistry; import org.betterx.bclib.util.Logger; import org.betterx.worlds.together.WorldsTogether; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java b/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java index f0395939..36b49f43 100644 --- a/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java @@ -15,8 +15,8 @@ import org.betterx.bclib.interfaces.RenderLayerProvider; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.bclib.interfaces.tools.*; import org.betterx.bclib.registry.BaseBlockEntities; -import org.betterx.worlds.together.tag.MineableTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.MineableTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Registry; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java index 348fec3f..cabbcdc7 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java @@ -3,7 +3,7 @@ package org.betterx.bclib.api.v2.levelgen.biomes; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleUtil; import org.betterx.bclib.util.WeightedList; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.data.BuiltinRegistries; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java index e4ed72e4..61a50879 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java @@ -6,8 +6,8 @@ import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.bclib.mixin.common.BiomeGenerationSettingsAccessor; import org.betterx.bclib.mixin.common.MobSpawnSettingsAccessor; import org.betterx.bclib.util.CollectionsUtil; -import org.betterx.worlds.together.tag.CommonBiomeTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.CommonBiomeTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java index 5af7a9ca..8c20faea 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java @@ -1,7 +1,7 @@ package org.betterx.bclib.api.v2.levelgen.features; import org.betterx.bclib.api.v2.levelgen.features.placement.*; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java index 6226a200..130523f4 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java @@ -1,6 +1,6 @@ package org.betterx.bclib.api.v2.levelgen.structures; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import com.mojang.serialization.Codec; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java index fe25bc43..df8402d5 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java @@ -4,13 +4,13 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBiomeTags} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBiomeTags} */ @Deprecated(forRemoval = true) public class CommonBiomeTags { /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBiomeTags#IN_NETHER} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBiomeTags#IN_NETHER} **/ @Deprecated(forRemoval = true) - public static final TagKey IN_NETHER = org.betterx.worlds.together.tag.CommonBiomeTags.IN_NETHER; + public static final TagKey IN_NETHER = org.betterx.worlds.together.tag.v3.CommonBiomeTags.IN_NETHER; } diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java index c8fd346d..38d1d7cf 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java @@ -4,128 +4,128 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags} */ @Deprecated(forRemoval = true) public class CommonBlockTags { /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#BARREL} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#BARREL} **/ @Deprecated(forRemoval = true) - public static final TagKey BARREL = org.betterx.worlds.together.tag.CommonBlockTags.BARREL; + public static final TagKey BARREL = org.betterx.worlds.together.tag.v3.CommonBlockTags.BARREL; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#BOOKSHELVES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#BOOKSHELVES} **/ @Deprecated(forRemoval = true) - public static final TagKey BOOKSHELVES = org.betterx.worlds.together.tag.CommonBlockTags.BOOKSHELVES; + public static final TagKey BOOKSHELVES = org.betterx.worlds.together.tag.v3.CommonBlockTags.BOOKSHELVES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#CHEST} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#CHEST} **/ @Deprecated(forRemoval = true) - public static final TagKey CHEST = org.betterx.worlds.together.tag.CommonBlockTags.CHEST; + public static final TagKey CHEST = org.betterx.worlds.together.tag.v3.CommonBlockTags.CHEST; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#END_STONES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#END_STONES} **/ @Deprecated(forRemoval = true) - public static final TagKey END_STONES = org.betterx.worlds.together.tag.CommonBlockTags.END_STONES; + public static final TagKey END_STONES = org.betterx.worlds.together.tag.v3.CommonBlockTags.END_STONES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#GEN_END_STONES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#GEN_END_STONES} **/ @Deprecated(forRemoval = true) - public static final TagKey GEN_END_STONES = org.betterx.worlds.together.tag.CommonBlockTags.GEN_END_STONES; + public static final TagKey GEN_END_STONES = org.betterx.worlds.together.tag.v3.CommonBlockTags.GEN_END_STONES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#IMMOBILE} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#IMMOBILE} **/ @Deprecated(forRemoval = true) - public static final TagKey IMMOBILE = org.betterx.worlds.together.tag.CommonBlockTags.IMMOBILE; + public static final TagKey IMMOBILE = org.betterx.worlds.together.tag.v3.CommonBlockTags.IMMOBILE; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#LEAVES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#LEAVES} **/ @Deprecated(forRemoval = true) - public static final TagKey LEAVES = org.betterx.worlds.together.tag.CommonBlockTags.LEAVES; + public static final TagKey LEAVES = org.betterx.worlds.together.tag.v3.CommonBlockTags.LEAVES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#NETHERRACK} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#NETHERRACK} **/ @Deprecated(forRemoval = true) - public static final TagKey NETHERRACK = org.betterx.worlds.together.tag.CommonBlockTags.NETHERRACK; + public static final TagKey NETHERRACK = org.betterx.worlds.together.tag.v3.CommonBlockTags.NETHERRACK; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#MYCELIUM} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#MYCELIUM} **/ @Deprecated(forRemoval = true) - public static final TagKey MYCELIUM = org.betterx.worlds.together.tag.CommonBlockTags.MYCELIUM; + public static final TagKey MYCELIUM = org.betterx.worlds.together.tag.v3.CommonBlockTags.MYCELIUM; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#NETHER_MYCELIUM} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#NETHER_MYCELIUM} **/ @Deprecated(forRemoval = true) - public static final TagKey NETHER_MYCELIUM = org.betterx.worlds.together.tag.CommonBlockTags.NETHER_MYCELIUM; + public static final TagKey NETHER_MYCELIUM = org.betterx.worlds.together.tag.v3.CommonBlockTags.NETHER_MYCELIUM; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#NETHER_PORTAL_FRAME} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#NETHER_PORTAL_FRAME} **/ @Deprecated(forRemoval = true) - public static final TagKey NETHER_PORTAL_FRAME = org.betterx.worlds.together.tag.CommonBlockTags.NETHER_PORTAL_FRAME; + public static final TagKey NETHER_PORTAL_FRAME = org.betterx.worlds.together.tag.v3.CommonBlockTags.NETHER_PORTAL_FRAME; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#NETHER_STONES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#NETHER_STONES} **/ @Deprecated(forRemoval = true) - public static final TagKey NETHER_STONES = org.betterx.worlds.together.tag.CommonBlockTags.NETHER_STONES; + public static final TagKey NETHER_STONES = org.betterx.worlds.together.tag.v3.CommonBlockTags.NETHER_STONES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#NETHER_ORES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#NETHER_ORES} **/ @Deprecated(forRemoval = true) - public static final TagKey NETHER_ORES = org.betterx.worlds.together.tag.CommonBlockTags.NETHER_ORES; + public static final TagKey NETHER_ORES = org.betterx.worlds.together.tag.v3.CommonBlockTags.NETHER_ORES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#END_ORES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#END_ORES} **/ @Deprecated(forRemoval = true) - public static final TagKey END_ORES = org.betterx.worlds.together.tag.CommonBlockTags.END_ORES; + public static final TagKey END_ORES = org.betterx.worlds.together.tag.v3.CommonBlockTags.END_ORES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#SAPLINGS} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#SAPLINGS} **/ @Deprecated(forRemoval = true) - public static final TagKey SAPLINGS = org.betterx.worlds.together.tag.CommonBlockTags.SAPLINGS; + public static final TagKey SAPLINGS = org.betterx.worlds.together.tag.v3.CommonBlockTags.SAPLINGS; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#SOUL_GROUND} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#SOUL_GROUND} **/ @Deprecated(forRemoval = true) - public static final TagKey SOUL_GROUND = org.betterx.worlds.together.tag.CommonBlockTags.SOUL_GROUND; + public static final TagKey SOUL_GROUND = org.betterx.worlds.together.tag.v3.CommonBlockTags.SOUL_GROUND; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#WOODEN_BARREL} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#WOODEN_BARREL} **/ @Deprecated(forRemoval = true) - public static final TagKey WOODEN_BARREL = org.betterx.worlds.together.tag.CommonBlockTags.WOODEN_BARREL; + public static final TagKey WOODEN_BARREL = org.betterx.worlds.together.tag.v3.CommonBlockTags.WOODEN_BARREL; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#WOODEN_CHEST} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#WOODEN_CHEST} **/ @Deprecated(forRemoval = true) - public static final TagKey WOODEN_CHEST = org.betterx.worlds.together.tag.CommonBlockTags.WOODEN_CHEST; + public static final TagKey WOODEN_CHEST = org.betterx.worlds.together.tag.v3.CommonBlockTags.WOODEN_CHEST; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#WORKBENCHES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#WORKBENCHES} **/ @Deprecated(forRemoval = true) - public static final TagKey WORKBENCHES = org.betterx.worlds.together.tag.CommonBlockTags.WORKBENCHES; + public static final TagKey WORKBENCHES = org.betterx.worlds.together.tag.v3.CommonBlockTags.WORKBENCHES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#DRAGON_IMMUNE} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#DRAGON_IMMUNE} **/ @Deprecated(forRemoval = true) - public static final TagKey DRAGON_IMMUNE = org.betterx.worlds.together.tag.CommonBlockTags.DRAGON_IMMUNE; + public static final TagKey DRAGON_IMMUNE = org.betterx.worlds.together.tag.v3.CommonBlockTags.DRAGON_IMMUNE; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#MINABLE_WITH_HAMMER} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#MINABLE_WITH_HAMMER} **/ @Deprecated(forRemoval = true) - public static final TagKey MINABLE_WITH_HAMMER = org.betterx.worlds.together.tag.CommonBlockTags.MINABLE_WITH_HAMMER; + public static final TagKey MINABLE_WITH_HAMMER = org.betterx.worlds.together.tag.v3.CommonBlockTags.MINABLE_WITH_HAMMER; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#IS_OBSIDIAN} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#IS_OBSIDIAN} **/ @Deprecated(forRemoval = true) - public static final TagKey IS_OBSIDIAN = org.betterx.worlds.together.tag.CommonBlockTags.IS_OBSIDIAN; + public static final TagKey IS_OBSIDIAN = org.betterx.worlds.together.tag.v3.CommonBlockTags.IS_OBSIDIAN; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#TERRAIN} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#TERRAIN} **/ @Deprecated(forRemoval = true) - public static final TagKey TERRAIN = org.betterx.worlds.together.tag.CommonBlockTags.TERRAIN; + public static final TagKey TERRAIN = org.betterx.worlds.together.tag.v3.CommonBlockTags.TERRAIN; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonBlockTags#NETHER_TERRAIN} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonBlockTags#NETHER_TERRAIN} **/ @Deprecated(forRemoval = true) - public static final TagKey NETHER_TERRAIN = org.betterx.worlds.together.tag.CommonBlockTags.NETHER_TERRAIN; + public static final TagKey NETHER_TERRAIN = org.betterx.worlds.together.tag.v3.CommonBlockTags.NETHER_TERRAIN; } diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java index 47c4a516..543c7fd9 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java @@ -4,70 +4,70 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags} */ @Deprecated(forRemoval = true) public class CommonItemTags { /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#HAMMERS} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#HAMMERS} **/ @Deprecated(forRemoval = true) - public final static TagKey HAMMERS = org.betterx.worlds.together.tag.CommonItemTags.HAMMERS; + public final static TagKey HAMMERS = org.betterx.worlds.together.tag.v3.CommonItemTags.HAMMERS; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#BARREL} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#BARREL} **/ @Deprecated(forRemoval = true) - public static final TagKey BARREL = org.betterx.worlds.together.tag.CommonItemTags.BARREL; + public static final TagKey BARREL = org.betterx.worlds.together.tag.v3.CommonItemTags.BARREL; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#CHEST} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#CHEST} **/ @Deprecated(forRemoval = true) - public static final TagKey CHEST = org.betterx.worlds.together.tag.CommonItemTags.CHEST; + public static final TagKey CHEST = org.betterx.worlds.together.tag.v3.CommonItemTags.CHEST; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#SHEARS} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#SHEARS} **/ @Deprecated(forRemoval = true) - public static final TagKey SHEARS = org.betterx.worlds.together.tag.CommonItemTags.SHEARS; + public static final TagKey SHEARS = org.betterx.worlds.together.tag.v3.CommonItemTags.SHEARS; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#FURNACES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#FURNACES} **/ @Deprecated(forRemoval = true) - public static final TagKey FURNACES = org.betterx.worlds.together.tag.CommonItemTags.FURNACES; + public static final TagKey FURNACES = org.betterx.worlds.together.tag.v3.CommonItemTags.FURNACES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#IRON_INGOTS} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#IRON_INGOTS} **/ @Deprecated(forRemoval = true) - public static final TagKey IRON_INGOTS = org.betterx.worlds.together.tag.CommonItemTags.IRON_INGOTS; + public static final TagKey IRON_INGOTS = org.betterx.worlds.together.tag.v3.CommonItemTags.IRON_INGOTS; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#LEAVES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#LEAVES} **/ @Deprecated(forRemoval = true) - public static final TagKey LEAVES = org.betterx.worlds.together.tag.CommonItemTags.LEAVES; + public static final TagKey LEAVES = org.betterx.worlds.together.tag.v3.CommonItemTags.LEAVES; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#SAPLINGS} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#SAPLINGS} **/ @Deprecated(forRemoval = true) - public static final TagKey SAPLINGS = org.betterx.worlds.together.tag.CommonItemTags.SAPLINGS; + public static final TagKey SAPLINGS = org.betterx.worlds.together.tag.v3.CommonItemTags.SAPLINGS; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#SOUL_GROUND} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#SOUL_GROUND} **/ @Deprecated(forRemoval = true) - public static final TagKey SOUL_GROUND = org.betterx.worlds.together.tag.CommonItemTags.SOUL_GROUND; + public static final TagKey SOUL_GROUND = org.betterx.worlds.together.tag.v3.CommonItemTags.SOUL_GROUND; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#WOODEN_BARREL} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#WOODEN_BARREL} **/ @Deprecated(forRemoval = true) - public static final TagKey WOODEN_BARREL = org.betterx.worlds.together.tag.CommonItemTags.WOODEN_BARREL; + public static final TagKey WOODEN_BARREL = org.betterx.worlds.together.tag.v3.CommonItemTags.WOODEN_BARREL; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#WOODEN_CHEST} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#WOODEN_CHEST} **/ @Deprecated(forRemoval = true) - public static final TagKey WOODEN_CHEST = org.betterx.worlds.together.tag.CommonItemTags.WOODEN_CHEST; + public static final TagKey WOODEN_CHEST = org.betterx.worlds.together.tag.v3.CommonItemTags.WOODEN_CHEST; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.CommonItemTags#WORKBENCHES} + * @deprecated Replaced by {@link org.betterx.worlds.together.tag.v3.CommonItemTags#WORKBENCHES} **/ @Deprecated(forRemoval = true) - public static final TagKey WORKBENCHES = org.betterx.worlds.together.tag.CommonItemTags.WORKBENCHES; + public static final TagKey WORKBENCHES = org.betterx.worlds.together.tag.v3.CommonItemTags.WORKBENCHES; } diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java index 5d05be34..29f16d16 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java @@ -1,46 +1,48 @@ package org.betterx.bclib.api.v2.tag; +import org.betterx.worlds.together.tag.v3.MineableTags; + import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; /** - * @deprecated Replaced by {@link org.betterx.worlds.together.tag.MineableTags} + * @deprecated Replaced by {@link MineableTags} */ @Deprecated(forRemoval = true) public class NamedMineableTags { /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#AXE} instead + * @deprecated use {@link MineableTags#AXE} instead **/ @Deprecated(forRemoval = true) - public static final TagKey AXE = org.betterx.worlds.together.tag.MineableTags.AXE; + public static final TagKey AXE = MineableTags.AXE; /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#HOE} instead + * @deprecated use {@link MineableTags#HOE} instead **/ @Deprecated(forRemoval = true) - public static final TagKey HOE = org.betterx.worlds.together.tag.MineableTags.HOE; + public static final TagKey HOE = MineableTags.HOE; /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#PICKAXE} instead + * @deprecated use {@link MineableTags#PICKAXE} instead **/ @Deprecated(forRemoval = true) - public static final TagKey PICKAXE = org.betterx.worlds.together.tag.MineableTags.PICKAXE; + public static final TagKey PICKAXE = MineableTags.PICKAXE; /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#SHEARS} instead + * @deprecated use {@link MineableTags#SHEARS} instead **/ @Deprecated(forRemoval = true) - public static final TagKey SHEARS = org.betterx.worlds.together.tag.MineableTags.SHEARS; + public static final TagKey SHEARS = MineableTags.SHEARS; /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#SHOVEL} instead + * @deprecated use {@link MineableTags#SHOVEL} instead **/ @Deprecated(forRemoval = true) - public static final TagKey SHOVEL = org.betterx.worlds.together.tag.MineableTags.SHOVEL; + public static final TagKey SHOVEL = MineableTags.SHOVEL; /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#SWORD} instead + * @deprecated use {@link MineableTags#SWORD} instead **/ @Deprecated(forRemoval = true) - public static final TagKey SWORD = org.betterx.worlds.together.tag.MineableTags.SWORD; + public static final TagKey SWORD = MineableTags.SWORD; /** - * @deprecated use {@link org.betterx.worlds.together.tag.MineableTags#HAMMER} instead + * @deprecated use {@link MineableTags#HAMMER} instead **/ @Deprecated(forRemoval = true) - public static final TagKey HAMMER = org.betterx.worlds.together.tag.MineableTags.HAMMER; + public static final TagKey HAMMER = MineableTags.HAMMER; } diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java index 6e5631f5..72a197cf 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java @@ -1,6 +1,6 @@ package org.betterx.bclib.api.v2.tag; -import org.betterx.worlds.together.tag.ToolTags; +import org.betterx.worlds.together.tag.v3.ToolTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java index 71f498d5..ffe17db2 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java @@ -2,9 +2,9 @@ package org.betterx.bclib.api.v2.tag; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.worlds.together.mixin.common.DiggerItemAccessor; -import org.betterx.worlds.together.tag.CommonBlockTags; -import org.betterx.worlds.together.tag.TagManager; -import org.betterx.worlds.together.tag.TagRegistry; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.tag.v3.TagRegistry; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.Registry; diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java index 1e2d0a2c..38b6d6ee 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java @@ -2,7 +2,7 @@ package org.betterx.bclib.api.v2.tag; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; -import org.betterx.worlds.together.tag.TagRegistry; +import org.betterx.worlds.together.tag.v3.TagRegistry; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.Registry; diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BlockPredicates.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BlockPredicates.java index 08397df5..eee11d6b 100644 --- a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BlockPredicates.java +++ b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BlockPredicates.java @@ -1,6 +1,6 @@ package org.betterx.bclib.api.v3.levelgen.features; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate; diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java index ed0061a1..877a58f8 100644 --- a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java @@ -2,7 +2,7 @@ package org.betterx.bclib.api.v3.levelgen.features; import org.betterx.bclib.api.v2.levelgen.features.config.PlaceFacingBlockConfig; import org.betterx.bclib.api.v2.levelgen.features.placement.*; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.Direction; import net.minecraft.core.Holder; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java index 6211c993..4e5c2719 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java @@ -1,7 +1,7 @@ package org.betterx.bclib.blocks; -import org.betterx.worlds.together.tag.MineableTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.MineableTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index 8796a6be..e085b85c 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java @@ -4,8 +4,8 @@ import org.betterx.bclib.client.models.BasePatterns; import org.betterx.bclib.client.models.ModelsHelper; import org.betterx.bclib.client.models.PatternsHelper; import org.betterx.bclib.client.sound.BlockSounds; -import org.betterx.worlds.together.tag.MineableTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.MineableTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.resources.model.UnbakedModel; diff --git a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java index 17cd0e7b..52b37775 100644 --- a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java @@ -1,7 +1,7 @@ package org.betterx.bclib.blocks; -import org.betterx.worlds.together.tag.MineableTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.MineableTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/org/betterx/bclib/commands/CommandRegistry.java b/src/main/java/org/betterx/bclib/commands/CommandRegistry.java index 89d5e794..1ccd2962 100644 --- a/src/main/java/org/betterx/bclib/commands/CommandRegistry.java +++ b/src/main/java/org/betterx/bclib/commands/CommandRegistry.java @@ -1,7 +1,7 @@ package org.betterx.bclib.commands; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java index 860a5523..88b05575 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java @@ -6,7 +6,7 @@ import org.betterx.bclib.complexmaterials.entry.RecipeEntry; import org.betterx.bclib.config.PathConfig; import org.betterx.bclib.registry.BlockRegistry; import org.betterx.bclib.registry.ItemRegistry; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java index 387c3489..5a2a873c 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java @@ -5,9 +5,9 @@ import org.betterx.bclib.blocks.*; import org.betterx.bclib.complexmaterials.entry.BlockEntry; import org.betterx.bclib.complexmaterials.entry.RecipeEntry; import org.betterx.bclib.recipes.GridRecipe; -import org.betterx.worlds.together.tag.CommonBlockTags; -import org.betterx.worlds.together.tag.CommonItemTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java index 5a10d379..6738e4ca 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java @@ -2,7 +2,7 @@ package org.betterx.bclib.complexmaterials.entry; import org.betterx.bclib.complexmaterials.ComplexMaterial; import org.betterx.bclib.registry.BlockRegistry; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java index a177bcc8..433e56bf 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java @@ -2,7 +2,7 @@ package org.betterx.bclib.complexmaterials.entry; import org.betterx.bclib.complexmaterials.ComplexMaterial; import org.betterx.bclib.registry.ItemRegistry; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/integration/ModIntegration.java b/src/main/java/org/betterx/bclib/integration/ModIntegration.java index 0959ed81..a1e98ff8 100644 --- a/src/main/java/org/betterx/bclib/integration/ModIntegration.java +++ b/src/main/java/org/betterx/bclib/integration/ModIntegration.java @@ -2,7 +2,7 @@ package org.betterx.bclib.integration; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.Holder; import net.minecraft.core.Registry; diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java index 6bb90a9c..84c4a602 100644 --- a/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java +++ b/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java @@ -1,8 +1,8 @@ package org.betterx.bclib.items.tool; -import org.betterx.worlds.together.tag.CommonItemTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.CommonItemTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java b/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java index 9a131e66..6854d7b0 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java @@ -1,6 +1,6 @@ package org.betterx.bclib.mixin.common; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ContainerLevelAccess; diff --git a/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java index c93945f3..dbad3515 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java @@ -1,7 +1,7 @@ package org.betterx.bclib.mixin.common; import org.betterx.bclib.util.MethodReplace; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; diff --git a/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java index 0c40bb79..1401045b 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java @@ -1,6 +1,6 @@ package org.betterx.bclib.mixin.common; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java index 6d96ce30..6d3957f7 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java @@ -1,6 +1,6 @@ package org.betterx.bclib.mixin.common; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java index b4e925f9..c9eff80e 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java @@ -1,6 +1,6 @@ package org.betterx.bclib.mixin.common.shears; -import org.betterx.worlds.together.tag.CommonItemTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java b/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java index 46490231..618f7e9a 100644 --- a/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java +++ b/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java @@ -1,6 +1,6 @@ package org.betterx.bclib.presets; -import org.betterx.worlds.together.tag.TagRegistry; +import org.betterx.worlds.together.tag.v3.TagRegistry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java index 0ccead06..e9eaaacc 100644 --- a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java +++ b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java @@ -5,7 +5,7 @@ import org.betterx.bclib.config.PathConfig; import org.betterx.bclib.interfaces.UnknownReceipBookCategory; import org.betterx.bclib.util.ItemUtil; import org.betterx.bclib.util.RecipeHelper; -import org.betterx.worlds.together.tag.CommonItemTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.core.NonNullList; diff --git a/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java b/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java index ad98896e..fca78723 100644 --- a/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java +++ b/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java @@ -2,7 +2,7 @@ package org.betterx.bclib.recipes; import org.betterx.bclib.BCLib; import org.betterx.bclib.config.Configs; -import org.betterx.worlds.together.tag.CommonItemTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; diff --git a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java index 16423f07..b334b2db 100644 --- a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java @@ -5,10 +5,10 @@ import org.betterx.bclib.blocks.BaseOreBlock; import org.betterx.bclib.blocks.FeatureSaplingBlock; import org.betterx.bclib.config.PathConfig; import org.betterx.bclib.interfaces.CustomItemProvider; -import org.betterx.worlds.together.tag.CommonBlockTags; -import org.betterx.worlds.together.tag.CommonItemTags; -import org.betterx.worlds.together.tag.MineableTags; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; +import org.betterx.worlds.together.tag.v3.MineableTags; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java index 531bf207..cf1879d3 100644 --- a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java @@ -9,9 +9,9 @@ import org.betterx.bclib.items.tool.BaseAxeItem; import org.betterx.bclib.items.tool.BaseHoeItem; import org.betterx.bclib.items.tool.BasePickaxeItem; import org.betterx.bclib.items.tool.BaseShearsItem; -import org.betterx.worlds.together.tag.CommonItemTags; -import org.betterx.worlds.together.tag.TagManager; -import org.betterx.worlds.together.tag.ToolTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; +import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.tag.v3.ToolTags; import net.minecraft.core.BlockSource; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/util/BlocksHelper.java b/src/main/java/org/betterx/bclib/util/BlocksHelper.java index 31bfee90..5bb5e4f5 100644 --- a/src/main/java/org/betterx/bclib/util/BlocksHelper.java +++ b/src/main/java/org/betterx/bclib/util/BlocksHelper.java @@ -1,6 +1,6 @@ package org.betterx.bclib.util; -import org.betterx.worlds.together.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; diff --git a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java index 9c99a52b..38798dc2 100644 --- a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java +++ b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java @@ -2,7 +2,7 @@ package org.betterx.bclib.world.structures; import org.betterx.bclib.api.v2.levelgen.structures.BCLStructureBuilder; import org.betterx.bclib.util.MHelper; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import com.mojang.serialization.Codec; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/worlds/together/WorldsTogether.java b/src/main/java/org/betterx/worlds/together/WorldsTogether.java index ff9c5ee2..15967983 100644 --- a/src/main/java/org/betterx/worlds/together/WorldsTogether.java +++ b/src/main/java/org/betterx/worlds/together/WorldsTogether.java @@ -1,7 +1,7 @@ package org.betterx.worlds.together; import org.betterx.bclib.util.Logger; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import org.betterx.worlds.together.world.WorldConfig; import org.betterx.worlds.together.worldPreset.WorldPresets; diff --git a/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java b/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java index 4a12f44c..3616b232 100644 --- a/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java +++ b/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java @@ -1,7 +1,7 @@ package org.betterx.worlds.together.flatLevel; -import org.betterx.worlds.together.tag.TagManager; -import org.betterx.worlds.together.tag.TagRegistry; +import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.tag.v3.TagRegistry; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java b/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java index 333dbaf4..3431afd1 100644 --- a/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java +++ b/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java @@ -1,6 +1,6 @@ package org.betterx.worlds.together.mixin.common; -import org.betterx.worlds.together.tag.TagManager; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagLoader; diff --git a/src/main/java/org/betterx/worlds/together/tag/CommonBiomeTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java similarity index 85% rename from src/main/java/org/betterx/worlds/together/tag/CommonBiomeTags.java rename to src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java index db2d4be7..5db5278f 100644 --- a/src/main/java/org/betterx/worlds/together/tag/CommonBiomeTags.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; diff --git a/src/main/java/org/betterx/worlds/together/tag/CommonBlockTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java similarity index 99% rename from src/main/java/org/betterx/worlds/together/tag/CommonBlockTags.java rename to src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java index d35aa9f9..6aff8f21 100644 --- a/src/main/java/org/betterx/worlds/together/tag/CommonBlockTags.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/worlds/together/tag/CommonItemTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java similarity index 97% rename from src/main/java/org/betterx/worlds/together/tag/CommonItemTags.java rename to src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java index 1cca2489..22445500 100644 --- a/src/main/java/org/betterx/worlds/together/tag/CommonItemTags.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/worlds/together/tag/MineableTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java similarity index 94% rename from src/main/java/org/betterx/worlds/together/tag/MineableTags.java rename to src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java index 40ce2007..38f878ea 100644 --- a/src/main/java/org/betterx/worlds/together/tag/MineableTags.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/worlds/together/tag/TagManager.java b/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java similarity index 99% rename from src/main/java/org/betterx/worlds/together/tag/TagManager.java rename to src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java index 7e269b2b..145d0fb7 100644 --- a/src/main/java/org/betterx/worlds/together/tag/TagManager.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.api.v2.tag.TagAPI; diff --git a/src/main/java/org/betterx/worlds/together/tag/TagRegistry.java b/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java similarity index 99% rename from src/main/java/org/betterx/worlds/together/tag/TagRegistry.java rename to src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java index 6dbbfc62..54472d83 100644 --- a/src/main/java/org/betterx/worlds/together/tag/TagRegistry.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; diff --git a/src/main/java/org/betterx/worlds/together/tag/ToolTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java similarity index 94% rename from src/main/java/org/betterx/worlds/together/tag/ToolTags.java rename to src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java index 6fe648fc..d33a1676 100644 --- a/src/main/java/org/betterx/worlds/together/tag/ToolTags.java +++ b/src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java @@ -1,4 +1,4 @@ -package org.betterx.worlds.together.tag; +package org.betterx.worlds.together.tag.v3; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java b/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java index b4644cab..38c57b1e 100644 --- a/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java +++ b/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java @@ -2,8 +2,8 @@ package org.betterx.worlds.together.worldPreset; import org.betterx.bclib.registry.PresetsRegistry; import org.betterx.worlds.together.WorldsTogether; -import org.betterx.worlds.together.tag.TagManager; -import org.betterx.worlds.together.tag.TagRegistry; +import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.tag.v3.TagRegistry; import org.betterx.worlds.together.world.WorldGenUtil; import org.betterx.worlds.together.worldPreset.client.WorldPresetsClient; import org.betterx.worlds.together.worldPreset.settings.VanillaWorldPresetSettings;