diff --git a/build.gradle b/build.gradle index da71bcb78..5acae5cbd 100644 --- a/build.gradle +++ b/build.gradle @@ -18,9 +18,9 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.14.5" - static def mcVersion = "20w28a" - static def yarnVersion = "+build.11" + static def baseVersion = "0.14.6" + static def mcVersion = "20w29a" + static def yarnVersion = "+build.1" } version = Globals.baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local") + "-" + getBranch() diff --git a/fabric-biomes-v1/build.gradle b/fabric-biomes-v1/build.gradle index 32f5d0e59..34272248b 100644 --- a/fabric-biomes-v1/build.gradle +++ b/fabric-biomes-v1/build.gradle @@ -1,2 +1,2 @@ archivesBaseName = "fabric-biomes-v1" -version = getSubprojectVersion(project, "1.0.0") +version = getSubprojectVersion(project, "1.0.1") diff --git a/fabric-biomes-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java b/fabric-biomes-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java index 3d46e2995..829399ec4 100644 --- a/fabric-biomes-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java +++ b/fabric-biomes-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java @@ -16,13 +16,12 @@ package net.fabricmc.fabric.test.biome; +import net.minecraft.class_5478; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; -import net.minecraft.world.biome.CrimsonForestBiome; -import net.minecraft.world.biome.PlainsBiome; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.biomes.v1.NetherBiomes; @@ -32,11 +31,11 @@ public class FabricBiomeTest implements ModInitializer { public static final String MOD_ID = "fabric-biome-api-v1-testmod"; @Override public void onInitialize() { - CrimsonForestBiome biome = Registry.register(BuiltinRegistries.BIOME, new Identifier(MOD_ID, "test_crimson_forest"), new CrimsonForestBiome()); + Biome biome = Registry.register(BuiltinRegistries.BIOME, new Identifier(MOD_ID, "test_crimson_forest"), class_5478.method_30730()); NetherBiomes.addNetherBiome(Biomes.BEACH, new Biome.MixedNoisePoint(0.0F, 0.5F, 0.0F, 0.0F, 0.1F)); NetherBiomes.addNetherBiome(biome, new Biome.MixedNoisePoint(0.0F, 0.5F, 0.0F, 0.0F, 0.275F)); - PlainsBiome customPlains = Registry.register(BuiltinRegistries.BIOME, new Identifier(MOD_ID, "custom_plains"), new PlainsBiome()); + Biome customPlains = Registry.register(BuiltinRegistries.BIOME, new Identifier(MOD_ID, "custom_plains"), class_5478.method_30701(null, false)); OverworldBiomes.addBiomeVariant(Biomes.PLAINS, customPlains, 1); } } diff --git a/fabric-registry-sync-v0/build.gradle b/fabric-registry-sync-v0/build.gradle index e11e74fa3..451d62407 100644 --- a/fabric-registry-sync-v0/build.gradle +++ b/fabric-registry-sync-v0/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-registry-sync-v0" -version = getSubprojectVersion(project, "0.3.9") +version = getSubprojectVersion(project, "0.3.10") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinLevelStorageSession.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinLevelStorageSession.java index 09206d4dd..4fc74ed7d 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinLevelStorageSession.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinLevelStorageSession.java @@ -39,7 +39,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.SaveProperties; import net.minecraft.world.level.storage.LevelStorage; -import net.minecraft.class_5455; +import net.minecraft.util.registry.DynamicRegistryManager; import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager; import net.fabricmc.fabric.impl.registry.sync.RemapException; @@ -130,7 +130,7 @@ public class MixinLevelStorageSession { } @Inject(method = "method_27426", at = @At("HEAD")) - public void saveWorld(class_5455 registryTracker, SaveProperties saveProperties, CompoundTag compoundTag, CallbackInfo info) { + public void saveWorld(DynamicRegistryManager registryTracker, SaveProperties saveProperties, CompoundTag compoundTag, CallbackInfo info) { if (!Files.exists(directory)) { return; }