From 3fc8135d91e657f180dcb5bd23d8505083fa5365 Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 12 Dec 2024 13:07:00 +0100 Subject: [PATCH] version dump --- .tool-versions | 2 +- dev-resources/spawn-test-spigot.sh | 8 ++++---- 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 +- .../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 | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.tool-versions b/.tool-versions index bb5e99345..b1e51edda 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java openjdk-21 +java adoptopenjdk-8.0.332+9 diff --git a/dev-resources/spawn-test-spigot.sh b/dev-resources/spawn-test-spigot.sh index 777fbe10b..30f923997 100755 --- a/dev-resources/spawn-test-spigot.sh +++ b/dev-resources/spawn-test-spigot.sh @@ -15,10 +15,10 @@ cp dev-resources/ops.json test-server-spigot/ cd test-server-spigot echo "Cleaning server..." -if [ ! -f ./spigot-1.21.jar ]; then - wget https://download.getbukkit.org/spigot/spigot-1.21.jar +if [ ! -f ./spigot-1.21.4.jar ]; then + wget https://download.getbukkit.org/spigot/spigot-1.21.4.jar echo "eula=true" > eula.txt - chmod +x spigot-1.21.jar + chmod +x spigot-1.21.4.jar fi #export OA_ENVIRONMENT="DEVELOPMENT" @@ -28,4 +28,4 @@ echo "Starting server.." rm world/session.lock rm world_the_end/session.lock rm world_nether/session.lock -java -Xms3G -Xmx3G -DIReallyKnowWhatIAmDoingISwear -jar spigot-1.21.jar nogui +java -Xms3G -Xmx3G -DIReallyKnowWhatIAmDoingISwear -jar spigot-1.21.4.jar nogui diff --git a/modules/mapdb-migrator/dependency-reduced-pom.xml b/modules/mapdb-migrator/dependency-reduced-pom.xml index fffd1d135..bc87d8ec8 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.5 + 6.10.6 provided diff --git a/modules/parties-module/dependency-reduced-pom.xml b/modules/parties-module/dependency-reduced-pom.xml index efb3a9149..3b12663c4 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.5 + 6.10.6 provided diff --git a/modules/skywars-module/dependency-reduced-pom.xml b/modules/skywars-module/dependency-reduced-pom.xml index 72f30b035..b1d84ae63 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.5 + 6.10.6 provided diff --git a/modules/vistas-client/dependency-reduced-pom.xml b/modules/vistas-client/dependency-reduced-pom.xml index 21e652b24..bee13fec4 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.5 + 6.10.6 provided diff --git a/modules/voice-join-permission/dependency-reduced-pom.xml b/modules/voice-join-permission/dependency-reduced-pom.xml index e4b08a8a0..53be0c362 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.5 + 6.10.6 provided diff --git a/plugin/protocol/static-resources/project_status.json b/plugin/protocol/static-resources/project_status.json index 3b4aa9ee1..aaa0ae42b 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.5", + "version_tag": "6.10.6", "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 958d16c91..0c3a85a83 100755 --- a/plugin/src/main/bash/data.bin +++ b/plugin/src/main/bash/data.bin @@ -1 +1 @@ -BUILD_NUM="1498" +BUILD_NUM="1502" 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 94169fa71..c7504fcc6 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.5", + version = "6.10.6", 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 2cb40f429..11f164fab 100644 --- a/plugin/src/main/resources/bungee.yml +++ b/plugin/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: OpenAudioMc -version: 6.10.5 +version: 6.10.6 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 958d16c91..0c3a85a83 100755 --- a/plugin/src/main/resources/data.bin +++ b/plugin/src/main/resources/data.bin @@ -1 +1 @@ -BUILD_NUM="1498" +BUILD_NUM="1502" diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties index bfc85b1fc..5a68edeb3 100644 --- a/plugin/src/main/resources/openaudiomc-build.properties +++ b/plugin/src/main/resources/openaudiomc-build.properties @@ -1,3 +1,3 @@ -BUILD_VERSION="1498" -BUILD_COMMIT="10292cce203f24881932a1474f6781bdb0448691" +BUILD_VERSION="1502" +BUILD_COMMIT="c1b8d01b0ffb085c03a6af17a91695c43f8a1ce8" BUILD_AUTHOR="Mats" diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml index b0060ec90..2884a0bd3 100644 --- a/plugin/src/main/resources/plugin.yml +++ b/plugin/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: OpenAudioMc -version: 6.10.5 +version: 6.10.6 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 da12f3b7e..1d3cb9bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ The OpenAudioMc Java plugin and Api UTF-8 - 6.10.5 + 6.10.6 1.18.36 @@ -26,7 +26,7 @@ 4.7.0 3.0.1 e1f961b - 2.14.0 + 2.14.1-SNAPSHOT b23a51825e