From adbf61a06b001e070e57fd52801ed88364f202b9 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 16 May 2023 11:27:08 -0400
Subject: [PATCH] 1.20-pre2

---
 .../embeddedt/modernfix/command/ModernFixCommands.java |  5 +++--
 .../mixin/perf/cache_strongholds/ServerLevelMixin.java | 10 +---------
 gradle.properties                                      |  4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java b/common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java
index 97fcda8c..397b0faf 100644
--- a/common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java
+++ b/common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java
@@ -42,14 +42,15 @@ public class ModernFixCommands {
                                 ResourceLocation structureLocation = new ResourceLocation(found.getNamespace(), matcher.group(1));
                                 try(InputStream resource = entry.getValue().open()) {
                                     CachingStructureManager.readStructureTag(structureLocation, level.getServer().getFixerUpper(), resource);
-                                    context.getSource().sendSuccess(Component.literal("checked " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")"), false);
+                                    Component msg = Component.literal("checked " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")");
+                                    context.getSource().sendSuccess(() -> msg, false);
                                 } catch(Throwable e) {
                                     ModernFix.LOGGER.error("Couldn't upgrade structure " + found, e);
                                     context.getSource().sendFailure(Component.literal("error reading " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")"));
                                 }
                             }
 
-                            context.getSource().sendSuccess(Component.literal("All structures upgraded"), false);
+                            context.getSource().sendSuccess(() -> Component.literal("All structures upgraded"), false);
 
                             return 1;
                         }))
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java
index 0a57a0ff..eba1767b 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java
@@ -3,19 +3,13 @@ package org.embeddedt.modernfix.common.mixin.perf.cache_strongholds;
 import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.CustomSpawner;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkGeneratorStructureState;
 import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.storage.DimensionDataStorage;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.world.level.storage.WritableLevelData;
 import org.embeddedt.modernfix.duck.IChunkGenerator;
 import org.embeddedt.modernfix.duck.IServerLevel;
@@ -28,8 +22,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.List;
-import java.util.concurrent.Executor;
 import java.util.function.Supplier;
 
 @Mixin(ServerLevel.class)
@@ -55,7 +47,7 @@ public abstract class ServerLevelMixin extends Level implements IServerLevel {
      * Now start the stronghold generation process.
      */
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void ensureGeneration(MinecraftServer minecraftServer, Executor executor, LevelStorageSource.LevelStorageAccess arg, ServerLevelData arg2, ResourceKey<Level> arg3, LevelStem arg4, ChunkProgressListener arg5, boolean bl, long l, List<CustomSpawner> list, boolean bl2, CallbackInfo ci) {
+    private void ensureGeneration(CallbackInfo ci) {
         mfix$strongholdCache = this.getDataStorage().computeIfAbsent(StrongholdLocationCache::load,
                 StrongholdLocationCache::new,
                 StrongholdLocationCache.getFileId(this.dimensionTypeRegistration()));
diff --git a/gradle.properties b/gradle.properties
index 85162c64..53c0b4fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 
 mod_id=modernfix
-minecraft_version=1.20-pre1
+minecraft_version=1.20-pre2
 enabled_platforms=fabric
 forge_version=1.19.4-45.0.22
 parchment_version=2023.03.12
@@ -14,7 +14,7 @@ kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
 
 fabric_loader_version=0.14.19
-fabric_api_version=0.80.3+1.20
+fabric_api_version=0.81.2+1.20
 
 continuity_version=3.0.0-beta.2+1.19.3