From 4afef529285e737941cff20c77d91d2a3a21827d Mon Sep 17 00:00:00 2001 From: Tim203 Date: Sun, 25 Feb 2024 22:59:41 +0100 Subject: [PATCH] Some minor changes --- api/build.gradle.kts | 2 +- .../geyser/platform/velocity/GeyserVelocityPlatform.java | 2 +- .../geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java | 2 +- core/build.gradle.kts | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index d0bb85e09..bd54a9ce4 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("geyser.shadow-conventions") + id("geyser.publish-conventions") } dependencies { diff --git a/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlatform.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlatform.java index b9eb228fc..541ba32f2 100644 --- a/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlatform.java +++ b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlatform.java @@ -259,6 +259,6 @@ public class GeyserVelocityPlatform implements GeyserBootstrap, IsolatedPlatform @Override public void disable() { - this.onGeyserDisable(); + this.onGeyserShutdown(); } } diff --git a/bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java b/bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java index 47745df7d..040cb17f1 100644 --- a/bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java +++ b/bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java @@ -120,7 +120,7 @@ public class GeyserViaProxyPlugin extends ViaProxyPlugin implements GeyserBootst return; } - this.geyser = GeyserImpl.load(PlatformType.VIAPROXY, this); + this.geyser = GeyserImpl.load(PlatformType.VIAPROXY, this, null); LoopbackUtil.checkAndApplyLoopback(this.logger); } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 7257b5fd6..66801c08c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -54,6 +54,7 @@ dependencies { // Test testImplementation(libs.junit) + testImplementation(projects.isolation) // Annotation Processors compileOnly(projects.ap)