From 6f375147d5834a1776093a049c58930da457e02c Mon Sep 17 00:00:00 2001 From: vLuckyyy Date: Sun, 27 Jul 2025 20:29:28 +0200 Subject: [PATCH 1/3] Support 1.21.8 --- buildSrc/src/main/kotlin/Versions.kt | 2 +- buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6b930208..60ddd1e2 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,7 +12,7 @@ object Versions { const val MULTIFICATION = "1.2.1" const val PACKETS_EVENTS = "2.8.0" - const val ADVENTURE_PLATFORM_BUKKIT = "4.4.0" + const val ADVENTURE_PLATFORM_BUKKIT = "4.4.1-SNAPSHOT" const val ADVENTURE_API = "4.23.0" const val LITE_COMMANDS = "3.10.0" diff --git a/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts b/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts index e960cbc1..85a57e0a 100644 --- a/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts +++ b/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts @@ -14,4 +14,5 @@ repositories { maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") maven("https://repo.codemc.io/repository/maven-releases/") maven("https://jitpack.io/") + maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") } From 492130cfd606136dfc7dc04c314ebfd8cf2366cc Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 27 Jul 2025 20:36:07 +0200 Subject: [PATCH 2/3] update repo --- buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts b/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts index 85a57e0a..d2510f14 100644 --- a/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts +++ b/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts @@ -6,7 +6,7 @@ repositories { mavenCentral() maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.eternalcode.pl/releases") maven("https://storehouse.okaeri.eu/repository/maven-public/") maven("https://repo.panda-lang.org/releases") From 1b9109bc0f3820713159cfae31b4cb2c2a9553b4 Mon Sep 17 00:00:00 2001 From: vLuckyyy Date: Tue, 29 Jul 2025 23:03:14 +0200 Subject: [PATCH 3/3] Release v2.2.0, remove default sound in combat notification. --- README.md | 4 ++-- buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts | 2 +- buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts | 2 +- .../src/main/kotlin/eternalcombat-repositories.gradle.kts | 2 +- .../combat/config/implementation/MessagesSettings.java | 6 +----- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 9a7f474a..f1c6e7ba 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ With Maven: With Gradle: ```kts -compileOnly("com.eternalcode:eternalcombat-api:2.1.1") +compileOnly("com.eternalcode:eternalcombat-api:2.2.0") ``` With Maven: @@ -124,7 +124,7 @@ With Maven: com.eternalcode eternalcombat-api - 2.1.1 + 2.2.0 provided ``` diff --git a/buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts b/buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts index ea857396..0020670b 100644 --- a/buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts +++ b/buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts @@ -3,7 +3,7 @@ plugins { } group = "com.eternalcode" -version = "2.1.1" +version = "2.2.0" tasks.compileJava { options.compilerArgs = listOf("-Xlint:deprecation", "-parameters") diff --git a/buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts b/buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts index 36299762..84b03241 100644 --- a/buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "com.eternalcode" -version = "2.1.1" +version = "2.2.0" java { withSourcesJar() diff --git a/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts b/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts index d2510f14..4734d358 100644 --- a/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts +++ b/buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts @@ -4,10 +4,10 @@ plugins { repositories { mavenCentral() - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.eternalcode.pl/releases") + maven("https://repo.eternalcode.pl/snapshots") maven("https://storehouse.okaeri.eu/repository/maven-public/") maven("https://repo.panda-lang.org/releases") maven("https://maven.enginehub.org/repo/") diff --git a/eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java b/eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java index 2384e9bb..def9a14f 100644 --- a/eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java +++ b/eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java @@ -20,13 +20,9 @@ public class MessagesSettings extends OkaeriConfig { "# Configure the combat log notification displayed to players.", "# You can use the {TIME} variable to display the remaining combat time.", " ", - "# BossBar progress: Set to -1.0 to show the remaining combat time as a progress bar.", - "# BossBar colors: https://javadoc.io/static/net.kyori/adventure-api/4.14.0/net/kyori/adventure/bossbar/BossBar.Color.html", - "# BossBar overlays: https://javadoc.io/static/net.kyori/adventure-api/4.14.0/net/kyori/adventure/bossbar/BossBar.Overlay.html" }) public Notice combatNotification = BukkitNotice.builder() - .actionBar("Combat ends in: {TIME}") - .sound(Sound.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 2.0F, 1.0F) + .actionBar("Combat ends in: {TIME}") .build(); @Comment({