From 4353c184d9d9962769baf330181dcac9f89b9989 Mon Sep 17 00:00:00 2001 From: DoctorMacc Date: Mon, 6 Jul 2020 21:42:12 -0400 Subject: [PATCH] Revert all 1.14.60-specific changes --- bootstrap/bukkit/pom.xml | 2 +- .../java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java | 4 ++-- .../src/main/java/org/geysermc/connector/GeyserConnector.java | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bootstrap/bukkit/pom.xml b/bootstrap/bukkit/pom.xml index ca8188126..95926854d 100644 --- a/bootstrap/bukkit/pom.xml +++ b/bootstrap/bukkit/pom.xml @@ -26,7 +26,7 @@ us.myles viaversion - 3.0.1 + 3.0.0-SNAPSHOT provided diff --git a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java index 1507f9ee4..3a13777b4 100644 --- a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java +++ b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java @@ -110,8 +110,8 @@ public class GeyserBukkitPlugin extends JavaPlugin implements GeyserBootstrap { if (Bukkit.getPluginManager().getPlugin("ViaVersion") != null) { // TODO: Update when ViaVersion updates // API changes between 2.2.3 and 3.0.0-SNAPSHOT require this check - if (Via.getAPI().getVersion().contains("2.2.3") && isLegacy) { - geyserLogger.info("ViaVersion detected but not the newest version of ViaVersion. Please update your ViaVersion plugin for compatibility with Geyser."); + if (!Via.getAPI().getVersion().equals("3.0.0-SNAPSHOT") && isLegacy) { + geyserLogger.info("ViaVersion detected but not ViaVersion-ABSTRACTION. Please update your ViaVersion plugin for compatibility with Geyser."); } else { isViaVersion = true; } diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java index 3d55845dc..d201656ad 100644 --- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java +++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java @@ -110,7 +110,6 @@ public class GeyserConnector { logger.info("Loading " + NAME + " version " + VERSION); logger.info(""); logger.info("******************************************"); - logger.warning("This build is for connecting to Java 1.15.2 servers and from Bedrock 1.14.60 clients. Please join our Discord (https://discord.geysermc.org) for up-to-date information about where to download 1.16."); this.generalThreadPool = Executors.newScheduledThreadPool(config.getGeneralThreadPool());