From 4e3592c7add5de624c7dab07b8fc6024d3e5fbdb Mon Sep 17 00:00:00 2001 From: ishland Date: Thu, 26 Oct 2023 18:25:26 +0800 Subject: [PATCH] build: 23w43a --- .../scheduling/mixin/shutdown/MixinMinecraftServer.java | 2 +- gradle.properties | 6 +++--- .../com/ishland/c2me/tests/worlddiff/ComparisonSession.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/c2me-opts-scheduling/src/main/java/com/ishland/c2me/opts/scheduling/mixin/shutdown/MixinMinecraftServer.java b/c2me-opts-scheduling/src/main/java/com/ishland/c2me/opts/scheduling/mixin/shutdown/MixinMinecraftServer.java index 5d7077ec0..901cac495 100644 --- a/c2me-opts-scheduling/src/main/java/com/ishland/c2me/opts/scheduling/mixin/shutdown/MixinMinecraftServer.java +++ b/c2me-opts-scheduling/src/main/java/com/ishland/c2me/opts/scheduling/mixin/shutdown/MixinMinecraftServer.java @@ -11,7 +11,7 @@ @Mixin(MinecraftServer.class) public class MixinMinecraftServer { - @Shadow private long timeReference; + @Shadow(aliases = "field_47139") private long timeReference; @Inject(method = "shutdown", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;runTasksTillTickEnd()V", shift = At.Shift.BEFORE)) private void shutdownBeforeRunTasks(CallbackInfo ci) { diff --git a/gradle.properties b/gradle.properties index 7619552e4..4fde00f0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=23w42a -yarn_mappings=23w42a+build.1 -loader_version=0.14.23 +minecraft_version=23w43a +yarn_mappings=23w43a+build.2 +loader_version=0.14.24 # Mod Properties mod_version=0.2.0+alpha.11 maven_group=com.ishland.c2me diff --git a/tests/world-diff/src/main/java/com/ishland/c2me/tests/worlddiff/ComparisonSession.java b/tests/world-diff/src/main/java/com/ishland/c2me/tests/worlddiff/ComparisonSession.java index 04f9236a0..7f4bf9e85 100644 --- a/tests/world-diff/src/main/java/com/ishland/c2me/tests/worlddiff/ComparisonSession.java +++ b/tests/world-diff/src/main/java/com/ishland/c2me/tests/worlddiff/ComparisonSession.java @@ -9,7 +9,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.class_8895; import net.minecraft.datafixer.Schemas; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtList; @@ -55,6 +54,7 @@ import net.minecraft.world.dimension.DimensionOptions; import net.minecraft.world.gen.structure.Structure; import net.minecraft.world.level.storage.LevelStorage; +import net.minecraft.world.level.storage.ParsedSaveProperties; import net.minecraft.world.storage.StorageIoWorker; import net.minecraft.world.updater.WorldUpdater; import org.apache.logging.log4j.LogManager; @@ -279,9 +279,9 @@ private static WorldHandle getWorldHandle(File worldFolder, String description) serverConfig, arg -> { Registry registry = arg.dimensionsRegistryManager().get(RegistryKeys.DIMENSION); - final class_8895 lv = LevelStorage.method_54523(null, arg.dataConfiguration(), registry, arg.worldGenRegistryManager()); + final ParsedSaveProperties lv = LevelStorage.parseSaveProperties(null, arg.dataConfiguration(), registry, arg.worldGenRegistryManager()); Objects.requireNonNull(lv); - return new SaveLoading.LoadContext<>(lv.worldData(), lv.dimensions().toDynamicRegistryManager()); + return new SaveLoading.LoadContext<>(lv.properties(), lv.dimensions().toDynamicRegistryManager()); }, SaveLoader::new, Util.getMainWorkerExecutor(),