From e850173d9e206b75272ed435cd904ea6d9223001 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 12 Jun 2022 00:05:48 +0200 Subject: [PATCH] [Change] Removed some use of internal FAPI Biome API (#2) --- .../api/v2/generator/BCLibNetherBiomeSource.java | 6 +++--- .../bclib/api/v2/levelgen/biomes/BiomeAPI.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java index 095dfd1a..5e7abdf0 100644 --- a/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java @@ -21,7 +21,7 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Climate; -import net.fabricmc.fabric.impl.biome.NetherBiomeData; +import net.fabricmc.fabric.api.biome.v1.NetherBiomes; import org.apache.commons.lang3.function.TriFunction; @@ -148,7 +148,7 @@ public class BCLibNetherBiomeSource extends BCLBiomeSource { private static boolean isValidNetherBiome(Holder biome, ResourceLocation location) { - return NetherBiomeData.canGenerateInNether(biome.unwrapKey().get()) || + return NetherBiomes.canGenerateInNether(biome.unwrapKey().get()) || biome.is(BiomeTags.IS_NETHER) || BiomeAPI.wasRegisteredAsNetherBiome(location); } @@ -156,7 +156,7 @@ public class BCLibNetherBiomeSource extends BCLBiomeSource { private static boolean isValidNonVanillaNetherBiome(Holder biome, ResourceLocation location) { return ( !"minecraft".equals(location.getNamespace()) && - NetherBiomeData.canGenerateInNether(biome.unwrapKey().get())) || + NetherBiomes.canGenerateInNether(biome.unwrapKey().get())) || BiomeAPI.wasRegisteredAs(location, BiomeAPI.BiomeType.BCL_NETHER); } diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java index 4e7ed07e..403ed17a 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java @@ -41,8 +41,8 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.impl.biome.NetherBiomeData; -import net.fabricmc.fabric.impl.biome.TheEndBiomeData; +import net.fabricmc.fabric.api.biome.v1.NetherBiomes; +import net.fabricmc.fabric.api.biome.v1.TheEndBiomes; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; @@ -200,7 +200,7 @@ public class BiomeAPI { ResourceKey key = getBiomeKey(bclBiome.getBiome()); if (bclBiome.allowFabricRegistration()) { - bclBiome.forEachClimateParameter(p -> NetherBiomeData.addNetherBiome(key, p)); + bclBiome.forEachClimateParameter(p -> NetherBiomes.addNetherBiome(key, p)); } return bclBiome; } @@ -231,8 +231,8 @@ public class BiomeAPI { float weight = biome.getGenChance(); ResourceKey key = getBiomeKey(biome.getBiome()); if (biome.allowFabricRegistration()) { - TheEndBiomeData.addEndBiomeReplacement(Biomes.END_HIGHLANDS, key, weight); - TheEndBiomeData.addEndBiomeReplacement(Biomes.END_MIDLANDS, key, weight); + TheEndBiomes.addHighlandsBiome(key, weight); + //TheEndBiomes.addMidlandsBiome(key, weight); } return biome; } @@ -282,7 +282,7 @@ public class BiomeAPI { float weight = biome.getGenChance(); ResourceKey key = getBiomeKey(biome.getBiome()); if (biome.allowFabricRegistration()) { - TheEndBiomeData.addEndBiomeReplacement(Biomes.SMALL_END_ISLANDS, key, weight); + TheEndBiomes.addSmallIslandsBiome(key, weight); } return biome; }