remove dead mechanisms

Mindgamesnl · Mindgamesnl · commit bff5d2c5ab87 · 2024-12-28T12:56:03.000+01:00
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-java openjdk-17
+java openjdk-21
diff --git a/modules/mapdb-migrator/dependency-reduced-pom.xml b/modules/mapdb-migrator/dependency-reduced-pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.craftmend.openaudiomc</groupId>
       <artifactId>openaudiomc</artifactId>
-      <version>6.10.6</version>
+      <version>6.10.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/modules/parties-module/dependency-reduced-pom.xml b/modules/parties-module/dependency-reduced-pom.xml
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.craftmend.openaudiomc</groupId>
       <artifactId>openaudiomc</artifactId>
-      <version>6.10.6</version>
+      <version>6.10.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/modules/skywars-module/dependency-reduced-pom.xml b/modules/skywars-module/dependency-reduced-pom.xml
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.craftmend.openaudiomc</groupId>
       <artifactId>openaudiomc</artifactId>
-      <version>6.10.6</version>
+      <version>6.10.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/modules/vistas-client/dependency-reduced-pom.xml b/modules/vistas-client/dependency-reduced-pom.xml
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.craftmend.openaudiomc</groupId>
       <artifactId>openaudiomc</artifactId>
-      <version>6.10.6</version>
+      <version>6.10.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/modules/voice-join-permission/dependency-reduced-pom.xml b/modules/voice-join-permission/dependency-reduced-pom.xml
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>com.craftmend.openaudiomc</groupId>
       <artifactId>openaudiomc</artifactId>
