diff --git a/build.gradle b/build.gradle index eefbea2d3..a9ebf2a04 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.4.21" - static def mcVersion = "1.15-pre7" + static def baseVersion = "0.4.22" + static def mcVersion = "1.15" static def yarnVersion = "+build.1" } @@ -223,7 +223,7 @@ curseforge { project { id = '306612' changelog = 'A changelog can be found at https://github.com/FabricMC/fabric/commits/master' - releaseType = 'alpha' + releaseType = 'beta' addGameVersion '1.15-Snapshot' mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) { displayName = "[$Globals.mcVersion] Fabric API $Globals.baseVersion build $ENV.BUILD_NUMBER" diff --git a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeData.java b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeData.java index 1708f4f33..dbcaa4666 100644 --- a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeData.java +++ b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeData.java @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; -import net.minecraft.world.biome.layer.util.BiomeLayers; +import net.minecraft.world.biome.layer.BiomeLayers; import net.minecraft.world.biome.source.VanillaLayeredBiomeSource; import net.fabricmc.fabric.api.biomes.v1.OverworldClimate; diff --git a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddHillsLayer.java b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddHillsLayer.java index 6642bb9e2..39948e78c 100644 --- a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddHillsLayer.java +++ b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddHillsLayer.java @@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.layer.AddHillsLayer; -import net.minecraft.world.biome.layer.util.BiomeLayers; +import net.minecraft.world.biome.layer.BiomeLayers; import net.minecraft.world.biome.layer.util.LayerRandomnessSource; import net.minecraft.world.biome.layer.util.LayerSampler; @@ -62,7 +62,7 @@ public class MixinAddHillsLayer { Biome parent; if (processedNoiseSample == 0 && biomeReturn != biomeId) { - parent = Biome.getParentBiome(Registry.BIOME.get(biomeReturn)); + parent = Biome.getModifiedBiome(Registry.BIOME.get(biomeReturn)); biomeReturn = parent == null ? biomeId : Registry.BIOME.getRawId(parent); }