From 32a560b3f75b2441bea468ea6e3d24c397c9c2a8 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Sat, 19 Feb 2022 14:25:58 +0000
Subject: [PATCH] Fix type passed to data pack reload events. (#2009)
---
.../api/event/lifecycle/v1/ServerLifecycleEvents.java | 8 ++++----
.../mixin/event/lifecycle/MinecraftServerMixin.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerLifecycleEvents.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerLifecycleEvents.java
index e6f04acc4..f432f3e44 100644
--- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerLifecycleEvents.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerLifecycleEvents.java
@@ -16,7 +16,7 @@
package net.fabricmc.fabric.api.event.lifecycle.v1;
-import net.minecraft.resource.ServerResourceManager;
+import net.minecraft.resource.LifecycledResourceManager;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PlayerManager;
@@ -118,7 +118,7 @@ public final class ServerLifecycleEvents {
@FunctionalInterface
public interface StartDataPackReload {
- void startDataPackReload(MinecraftServer server, ServerResourceManager serverResourceManager);
+ void startDataPackReload(MinecraftServer server, LifecycledResourceManager resourceManager);
}
@FunctionalInterface
@@ -129,9 +129,9 @@ public final class ServerLifecycleEvents {
* <p>If the reload was not successful, the old data packs will be kept.
*
* @param server the server
- * @param serverResourceManager the server resource manager
+ * @param resourceManager the resource manager
* @param success if the reload was successful
*/
- void endDataPackReload(MinecraftServer server, ServerResourceManager serverResourceManager, boolean success);
+ void endDataPackReload(MinecraftServer server, LifecycledResourceManager resourceManager, boolean success);
}
}
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
index 5d238f0e9..4683abfbf 100644
--- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
@@ -90,14 +90,14 @@ public abstract class MinecraftServerMixin {
@Inject(method = "reloadResources", at = @At("HEAD"))
private void startResourceReload(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
- ServerLifecycleEvents.START_DATA_PACK_RELOAD.invoker().startDataPackReload((MinecraftServer) (Object) this, this.serverResourceManager.managers());
+ ServerLifecycleEvents.START_DATA_PACK_RELOAD.invoker().startDataPackReload((MinecraftServer) (Object) this, this.serverResourceManager.resourceManager());
}
@Inject(method = "reloadResources", at = @At("TAIL"))
private void endResourceReload(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
cir.getReturnValue().handleAsync((value, throwable) -> {
// Hook into fail
- ServerLifecycleEvents.END_DATA_PACK_RELOAD.invoker().endDataPackReload((MinecraftServer) (Object) this, this.serverResourceManager.managers(), throwable == null);
+ ServerLifecycleEvents.END_DATA_PACK_RELOAD.invoker().endDataPackReload((MinecraftServer) (Object) this, this.serverResourceManager.resourceManager(), throwable == null);
return value;
}, (MinecraftServer) (Object) this);
}