From 6770bbbbead70ada463dbc417914f8e1632c4df9 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 21 Jun 2022 19:25:57 +0200 Subject: [PATCH] Adopted new BCLib API --- .../java/org/betterx/betterend/BetterEnd.java | 4 +- .../betterend/blocks/BulbVineSeedBlock.java | 2 +- .../betterend/blocks/EndLilySeedBlock.java | 2 +- .../betterend/blocks/EndLotusSeedBlock.java | 2 +- .../betterend/blocks/EndstoneDustBlock.java | 2 +- .../blocks/HelixTreeLeavesBlock.java | 6 +-- .../betterend/blocks/HydraluxBlock.java | 2 +- .../betterend/blocks/LumecornBlock.java | 2 +- .../blocks/MossyGlowshroomCapBlock.java | 4 +- .../blocks/NeonCactusPlantBlock.java | 2 +- .../betterend/blocks/ShadowGrassBlock.java | 2 +- .../blocks/SmallJellyshroomBlock.java | 2 +- .../betterend/blocks/basis/EndPlantBlock.java | 2 +- .../blocks/basis/EndPlantWithAgeBlock.java | 2 +- .../blocks/basis/EndTerrainBlock.java | 2 +- .../blocks/basis/EndUnderwaterPlantBlock.java | 2 +- .../basis/EndUnderwaterWallPlantBlock.java | 2 +- .../blocks/basis/EndWallMushroom.java | 2 +- .../blocks/basis/EndWallPlantBlock.java | 2 +- .../betterend/blocks/basis/FurBlock.java | 8 +-- .../CrystalSubblocksMaterial.java | 20 +++---- .../complexmaterials/MetalMaterial.java | 17 +++--- .../complexmaterials/StoneMaterial.java | 31 ++++++----- .../betterend/entity/EndSlimeEntity.java | 2 +- .../integration/NourishIntegration.java | 10 ++-- .../integration/byg/BYGIntegration.java | 2 +- .../byg/features/BigEtherTreeFeature.java | 2 +- .../NightshadeRedwoodTreeFeature.java | 2 +- .../byg/features/OldBulbisTreeFeature.java | 2 +- .../betterend/item/tool/EndHammerItem.java | 4 +- .../mixin/common/ChorusFlowerBlockMixin.java | 2 +- .../mixin/common/ChorusPlantBlockMixin.java | 2 +- .../mixin/common/EnchantmentMenuMixin.java | 2 +- .../mixin/common/EndPodiumFeatureMixin.java | 8 +-- .../betterend/mixin/common/EndSpikeMixin.java | 4 +- .../mixin/common/SpikeFeatureMixin.java | 6 +-- .../betterend/recipe/CraftingRecipes.java | 2 +- .../betterend/registry/EndStructures.java | 4 +- .../betterx/betterend/registry/EndTags.java | 54 ++++++++++--------- .../betterend/util/StructureErode.java | 2 +- .../world/features/CavePumpkinFeature.java | 2 +- .../world/features/CrashedShipFeature.java | 2 +- .../world/features/DoublePlantFeature.java | 1 + .../world/features/GlowPillarFeature.java | 1 + .../world/features/LanceleafFeature.java | 1 + .../betterend/world/features/NBTFeature.java | 2 +- .../world/features/ScatterFeature.java | 2 +- .../world/features/SinglePlantFeature.java | 1 + .../features/UnderwaterPlantFeature.java | 1 + .../world/features/bushes/BushFeature.java | 2 +- .../features/bushes/BushWithOuterFeature.java | 2 +- .../bushes/LargeAmaranitaFeature.java | 2 +- .../world/features/bushes/Lumecorn.java | 2 +- .../features/bushes/TenaneaBushFeature.java | 2 +- .../world/features/terrain/ArchFeature.java | 2 +- .../terrain/BigAuroraCrystalFeature.java | 2 +- .../features/terrain/DesertLakeFeature.java | 2 +- .../features/terrain/EndLakeFeature.java | 2 +- .../features/terrain/FallenPillarFeature.java | 2 +- .../world/features/terrain/GeyserFeature.java | 2 +- .../terrain/ObsidianBoulderFeature.java | 2 +- .../ObsidianPillarBasementFeature.java | 2 +- .../features/terrain/SingleBlockFeature.java | 2 +- .../terrain/SmaragdantCrystalFeature.java | 2 +- .../world/features/terrain/SpireFeature.java | 2 +- .../features/terrain/StalactiteFeature.java | 2 +- .../terrain/SulphuricCaveFeature.java | 2 +- .../terrain/SulphuricLakeFeature.java | 2 +- .../features/terrain/SurfaceVentFeature.java | 2 +- .../features/terrain/ThinArchFeature.java | 2 +- .../caves/CaveChunkPopulatorFeature.java | 2 +- .../terrain/caves/EndCaveFeature.java | 2 +- .../terrain/caves/RoundCaveFeature.java | 2 +- .../terrain/caves/TunelCaveFeature.java | 2 +- .../features/trees/DragonTreeFeature.java | 2 +- .../features/trees/JellyshroomFeature.java | 2 +- .../features/trees/LacugroveFeature.java | 2 +- .../world/features/trees/LucerniaFeature.java | 2 +- .../features/trees/UmbrellaTreeFeature.java | 2 +- .../world/generator/TerrainGenerator.java | 4 +- .../features/EternalPortalStructure.java | 2 +- .../world/structures/piece/CavePiece.java | 2 +- .../piece/CrystalMountainPiece.java | 2 +- .../world/structures/piece/LakePiece.java | 2 +- 84 files changed, 164 insertions(+), 153 deletions(-) diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index 79bb0454..d6976bfc 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -1,6 +1,5 @@ package org.betterx.betterend; -import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.util.Logger; import org.betterx.betterend.api.BetterEndPlugin; @@ -15,6 +14,7 @@ import org.betterx.betterend.util.BonemealPlants; import org.betterx.betterend.util.LootTableUtil; import org.betterx.betterend.world.generator.GeneratorOptions; import org.betterx.betterend.world.generator.TerrainGenerator; +import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biomes; @@ -31,7 +31,7 @@ public class BetterEnd implements ModInitializer { @Override public void onInitialize() { - WorldDataAPI.registerModCache(MOD_ID); + WorldConfig.registerModCache(MOD_ID); EndPortals.loadPortals(); EndSounds.register(); EndBlockEntities.register(); diff --git a/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java index b943bb36..3278d930 100644 --- a/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java @@ -1,11 +1,11 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.blocks.basis.EndPlantWithAgeBlock; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; diff --git a/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java b/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java index 2e0ad880..3c038d5b 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java @@ -1,10 +1,10 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.blocks.UnderwaterPlantWithAgeBlock; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java index 31bc4ed2..dcc37a0d 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java @@ -1,10 +1,10 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.blocks.UnderwaterPlantWithAgeBlock; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.registry.EndBlocks; +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/betterend/blocks/EndstoneDustBlock.java b/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java index 04fdc8c5..4cbd98d2 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java @@ -1,9 +1,9 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.bclib.interfaces.tools.AddMineableShovel; import org.betterx.bclib.util.ColorUtil; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java b/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java index 6cd89394..63559e7d 100644 --- a/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java @@ -1,7 +1,5 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.NamedBlockTags; -import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.blocks.BaseBlock; import org.betterx.bclib.blocks.BaseLeavesBlock; import org.betterx.bclib.interfaces.CustomColorProvider; @@ -10,9 +8,11 @@ import org.betterx.bclib.util.ColorUtil; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.item.ItemColor; +import net.minecraft.tags.BlockTags; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; @@ -42,7 +42,7 @@ public class HelixTreeLeavesBlock extends BaseBlock implements CustomColorProvid .strength(0.2F) ); - TagAPI.addBlockTag(NamedBlockTags.LEAVES, this); + TagManager.BLOCKS.add(BlockTags.LEAVES, this); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java b/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java index f8373437..a757e5da 100644 --- a/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java @@ -1,12 +1,12 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.UnderwaterPlantBlock; import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.EndBlockProperties.HydraluxShape; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java b/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java index 77b363bb..67ae4966 100644 --- a/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java @@ -1,6 +1,5 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseBlockNotFull; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; @@ -8,6 +7,7 @@ import org.betterx.bclib.interfaces.tools.AddMineableAxe; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +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/betterend/blocks/MossyGlowshroomCapBlock.java b/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java index 9e499245..db6d5c15 100644 --- a/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java @@ -1,9 +1,9 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.NamedMineableTags; import org.betterx.bclib.blocks.BaseBlock; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.MineableTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -42,6 +42,6 @@ public class MossyGlowshroomCapBlock extends BaseBlock implements TagProvider { @Override public void addTags(List> blockTags, List> itemTags) { - blockTags.add(NamedMineableTags.AXE); + blockTags.add(MineableTags.AXE); } } diff --git a/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java index 40576f0c..0fe46eb4 100644 --- a/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java @@ -1,6 +1,5 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseBlockNotFull; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; @@ -11,6 +10,7 @@ import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.EndBlockProperties.CactusBottom; import org.betterx.betterend.interfaces.PottablePlant; import org.betterx.betterend.registry.EndBlocks; +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/betterend/blocks/ShadowGrassBlock.java b/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java index b1364ea1..e76ac91d 100644 --- a/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java @@ -1,9 +1,9 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.betterend.blocks.basis.EndTerrainBlock; import org.betterx.betterend.registry.EndParticles; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java b/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java index e03cd1a7..a20dc963 100644 --- a/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java @@ -1,6 +1,5 @@ package org.betterx.betterend.blocks; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseAttachedBlock; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; @@ -8,6 +7,7 @@ import org.betterx.bclib.items.tool.BaseShearsItem; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.interfaces.PottablePlant; import org.betterx.betterend.registry.EndFeatures; +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/betterend/blocks/basis/EndPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java index f197c655..d3081bd1 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java @@ -1,8 +1,8 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BasePlantBlock; import org.betterx.betterend.interfaces.PottablePlant; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java index c56ca0e4..87518dd0 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java @@ -1,7 +1,7 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BasePlantWithAgeBlock; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java index 3b8a3cba..a4e10f0f 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java @@ -1,9 +1,9 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseTerrainBlock; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.betterend.interfaces.PottableTerrain; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java index 554ad700..27668841 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java @@ -1,7 +1,7 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.UnderwaterPlantBlock; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java index 8a9ab6ac..f1e1b7a9 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java @@ -1,7 +1,7 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseUnderwaterWallPlantBlock; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java b/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java index ad52537e..c57b47b6 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java @@ -1,7 +1,7 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.WallMushroomBlock; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java index ccc95db0..dcfc3e07 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java @@ -1,7 +1,7 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseWallPlantBlock; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java index 51d5c546..ed87f844 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java @@ -1,16 +1,16 @@ package org.betterx.betterend.blocks.basis; -import org.betterx.bclib.api.v2.tag.NamedBlockTags; -import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.blocks.BaseAttachedBlock; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.bclib.items.tool.BaseShearsItem; import org.betterx.bclib.util.MHelper; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.tags.BlockTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; @@ -45,7 +45,7 @@ public class FurBlock extends BaseAttachedBlock implements RenderLayerProvider, .noCollission()); this.drop = drop; this.dropChance = dropChance; - TagAPI.addBlockTag(NamedBlockTags.LEAVES, this); + TagManager.BLOCKS.add(BlockTags.LEAVES, this); } public FurBlock(ItemLike drop, int dropChance) { @@ -55,7 +55,7 @@ public class FurBlock extends BaseAttachedBlock implements RenderLayerProvider, .noCollission()); this.drop = drop; this.dropChance = dropChance; - TagAPI.addBlockTag(NamedBlockTags.LEAVES, this); + TagManager.BLOCKS.add(BlockTags.LEAVES, this); } @Override diff --git a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java index 12f17567..d2c10b2b 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java @@ -1,8 +1,5 @@ package org.betterx.betterend.complexmaterials; -import org.betterx.bclib.api.v2.tag.NamedBlockTags; -import org.betterx.bclib.api.v2.tag.NamedItemTags; -import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.blocks.BaseSlabBlock; import org.betterx.bclib.blocks.BaseStairsBlock; import org.betterx.bclib.blocks.BaseWallBlock; @@ -14,7 +11,10 @@ import org.betterx.betterend.blocks.basis.LitPillarBlock; import org.betterx.betterend.config.Configs; import org.betterx.betterend.recipe.CraftingRecipes; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.TagManager; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.world.level.block.Block; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -122,14 +122,14 @@ public class CrystalSubblocksMaterial { CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar); // Item Tags // - TagAPI.addItemTag(NamedItemTags.SLABS, slab, brick_slab); - TagAPI.addItemTag(NamedItemTags.STONE_BRICKS, bricks); - TagAPI.addItemTag(NamedItemTags.STONE_CRAFTING_MATERIALS, source); - TagAPI.addItemTag(NamedItemTags.STONE_TOOL_MATERIALS, source); + TagManager.ITEMS.add(ItemTags.SLABS, slab.asItem(), brick_slab.asItem()); + TagManager.ITEMS.add(ItemTags.STONE_BRICKS, bricks.asItem()); + TagManager.ITEMS.add(ItemTags.STONE_CRAFTING_MATERIALS, source.asItem()); + TagManager.ITEMS.add(ItemTags.STONE_TOOL_MATERIALS, source.asItem()); // Block Tags // - TagAPI.addBlockTag(NamedBlockTags.STONE_BRICKS, bricks); - TagAPI.addBlockTag(NamedBlockTags.WALLS, wall, brick_wall); - TagAPI.addBlockTag(NamedBlockTags.SLABS, slab, brick_slab); + TagManager.BLOCKS.add(BlockTags.STONE_BRICKS, bricks); + TagManager.BLOCKS.add(BlockTags.WALLS, wall, brick_wall); + TagManager.BLOCKS.add(BlockTags.SLABS, slab, brick_slab); } } \ No newline at end of file diff --git a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java index a332dc25..f5c60442 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java @@ -1,8 +1,5 @@ package org.betterx.betterend.complexmaterials; -import org.betterx.bclib.api.v2.tag.NamedBlockTags; -import org.betterx.bclib.api.v2.tag.NamedItemTags; -import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.blocks.*; import org.betterx.bclib.items.ModelProviderItem; import org.betterx.bclib.items.tool.BaseAxeItem; @@ -25,8 +22,10 @@ import org.betterx.betterend.item.tool.EndPickaxe; import org.betterx.betterend.recipe.builders.AlloyingRecipe; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorMaterial; @@ -167,9 +166,9 @@ public class MetalMaterial { rawOre = hasOre ? EndItems.registerEndItem(name + "_raw", new ModelProviderItem(itemSettings)) : null; ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseOreBlock(() -> rawOre, 1, 3, 1)) : null; - alloyingOre = hasOre ? TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_alloying") : null; + alloyingOre = hasOre ? TagManager.ITEMS.makeTag(BetterEnd.MOD_ID, name + "_alloying") : null; if (hasOre) { - TagAPI.addItemTag(alloyingOre, ore, rawOre); + TagManager.ITEMS.add(alloyingOre, ore.asItem(), rawOre); } block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings)); @@ -506,9 +505,9 @@ public class MetalMaterial { .setGroup("end_metal_boots") .build(); - TagAPI.addBlockTag(NamedBlockTags.ANVIL, anvilBlock); - TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, block); - TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, ingot); - TagAPI.addBlockTag(BlockTags.DRAGON_IMMUNE, ore, bars); + TagManager.BLOCKS.add(BlockTags.ANVIL, anvilBlock); + TagManager.BLOCKS.add(BlockTags.BEACON_BASE_BLOCKS, block); + TagManager.ITEMS.add(ItemTags.BEACON_PAYMENT_ITEMS, ingot); + TagManager.BLOCKS.add(BlockTags.DRAGON_IMMUNE, ore, bars); } } \ No newline at end of file diff --git a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java index ea898a34..9e6cbdaf 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java @@ -1,6 +1,5 @@ package org.betterx.betterend.complexmaterials; -import org.betterx.bclib.api.v2.tag.*; import org.betterx.bclib.blocks.*; import org.betterx.bclib.recipes.GridRecipe; import org.betterx.betterend.BetterEnd; @@ -11,8 +10,12 @@ import org.betterx.betterend.config.Configs; import org.betterx.betterend.recipe.CraftingRecipes; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +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.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MaterialColor; @@ -175,22 +178,22 @@ public class StoneMaterial { CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar); // Item Tags // - TagAPI.addItemTag(NamedItemTags.SLABS, slab, brickSlab); - TagAPI.addItemTag(NamedItemTags.STONE_BRICKS, bricks); - TagAPI.addItemTag(NamedItemTags.STONE_CRAFTING_MATERIALS, stone); - TagAPI.addItemTag(NamedItemTags.STONE_TOOL_MATERIALS, stone); - TagAPI.addItemTag(CommonItemTags.FURNACES, furnace); + TagManager.ITEMS.add(ItemTags.SLABS, slab.asItem(), brickSlab.asItem()); + TagManager.ITEMS.add(ItemTags.STONE_BRICKS, bricks.asItem()); + TagManager.ITEMS.add(ItemTags.STONE_CRAFTING_MATERIALS, stone.asItem()); + TagManager.ITEMS.add(ItemTags.STONE_TOOL_MATERIALS, stone.asItem()); + TagManager.ITEMS.add(CommonItemTags.FURNACES, furnace.asItem()); // Block Tags // - TagAPI.addBlockTag(NamedBlockTags.STONE_BRICKS, bricks); - TagAPI.addBlockTag(NamedBlockTags.WALLS, wall, brickWall); - TagAPI.addBlockTag(NamedBlockTags.SLABS, slab, brickSlab); - TagAPI.addBlockTags(pressurePlate, NamedBlockTags.PRESSURE_PLATES, NamedBlockTags.STONE_PRESSURE_PLATES); - TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone); + TagManager.BLOCKS.add(BlockTags.STONE_BRICKS, bricks); + TagManager.BLOCKS.add(BlockTags.WALLS, wall, brickWall); + TagManager.BLOCKS.add(BlockTags.SLABS, slab, brickSlab); + TagManager.BLOCKS.add(pressurePlate, BlockTags.PRESSURE_PLATES, BlockTags.STONE_PRESSURE_PLATES); + TagManager.BLOCKS.add(CommonBlockTags.END_STONES, stone); - TagAPI.addBlockTag(BlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall); + TagManager.BLOCKS.add(BlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall); - TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone); - TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone); + TagManager.BLOCKS.add(CommonBlockTags.END_STONES, stone); + TagManager.BLOCKS.add(CommonBlockTags.END_STONES, stone); } } \ No newline at end of file diff --git a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java index fa74b0e6..ab1229ec 100644 --- a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java +++ b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java @@ -2,12 +2,12 @@ package org.betterx.betterend.entity; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.interfaces.ISlime; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.util.GlobalState; +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/betterend/integration/NourishIntegration.java b/src/main/java/org/betterx/betterend/integration/NourishIntegration.java index 7570dcef..fc8fd435 100644 --- a/src/main/java/org/betterx/betterend/integration/NourishIntegration.java +++ b/src/main/java/org/betterx/betterend/integration/NourishIntegration.java @@ -1,8 +1,8 @@ package org.betterx.betterend.integration; -import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.integration.ModIntegration; import org.betterx.betterend.registry.EndItems; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -19,8 +19,8 @@ public class NourishIntegration extends ModIntegration { TagKey protein = getItemTag("protein"); TagKey sweets = getItemTag("sweets"); - TagAPI.addItemTag(fats, EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED); - TagAPI.addItemTag( + TagManager.ITEMS.add(fats, EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED); + TagManager.ITEMS.add( fruit, EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_COOKED, @@ -33,7 +33,7 @@ public class NourishIntegration extends ModIntegration { EndItems.CHORUS_MUSHROOM_COOKED, EndItems.BOLUX_MUSHROOM_COOKED ); - TagAPI.addItemTag( + TagManager.ITEMS.add( protein, EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED, @@ -41,7 +41,7 @@ public class NourishIntegration extends ModIntegration { EndItems.BOLUX_MUSHROOM_COOKED, EndItems.CAVE_PUMPKIN_PIE ); - TagAPI.addItemTag( + TagManager.ITEMS.add( sweets, EndItems.SHADOW_BERRY_JELLY, EndItems.SWEET_BERRY_JELLY, diff --git a/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java b/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java index d358da0c..12169cce 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java +++ b/src/main/java/org/betterx/betterend/integration/byg/BYGIntegration.java @@ -12,7 +12,7 @@ public class BYGIntegration extends ModIntegration implements EndBiomeIntegratio public void init() { /*Block block = Integrations.BYG.getBlock("ivis_phylium"); if (block != null) { - TagAPI.addTags(block, CommonBlockTags.END_STONES, CommonBlockTags.GEN_END_STONES); + TagManager.addTags(block, CommonBlockTags.END_STONES, CommonBlockTags.GEN_END_STONES); } BYGBlocks.register(); BYGFeatures.register(); diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java b/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java index fed93d3b..e39b3e98 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/BigEtherTreeFeature.java @@ -1,11 +1,11 @@ package org.betterx.betterend.integration.byg.features; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.integration.Integrations; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java b/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java index 4ad94c81..1a81537c 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.integration.byg.features; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; @@ -13,6 +12,7 @@ import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.integration.Integrations; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java b/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java index 79d140c3..c613e7e6 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/OldBulbisTreeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.integration.byg.features; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFSubtraction; @@ -12,6 +11,7 @@ import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.noise.OpenSimplexNoise; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/item/tool/EndHammerItem.java b/src/main/java/org/betterx/betterend/item/tool/EndHammerItem.java index 0343e1f4..7168a6e0 100644 --- a/src/main/java/org/betterx/betterend/item/tool/EndHammerItem.java +++ b/src/main/java/org/betterx/betterend/item/tool/EndHammerItem.java @@ -1,11 +1,11 @@ package org.betterx.betterend.item.tool; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; -import org.betterx.bclib.api.v2.tag.CommonItemTags; import org.betterx.bclib.client.models.ModelsHelper; import org.betterx.bclib.interfaces.ItemModelProvider; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.bclib.util.MHelper; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonItemTags; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/mixin/common/ChorusFlowerBlockMixin.java b/src/main/java/org/betterx/betterend/mixin/common/ChorusFlowerBlockMixin.java index 64442ab0..6a83bd02 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ChorusFlowerBlockMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ChorusFlowerBlockMixin.java @@ -1,9 +1,9 @@ package org.betterx.betterend.mixin.common; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.world.generator.GeneratorOptions; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/org/betterx/betterend/mixin/common/ChorusPlantBlockMixin.java b/src/main/java/org/betterx/betterend/mixin/common/ChorusPlantBlockMixin.java index 2367152a..2e47bc30 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ChorusPlantBlockMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ChorusPlantBlockMixin.java @@ -1,7 +1,7 @@ package org.betterx.betterend.mixin.common; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.betterend.registry.EndBlocks; +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/betterend/mixin/common/EnchantmentMenuMixin.java b/src/main/java/org/betterx/betterend/mixin/common/EnchantmentMenuMixin.java index ceda1e6b..910caa91 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/EnchantmentMenuMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/EnchantmentMenuMixin.java @@ -1,6 +1,6 @@ package org.betterx.betterend.mixin.common; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.Registry; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/mixin/common/EndPodiumFeatureMixin.java b/src/main/java/org/betterx/betterend/mixin/common/EndPodiumFeatureMixin.java index 1e6b435a..8f112eab 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/EndPodiumFeatureMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/EndPodiumFeatureMixin.java @@ -1,9 +1,9 @@ package org.betterx.betterend.mixin.common; -import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.bclib.util.StructureHelper; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.world.generator.GeneratorOptions; +import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; @@ -74,7 +74,7 @@ public class EndPodiumFeatureMixin { } private BlockPos be_updatePortalPos(WorldGenLevel world) { - CompoundTag compound = WorldDataAPI.getRootTag(BetterEnd.MOD_ID).getCompound("portal"); + CompoundTag compound = WorldConfig.getRootTag(BetterEnd.MOD_ID).getCompound("portal"); be_portalPosition = NbtUtils.readBlockPos(compound); if (be_portalPosition.getY() == 0) { @@ -87,8 +87,8 @@ public class EndPodiumFeatureMixin { }*/ int y = world.getHeight(Types.WORLD_SURFACE, 0, 0); be_portalPosition = new BlockPos(0, y, 0); - WorldDataAPI.getRootTag(BetterEnd.MOD_ID).put("portal", NbtUtils.writeBlockPos(be_portalPosition)); - WorldDataAPI.saveFile(BetterEnd.MOD_ID); + WorldConfig.getRootTag(BetterEnd.MOD_ID).put("portal", NbtUtils.writeBlockPos(be_portalPosition)); + WorldConfig.saveFile(BetterEnd.MOD_ID); } return be_portalPosition; diff --git a/src/main/java/org/betterx/betterend/mixin/common/EndSpikeMixin.java b/src/main/java/org/betterx/betterend/mixin/common/EndSpikeMixin.java index 3f955381..07e169cd 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/EndSpikeMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/EndSpikeMixin.java @@ -1,8 +1,8 @@ package org.betterx.betterend.mixin.common; -import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.world.generator.GeneratorOptions; +import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.levelgen.feature.SpikeFeature.EndSpike; @@ -26,7 +26,7 @@ public class EndSpikeMixin { int x = getCenterX(); int z = getCenterZ(); String pillarID = String.format("%d_%d", x, z); - CompoundTag pillar = WorldDataAPI.getCompoundTag(BetterEnd.MOD_ID, "pillars"); + CompoundTag pillar = WorldConfig.getCompoundTag(BetterEnd.MOD_ID, "pillars"); int minY = pillar.contains(pillarID) ? pillar.getInt(pillarID) : 65; int maxY = minY + height - 54; info.setReturnValue(maxY); diff --git a/src/main/java/org/betterx/betterend/mixin/common/SpikeFeatureMixin.java b/src/main/java/org/betterx/betterend/mixin/common/SpikeFeatureMixin.java index 91a5ae77..c58cefee 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/SpikeFeatureMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/SpikeFeatureMixin.java @@ -1,10 +1,10 @@ package org.betterx.betterend.mixin.common; -import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.StructureHelper; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.world.generator.GeneratorOptions; +import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; @@ -60,14 +60,14 @@ public class SpikeFeatureMixin { long lz = z; if (lx * lx + lz * lz < 10000) { String pillarID = String.format("%d_%d", x, z); - CompoundTag pillar = WorldDataAPI.getCompoundTag(BetterEnd.MOD_ID, "pillars"); + CompoundTag pillar = WorldConfig.getCompoundTag(BetterEnd.MOD_ID, "pillars"); boolean haveValue = pillar.contains(pillarID); minY = haveValue ? pillar.getInt(pillarID) : world.getChunk(x >> 4, z >> 4).getHeight(Types.WORLD_SURFACE, x & 15, z); if (!haveValue) { pillar.putInt(pillarID, minY); - WorldDataAPI.saveFile(BetterEnd.MOD_ID); + WorldConfig.saveFile(BetterEnd.MOD_ID); } } else { minY = world.getChunk(x >> 4, z >> 4).getHeight(Types.WORLD_SURFACE, x & 15, z); diff --git a/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java b/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java index 243187f6..e783753d 100644 --- a/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java @@ -1,11 +1,11 @@ package org.betterx.betterend.recipe; -import org.betterx.bclib.api.v2.tag.CommonItemTags; import org.betterx.bclib.recipes.GridRecipe; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.config.Configs; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import org.betterx.worlds.together.tag.v3.CommonItemTags; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/org/betterx/betterend/registry/EndStructures.java b/src/main/java/org/betterx/betterend/registry/EndStructures.java index 7bfaf5e8..5a394097 100644 --- a/src/main/java/org/betterx/betterend/registry/EndStructures.java +++ b/src/main/java/org/betterx/betterend/registry/EndStructures.java @@ -2,10 +2,10 @@ package org.betterx.betterend.registry; import org.betterx.bclib.api.v2.levelgen.structures.BCLStructure; import org.betterx.bclib.api.v2.levelgen.structures.BCLStructureBuilder; -import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.world.structures.features.*; import org.betterx.betterend.world.structures.piece.*; +import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -73,7 +73,7 @@ public class EndStructures { public static void addBiomeStructures(ResourceLocation biomeID, Holder biome) { if (!biomeID.getPath().contains("mountain") && !biomeID.getPath().contains("lake")) { - TagAPI.addBiomeTag(ETERNAL_PORTAL.biomeTag, biome.value()); + TagManager.BIOMES.add(ETERNAL_PORTAL.biomeTag, biome.value()); } } } diff --git a/src/main/java/org/betterx/betterend/registry/EndTags.java b/src/main/java/org/betterx/betterend/registry/EndTags.java index 97eb4751..9c6f0c28 100644 --- a/src/main/java/org/betterx/betterend/registry/EndTags.java +++ b/src/main/java/org/betterx/betterend/registry/EndTags.java @@ -2,7 +2,6 @@ package org.betterx.betterend.registry; import org.betterx.bclib.api.v2.BonemealAPI; import org.betterx.bclib.api.v2.ComposterAPI; -import org.betterx.bclib.api.v2.tag.*; import org.betterx.bclib.blocks.BaseVineBlock; import org.betterx.bclib.blocks.SimpleLeavesBlock; import org.betterx.betterend.BetterEnd; @@ -10,8 +9,13 @@ import org.betterx.betterend.blocks.basis.EndTerrainBlock; import org.betterx.betterend.blocks.basis.PedestalBlock; import org.betterx.betterend.item.tool.EndHammerItem; import org.betterx.betterend.world.biome.EndBiome; +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.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.Item; @@ -34,12 +38,12 @@ public class EndTags { // https://fabricmc.net/wiki/tutorial:tags // Block Tags - public static final TagKey PEDESTALS = TagAPI.makeBlockTag(BetterEnd.MOD_ID, "pedestal"); + public static final TagKey PEDESTALS = TagManager.BLOCKS.makeTag(BetterEnd.MOD_ID, "pedestal"); // Item Tags - public static final TagKey ALLOYING_IRON = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_iron"); - public static final TagKey ALLOYING_GOLD = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_gold"); - public static final TagKey ALLOYING_COPPER = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_copper"); + public static final TagKey ALLOYING_IRON = TagManager.ITEMS.makeTag(BetterEnd.MOD_ID, "alloying_iron"); + public static final TagKey ALLOYING_GOLD = TagManager.ITEMS.makeTag(BetterEnd.MOD_ID, "alloying_gold"); + public static final TagKey ALLOYING_COPPER = TagManager.ITEMS.makeTag(BetterEnd.MOD_ID, "alloying_copper"); public static void register() { addEndGround(EndBlocks.THALLASIUM.ore); @@ -52,27 +56,27 @@ public class EndTags { final Item item = block.asItem(); if (material.equals(Material.STONE) || material.equals(Material.METAL) || material.equals(Material.HEAVY_METAL)) { - TagAPI.addBlockTag(NamedMineableTags.PICKAXE, block); + TagManager.BLOCKS.add(MineableTags.PICKAXE, block); } else if (material.equals(Material.WOOD)) { - TagAPI.addBlockTag(NamedMineableTags.AXE, block); + TagManager.BLOCKS.add(MineableTags.AXE, block); } else if (material.equals(Material.LEAVES) || material.equals(Material.PLANT) || material.equals(Material.WATER_PLANT) || material.equals( Material.SPONGE)) { - TagAPI.addBlockTag(NamedMineableTags.HOE, block); + TagManager.BLOCKS.add(MineableTags.HOE, block); } else if (material.equals(Material.SAND)) { - TagAPI.addBlockTag(NamedMineableTags.SHOVEL, block); + TagManager.BLOCKS.add(MineableTags.SHOVEL, block); } if (block instanceof EndTerrainBlock) { addEndGround(block); - TagAPI.addBlockTag(NamedBlockTags.NYLIUM, block); + TagManager.BLOCKS.add(BlockTags.NYLIUM, block); BonemealAPI.addSpreadableBlock(block, Blocks.END_STONE); } else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) { - TagAPI.addBlockTag(NamedBlockTags.LEAVES, block); + TagManager.BLOCKS.add(BlockTags.LEAVES, block); ComposterAPI.allowCompost(0.3f, item); } else if (block instanceof BaseVineBlock) { - TagAPI.addBlockTag(NamedBlockTags.CLIMBABLE, block); + TagManager.BLOCKS.add(BlockTags.CLIMBABLE, block); } else if (block instanceof PedestalBlock) { - TagAPI.addBlockTag(PEDESTALS, block); + TagManager.BLOCKS.add(PEDESTALS, block); } Material mat = block.defaultBlockState().getMaterial(); @@ -81,7 +85,7 @@ public class EndTags { } }); addEndGround(EndBlocks.CAVE_MOSS); - TagAPI.addBlockTag(NamedBlockTags.NYLIUM, EndBlocks.CAVE_MOSS); + TagManager.BLOCKS.add(BlockTags.NYLIUM, EndBlocks.CAVE_MOSS); BonemealAPI.addSpreadableBlock(EndBlocks.CAVE_MOSS, Blocks.END_STONE); BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_OBSIDIAN, Blocks.OBSIDIAN); BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.DRAGON_BONE_BLOCK); @@ -100,31 +104,31 @@ public class EndTags { } }); - TagAPI.addBlockTag( + TagManager.BLOCKS.add( CommonBlockTags.END_STONES, EndBlocks.ENDER_ORE, EndBlocks.BRIMSTONE ); - TagAPI.addBlockTag(CommonBlockTags.END_STONES, EndBlocks.BRIMSTONE); - TagAPI.addBlockTag(NamedBlockTags.ANVIL, EndBlocks.AETERNIUM_ANVIL); - TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK); - TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT); - TagAPI.addBlockTag( + TagManager.BLOCKS.add(CommonBlockTags.END_STONES, EndBlocks.BRIMSTONE); + TagManager.BLOCKS.add(BlockTags.ANVIL, EndBlocks.AETERNIUM_ANVIL); + TagManager.BLOCKS.add(BlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK); + TagManager.ITEMS.add(ItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT); + TagManager.BLOCKS.add( BlockTags.DRAGON_IMMUNE, EndBlocks.ENDER_ORE, EndBlocks.ETERNAL_PEDESTAL, EndBlocks.FLAVOLITE_RUNED_ETERNAL, EndBlocks.FLAVOLITE_RUNED ); - TagAPI.addItemTag(CommonItemTags.IRON_INGOTS, EndBlocks.THALLASIUM.ingot); + TagManager.ITEMS.add(CommonItemTags.IRON_INGOTS, EndBlocks.THALLASIUM.ingot); - TagAPI.addItemTag(ALLOYING_IRON, Items.IRON_ORE, Items.DEEPSLATE_IRON_ORE, Items.RAW_IRON); - TagAPI.addItemTag(ALLOYING_GOLD, Items.GOLD_ORE, Items.DEEPSLATE_GOLD_ORE, Items.RAW_GOLD); - TagAPI.addItemTag(ALLOYING_COPPER, Items.COPPER_ORE, Items.DEEPSLATE_COPPER_ORE, Items.RAW_COPPER); + TagManager.ITEMS.add(ALLOYING_IRON, Items.IRON_ORE, Items.DEEPSLATE_IRON_ORE, Items.RAW_IRON); + TagManager.ITEMS.add(ALLOYING_GOLD, Items.GOLD_ORE, Items.DEEPSLATE_GOLD_ORE, Items.RAW_GOLD); + TagManager.ITEMS.add(ALLOYING_COPPER, Items.COPPER_ORE, Items.DEEPSLATE_COPPER_ORE, Items.RAW_COPPER); } public static void addEndGround(Block bl) { - TagAPI.addBlockTag(CommonBlockTags.END_STONES, bl); + TagManager.BLOCKS.add(CommonBlockTags.END_STONES, bl); } public static void addBiomeSurfaceToEndGroup(EndBiome b) { diff --git a/src/main/java/org/betterx/betterend/util/StructureErode.java b/src/main/java/org/betterx/betterend/util/StructureErode.java index d0462126..b81161d3 100644 --- a/src/main/java/org/betterx/betterend/util/StructureErode.java +++ b/src/main/java/org/betterx/betterend/util/StructureErode.java @@ -1,9 +1,9 @@ package org.betterx.betterend.util; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; +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/betterend/world/features/CavePumpkinFeature.java b/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java index c3f708f6..8be48cf8 100644 --- a/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java @@ -1,10 +1,10 @@ package org.betterx.betterend.world.features; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.blocks.EndBlockProperties; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java b/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java index af8cbc3a..c2d0c200 100644 --- a/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java @@ -1,11 +1,11 @@ package org.betterx.betterend.world.features; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.StructureHelper; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.util.StructureErode; import org.betterx.betterend.world.biome.EndBiome; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/betterend/world/features/DoublePlantFeature.java b/src/main/java/org/betterx/betterend/world/features/DoublePlantFeature.java index d6409478..1feb68da 100644 --- a/src/main/java/org/betterx/betterend/world/features/DoublePlantFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/DoublePlantFeature.java @@ -34,6 +34,7 @@ public class DoublePlantFeature extends ScatterFeature { center.getZ() - blockPos.getZ() ) / radius * 0.6F + random.nextFloat() * 0.4F; plant = d < 0.5F ? largePlant : smallPlant; + //noinspection deprecation return plant.canSurvive(plant.defaultBlockState(), world, blockPos); } diff --git a/src/main/java/org/betterx/betterend/world/features/GlowPillarFeature.java b/src/main/java/org/betterx/betterend/world/features/GlowPillarFeature.java index 500dd6ae..bba1f118 100644 --- a/src/main/java/org/betterx/betterend/world/features/GlowPillarFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/GlowPillarFeature.java @@ -20,6 +20,7 @@ public class GlowPillarFeature extends ScatterFeature { BlockPos blockPos, float radius ) { + //noinspection deprecation return EndBlocks.GLOWING_PILLAR_SEED.canSurvive(AIR, world, blockPos); } diff --git a/src/main/java/org/betterx/betterend/world/features/LanceleafFeature.java b/src/main/java/org/betterx/betterend/world/features/LanceleafFeature.java index 08c24c41..7db2999c 100644 --- a/src/main/java/org/betterx/betterend/world/features/LanceleafFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/LanceleafFeature.java @@ -20,6 +20,7 @@ public class LanceleafFeature extends ScatterFeature { BlockPos blockPos, float radius ) { + //noinspection deprecation return EndBlocks.LANCELEAF_SEED.canSurvive(AIR, world, blockPos); } diff --git a/src/main/java/org/betterx/betterend/world/features/NBTFeature.java b/src/main/java/org/betterx/betterend/world/features/NBTFeature.java index 93a9b034..4b671027 100644 --- a/src/main/java/org/betterx/betterend/world/features/NBTFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/NBTFeature.java @@ -3,8 +3,8 @@ package org.betterx.betterend.world.features; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.levelgen.structures.templatesystem.DestructionStructureProcessor; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; +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/betterend/world/features/ScatterFeature.java b/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java index cff68c53..0af9a973 100644 --- a/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java @@ -1,10 +1,10 @@ package org.betterx.betterend.world.features; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.util.GlobalState; +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/betterend/world/features/SinglePlantFeature.java b/src/main/java/org/betterx/betterend/world/features/SinglePlantFeature.java index 00e06eb8..a7521ebe 100644 --- a/src/main/java/org/betterx/betterend/world/features/SinglePlantFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/SinglePlantFeature.java @@ -52,6 +52,7 @@ public class SinglePlantFeature extends ScatterFeature { BlockPos blockPos, float radius ) { + //noinspection deprecation return plant.canSurvive(plant.defaultBlockState(), world, blockPos); } diff --git a/src/main/java/org/betterx/betterend/world/features/UnderwaterPlantFeature.java b/src/main/java/org/betterx/betterend/world/features/UnderwaterPlantFeature.java index 945fee3c..0072218f 100644 --- a/src/main/java/org/betterx/betterend/world/features/UnderwaterPlantFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/UnderwaterPlantFeature.java @@ -25,6 +25,7 @@ public class UnderwaterPlantFeature extends UnderwaterPlantScatter { BlockPos blockPos, float radius ) { + //noinspection deprecation return super.canSpawn(world, blockPos) && plant.canSurvive(plant.defaultBlockState(), world, blockPos); } diff --git a/src/main/java/org/betterx/betterend/world/features/bushes/BushFeature.java b/src/main/java/org/betterx/betterend/world/features/bushes/BushFeature.java index 30bfc175..0f453a3c 100644 --- a/src/main/java/org/betterx/betterend/world/features/bushes/BushFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/bushes/BushFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.bushes; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFScale3D; @@ -11,6 +10,7 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; +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/betterend/world/features/bushes/BushWithOuterFeature.java b/src/main/java/org/betterx/betterend/world/features/bushes/BushWithOuterFeature.java index a2ac4329..ff851e38 100644 --- a/src/main/java/org/betterx/betterend/world/features/bushes/BushWithOuterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/bushes/BushWithOuterFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.bushes; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFScale3D; @@ -11,6 +10,7 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; +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/betterend/world/features/bushes/LargeAmaranitaFeature.java b/src/main/java/org/betterx/betterend/world/features/bushes/LargeAmaranitaFeature.java index 744c92b4..f6c6b13a 100644 --- a/src/main/java/org/betterx/betterend/world/features/bushes/LargeAmaranitaFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/bushes/LargeAmaranitaFeature.java @@ -1,12 +1,12 @@ package org.betterx.betterend.world.features.bushes; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.registry.EndBlocks; +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/betterend/world/features/bushes/Lumecorn.java b/src/main/java/org/betterx/betterend/world/features/bushes/Lumecorn.java index 80fc434f..f50e0dda 100644 --- a/src/main/java/org/betterx/betterend/world/features/bushes/Lumecorn.java +++ b/src/main/java/org/betterx/betterend/world/features/bushes/Lumecorn.java @@ -1,12 +1,12 @@ package org.betterx.betterend.world.features.bushes; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.EndBlockProperties.LumecornShape; import org.betterx.betterend.blocks.LumecornBlock; import org.betterx.betterend.registry.EndBlocks; +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/betterend/world/features/bushes/TenaneaBushFeature.java b/src/main/java/org/betterx/betterend/world/features/bushes/TenaneaBushFeature.java index f6f09951..a851da12 100644 --- a/src/main/java/org/betterx/betterend/world/features/bushes/TenaneaBushFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/bushes/TenaneaBushFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.bushes; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.sdf.SDF; @@ -15,6 +14,7 @@ import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.basis.FurBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +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/betterend/world/features/terrain/ArchFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/ArchFeature.java index ee3aba6f..43fa070b 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/ArchFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/ArchFeature.java @@ -1,13 +1,13 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFRotation; import org.betterx.bclib.sdf.primitive.SDFTorus; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/BigAuroraCrystalFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/BigAuroraCrystalFeature.java index 343ddefa..1acc66c7 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/BigAuroraCrystalFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/BigAuroraCrystalFeature.java @@ -1,13 +1,13 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFRotation; import org.betterx.bclib.sdf.primitive.SDFHexPrism; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/DesertLakeFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/DesertLakeFeature.java index a3048bc4..ee8a97b6 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/DesertLakeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/DesertLakeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; @@ -9,6 +8,7 @@ import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.util.GlobalState; import org.betterx.betterend.world.biome.EndBiome; +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/betterend/world/features/terrain/EndLakeFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/EndLakeFeature.java index bb0d67a7..ab30804f 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/EndLakeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/EndLakeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; @@ -9,6 +8,7 @@ import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.util.GlobalState; import org.betterx.betterend.world.biome.EndBiome; +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/betterend/world/features/terrain/FallenPillarFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/FallenPillarFeature.java index 4fec4aff..ea22bb96 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/FallenPillarFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/FallenPillarFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFRotation; @@ -10,6 +9,7 @@ import org.betterx.bclib.sdf.primitive.SDFCappedCone; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/GeyserFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/GeyserFeature.java index c53b619b..29bcb899 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/GeyserFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/GeyserFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; import org.betterx.bclib.sdf.primitive.SDFCappedCone; @@ -15,6 +14,7 @@ import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.util.BlockFixer; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianBoulderFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianBoulderFeature.java index cb230efc..ab273c42 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianBoulderFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianBoulderFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFScale3D; @@ -9,6 +8,7 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianPillarBasementFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianPillarBasementFeature.java index ac5dc090..855a241b 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianPillarBasementFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/ObsidianPillarBasementFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFRotation; @@ -12,6 +11,7 @@ import org.betterx.bclib.sdf.primitive.SDFFlatland; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/SingleBlockFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SingleBlockFeature.java index 58cae64b..1e5cad73 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SingleBlockFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SingleBlockFeature.java @@ -1,8 +1,8 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/SmaragdantCrystalFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SmaragdantCrystalFeature.java index 02a4b139..0b7acfd2 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SmaragdantCrystalFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SmaragdantCrystalFeature.java @@ -1,10 +1,10 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.registry.EndBlocks; +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/betterend/world/features/terrain/SpireFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java index f6f5c690..65cbf896 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java @@ -2,7 +2,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFSmoothUnion; @@ -13,6 +12,7 @@ import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.world.biome.EndBiome; +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/betterend/world/features/terrain/StalactiteFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/StalactiteFeature.java index 3780ce9b..68523240 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/StalactiteFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/StalactiteFeature.java @@ -1,9 +1,9 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.StalactiteBlock; import org.betterx.bclib.util.BlocksHelper; +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/betterend/world/features/terrain/SulphuricCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SulphuricCaveFeature.java index 37ee9741..4f4da432 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SulphuricCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SulphuricCaveFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.EndBlockProperties; @@ -9,6 +8,7 @@ import org.betterx.betterend.blocks.SulphurCrystalBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.BlockFixer; +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/betterend/world/features/terrain/SulphuricLakeFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SulphuricLakeFeature.java index d317ea97..0bb99d72 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SulphuricLakeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SulphuricLakeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.EndBlockProperties; @@ -9,6 +8,7 @@ import org.betterx.betterend.blocks.SulphurCrystalBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.GlobalState; +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/betterend/world/features/terrain/SurfaceVentFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SurfaceVentFeature.java index acff0323..bdb0b566 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SurfaceVentFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SurfaceVentFeature.java @@ -1,11 +1,11 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.HydrothermalVentBlock; import org.betterx.betterend.registry.EndBlocks; +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/betterend/world/features/terrain/ThinArchFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/ThinArchFeature.java index df45c6a5..0295f311 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/ThinArchFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/ThinArchFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.terrain; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFCoordModify; import org.betterx.bclib.sdf.operator.SDFDisplacement; @@ -10,6 +9,7 @@ import org.betterx.bclib.sdf.operator.SDFUnion; import org.betterx.bclib.sdf.primitive.SDFTorus; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java index 3c7efbb2..1fc051dc 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java @@ -1,10 +1,10 @@ package org.betterx.betterend.world.features.terrain.caves; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.world.biome.cave.EndCaveBiome; +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/betterend/world/features/terrain/caves/EndCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java index 62ef09a5..85e8118a 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java @@ -4,13 +4,13 @@ import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.cave.EndCaveBiome; +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/betterend/world/features/terrain/caves/RoundCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/RoundCaveFeature.java index 8e13c4f7..9e334e3b 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/RoundCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/RoundCaveFeature.java @@ -1,9 +1,9 @@ package org.betterx.betterend.world.features.terrain.caves; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; +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/betterend/world/features/terrain/caves/TunelCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java index d6d6f35b..d56392b7 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java @@ -3,12 +3,12 @@ package org.betterx.betterend.world.features.terrain.caves; import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.cave.EndCaveBiome; +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/betterend/world/features/trees/DragonTreeFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/DragonTreeFeature.java index 353435e0..9718655b 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/DragonTreeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/DragonTreeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.trees; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; @@ -11,6 +10,7 @@ import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/trees/JellyshroomFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/JellyshroomFeature.java index e7b48928..99682a14 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/JellyshroomFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/JellyshroomFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.trees; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; import org.betterx.bclib.sdf.primitive.SDFSphere; @@ -9,6 +8,7 @@ import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.blocks.JellyshroomCapBlock; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/trees/LacugroveFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/LacugroveFeature.java index f01c8c4e..f4b43cd7 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/LacugroveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/LacugroveFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.trees; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; @@ -13,6 +12,7 @@ import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/trees/LucerniaFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/LucerniaFeature.java index 626d0cd1..a495278c 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/LucerniaFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/LucerniaFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.trees; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.sdf.SDF; @@ -13,6 +12,7 @@ import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.blocks.basis.FurBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/features/trees/UmbrellaTreeFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/UmbrellaTreeFeature.java index e2d803e7..c39fb2e2 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/UmbrellaTreeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/UmbrellaTreeFeature.java @@ -1,7 +1,6 @@ package org.betterx.betterend.world.features.trees; import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; import org.betterx.bclib.sdf.primitive.SDFSphere; @@ -11,6 +10,7 @@ import org.betterx.bclib.util.SplineHelper; import org.betterx.betterend.blocks.UmbrellaTreeClusterBlock; import org.betterx.betterend.blocks.UmbrellaTreeMembraneBlock; import org.betterx.betterend.registry.EndBlocks; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import com.mojang.math.Vector3f; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java b/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java index b62be7d8..730c31b6 100644 --- a/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java +++ b/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java @@ -1,6 +1,5 @@ package org.betterx.betterend.world.generator; -import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.presets.worldgen.BCLWorldPresetSettings; @@ -10,6 +9,7 @@ import org.betterx.betterend.mixin.common.NoiseBasedChunkGeneratorAccessor; import org.betterx.betterend.mixin.common.NoiseChunkAccessor; import org.betterx.betterend.mixin.common.NoiseInterpolatorAccessor; import org.betterx.betterend.noise.OpenSimplexNoise; +import org.betterx.worlds.together.world.WorldGenUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; @@ -219,7 +219,7 @@ public class TerrainGenerator { if (chunkGenerator instanceof NoiseBasedChunkGenerator) { Holder sHolder = ((NoiseBasedChunkGeneratorAccessor) chunkGenerator) .be_getSettings(); - if (LevelGenUtil.getWorldSettings() instanceof BCLWorldPresetSettings bset) { + if (WorldGenUtil.getWorldSettings() instanceof BCLWorldPresetSettings bset) { BETargetChecker.class.cast(sHolder.value()).be_setTarget(bset.useEndTerrainGenerator); } diff --git a/src/main/java/org/betterx/betterend/world/structures/features/EternalPortalStructure.java b/src/main/java/org/betterx/betterend/world/structures/features/EternalPortalStructure.java index 83603acf..321014f4 100644 --- a/src/main/java/org/betterx/betterend/world/structures/features/EternalPortalStructure.java +++ b/src/main/java/org/betterx/betterend/world/structures/features/EternalPortalStructure.java @@ -1,7 +1,7 @@ package org.betterx.betterend.world.structures.features; +import org.betterx.bclib.api.v2.levelgen.structures.BCLStructure; import org.betterx.bclib.util.StructureHelper; -import org.betterx.bclib.world.structures.BCLStructure; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.world.structures.piece.NBTPiece; diff --git a/src/main/java/org/betterx/betterend/world/structures/piece/CavePiece.java b/src/main/java/org/betterx/betterend/world/structures/piece/CavePiece.java index d811ef43..671b1982 100644 --- a/src/main/java/org/betterx/betterend/world/structures/piece/CavePiece.java +++ b/src/main/java/org/betterx/betterend/world/structures/piece/CavePiece.java @@ -1,11 +1,11 @@ package org.betterx.betterend.world.structures.piece; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.util.GlobalState; +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/betterend/world/structures/piece/CrystalMountainPiece.java b/src/main/java/org/betterx/betterend/world/structures/piece/CrystalMountainPiece.java index 00fd3fd1..510eb680 100644 --- a/src/main/java/org/betterx/betterend/world/structures/piece/CrystalMountainPiece.java +++ b/src/main/java/org/betterx/betterend/world/structures/piece/CrystalMountainPiece.java @@ -1,12 +1,12 @@ package org.betterx.betterend.world.structures.piece; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.util.GlobalState; import org.betterx.betterend.world.biome.EndBiome; +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/betterend/world/structures/piece/LakePiece.java b/src/main/java/org/betterx/betterend/world/structures/piece/LakePiece.java index c47c4f4d..b84dc10f 100644 --- a/src/main/java/org/betterx/betterend/world/structures/piece/LakePiece.java +++ b/src/main/java/org/betterx/betterend/world/structures/piece/LakePiece.java @@ -1,13 +1,13 @@ package org.betterx.betterend.world.structures.piece; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.world.biome.EndBiome; +import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos;