From 398af52feda2bf73f0e2895b9af8ad2114a8f378 Mon Sep 17 00:00:00 2001 From: Sven Date: Sat, 24 Jan 2026 15:21:43 +0100 Subject: [PATCH 1/5] Update DiamondBank-OG --- libs/DiamondBank-OG | 2 +- libs/Utilities-OG | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/DiamondBank-OG b/libs/DiamondBank-OG index 450ae7a..ab4db3d 160000 --- a/libs/DiamondBank-OG +++ b/libs/DiamondBank-OG @@ -1 +1 @@ -Subproject commit 450ae7ac53791a925e971f8a519488cfab8f9504 +Subproject commit ab4db3d8b8b23e435a40b1d4b06a5c33b5711187 diff --git a/libs/Utilities-OG b/libs/Utilities-OG index 3705eaf..fc93c2e 160000 --- a/libs/Utilities-OG +++ b/libs/Utilities-OG @@ -1 +1 @@ -Subproject commit 3705eafbc310ee561bbb61e2ee075f16cec9d709 +Subproject commit fc93c2ed4f748c8f5e871e06cf18a349956f8879 -- 2.47.3 From 5cb033fa4b1256c9a92fba0859d7b9ad69fe431e Mon Sep 17 00:00:00 2001 From: Sven Date: Sat, 24 Jan 2026 15:38:48 +0100 Subject: [PATCH 2/5] Fix API usage for DiamondBank-OG --- src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt | 2 +- src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt | 2 +- src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt | 2 +- src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt | 2 +- src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt index 258b5fd..6450452 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt @@ -138,7 +138,7 @@ class HomesFive : Quest { override suspend fun consumeQuestItems(player: Player): Boolean { val withdrawResult = - QuestsOG.diamondBankAPI.withdrawFromPlayer(player.uniqueId, 2500 * 9, "Homes five quest claimed", null) + QuestsOG.diamondBankAPI.consumeFromPlayer(player.uniqueId, 2500 * 9, "Homes five quest claimed", null) if (withdrawResult.isFailure) { return false } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt index d7a965b..c135217 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt @@ -107,7 +107,7 @@ class HomesFour : Quest { override suspend fun consumeQuestItems(player: Player): Boolean { val withdrawResult = - QuestsOG.diamondBankAPI.withdrawFromPlayer(player.uniqueId, 1000 * 9, "Homes four quest claimed", null) + QuestsOG.diamondBankAPI.consumeFromPlayer(player.uniqueId, 1000 * 9, "Homes four quest claimed", null) if (withdrawResult.isFailure) { return false } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt index 5493df2..0fcfb9f 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt @@ -116,7 +116,7 @@ class HomesSix : Quest { override suspend fun consumeQuestItems(player: Player): Boolean { val withdrawResult = - QuestsOG.diamondBankAPI.withdrawFromPlayer(player.uniqueId, 5000 * 9, "Homes six quest claimed", null) + QuestsOG.diamondBankAPI.consumeFromPlayer(player.uniqueId, 5000 * 9, "Homes six quest claimed", null) if (withdrawResult.isFailure) { return false } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt index 1c66b1a..0c973ae 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt @@ -85,7 +85,7 @@ class HomesThree : Quest { override suspend fun consumeQuestItems(player: Player): Boolean { val withdrawResult = - QuestsOG.diamondBankAPI.withdrawFromPlayer(player.uniqueId, 250 * 9, "Homes three quest claimed", null) + QuestsOG.diamondBankAPI.consumeFromPlayer(player.uniqueId, 250 * 9, "Homes three quest claimed", null) if (withdrawResult.isFailure) { return false } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt index 40f41dd..6ba433f 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt @@ -74,7 +74,7 @@ class HomesTwo : Quest { override suspend fun consumeQuestItems(player: Player): Boolean { val withdrawResult = - QuestsOG.diamondBankAPI.withdrawFromPlayer(player.uniqueId, 100 * 9, "Homes two quest claimed", null) + QuestsOG.diamondBankAPI.consumeFromPlayer(player.uniqueId, 100 * 9, "Homes two quest claimed", null) if (withdrawResult.isFailure) { return false } -- 2.47.3 From 2756f3affe823f4d875762cc3c5d1e2b3e406459 Mon Sep 17 00:00:00 2001 From: Sven Date: Sat, 24 Jan 2026 15:39:22 +0100 Subject: [PATCH 3/5] Update Lettuce --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 32a9333..6fd6dc8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,7 +75,7 @@ dependencies { compileOnly("net.luckperms:api:5.5") // Import LuckPerms API. implementation("org.jetbrains.kotlin:kotlin-stdlib") // Import Kotlin standard library. implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") // Import Kotlin async library. - implementation("io.lettuce:lettuce-core:6.7.1.RELEASE") // Import Lettuce API for keydb. + implementation("io.lettuce:lettuce-core:7.2.0.RELEASE") // Import Lettuce API for keydb. compileOnly("com.github.Realizedd.Duels:duels-api:3.5.1") // Import Duels API (API-compatible with Duels-OG). compileOnlyApi(project(":libs:Utilities-OG")) // Import TrueOG Network Utilities-OG Java API (from source). compileOnlyApi(project(":libs:DiamondBank-OG")) { -- 2.47.3 From da6ca201fc15d142c01042251723a70139bf2488 Mon Sep 17 00:00:00 2001 From: Sven Date: Sat, 24 Jan 2026 15:41:46 +0100 Subject: [PATCH 4/5] Use composite builds to keep classpaths separate --- build.gradle.kts | 4 ++-- settings.gradle.kts | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6fd6dc8..2bec77d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,8 +77,8 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") // Import Kotlin async library. implementation("io.lettuce:lettuce-core:7.2.0.RELEASE") // Import Lettuce API for keydb. compileOnly("com.github.Realizedd.Duels:duels-api:3.5.1") // Import Duels API (API-compatible with Duels-OG). - compileOnlyApi(project(":libs:Utilities-OG")) // Import TrueOG Network Utilities-OG Java API (from source). - compileOnlyApi(project(":libs:DiamondBank-OG")) { + compileOnlyApi("net.trueog.utilities-og:Utilities-OG") // Import TrueOG Network Utilities-OG Java API (from source). + compileOnlyApi("net.trueog.diamondbankog:DiamondBank-OG") { attributes { attribute(kotlinAttribute, true) } } // Import TrueOG network DiamondBank-OG Kotlin API (from source). } diff --git a/settings.gradle.kts b/settings.gradle.kts index 49d494a..4cc5224 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,4 @@ ProcessBuilder("sh", "bootstrap.sh").directory(rootDir).inheritIO().start().let file("libs") .listFiles() ?.filter { it.isDirectory && !it.name.startsWith(".") } - ?.forEach { dir -> - include(":libs:${dir.name}") - project(":libs:${dir.name}").projectDir = dir - } + ?.forEach { dir -> includeBuild("libs/${dir.name}") } -- 2.47.3 From ed13ea66a1271b452f94c45370ede7a761c3fcf9 Mon Sep 17 00:00:00 2001 From: Sven Date: Sat, 24 Jan 2026 15:42:02 +0100 Subject: [PATCH 5/5] Relocate shadowed dependencies --- build.gradle.kts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2bec77d..bbb3aa1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ val commitHash = output.trim() } -group = "net.trueog.quests-og" // Declare bundle identifier. +group = "net.trueog.questsOG" // Declare bundle identifier. val apiVersion = "1.19" // Declare minecraft server target version. @@ -91,9 +91,10 @@ tasks.withType().configureEach { // Ensure reproducible .ja /* ----------------------------- Shadow -------------------------------- */ tasks.shadowJar { - exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed. archiveClassifier.set("") // Use empty string instead of null. minimize() + isEnableRelocation = true + relocationPrefix = "${project.group}.shadow" } tasks.jar { archiveClassifier.set("part") } // Applies to root jarfile only. -- 2.47.3