From dc619eea46194955ede129b6a7125be2c1e8fa74 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:49:47 +1000 Subject: Backend: Classes -> Objects with annotation (#1982) Co-authored-by: ThatGravyBoat --- src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt | 4 +++- src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data/mob') diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt index bb9eb7ac0..03f6d64b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.features.dev.DebugMobConfig.HowToShow import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.events.MobEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand.getMobInfo import at.hannibal2.skyhanni.utils.LocationUtils.getTopCenter import at.hannibal2.skyhanni.utils.LorenzColor @@ -16,7 +17,8 @@ import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityPlayerSP import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class MobDebug { +@SkyHanniModule +object MobDebug { private val config get() = SkyHanniMod.feature.dev.mobDebug.mobDetection diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt index f85e63420..9a1ec8672 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt @@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.MobEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.CollectionUtils.drainForEach import at.hannibal2.skyhanni.utils.CollectionUtils.drainTo import at.hannibal2.skyhanni.utils.CollectionUtils.put @@ -35,9 +36,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicBoolean -private const val MAX_RETRIES = 20 * 5 -class MobDetection { +@SkyHanniModule +object MobDetection { /* Unsupported "Mobs" Nicked Players @@ -53,6 +54,8 @@ class MobDetection { Zee */ + private const val MAX_RETRIES = 20 * 5 + private val forceReset get() = !SkyHanniMod.feature.dev.mobDebug.enable private var shouldClear: AtomicBoolean = AtomicBoolean(false) -- cgit