MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] Removed some use of internal FAPI Biome API (#2)

Browse source
This commit is contained in:
Frank 2022-06-12 00:05:48 +02:00
parent a83117b8a9
commit e850173d9e
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java
View file

@ -21,7 +21,7 @@ import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.BiomeSource;
import net.minecraft.world.level.biome.Climate; 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; import org.apache.commons.lang3.function.TriFunction;
@ -148,7 +148,7 @@ public class BCLibNetherBiomeSource extends BCLBiomeSource {
private static boolean isValidNetherBiome(Holder<Biome> biome, ResourceLocation location) { private static boolean isValidNetherBiome(Holder<Biome> biome, ResourceLocation location) {
return NetherBiomeData.canGenerateInNether(biome.unwrapKey().get()) || return NetherBiomes.canGenerateInNether(biome.unwrapKey().get()) ||
biome.is(BiomeTags.IS_NETHER) || biome.is(BiomeTags.IS_NETHER) ||
BiomeAPI.wasRegisteredAsNetherBiome(location); BiomeAPI.wasRegisteredAsNetherBiome(location);
} }
@ -156,7 +156,7 @@ public class BCLibNetherBiomeSource extends BCLBiomeSource {
private static boolean isValidNonVanillaNetherBiome(Holder<Biome> biome, ResourceLocation location) { private static boolean isValidNonVanillaNetherBiome(Holder<Biome> biome, ResourceLocation location) {
return ( return (
!"minecraft".equals(location.getNamespace()) && !"minecraft".equals(location.getNamespace()) &&
NetherBiomeData.canGenerateInNether(biome.unwrapKey().get())) || NetherBiomes.canGenerateInNether(biome.unwrapKey().get())) ||
BiomeAPI.wasRegisteredAs(location, BiomeAPI.BiomeType.BCL_NETHER); BiomeAPI.wasRegisteredAs(location, BiomeAPI.BiomeType.BCL_NETHER);
} }

12
src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
View file

@ -41,8 +41,8 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.impl.biome.NetherBiomeData; import net.fabricmc.fabric.api.biome.v1.NetherBiomes;
import net.fabricmc.fabric.impl.biome.TheEndBiomeData; import net.fabricmc.fabric.api.biome.v1.TheEndBiomes;
import com.google.common.base.Suppliers; import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -200,7 +200,7 @@ public class BiomeAPI {
ResourceKey<Biome> key = getBiomeKey(bclBiome.getBiome()); ResourceKey<Biome> key = getBiomeKey(bclBiome.getBiome());
if (bclBiome.allowFabricRegistration()) { if (bclBiome.allowFabricRegistration()) {
bclBiome.forEachClimateParameter(p -> NetherBiomeData.addNetherBiome(key, p)); bclBiome.forEachClimateParameter(p -> NetherBiomes.addNetherBiome(key, p));
} }
return bclBiome; return bclBiome;
} }
@ -231,8 +231,8 @@ public class BiomeAPI {
float weight = biome.getGenChance(); float weight = biome.getGenChance();
ResourceKey<Biome> key = getBiomeKey(biome.getBiome()); ResourceKey<Biome> key = getBiomeKey(biome.getBiome());
if (biome.allowFabricRegistration()) { if (biome.allowFabricRegistration()) {
TheEndBiomeData.addEndBiomeReplacement(Biomes.END_HIGHLANDS, key, weight); TheEndBiomes.addHighlandsBiome(key, weight);
TheEndBiomeData.addEndBiomeReplacement(Biomes.END_MIDLANDS, key, weight); //TheEndBiomes.addMidlandsBiome(key, weight);
} }
return biome; return biome;
} }
@ -282,7 +282,7 @@ public class BiomeAPI {
float weight = biome.getGenChance(); float weight = biome.getGenChance();
ResourceKey<Biome> key = getBiomeKey(biome.getBiome()); ResourceKey<Biome> key = getBiomeKey(biome.getBiome());
if (biome.allowFabricRegistration()) { if (biome.allowFabricRegistration()) {
TheEndBiomeData.addEndBiomeReplacement(Biomes.SMALL_END_ISLANDS, key, weight); TheEndBiomes.addSmallIslandsBiome(key, weight);
} }
return biome; return biome;
} }