Don't start if Floodgate is outdated

bundabrg · Jun 6, 2021 · 3cdc4c7 · 3cdc4c7
1 parent 3835da2
commit 3cdc4c7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java
@@ -94,6 +94,12 @@ public void onEnable() {
         this.geyserLogger = new GeyserBungeeLogger(getLogger(), geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
+        // Remove this in like a year
+        if (getProxy().getPluginManager().getPlugin("floodgate-bungee") != null) {
+            geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/"));
+            return;
+        }
+
         if (geyserConfig.getRemote().getAuthType().equals("floodgate") && getProxy().getPluginManager().getPlugin("floodgate") == null) {
             geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             return;

diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java
@@ -120,6 +120,13 @@ public void onEnable() {
         this.geyserLogger = new GeyserSpigotLogger(getLogger(), geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
+        // Remove this in like a year
+        if (Bukkit.getPluginManager().getPlugin("floodgate-bukkit") != null) {
+            geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/"));
+            this.getPluginLoader().disablePlugin(this);
+            return;
+        }
+
         if (geyserConfig.getRemote().getAuthType().equals("floodgate") && Bukkit.getPluginManager().getPlugin("floodgate") == null) {
             geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             this.getPluginLoader().disablePlugin(this);

diff --git a/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java b/bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java
@@ -107,6 +107,15 @@ public void onEnable() {
         this.geyserLogger = new GeyserVelocityLogger(logger, geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
+        // Remove this in like a year
+        try {
+            // Should only exist on 1.0
+            Class.forName("org.geysermc.floodgate.FloodgateAPI");
+            geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/"));
+            return;
+        } catch (ClassNotFoundException ignored) {
+        }
+
         if (geyserConfig.getRemote().getAuthType().equals("floodgate") && !proxyServer.getPluginManager().getPlugin("floodgate").isPresent()) {
             geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             return;

diff --git a/connector/src/main/resources/languages b/connector/src/main/resources/languages
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
+0 −6		texts/af_ZA.properties
+0 −6		texts/ar_SA.properties
+0 −6		texts/be_BY.properties
+0 −6		texts/bg_BG.properties
+0 −6		texts/cs_CZ.properties
+0 −6		texts/da_DK.properties
+0 −6		texts/de_DE.properties
+0 −6		texts/el_GR.properties
+0 −6		texts/en_GB.properties
+1 −0		texts/en_US.properties
+0 −6		texts/es_ES.properties
+0 −6		texts/es_MX.properties
+0 −6		texts/fi_FI.properties
+2 −8		texts/fr_CA.properties
+0 −6		texts/fr_FR.properties
+0 −6		texts/he_IL.properties
+2 −8		texts/hi_IN.properties
+0 −6		texts/hu_HU.properties
+0 −6		texts/id_ID.properties
+2 −8		texts/it_IT.properties
+0 −6		texts/ja_JP.properties
+0 −6		texts/ko_KR.properties
+0 −6		texts/nb_NO.properties
+0 −6		texts/nl_NL.properties
+0 −6		texts/pl_PL.properties
+0 −6		texts/pt_BR.properties
+0 −6		texts/pt_PT.properties
+0 −6		texts/ro_RO.properties
+1 −7		texts/ru_RU.properties
+0 −6		texts/sk_SK.properties
+0 −6		texts/sv_SE.properties
+0 −6		texts/tr_TR.properties
+6 −12		texts/uk_UA.properties
+0 −6		texts/zh_CN.properties
+0 −6		texts/zh_TW.properties