From 5308d31ef286afeebd4a0e1475f1e618da1bd651 Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Fri, 15 Aug 2025 13:09:06 -0400 Subject: [PATCH] Long ProgressRequirement --- .../kotlin/net/trueog/questsOG/Requirement.kt | 2 +- .../net/trueog/questsOG/quests/HomesFive.kt | 18 +++++++------- .../net/trueog/questsOG/quests/HomesFour.kt | 10 ++++---- .../net/trueog/questsOG/quests/HomesSix.kt | 24 +++++++++++-------- .../net/trueog/questsOG/quests/HomesThree.kt | 10 ++++---- .../net/trueog/questsOG/quests/HomesTwo.kt | 6 ++--- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/main/kotlin/net/trueog/questsOG/Requirement.kt b/src/main/kotlin/net/trueog/questsOG/Requirement.kt index 1f11281..86ec335 100644 --- a/src/main/kotlin/net/trueog/questsOG/Requirement.kt +++ b/src/main/kotlin/net/trueog/questsOG/Requirement.kt @@ -2,6 +2,6 @@ package net.trueog.questsOG open class Requirement(val name: String) -class ProgressRequirement(name: String, val current: Int, val target: Int) : Requirement(name) +class ProgressRequirement(name: String, val current: Long, val target: Long) : Requirement(name) class BooleanRequirement(name: String, val met: Boolean) : Requirement(name) diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt index 1f87411..258b5fd 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesFive.kt @@ -166,12 +166,12 @@ class HomesFive : Quest { } return arrayOf( - ProgressRequirement("Total Shards", requirements.totalShards, 2500 * 9), - ProgressRequirement("Ticks Played", requirements.ticksPlayed, 25920000), - ProgressRequirement("Cm Travelled on Pig", requirements.pigOneCm, 500000), - ProgressRequirement("Cm Travelled on Strider", requirements.striderOneCm, 100000), - ProgressRequirement("Dolphins Killed", requirements.dolphinKills, 50), - ProgressRequirement("Zoglins Killed", requirements.zoglinKills, 50), + ProgressRequirement("Total Shards", requirements.totalShards, 2500L * 9L), + 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("Dolphins Killed", (requirements.dolphinKills).toLong(), (50).toLong()), + ProgressRequirement("Zoglins Killed", (requirements.zoglinKills).toLong(), (50).toLong()), BooleanRequirement("The Cutest Predator", requirements.hasCutestPredator), BooleanRequirement("Two by Two", requirements.hasTwoByTwo), BooleanRequirement("A Complete Catalogue", requirements.hasCompleteCatalogue), @@ -181,10 +181,10 @@ class HomesFive : Quest { "Died to \"walked into the danger zone due to Zoglin\"", requirements.hasDiedToMagmaBlockWhileFightingZoglin, ), - ProgressRequirement("Levels", requirements.levels, 200), - ProgressRequirement("Fish Caught", requirements.fishCaught, 2000), + ProgressRequirement("Levels", (requirements.levels).toLong(), (200).toLong()), + ProgressRequirement("Fish Caught", (requirements.fishCaught).toLong(), (2000).toLong()), BooleanRequirement("Has Villager Head", requirements.hasVillagerHead), - ProgressRequirement("Duels Wins", requirements.duelsWins, 150), + ProgressRequirement("Duels Wins", (requirements.duelsWins).toLong(), (150).toLong()), ) } } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt index 6132243..d7a965b 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesFour.kt @@ -135,14 +135,14 @@ class HomesFour : Quest { } return arrayOf( - ProgressRequirement("Total Shards", requirements.totalShards, 1000 * 9), - ProgressRequirement("Ticks Played", requirements.ticksPlayed, 17280000), - ProgressRequirement("Total Cm Travelled", requirements.totalCm, 20000000), + ProgressRequirement("Total Shards", (requirements.totalShards).toLong(), 1000L * 9L), + ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (17280000).toLong()), + ProgressRequirement("Total Cm Travelled", (requirements.totalCm).toLong(), (20000000).toLong()), BooleanRequirement("A Furious Cocktail", requirements.hasFuriousCocktail), BooleanRequirement("Serious Dedication", requirements.hasSeriousDedication), - ProgressRequirement("Levels", requirements.levels, 150), + ProgressRequirement("Levels", (requirements.levels).toLong(), (150).toLong()), BooleanRequirement("Died to \"death.fell.accident.water\"", requirements.hasDiedToFellAccidentWater), - ProgressRequirement("Duels Wins", requirements.duelsWins, 50), + ProgressRequirement("Duels Wins", (requirements.duelsWins).toLong(), (50).toLong()), ) } } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt index 57ab7ce..5493df2 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesSix.kt @@ -157,16 +157,20 @@ class HomesSix : Quest { } return arrayOf( - ProgressRequirement("Total Shards", requirements.totalShards, 5000 * 9), - ProgressRequirement("Ticks Played", requirements.ticksPlayed, 51840000), - ProgressRequirement("Cm Walked on Water", requirements.walkOnWaterOneCm, 1000000), - ProgressRequirement("Cm Walked under Water", requirements.walkUnderWaterOneCm, 1000000), - ProgressRequirement("Music Discs", requirements.discs, 13), - ProgressRequirement("Finished Advancements", requirements.finishedAdvancements, 1179), - ProgressRequirement("Obsidian Mined", requirements.obsidianMined, 1500), - ProgressRequirement("Dragon Eggs", requirements.dragonEggs, 5), - ProgressRequirement("Levels", requirements.levels, 250), - ProgressRequirement("Duels Wins", requirements.duelsWins, 300), + ProgressRequirement("Total Shards", (requirements.totalShards).toLong(), 5000L * 9L), + ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (51840000).toLong()), + ProgressRequirement("Cm Walked on Water", (requirements.walkOnWaterOneCm).toLong(), (1000000).toLong()), + ProgressRequirement( + "Cm Walked under Water", + (requirements.walkUnderWaterOneCm).toLong(), + (1000000).toLong(), + ), + ProgressRequirement("Music Discs", (requirements.discs).toLong(), (13).toLong()), + ProgressRequirement("Finished Advancements", (requirements.finishedAdvancements).toLong(), (1179).toLong()), + ProgressRequirement("Obsidian Mined", (requirements.obsidianMined).toLong(), (1500).toLong()), + ProgressRequirement("Dragon Eggs", (requirements.dragonEggs).toLong(), (5).toLong()), + ProgressRequirement("Levels", (requirements.levels).toLong(), (250).toLong()), + ProgressRequirement("Duels Wins", (requirements.duelsWins).toLong(), (300).toLong()), ) } } diff --git a/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt b/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt index 63b6431..1c66b1a 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesThree.kt @@ -113,12 +113,12 @@ class HomesThree : Quest { } return arrayOf( - ProgressRequirement("Total Shards", requirements.totalShards, 250 * 9), - ProgressRequirement("Ticks Played", requirements.ticksPlayed, 8640000), - ProgressRequirement("Total Cm Travelled", requirements.totalCm, 5000000), + ProgressRequirement("Total Shards", (requirements.totalShards).toLong(), 250L * 9L), + ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (8640000).toLong()), + ProgressRequirement("Total Cm Travelled", (requirements.totalCm).toLong(), (5000000).toLong()), BooleanRequirement("Beaconator", requirements.hasBeaconator), - ProgressRequirement("Levels", requirements.levels, 100), - ProgressRequirement("Duels Wins", requirements.duelsWins, 20), + 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 d946539..40f41dd 100644 --- a/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt +++ b/src/main/kotlin/net/trueog/questsOG/quests/HomesTwo.kt @@ -98,9 +98,9 @@ class HomesTwo : Quest { } return arrayOf( - ProgressRequirement("Total Shards", requirements.totalShards, 100 * 9), - ProgressRequirement("Ticks Played", requirements.ticksPlayed, 1728000), - ProgressRequirement("Total Cm Travelled", requirements.totalCm, 1000000), + ProgressRequirement("Total Shards", (requirements.totalShards).toLong(), 100L * 9L), + ProgressRequirement("Ticks Played", (requirements.ticksPlayed).toLong(), (1728000).toLong()), + ProgressRequirement("Total Cm Travelled", (requirements.totalCm).toLong(), (1000000).toLong()), ) } }