diff --git a/fabric/build.gradle b/fabric/build.gradle
index f1634a3eb..c9294c6c7 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -13,9 +13,9 @@ repositories {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.21.4'
-    mappings 'net.fabricmc:yarn:1.21.4+build.1:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.16.9'
+    minecraft 'com.mojang:minecraft:1.21.5'
+    mappings 'net.fabricmc:yarn:1.21.5+build.1:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.16.10'
 
     Set<String> apiModules = [
             'fabric-api-base',
@@ -26,7 +26,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.111.0+1.21.4'))
+        modImplementation(fabricApi.module(it, '0.119.0+1.21.5'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.3.3'))
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java
index 303f8dccb..b57e66505 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java
@@ -73,8 +73,7 @@ public class FabricPlayerCalculator implements ContextCalculator<ServerPlayerEnt
     @Override
     public void calculate(@NonNull ServerPlayerEntity target, @NonNull ContextConsumer consumer) {
         GameMode mode = target.interactionManager.getGameMode();
-        final int GAME_MODE_NOT_SET = -1; // GameMode.NOT_SET with ID -1 was removed in 1.17
-        if (this.gamemode && mode != null && mode.getId() != GAME_MODE_NOT_SET) {
+        if (this.gamemode && mode != null) {
             consumer.accept(DefaultContextKeys.GAMEMODE_KEY, GAMEMODE_NAMER.name(mode));
         }
 
diff --git a/forge/gradle.properties b/forge/gradle.properties
index 1c5304927..44b786309 100644
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1,2 +1,2 @@
-minecraftVersion=1.21.4
-forgeVersion=54.0.6
\ No newline at end of file
+minecraftVersion=1.21.5
+forgeVersion=55.0.0
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd964865c..37a7df2b6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 shadow = "8.3.0"
 blossom = "1.3.1"
-moddevgradle = "1.0.21"
+moddevgradle = "2.0.78"
 forgegradle = "[6.0,6.2)"
-loom = "1.7-SNAPSHOT"
+loom = "1.10-SNAPSHOT"
 licenser = "0.6.1"
 
 [plugins]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2c3521197..a4b76b953 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e5..cea7a793a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
index 422b04d7d..204cafd82 100644
--- a/neoforge/gradle.properties
+++ b/neoforge/gradle.properties
@@ -1,2 +1,2 @@
-minecraftVersion=1.21.4
-neoForgeVersion=21.4.10-beta
\ No newline at end of file
+minecraftVersion=1.21.5
+neoForgeVersion=21.5.2-beta
\ No newline at end of file
diff --git a/neoforge/loader/build.gradle b/neoforge/loader/build.gradle
index 3d698ed58..960bf9e80 100644
--- a/neoforge/loader/build.gradle
+++ b/neoforge/loader/build.gradle
@@ -20,11 +20,11 @@ neoForge {
     runs {
         client {
             client()
-            mods.set(new HashSet()) // Work around classpath issues by using the production jar for dev runs
+            //mods.set(new HashSet()) // Work around classpath issues by using the production jar for dev runs
         }
         server {
             server()
-            mods.set(new HashSet()) // Work around classpath issues by using the production jar for dev runs
+            //mods.set(new HashSet()) // Work around classpath issues by using the production jar for dev runs
         }
     }
 }
diff --git a/neoforge/src/main/java/me/lucko/luckperms/neoforge/listeners/NeoForgePlatformListener.java b/neoforge/src/main/java/me/lucko/luckperms/neoforge/listeners/NeoForgePlatformListener.java
index 3daa3177f..ac17bd14d 100644
--- a/neoforge/src/main/java/me/lucko/luckperms/neoforge/listeners/NeoForgePlatformListener.java
+++ b/neoforge/src/main/java/me/lucko/luckperms/neoforge/listeners/NeoForgePlatformListener.java
@@ -36,7 +36,7 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.server.players.ServerOpList;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.neoforge.event.AddReloadListenerEvent;
+import net.neoforged.neoforge.event.AddServerReloadListenersEvent;
 import net.neoforged.neoforge.event.CommandEvent;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
 
@@ -71,7 +71,7 @@ public class NeoForgePlatformListener {
     }
 
     @SubscribeEvent
-    public void onAddReloadListener(AddReloadListenerEvent event) {
+    public void onAddReloadListener(AddServerReloadListenersEvent event) {
         Commands commands = event.getServerResources().getCommands();
         BrigadierInjector.inject(this.plugin, commands.getDispatcher());
     }