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 <thatgravyboat@gmail.com>
---
 .../hannibal2/skyhanni/features/summonings/SummoningMobManager.kt | 4 +++-
 .../hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt  | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/summonings')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
index c656d0bef..8bea95eb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
 import at.hannibal2.skyhanni.utils.EntityUtils
@@ -26,7 +27,8 @@ import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
-class SummoningMobManager {
+@SkyHanniModule
+object SummoningMobManager {
 
     private val config get() = SkyHanniMod.feature.combat.summonings
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
index e04890620..ef9da0261 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.EntityUtils.getNameTagWith
@@ -18,10 +19,11 @@ import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.minutes
 
-class SummoningSoulsName {
+@SkyHanniModule
+object SummoningSoulsName {
 
     // TODO repo
-    private val texture =
+    private const val TEXTURE =
         "ewogICJ0aW1lc3RhbXAiIDogMTYwMTQ3OTI2NjczMywKICAicHJvZmlsZUlkIiA6ICJmMzA1ZjA5NDI0NTg0ZjU" +
             "4YmEyYjY0ZjAyZDcyNDYyYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJqcm9ja2EzMyIsCiAgInNpZ25hdH" +
             "VyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgI" +
@@ -44,7 +46,7 @@ class SummoningSoulsName {
         for (entity in EntityUtils.getEntities<EntityArmorStand>()) {
             if (souls.contains(entity)) continue
 
-            if (entity.hasSkullTexture(texture)) {
+            if (entity.hasSkullTexture(TEXTURE)) {
                 val soulLocation = entity.getLorenzVec()
 
                 val map = mutableMapOf<Int, Double>()
-- 
cgit