diff --git a/gradle.properties b/gradle.properties index 3a2de67a..a5ccca28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.19-pre3 +minecraft_version=1.19 loader_version=0.14.6 -fabric_version=0.53.4+1.19 +fabric_version=0.55.2+1.19 #Loom loom_version=0.12-SNAPSHOT diff --git a/src/main/java/org/betterx/betterend/blocks/DragonTreeSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/DragonTreeSaplingBlock.java index 20f59b0b..252d04e2 100644 --- a/src/main/java/org/betterx/betterend/blocks/DragonTreeSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/DragonTreeSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class DragonTreeSaplingBlock extends PottableFeatureSapling { public DragonTreeSaplingBlock() { - super((state) -> EndFeatures.DRAGON_TREE.getFeature()); + super((state) -> EndFeatures.DRAGON_TREE); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/HelixTreeSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/HelixTreeSaplingBlock.java index ea3a7930..c38b85e8 100644 --- a/src/main/java/org/betterx/betterend/blocks/HelixTreeSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/HelixTreeSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class HelixTreeSaplingBlock extends PottableFeatureSapling { public HelixTreeSaplingBlock() { - super((state) -> EndFeatures.HELIX_TREE.getFeature()); + super((state) -> EndFeatures.HELIX_TREE); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/LacugroveSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/LacugroveSaplingBlock.java index 372e6c0a..7750cd30 100644 --- a/src/main/java/org/betterx/betterend/blocks/LacugroveSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LacugroveSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class LacugroveSaplingBlock extends PottableFeatureSapling { public LacugroveSaplingBlock() { - super((state) -> EndFeatures.LACUGROVE.getFeature()); + super((state) -> EndFeatures.LACUGROVE); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/LucerniaSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/LucerniaSaplingBlock.java index 6c6f4901..daa0825a 100644 --- a/src/main/java/org/betterx/betterend/blocks/LucerniaSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LucerniaSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class LucerniaSaplingBlock extends PottableFeatureSapling { public LucerniaSaplingBlock() { - super((state) -> EndFeatures.LUCERNIA.getFeature()); + super((state) -> EndFeatures.LUCERNIA); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomSaplingBlock.java index 4262ccf0..3283d600 100644 --- a/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/MossyGlowshroomSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class MossyGlowshroomSaplingBlock extends PottableFeatureSapling { public MossyGlowshroomSaplingBlock() { - super(7, (state) -> EndFeatures.MOSSY_GLOWSHROOM.getFeature()); + super(7, (state) -> EndFeatures.MOSSY_GLOWSHROOM); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/PythadendronSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/PythadendronSaplingBlock.java index 0140db8d..8c978d06 100644 --- a/src/main/java/org/betterx/betterend/blocks/PythadendronSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/PythadendronSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class PythadendronSaplingBlock extends PottableFeatureSapling { public PythadendronSaplingBlock() { - super((state) -> EndFeatures.PYTHADENDRON_TREE.getFeature()); + super((state) -> EndFeatures.PYTHADENDRON_TREE); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/TenaneaSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/TenaneaSaplingBlock.java index d06ea355..33e42e30 100644 --- a/src/main/java/org/betterx/betterend/blocks/TenaneaSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/TenaneaSaplingBlock.java @@ -11,7 +11,7 @@ import org.betterx.betterend.registry.EndFeatures; public class TenaneaSaplingBlock extends PottableFeatureSapling { public TenaneaSaplingBlock() { - super((state) -> EndFeatures.TENANEA.getFeature()); + super((state) -> EndFeatures.TENANEA); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeSaplingBlock.java b/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeSaplingBlock.java index 1c4a56bb..16bab14c 100644 --- a/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeSaplingBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeSaplingBlock.java @@ -12,7 +12,7 @@ import org.betterx.betterend.registry.EndFeatures; public class UmbrellaTreeSaplingBlock extends PottableFeatureSapling { public UmbrellaTreeSaplingBlock() { - super((state) -> EndFeatures.UMBRELLA_TREE.getFeature()); + super((state) -> EndFeatures.UMBRELLA_TREE); } @Override diff --git a/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java b/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java index 44114215..75c68711 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/PottableFeatureSapling.java @@ -3,17 +3,18 @@ package org.betterx.betterend.blocks.basis; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; import org.betterx.bclib.blocks.FeatureSaplingBlock; import org.betterx.betterend.interfaces.PottablePlant; import java.util.function.Function; public abstract class PottableFeatureSapling extends FeatureSaplingBlock implements PottablePlant { - public PottableFeatureSapling(Function> featureSupplier) { + public PottableFeatureSapling(Function featureSupplier) { super(featureSupplier); } - public PottableFeatureSapling(int light, Function> featureSupplier) { + public PottableFeatureSapling(int light, Function featureSupplier) { super(light, featureSupplier); } } 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 d1d292e9..362a0d2e 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,7 +10,7 @@ import net.minecraft.world.level.material.Material; import com.google.common.base.Function; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.util.MHelper; 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 f999aca5..e46583a0 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,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; 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 6bc67349..add1ae21 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,7 @@ import net.minecraft.world.phys.AABB; import com.google.common.collect.Lists; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; diff --git a/src/main/java/org/betterx/betterend/registry/EndFeatures.java b/src/main/java/org/betterx/betterend/registry/EndFeatures.java index 0b26b0fd..b1dfddac 100644 --- a/src/main/java/org/betterx/betterend/registry/EndFeatures.java +++ b/src/main/java/org/betterx/betterend/registry/EndFeatures.java @@ -23,6 +23,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.util.JsonFactory; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.complexmaterials.StoneMaterial; diff --git a/src/main/java/org/betterx/betterend/util/LootTableUtil.java b/src/main/java/org/betterx/betterend/util/LootTableUtil.java index fe983d13..44d135aa 100644 --- a/src/main/java/org/betterx/betterend/util/LootTableUtil.java +++ b/src/main/java/org/betterx/betterend/util/LootTableUtil.java @@ -5,14 +5,13 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; - -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 net.fabricmc.fabric.api.loot.v2.LootTableEvents; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; @@ -32,63 +31,58 @@ public class LootTableUtil { private static final ResourceLocation UMBRELLA_JUNGLE = BetterEnd.makeID("chests/umbrella_jungle"); public static void init() { - LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, table, setter) -> { + LootTableEvents.MODIFY.register((resourceManager, lootManager, id, table, setter) -> { if (END_CITY_TREASURE_ID.equals(id)) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + LootPool.Builder builder = LootPool.lootPool(); builder.setRolls(ConstantValue.exactly(1)); - builder.withCondition(LootItemRandomChanceCondition.randomChance(0.2f).build()); - builder.withEntry(LootItem.lootTableItem(Items.GHAST_TEAR).build()); + builder.conditionally(LootItemRandomChanceCondition.randomChance(0.2f).build()); + builder.add(LootItem.lootTableItem(Items.GHAST_TEAR)); table.withPool(builder); - builder = FabricLootPoolBuilder.builder(); + builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(0, 3)); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_STRANGE_AND_ALIEN).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_GRASPING_AT_STARS).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_ENDSEEKER).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_EO_DRACONA).build()); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_STRANGE_AND_ALIEN)); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_GRASPING_AT_STARS)); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_ENDSEEKER)); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_EO_DRACONA)); table.withPool(builder); } else if (id.getNamespace().equals(BetterEnd.MOD_ID)) { addCommonItems(table); if (FOGGY_MUSHROOMLAND.equals(id)) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + LootPool.Builder builder =LootPool.lootPool(); builder.setRolls(UniformGenerator.between(4, 8)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.MOSSY_GLOWSHROOM.getBlock(WoodenComplexMaterial.BLOCK_PLANKS)) - .build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.MOSSY_GLOWSHROOM_SAPLING).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.BLUE_VINE_SEED).build()); + builder.add(LootItem.lootTableItem(EndBlocks.MOSSY_GLOWSHROOM.getBlock(WoodenComplexMaterial.BLOCK_PLANKS))); + builder.add(LootItem.lootTableItem(EndBlocks.MOSSY_GLOWSHROOM_SAPLING)); + builder.add(LootItem.lootTableItem(EndBlocks.BLUE_VINE_SEED)); table.withPool(builder); } else if (CHORUS_FOREST.equals(id)) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + LootPool.Builder builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(4, 8)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.PYTHADENDRON.getBlock(WoodenComplexMaterial.BLOCK_PLANKS)) - .build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.PYTHADENDRON_SAPLING).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.CHORUS_MUSHROOM).build()); + builder.add(LootItem.lootTableItem(EndBlocks.PYTHADENDRON.getBlock(WoodenComplexMaterial.BLOCK_PLANKS))); + builder.add(LootItem.lootTableItem(EndBlocks.PYTHADENDRON_SAPLING)); + builder.add(LootItem.lootTableItem(EndBlocks.CHORUS_MUSHROOM)); table.withPool(builder); } else if (SHADOW_FOREST.equals(id)) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + LootPool.Builder builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(4, 8)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.DRAGON_TREE.getBlock(WoodenComplexMaterial.BLOCK_PLANKS)) - .build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.DRAGON_TREE_SAPLING).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.SHADOW_BERRY).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.SHADOW_BERRY_RAW).build()); + builder.add(LootItem.lootTableItem(EndBlocks.DRAGON_TREE.getBlock(WoodenComplexMaterial.BLOCK_PLANKS))); + builder.add(LootItem.lootTableItem(EndBlocks.DRAGON_TREE_SAPLING)); + builder.add(LootItem.lootTableItem(EndBlocks.SHADOW_BERRY)); + builder.add(LootItem.lootTableItem(EndItems.SHADOW_BERRY_RAW)); table.withPool(builder); } else if (LANTERN_WOODS.equals(id)) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + LootPool.Builder builder =LootPool.lootPool(); builder.setRolls(UniformGenerator.between(4, 8)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.LUCERNIA.getBlock(WoodenComplexMaterial.BLOCK_PLANKS)) - .build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.LUCERNIA_SAPLING).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.BOLUX_MUSHROOM).build()); + builder.add(LootItem.lootTableItem(EndBlocks.LUCERNIA.getBlock(WoodenComplexMaterial.BLOCK_PLANKS))); + builder.add(LootItem.lootTableItem(EndBlocks.LUCERNIA_SAPLING)); + builder.add(LootItem.lootTableItem(EndBlocks.BOLUX_MUSHROOM)); table.withPool(builder); } else if (UMBRELLA_JUNGLE.equals(id)) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + LootPool.Builder builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(4, 8)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.UMBRELLA_TREE.getBlock(WoodenComplexMaterial.BLOCK_PLANKS)) - .build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.UMBRELLA_TREE_SAPLING).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.SMALL_JELLYSHROOM).build()); + builder.add(LootItem.lootTableItem(EndBlocks.UMBRELLA_TREE.getBlock(WoodenComplexMaterial.BLOCK_PLANKS))); + builder.add(LootItem.lootTableItem(EndBlocks.UMBRELLA_TREE_SAPLING)); + builder.add(LootItem.lootTableItem(EndBlocks.SMALL_JELLYSHROOM)); table.withPool(builder); } } @@ -111,43 +105,43 @@ public class LootTableUtil { return COMMON; } - private static void addCommonItems(FabricLootSupplierBuilder table) { - FabricLootPoolBuilder builder = FabricLootPoolBuilder.builder(); + private static void addCommonItems(LootTable.Builder table) { + LootPool.Builder builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(0, 2)); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_STRANGE_AND_ALIEN).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_GRASPING_AT_STARS).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_ENDSEEKER).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_EO_DRACONA).build()); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_STRANGE_AND_ALIEN)); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_GRASPING_AT_STARS)); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_ENDSEEKER)); + builder.add(LootItem.lootTableItem(EndItems.MUSIC_DISC_EO_DRACONA)); table.withPool(builder); - builder = FabricLootPoolBuilder.builder(); + builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(4, 8)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.ingot).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.rawOre).build()); - builder.withEntry(LootItem.lootTableItem(Items.ENDER_PEARL).build()); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.ingot)); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.rawOre)); + builder.add(LootItem.lootTableItem(Items.ENDER_PEARL)); table.withPool(builder); - builder = FabricLootPoolBuilder.builder(); + builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(2, 4)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.TERMINITE.ingot).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.ENDER_SHARD).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.AURORA_CRYSTAL).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.axe).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.pickaxe).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.hoe).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.sword).build()); - builder.withEntry(LootItem.lootTableItem(EndBlocks.THALLASIUM.shovel).build()); - builder.withEntry(LootItem.lootTableItem(Items.ENDER_EYE).build()); - builder.withEntry(LootItem.lootTableItem(Blocks.OBSIDIAN).build()); + builder.add(LootItem.lootTableItem(EndBlocks.TERMINITE.ingot)); + builder.add(LootItem.lootTableItem(EndItems.ENDER_SHARD)); + builder.add(LootItem.lootTableItem(EndBlocks.AURORA_CRYSTAL)); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.axe)); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.pickaxe)); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.hoe)); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.sword)); + builder.add(LootItem.lootTableItem(EndBlocks.THALLASIUM.shovel)); + builder.add(LootItem.lootTableItem(Items.ENDER_EYE)); + builder.add(LootItem.lootTableItem(Blocks.OBSIDIAN)); table.withPool(builder); - builder = FabricLootPoolBuilder.builder(); + builder = LootPool.lootPool(); builder.setRolls(UniformGenerator.between(0, 4)); - builder.withEntry(LootItem.lootTableItem(EndBlocks.FLAVOLITE_RUNED).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.AETERNIUM_INGOT).build()); - builder.withEntry(LootItem.lootTableItem(EndItems.AMBER_GEM).build()); - builder.withEntry(LootItem.lootTableItem(Items.END_CRYSTAL).build()); - builder.withEntry(LootItem.lootTableItem(Items.GHAST_TEAR).build()); + builder.add(LootItem.lootTableItem(EndBlocks.FLAVOLITE_RUNED)); + builder.add(LootItem.lootTableItem(EndItems.AETERNIUM_INGOT)); + builder.add(LootItem.lootTableItem(EndItems.AMBER_GEM)); + builder.add(LootItem.lootTableItem(Items.END_CRYSTAL)); + builder.add(LootItem.lootTableItem(Items.GHAST_TEAR)); table.withPool(builder); } } 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 b114499e..0cf98fe3 100644 --- a/src/main/java/org/betterx/betterend/world/features/BiomeIslandFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/BiomeIslandFeature.java @@ -8,7 +8,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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; import org.betterx.bclib.sdf.operator.SDFTranslate; 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 1542f4c3..db6c201a 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.api.v2.levelgen.features.ListFeature; + import org.betterx.betterend.util.LootTableUtil; import java.util.List; 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 d38bd84d..9233db7f 100644 --- a/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/CavePumpkinFeature.java @@ -6,7 +6,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.blocks.EndBlockProperties; 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 c8666efc..9f4d596d 100644 --- a/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/CrashedShipFeature.java @@ -16,7 +16,6 @@ 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.v2.levelgen.features.NBTFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.StructureHelper; 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 62b23540..4820c626 100644 --- a/src/main/java/org/betterx/betterend/world/features/FullHeightScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/FullHeightScatterFeature.java @@ -8,7 +8,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.util.GlobalState; 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 df1ec5ff..6bbdf96d 100644 --- a/src/main/java/org/betterx/betterend/world/features/InvertedScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/InvertedScatterFeature.java @@ -8,7 +8,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.util.GlobalState; diff --git a/src/main/java/org/betterx/betterend/world/features/ListFeature.java b/src/main/java/org/betterx/betterend/world/features/ListFeature.java new file mode 100644 index 00000000..f0ef990f --- /dev/null +++ b/src/main/java/org/betterx/betterend/world/features/ListFeature.java @@ -0,0 +1,83 @@ +package org.betterx.betterend.world.features; + + +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; + +import org.betterx.bclib.util.StructureHelper; + +import java.util.List; + +public class ListFeature extends NBTFeature { + private final List list; + private StructureInfo selected; + + public ListFeature(List list, BlockState defaultBlock) { + super(defaultBlock); + this.list = list; + } + + @Override + protected StructureTemplate getStructure(WorldGenLevel world, BlockPos pos, RandomSource random) { + selected = list.get(random.nextInt(list.size())); + return selected.getStructure(); + } + + @Override + protected boolean canSpawn(WorldGenLevel world, BlockPos pos, RandomSource random) { + int cx = pos.getX() >> 4; + int cz = pos.getZ() >> 4; + return ((cx + cz) & 1) == 0 && pos.getY() > 58;// && world.getBlockState(pos.below()).is(EndTags.GEN_TERRAIN); + } + + @Override + protected Rotation getRotation(WorldGenLevel world, BlockPos pos, RandomSource random) { + return Rotation.getRandom(random); + } + + @Override + protected Mirror getMirror(WorldGenLevel world, BlockPos pos, RandomSource random) { + return Mirror.values()[random.nextInt(3)]; + } + + @Override + protected int getYOffset(StructureTemplate structure, WorldGenLevel world, BlockPos pos, RandomSource random) { + return selected.offsetY; + } + + @Override + protected TerrainMerge getTerrainMerge(WorldGenLevel world, BlockPos pos, RandomSource random) { + return selected.terrainMerge; + } + + @Override + protected void addStructureData(StructurePlaceSettings data) { + } + + public static final class StructureInfo { + public final TerrainMerge terrainMerge; + public final String structurePath; + public final int offsetY; + + private StructureTemplate structure; + + public StructureInfo(String structurePath, int offsetY, TerrainMerge terrainMerge) { + this.terrainMerge = terrainMerge; + this.structurePath = structurePath; + this.offsetY = offsetY; + } + + public StructureTemplate getStructure() { + if (structure == null) { + structure = StructureHelper.readStructure(structurePath); + } + return structure; + } + } +} diff --git a/src/main/java/org/betterx/betterend/world/features/NBTFeature.java b/src/main/java/org/betterx/betterend/world/features/NBTFeature.java new file mode 100644 index 00000000..7d6d0656 --- /dev/null +++ b/src/main/java/org/betterx/betterend/world/features/NBTFeature.java @@ -0,0 +1,236 @@ +package org.betterx.betterend.world.features; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.BlockPos.MutableBlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Holder; +import net.minecraft.core.Vec3i; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtIo; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +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 net.minecraft.world.level.levelgen.structure.BoundingBox; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; + +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.structures.templatesystem.DestructionStructureProcessor; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; +import org.betterx.bclib.util.BlocksHelper; + +import java.io.IOException; +import java.io.InputStream; + +//TODO: 1.19 Check if we can merge this with the new TemplateFeature! +public abstract class NBTFeature extends DefaultFeature { + private final BlockState defaultBlock; + + public NBTFeature(BlockState defaultBlock) { + this.defaultBlock = defaultBlock; + } + + protected static final DestructionStructureProcessor DESTRUCTION = new DestructionStructureProcessor(); + + protected abstract StructureTemplate getStructure(WorldGenLevel world, BlockPos pos, RandomSource random); + + protected abstract boolean canSpawn(WorldGenLevel world, BlockPos pos, RandomSource random); + + protected abstract Rotation getRotation(WorldGenLevel world, BlockPos pos, RandomSource random); + + protected abstract Mirror getMirror(WorldGenLevel world, BlockPos pos, RandomSource random); + + protected abstract int getYOffset(StructureTemplate structure, + WorldGenLevel world, + BlockPos pos, + RandomSource random); + + protected abstract TerrainMerge getTerrainMerge(WorldGenLevel world, BlockPos pos, RandomSource random); + + protected abstract void addStructureData(StructurePlaceSettings data); + + protected BlockPos getGround(WorldGenLevel world, BlockPos center) { + Holder biome = world.getBiome(center); + ResourceLocation id = BiomeAPI.getBiomeID(biome); + if (id.getNamespace().contains("moutain") || id.getNamespace().contains("lake")) { + int y = getAverageY(world, center); + return new BlockPos(center.getX(), y, center.getZ()); + } else { + int y = getAverageYWG(world, center); + return new BlockPos(center.getX(), y, center.getZ()); + } + } + + protected int getAverageY(WorldGenLevel world, BlockPos center) { + int y = getYOnSurface(world, center.getX(), center.getZ()); + y += getYOnSurface(world, center.getX() - 2, center.getZ() - 2); + y += getYOnSurface(world, center.getX() + 2, center.getZ() - 2); + y += getYOnSurface(world, center.getX() - 2, center.getZ() + 2); + y += getYOnSurface(world, center.getX() + 2, center.getZ() + 2); + return y / 5; + } + + protected int getAverageYWG(WorldGenLevel world, BlockPos center) { + int y = getYOnSurfaceWG(world, center.getX(), center.getZ()); + y += getYOnSurfaceWG(world, center.getX() - 2, center.getZ() - 2); + y += getYOnSurfaceWG(world, center.getX() + 2, center.getZ() - 2); + y += getYOnSurfaceWG(world, center.getX() - 2, center.getZ() + 2); + y += getYOnSurfaceWG(world, center.getX() + 2, center.getZ() + 2); + return y / 5; + } + + @Override + public boolean place(FeaturePlaceContext context) { + WorldGenLevel world = context.level(); + RandomSource random = context.random(); + BlockPos center = context.origin(); + + center = new BlockPos(((center.getX() >> 4) << 4) | 8, 128, ((center.getZ() >> 4) << 4) | 8); + center = getGround(world, center); + + if (!canSpawn(world, center, random)) { + return false; + } + + int posY = center.getY() + 1; + StructureTemplate structure = getStructure(world, center, random); + Rotation rotation = getRotation(world, center, random); + Mirror mirror = getMirror(world, center, random); + BlockPos offset = StructureTemplate.transform( + new BlockPos(structure.getSize()), + mirror, + rotation, + BlockPos.ZERO + ); + center = center.offset(0, getYOffset(structure, world, center, random) + 0.5, 0); + + BoundingBox bounds = makeBox(center); + StructurePlaceSettings placementData = new StructurePlaceSettings() + .setRotation(rotation) + .setMirror(mirror) + .setBoundingBox(bounds); + addStructureData(placementData); + center = center.offset(-offset.getX() * 0.5, 0, -offset.getZ() * 0.5); + structure.placeInWorld(world, center, center, placementData, random, 4); + + TerrainMerge merge = getTerrainMerge(world, center, random); + int x1 = center.getX(); + int z1 = center.getZ(); + int x2 = x1 + offset.getX(); + int z2 = z1 + offset.getZ(); + if (merge != TerrainMerge.NONE) { + MutableBlockPos mut = new MutableBlockPos(); + + if (x2 < x1) { + int a = x1; + x1 = x2; + x2 = a; + } + + if (z2 < z1) { + int a = z1; + z1 = z2; + z2 = a; + } + + int surfMax = posY - 1; + for (int x = x1; x <= x2; x++) { + mut.setX(x); + for (int z = z1; z <= z2; z++) { + mut.setZ(z); + mut.setY(surfMax); + BlockState state = world.getBlockState(mut); + if (!isTerrain(state) && state.isFaceSturdy(world, mut, Direction.DOWN)) { + for (int i = 0; i < 10; i++) { + mut.setY(mut.getY() - 1); + BlockState stateSt = world.getBlockState(mut); + if (!isTerrain(stateSt)) { + if (merge == TerrainMerge.SURFACE) { + boolean isTop = mut.getY() == surfMax && state.getMaterial().isSolidBlocking(); + Holder b = world.getBiome(mut); + BlockState top = (isTop + ? BiomeAPI.findTopMaterial(b) + : BiomeAPI.findUnderMaterial(b)).orElse(defaultBlock); + BlocksHelper.setWithoutUpdate(world, mut, top); + } else { + BlocksHelper.setWithoutUpdate(world, mut, state); + } + } else { + if (isTerrain(state) && state.getMaterial().isSolidBlocking()) { + if (merge == TerrainMerge.SURFACE) { + Holder b = world.getBiome(mut); + BlockState bottom = BiomeAPI.findUnderMaterial(b).orElse(defaultBlock); + BlocksHelper.setWithoutUpdate(world, mut, bottom); + } else { + BlocksHelper.setWithoutUpdate(world, mut, state); + } + } + break; + } + } + } + } + } + } + //BlocksHelper.fixBlocks(world, new BlockPos(x1, center.getY(), z1), new BlockPos(x2, center.getY() + offset.getY(), z2)); + + return true; + } + + private boolean isTerrain(BlockState state) { + return state.is(CommonBlockTags.END_STONES) || state.is(CommonBlockTags.NETHER_STONES); + } + + protected BoundingBox makeBox(BlockPos pos) { + int sx = ((pos.getX() >> 4) << 4) - 16; + int sz = ((pos.getZ() >> 4) << 4) - 16; + int ex = sx + 47; + int ez = sz + 47; + return BoundingBox.fromCorners(new Vec3i(sx, 0, sz), new Vec3i(ex, 255, ez)); + } + + protected static StructureTemplate readStructure(ResourceLocation resource) { + String ns = resource.getNamespace(); + String nm = resource.getPath(); + + try { + InputStream inputstream = MinecraftServer.class.getResourceAsStream("/data/" + ns + "/structures/" + nm + ".nbt"); + return readStructureFromStream(inputstream); + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + } + + private static StructureTemplate readStructureFromStream(InputStream stream) throws IOException { + CompoundTag nbttagcompound = NbtIo.readCompressed(stream); + + StructureTemplate template = new StructureTemplate(); + template.load(nbttagcompound); + + return template; + } + + public enum TerrainMerge { + NONE, SURFACE, OBJECT; + + public static TerrainMerge getFromString(String type) { + if (type.equals("surface")) { + return SURFACE; + } else if (type.equals("object")) { + return OBJECT; + } else { + return NONE; + } + } + } +} 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 943f82ca..5ad9e6c5 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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.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 75a7f0c3..ef0bbd4e 100644 --- a/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/ScatterFeature.java @@ -7,7 +7,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 cfedeb67..70e93590 100644 --- a/src/main/java/org/betterx/betterend/world/features/SilkMothNestFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/SilkMothNestFeature.java @@ -12,7 +12,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.registry.EndBlocks; 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 f37e01e5..e77a6e95 100644 --- a/src/main/java/org/betterx/betterend/world/features/WallScatterFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/WallScatterFeature.java @@ -9,7 +9,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 b974e946..fa4ff271 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,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 9ea16b30..1e61a524 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,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 d5833324..b71a1157 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,7 +9,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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; 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 88750330..943321f1 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,7 +9,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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 cc2b3298..9c49b0bf 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,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; 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 3fe8003c..f3b002a8 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,7 +11,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import com.google.common.collect.Lists; -import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 d7b38c1f..e6712ccc 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,7 +8,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFRotation; 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 2a34307d..96e00c13 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,7 +11,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 cd63f1b7..99210b4c 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,7 +11,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 beacc1b1..491eda0c 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,7 +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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 a5ca8da2..ad79011e 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,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; 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 12facdc8..9738fda3 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,7 +8,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFRotation; import org.betterx.bclib.sdf.operator.SDFTranslate; 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 3565d23c..efbeefbb 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,7 +9,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 07f56de7..2218d88a 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,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 086a78e5..eecf6f22 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,7 +8,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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFCoordModify; import org.betterx.bclib.sdf.operator.SDFScale3D; 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 fab0173b..9a1ec1e3 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,7 +9,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; 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 b2936fb0..aaa8a531 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,7 +9,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 b05b5e3e..a5d31579 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 @@ -14,7 +14,7 @@ import net.minecraft.world.level.material.Material; import com.google.common.collect.Lists; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 6a756f11..65421b04 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,7 +11,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.StalactiteBlock; import org.betterx.bclib.util.BlocksHelper; 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 55580199..e1d3ebfc 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,7 +10,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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 7dd14259..3e2f19ea 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,7 +14,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 53374a3a..6f00a64a 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,7 +12,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 a7f05d00..c09c8062 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,7 +8,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.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; 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 40fb7b15..aa68d3b1 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,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import com.mojang.math.Vector3f; -import org.betterx.bclib.api.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFCoordModify; 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 10a4b87a..d6c6d7e4 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,7 +12,7 @@ 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.v2.levelgen.features.DefaultFeature; +import org.betterx.bclib.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.util.BlockFixer; 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 6d3e6dd7..e6fa78f9 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 @@ -20,7 +20,7 @@ import com.google.common.collect.Sets; 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.levelgen.features.features.DefaultFeature; 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/features/trees/DragonTreeFeature.java b/src/main/java/org/betterx/betterend/world/features/trees/DragonTreeFeature.java index 4bc1c75d..f2875ace 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,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; 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 540cb736..870b9287 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,7 +15,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.blocks.BaseAttachedBlock; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; 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 a1032680..98e5098e 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,7 +12,7 @@ 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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; 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 f9ca46c0..f5e7754d 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,7 +12,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; 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 17ec6032..cec2d3b6 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,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; 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 9c246528..c23d8420 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,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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; 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 6659c1e0..0c627c3a 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,7 +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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; import org.betterx.bclib.sdf.primitive.SDFCappedCone; 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 ea03486c..6656e980 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,7 +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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.sdf.PosInfo; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.SDFDisplacement; 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 87603d0a..7051adda 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,7 +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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.sdf.SDF; 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 156ee993..db67fda6 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,7 +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.api.v2.levelgen.features.features.DefaultFeature; import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.sdf.SDF; import org.betterx.bclib.sdf.operator.*; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5e964bd3..47b99d2f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,10 +39,10 @@ "betterend.mixins.shadow.json" ], "depends": { - "fabricloader": ">=0.14.5", - "fabric": ">=0.52.4", - "minecraft": "1.19-beta.1", - "bclib": "2.0.x" + "fabricloader": ">=0.14.6", + "fabric": ">=0.55.2", + "minecraft": "1.19", + "bclib": "2.0.0" }, "suggests": { "byg": ">=1.1.3",