From 8007c4a51a2b45aef20ba07cd2b3041e132fc691 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 10 Jun 2023 14:33:57 +0200 Subject: code cleanup --- src/main/java/at/hannibal2/skyhanni/config/Storage.java | 1 + src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt | 2 ++ src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt | 2 -- .../java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni') diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index ec37aa1f7..39b806520 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -154,6 +154,7 @@ public class Storage { @Expose public PlotIcon plotIcon = new PlotIcon(); + public static class PlotIcon { @Expose public Map plotList = new HashMap<>(); diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt index a149b09c1..5e2321e24 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt @@ -72,6 +72,8 @@ class BazaarDataHolder { if (internalName == "JACOBS_TICKET") return true if (internalName == "RAW_SOULFLOW") return true + if (internalName.contains(";")) return true + return false } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt index 06acdcf75..fc742e0a1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.HypixelTickEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.round @@ -62,7 +61,6 @@ class TpsCounter { if (hasPacketReceived) { hasPacketReceived = false - HypixelTickEvent().postAndCatch() packetsFromLastSecond++ } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt index 3a39fa71d..d4e4df46f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt @@ -14,7 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class DetectBrokenHyperion { private val config get() = SkyHanniMod.feature.slayer private var brokenInRow = 0 - private val logger = LorenzLogger("detect_broken_hyperion") + private val logger = LorenzLogger("slayer/detect_broken_hyperion") @SubscribeEvent fun onPurseChange(event: PurseChangeEvent) { -- cgit