summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data/mob
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-06-06 11:49:47 +1000
committerGitHub <noreply@github.com>2024-06-06 11:49:47 +1000
commitdc619eea46194955ede129b6a7125be2c1e8fa74 (patch)
treefaa23cfef9c0da8e9870fef0c7c1e71e13d9f74d /src/main/java/at/hannibal2/skyhanni/data/mob
parent4ef946f824817e91bdf9c2e0ae4f201e5c669f63 (diff)
downloadskyhanni-dc619eea46194955ede129b6a7125be2c1e8fa74.tar.gz
skyhanni-dc619eea46194955ede129b6a7125be2c1e8fa74.tar.bz2
skyhanni-dc619eea46194955ede129b6a7125be2c1e8fa74.zip
Backend: Classes -> Objects with annotation (#1982)
Co-authored-by: ThatGravyBoat <thatgravyboat@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/mob')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt7
2 files changed, 8 insertions, 3 deletions
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)