Fixed remaining merge issues

core/src/main/java/org/geysermc/geyser/floodgate/IntegratedFloodgateProvider.java

@@ -58,6 +58,7 @@ public class IntegratedFloodgateProvider implements FloodgateProvider {
 
     @Override
     public String onClientIntention(GeyserSession session) {
+        // we don't have to do anything here, it's done in LocalServerChannelWrapper
         return null;
     }
 }

gradle/libs.versions.toml

@@ -39,7 +39,7 @@ mixin = "0.8.5"
 
 # plugin versions
 indra = "3.1.3"
-shadow = "7.1.3-SNAPSHOT"
+shadow = "8.1.1"
 architectury-plugin = "3.4-SNAPSHOT"
 architectury-loom = "1.4-SNAPSHOT"
 minotaur = "2.8.7"

settings.gradle.kts

@@ -74,6 +74,7 @@ project(":viaproxy").projectDir = file("bootstrap/viaproxy")
 include(":standalone")
 project(":standalone").projectDir = file("bootstrap/standalone")
 
+include(":mod")
 project(":mod").projectDir = file("bootstrap/mod")
 //todo see what's possible with fabric
 include(":fabric")