FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-05 19:47:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

Fix type passed to data pack reload events. ()

Browse source
This commit is contained in:
modmuss50 2022-02-19 14:25:58 +00:00 • committed by GitHub
parent 0ef16df861
commit 32a560b3f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric
api/event/lifecycle/v1
ServerLifecycleEvents.java
mixin/event/lifecycle
MinecraftServerMixin.java

8
fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerLifecycleEvents.java
View file

@ -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);
}
}

4
fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
View file

@ -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);
}