aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoringlettronald <inglettronald@gmail.com>2023-04-02 16:36:53 -0500
committeringlettronald <inglettronald@gmail.com>2023-04-02 16:36:53 -0500
commit08848974d8ea83d692ce1c215fd0d4f30bf72ab5 (patch)
tree42ee5d10e5fbce670baffeda277fc83d168f6e07
parent38c1134cfa09d9a4bbbc488797a3ec019dd00834 (diff)
downloadDulkirMod-08848974d8ea83d692ce1c215fd0d4f30bf72ab5.tar.gz
DulkirMod-08848974d8ea83d692ce1c215fd0d4f30bf72ab5.tar.bz2
DulkirMod-08848974d8ea83d692ce1c215fd0d4f30bf72ab5.zip
final changes hopefully
-rw-r--r--src/main/kotlin/dulkirmod/DulkirMod.kt4
-rw-r--r--src/main/kotlin/dulkirmod/config/DulkirConfig.kt14
-rw-r--r--src/main/kotlin/dulkirmod/config/KeyHud.kt (renamed from src/main/kotlin/dulkirmod/config/DulkirHud.kt)3
-rw-r--r--src/main/kotlin/dulkirmod/features/BrokenHypeNotif.kt2
4 files changed, 10 insertions, 13 deletions
diff --git a/src/main/kotlin/dulkirmod/DulkirMod.kt b/src/main/kotlin/dulkirmod/DulkirMod.kt
index a484e00..1c46e08 100644
--- a/src/main/kotlin/dulkirmod/DulkirMod.kt
+++ b/src/main/kotlin/dulkirmod/DulkirMod.kt
@@ -2,7 +2,7 @@ package dulkirmod
import dulkirmod.command.*
import dulkirmod.config.DulkirConfig
-import dulkirmod.config.DulkirHud
+import dulkirmod.config.KeyHud
import dulkirmod.events.ChatEvent
import dulkirmod.features.*
import dulkirmod.features.chat.AbiphoneDND
@@ -132,7 +132,7 @@ class DulkirMod {
val mc: Minecraft = Minecraft.getMinecraft()
var config = DulkirConfig
- var hud = DulkirHud()
+ var hud = KeyHud()
var display: GuiScreen? = null
val scope = CoroutineScope(EmptyCoroutineContext)
diff --git a/src/main/kotlin/dulkirmod/config/DulkirConfig.kt b/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
index 4a33803..6af452b 100644
--- a/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
+++ b/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
@@ -10,13 +10,6 @@ import dulkirmod.utils.Utils
object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-config.json") {
- @HUD(
- name = "Wither Key Display",
- category = "HUD",
- subcategory = "Dungeons"
- )
- var witherKeyDisplayHUD: DulkirHud = DulkirHud()
-
@Switch(
name = "Patch Crimson Isle memory leak",
description = "This is a temporary fix for the memory leak on crimson isles. It will be removed when Hypixel fixes the issue.",
@@ -601,6 +594,13 @@ object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-conf
)
var cancelReequip = false
+ @HUD(
+ name = "Wither Key Display",
+ category = "HUD",
+ subcategory = "Dungeons"
+ )
+ var witherKeyDisplayHUD: KeyHud = KeyHud()
+
fun init() {
initialize()
addDependency("customMessage", "throttleNotifier")
diff --git a/src/main/kotlin/dulkirmod/config/DulkirHud.kt b/src/main/kotlin/dulkirmod/config/KeyHud.kt
index 038e1f6..ca7b2e4 100644
--- a/src/main/kotlin/dulkirmod/config/DulkirHud.kt
+++ b/src/main/kotlin/dulkirmod/config/KeyHud.kt
@@ -3,8 +3,7 @@ import cc.polyfrost.oneconfig.hud.TextHud
import dulkirmod.features.chat.DungeonKeyDisplay
-class DulkirHud : TextHud(true) {
-
+class KeyHud : TextHud(true) {
override fun getLines(lines: MutableList<String>?, example: Boolean) {
if (example) {
diff --git a/src/main/kotlin/dulkirmod/features/BrokenHypeNotif.kt b/src/main/kotlin/dulkirmod/features/BrokenHypeNotif.kt
index 4253b6f..fcbc2f3 100644
--- a/src/main/kotlin/dulkirmod/features/BrokenHypeNotif.kt
+++ b/src/main/kotlin/dulkirmod/features/BrokenHypeNotif.kt
@@ -3,7 +3,6 @@ package dulkirmod.features
import dulkirmod.DulkirMod.Companion.mc
import dulkirmod.config.DulkirConfig
import dulkirmod.utils.TabListUtils
-import dulkirmod.utils.TextUtils
import dulkirmod.utils.TitleUtils
import dulkirmod.utils.Utils
import net.minecraft.item.ItemStack
@@ -40,7 +39,6 @@ fun brokenHypeNotif() {
}
}
}
- TextUtils.info(id)
// check if a wither blade, then check if same id
if (!(id matches "(HYPERION|ASTRAEA|SCYLLA|VALKYRIE)".toRegex())) {
return