From f84891b1c8c3c02c9963c2a9cc772849b2a0dbe3 Mon Sep 17 00:00:00 2001 From: Mats Date: Fri, 22 Nov 2024 18:30:22 +0100 Subject: [PATCH] version bump --- .tool-versions | 2 +- api/dependency-reduced-pom.xml | 2 +- modules/mapdb-migrator/dependency-reduced-pom.xml | 2 +- modules/parties-module/dependency-reduced-pom.xml | 2 +- modules/skywars-module/dependency-reduced-pom.xml | 2 +- modules/vistas-client/dependency-reduced-pom.xml | 2 +- modules/voice-join-permission/dependency-reduced-pom.xml | 2 +- plugin/protocol/static-resources/project_status.json | 2 +- plugin/src/main/bash/data.bin | 2 +- .../spigot/modules/commands/subcommands/AliasSubCommand.java | 2 ++ .../craftmend/openaudiomc/velocity/OpenAudioMcVelocity.java | 2 +- plugin/src/main/resources/bungee.yml | 2 +- plugin/src/main/resources/data.bin | 2 +- plugin/src/main/resources/openaudiomc-build.properties | 4 ++-- plugin/src/main/resources/plugin.yml | 2 +- pom.xml | 2 +- 16 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.tool-versions b/.tool-versions index 8ad369382b..bb5e993457 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java openjdk-17 +java openjdk-21 diff --git a/api/dependency-reduced-pom.xml b/api/dependency-reduced-pom.xml index 0a584b89cb..81b0224802 100644 --- a/api/dependency-reduced-pom.xml +++ b/api/dependency-reduced-pom.xml @@ -95,8 +95,8 @@ - ${project.build.directory}/delombok 1.8 + ${project.build.directory}/delombok UTF-8 src/main/java diff --git a/modules/mapdb-migrator/dependency-reduced-pom.xml b/modules/mapdb-migrator/dependency-reduced-pom.xml index 28e2d1c150..109ac4c60f 100644 --- a/modules/mapdb-migrator/dependency-reduced-pom.xml +++ b/modules/mapdb-migrator/dependency-reduced-pom.xml @@ -107,7 +107,7 @@ com.craftmend.openaudiomc openaudiomc - 6.10.3 + 6.10.4 provided diff --git a/modules/parties-module/dependency-reduced-pom.xml b/modules/parties-module/dependency-reduced-pom.xml index f8f0324594..f011c3c8d2 100644 --- a/modules/parties-module/dependency-reduced-pom.xml +++ b/modules/parties-module/dependency-reduced-pom.xml @@ -112,7 +112,7 @@ com.craftmend.openaudiomc openaudiomc - 6.10.3 + 6.10.4 provided diff --git a/modules/skywars-module/dependency-reduced-pom.xml b/modules/skywars-module/dependency-reduced-pom.xml index c599f194cd..cfc0fb70da 100644 --- a/modules/skywars-module/dependency-reduced-pom.xml +++ b/modules/skywars-module/dependency-reduced-pom.xml @@ -112,7 +112,7 @@ com.craftmend.openaudiomc openaudiomc - 6.10.3 + 6.10.4 provided diff --git a/modules/vistas-client/dependency-reduced-pom.xml b/modules/vistas-client/dependency-reduced-pom.xml index 16a2446b65..f36b7b2ee3 100644 --- a/modules/vistas-client/dependency-reduced-pom.xml +++ b/modules/vistas-client/dependency-reduced-pom.xml @@ -115,7 +115,7 @@ com.craftmend.openaudiomc openaudiomc - 6.10.3 + 6.10.4 provided diff --git a/modules/voice-join-permission/dependency-reduced-pom.xml b/modules/voice-join-permission/dependency-reduced-pom.xml index 77f7ac5a42..a0ad0d1d76 100644 --- a/modules/voice-join-permission/dependency-reduced-pom.xml +++ b/modules/voice-join-permission/dependency-reduced-pom.xml @@ -108,7 +108,7 @@ com.craftmend.openaudiomc openaudiomc - 6.10.3 + 6.10.4 provided diff --git a/plugin/protocol/static-resources/project_status.json b/plugin/protocol/static-resources/project_status.json index ccaec4198b..f975187b3a 100644 --- 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.3", + "version_tag": "6.10.4", "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 index 4db4edb15e..458ae399da 100755 --- a/plugin/src/main/bash/data.bin +++ b/plugin/src/main/bash/data.bin @@ -1 +1 @@ -BUILD_NUM="1468" +BUILD_NUM="1471" diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java index 8d1fedc2c8..5766c7259a 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java @@ -60,6 +60,8 @@ public void onExecute(User sender, String[] args) { if (alias != null) { OpenAudioMc.getService(DatabaseService.class).getRepository(Alias.class).delete(alias); message(sender, ChatColor.GREEN + "Success! the alias " + ChatColor.YELLOW + "a:" + sanitize(args[1]) + ChatColor.GRAY + " has been removed."); + // also remove it from the cache + OpenAudioMc.getService(AliasService.class).getAliasMap().remove(sanitize(args[1])); } else { message(sender, ChatColor.RED + "Error! the alias " + ChatColor.YELLOW + "a:" + sanitize(args[1]) + ChatColor.GRAY + " does not exist."); } diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/velocity/OpenAudioMcVelocity.java b/plugin/src/main/java/com/craftmend/openaudiomc/velocity/OpenAudioMcVelocity.java index 35cbe85016..3d3ba06ae5 100644 --- 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.3", + version = "6.10.4", 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 index 69c49a5405..bcf8aeaead 100644 --- a/plugin/src/main/resources/bungee.yml +++ b/plugin/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: OpenAudioMc -version: 6.10.3 +version: 6.10.4 main: com.craftmend.openaudiomc.bungee.OpenAudioMcBungee author: Mindgamesnl authors: [Mindgamesnl] diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin index 4db4edb15e..458ae399da 100755 --- a/plugin/src/main/resources/data.bin +++ b/plugin/src/main/resources/data.bin @@ -1 +1 @@ -BUILD_NUM="1468" +BUILD_NUM="1471" diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties index 6ea07995d0..3e96069790 100644 --- a/plugin/src/main/resources/openaudiomc-build.properties +++ b/plugin/src/main/resources/openaudiomc-build.properties @@ -1,3 +1,3 @@ -BUILD_VERSION="1468" -BUILD_COMMIT="a3e0cf717c234d54b9f909d29976b4fa01fea99c" +BUILD_VERSION="1471" +BUILD_COMMIT="30e086cb7cec6a7d776d63f60e19b152ce7ab141" BUILD_AUTHOR="Mats" diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml index 44b536c76d..7fe27f99a1 100644 --- a/plugin/src/main/resources/plugin.yml +++ b/plugin/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: OpenAudioMc -version: 6.10.3 +version: 6.10.4 softdepend: [WorldGuard, Train_Carts, LiteBans, Essentials, PlaceholderAPI] main: com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot api-version: 1.13 diff --git a/pom.xml b/pom.xml index e7725ce564..cac22e1551 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ The OpenAudioMc Java plugin and Api UTF-8 - 6.10.3 + 6.10.4 1.18.30