diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index edfadec5..276743d6 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -6,8 +6,8 @@ import net.minecraft.world.level.biome.Biomes; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; -import org.betterx.bclib.api.WorldDataAPI; -import org.betterx.bclib.api.biomes.BiomeAPI; +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; import org.betterx.betterend.config.Configs; @@ -56,9 +56,9 @@ public class BetterEnd implements ModInitializer { Configs.saveConfigs(); if (GeneratorOptions.useNewGenerator()) { - org.betterx.bclib.world.generator.GeneratorOptions.setFarEndBiomes(GeneratorOptions.getIslandDistBlock()); - org.betterx.bclib.world.generator.GeneratorOptions.setEndLandFunction((pos) -> TerrainGenerator.isLand(pos.x, - pos.y)); + org.betterx.bclib.api.v2.generator.GeneratorOptions.setFarEndBiomes(GeneratorOptions.getIslandDistBlock()); + org.betterx.bclib.api.v2.generator.GeneratorOptions.setEndLandFunction((pos) -> TerrainGenerator.isLand(pos.x, + pos.y)); } BiomeAPI.registerEndBiomeModification((biomeID, biome) -> { diff --git a/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java index 19291d4f..c8d4326f 100644 --- a/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java b/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java index 58489ad0..16773c5a 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndLilySeedBlock.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluids; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java index fbe13a77..721fb713 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndLotusSeedBlock.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluids; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java b/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java index ae00c8c4..ee9b42b3 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java @@ -15,7 +15,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java b/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java index d5f9a81b..382064b6 100644 --- a/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java @@ -16,8 +16,8 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.TagAPI; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java b/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java index f5763f92..2ae88f8d 100644 --- a/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/HydraluxBlock.java @@ -19,7 +19,7 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java b/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java index a478937c..393bf9cd 100644 --- a/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LumecornBlock.java @@ -20,7 +20,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java b/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java index 521ab65b..e5447f29 100644 --- a/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomCapBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.material.Material; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedMineableTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java index eabfd6ea..9ee1bdfd 100644 --- a/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/NeonCactusPlantBlock.java @@ -29,7 +29,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java b/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java index 287b438c..d2719be4 100644 --- a/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.material.MaterialColor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java b/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java index 3a230c88..9a317bd9 100644 --- a/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/SmallJellyshroomBlock.java @@ -15,9 +15,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.BonemealableBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; @@ -31,7 +29,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; 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 26226995..3a1c23b3 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java @@ -3,7 +3,7 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BasePlantBlock; import org.betterx.betterend.interfaces.PottablePlant; 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 7ab1aa1f..469a65b1 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java @@ -2,7 +2,7 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BasePlantWithAgeBlock; import java.util.function.Function; 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 94dc94e9..b6a45306 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MaterialColor; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; 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 b1f167ee..241da9f2 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java @@ -2,7 +2,7 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.UnderwaterPlantBlock; import java.util.function.Function; 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 b0427bfc..6d1f5812 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java @@ -2,7 +2,7 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseUnderwaterWallPlantBlock; public class EndUnderwaterWallPlantBlock extends BaseUnderwaterWallPlantBlock { 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 96abea79..19f4d53c 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java @@ -2,7 +2,7 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.WallMushroomBlock; public class EndWallMushroom extends WallMushroomBlock { 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 2419fb47..5a84101b 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndWallPlantBlock.java @@ -2,7 +2,7 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BaseWallPlantBlock; public class EndWallPlantBlock extends BaseWallPlantBlock { 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 86b4c5f9..df774fec 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/FurBlock.java @@ -20,8 +20,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.TagAPI; +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; diff --git a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java index edf5b1c7..2cc15754 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java @@ -4,9 +4,9 @@ import net.minecraft.world.level.block.Block; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.NamedItemTags; -import org.betterx.bclib.api.tag.TagAPI; +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; diff --git a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java index 664ebda1..1973adc8 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java @@ -15,10 +15,10 @@ import net.minecraft.world.level.material.MaterialColor; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.CommonBlockTags; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.NamedItemTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java index 2c6ea05f..3857a63f 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.material.MaterialColor; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.*; +import org.betterx.bclib.api.v2.tag.*; import org.betterx.bclib.blocks.*; import org.betterx.bclib.recipes.GridRecipe; import org.betterx.betterend.BetterEnd; diff --git a/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java b/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java index 8bfad56c..e94a03ec 100644 --- a/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java +++ b/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java @@ -22,7 +22,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.EndItems; diff --git a/src/main/java/org/betterx/betterend/entity/EndFishEntity.java b/src/main/java/org/betterx/betterend/entity/EndFishEntity.java index 4b3e0a3b..54b7299f 100644 --- a/src/main/java/org/betterx/betterend/entity/EndFishEntity.java +++ b/src/main/java/org/betterx/betterend/entity/EndFishEntity.java @@ -28,7 +28,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.Blocks; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.EndItems; diff --git a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java index 326f43b9..e4ff4b7e 100644 --- a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java +++ b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java @@ -35,9 +35,9 @@ import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.Blocks; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/integration/EnderscapeIntegration.java b/src/main/java/org/betterx/betterend/integration/EnderscapeIntegration.java index 4cfffec0..93c1ea32 100644 --- a/src/main/java/org/betterx/betterend/integration/EnderscapeIntegration.java +++ b/src/main/java/org/betterx/betterend/integration/EnderscapeIntegration.java @@ -6,11 +6,11 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.TagAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.integration.ModIntegration; -import org.betterx.bclib.world.features.BCLFeature; public class EnderscapeIntegration extends ModIntegration { public EnderscapeIntegration() { @@ -33,7 +33,7 @@ public class EnderscapeIntegration extends ModIntegration { }); BCLFeature scatteredShadowQuartzOre = getFeature("scattered_shadow_quartz_ore", - Decoration.UNDERGROUND_DECORATION); + Decoration.UNDERGROUND_DECORATION); BCLFeature voidNebuliteOre = getFeature("void_nebulite_ore", Decoration.UNDERGROUND_DECORATION); BCLFeature nebuliteOre = getFeature("nebulite_ore", Decoration.UNDERGROUND_DECORATION); diff --git a/src/main/java/org/betterx/betterend/integration/Integrations.java b/src/main/java/org/betterx/betterend/integration/Integrations.java index 4521d7d5..5cdb9b19 100644 --- a/src/main/java/org/betterx/betterend/integration/Integrations.java +++ b/src/main/java/org/betterx/betterend/integration/Integrations.java @@ -6,7 +6,7 @@ import net.minecraft.world.item.Items; import net.fabricmc.loader.api.FabricLoader; -import org.betterx.bclib.api.ModIntegrationAPI; +import org.betterx.bclib.api.v2.ModIntegrationAPI; import org.betterx.bclib.integration.ModIntegration; import org.betterx.bclib.recipes.GridRecipe; import org.betterx.betterend.BetterEnd; diff --git a/src/main/java/org/betterx/betterend/integration/NourishIntegration.java b/src/main/java/org/betterx/betterend/integration/NourishIntegration.java index a152a838..2087ccc4 100644 --- a/src/main/java/org/betterx/betterend/integration/NourishIntegration.java +++ b/src/main/java/org/betterx/betterend/integration/NourishIntegration.java @@ -3,7 +3,7 @@ package org.betterx.betterend.integration; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.integration.ModIntegration; import org.betterx.betterend.registry.EndItems; diff --git a/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java b/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java index 956ff692..b4d1afd1 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java +++ b/src/main/java/org/betterx/betterend/integration/byg/biomes/NightshadeRedwoods.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.byg.features.BYGFeatures; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java b/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java index 0d71d145..dca30ffa 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java +++ b/src/main/java/org/betterx/betterend/integration/byg/biomes/OldBulbisGardens.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.placement.PlacedFeature; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.byg.features.BYGFeatures; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java b/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java index e75a25bd..18e45c65 100644 --- a/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java +++ b/src/main/java/org/betterx/betterend/integration/byg/features/BYGFeatures.java @@ -3,8 +3,8 @@ package org.betterx.betterend.integration.byg.features; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.features.BCLCommonFeatures; -import org.betterx.bclib.world.features.BCLFeature; +import org.betterx.bclib.api.v2.levelgen.features.BCLCommonFeatures; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.byg.BYGBlocks; @@ -18,43 +18,43 @@ public class BYGFeatures { "old_bulbis_tree", new OldBulbisTreeFeature(), 1 - ); + ); public static final BCLFeature IVIS_SPROUT = redisterVegetation( "ivis_sprout", new SinglePlantFeature(Integrations.BYG.getBlock("ivis_sprout"), 6, 2), 6 - ); + ); public static final BCLFeature IVIS_VINE = redisterVegetation( "ivis_vine", new VineFeature(BYGBlocks.IVIS_VINE, 24), 5 - ); + ); public static final BCLFeature IVIS_MOSS = redisterVegetation( "ivis_moss", new WallPlantFeature(BYGBlocks.IVIS_MOSS, 6), 1 - ); + ); public static final BCLFeature IVIS_MOSS_WOOD = redisterVegetation( "ivis_moss_wood", new WallPlantOnLogFeature(BYGBlocks.IVIS_MOSS, 6), 15 - ); + ); public static final BCLFeature NIGHTSHADE_MOSS = redisterVegetation( "nightshade_moss", new WallPlantFeature(BYGBlocks.NIGHTSHADE_MOSS, 5), 2 - ); + ); public static final BCLFeature NIGHTSHADE_MOSS_WOOD = redisterVegetation( "nightshade_moss_wood", new WallPlantOnLogFeature(BYGBlocks.NIGHTSHADE_MOSS, 5), 8 - ); + ); public static final BCLFeature NIGHTSHADE_REDWOOD_TREE = redisterVegetation( "nightshade_redwood_tree", new NightshadeRedwoodTreeFeature(), 1 - ); + ); public static final BCLFeature BIG_ETHER_TREE = redisterVegetation("big_ether_tree", new BigEtherTreeFeature(), 1); public static void 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 dcc586a2..d1d292e9 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 @@ -10,11 +10,11 @@ import net.minecraft.world.level.material.Material; import com.google.common.base.Function; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.integration.Integrations; import java.util.List; 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 92253551..f999aca5 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 @@ -15,7 +15,8 @@ import net.minecraft.world.level.material.Material; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -26,7 +27,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.integration.Integrations; import java.util.List; @@ -195,6 +195,6 @@ public class NightshadeRedwoodTreeFeature extends DefaultFeature { new Vector3f(0.40F, 0.2F, 0), new Vector3f(0.50F, 0.4F, 0), new Vector3f(0.55F, 0.6F, 0) - ); + ); } } 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 d16e69d5..6bc67349 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 @@ -13,7 +13,8 @@ import net.minecraft.world.phys.AABB; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -22,7 +23,6 @@ import org.betterx.bclib.sdf.operator.SDFUnion; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.noise.OpenSimplexNoise; @@ -46,8 +46,8 @@ public class OldBulbisTreeFeature extends DefaultFeature { BlockState stem = Integrations.BYG.getDefaultState("bulbis_stem"); BlockState wood = Integrations.BYG.getDefaultState("bulbis_wood"); BlockState cap = Integrations.BYG.getDefaultState(random.nextBoolean() - ? "bulbis_shell" - : "purple_bulbis_shell"); + ? "bulbis_shell" + : "purple_bulbis_shell"); BlockState glow = Integrations.BYG.getDefaultState("purple_shroomlight"); Function replacement = (state) -> { @@ -184,7 +184,7 @@ public class OldBulbisTreeFeature extends DefaultFeature { new Vector3f(0.30F, 0.55F, 0.00F), new Vector3f(0.42F, 0.70F, 0.00F), new Vector3f(0.50F, 1.00F, 0.00F) - ); + ); ROOT = Lists.newArrayList( new Vector3f(0F, 1F, 0), @@ -192,7 +192,7 @@ public class OldBulbisTreeFeature extends DefaultFeature { new Vector3f(0.3F, 0.30F, 0), new Vector3f(0.7F, 0.05F, 0), new Vector3f(0.8F, -0.20F, 0) - ); + ); SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); LEAF = Lists.newArrayList( @@ -201,7 +201,7 @@ public class OldBulbisTreeFeature extends DefaultFeature { new Vector3f(0.40F, 0.8F, 0), new Vector3f(0.75F, 0.9F, 0), new Vector3f(1.00F, 0.8F, 0) - ); + ); SIDE = Lists.newArrayList( new Vector3f(0, -0.3F, -0.5F), @@ -209,6 +209,6 @@ public class OldBulbisTreeFeature extends DefaultFeature { new Vector3f(0, 0.0F, 0.0F), new Vector3f(0, -0.1F, 0.3F), new Vector3f(0, -0.3F, 0.5F) - ); + ); } } 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 93349b36..baa3e13b 100644 --- a/src/main/java/org/betterx/betterend/item/tool/EndHammerItem.java +++ b/src/main/java/org/betterx/betterend/item/tool/EndHammerItem.java @@ -27,8 +27,8 @@ import net.fabricmc.api.Environment; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.Multimap; -import org.betterx.bclib.api.tag.CommonBlockTags; -import org.betterx.bclib.api.tag.CommonItemTags; +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; diff --git a/src/main/java/org/betterx/betterend/mixin/client/MusicTrackerMixin.java b/src/main/java/org/betterx/betterend/mixin/client/MusicTrackerMixin.java index ab065970..2c7f5219 100644 --- a/src/main/java/org/betterx/betterend/mixin/client/MusicTrackerMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/client/MusicTrackerMixin.java @@ -8,7 +8,7 @@ import net.minecraft.sounds.Music; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.betterend.client.ClientOptions; import org.betterx.betterend.world.biome.EndBiome; import org.spongepowered.asm.mixin.Final; 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 69824413..435725b7 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ChorusFlowerBlockMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ChorusFlowerBlockMixin.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; 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 c6ca4dd4..44870da4 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ChorusPlantBlockMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ChorusPlantBlockMixin.java @@ -13,7 +13,7 @@ import net.minecraft.world.level.block.ChorusPlantBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.betterend.registry.EndBlocks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; 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 a537fd32..67301c2d 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/EnchantmentMenuMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/EnchantmentMenuMixin.java @@ -8,7 +8,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.EnchantmentInstance; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; 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 9f33b4da..91f6609f 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/EndPodiumFeatureMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/EndPodiumFeatureMixin.java @@ -13,7 +13,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; -import org.betterx.bclib.api.WorldDataAPI; +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; 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 b9a336be..90ca03c0 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/EndSpikeMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/EndSpikeMixin.java @@ -3,7 +3,7 @@ package org.betterx.betterend.mixin.common; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.levelgen.feature.SpikeFeature.EndSpike; -import org.betterx.bclib.api.WorldDataAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.world.generator.GeneratorOptions; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java b/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java index 41717e5b..f09ed0ae 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ServerLevelMixin.java @@ -21,7 +21,7 @@ import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess; import net.minecraft.world.level.storage.ServerLevelData; import net.minecraft.world.level.storage.WritableLevelData; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.interfaces.BETargetChecker; import org.betterx.betterend.registry.EndBlocks; 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 db40a72b..25c3cdfc 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/SpikeFeatureMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/SpikeFeatureMixin.java @@ -19,7 +19,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.SpikeConfigurat import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; -import org.betterx.bclib.api.WorldDataAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.StructureHelper; import org.betterx.betterend.BetterEnd; diff --git a/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java b/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java index d7d949f8..4a8ec184 100644 --- a/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java @@ -8,7 +8,7 @@ import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import org.betterx.bclib.api.tag.CommonItemTags; +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; diff --git a/src/main/java/org/betterx/betterend/registry/EndBiomes.java b/src/main/java/org/betterx/betterend/registry/EndBiomes.java index 753d2a13..a9feaad0 100644 --- a/src/main/java/org/betterx/betterend/registry/EndBiomes.java +++ b/src/main/java/org/betterx/betterend/registry/EndBiomes.java @@ -5,11 +5,11 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.biome.Biome; -import org.betterx.bclib.api.LifeCycleAPI; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.world.generator.BiomePicker; -import org.betterx.bclib.world.generator.map.hex.HexBiomeMap; +import org.betterx.bclib.api.v2.LifeCycleAPI; +import org.betterx.bclib.api.v2.generator.BiomePicker; +import org.betterx.bclib.api.v2.generator.map.hex.HexBiomeMap; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.betterend.config.Configs; import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.air.BiomeIceStarfield; diff --git a/src/main/java/org/betterx/betterend/registry/EndEntities.java b/src/main/java/org/betterx/betterend/registry/EndEntities.java index 7f3fb972..965858c9 100644 --- a/src/main/java/org/betterx/betterend/registry/EndEntities.java +++ b/src/main/java/org/betterx/betterend/registry/EndEntities.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.levelgen.Heightmap.Types; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; -import org.betterx.bclib.api.spawning.SpawnRuleBuilder; +import org.betterx.bclib.api.v2.spawning.SpawnRuleBuilder; import org.betterx.bclib.util.ColorUtil; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.config.Configs; diff --git a/src/main/java/org/betterx/betterend/registry/EndFeatures.java b/src/main/java/org/betterx/betterend/registry/EndFeatures.java index 4bd4d34e..0b26b0fd 100644 --- a/src/main/java/org/betterx/betterend/registry/EndFeatures.java +++ b/src/main/java/org/betterx/betterend/registry/EndFeatures.java @@ -19,16 +19,11 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.features.BCLCommonFeatures; -import org.betterx.bclib.api.features.BCLFeatureBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.features.*; import org.betterx.bclib.util.JsonFactory; -import org.betterx.bclib.world.features.BCLFeature; -import org.betterx.bclib.world.features.DefaultFeature; -import org.betterx.bclib.world.features.ListFeature.StructureInfo; -import org.betterx.bclib.world.features.NBTFeature.TerrainMerge; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.complexmaterials.StoneMaterial; import org.betterx.betterend.config.Configs; @@ -46,317 +41,319 @@ import java.util.List; public class EndFeatures { // Trees // - public static final BCLFeature MOSSY_GLOWSHROOM = redisterVegetation("mossy_glowshroom", - new MossyGlowshroomFeature(), - 2); - public static final BCLFeature PYTHADENDRON_TREE = redisterVegetation("pythadendron_tree", - new PythadendronTreeFeature(), - 1); - public static final BCLFeature LACUGROVE = redisterVegetation("lacugrove", new LacugroveFeature(), 4); - public static final BCLFeature DRAGON_TREE = redisterVegetation("dragon_tree", new DragonTreeFeature(), 2); - public static final BCLFeature TENANEA = redisterVegetation("tenanea", new TenaneaFeature(), 2); - public static final BCLFeature HELIX_TREE = redisterVegetation("helix_tree", new HelixTreeFeature(), 1); - public static final BCLFeature UMBRELLA_TREE = redisterVegetation("umbrella_tree", new UmbrellaTreeFeature(), 2); - public static final BCLFeature JELLYSHROOM = redisterVegetation("jellyshroom", new JellyshroomFeature(), 2); - public static final BCLFeature GIGANTIC_AMARANITA = redisterVegetation("gigantic_amaranita", - new GiganticAmaranitaFeature(), - 1); - public static final BCLFeature LUCERNIA = redisterVegetation("lucernia", new LucerniaFeature(), 3); + public static final BCLFeature MOSSY_GLOWSHROOM = registerVegetation( + "mossy_glowshroom", + new MossyGlowshroomFeature(), + 2); + public static final BCLFeature PYTHADENDRON_TREE = registerVegetation("pythadendron_tree", + new PythadendronTreeFeature(), + 1); + public static final BCLFeature LACUGROVE = registerVegetation("lacugrove", new LacugroveFeature(), 4); + public static final BCLFeature DRAGON_TREE = registerVegetation("dragon_tree", new DragonTreeFeature(), 2); + public static final BCLFeature TENANEA = registerVegetation("tenanea", new TenaneaFeature(), 2); + public static final BCLFeature HELIX_TREE = registerVegetation("helix_tree", new HelixTreeFeature(), 1); + public static final BCLFeature UMBRELLA_TREE = registerVegetation("umbrella_tree", new UmbrellaTreeFeature(), 2); + public static final BCLFeature JELLYSHROOM = registerVegetation("jellyshroom", new JellyshroomFeature(), 2); + public static final BCLFeature GIGANTIC_AMARANITA = registerVegetation("gigantic_amaranita", + new GiganticAmaranitaFeature(), + 1); + public static final BCLFeature LUCERNIA = registerVegetation("lucernia", new LucerniaFeature(), 3); // Bushes // - public static final BCLFeature PYTHADENDRON_BUSH = redisterVegetation("pythadendron_bush", - new BushFeature(EndBlocks.PYTHADENDRON_LEAVES, - EndBlocks.PYTHADENDRON.getBark()), - 3); - public static final BCLFeature DRAGON_TREE_BUSH = redisterVegetation("dragon_tree_bush", - new BushFeature(EndBlocks.DRAGON_TREE_LEAVES, - EndBlocks.DRAGON_TREE.getBark()), - 5); - public static final BCLFeature TENANEA_BUSH = redisterVegetation("tenanea_bush", new TenaneaBushFeature(), 6); - public static final BCLFeature LUMECORN = redisterVegetation("lumecorn", new Lumecorn(), 5); - public static final BCLFeature LARGE_AMARANITA = redisterVegetation("large_amaranita", - new LargeAmaranitaFeature(), - 5); - public static final BCLFeature LUCERNIA_BUSH = redisterVegetation("lucernia_bush", - new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, - EndBlocks.LUCERNIA_OUTER_LEAVES, - EndBlocks.LUCERNIA.getBark()), - 10); - public static final BCLFeature LUCERNIA_BUSH_RARE = redisterVegetation("lucernia_bush_rare", - new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, - EndBlocks.LUCERNIA_OUTER_LEAVES, - EndBlocks.LUCERNIA.getBark()), - 1); - public static final BCLFeature NEON_CACTUS = redisterVegetation("neon_cactus", new NeonCactusFeature(), 2); + public static final BCLFeature PYTHADENDRON_BUSH = registerVegetation("pythadendron_bush", + new BushFeature(EndBlocks.PYTHADENDRON_LEAVES, + EndBlocks.PYTHADENDRON.getBark()), + 3); + public static final BCLFeature DRAGON_TREE_BUSH = registerVegetation("dragon_tree_bush", + new BushFeature(EndBlocks.DRAGON_TREE_LEAVES, + EndBlocks.DRAGON_TREE.getBark()), + 5); + public static final BCLFeature TENANEA_BUSH = registerVegetation("tenanea_bush", new TenaneaBushFeature(), 6); + public static final BCLFeature LUMECORN = registerVegetation("lumecorn", new Lumecorn(), 5); + public static final BCLFeature LARGE_AMARANITA = registerVegetation("large_amaranita", + new LargeAmaranitaFeature(), + 5); + public static final BCLFeature LUCERNIA_BUSH = registerVegetation("lucernia_bush", + new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, + EndBlocks.LUCERNIA_OUTER_LEAVES, + EndBlocks.LUCERNIA.getBark()), + 10); + public static final BCLFeature LUCERNIA_BUSH_RARE = registerVegetation("lucernia_bush_rare", + new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, + EndBlocks.LUCERNIA_OUTER_LEAVES, + EndBlocks.LUCERNIA.getBark()), + 1); + public static final BCLFeature NEON_CACTUS = registerVegetation("neon_cactus", new NeonCactusFeature(), 2); // Plants // - public static final BCLFeature UMBRELLA_MOSS = redisterVegetation("umbrella_moss", - new DoublePlantFeature(EndBlocks.UMBRELLA_MOSS, - EndBlocks.UMBRELLA_MOSS_TALL, - 5), - 3); - public static final BCLFeature CREEPING_MOSS = redisterVegetation("creeping_moss", - new SinglePlantFeature(EndBlocks.CREEPING_MOSS, - 5), - 3); - public static final BCLFeature BLUE_VINE = redisterVegetation("blue_vine", new BlueVineFeature(), 1); - public static final BCLFeature CHORUS_GRASS = redisterVegetation("chorus_grass", - new SinglePlantFeature(EndBlocks.CHORUS_GRASS, 4), - 3); - public static final BCLFeature CRYSTAL_GRASS = redisterVegetation("crystal_grass", - new SinglePlantFeature(EndBlocks.CRYSTAL_GRASS, - 8, - false), - 5); - public static final BCLFeature SHADOW_PLANT = redisterVegetation("shadow_plant", - new SinglePlantFeature(EndBlocks.SHADOW_PLANT, 6), - 5); - public static final BCLFeature MURKWEED = redisterVegetation("murkweed", - new SinglePlantFeature(EndBlocks.MURKWEED, 3), - 2); - public static final BCLFeature NEEDLEGRASS = redisterVegetation("needlegrass", - new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), - 1); - public static final BCLFeature SHADOW_BERRY = redisterVegetation("shadow_berry", - new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), - 1); - public static final BCLFeature BUSHY_GRASS = redisterVegetation("bushy_grass", - new SinglePlantFeature(EndBlocks.BUSHY_GRASS, - 8, - false), - 10); - public static final BCLFeature BUSHY_GRASS_WG = redisterVegetation("bushy_grass_wg", - new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), - 8); - public static final BCLFeature AMBER_GRASS = redisterVegetation("amber_grass", - new SinglePlantFeature(EndBlocks.AMBER_GRASS, 6), - 7); - public static final BCLFeature LANCELEAF = redisterVegetation("lanceleaf", new LanceleafFeature(), 2); - public static final BCLFeature GLOW_PILLAR = redisterVegetation("glow_pillar", new GlowPillarFeature(), 1); - public static final BCLFeature TWISTED_UMBRELLA_MOSS = redisterVegetation("twisted_umbrella_moss", - new DoublePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, - EndBlocks.TWISTED_UMBRELLA_MOSS_TALL, - 6), - 3); - public static final BCLFeature JUNGLE_GRASS = redisterVegetation("jungle_grass", - new SinglePlantFeature(EndBlocks.JUNGLE_GRASS, - 7, - 3), - 6); - public static final BCLFeature SMALL_JELLYSHROOM_FLOOR = redisterVegetation("small_jellyshroom_floor", - new SinglePlantFeature(EndBlocks.SMALL_JELLYSHROOM, - 5, - 5), - 2); - public static final BCLFeature BLOSSOM_BERRY = redisterVegetation("blossom_berry", - new SinglePlantFeature(EndBlocks.BLOSSOM_BERRY, - 3, - 3), - 2); - public static final BCLFeature BLOOMING_COOKSONIA = redisterVegetation("blooming_cooksonia", - new SinglePlantFeature(EndBlocks.BLOOMING_COOKSONIA, - 5), - 5); - public static final BCLFeature SALTEAGO = redisterVegetation("salteago", - new SinglePlantFeature(EndBlocks.SALTEAGO, 5), - 5); - public static final BCLFeature VAIOLUSH_FERN = redisterVegetation("vaiolush_fern", - new SinglePlantFeature(EndBlocks.VAIOLUSH_FERN, - 5), - 5); - public static final BCLFeature FRACTURN = redisterVegetation("fracturn", - new SinglePlantFeature(EndBlocks.FRACTURN, 5), - 5); - public static final BCLFeature UMBRELLA_MOSS_RARE = redisterVegetation("umbrella_moss_rare", - new SinglePlantFeature(EndBlocks.UMBRELLA_MOSS, - 3), - 2); - public static final BCLFeature CREEPING_MOSS_RARE = redisterVegetation("creeping_moss_rare", - new SinglePlantFeature(EndBlocks.CREEPING_MOSS, - 3), - 2); - public static final BCLFeature TWISTED_UMBRELLA_MOSS_RARE = redisterVegetation("twisted_umbrella_moss_rare", - new SinglePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, - 3), - 2); - public static final BCLFeature ORANGO = redisterVegetation("orango", - new SinglePlantFeature(EndBlocks.ORANGO, 5), - 6); - public static final BCLFeature AERIDIUM = redisterVegetation("aeridium", - new SinglePlantFeature(EndBlocks.AERIDIUM, 5, 4), - 5); - public static final BCLFeature LUTEBUS = redisterVegetation("lutebus", - new SinglePlantFeature(EndBlocks.LUTEBUS, 5, 2), - 5); - public static final BCLFeature LAMELLARIUM = redisterVegetation("lamellarium", - new SinglePlantFeature(EndBlocks.LAMELLARIUM, 5), - 6); - public static final BCLFeature SMALL_AMARANITA = redisterVegetation("small_amaranita", - new SinglePlantFeature(EndBlocks.SMALL_AMARANITA_MUSHROOM, - 5, - 5), - 4); - public static final BCLFeature GLOBULAGUS = redisterVegetation("globulagus", - new SinglePlantFeature(EndBlocks.GLOBULAGUS, 5, 3), - 6); - public static final BCLFeature CLAWFERN = redisterVegetation("clawfern", - new SinglePlantFeature(EndBlocks.CLAWFERN, 5, 4), - 5); - public static final BCLFeature BOLUX_MUSHROOM = redisterVegetation("bolux_mushroom", - new SinglePlantFeature(EndBlocks.BOLUX_MUSHROOM, - 5, - 5), - 2); - public static final BCLFeature CHORUS_MUSHROOM = redisterVegetation("chorus_mushroom", - new SinglePlantFeature(EndBlocks.CHORUS_MUSHROOM, - 3, - 5), - 1); - public static final BCLFeature AMBER_ROOT = redisterVegetation("amber_root", - new SinglePlantFeature(EndBlocks.AMBER_ROOT, 5, 5), - 1); + public static final BCLFeature UMBRELLA_MOSS = registerVegetation("umbrella_moss", + new DoublePlantFeature(EndBlocks.UMBRELLA_MOSS, + EndBlocks.UMBRELLA_MOSS_TALL, + 5), + 3); + public static final BCLFeature CREEPING_MOSS = registerVegetation("creeping_moss", + new SinglePlantFeature(EndBlocks.CREEPING_MOSS, + 5), + 3); + public static final BCLFeature BLUE_VINE = registerVegetation("blue_vine", new BlueVineFeature(), 1); + public static final BCLFeature CHORUS_GRASS = registerVegetation("chorus_grass", + new SinglePlantFeature(EndBlocks.CHORUS_GRASS, 4), + 3); + public static final BCLFeature CRYSTAL_GRASS = registerVegetation("crystal_grass", + new SinglePlantFeature(EndBlocks.CRYSTAL_GRASS, + 8, + false), + 5); + public static final BCLFeature SHADOW_PLANT = registerVegetation("shadow_plant", + new SinglePlantFeature(EndBlocks.SHADOW_PLANT, 6), + 5); + public static final BCLFeature MURKWEED = registerVegetation("murkweed", + new SinglePlantFeature(EndBlocks.MURKWEED, 3), + 2); + public static final BCLFeature NEEDLEGRASS = registerVegetation("needlegrass", + new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), + 1); + public static final BCLFeature SHADOW_BERRY = registerVegetation("shadow_berry", + new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), + 1); + public static final BCLFeature BUSHY_GRASS = registerVegetation("bushy_grass", + new SinglePlantFeature(EndBlocks.BUSHY_GRASS, + 8, + false), + 10); + public static final BCLFeature BUSHY_GRASS_WG = registerVegetation("bushy_grass_wg", + new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), + 8); + public static final BCLFeature AMBER_GRASS = registerVegetation("amber_grass", + new SinglePlantFeature(EndBlocks.AMBER_GRASS, 6), + 7); + public static final BCLFeature LANCELEAF = registerVegetation("lanceleaf", new LanceleafFeature(), 2); + public static final BCLFeature GLOW_PILLAR = registerVegetation("glow_pillar", new GlowPillarFeature(), 1); + public static final BCLFeature TWISTED_UMBRELLA_MOSS = registerVegetation("twisted_umbrella_moss", + new DoublePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, + EndBlocks.TWISTED_UMBRELLA_MOSS_TALL, + 6), + 3); + public static final BCLFeature JUNGLE_GRASS = registerVegetation("jungle_grass", + new SinglePlantFeature(EndBlocks.JUNGLE_GRASS, + 7, + 3), + 6); + public static final BCLFeature SMALL_JELLYSHROOM_FLOOR = registerVegetation("small_jellyshroom_floor", + new SinglePlantFeature(EndBlocks.SMALL_JELLYSHROOM, + 5, + 5), + 2); + public static final BCLFeature BLOSSOM_BERRY = registerVegetation("blossom_berry", + new SinglePlantFeature(EndBlocks.BLOSSOM_BERRY, + 3, + 3), + 2); + public static final BCLFeature BLOOMING_COOKSONIA = registerVegetation("blooming_cooksonia", + new SinglePlantFeature(EndBlocks.BLOOMING_COOKSONIA, + 5), + 5); + public static final BCLFeature SALTEAGO = registerVegetation("salteago", + new SinglePlantFeature(EndBlocks.SALTEAGO, 5), + 5); + public static final BCLFeature VAIOLUSH_FERN = registerVegetation("vaiolush_fern", + new SinglePlantFeature(EndBlocks.VAIOLUSH_FERN, + 5), + 5); + public static final BCLFeature FRACTURN = registerVegetation("fracturn", + new SinglePlantFeature(EndBlocks.FRACTURN, 5), + 5); + public static final BCLFeature UMBRELLA_MOSS_RARE = registerVegetation("umbrella_moss_rare", + new SinglePlantFeature(EndBlocks.UMBRELLA_MOSS, + 3), + 2); + public static final BCLFeature CREEPING_MOSS_RARE = registerVegetation("creeping_moss_rare", + new SinglePlantFeature(EndBlocks.CREEPING_MOSS, + 3), + 2); + public static final BCLFeature TWISTED_UMBRELLA_MOSS_RARE = registerVegetation("twisted_umbrella_moss_rare", + new SinglePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, + 3), + 2); + public static final BCLFeature ORANGO = registerVegetation("orango", + new SinglePlantFeature(EndBlocks.ORANGO, 5), + 6); + public static final BCLFeature AERIDIUM = registerVegetation("aeridium", + new SinglePlantFeature(EndBlocks.AERIDIUM, 5, 4), + 5); + public static final BCLFeature LUTEBUS = registerVegetation("lutebus", + new SinglePlantFeature(EndBlocks.LUTEBUS, 5, 2), + 5); + public static final BCLFeature LAMELLARIUM = registerVegetation("lamellarium", + new SinglePlantFeature(EndBlocks.LAMELLARIUM, 5), + 6); + public static final BCLFeature SMALL_AMARANITA = registerVegetation("small_amaranita", + new SinglePlantFeature(EndBlocks.SMALL_AMARANITA_MUSHROOM, + 5, + 5), + 4); + public static final BCLFeature GLOBULAGUS = registerVegetation("globulagus", + new SinglePlantFeature(EndBlocks.GLOBULAGUS, 5, 3), + 6); + public static final BCLFeature CLAWFERN = registerVegetation("clawfern", + new SinglePlantFeature(EndBlocks.CLAWFERN, 5, 4), + 5); + public static final BCLFeature BOLUX_MUSHROOM = registerVegetation("bolux_mushroom", + new SinglePlantFeature(EndBlocks.BOLUX_MUSHROOM, + 5, + 5), + 2); + public static final BCLFeature CHORUS_MUSHROOM = registerVegetation("chorus_mushroom", + new SinglePlantFeature(EndBlocks.CHORUS_MUSHROOM, + 3, + 5), + 1); + public static final BCLFeature AMBER_ROOT = registerVegetation("amber_root", + new SinglePlantFeature(EndBlocks.AMBER_ROOT, 5, 5), + 1); //public static final BCLFeature PEARLBERRY = redisterVegetation("pearlberry", new SinglePlantFeature(EndBlocks.PEARLBERRY, 5, 5), 1); - public static final BCLFeature INFLEXIA = redisterVegetation("inflexia", - new SinglePlantFeature(EndBlocks.INFLEXIA, - 7, - false, - 3), - 16); - public static final BCLFeature FLAMMALIX = redisterVegetation("flammalix", - new SinglePlantFeature(EndBlocks.FLAMMALIX, - 3, - false, - 7), - 5); + public static final BCLFeature INFLEXIA = registerVegetation("inflexia", + new SinglePlantFeature(EndBlocks.INFLEXIA, + 7, + false, + 3), + 16); + public static final BCLFeature FLAMMALIX = registerVegetation("flammalix", + new SinglePlantFeature(EndBlocks.FLAMMALIX, + 3, + false, + 7), + 5); // Vines // - public static final BCLFeature DENSE_VINE = redisterVegetation("dense_vine", - new VineFeature(EndBlocks.DENSE_VINE, 24), - 3); - public static final BCLFeature TWISTED_VINE = redisterVegetation("twisted_vine", - new VineFeature(EndBlocks.TWISTED_VINE, 24), - 1); - public static final BCLFeature BULB_VINE = redisterVegetation("bulb_vine", - new VineFeature(EndBlocks.BULB_VINE, 24), - 3); - public static final BCLFeature JUNGLE_VINE = redisterVegetation("jungle_vine", - new VineFeature(EndBlocks.JUNGLE_VINE, 24), - 5); + public static final BCLFeature DENSE_VINE = registerVegetation("dense_vine", + new VineFeature(EndBlocks.DENSE_VINE, 24), + 3); + public static final BCLFeature TWISTED_VINE = registerVegetation("twisted_vine", + new VineFeature(EndBlocks.TWISTED_VINE, 24), + 1); + public static final BCLFeature BULB_VINE = registerVegetation("bulb_vine", + new VineFeature(EndBlocks.BULB_VINE, 24), + 3); + public static final BCLFeature JUNGLE_VINE = registerVegetation("jungle_vine", + new VineFeature(EndBlocks.JUNGLE_VINE, 24), + 5); // Ceil plants - public static final BCLFeature SMALL_JELLYSHROOM_CEIL = redisterVegetation("small_jellyshroom_ceil", - new SingleInvertedScatterFeature( - EndBlocks.SMALL_JELLYSHROOM, - 8), - 8); + public static final BCLFeature SMALL_JELLYSHROOM_CEIL = registerVegetation("small_jellyshroom_ceil", + new SingleInvertedScatterFeature( + EndBlocks.SMALL_JELLYSHROOM, + 8), + 8); // Wall Plants // - public static final BCLFeature PURPLE_POLYPORE = redisterVegetation("purple_polypore", - new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, - 3), - 5); - public static final BCLFeature AURANT_POLYPORE = redisterVegetation("aurant_polypore", - new WallPlantOnLogFeature(EndBlocks.AURANT_POLYPORE, - 3), - 5); - public static final BCLFeature TAIL_MOSS = redisterVegetation("tail_moss", - new WallPlantFeature(EndBlocks.TAIL_MOSS, 3), - 15); - public static final BCLFeature CYAN_MOSS = redisterVegetation("cyan_moss", - new WallPlantFeature(EndBlocks.CYAN_MOSS, 3), - 15); - public static final BCLFeature TAIL_MOSS_WOOD = redisterVegetation("tail_moss_wood", - new WallPlantOnLogFeature(EndBlocks.TAIL_MOSS, - 4), - 25); - public static final BCLFeature CYAN_MOSS_WOOD = redisterVegetation("cyan_moss_wood", - new WallPlantOnLogFeature(EndBlocks.CYAN_MOSS, - 4), - 25); - public static final BCLFeature TWISTED_MOSS = redisterVegetation("twisted_moss", - new WallPlantFeature(EndBlocks.TWISTED_MOSS, 6), - 15); - public static final BCLFeature TWISTED_MOSS_WOOD = redisterVegetation("twisted_moss_wood", - new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, - 6), - 25); - public static final BCLFeature BULB_MOSS = redisterVegetation("bulb_moss", - new WallPlantFeature(EndBlocks.BULB_MOSS, 6), - 1); - public static final BCLFeature BULB_MOSS_WOOD = redisterVegetation("bulb_moss_wood", - new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, - 6), - 15); - public static final BCLFeature SMALL_JELLYSHROOM_WALL = redisterVegetation("small_jellyshroom_wall", - new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, - 4), - 4); - public static final BCLFeature SMALL_JELLYSHROOM_WOOD = redisterVegetation("small_jellyshroom_wood", - new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, - 4), - 8); - public static final BCLFeature JUNGLE_FERN_WOOD = redisterVegetation("jungle_fern_wood", - new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, - 3), - 12); - public static final BCLFeature RUSCUS = redisterVegetation("ruscus", new WallPlantFeature(EndBlocks.RUSCUS, 6), 10); - public static final BCLFeature RUSCUS_WOOD = redisterVegetation("ruscus_wood", - new WallPlantOnLogFeature(EndBlocks.RUSCUS, 6), - 10); + public static final BCLFeature PURPLE_POLYPORE = registerVegetation("purple_polypore", + new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, + 3), + 5); + public static final BCLFeature AURANT_POLYPORE = registerVegetation("aurant_polypore", + new WallPlantOnLogFeature(EndBlocks.AURANT_POLYPORE, + 3), + 5); + public static final BCLFeature TAIL_MOSS = registerVegetation("tail_moss", + new WallPlantFeature(EndBlocks.TAIL_MOSS, 3), + 15); + public static final BCLFeature CYAN_MOSS = registerVegetation("cyan_moss", + new WallPlantFeature(EndBlocks.CYAN_MOSS, 3), + 15); + public static final BCLFeature TAIL_MOSS_WOOD = registerVegetation("tail_moss_wood", + new WallPlantOnLogFeature(EndBlocks.TAIL_MOSS, + 4), + 25); + public static final BCLFeature CYAN_MOSS_WOOD = registerVegetation("cyan_moss_wood", + new WallPlantOnLogFeature(EndBlocks.CYAN_MOSS, + 4), + 25); + public static final BCLFeature TWISTED_MOSS = registerVegetation("twisted_moss", + new WallPlantFeature(EndBlocks.TWISTED_MOSS, 6), + 15); + public static final BCLFeature TWISTED_MOSS_WOOD = registerVegetation("twisted_moss_wood", + new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, + 6), + 25); + public static final BCLFeature BULB_MOSS = registerVegetation("bulb_moss", + new WallPlantFeature(EndBlocks.BULB_MOSS, 6), + 1); + public static final BCLFeature BULB_MOSS_WOOD = registerVegetation("bulb_moss_wood", + new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, + 6), + 15); + public static final BCLFeature SMALL_JELLYSHROOM_WALL = registerVegetation("small_jellyshroom_wall", + new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, + 4), + 4); + public static final BCLFeature SMALL_JELLYSHROOM_WOOD = registerVegetation("small_jellyshroom_wood", + new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, + 4), + 8); + public static final BCLFeature JUNGLE_FERN_WOOD = registerVegetation("jungle_fern_wood", + new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, + 3), + 12); + public static final BCLFeature RUSCUS = registerVegetation("ruscus", new WallPlantFeature(EndBlocks.RUSCUS, 6), 10); + public static final BCLFeature RUSCUS_WOOD = registerVegetation("ruscus_wood", + new WallPlantOnLogFeature(EndBlocks.RUSCUS, 6), + 10); // Sky plants - public static final BCLFeature FILALUX = redisterVegetation("filalux", new FilaluxFeature(), 1); + public static final BCLFeature FILALUX = registerVegetation("filalux", new FilaluxFeature(), 1); // Water // - public static final BCLFeature BUBBLE_CORAL = redisterVegetation("bubble_coral", - new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, - 6), - 10); - public static final BCLFeature BUBBLE_CORAL_RARE = redisterVegetation("bubble_coral_rare", - new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, - 3), - 4); - public static final BCLFeature END_LILY = redisterVegetation("end_lily", new EndLilyFeature(6), 10); - public static final BCLFeature END_LILY_RARE = redisterVegetation("end_lily_rare", new EndLilyFeature(3), 4); - public static final BCLFeature END_LOTUS = redisterVegetation("end_lotus", new EndLotusFeature(7), 5); - public static final BCLFeature END_LOTUS_LEAF = redisterVegetation("end_lotus_leaf", - new EndLotusLeafFeature(20), - 25); - public static final BCLFeature HYDRALUX = redisterVegetation("hydralux", new HydraluxFeature(5), 5); - public static final BCLFeature POND_ANEMONE = redisterVegetation("pond_anemone", - new UnderwaterPlantFeature(EndBlocks.POND_ANEMONE, - 6), - 10); + public static final BCLFeature BUBBLE_CORAL = registerVegetation("bubble_coral", + new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, + 6), + 10); + public static final BCLFeature BUBBLE_CORAL_RARE = registerVegetation("bubble_coral_rare", + new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, + 3), + 4); + public static final BCLFeature END_LILY = registerVegetation("end_lily", new EndLilyFeature(6), 10); + public static final BCLFeature END_LILY_RARE = registerVegetation("end_lily_rare", new EndLilyFeature(3), 4); + public static final BCLFeature END_LOTUS = registerVegetation("end_lotus", new EndLotusFeature(7), 5); + public static final BCLFeature END_LOTUS_LEAF = registerVegetation("end_lotus_leaf", + new EndLotusLeafFeature(20), + 25); + public static final BCLFeature HYDRALUX = registerVegetation("hydralux", new HydraluxFeature(5), 5); + public static final BCLFeature POND_ANEMONE = registerVegetation("pond_anemone", + new UnderwaterPlantFeature(EndBlocks.POND_ANEMONE, + 6), + 10); - public static final BCLFeature CHARNIA_RED = redisterVegetation("charnia_red", - new CharniaFeature(EndBlocks.CHARNIA_RED), - 10); - public static final BCLFeature CHARNIA_PURPLE = redisterVegetation("charnia_purple", - new CharniaFeature(EndBlocks.CHARNIA_PURPLE), - 10); - public static final BCLFeature CHARNIA_CYAN = redisterVegetation("charnia_cyan", - new CharniaFeature(EndBlocks.CHARNIA_CYAN), - 10); - public static final BCLFeature CHARNIA_LIGHT_BLUE = redisterVegetation("charnia_light_blue", - new CharniaFeature(EndBlocks.CHARNIA_LIGHT_BLUE), - 10); - public static final BCLFeature CHARNIA_ORANGE = redisterVegetation("charnia_orange", - new CharniaFeature(EndBlocks.CHARNIA_ORANGE), - 10); - public static final BCLFeature CHARNIA_GREEN = redisterVegetation("charnia_green", - new CharniaFeature(EndBlocks.CHARNIA_GREEN), - 10); - public static final BCLFeature MENGER_SPONGE = redisterVegetation("menger_sponge", new MengerSpongeFeature(5), 1); - public static final BCLFeature CHARNIA_RED_RARE = redisterVegetation("charnia_red_rare", - new CharniaFeature(EndBlocks.CHARNIA_RED), - 2); - public static final BCLFeature BIOME_ISLAND = BCLFeatureBuilder.start(BetterEnd.makeID("overworld_island"), - new BiomeIslandFeature()) - .decoration(Decoration.RAW_GENERATION) - .build(); - public static final BCLFeature FLAMAEA = redisterVegetation("flamaea", - new SinglePlantFeature(EndBlocks.FLAMAEA, 12, false, 5), - 20); + public static final BCLFeature CHARNIA_RED = registerVegetation("charnia_red", + new CharniaFeature(EndBlocks.CHARNIA_RED), + 10); + public static final BCLFeature CHARNIA_PURPLE = registerVegetation("charnia_purple", + new CharniaFeature(EndBlocks.CHARNIA_PURPLE), + 10); + public static final BCLFeature CHARNIA_CYAN = registerVegetation("charnia_cyan", + new CharniaFeature(EndBlocks.CHARNIA_CYAN), + 10); + public static final BCLFeature CHARNIA_LIGHT_BLUE = registerVegetation("charnia_light_blue", + new CharniaFeature(EndBlocks.CHARNIA_LIGHT_BLUE), + 10); + public static final BCLFeature CHARNIA_ORANGE = registerVegetation("charnia_orange", + new CharniaFeature(EndBlocks.CHARNIA_ORANGE), + 10); + public static final BCLFeature CHARNIA_GREEN = registerVegetation("charnia_green", + new CharniaFeature(EndBlocks.CHARNIA_GREEN), + 10); + public static final BCLFeature MENGER_SPONGE = registerVegetation("menger_sponge", new MengerSpongeFeature(5), 1); + public static final BCLFeature CHARNIA_RED_RARE = registerVegetation("charnia_red_rare", + new CharniaFeature(EndBlocks.CHARNIA_RED), + 2); + public static final BCLFeature BIOME_ISLAND = BCLFeatureBuilder + .start(BetterEnd.makeID("overworld_island"), + new BiomeIslandFeature()) + .decoration(Decoration.RAW_GENERATION) + .buildAndRegister(); + public static final BCLFeature FLAMAEA = registerVegetation("flamaea", + new SinglePlantFeature(EndBlocks.FLAMAEA, 12, false, 5), + 20); // Terrain // public static final BCLFeature END_LAKE = registerLake("end_lake", new EndLakeFeature(), 4); @@ -369,53 +366,53 @@ public class EndFeatures { public static final BCLFeature GEYSER = registerRawGen("geyser", new GeyserFeature(), 8); public static final BCLFeature SULPHURIC_LAKE = registerLake("sulphuric_lake", new SulphuricLakeFeature(), 8); public static final BCLFeature SULPHURIC_CAVE = BCLCommonFeatures.makeCountFeature(BetterEnd.makeID("sulphuric_cave"), - Decoration.RAW_GENERATION, - new SulphuricCaveFeature(), - 2); + Decoration.RAW_GENERATION, + new SulphuricCaveFeature(), + 2); public static final BCLFeature ICE_STAR = registerRawGen("ice_star", new IceStarFeature(5, 15, 10, 25), 15); public static final BCLFeature ICE_STAR_SMALL = registerRawGen("ice_star_small", - new IceStarFeature(3, 5, 7, 12), - 8); + new IceStarFeature(3, 5, 7, 12), + 8); public static final BCLFeature SURFACE_VENT = registerChanced("surface_vent", new SurfaceVentFeature(), 4); public static final BCLFeature SULPHUR_HILL = registerChanced("sulphur_hill", new SulphurHillFeature(), 8); public static final BCLFeature OBSIDIAN_PILLAR_BASEMENT = registerChanced("obsidian_pillar_basement", - new ObsidianPillarBasementFeature(), - 8); + new ObsidianPillarBasementFeature(), + 8); public static final BCLFeature OBSIDIAN_BOULDER = registerChanced("obsidian_boulder", - new ObsidianBoulderFeature(), - 10); + new ObsidianBoulderFeature(), + 10); public static final BCLFeature FALLEN_PILLAR = registerChanced("fallen_pillar", new FallenPillarFeature(), 20); public static final BCLFeature TUNEL_CAVE = BCLCommonFeatures.makeChunkFeature(BetterEnd.makeID("tunel_cave"), - Decoration.RAW_GENERATION, - new TunelCaveFeature()); + Decoration.RAW_GENERATION, + new TunelCaveFeature()); public static final BCLFeature UMBRALITH_ARCH = registerChanced("umbralith_arch", new ArchFeature( EndBlocks.UMBRALITH.stone, pos -> UmbraValleyBiome.getSurface(pos.getX(), pos.getZ()).defaultBlockState() ), 10); public static final BCLFeature THIN_UMBRALITH_ARCH = registerChanced("thin_umbralith_arch", - new ThinArchFeature(EndBlocks.UMBRALITH.stone), - 15); + new ThinArchFeature(EndBlocks.UMBRALITH.stone), + 15); // Ores // public static final BCLFeature THALLASIUM_ORE = registerOre("thallasium_ore", EndBlocks.THALLASIUM.ore, 24, 8); public static final BCLFeature ENDER_ORE = registerOre("ender_ore", EndBlocks.ENDER_ORE, 12, 4); public static final BCLFeature AMBER_ORE = registerOre("amber_ore", EndBlocks.AMBER_ORE, 60, 6); public static final BCLFeature DRAGON_BONE_BLOCK_ORE = registerOre("dragon_bone_ore", - EndBlocks.DRAGON_BONE_BLOCK, - 24, - 8); + EndBlocks.DRAGON_BONE_BLOCK, + 24, + 8); public static final BCLFeature VIOLECITE_LAYER = registerLayer("violecite_layer", - EndBlocks.VIOLECITE, - 15, - 16, - 128, - 8); + EndBlocks.VIOLECITE, + 15, + 16, + 128, + 8); public static final BCLFeature FLAVOLITE_LAYER = registerLayer("flavolite_layer", - EndBlocks.FLAVOLITE, - 12, - 16, - 128, - 6); + EndBlocks.FLAVOLITE, + 12, + 16, + 128, + 6); // Buildings public static final BCLFeature CRASHED_SHIP = registerChanced("crashed_ship", new CrashedShipFeature(), 500); @@ -454,9 +451,12 @@ public class EndFeatures { ); public static final DefaultFeature CAVE_PUMPKIN = new CavePumpkinFeature(); - private static BCLFeature redisterVegetation(String name, Feature feature, int density) { + private static > BCLFeature registerVegetation( + String name, + F feature, + int density) { ResourceLocation id = BetterEnd.makeID(name); - return BCLFeatureBuilder.start(id, feature).countLayersMax(density).onlyInBiome().build(); + return BCLFeatureBuilder.start(id, feature).countLayersMax(density).onlyInBiome().buildAndRegister(); } private static BCLFeature registerRawGen(String name, Feature feature, int chance) { @@ -469,21 +469,21 @@ public class EndFeatures { private static BCLFeature registerChanced(String name, Feature feature, int chance) { return BCLCommonFeatures.makeChancedFeature(BetterEnd.makeID(name), - Decoration.SURFACE_STRUCTURES, - feature, - chance); + Decoration.SURFACE_STRUCTURES, + feature, + chance); } private static BCLFeature registerOre(String name, Block blockOre, int veins, int veinSize) { return BCLCommonFeatures.makeOreFeature(BetterEnd.makeID(name), - blockOre, - Blocks.END_STONE, - veins, - veinSize, - 0, - HeightRangePlacement.uniform(VerticalAnchor.bottom(), - VerticalAnchor.absolute(128)), - false); + blockOre, + Blocks.END_STONE, + veins, + veinSize, + 0, + HeightRangePlacement.uniform(VerticalAnchor.bottom(), + VerticalAnchor.absolute(128)), + false); } private static BCLFeature registerLayer(String name, Block block, float radius, int minY, int maxY, int count) { @@ -492,7 +492,7 @@ public class EndFeatures { .start(BetterEnd.makeID(name), layer) .decoration(GenerationStep.Decoration.UNDERGROUND_ORES) .modifier(CountPlacement.of(count)) - .build(); + .buildAndRegister(); } private static BCLFeature registerLayer(String name, @@ -542,7 +542,7 @@ public class EndFeatures { .start(id, feature) .decoration(Decoration.SURFACE_STRUCTURES) .modifier(placed.placement()) - .build(placed.feature().value().config()); + .buildAndRegister(placed.feature().value().config()); } String path = "/data/" + ns + "/structures/biome/" + nm + "/"; @@ -551,13 +551,15 @@ public class EndFeatures { JsonObject obj = JsonFactory.getJsonObject(inputstream); JsonArray structures = obj.getAsJsonArray("structures"); if (structures != null) { - List list = Lists.newArrayList(); + List list = Lists.newArrayList(); structures.forEach((entry) -> { JsonObject e = entry.getAsJsonObject(); String structure = path + e.get("nbt").getAsString() + ".nbt"; - TerrainMerge terrainMerge = TerrainMerge.getFromString(e.get("terrainMerge").getAsString()); + NBTFeature.TerrainMerge terrainMerge = NBTFeature.TerrainMerge.getFromString(e + .get("terrainMerge") + .getAsString()); int offsetY = e.get("offsetY").getAsInt(); - list.add(new StructureInfo(structure, offsetY, terrainMerge)); + list.add(new ListFeature.StructureInfo(structure, offsetY, terrainMerge)); }); if (!list.isEmpty()) { return BCLCommonFeatures.makeChancedFeature( @@ -565,7 +567,7 @@ public class EndFeatures { Decoration.SURFACE_STRUCTURES, new BuildingListFeature(list, Blocks.END_STONE.defaultBlockState()), 10 - ); + ); } } } diff --git a/src/main/java/org/betterx/betterend/registry/EndStructures.java b/src/main/java/org/betterx/betterend/registry/EndStructures.java index f75141d1..6f046e11 100644 --- a/src/main/java/org/betterx/betterend/registry/EndStructures.java +++ b/src/main/java/org/betterx/betterend/registry/EndStructures.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.world.structures.BCLStructure; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.world.structures.features.*; diff --git a/src/main/java/org/betterx/betterend/registry/EndTags.java b/src/main/java/org/betterx/betterend/registry/EndTags.java index 296d3e19..42aeccad 100644 --- a/src/main/java/org/betterx/betterend/registry/EndTags.java +++ b/src/main/java/org/betterx/betterend/registry/EndTags.java @@ -14,9 +14,9 @@ import net.fabricmc.fabric.mixin.object.builder.AbstractBlockAccessor; import net.fabricmc.fabric.mixin.object.builder.AbstractBlockSettingsAccessor; import com.google.common.collect.Lists; -import org.betterx.bclib.api.BonemealAPI; -import org.betterx.bclib.api.ComposterAPI; -import org.betterx.bclib.api.tag.*; +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; diff --git a/src/main/java/org/betterx/betterend/util/BonemealPlants.java b/src/main/java/org/betterx/betterend/util/BonemealPlants.java index 2964a846..4afdcbe2 100644 --- a/src/main/java/org/betterx/betterend/util/BonemealPlants.java +++ b/src/main/java/org/betterx/betterend/util/BonemealPlants.java @@ -4,7 +4,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import com.google.common.collect.Lists; -import org.betterx.bclib.api.BonemealAPI; +import org.betterx.bclib.api.v2.BonemealAPI; import org.betterx.betterend.blocks.basis.EndTerrainBlock; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.EndBlocks; diff --git a/src/main/java/org/betterx/betterend/util/LootTableUtil.java b/src/main/java/org/betterx/betterend/util/LootTableUtil.java index dcd87561..fe983d13 100644 --- a/src/main/java/org/betterx/betterend/util/LootTableUtil.java +++ b/src/main/java/org/betterx/betterend/util/LootTableUtil.java @@ -14,8 +14,8 @@ import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; import net.fabricmc.fabric.api.loot.v1.FabricLootSupplierBuilder; import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.complexmaterials.WoodenComplexMaterial; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndBiomes; diff --git a/src/main/java/org/betterx/betterend/util/StructureErode.java b/src/main/java/org/betterx/betterend/util/StructureErode.java index f12f35d2..66136d97 100644 --- a/src/main/java/org/betterx/betterend/util/StructureErode.java +++ b/src/main/java/org/betterx/betterend/util/StructureErode.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.material.Material; import com.google.common.collect.Sets; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/world/biome/EndBiome.java b/src/main/java/org/betterx/betterend/world/biome/EndBiome.java index 6b5250c6..7d91acd7 100644 --- a/src/main/java/org/betterx/betterend/world/biome/EndBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/EndBiome.java @@ -9,12 +9,12 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.SurfaceRules; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndBlocks; diff --git a/src/main/java/org/betterx/betterend/world/biome/air/BiomeIceStarfield.java b/src/main/java/org/betterx/betterend/world/biome/air/BiomeIceStarfield.java index 413a0f6e..db442802 100644 --- a/src/main/java/org/betterx/betterend/world/biome/air/BiomeIceStarfield.java +++ b/src/main/java/org/betterx/betterend/world/biome/air/BiomeIceStarfield.java @@ -2,7 +2,7 @@ package org.betterx.betterend.world.biome.air; import net.minecraft.world.entity.EntityType; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; import org.betterx.betterend.registry.EndStructures; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java index acafc13c..b434d6ee 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java @@ -2,9 +2,9 @@ package org.betterx.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java index 5068e534..b917b566 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java @@ -2,9 +2,9 @@ package org.betterx.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java index 69951219..d8bcf749 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java @@ -2,9 +2,9 @@ package org.betterx.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java index c812900d..a03461c4 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java @@ -8,13 +8,13 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.feature.Feature; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.features.BCLCommonFeatures; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.features.BCLCommonFeatures; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; import org.betterx.bclib.util.WeightedList; -import org.betterx.bclib.world.features.BCLFeature; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndSounds; import org.betterx.betterend.world.biome.EndBiome; @@ -32,7 +32,7 @@ public class EndCaveBiome extends EndBiome { BetterEnd.makeID(ID.getPath() + "_cave_populator"), GenerationStep.Decoration.RAW_GENERATION, new CaveChunkPopulatorFeature(() -> (EndCaveBiome) BiomeAPI.getBiome(ID)) - ); + ); builder.feature(feature) .music(EndSounds.MUSIC_CAVES) diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java index cebacddd..e8ac4307 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java @@ -5,9 +5,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java index 8fce5376..fe70f635 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java @@ -4,9 +4,9 @@ import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java index db38c4fd..cb88c615 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java @@ -3,9 +3,9 @@ package org.betterx.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.api.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeSettings; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/AmberLandBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/AmberLandBiome.java index 9cc186e1..aab45d20 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/AmberLandBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/AmberLandBiome.java @@ -4,7 +4,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/BlossomingSpiresBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/BlossomingSpiresBiome.java index 9b1aaf05..aa501c8c 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/BlossomingSpiresBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/BlossomingSpiresBiome.java @@ -3,7 +3,7 @@ package org.betterx.betterend.world.biome.land; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndEntities; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java index 4642efd1..ea167355 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java @@ -7,7 +7,7 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndEntities; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/CrystalMountainsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/CrystalMountainsBiome.java index b7eff3bb..9e0fded6 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/CrystalMountainsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/CrystalMountainsBiome.java @@ -3,7 +3,7 @@ package org.betterx.betterend.world.biome.land; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java index 65270b9c..b5b8492c 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java @@ -3,7 +3,7 @@ package org.betterx.betterend.world.biome.land; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java index dc21fb39..b8ea43d7 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java @@ -4,7 +4,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java index e9668e75..b4deeb7d 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java @@ -8,8 +8,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.placement.CaveSurface; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndSounds; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java index fefe07a3..4e44909e 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java @@ -4,7 +4,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java index f190fffd..6d16e31b 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java @@ -4,7 +4,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java index 5ec0ae02..121c4eaa 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java @@ -4,7 +4,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/MegalakeBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/MegalakeBiome.java index eb0ee1ba..6bf73c2f 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/MegalakeBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/MegalakeBiome.java @@ -3,7 +3,7 @@ package org.betterx.betterend.world.biome.land; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/MegalakeGroveBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/MegalakeGroveBiome.java index e4b5e414..a20b3e16 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/MegalakeGroveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/MegalakeGroveBiome.java @@ -3,7 +3,7 @@ package org.betterx.betterend.world.biome.land; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java index 73e05514..8ab6a312 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java @@ -9,9 +9,9 @@ import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource; import net.minecraft.world.level.levelgen.placement.CaveSurface; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; -import org.betterx.bclib.api.surface.rules.SwitchRuleSource; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.rules.SwitchRuleSource; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/PaintedMountainsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/PaintedMountainsBiome.java index 8814bcbe..c7c66aad 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/PaintedMountainsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/PaintedMountainsBiome.java @@ -4,7 +4,7 @@ import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndSounds; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java index 9b3c3245..7db6537f 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java @@ -5,7 +5,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndEntities; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java index 2de0aaf2..d3cd459d 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java @@ -7,9 +7,9 @@ import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource; import net.minecraft.world.level.levelgen.placement.CaveSurface; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; -import org.betterx.bclib.api.surface.rules.SwitchRuleSource; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.rules.SwitchRuleSource; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/UmbraValleyBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/UmbraValleyBiome.java index af5f9997..78e284d6 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/UmbraValleyBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/UmbraValleyBiome.java @@ -4,9 +4,9 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.SurfaceRules; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; -import org.betterx.bclib.api.surface.rules.SwitchRuleSource; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.rules.SwitchRuleSource; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java index ce37c3c9..59379774 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java @@ -4,7 +4,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/features/BiomeIslandFeature.java b/src/main/java/org/betterx/betterend/world/features/BiomeIslandFeature.java index 42aebbe0..b114499e 100644 --- a/src/main/java/org/betterx/betterend/world/features/BiomeIslandFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/BiomeIslandFeature.java @@ -8,12 +8,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFCappedCone; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/features/BuildingListFeature.java b/src/main/java/org/betterx/betterend/world/features/BuildingListFeature.java index 73695463..1542f4c3 100644 --- a/src/main/java/org/betterx/betterend/world/features/BuildingListFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/BuildingListFeature.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProc import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; -import org.betterx.bclib.world.features.ListFeature; +import org.betterx.bclib.api.v2.levelgen.features.ListFeature; import org.betterx.betterend.util.LootTableUtil; import java.util.List; @@ -53,7 +53,7 @@ public class BuildingListFeature extends ListFeature { chestPos.getX() >> 2, chestPos.getY() >> 2, chestPos.getZ() >> 2 - ); + ); chestEntity.setLootTable(LootTableUtil.getTable(biome), random.nextLong()); chestEntity.setChanged(); } 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 ac6e0924..d38bd84d 100644 --- a/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java @@ -6,9 +6,9 @@ import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.EndBlockProperties; import org.betterx.betterend.registry.EndBlocks; @@ -29,13 +29,13 @@ public class CavePumpkinFeature extends DefaultFeature { world, pos, EndBlocks.CAVE_PUMPKIN_SEED.defaultBlockState().setValue(EndBlockProperties.AGE, age) - ); + ); if (age > 1) { BlocksHelper.setWithoutUpdate( world, pos.below(), EndBlocks.CAVE_PUMPKIN.defaultBlockState().setValue(EndBlockProperties.SMALL, age < 3) - ); + ); } return true; 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 0e05a2c2..c8666efc 100644 --- a/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java @@ -16,10 +16,10 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.*; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.features.NBTFeature; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.StructureHelper; -import org.betterx.bclib.world.features.NBTFeature; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.util.StructureErode; import org.betterx.betterend.world.biome.EndBiome; @@ -97,7 +97,7 @@ public class CrashedShipFeature extends NBTFeature { mirror, rotation, BlockPos.ZERO - ); + ); center = center.offset(0, getYOffset(structure, world, center, random) + 0.5, 0); StructurePlaceSettings placementData = new StructurePlaceSettings().setRotation(rotation).setMirror(mirror); center = center.offset(-offset.getX() * 0.5, 0, -offset.getZ() * 0.5); @@ -113,7 +113,7 @@ public class CrashedShipFeature extends NBTFeature { world, new BlockPos(bounds.minX(), bounds.minY(), bounds.minZ()), new BlockPos(bounds.maxX(), bounds.maxY(), bounds.maxZ()) - ); + ); return true; } diff --git a/src/main/java/org/betterx/betterend/world/features/FullHeightScatterFeature.java b/src/main/java/org/betterx/betterend/world/features/FullHeightScatterFeature.java index fcc50b6d..62b23540 100644 --- a/src/main/java/org/betterx/betterend/world/features/FullHeightScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/FullHeightScatterFeature.java @@ -8,9 +8,9 @@ import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.util.GlobalState; public abstract class FullHeightScatterFeature extends DefaultFeature { diff --git a/src/main/java/org/betterx/betterend/world/features/InvertedScatterFeature.java b/src/main/java/org/betterx/betterend/world/features/InvertedScatterFeature.java index dd8a704a..df1ec5ff 100644 --- a/src/main/java/org/betterx/betterend/world/features/InvertedScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/InvertedScatterFeature.java @@ -8,9 +8,9 @@ import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.util.GlobalState; public abstract class InvertedScatterFeature extends DefaultFeature { diff --git a/src/main/java/org/betterx/betterend/world/features/NeonCactusFeature.java b/src/main/java/org/betterx/betterend/world/features/NeonCactusFeature.java index e989fb31..943f82ca 100644 --- a/src/main/java/org/betterx/betterend/world/features/NeonCactusFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/NeonCactusFeature.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.world.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.betterend.blocks.NeonCactusPlantBlock; import org.betterx.betterend.registry.EndBlocks; 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 e794d1e1..75a7f0c3 100644 --- a/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java @@ -7,10 +7,10 @@ import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.util.GlobalState; public abstract class ScatterFeature extends DefaultFeature { @@ -82,7 +82,7 @@ public abstract class ScatterFeature extends DefaultFeature { center, POS, r - ) && (getChance() < 2 || random.nextInt(getChance()) == 0)) { + ) && (getChance() < 2 || random.nextInt(getChance()) == 0)) { generate(world, random, POS); } } diff --git a/src/main/java/org/betterx/betterend/world/features/SilkMothNestFeature.java b/src/main/java/org/betterx/betterend/world/features/SilkMothNestFeature.java index 01acd839..cfedeb67 100644 --- a/src/main/java/org/betterx/betterend/world/features/SilkMothNestFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/SilkMothNestFeature.java @@ -12,9 +12,9 @@ import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.GlobalState; @@ -51,14 +51,14 @@ public class SilkMothNestFeature extends DefaultFeature { EndBlocks.SILK_MOTH_NEST.defaultBlockState() .setValue(BlockStateProperties.HORIZONTAL_FACING, dir) .setValue(BlockProperties.ACTIVE, false) - ); + ); POS.setY(y - 1); BlocksHelper.setWithoutUpdate( world, POS, EndBlocks.SILK_MOTH_NEST.defaultBlockState() .setValue(BlockStateProperties.HORIZONTAL_FACING, dir) - ); + ); return true; } } diff --git a/src/main/java/org/betterx/betterend/world/features/WallScatterFeature.java b/src/main/java/org/betterx/betterend/world/features/WallScatterFeature.java index 1894a95f..f37e01e5 100644 --- a/src/main/java/org/betterx/betterend/world/features/WallScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/WallScatterFeature.java @@ -9,9 +9,9 @@ import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; public abstract class WallScatterFeature extends DefaultFeature { private static final Direction[] DIR = BlocksHelper.makeHorizontal(); 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 7e273fd4..b974e946 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 @@ -11,7 +11,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -20,7 +21,6 @@ import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import java.util.function.Function; @@ -78,7 +78,7 @@ public class BushFeature extends DefaultFeature { world, p, leaves.defaultBlockState().setValue(LeavesBlock.DISTANCE, 1) - ); + ); } else { BlocksHelper.setWithoutUpdate(world, p, leaves.defaultBlockState()); } 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 463650b7..9ea16b30 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 @@ -12,7 +12,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -21,7 +22,6 @@ import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import java.util.function.Function; @@ -79,7 +79,7 @@ public class BushWithOuterFeature extends DefaultFeature { info.setBlockPos( info.getPos().relative(dir), outer_leaves.defaultBlockState().setValue(BlockStateProperties.FACING, dir) - ); + ); } } } @@ -95,7 +95,7 @@ public class BushWithOuterFeature extends DefaultFeature { world, p, leaves.defaultBlockState().setValue(LeavesBlock.DISTANCE, 1) - ); + ); } else { BlocksHelper.setWithoutUpdate(world, p, leaves.defaultBlockState()); } 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 3ce4ca0f..d5833324 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 @@ -9,12 +9,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.registry.EndBlocks; public class LargeAmaranitaFeature extends DefaultFeature { @@ -42,13 +42,13 @@ public class LargeAmaranitaFeature extends DefaultFeature { world, mut.move(Direction.UP), state.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.MIDDLE) - ); + ); } BlocksHelper.setWithUpdate( world, mut.move(Direction.UP), state.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.TOP) - ); + ); return true; } 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 42d7d013..88750330 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 @@ -9,10 +9,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.EndBlockProperties.LumecornShape; import org.betterx.betterend.blocks.LumecornBlock; import org.betterx.betterend.registry.EndBlocks; @@ -46,7 +46,7 @@ public class Lumecorn extends DefaultFeature { world, mut, EndBlocks.LUMECORN.defaultBlockState().setValue(LumecornBlock.SHAPE, LumecornShape.BOTTOM_SMALL) - ); + ); BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), bottom); BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), topMiddle); BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), top); @@ -57,18 +57,18 @@ public class Lumecorn extends DefaultFeature { world, mut, EndBlocks.LUMECORN.defaultBlockState().setValue(LumecornBlock.SHAPE, LumecornShape.BOTTOM_SMALL) - ); + ); } else { BlocksHelper.setWithoutUpdate( world, mut, EndBlocks.LUMECORN.defaultBlockState().setValue(LumecornBlock.SHAPE, LumecornShape.BOTTOM_BIG) - ); + ); BlocksHelper.setWithoutUpdate( world, mut.move(Direction.UP), EndBlocks.LUMECORN.defaultBlockState().setValue(LumecornBlock.SHAPE, LumecornShape.MIDDLE) - ); + ); height--; } BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), bottom); 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 7bf5c419..cc2b3298 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 @@ -12,7 +12,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -23,7 +24,6 @@ import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.basis.FurBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -54,7 +54,7 @@ public class TenaneaBushFeature extends DefaultFeature { vec.x() * 0.2, vec.y() * 0.2, vec.z() * 0.2 - ) * 3).setSource(sphere); + ) * 3).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> MHelper.randRange(-2F, 2F, random)).setSource(sphere); sphere = new SDFSubtraction().setSourceA(sphere) .setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere)); @@ -75,7 +75,7 @@ public class TenaneaBushFeature extends DefaultFeature { info.setBlockPos( info.getPos().relative(d), EndBlocks.TENANEA_OUTER_LEAVES.defaultBlockState().setValue(FurBlock.FACING, d) - ); + ); } } 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 75b2c796..3fe8003c 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 @@ -11,13 +11,13 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import com.google.common.collect.Lists; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import java.util.List; @@ -41,7 +41,7 @@ public class ArchFeature extends DefaultFeature { BlockPos pos = getPosOnSurfaceWG( world, new BlockPos((origin.getX() & 0xFFFFFFF0) | 7, 0, (origin.getZ() & 0xFFFFFFF0) | 7) - ); + ); if (!world.getBlockState(pos.below(5)).is(CommonBlockTags.GEN_END_STONES)) { return false; } @@ -58,13 +58,13 @@ public class ArchFeature extends DefaultFeature { OpenSimplexNoise noise = new OpenSimplexNoise(random.nextLong()); arch = new SDFDisplacement().setFunction((vec) -> { return (float) (Math.abs(noise.eval(vec.x() * 0.1, - vec.y() * 0.1, - vec.z() * 0.1 - )) * 3F + Math.abs(noise.eval( + vec.y() * 0.1, + vec.z() * 0.1 + )) * 3F + Math.abs(noise.eval( vec.x() * 0.3, vec.y() * 0.3 + 100, vec.z() * 0.3 - )) * 1.3F) - smallRadiusF * Math.abs(1 - vec.y() / bigRadius); + )) * 1.3F) - smallRadiusF * Math.abs(1 - vec.y() / bigRadius); }).setSource(arch); List surface = Lists.newArrayList(); 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 19ef0ff8..d7b38c1f 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 @@ -8,13 +8,13 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.registry.EndBlocks; public class BigAuroraCrystalFeature extends DefaultFeature { 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 93f89680..2a34307d 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 @@ -11,10 +11,10 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.BlockFixer; @@ -116,7 +116,7 @@ public class DesertLakeFeature extends DefaultFeature { x * 0.2, y * 0.2, z * 0.2 - ) * 0.25 + 0.75)) - 1.0 / size; + ) * 0.25 + 0.75)) - 1.0 / size; if (r > 0) { r *= r; if (x2 + z2 <= r) { @@ -127,7 +127,7 @@ public class DesertLakeFeature extends DefaultFeature { pos = POS.below(); if (world.getBlockState(pos).is(CommonBlockTags.GEN_END_STONES)) { state = EndBiome.findTopMaterial(world, - pos); //world.getBiome(pos).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial(); + pos); //world.getBiome(pos).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial(); if (y > waterLevel + 1) BlocksHelper.setWithoutUpdate(world, pos, state); else if (y > waterLevel) BlocksHelper.setWithoutUpdate( @@ -136,13 +136,13 @@ public class DesertLakeFeature extends DefaultFeature { random.nextBoolean() ? state : EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); else BlocksHelper.setWithoutUpdate( world, pos, EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); } } } else { @@ -186,8 +186,9 @@ public class DesertLakeFeature extends DefaultFeature { BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.ENDSTONE_DUST.defaultBlockState()); } pos = POS.above(); - while (canReplace(state = world.getBlockState(pos)) && !state.isAir() && state.getFluidState() - .isEmpty()) { + while (canReplace(state = world.getBlockState(pos)) && !state.isAir() && state + .getFluidState() + .isEmpty()) { BlocksHelper.setWithoutUpdate(world, pos, pos.getY() < waterLevel ? WATER : AIR); pos = pos.above(); } @@ -200,19 +201,19 @@ public class DesertLakeFeature extends DefaultFeature { } else if (y < waterLevel) { if (world.isEmptyBlock(POS.above())) { state = EndBiome.findTopMaterial(world, - pos); //world.getBiome(POS).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial(); + pos); //world.getBiome(POS).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial(); BlocksHelper.setWithoutUpdate( world, POS, random.nextBoolean() ? state : EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); BlocksHelper.setWithoutUpdate(world, POS.below(), END_STONE); } else { BlocksHelper.setWithoutUpdate( world, POS, EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); BlocksHelper.setWithoutUpdate(world, POS.below(), END_STONE); } } @@ -226,16 +227,17 @@ public class DesertLakeFeature extends DefaultFeature { world, new BlockPos(minX - 2, waterLevel - 2, minZ - 2), new BlockPos(maxX + 2, blockPos.getY() + 20, maxZ + 2) - ); + ); return true; } private boolean canReplace(BlockState state) { return state.getMaterial() - .isReplaceable() || state.is(CommonBlockTags.GEN_END_STONES) || state.is(EndBlocks.ENDSTONE_DUST) || state.getMaterial() - .equals( - Material.PLANT) || state + .isReplaceable() || state.is(CommonBlockTags.GEN_END_STONES) || state.is(EndBlocks.ENDSTONE_DUST) || state + .getMaterial() + .equals( + Material.PLANT) || state .getMaterial() .equals(Material.WATER_PLANT); } 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 9e957148..cd63f1b7 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 @@ -11,10 +11,10 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.util.BlockFixer; @@ -119,7 +119,7 @@ public class EndLakeFeature extends DefaultFeature { x * 0.2, y * 0.2, z * 0.2 - ) * 0.25 + 0.75)) - 1.0 / size; + ) * 0.25 + 0.75)) - 1.0 / size; if (r > 0) { r *= r; if (x2 + z2 <= r) { @@ -138,13 +138,13 @@ public class EndLakeFeature extends DefaultFeature { random.nextBoolean() ? state : EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); else BlocksHelper.setWithoutUpdate( world, pos, EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); } } } else { @@ -188,8 +188,9 @@ public class EndLakeFeature extends DefaultFeature { BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.ENDSTONE_DUST.defaultBlockState()); } pos = POS.above(); - while (canReplace(state = world.getBlockState(pos)) && !state.isAir() && state.getFluidState() - .isEmpty()) { + while (canReplace(state = world.getBlockState(pos)) && !state.isAir() && state + .getFluidState() + .isEmpty()) { BlocksHelper.setWithoutUpdate(world, pos, pos.getY() < waterLevel ? WATER : AIR); pos = pos.above(); } @@ -206,7 +207,7 @@ public class EndLakeFeature extends DefaultFeature { world, POS, random.nextBoolean() ? state : EndBlocks.ENDSTONE_DUST.defaultBlockState() - ); + ); BlocksHelper.setWithoutUpdate(world, POS.below(), END_STONE); } else { BlocksHelper.setWithoutUpdate(world, POS, EndBlocks.ENDSTONE_DUST.defaultBlockState()); @@ -222,16 +223,17 @@ public class EndLakeFeature extends DefaultFeature { world, new BlockPos(minX - 2, waterLevel - 2, minZ - 2), new BlockPos(maxX + 2, blockPos.getY() + 20, maxZ + 2) - ); + ); return true; } private boolean canReplace(BlockState state) { return state.getMaterial() - .isReplaceable() || state.is(CommonBlockTags.GEN_END_STONES) || state.is(EndBlocks.ENDSTONE_DUST) || state.getMaterial() - .equals( - Material.PLANT) || state + .isReplaceable() || state.is(CommonBlockTags.GEN_END_STONES) || state.is(EndBlocks.ENDSTONE_DUST) || state + .getMaterial() + .equals( + Material.PLANT) || state .getMaterial() .equals(Material.WATER_PLANT); } 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 8ca5c0c2..beacc1b1 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 @@ -10,14 +10,14 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFCappedCone; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -30,7 +30,7 @@ public class FallenPillarFeature extends DefaultFeature { pos = getPosOnSurface( world, new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)) - ); + ); if (!world.getBlockState(pos.below(5)).is(CommonBlockTags.GEN_END_STONES)) { return false; } diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java index c8e8995e..2980a78c 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import com.google.common.collect.Lists; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.primitive.SDFSphere; 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 2ea9830b..a5ca8da2 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 @@ -15,7 +15,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -24,7 +25,6 @@ import org.betterx.bclib.sdf.primitive.SDFPrimitive; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.HydrothermalVentBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -177,9 +177,9 @@ public class GeyserFeature extends DefaultFeature { for (int i = 0; i < 150; i++) { mut.set(pos) .move(MHelper.floor(random.nextGaussian() * 4 + 0.5), - -halfHeight - 10, - MHelper.floor(random.nextGaussian() * 4 + 0.5) - ); + -halfHeight - 10, + MHelper.floor(random.nextGaussian() * 4 + 0.5) + ); float distRaw = MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ()); int dist = MHelper.floor(6 - distRaw) + random.nextInt(2); if (dist >= 0) { @@ -201,7 +201,7 @@ public class GeyserFeature extends DefaultFeature { p, EndBlocks.TUBE_WORM.defaultBlockState() .setValue(HorizontalDirectionalBlock.FACING, dir) - ); + ); } } mut.setY(mut.getY() + 1); @@ -223,9 +223,9 @@ public class GeyserFeature extends DefaultFeature { for (int i = 0; i < 10; i++) { mut.set(pos) .move(MHelper.floor(random.nextGaussian() * 0.7 + 0.5), - -halfHeight - 10, - MHelper.floor(random.nextGaussian() * 0.7 + 0.5) - ); + -halfHeight - 10, + MHelper.floor(random.nextGaussian() * 0.7 + 0.5) + ); float distRaw = MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ()); int dist = MHelper.floor(6 - distRaw) + random.nextInt(2); if (dist >= 0) { @@ -255,11 +255,11 @@ public class GeyserFeature extends DefaultFeature { EndFeatures.SULPHURIC_LAKE.getFeature() .place(new FeaturePlaceContext<>(Optional.empty(), - world, - chunkGenerator, - random, - pos, - null)); + world, + chunkGenerator, + random, + pos, + null)); double distance = radius1 * 1.7; BlockPos start = pos.offset(-distance, -halfHeight - 15 - distance, -distance); diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/IceStarFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/IceStarFeature.java index 4c5e9e6c..12facdc8 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/IceStarFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/IceStarFeature.java @@ -8,13 +8,13 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import com.mojang.math.Vector3f; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFRotation; import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.operator.SDFUnion; import org.betterx.bclib.sdf.primitive.SDFCappedCone; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.registry.EndBlocks; import java.util.ArrayList; @@ -84,7 +84,7 @@ public class IceStarFeature extends DefaultFeature { px, py, pz - ) * 0.4F + random.nextFloat() * randScale; + ) * 0.4F + random.nextFloat() * randScale; if (distance < ancientRadius) { return ancient; } else if (distance < denseRadius) { 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 a11239f8..3565d23c 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 @@ -9,13 +9,13 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -28,7 +28,7 @@ public class ObsidianBoulderFeature extends DefaultFeature { pos = getPosOnSurface( world, new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)) - ); + ); if (!world.getBlockState(pos.below()).is(CommonBlockTags.END_STONES)) { return false; } @@ -38,7 +38,7 @@ public class ObsidianBoulderFeature extends DefaultFeature { BlockPos p = getPosOnSurface( world, new BlockPos(pos.getX() + random.nextInt(16) - 8, pos.getY(), pos.getZ() + random.nextInt(16) - 8) - ); + ); makeBoulder(world, p, random); } 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 4f34e587..07f56de7 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 @@ -10,7 +10,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -19,7 +20,6 @@ import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFCappedCone; import org.betterx.bclib.sdf.primitive.SDFFlatland; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -32,7 +32,7 @@ public class ObsidianPillarBasementFeature extends DefaultFeature { pos = getPosOnSurface( world, new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)) - ); + ); if (!world.getBlockState(pos.below(5)).is(CommonBlockTags.GEN_END_STONES)) { return false; } diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/OreLayerFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/OreLayerFeature.java index 8bb7bb8d..086a78e5 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/OreLayerFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/OreLayerFeature.java @@ -8,12 +8,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFCoordModify; import org.betterx.bclib.sdf.operator.SDFScale3D; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; public class OreLayerFeature extends DefaultFeature { 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 dfda30fd..fab0173b 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 @@ -9,9 +9,9 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.features.DefaultFeature; public class SingleBlockFeature extends DefaultFeature { private final Block block; 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 d5e0fe31..b2936fb0 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 @@ -9,10 +9,10 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.registry.EndBlocks; public class SmaragdantCrystalFeature extends DefaultFeature { @@ -35,7 +35,7 @@ public class SmaragdantCrystalFeature extends DefaultFeature { int dist = MHelper.floor(1.5F - MHelper.length( mut.getX() - pos.getX(), mut.getZ() - pos.getZ() - )) + random.nextInt(3); + )) + random.nextInt(3); if (dist > 0) { BlockState state = world.getBlockState(mut); for (int n = 0; n < 10 && state.isAir(); n++) { @@ -53,7 +53,7 @@ public class SmaragdantCrystalFeature extends DefaultFeature { world, mut, shard.setValue(BlockStateProperties.WATERLOGGED, waterlogged) - ); + ); } } } 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 37a8a30f..b05b5e3e 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 @@ -13,15 +13,15 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.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; import org.betterx.bclib.sdf.operator.SDFTranslate; import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.EndFeatures; @@ -59,9 +59,9 @@ public class SpireFeature extends DefaultFeature { vec.x() * 0.1, vec.y() * 0.1, vec.z() * 0.1 - )) * 3F + Math.abs(noise.eval(vec.x() * 0.3, - vec.y() * 0.3 + 100, - vec.z() * 0.3)) * 1.3F); + )) * 3F + Math.abs(noise.eval(vec.x() * 0.3, + vec.y() * 0.3 + 100, + vec.z() * 0.3)) * 1.3F); }).setSource(sdf); final BlockPos center = pos; List support = Lists.newArrayList(); @@ -86,11 +86,11 @@ public class SpireFeature extends DefaultFeature { if (BiomeAPI.getFromBiome(world.getBiome(bpos)) == EndBiomes.BLOSSOMING_SPIRES) { EndFeatures.TENANEA_BUSH.getFeature() .place(new FeaturePlaceContext<>(Optional.empty(), - world, - chunkGenerator, - random, - bpos, - null)); + world, + chunkGenerator, + random, + bpos, + null)); } }); 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 d5a8f058..6a756f11 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 @@ -11,10 +11,10 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; public class StalactiteFeature extends DefaultFeature { private final boolean ceiling; @@ -66,7 +66,7 @@ public class StalactiteFeature extends DefaultFeature { BlockState state = stalagnate ? base.setValue( StalactiteBlock.IS_FLOOR, dir > 0 ? i < center : i > center - ) : base.setValue(StalactiteBlock.IS_FLOOR, dir > 0); + ) : base.setValue(StalactiteBlock.IS_FLOOR, dir > 0); BlocksHelper.setWithoutUpdate(world, mut, state); } diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/SulphurHillFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SulphurHillFeature.java index e421a486..55580199 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SulphurHillFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SulphurHillFeature.java @@ -10,10 +10,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; 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 96eb2b25..7dd14259 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 @@ -14,10 +14,10 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.google.common.collect.Sets; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.EndBlockProperties; import org.betterx.betterend.blocks.SulphurCrystalBlock; import org.betterx.betterend.noise.OpenSimplexNoise; @@ -110,7 +110,7 @@ public class SulphuricCaveFeature extends DefaultFeature { x * 0.03, y * 0.03, z * 0.03 - ) * 0.5; + ) * 0.5; if (v > 0.4) { brimstone.add(mut.immutable()); } else { @@ -130,13 +130,13 @@ public class SulphuricCaveFeature extends DefaultFeature { for (int i = 0; i < count; i++) { mut.set(pos) .move(MHelper.floor(random.nextGaussian() * 2 + 0.5), - 0, - MHelper.floor(random.nextGaussian() * 2 + 0.5) - ); + 0, + MHelper.floor(random.nextGaussian() * 2 + 0.5) + ); int dist = MHelper.floor(3 - MHelper.length( mut.getX() - pos.getX(), mut.getZ() - pos.getZ() - )) + random.nextInt(2); + )) + random.nextInt(2); if (dist > 0) { state = world.getBlockState(mut); while (!state.getFluidState().isEmpty() || state.getMaterial().equals(Material.WATER_PLANT)) { @@ -156,7 +156,7 @@ public class SulphuricCaveFeature extends DefaultFeature { p, EndBlocks.TUBE_WORM.defaultBlockState() .setValue(HorizontalDirectionalBlock.FACING, dir) - ); + ); } } mut.setY(mut.getY() + 1); @@ -167,8 +167,8 @@ public class SulphuricCaveFeature extends DefaultFeature { while (state.is(Blocks.WATER)) { BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.VENT_BUBBLE_COLUMN.defaultBlockState()); world.scheduleTick(mut.immutable(), - EndBlocks.VENT_BUBBLE_COLUMN, - MHelper.randRange(8, 32, random)); + EndBlocks.VENT_BUBBLE_COLUMN, + MHelper.randRange(8, 32, random)); mut.setY(mut.getY() + 1); state = world.getBlockState(mut); } 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 0a0d0a51..53374a3a 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 @@ -12,10 +12,10 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Fluids; import com.google.common.collect.Sets; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.EndBlockProperties; import org.betterx.betterend.blocks.SulphurCrystalBlock; import org.betterx.betterend.noise.OpenSimplexNoise; @@ -169,7 +169,7 @@ public class SulphuricLakeFeature extends DefaultFeature { world, pos.getX() + dir.getStepX() * 2, pos.getZ() + dir.getStepZ() * 2 - ) < y || getYOnSurface( + ) < y || getYOnSurface( world, pos.getX() + dir.getStepX() * 3, pos.getZ() + dir.getStepZ() * 3) < y) { 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 9d34bb63..a7f05d00 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 @@ -8,10 +8,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.HydrothermalVentBlock; import org.betterx.betterend.registry.EndBlocks; @@ -24,7 +24,7 @@ public class SurfaceVentFeature extends DefaultFeature { pos = getPosOnSurface( world, new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)) - ); + ); if (!world.getBlockState(pos.below(3)).is(CommonBlockTags.GEN_END_STONES)) { return false; } @@ -39,7 +39,7 @@ public class SurfaceVentFeature extends DefaultFeature { int dist = MHelper.floor(2 - MHelper.length( mut.getX() - pos.getX(), mut.getZ() - pos.getZ() - )) + random.nextInt(2); + )) + random.nextInt(2); if (dist > 0) { BlockState state = world.getBlockState(mut); for (int n = 0; n < 10 && state.isAir(); n++) { 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 4a3fc821..40fb7b15 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 @@ -11,7 +11,8 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -19,7 +20,6 @@ import org.betterx.bclib.sdf.operator.SDFRotation; import org.betterx.bclib.sdf.operator.SDFUnion; import org.betterx.bclib.sdf.primitive.SDFTorus; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; public class ThinArchFeature extends DefaultFeature { @@ -36,9 +36,9 @@ public class ThinArchFeature extends DefaultFeature { RandomSource random = featurePlaceContext.random(); BlockPos pos = getPosOnSurfaceWG(world, - new BlockPos((origin.getX() & 0xFFFFFFF0) | 7, - 0, - (origin.getZ() & 0xFFFFFFF0) | 7)); + new BlockPos((origin.getX() & 0xFFFFFFF0) | 7, + 0, + (origin.getZ() & 0xFFFFFFF0) | 7)); if (!world.getBlockState(pos.below(5)).is(CommonBlockTags.GEN_END_STONES)) { return false; } 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 c035e9a5..10a4b87a 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 @@ -12,9 +12,9 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import com.google.common.collect.Sets; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.world.biome.cave.EndCaveBiome; 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 b1a332ac..6d3e6dd7 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 @@ -17,13 +17,13 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +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.DefaultFeature; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.features.DefaultFeature; -import org.betterx.bclib.world.generator.BiomePicker; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.util.BlockFixer; import org.betterx.betterend.world.biome.EndBiome; 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 59b22640..d6b05b53 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 @@ -8,7 +8,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import com.google.common.collect.Sets; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; 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 b7d2fe23..96406faf 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 @@ -19,11 +19,11 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +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.bclib.world.generator.BiomePicker; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.world.biome.EndBiome; @@ -83,11 +83,11 @@ public class TunelCaveFeature extends EndCaveFeature { float vert = Mth.sin((y + (float) noiseV.eval( pos.getX() * 0.01, pos.getZ() * 0.01 - ) * 20) * 0.1F) * 0.9F; + ) * 20) * 0.1F) * 0.9F; float dist = (float) noiseD.eval(pos.getX() * 0.1, y * 0.1, pos.getZ() * 0.1) * 0.12F; val = (val + vert * vert + dist) + density + gradient; if (val < 0.15 && world.getBlockState(pos).is(CommonBlockTags.GEN_END_STONES) && noWaterNear(world, - pos)) { + pos)) { positions.add(pos.immutable()); } } @@ -234,10 +234,10 @@ public class TunelCaveFeature extends EndCaveFeature { return hasCavesInBiome(world, pos.offset(-8, 0, -8)) && hasCavesInBiome( world, pos.offset(8, 0, -8) - ) && hasCavesInBiome(world, - pos.offset(-8, - 0, - 8)) && hasCavesInBiome( + ) && hasCavesInBiome(world, + pos.offset(-8, + 0, + 8)) && hasCavesInBiome( world, pos.offset(8, 0, 8)); } 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 3ae94d5c..4bc1c75d 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 @@ -14,7 +14,8 @@ import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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.*; @@ -22,7 +23,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -111,10 +111,10 @@ public class DragonTreeFeature extends DefaultFeature { Vector3f last = branch.get(branch.size() - 1); if (world.getBlockState(pos.offset(last.x(), last.y(), last.z())).is(CommonBlockTags.GEN_END_STONES)) { SplineHelper.fillSpline(branch, - world, - EndBlocks.DRAGON_TREE.getBark().defaultBlockState(), - pos, - REPLACE); + world, + EndBlocks.DRAGON_TREE.getBark().defaultBlockState(), + pos, + REPLACE); } } } @@ -181,7 +181,7 @@ public class DragonTreeFeature extends DefaultFeature { random.nextGaussian() * 1, random.nextGaussian() * 1, random.nextGaussian() * 1 - ); + ); boolean place = true; for (Direction d : Direction.values()) { BlockState state = world.getBlockState(p.relative(d)); @@ -230,7 +230,7 @@ public class DragonTreeFeature extends DefaultFeature { new Vector3f(0.4F, 0.6F, 0), new Vector3f(0.8F, 0.8F, 0), new Vector3f(1, 1, 0) - ); + ); SIDE1 = Lists.newArrayList(new Vector3f(0.4F, 0.6F, 0), new Vector3f(0.8F, 0.8F, 0), new Vector3f(1, 1, 0)); SIDE2 = SplineHelper.copySpline(SIDE1); @@ -250,7 +250,7 @@ public class DragonTreeFeature extends DefaultFeature { new Vector3f(0.3F, 0.3F, 0), new Vector3f(0.7F, 0.05F, 0), new Vector3f(0.8F, -0.2F, 0) - ); + ); SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); } } diff --git a/src/main/java/org/betterx/betterend/world/features/trees/GiganticAmaranitaFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/GiganticAmaranitaFeature.java index f2b05412..540cb736 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/GiganticAmaranitaFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/GiganticAmaranitaFeature.java @@ -15,13 +15,13 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.blocks.BaseAttachedBlock; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.registry.EndBlocks; import java.util.List; @@ -54,7 +54,7 @@ public class GiganticAmaranitaFeature extends DefaultFeature { radius, 0.2F, (bpos) -> EndBlocks.AMARANITA_STEM.defaultBlockState() - ); + ); Vector3f capPos = spline.get(spline.size() - 1); makeHead(world, pos.offset(capPos.x() + 0.5F, capPos.y() + 1.5F, capPos.z() + 0.5F), Mth.floor(size / 1.6F)); @@ -107,7 +107,7 @@ public class GiganticAmaranitaFeature extends DefaultFeature { mut, EndBlocks.AMARANITA_FUR.defaultBlockState() .setValue(BaseAttachedBlock.FACING, Direction.DOWN) - ); + ); } } } @@ -172,13 +172,13 @@ public class GiganticAmaranitaFeature extends DefaultFeature { Direction dir = Direction.fromAxisAndDirection( axis, distance < 0 ? AxisDirection.NEGATIVE : AxisDirection.POSITIVE - ); + ); BlocksHelper.setWithoutUpdate( world, offseted, EndBlocks.AMARANITA_FUR.defaultBlockState() .setValue(BaseAttachedBlock.FACING, dir) - ); + ); } mut.move(Direction.DOWN); } @@ -188,7 +188,7 @@ public class GiganticAmaranitaFeature extends DefaultFeature { mut, EndBlocks.AMARANITA_FUR.defaultBlockState() .setValue(BaseAttachedBlock.FACING, Direction.DOWN) - ); + ); } } } @@ -298,13 +298,13 @@ public class GiganticAmaranitaFeature extends DefaultFeature { Direction dir = Direction.fromAxisAndDirection( axis, distance < 0 ? AxisDirection.NEGATIVE : AxisDirection.POSITIVE - ); + ); BlocksHelper.setWithoutUpdate( world, offseted, EndBlocks.AMARANITA_FUR.defaultBlockState() .setValue(BaseAttachedBlock.FACING, dir) - ); + ); } mut.move(Direction.DOWN); } @@ -314,7 +314,7 @@ public class GiganticAmaranitaFeature extends DefaultFeature { mut, EndBlocks.AMARANITA_FUR.defaultBlockState() .setValue(BaseAttachedBlock.FACING, Direction.DOWN) - ); + ); } } } diff --git a/src/main/java/org/betterx/betterend/world/features/trees/HelixTreeFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/HelixTreeFeature.java index 7b701e24..a1032680 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/HelixTreeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/HelixTreeFeature.java @@ -12,13 +12,13 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.phys.AABB; import com.mojang.math.Vector3f; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.HelixTreeLeavesBlock; import org.betterx.betterend.registry.EndBlocks; @@ -71,20 +71,20 @@ public class HelixTreeFeature extends DefaultFeature { sdf.addPostProcess(POST).fillArea(world, pos, new AABB(pos.offset(-dx, dy1, -dx), pos.offset(dx, dy2, dx))); SplineHelper.scale(spline, scale); SplineHelper.fillSplineForce(spline, - world, - EndBlocks.HELIX_TREE.getBark().defaultBlockState(), - pos, - (state) -> { - return state.getMaterial().isReplaceable(); - }); + world, + EndBlocks.HELIX_TREE.getBark().defaultBlockState(), + pos, + (state) -> { + return state.getMaterial().isReplaceable(); + }); SplineHelper.rotateSpline(spline, (float) Math.PI); SplineHelper.fillSplineForce(spline, - world, - EndBlocks.HELIX_TREE.getBark().defaultBlockState(), - pos, - (state) -> { - return state.getMaterial().isReplaceable(); - }); + world, + EndBlocks.HELIX_TREE.getBark().defaultBlockState(), + pos, + (state) -> { + return state.getMaterial().isReplaceable(); + }); SplineHelper.scale(spline2, scale); BlockPos leafStart = pos.offset(lastPoint.x() + 0.5, lastPoint.y() + 0.5, lastPoint.z() + 0.5); SplineHelper.fillSplineForce( @@ -95,7 +95,7 @@ public class HelixTreeFeature extends DefaultFeature { (state) -> { return state.getMaterial().isReplaceable(); } - ); + ); spline.clear(); float rad = MHelper.randRange(8F, 11F, random); 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 cf170c46..f9ca46c0 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 @@ -12,13 +12,13 @@ import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.JellyshroomCapBlock; import org.betterx.betterend.registry.EndBlocks; @@ -115,7 +115,7 @@ public class JellyshroomFeature extends DefaultFeature { new Vector3f(0.3F, 0.30F, 0), new Vector3f(0.7F, 0.05F, 0), new Vector3f(0.8F, -0.20F, 0) - ); + ); SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); REPLACE = (state) -> { 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 7dced7f4..17ec6032 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 @@ -13,7 +13,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -23,7 +24,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -101,7 +101,7 @@ public class LacugroveFeature extends DefaultFeature { world, mut, y == top ? EndBlocks.LACUGROVE.getBark() : EndBlocks.LACUGROVE.getLog() - ); + ); } else { break; } @@ -174,7 +174,7 @@ public class LacugroveFeature extends DefaultFeature { random.nextGaussian() * 1, random.nextGaussian() * 1, random.nextGaussian() * 1 - ); + ); boolean place = true; for (Direction d : Direction.values()) { BlockState state = world.getBlockState(p.relative(d)); 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 c76db45a..9c246528 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 @@ -14,7 +14,8 @@ import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; @@ -23,7 +24,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.basis.FurBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -85,7 +85,7 @@ public class LucerniaFeature extends DefaultFeature { vec.x() * 0.2, vec.y() * 0.2, vec.z() * 0.2 - ) * 2F).setSource(sphere); + ) * 2F).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> MHelper.randRange(-1.5F, 1.5F, random)).setSource(sphere); MutableBlockPos mut = new MutableBlockPos(); @@ -190,10 +190,10 @@ public class LucerniaFeature extends DefaultFeature { Vector3f last = branch.get(branch.size() - 1); if (world.getBlockState(pos.offset(last.x(), last.y(), last.z())).is(CommonBlockTags.GEN_END_STONES)) { SplineHelper.fillSplineForce(branch, - world, - EndBlocks.LUCERNIA.getBark().defaultBlockState(), - pos, - REPLACE); + world, + EndBlocks.LUCERNIA.getBark().defaultBlockState(), + pos, + REPLACE); } } } @@ -221,14 +221,14 @@ public class LucerniaFeature extends DefaultFeature { new Vector3f(0.30F, 0.55F, 0.00F), new Vector3f(0.42F, 0.70F, 0.00F), new Vector3f(0.50F, 1.00F, 0.00F) - ); + ); ROOT = Lists.newArrayList( new Vector3f(0.1F, 0.70F, 0), new Vector3f(0.3F, 0.30F, 0), new Vector3f(0.7F, 0.05F, 0), new Vector3f(0.8F, -0.20F, 0) - ); + ); SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); } } diff --git a/src/main/java/org/betterx/betterend/world/features/trees/MossyGlowshroomFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/MossyGlowshroomFeature.java index 2d8d5c0d..6659c1e0 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/MossyGlowshroomFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/MossyGlowshroomFeature.java @@ -10,6 +10,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; import org.betterx.bclib.sdf.primitive.SDFCappedCone; @@ -18,7 +19,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.MossyGlowshroomCapBlock; import org.betterx.betterend.blocks.basis.FurBlock; import org.betterx.betterend.noise.OpenSimplexNoise; @@ -98,7 +98,7 @@ public class MossyGlowshroomFeature extends DefaultFeature { info.setBlockPos( info.getPos().relative(dir), EndBlocks.MOSSY_GLOWSHROOM_FUR.defaultBlockState().setValue(FurBlock.FACING, dir) - ); + ); } } @@ -106,7 +106,7 @@ public class MossyGlowshroomFeature extends DefaultFeature { info.setBlockPos( info.getPos().below(), EndBlocks.MOSSY_GLOWSHROOM_FUR.defaultBlockState().setValue(FurBlock.FACING, Direction.DOWN) - ); + ); } } return info.getState(); @@ -145,7 +145,7 @@ public class MossyGlowshroomFeature extends DefaultFeature { float y = pos.y() + (float) noise.eval( pos.x() * 0.1 + CENTER.x(), pos.z() * 0.1 + CENTER.z() - ) * dist * 0.3F - dist * 0.15F; + ) * dist * 0.3F - dist * 0.15F; pos.set(pos.x(), y, pos.z()); }).setSource(cones); diff --git a/src/main/java/org/betterx/betterend/world/features/trees/PythadendronTreeFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/PythadendronTreeFeature.java index d95274d7..ea03486c 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/PythadendronTreeFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/PythadendronTreeFeature.java @@ -12,6 +12,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import com.mojang.math.Vector3f; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; @@ -22,7 +23,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -61,7 +61,7 @@ public class PythadendronTreeFeature extends DefaultFeature { depth, world, pos - ); + ); SDF function = SplineHelper.buildSDF(spline, 1.7F, 1.1F, (bpos) -> { return EndBlocks.PYTHADENDRON.getBark().defaultBlockState(); @@ -103,7 +103,7 @@ public class PythadendronTreeFeature extends DefaultFeature { EndBlocks.PYTHADENDRON.getBark().defaultBlockState(), pos, REPLACE - ); + ); spline = SplineHelper.makeSpline(x, y, z, x2, y, z2, 5); SplineHelper.powerOffset(spline, size * MHelper.randRange(1.0F, 2.0F, random), 4); @@ -116,7 +116,7 @@ public class PythadendronTreeFeature extends DefaultFeature { EndBlocks.PYTHADENDRON.getBark().defaultBlockState(), pos, REPLACE - ); + ); OpenSimplexNoise noise = new OpenSimplexNoise(random.nextInt()); if (depth < 3) { diff --git a/src/main/java/org/betterx/betterend/world/features/trees/TenaneaFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/TenaneaFeature.java index 6a51b08d..87603d0a 100644 --- a/src/main/java/org/betterx/betterend/world/features/trees/TenaneaFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/trees/TenaneaFeature.java @@ -14,6 +14,7 @@ import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; +import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.sdf.SDF; @@ -22,7 +23,6 @@ import org.betterx.bclib.sdf.primitive.SDFSphere; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.basis.FurBlock; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; @@ -79,7 +79,7 @@ public class TenaneaFeature extends DefaultFeature { vec.x() * 0.2, vec.y() * 0.2, vec.z() * 0.2 - ) * 2F).setSource(sphere); + ) * 2F).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> MHelper.randRange(-1.5F, 1.5F, random)).setSource(sphere); MutableBlockPos mut = new MutableBlockPos(); @@ -196,6 +196,6 @@ public class TenaneaFeature extends DefaultFeature { new Vector3f(0.30F, 0.55F, 0.00F), new Vector3f(0.42F, 0.70F, 0.00F), new Vector3f(0.50F, 1.00F, 0.00F) - ); + ); } } 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 c6270895..156ee993 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 @@ -14,14 +14,14 @@ import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.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; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.SplineHelper; -import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.betterend.blocks.UmbrellaTreeClusterBlock; import org.betterx.betterend.blocks.UmbrellaTreeMembraneBlock; import org.betterx.betterend.registry.EndBlocks; @@ -208,14 +208,14 @@ public class UmbrellaTreeFeature extends DefaultFeature { new Vector3f(0.30F, 0.55F, 0.00F), new Vector3f(0.42F, 0.70F, 0.00F), new Vector3f(0.50F, 1.00F, 0.00F) - ); + ); ROOT = Lists.newArrayList( new Vector3f(0.1F, 0.70F, 0), new Vector3f(0.3F, 0.30F, 0), new Vector3f(0.7F, 0.05F, 0), new Vector3f(0.8F, -0.20F, 0) - ); + ); SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); REPLACE = (state) -> { 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 91b6377b..6853e454 100644 --- a/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java +++ b/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java @@ -8,8 +8,8 @@ import net.minecraft.world.level.levelgen.LegacyRandomSource; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; 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 72c976ee..a4166103 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 @@ -13,7 +13,7 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; 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 7c36c729..7cd41364 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 @@ -19,8 +19,8 @@ import net.minecraft.world.level.levelgen.Heightmap.Types; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; 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 49a97d48..de6c4198 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 @@ -24,8 +24,8 @@ import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSeriali import net.minecraft.world.level.material.FluidState; import com.google.common.collect.Maps; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.CommonBlockTags; +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; diff --git a/src/main/java/org/betterx/betterend/world/structures/piece/MountainPiece.java b/src/main/java/org/betterx/betterend/world/structures/piece/MountainPiece.java index 1c48cc06..47e6edd1 100644 --- a/src/main/java/org/betterx/betterend/world/structures/piece/MountainPiece.java +++ b/src/main/java/org/betterx/betterend/world/structures/piece/MountainPiece.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; import com.google.common.collect.Maps; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.noise.OpenSimplexNoise; diff --git a/src/main/java/org/betterx/betterend/world/structures/piece/VoxelPiece.java b/src/main/java/org/betterx/betterend/world/structures/piece/VoxelPiece.java index b4533585..4a282742 100644 --- a/src/main/java/org/betterx/betterend/world/structures/piece/VoxelPiece.java +++ b/src/main/java/org/betterx/betterend/world/structures/piece/VoxelPiece.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext; -import org.betterx.bclib.world.structures.StructureWorld; +import org.betterx.bclib.api.v2.levelgen.structures.StructureWorld; import org.betterx.betterend.registry.EndStructures; import java.util.function.Consumer;