From 23bcbe1977ccb5bce6917b0c6afcd0552adb5b3e Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Sep 2021 16:19:30 +0200 Subject: [PATCH] Some simple Biome related changes --- src/main/java/ru/bclib/api/BiomeAPI.java | 7 +++++-- .../ru/bclib/complexmaterials/WoodenComplexMaterial.java | 2 +- .../java/ru/bclib/mixin/common/InternalBiomeDataMixin.java | 3 ++- src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java | 4 ++-- .../java/ru/bclib/world/generator/BCLibEndBiomeSource.java | 5 +++-- .../ru/bclib/world/generator/BCLibNetherBiomeSource.java | 5 +++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/bclib/api/BiomeAPI.java b/src/main/java/ru/bclib/api/BiomeAPI.java index eb4ff13e..9aef32e0 100644 --- a/src/main/java/ru/bclib/api/BiomeAPI.java +++ b/src/main/java/ru/bclib/api/BiomeAPI.java @@ -11,7 +11,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.Biome.ClimateParameters; +import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.Biomes; import org.jetbrains.annotations.Nullable; import ru.bclib.util.MHelper; @@ -95,11 +95,14 @@ public class BiomeAPI { registerBiome(biome); NETHER_BIOME_PICKER.addBiome(biome); Random random = new Random(biome.getID().hashCode()); - ClimateParameters parameters = new ClimateParameters( + //TODO: did they add depth and scale as two new params here??? + Climate.ParameterPoint parameters = Climate.parameters( MHelper.randRange(-1.5F, 1.5F, random), MHelper.randRange(-1.5F, 1.5F, random), MHelper.randRange(-1.5F, 1.5F, random), MHelper.randRange(-1.5F, 1.5F, random), + 0.0f, + 0.0f, random.nextFloat() ); ResourceKey key = BuiltinRegistries.BIOME.getResourceKey(biome.getBiome()).get(); diff --git a/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java b/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java index 97a54004..4940f6c1 100644 --- a/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java +++ b/src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java @@ -75,7 +75,7 @@ public class WoodenComplexMaterial extends ComplexMaterial { @Override protected FabricBlockSettings getBlockSettings() { - return FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).materialColor(planksColor); + return FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).mapColor(planksColor); } @Override diff --git a/src/main/java/ru/bclib/mixin/common/InternalBiomeDataMixin.java b/src/main/java/ru/bclib/mixin/common/InternalBiomeDataMixin.java index 3f0e7c37..ac8d41b4 100644 --- a/src/main/java/ru/bclib/mixin/common/InternalBiomeDataMixin.java +++ b/src/main/java/ru/bclib/mixin/common/InternalBiomeDataMixin.java @@ -4,6 +4,7 @@ import net.fabricmc.fabric.impl.biome.InternalBiomeData; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.biome.Climate; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -34,7 +35,7 @@ public class InternalBiomeDataMixin { } @Inject(method = "addNetherBiome", at = @At(value = "HEAD")) - private static void bclib_addNetherBiome(ResourceKey biome, Biome.ClimateParameters spawnNoisePoint, CallbackInfo info) { + private static void bclib_addNetherBiome(ResourceKey biome, Climate.ParameterPoint spawnNoisePoint, CallbackInfo info) { FabricBiomesData.NETHER_BIOMES.add(biome); } } diff --git a/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java b/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java index bd661334..af2fd15a 100644 --- a/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java +++ b/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java @@ -341,8 +341,8 @@ public class BCLBiomeDef { return new Biome.BiomeBuilder().precipitation(precipitation) .biomeCategory(category) - .depth(depth) - .scale(0.2F) + //.depth(depth) //TODO: No longer available in 1.18 + //.scale(0.2F) .temperature(temperature) .downfall(downfall) .specialEffects(effects.build()) diff --git a/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java b/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java index d5dd9827..6f442b0f 100644 --- a/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java +++ b/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java @@ -9,6 +9,7 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.TheEndBiomeSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.synth.SimplexNoise; @@ -46,7 +47,7 @@ public class BCLibEndBiomeSource extends BiomeSource { BiomeAPI.END_LAND_BIOME_PICKER.clearMutables(); BiomeAPI.END_VOID_BIOME_PICKER.clearMutables(); - this.possibleBiomes.forEach(biome -> { + this.possibleBiomes().forEach(biome -> { ResourceLocation key = biomeRegistry.getKey(biome); if (!BiomeAPI.hasBiome(key)) { BCLBiome bclBiome = new BCLBiome(key, biome, 1, 1); @@ -98,7 +99,7 @@ public class BCLibEndBiomeSource extends BiomeSource { } @Override - public Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) { + public Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ, Climate.Sampler sampler) { long i = (long) biomeX * (long) biomeX; long j = (long) biomeZ * (long) biomeZ; long check = GeneratorOptions.isFarEndBiomes() ? 65536L : 625L; diff --git a/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java b/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java index 9fdbfbe5..be2e7f8c 100644 --- a/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java +++ b/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java @@ -8,6 +8,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.biome.BiomeSource; +import net.minecraft.world.level.biome.Climate; import ru.bclib.BCLib; import ru.bclib.api.BiomeAPI; import ru.bclib.world.biomes.BCLBiome; @@ -35,7 +36,7 @@ public class BCLibNetherBiomeSource extends BiomeSource { BiomeAPI.NETHER_BIOME_PICKER.clearMutables(); - this.possibleBiomes.forEach(biome -> { + this.possibleBiomes().forEach(biome -> { ResourceLocation key = biomeRegistry.getKey(biome); if (!BiomeAPI.hasBiome(key)) { BCLBiome bclBiome = new BCLBiome(key, biome, 1, 1); @@ -76,7 +77,7 @@ public class BCLibNetherBiomeSource extends BiomeSource { } @Override - public Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) { + public Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ, Climate.Sampler sampler) { if ((biomeX & 63) == 0 && (biomeZ & 63) == 0) { biomeMap.clearCache(); }