diff options
20 files changed, 47 insertions, 40 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 75a8ca20f..6dc51b7a6 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -53,12 +53,12 @@ import at.hannibal2.skyhanni.features.bazaar.BazaarCancelledBuyOrderClipboard import at.hannibal2.skyhanni.features.bazaar.BazaarOpenPriceWebsite import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper import at.hannibal2.skyhanni.features.bingo.BingoAPI -import at.hannibal2.skyhanni.features.bingo.BingoCardDisplay -import at.hannibal2.skyhanni.features.bingo.BingoCardTips -import at.hannibal2.skyhanni.features.bingo.BingoNextStepHelper import at.hannibal2.skyhanni.features.bingo.CompactBingoChat import at.hannibal2.skyhanni.features.bingo.MinionCraftHelper +import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay import at.hannibal2.skyhanni.features.bingo.card.BingoCardReader +import at.hannibal2.skyhanni.features.bingo.card.BingoCardTips +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper import at.hannibal2.skyhanni.features.chat.ArachneChatMessageHider import at.hannibal2.skyhanni.features.chat.ChatFilter import at.hannibal2.skyhanni.features.chat.CompactBestiaryChatMessage diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index f3bd55907..1a0b41629 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.data.ChatManager import at.hannibal2.skyhanni.data.GardenCropMilestonesCommunityFix import at.hannibal2.skyhanni.data.GuiEditManager import at.hannibal2.skyhanni.data.PartyAPI -import at.hannibal2.skyhanni.features.bingo.BingoCardDisplay -import at.hannibal2.skyhanni.features.bingo.BingoNextStepHelper +import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper import at.hannibal2.skyhanni.features.chat.Translator import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil diff --git a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt index 46f0f3722..b091c24f3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.bingo import at.hannibal2.skyhanni.events.LorenzEvent -import at.hannibal2.skyhanni.features.bingo.card.BingoGoal +import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal class BingoGoalReachedEvent(val goal: BingoGoal) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt index 17a6fe507..cc5dec6ff 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt @@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoRanksJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent -import at.hannibal2.skyhanni.features.bingo.card.BingoGoal -import at.hannibal2.skyhanni.features.bingo.card.GoalType +import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal +import at.hannibal2.skyhanni.features.bingo.card.goals.GoalType import at.hannibal2.skyhanni.utils.SimpleTimeMark import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -31,7 +31,7 @@ object BingoAPI { fun getTip(itemName: String) = tips.filter { itemName.startsWith(it.key.split(" (Community Goal)")[0]) }.values.firstOrNull() - fun BingoGoal.getTip(): BingoJson.BingoTip? = if (type == GoalType.COMMUNITY) { + fun BingoGoal.getTip(): BingoJson.BingoTip? = if (type == at.hannibal2.skyhanni.features.bingo.card.goals.GoalType.COMMUNITY) { getTip(displayName) } else { tips[displayName] diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt index 98ac19a76..bc6b4de49 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo +package at.hannibal2.skyhanni.features.bingo.card import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator @@ -6,6 +6,8 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent +import at.hannibal2.skyhanni.features.bingo.BingoAPI +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index 5c9c7aa5b..151cb145e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -7,6 +7,9 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent import at.hannibal2.skyhanni.events.bingo.BingoGoalReachedEvent import at.hannibal2.skyhanni.features.bingo.BingoAPI +import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal +import at.hannibal2.skyhanni.features.bingo.card.goals.GoalType +import at.hannibal2.skyhanni.features.bingo.card.goals.HiddenGoalData import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardTips.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt index 672dce98c..2e1af0d1a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardTips.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt @@ -1,9 +1,10 @@ -package at.hannibal2.skyhanni.features.bingo +package at.hannibal2.skyhanni.features.bingo.card import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.features.bingo.BingoAPI import at.hannibal2.skyhanni.features.bingo.BingoAPI.getTip -import at.hannibal2.skyhanni.features.bingo.card.GoalType +import at.hannibal2.skyhanni.features.bingo.card.goals.GoalType import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt index 24162fe13..31f01b335 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoGoal.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.card +package at.hannibal2.skyhanni.features.bingo.card.goals class BingoGoal( val displayName: String, diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/GoalType.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/GoalType.kt index 01b59e610..b2e4f6d8d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/GoalType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/GoalType.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.card +package at.hannibal2.skyhanni.features.bingo.card.goals enum class GoalType { COMMUNITY, diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/HiddenGoalData.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/HiddenGoalData.kt index 8df08906c..b2ea441d3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/HiddenGoalData.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/HiddenGoalData.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.card +package at.hannibal2.skyhanni.features.bingo.card.goals import kotlin.time.Duration diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt index e2381524d..0cd5df65a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.api.CollectionAPI @@ -6,16 +6,17 @@ import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.SkillExperience import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.features.bingo.nextstep.ChatMessageStep -import at.hannibal2.skyhanni.features.bingo.nextstep.CollectionStep -import at.hannibal2.skyhanni.features.bingo.nextstep.CraftStep -import at.hannibal2.skyhanni.features.bingo.nextstep.IslandVisitStep -import at.hannibal2.skyhanni.features.bingo.nextstep.ItemsStep -import at.hannibal2.skyhanni.features.bingo.nextstep.NextStep -import at.hannibal2.skyhanni.features.bingo.nextstep.ObtainCrystalStep -import at.hannibal2.skyhanni.features.bingo.nextstep.PartialProgressItemsStep -import at.hannibal2.skyhanni.features.bingo.nextstep.ProgressionStep -import at.hannibal2.skyhanni.features.bingo.nextstep.SkillLevelStep +import at.hannibal2.skyhanni.features.bingo.BingoAPI +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.ChatMessageStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.CollectionStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.CraftStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.IslandVisitStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.ItemsStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.NextStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.ObtainCrystalStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.PartialProgressItemsStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.ProgressionStep +import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.SkillLevelStep import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/ChatMessageStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ChatMessageStep.kt index 021ef5f73..0da254a40 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/ChatMessageStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ChatMessageStep.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps class ChatMessageStep(displayName: String) : NextStep(displayName) class ObtainCrystalStep(val crystalName: String) : NextStep("Obtain a $crystalName Crystal") diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt index 4e08b2ba4..e6bb7075b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NumberUtil @@ -6,4 +6,4 @@ import at.hannibal2.skyhanni.utils.NumberUtil class CollectionStep(collectionName: String, amountNeeded: Int) : ProgressionStep(NumberUtil.format(amountNeeded) + " $collectionName Collection", amountNeeded.toLong()) { val internalName by lazy { NEUInternalName.fromItemName(if (collectionName == "Mushroom") "Red Mushroom" else collectionName) } -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CraftStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CraftStep.kt new file mode 100644 index 000000000..4ae9a08c0 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CraftStep.kt @@ -0,0 +1,3 @@ +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps + +class CraftStep(val itemName: String) : NextStep("Craft $itemName") diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/IslandVisitStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/IslandVisitStep.kt index c25c440bc..f2ae9cf01 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/IslandVisitStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/IslandVisitStep.kt @@ -1,5 +1,5 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps import at.hannibal2.skyhanni.data.IslandType -class IslandVisitStep(val island: IslandType) : NextStep("Visit ${island.displayName}")
\ No newline at end of file +class IslandVisitStep(val island: IslandType) : NextStep("Visit ${island.displayName}") diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/ItemsStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ItemsStep.kt index c9e65b1b4..548318a20 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/ItemsStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ItemsStep.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps open class ItemsStep(displayName: String, val itemName: String, amountNeeded: Long, val variants: Map<String, Int>) : ProgressionStep(displayName, amountNeeded) diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/NextStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/NextStep.kt index d5077478e..d0a73926a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/NextStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/NextStep.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps abstract class NextStep( val displayName: String, diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/ProgressionStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ProgressionStep.kt index 2d19438d5..26f7d6c4d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/ProgressionStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ProgressionStep.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps abstract class ProgressionStep(displayName: String, open val amountNeeded: Long, var amountHaving: Long = 0) : - NextStep(displayName)
\ No newline at end of file + NextStep(displayName) diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/SkillLevelStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/SkillLevelStep.kt index 48767e8d9..e93aa24b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/SkillLevelStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/SkillLevelStep.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep +package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps import at.hannibal2.skyhanni.data.SkillExperience @@ -7,4 +7,4 @@ class SkillLevelStep( private val skillLevelNeeded: Int, skillExpNeeded: Long = SkillExperience.getExpForLevel(skillLevelNeeded) ) : - ProgressionStep("$skillName $skillLevelNeeded", skillExpNeeded)
\ No newline at end of file + ProgressionStep("$skillName $skillLevelNeeded", skillExpNeeded) diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CraftStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CraftStep.kt deleted file mode 100644 index 4c20494b0..000000000 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CraftStep.kt +++ /dev/null @@ -1,3 +0,0 @@ -package at.hannibal2.skyhanni.features.bingo.nextstep - -class CraftStep(val itemName: String) : NextStep("Craft $itemName")
\ No newline at end of file |