From 106455a31135671fe54bdc722f47ee6ae8e6d0b3 Mon Sep 17 00:00:00 2001
From: Potatoboy9999 <51728317+PotatoPresident@users.noreply.github.com>
Date: Wed, 3 Aug 2022 19:45:34 +0000
Subject: [PATCH] Fabric 1.19.1 (#3437)

---
 fabric/build.gradle                                         | 6 +++---
 .../java/me/lucko/luckperms/fabric/FabricSenderFactory.java | 2 +-
 .../lucko/luckperms/fabric/mixin/CommandManagerMixin.java   | 5 +++--
 fabric/src/main/resources/fabric.mod.json                   | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index 889fbd606..27e9a2a60 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -14,8 +14,8 @@ repositories {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.19'
-    mappings 'net.fabricmc:yarn:1.19+build.1:v2'
+    minecraft 'com.mojang:minecraft:1.19.1'
+    mappings 'net.fabricmc:yarn:1.19.1+build.1:v2'
     modImplementation 'net.fabricmc:fabric-loader:0.14.6'
 
     Set<String> apiModules = [
@@ -26,7 +26,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.55.2+1.19'))
+        modImplementation(fabricApi.module(it, '0.58.5+1.19.1'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT'))
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
index 94f53d1b7..1e3537c2d 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
@@ -101,7 +101,7 @@ public class FabricSenderFactory extends SenderFactory<LPFabricPlugin, ServerCom
 
     @Override
     protected void performCommand(ServerCommandSource sender, String command) {
-        sender.getServer().getCommandManager().execute(sender, command);
+        sender.getServer().getCommandManager().executeWithPrefix(sender, command);
     }
 
     @Override
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java
index a08a30fcf..ac7659c14 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java
@@ -25,6 +25,7 @@
 
 package me.lucko.luckperms.fabric.mixin;
 
+import com.mojang.brigadier.ParseResults;
 import me.lucko.luckperms.fabric.event.PreExecuteCommandCallback;
 
 import net.minecraft.server.command.CommandManager;
@@ -38,8 +39,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(CommandManager.class)
 public class CommandManagerMixin {
     @Inject(at = @At("HEAD"), method = "execute", cancellable = true)
-    private void commandExecuteCallback(ServerCommandSource source, String input, CallbackInfoReturnable<Integer> info) {
-        if (!PreExecuteCommandCallback.EVENT.invoker().onPreExecuteCommand(source, input)) {
+    private void commandExecuteCallback(ParseResults<ServerCommandSource> parseResults, String command, CallbackInfoReturnable<Integer> info) {
+        if (!PreExecuteCommandCallback.EVENT.invoker().onPreExecuteCommand(parseResults.getContext().getSource(), command)) {
             info.setReturnValue(0);
         }
     }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 8a32a743b..0121aa4e1 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -32,9 +32,9 @@
   "depends": {
     "fabricloader": ">=0.9.0",
     "fabric-api-base": "*",
-    "fabric-command-api-v1": "*",
+    "fabric-command-api-v2": "*",
     "fabric-lifecycle-events-v1": "*",
-    "fabric-networking-v0": "*",
+    "fabric-networking-api-v1": "*",
     "fabric-permissions-api-v0": "*"
   },
   "custom": {