diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
24 files changed, 66 insertions, 78 deletions
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 e960ec4b6..5950f484d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage.BingoSession import at.hannibal2.skyhanni.data.ProfileStorageData +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoRanksJson import at.hannibal2.skyhanni.events.DebugDataCollectEvent @@ -23,7 +24,7 @@ import java.time.ZoneOffset object BingoAPI { private var ranks = mapOf<String, Int>() - private var data: Map<String, BingoJson.BingoData> = emptyMap() + private var data: Map<String, BingoData> = emptyMap() val bingoGoals get() = bingoStorage.goals val personalGoals get() = bingoGoals.values.filter { it.type == GoalType.PERSONAL } @@ -69,7 +70,7 @@ object BingoAPI { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { ranks = event.getConstant<BingoRanksJson>("BingoRanks").ranks - data = event.getConstant<BingoJson>("Bingo").bingo_tips + data = event.getConstant<BingoJson>("Bingo").bingoTips } fun getRankFromScoreboard(text: String) = if (detectionPattern.matches(text)) getRank(text) else null @@ -84,7 +85,7 @@ object BingoAPI { fun getData(itemName: String) = data.filter { itemName.startsWith(it.key.split(" (Community Goal)")[0]) }.values.firstOrNull() - fun BingoGoal.getData(): BingoJson.BingoData? = if (type == GoalType.COMMUNITY) { + fun BingoGoal.getData(): BingoData? = if (type == GoalType.COMMUNITY) { getData(displayName) } else { data[displayName] 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 67326faea..6d4a45789 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 @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.bingo.card import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData import at.hannibal2.skyhanni.events.InventoryUpdatedEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent @@ -166,5 +166,5 @@ object BingoCardReader { BingoCardUpdateEvent().postAndCatch() } - private fun BingoJson.BingoData.getDescriptionLine() = "§7" + note.joinToString(" ") + private fun BingoData.getDescriptionLine() = "§7" + note.joinToString(" ") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt index 7dcf9ff7a..9fe716328 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDrops +import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDropsJson import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ItemAddEvent import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -54,12 +54,12 @@ object DianaProfitTracker { @Expose var burrowsDug: Long = 0 - override fun getDescription(timesDropped: Long): List<String> { - val percentage = timesDropped.toDouble() / burrowsDug + override fun getDescription(timesGained: Long): List<String> { + val percentage = timesGained.toDouble() / burrowsDug val perBurrow = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0)) return listOf( - "§7Dropped §e${timesDropped.addSeparators()} §7times.", + "§7Dropped §e${timesGained.addSeparators()} §7times.", "§7Your drop chance per burrow: §c$perBurrow", ) } @@ -148,7 +148,7 @@ object DianaProfitTracker { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - allowedDrops = event.getConstant<DianaDrops>("DianaDrops").diana_drops + allowedDrops = event.getConstant<DianaDropsJson>("DianaDrops").dianaDrops } fun resetCommand() { diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt index af2c17be0..411e08e5e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.features.event.lobby.waypoints -import at.hannibal2.skyhanni.data.jsonobjects.repo.EventWaypointsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.EventWaypointData import at.hannibal2.skyhanni.utils.LorenzVec data class EventWaypoint( @@ -9,7 +9,7 @@ data class EventWaypoint( var isFound: Boolean = false, ) -fun loadEventWaypoints(waypoints: Map<String, List<EventWaypointsJson.Waypoint>>): Map<String, MutableSet<EventWaypoint>> { +fun loadEventWaypoints(waypoints: Map<String, List<EventWaypointData>>): Map<String, MutableSet<EventWaypoint>> { return buildMap { waypoints.forEach { lobby -> val set = mutableSetOf<EventWaypoint>() diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt index c76349cd1..b56adecad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt @@ -120,9 +120,8 @@ object PresentWaypoints { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<EventWaypointsJson>("EventWaypoints") - presentLocations = loadEventWaypoints(data.presents ?: error("'presents' is null in EventWaypoints!")) - presentEntranceLocations = - loadEventWaypoints(data.presents_entrances ?: error("'presents_entrances' is null in EventWaypoints!")) + presentLocations = loadEventWaypoints(data.presents) + presentEntranceLocations = loadEventWaypoints(data.presentsEntrances) } private fun isEnabled(): Boolean = diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt index aaf7db8a7..89beae6aa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt @@ -120,8 +120,8 @@ object FishingAPI { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<ItemsJson>("Items") - lavaRods = data.lava_fishing_rods - waterRods = data.water_fishing_rods + lavaRods = data.lavaFishingRods + waterRods = data.waterFishingRods } private fun getAllowedBlocks() = if (holdingLavaRod) lavaBlocks else waterBlocks diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt index 59d9d818b..5f7499574 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt @@ -35,20 +35,20 @@ class SeaCreatureManager { allFishingMobs = emptyMap() var counter = 0 - val data = event.getConstant<Map<String, SeaCreatureJson.Variant>>("SeaCreatures", SeaCreatureJson.TYPE) + val data = event.getConstant<Map<String, SeaCreatureJson>>("SeaCreatures", SeaCreatureJson.TYPE) val allFishingMobs = mutableMapOf<String, SeaCreature>() val variants = mutableMapOf<String, List<String>>() for ((variantName, variant) in data) { - val chatColor = variant.chat_color + val chatColor = variant.chatColor val variantFishes = mutableListOf<String>() variants[variantName] = variantFishes - for ((name, seaCreature) in variant.sea_creatures) { - val chatMessage = seaCreature.chat_message - val fishingExperience = seaCreature.fishing_experience + for ((name, seaCreature) in variant.seaCreatures) { + val chatMessage = seaCreature.chatMessage + val fishingExperience = seaCreature.fishingExperience val rarity = seaCreature.rarity - val rare = seaCreature.rare ?: false + val rare = seaCreature.rare val creature = SeaCreature(name, fishingExperience, chatColor, rare, rarity) seaCreatureMap[chatMessage] = creature diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt index 2b3a59032..44893f949 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.fishing.trophy import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ProfileStorageData +import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishInfo import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson.TrophyFishInfo import at.hannibal2.skyhanni.events.NeuProfileDataLoadedEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -21,7 +21,7 @@ object TrophyFishManager { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<TrophyFishJson>("TrophyFish") - trophyFishInfo = data.trophy_fish + trophyFishInfo = data.trophyFish } val fish: MutableMap<String, MutableMap<TrophyRarity, Int>>? @@ -87,15 +87,6 @@ object TrophyFishManager { fun getInfoByName(name: String) = trophyFishInfo.values.find { it.displayName == name } fun TrophyFishInfo.getFilletValue(rarity: TrophyRarity): Int { - if (fillet == null) { - ErrorManager.logErrorStateWithData( - "Error trying to read trophy fish info", - "fillet in TrophyFishInfo is null", - "displayName" to displayName, - "TrophyFishInfo" to this, - ) - return -1 - } return fillet.getOrDefault(rarity, -1) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index 86bbafab7..46d694131 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -275,7 +275,7 @@ object GardenAPI { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<GardenJson>("Garden") - gardenExperience = data.garden_exp + gardenExperience = data.gardenExp totalAmountVisitorsExisting = data.visitors.size } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 701082d63..b198b3e3a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -550,7 +550,7 @@ object ComposterOverlay { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<GardenJson>("Garden") - organicMatter = data.organic_matter + organicMatter = data.organicMatter fuelFactors = data.fuel updateOrganicMatterFactors() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt index 294aa0424..b55ed769d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.garden.farming import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.IslandType +import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropInfo import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropsJson.DropInfo import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.IslandChangeEvent import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -126,10 +126,10 @@ object ArmorDropTracker { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<ArmorDropsJson>("ArmorDrops") - armorDropInfo = data.special_crops + armorDropInfo = data.specialCrops } - private var armorDropInfo = mapOf<String, DropInfo>() + private var armorDropInfo = mapOf<String, ArmorDropInfo>() private var currentArmorDropChance = 0.0 private var lastCalculationTime = SimpleTimeMark.farPast() @@ -140,7 +140,7 @@ object ArmorDropTracker { lastCalculationTime = SimpleTimeMark.now() val armorDropName = crop.specialDropType - val armorName = armorDropInfo[armorDropName]?.armor_type ?: return 0.0 + val armorName = armorDropInfo[armorDropName]?.armorType ?: return 0.0 val pieceCount = InventoryUtils.getArmor() .mapNotNull { it?.getInternalName()?.asString() } .count { it.contains(armorName) || it.contains("FERMENTO") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index c81c30db5..f4d954229 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter import at.hannibal2.skyhanni.data.GardenCropMilestones.setCounter import at.hannibal2.skyhanni.data.Perk import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson.DicerType +import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerType import at.hannibal2.skyhanni.events.CropClickEvent import at.hannibal2.skyhanni.events.GardenToolChangeEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt index 8a619e37e..42b8b5d35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.garden.inventory import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradeCostsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradeCostsJson.Price +import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradePrice import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.garden.GardenAPI @@ -28,7 +28,7 @@ object AnitaExtraFarmingFortune { "§5§o§aJacob's Ticket §8x(?<realAmount>.*)" ) - private var levelPrice = mapOf<Int, Price>() + private var levelPrice = mapOf<Int, AnitaUpgradePrice>() @SubscribeEvent fun onTooltip(event: LorenzToolTipEvent) { @@ -41,7 +41,7 @@ object AnitaExtraFarmingFortune { val anitaUpgrade = GardenAPI.storage?.fortune?.anitaUpgrade ?: return var contributionFactor = 1.0 - val baseAmount = levelPrice[anitaUpgrade + 1]?.jacob_tickets ?: return + val baseAmount = levelPrice[anitaUpgrade + 1]?.jacobTickets ?: return for (line in event.toolTip) { realAmountPattern.matchMatcher(line) { val realAmount = group("realAmount").formatDouble() @@ -53,8 +53,8 @@ object AnitaExtraFarmingFortune { var jacobTickets = 0 for ((level, price) in levelPrice) { if (level > anitaUpgrade) { - goldMedals += price.gold_medals - jacobTickets += price.jacob_tickets + goldMedals += price.goldMedals + jacobTickets += price.jacobTickets } } jacobTickets = (contributionFactor * jacobTickets).toInt() @@ -80,7 +80,7 @@ object AnitaExtraFarmingFortune { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<AnitaUpgradeCostsJson>("AnitaUpgradeCosts") - levelPrice = data.level_price + levelPrice = data.levelPrice } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt index fffff6a6f..5fa0debe5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt @@ -18,9 +18,9 @@ object GardenVisitorColorNames { visitorColours.clear() visitorItems.clear() for ((visitor, visitorData) in data.visitors) { - val rarity = visitorData.new_rarity ?: visitorData.rarity + val rarity = visitorData.newRarity ?: visitorData.rarity visitorColours[visitor] = rarity.color.getChatColor() - visitorItems[visitor] = visitorData.need_items + visitorItems[visitor] = visitorData.needItems } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt index 848bcc992..729f9d847 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.garden.visitor import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.VisitorBlockBehaviour import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenVisitor import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent @@ -29,7 +30,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object HighlightVisitorsOutsideOfGarden { - private var visitorJson = mapOf<String?, List<GardenJson.GardenVisitor>>() + private var visitorJson = mapOf<String?, List<GardenVisitor>>() private val config get() = GardenAPI.config.visitors @@ -59,7 +60,7 @@ object HighlightVisitorsOutsideOfGarden { val possibleJsons = visitorJson[mode] ?: return false val skinOrType = getSkinOrTypeFor(entity) return possibleJsons.any { - (it.position == null || it.position!!.distance(entity.position.toLorenzVec()) < 1) + (it.position == null || it.position.distance(entity.position.toLorenzVec()) < 1) && it.skinOrType == skinOrType } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt index b8f511cdc..f7944fcde 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.jsonobjects.repo.HideNotClickableItemsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.HideNotClickableItemsJson.SalvageFilter +import at.hannibal2.skyhanni.data.jsonobjects.repo.SalvageFilter import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent @@ -76,10 +76,10 @@ object HideNotClickableItems { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val hideNotClickable = event.getConstant<HideNotClickableItemsJson>("HideNotClickableItems") - hideNpcSellFilter.load(hideNotClickable.hide_npc_sell) - hideInStorageFilter.load(hideNotClickable.hide_in_storage) - hidePlayerTradeFilter.load(hideNotClickable.hide_player_trade) - notAuctionableFilter.load(hideNotClickable.not_auctionable) + hideNpcSellFilter.load(hideNotClickable.hideNpcSell) + hideInStorageFilter.load(hideNotClickable.hideInStorage) + hidePlayerTradeFilter.load(hideNotClickable.hidePlayerTrade) + notAuctionableFilter.load(hideNotClickable.notAuctionable) updateSalvageList(hideNotClickable.salvage) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt index 34e39bc28..8e2a5c592 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt @@ -53,8 +53,8 @@ object ItemStars { val data = event.getConstant<ItemsJson>("Items") armorNames.clear() tiers.clear() - armorNames.addAll(data.crimson_armors) - for (tier in data.crimson_tiers) { + armorNames.addAll(data.crimsonArmors) + for (tier in data.crimsonTiers) { tiers[tier.key] = tier.value } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt index 31291345a..9cf785503 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt @@ -184,7 +184,7 @@ object MinionXp { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - xpInfoMap = event.getConstant<MinionXPJson>("MinionXP").minion_xp.mapNotNull { xpType -> + xpInfoMap = event.getConstant<MinionXPJson>("MinionXP").minionXp.mapNotNull { xpType -> xpType.value.mapNotNull { it.key.asInternalName() to XpInfo(SkillType.getByName(xpType.key), it.value) } }.flatten().toMap() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt index 85d06060d..e0045ba76 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt @@ -2,9 +2,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.data.jsonobjects.repo.TabListJson import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils @@ -21,19 +19,17 @@ object InGameDateDisplay { private val config get() = SkyHanniMod.feature.gui.inGameDate - private val monthAndDatePattern by RepoPattern.pattern( - "misc.ingametime.date", + private val patternGroup = RepoPattern.group("misc.ingametime") + private val monthAndDatePattern by patternGroup.pattern( + "date", ".*((Early|Late) )?(Winter|Spring|Summer|Autumn) [0-9]{1,2}(nd|rd|th|st)?.*" ) - private var display = "" - - // sun, moon, spooky - private var sunMoonIcons = emptyList<String>() + private val timeSymbolsPattern by patternGroup.pattern( + "symbols", + "([☀☽࿇])" + ) - @SubscribeEvent - fun onRepoReload(event: RepositoryReloadEvent) { - sunMoonIcons = event.getConstant<TabListJson>("TabList").sun_moon_symbols - } + private var display = "" @SubscribeEvent fun onSecondPassed(event: SecondPassedEvent) { @@ -57,7 +53,7 @@ object InGameDateDisplay { val time = list.find { it.lowercase().contains("am ") || it.lowercase().contains("pm ") } ?: "??" theBaseString = "$monthAndDate, $year ${time.trim()}".removeColor() if (!config.includeSunMoon) { - sunMoonIcons.forEach { theBaseString = theBaseString.replace(it, "") } + theBaseString = timeSymbolsPattern.matcher(theBaseString).replaceAll("") } } else { theBaseString = date.formatted() diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 8fb37ee6e..d0e198765 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -61,7 +61,7 @@ object EstimatedItemValue { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<ItemsJson>("Items") - bookBundleAmount = data.book_bundle_amount ?: error("book_bundle_amount is missing") + bookBundleAmount = data.bookBundleAmount } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt index 0cd1a1888..694ebed35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage -import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.ReputationQuest import at.hannibal2.skyhanni.data.model.TabWidget import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest.quest.DojoQuest diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt index c1edbfb4f..1797e2227 100644 --- a/ |