From 047989172c8ae5af399e90771cf66290c05b6d44 Mon Sep 17 00:00:00 2001
From: Drex <nicknamedrex@gmail.com>
Date: Sat, 10 Feb 2024 14:35:34 +0100
Subject: [PATCH] Added Redirector mod compatibility

fixes #14
---
 CHANGELOG.md                                          |  4 ++++
 build.gradle                                          |  4 +---
 gradle.properties                                     | 11 +++++------
 gradle/wrapper/gradle-wrapper.properties              |  2 +-
 .../mixin/command/GameModeCommandMixin.java           |  3 ++-
 src/main/resources/fabric.mod.json                    |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6386d0d..9209008 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.3] - 2024-02-10
+### Added
+- Redirector mod compatibility
+
 ## [0.2.2] - 2023-08-27
 ### Removed
 - Multi-version residue
diff --git a/build.gradle b/build.gradle
index 61f099f..30d27b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -20,8 +20,6 @@ dependencies {
     mappings loom.officialMojangMappings()
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")))
-
     // Fabric API
     modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version))
 
diff --git a/gradle.properties b/gradle.properties
index 24f7fad..3723acc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,13 +2,12 @@
 org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.20.2
-loader_version=0.14.22
+minecraft_version=1.20.4
+loader_version=0.15.6
 # Mod Properties
-mod_version=0.2.2
+mod_version=0.2.3
 maven_group=me.drex
 archives_base_name=vanilla-permissions
 # Dependencies
-fabric_version=0.89.2+1.20.2
-fabric_permissions_version=0.3-SNAPSHOT
-mixin_extras_version=0.2.0-rc.5
+fabric_version=0.96.0+1.20.4
+fabric_permissions_version=0.3-SNAPSHOT
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102..a595206 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/me/drex/vanillapermissions/mixin/command/GameModeCommandMixin.java b/src/main/java/me/drex/vanillapermissions/mixin/command/GameModeCommandMixin.java
index a6216f6..c3d27db 100644
--- a/src/main/java/me/drex/vanillapermissions/mixin/command/GameModeCommandMixin.java
+++ b/src/main/java/me/drex/vanillapermissions/mixin/command/GameModeCommandMixin.java
@@ -17,7 +17,8 @@
 import java.util.Collection;
 import java.util.Collections;
 
-@Mixin(GameModeCommand.class)
+// Very low priority, because we want to be applied before Redirector, which has a default priority of 10
+@Mixin(priority = 5, value = GameModeCommand.class)
 public abstract class GameModeCommandMixin {
 
     @Shadow
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index bc2d0a1..f48eb61 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,10 +36,10 @@
   ],
   "accessWidener": "vanilla-permissions.accesswidener",
   "depends": {
-    "fabricloader": ">=0.14.9",
+    "fabricloader": ">=0.15.6",
     "fabric-api": "*",
     "fabric-permissions-api-v0": "*",
-    "minecraft": ">=1.20.2",
+    "minecraft": ">=1.20 <=1.20.4",
     "java": ">=17"
   },
   "suggests": {