From 21a9b8af655f7efe062416ac11461b856ac3d1c1 Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Thu, 21 May 2026 11:58:29 -0400 Subject: [PATCH] Improve GUI, clarify home goals --- README.md | 8 ++++---- libs/GxUI-OG | 2 +- src/main/kotlin/net/trueog/questsOG/QuestGuiCommand.kt | 2 +- .../kotlin/net/trueog/questsOG/quests/HomesFive.kt | 6 +++--- .../kotlin/net/trueog/questsOG/quests/HomesFour.kt | 4 ++-- src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt | 10 +++++----- .../kotlin/net/trueog/questsOG/quests/HomesThree.kt | 6 +++--- src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt | 8 +++++--- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 8ce06c9..25aadd9 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ Free ### Five homes - 2500 diamonds - 15 days played -- 5000k blocks travelled on pig -- 1000k blocks travelled on strider +- 5000 blocks travelled on pig +- 1000 blocks travelled on strider - Kill 50 dolphins - Kill 50 zoglins - The Cutest Predator advancement @@ -53,8 +53,8 @@ Free ### Six Homes - 5000 diamonds - 30 days played -- 10000k blocks walked on water -- 10000k blocks walked underwater +- 10000 blocks walked on water +- 10000 blocks walked underwater - All 13 music discs - All advancements - 1500 blocks of obsidian mined diff --git a/libs/GxUI-OG b/libs/GxUI-OG index 24b385d..e606c9d 160000 --- a/libs/GxUI-OG +++ b/libs/GxUI-OG @@ -1 +1 @@ -Subproject commit 24b385d3f795f0c74a193a9da3277af00936af59 +Subproject commit e606c9d638fc31eae18884b211703851333b0d8e diff --git a/src/main/kotlin/net/trueog/questsOG/QuestGuiCommand.kt b/src/main/kotlin/net/trueog/questsOG/QuestGuiCommand.kt index e6b09d5..3c4b377 100644 --- a/src/main/kotlin/net/trueog/questsOG/QuestGuiCommand.kt +++ b/src/main/kotlin/net/trueog/questsOG/QuestGuiCommand.kt @@ -24,7 +24,7 @@ class QuestGuiCommand : CommandExecutor { if (debug) QuestsOG.plugin.logger.info("/questgui coroutine entered for ${sender.name}") val nextQuest = HomesProgression.getNextQuest(sender) if (debug) QuestsOG.plugin.logger.info("/questgui nextQuest=${nextQuest?.javaClass?.simpleName}") - val builder = AdvancementMenu.builder(QuestsOG.plugin, sender, "&6Home Quests") + val builder = AdvancementMenu.builder(QuestsOG.plugin, sender, "&aHome Quests") HomesProgression.quests.forEach { quest -> builder.add(questName(quest), stateFor(quest, nextQuest)) diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt index 33733b2..d127518 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt @@ -176,9 +176,9 @@ class HomesFive : Quest { return arrayOf( ProgressRequirement("Total Shards", requirements.totalShards, 2500L * 9), - ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (25920000).toLong()), - ProgressRequirement("Cm Travelled on Pig", (requirements.pigOneCm).toLong(), (500000).toLong()), - ProgressRequirement("Cm Travelled on Strider", (requirements.striderOneCm).toLong(), (100000).toLong()), + ProgressRequirement("Days Played", (requirements.ticksPlayed / 1_728_000).toLong(), 15L), + ProgressRequirement("Blocks Travelled on Pig", (requirements.pigOneCm / 100).toLong(), 5_000L), + ProgressRequirement("Blocks Travelled on Strider", (requirements.striderOneCm / 100).toLong(), 1_000L), ProgressRequirement("Dolphins Killed", (requirements.dolphinKills).toLong(), (50).toLong()), ProgressRequirement("Zoglins Killed", (requirements.zoglinKills).toLong(), (50).toLong()), BooleanRequirement("The Cutest Predator", requirements.hasCutestPredator), diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt index 1e31d04..697c86d 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt @@ -145,8 +145,8 @@ class HomesFour : Quest { return arrayOf( ProgressRequirement("Total Shards", requirements.totalShards, 1000L * 9), - ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (17280000).toLong()), - ProgressRequirement("Total Cm Travelled", (requirements.totalCm).toLong(), (20000000).toLong()), + ProgressRequirement("Days Played", (requirements.ticksPlayed / 1_728_000).toLong(), 10L), + ProgressRequirement("Blocks Travelled", (requirements.totalCm / 100).toLong(), 200_000L), BooleanRequirement("A Furious Cocktail", requirements.hasFuriousCocktail), BooleanRequirement("Serious Dedication", requirements.hasSeriousDedication), ProgressRequirement("Levels", (requirements.levels).toLong(), (150).toLong()), diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt index 529fc48..a0bd8dd 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt @@ -167,12 +167,12 @@ class HomesSix : Quest { return arrayOf( ProgressRequirement("Total Shards", requirements.totalShards, 5000L * 9), - ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (51840000).toLong()), - ProgressRequirement("Cm Walked on Water", (requirements.walkOnWaterOneCm).toLong(), (1000000).toLong()), + ProgressRequirement("Days Played", (requirements.ticksPlayed / 1_728_000).toLong(), 30L), + ProgressRequirement("Blocks Walked on Water", (requirements.walkOnWaterOneCm / 100).toLong(), 10_000L), ProgressRequirement( - "Cm Walked under Water", - (requirements.walkUnderWaterOneCm).toLong(), - (1000000).toLong(), + "Blocks Walked Under Water", + (requirements.walkUnderWaterOneCm / 100).toLong(), + 10_000L, ), ProgressRequirement("Music Discs", (requirements.discs).toLong(), (13).toLong()), ProgressRequirement("Finished Advancements", (requirements.finishedAdvancements).toLong(), (1179).toLong()), diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt index 45f6c5e..4340845 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt @@ -80,7 +80,7 @@ class HomesThree : Quest { return requirements.totalShards >= 250L * 9 && requirements.ticksPlayed / 20.0 / 60.0 / 60.0 / 24.0 >= 5 && - requirements.totalCm / 100.0 >= 50000 && // 100k? + requirements.totalCm / 100.0 >= 50000 && requirements.hasBeaconator && requirements.levels >= 100 && requirements.duelsWins >= 20 @@ -123,8 +123,8 @@ class HomesThree : Quest { return arrayOf( ProgressRequirement("Total Shards", requirements.totalShards, 250L * 9), - ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (8640000).toLong()), - ProgressRequirement("Total Cm Travelled", (requirements.totalCm).toLong(), (5000000).toLong()), + ProgressRequirement("Days Played", (requirements.ticksPlayed / 1_728_000).toLong(), 5L), + ProgressRequirement("Blocks Travelled", (requirements.totalCm / 100).toLong(), 50_000L), BooleanRequirement("Beaconator", requirements.hasBeaconator), ProgressRequirement("Levels", (requirements.levels).toLong(), (100).toLong()), ProgressRequirement("Duels Wins", (requirements.duelsWins).toLong(), (20).toLong()), diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt index 649df1a..f62f489 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt @@ -88,7 +88,7 @@ class HomesTwo : Quest { return false } - runOnMainThread { player.level -= 100 } + runOnMainThread { player.level -= 50 } return true } @@ -108,8 +108,10 @@ class HomesTwo : Quest { return arrayOf( ProgressRequirement("Total Shards", requirements.totalShards, 100L * 9), - ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (1728000).toLong()), - ProgressRequirement("Total Cm Travelled", (requirements.totalCm).toLong(), (1000000).toLong()), + ProgressRequirement("Hours Played", (requirements.ticksPlayed / 72000).toLong(), 24L), + ProgressRequirement("Blocks Travelled", (requirements.totalCm / 100).toLong(), 10_000L), + ProgressRequirement("Levels", (requirements.levels).toLong(), 50L), + ProgressRequirement("Duels Wins", (requirements.duelsWins).toLong(), 10L), ) } }