-      <version>6.10.6</version>
+      <version>6.10.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/plugin/protocol/static-resources/project_status.json b/plugin/protocol/static-resources/project_status.json
@@ -1,7 +1,7 @@
 {
   "response": {
     "versioning": {
-      "version_tag": "6.10.6",
+      "version_tag": "6.10.7",
       "build_number": 700,
       "version_importance": "&e&aHighly Recommended",
       "version_update_message": "Migrated to a new platform, free CDN, settings, routing, and much more! Please read the changelog for more information and a guide on how to migrate."
diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin
@@ -1 +1 @@
-BUILD_NUM="1506"
+BUILD_NUM="1511"
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/OpenAudioMc.java b/plugin/src/main/java/com/craftmend/openaudiomc/OpenAudioMc.java
@@ -8,8 +8,6 @@
 import com.craftmend.openaudiomc.generic.client.ClientDataService;
 import com.craftmend.openaudiomc.generic.commands.CommandService;
 import com.craftmend.openaudiomc.generic.database.DatabaseService;
-import com.craftmend.openaudiomc.generic.environment.EnvironmentService;
-import com.craftmend.openaudiomc.generic.environment.GlobalConstantService;
 import com.craftmend.openaudiomc.generic.environment.MagicValue;
 import com.craftmend.openaudiomc.generic.events.EventService;
 import com.craftmend.openaudiomc.generic.logging.OpenAudioLogger;
@@ -147,14 +145,12 @@ public OpenAudioMc(OpenAudioInvoker invoker) throws Exception {
         // load core services in order
         serviceManager.loadServices(
                 DatabaseService.class,          // player and profile storage
-                EnvironmentService.class,       // env loader
                 MojangLookupService.class,      // handles caching of uuid's > names
                 ProxyHostService.class,         // register handlers for proxy events
                 MediaService.class,             // processes outgoing URL's
                 TimeService.class,              // processes remote or network timecodes and translates them for the client
                 StateService.class,             // handles internal state tracking/monitoring
                 AuthenticationService.class,    // handles server key sets with the OpenAudioMc backend infrastructure
-                GlobalConstantService.class,    // keeps track of remote project constants (like release versions, etc)
                 CommandService.class,           // standardized command processor regardless of platform
                 RedisService.class,             // redis hook/service implementation
                 OpenaudioAccountService.class,  // platform specific features, like voice chat
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/client/objects/ClientConnection.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/client/objects/ClientConnection.java
@@ -16,7 +16,6 @@
 import com.craftmend.openaudiomc.generic.client.session.RtcSessionManager;
 import com.craftmend.openaudiomc.generic.client.session.SessionData;
 import com.craftmend.openaudiomc.generic.client.store.ClientDataStore;
-import com.craftmend.openaudiomc.generic.environment.GlobalConstantService;
 import com.craftmend.openaudiomc.generic.environment.MagicValue;
 import com.craftmend.openaudiomc.generic.media.MediaService;
 import com.craftmend.openaudiomc.generic.networking.abstracts.AbstractPacket;
@@ -80,14 +79,12 @@ public ClientConnection(User playerContainer, SerializableClient fromSerialized)
             this.session.applySerializedSession(fromSerialized);
         }
 
-        if (OpenAudioMc.getInstance().getConfiguration().getBoolean(StorageKey.SETTINGS_SEND_URL_ON_JOIN))
+        if (OpenAudioMc.getInstance().getConfiguration().getBoolean(StorageKey.SETTINGS_SEND_URL_ON_JOIN)) {
             OpenAudioMc.resolveDependency(TaskService.class).schduleSyncDelayedTask(() -> {
                 if (!isConnected()) {
                     this.getAuth().publishSessionUrl();
                 }
             }, 20 * StorageKey.SETTINGS_SEND_URL_ON_JOIN_DELAY.getInt());
-        if (!OpenAudioMc.getInstance().getInvoker().isNodeServer()) {
-            OpenAudioMc.getService(GlobalConstantService.class).sendNotifications(user);
         }
 
         getDataStore().setWhenFinished(dataStore -> {
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/EnvironmentService.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/EnvironmentService.java
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/GlobalConstantService.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/GlobalConstantService.java
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/models/Announcement.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/models/Announcement.java
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/models/ProjectStatus.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/models/ProjectStatus.java
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/models/VersionDetails.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/environment/models/VersionDetails.java
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/migrations/MigrationWorker.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/migrations/MigrationWorker.java
@@ -22,7 +22,6 @@ public void handleMigrations() {
         final SimpleMigration[] migrations = new SimpleMigration[]{
                 new AddConfigKeyMigration(MESSAGE_HOVER_TO_CONNECT, "adds a config field for the hover-to-connect message"),
                 new AddConfigKeyMigration(SETTINGS_STAFF_TIPS, "adds a config field for the staff-tips option"),
-                new AddConfigKeyMigration(SETTINGS_NOTIFY_UPDATES, "adds config fields for update and announcement preferences,"),
                 new AddConfigKeyMigration(MESSAGE_GENERATING_SESSION, "messages for generation and session errors"),
                 new AddConfigKeyMigration(SETTINGS_PRELOAD_SOUNDS, "add a config value for how many files to prefetch"),
                 new AddConfigKeyMigration(MESSAGE_CLIENT_VOLUME, "add a config value for default volume messages"),
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/rest/routes/Endpoint.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/rest/routes/Endpoint.java
@@ -9,6 +9,7 @@
 public enum Endpoint {
 
     // accounts
+    ACCESS_TEST("https://gateway.openaudiomc.net", "/", false),
     GET_ACCOUNT_SETTINGS("https://account.openaudiomc.net", "/api/v1/installation/settings/_public_key_", true),
     REGISTER("https://account.openaudiomc.net", "/api/v1/installation/register", false),
     RELAY_LOGIN("https://gateway.openaudiomc.net", "/api/v1/installation/login-relay/_public_key_/_private_key_", true),
@@ -28,9 +29,6 @@ public enum Endpoint {
 
     // loopback
     LOOPBACK_CHECK("", "/api/validate", false, false),
-
-    // external
-    GITHUB_VERSION_CHECK("https://raw.githubusercontent.com", "/Mindgamesnl/OpenAudioMc/master/plugin/protocol/static-resources/project_status.json", false, false),
     ;
 
     private String baseUrl;
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/state/collectors/BuildDetail.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/state/collectors/BuildDetail.java
@@ -1,8 +1,6 @@
 package com.craftmend.openaudiomc.generic.state.collectors;
 
 import com.craftmend.openaudiomc.OpenAudioMc;
-import com.craftmend.openaudiomc.generic.environment.GlobalConstantService;
-import com.craftmend.openaudiomc.generic.environment.models.ProjectStatus;
 import com.craftmend.openaudiomc.generic.state.interfaces.StateDetail;
 
 public class BuildDetail implements StateDetail {
@@ -14,15 +12,7 @@ public String title() {
 
     @Override
     public String value() {
-        ProjectStatus ps = OpenAudioMc.getService(GlobalConstantService.class).getProjectStatus();
-        String l = "";
-        if (ps == null) {
-            l = "Unknown";
-        } else {
-            l = ps.getLatestBuildNumber() + "";
-        }
-
-        return "Running build: " + OpenAudioMc.BUILD.getBuildNumber() + ", latest: " + l;
+        return "Running build: " + OpenAudioMc.BUILD.getBuildNumber();
     }
 
 }
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java
@@ -93,8 +93,6 @@ public enum StorageKey {
     SETTINGS_USE_WG_PRIORITY(false, "options.use-region-priority", StorageLocation.CONFIG_FILE),
     SETTINGS_PLUS_ACCESS_LEVEL(false, "options.plus-access-level", StorageLocation.CONFIG_FILE),
     SETTINGS_STAFF_TIPS(false, "options.staff-tips", StorageLocation.CONFIG_FILE),
-    SETTINGS_NOTIFY_UPDATES(false, "options.notify-updates", StorageLocation.CONFIG_FILE),
-    SETTINGS_NOTIFY_ANNOUNCEMENTS(false, "options.notify-announcements", StorageLocation.CONFIG_FILE),
     SETTINGS_PRELOAD_SOUNDS(false, "options.preload-resources", StorageLocation.CONFIG_FILE),
     SETTINGS_PRELOAD_REPLENISH_POOL(false, "options.replenish-preload-cache", StorageLocation.CONFIG_FILE),
     SETTINGS_GC_STRATEGY(false, "options.gc-strategy", StorageLocation.CONFIG_FILE),
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/velocity/OpenAudioMcVelocity.java b/plugin/src/main/java/com/craftmend/openaudiomc/velocity/OpenAudioMcVelocity.java
@@ -37,7 +37,7 @@
 @Plugin(
         id = "openaudiomc",
         name = "OpenAudioMc Bungee Plugin Port for Velocity",
-        version = "6.10.6",
+        version = "6.10.7",
         authors = {"Mindgamesnl", "fluse1367"},
         description = "OpenAudioMc: Proximity voice chat & audio plugin for Minecraft, no mods needed. Supports Bungeecord, Velocity, Spigot & more.",
         url = "https://openaudiomc.net/"
diff --git a/plugin/src/main/resources/bungee.yml b/plugin/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
 name: OpenAudioMc
-version: 6.10.6
+version: 6.10.7
 main: com.craftmend.openaudiomc.bungee.OpenAudioMcBungee
 author: Mindgamesnl
 authors: [Mindgamesnl]
diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml
@@ -212,12 +212,6 @@ options:
   # Staff will receive helpful tips and error messages when something went wrong while playing a file
   staff-tips: true
 
-  # If you want to receive update notifications, recommended to leave it on, but turn it off if you have to for some weird reason
-  notify-updates: true
-
-  # If you want to receive announcements over things like server maintenance, highly recommended, we'll never bother you if not needed
-  notify-announcements: true
-
   # The amount of resources you want to have preloaded in the client
   preload-resources: 7
 
diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin
@@ -1 +1 @@
-BUILD_NUM="1506"
+BUILD_NUM="1511"
diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties
@@ -1,3 +1,3 @@
-BUILD_VERSION="1506"
-BUILD_COMMIT="c8d99549e41b38f06b21cd6b8756dfdc278c5ff9"
+BUILD_VERSION="1511"
+BUILD_COMMIT="295b056e910a913f6d409dff441b932f670f7cc8"
 BUILD_AUTHOR="Mats"
diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: OpenAudioMc
-version: 6.10.6
+version: 6.10.7
 softdepend: [WorldGuard, Train_Carts, LiteBans, Essentials, PlaceholderAPI]
 main: com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot
 api-version: 1.13
diff --git a/plugin/src/test/java/com/craftmend/tests/TestRest.java b/plugin/src/test/java/com/craftmend/tests/TestRest.java
@@ -1,24 +1,32 @@
 package com.craftmend.tests;
 
-import com.craftmend.openaudiomc.generic.environment.models.ProjectStatus;
 import com.craftmend.openaudiomc.generic.rest.RestRequest;
+import com.craftmend.openaudiomc.generic.rest.response.AbstractRestResponse;
 import com.craftmend.openaudiomc.generic.rest.response.SectionError;
 import com.craftmend.openaudiomc.generic.rest.routes.Endpoint;
+import lombok.Getter;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class TestRest {
 
+    @Getter
+    public static class GatewayStatus extends AbstractRestResponse {
+        private String motd;
+        private String[] enabledFeatureFlags;
+        private String env;
+    }
+
     @Test
     public void testHtml() {
-        RestRequest<ProjectStatus> restRequest = new RestRequest<>(ProjectStatus.class, Endpoint.GITHUB_VERSION_CHECK);
+        RestRequest<GatewayStatus> restRequest = new RestRequest<>(GatewayStatus.class, Endpoint.ACCESS_TEST);
         restRequest.run();
-        Assert.assertTrue(restRequest.getError() == SectionError.NONE);
+        Assert.assertSame(restRequest.getError(), SectionError.NONE);
 
-        ProjectStatus status = restRequest.getResponse();
+        GatewayStatus status = restRequest.getResponse();
 
         Assert.assertNotNull(status);
-        Assert.assertTrue(status.isLocalLatest());
+        Assert.assertEquals("production", status.getEnv());
     }
 
 }
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"response": {`
`3`	`3`	`"versioning": {`
`4`		`- "version_tag": "6.10.6",`
	`4`	`+ "version_tag": "6.10.7",`
`5`	`5`	`"build_number": 700,`
`6`	`6`	`"version_importance": "&e&aHighly Recommended",`
`7`	`7`	`"version_update_message": "Migrated to a new platform, free CDN, settings, routing, and much more! Please read the changelog for more information and a guide on how to migrate."`