From 974876309796b216b1a7863353791a61f8c540f5 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Sun, 25 Feb 2024 22:25:44 +0100 Subject: [PATCH] Fixed remaining merge issues --- .../geysermc/geyser/floodgate/IntegratedFloodgateProvider.java | 1 + gradle/libs.versions.toml | 2 +- settings.gradle.kts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/geysermc/geyser/floodgate/IntegratedFloodgateProvider.java b/core/src/main/java/org/geysermc/geyser/floodgate/IntegratedFloodgateProvider.java index 4b16d24ee..f07b8ec16 100644 --- a/core/src/main/java/org/geysermc/geyser/floodgate/IntegratedFloodgateProvider.java +++ b/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; } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 62deb182d..975d81bde 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/settings.gradle.kts b/settings.gradle.kts index 529c7da07..5ddebd7e3 100644 --- a/settings.gradle.kts +++ b/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")