From 71ee4357b59cf30a85acce0e725078b98f3bf55d Mon Sep 17 00:00:00 2001 From: inglettronald Date: Fri, 28 Apr 2023 05:12:26 -0500 Subject: removed conflicting file structure name --- src/main/kotlin/dulkirmod/huds/GardenInfoHud.kt | 28 --------------------- src/main/kotlin/dulkirmod/huds/KeyHud.kt | 16 ------------ src/main/kotlin/dulkirmod/huds/YawDisplayHud.kt | 29 ---------------------- .../kotlin/dulkirmod/overlays/GardenInfoHud.kt | 28 +++++++++++++++++++++ src/main/kotlin/dulkirmod/overlays/KeyHud.kt | 16 ++++++++++++ .../kotlin/dulkirmod/overlays/YawDisplayHud.kt | 29 ++++++++++++++++++++++ 6 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 src/main/kotlin/dulkirmod/huds/GardenInfoHud.kt delete mode 100644 src/main/kotlin/dulkirmod/huds/KeyHud.kt delete mode 100644 src/main/kotlin/dulkirmod/huds/YawDisplayHud.kt create mode 100644 src/main/kotlin/dulkirmod/overlays/GardenInfoHud.kt create mode 100644 src/main/kotlin/dulkirmod/overlays/KeyHud.kt create mode 100644 src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt (limited to 'src') diff --git a/src/main/kotlin/dulkirmod/huds/GardenInfoHud.kt b/src/main/kotlin/dulkirmod/huds/GardenInfoHud.kt deleted file mode 100644 index 0a8ba9e..0000000 --- a/src/main/kotlin/dulkirmod/huds/GardenInfoHud.kt +++ /dev/null @@ -1,28 +0,0 @@ -package dulkirmod.huds - -import cc.polyfrost.oneconfig.hud.TextHud -import dulkirmod.config.DulkirConfig -import dulkirmod.utils.TabListUtils -import dulkirmod.utils.Utils - -class GardenInfoHud : TextHud(false) { - override fun getLines(lines: MutableList?, example: Boolean) { - if (!Utils.isInSkyblock()) return - if (TabListUtils.area != "Garden") return - var i = 0 - if (DulkirConfig.gardenMilestoneDisplay) { - lines?.add(i, TabListUtils.gardenMilestone) - ++i - } - if (DulkirConfig.visitorInfo) { - lines?.add(i, "Visitors: ${TabListUtils.numVisitors} - ${TabListUtils.timeTillNextVisitor}") - ++i - } - if (DulkirConfig.composterAlert) { - if (TabListUtils.emptyComposter) { - lines?.add(i, "Empty Composter!") - ++i - } - } - } -} \ No newline at end of file diff --git a/src/main/kotlin/dulkirmod/huds/KeyHud.kt b/src/main/kotlin/dulkirmod/huds/KeyHud.kt deleted file mode 100644 index 597696e..0000000 --- a/src/main/kotlin/dulkirmod/huds/KeyHud.kt +++ /dev/null @@ -1,16 +0,0 @@ -package dulkirmod.huds -import cc.polyfrost.oneconfig.hud.TextHud -import dulkirmod.features.chat.DungeonKeyDisplay - - -class KeyHud : TextHud(false) { - - override fun getLines(lines: MutableList?, example: Boolean) { - if (example) { - lines?.add(0, "Wither Key Display") - return - } - if (DungeonKeyDisplay.hasKey) - lines?.add(0, "Key Obtained") - } -} \ No newline at end of file diff --git a/src/main/kotlin/dulkirmod/huds/YawDisplayHud.kt b/src/main/kotlin/dulkirmod/huds/YawDisplayHud.kt deleted file mode 100644 index 92c40f9..0000000 --- a/src/main/kotlin/dulkirmod/huds/YawDisplayHud.kt +++ /dev/null @@ -1,29 +0,0 @@ -package dulkirmod.huds - -import cc.polyfrost.oneconfig.hud.TextHud -import dulkirmod.DulkirMod.Companion.mc -import dulkirmod.config.DulkirConfig -import dulkirmod.utils.TabListUtils -import dulkirmod.utils.Utils - -class YawDisplayHud : TextHud(false) { - override fun getLines(lines: MutableList?, example: Boolean) { - if (!Utils.isInSkyblock()) return - if (TabListUtils.area != "Garden") return - val pitch = mc.thePlayer.rotationPitch - var yaw = mc.thePlayer.rotationYaw % 360f - - if (yaw < -180.0f) { - yaw += 360.0f; - } else if (yaw > 180.0f) { - yaw -= 360.0f; - } - if (DulkirConfig.yaw3Decimals) { - lines?.add(0, String.format("Yaw: %.3f", yaw)) - } else { - lines?.add(0, String.format("Yaw: %.2f", yaw)) - } - if (DulkirConfig.showPitch) - lines?.add(1, String.format("Pitch: %.2f", pitch)) - } -} \ No newline at end of file diff --git a/src/main/kotlin/dulkirmod/overlays/GardenInfoHud.kt b/src/main/kotlin/dulkirmod/overlays/GardenInfoHud.kt new file mode 100644 index 0000000..efcf776 --- /dev/null +++ b/src/main/kotlin/dulkirmod/overlays/GardenInfoHud.kt @@ -0,0 +1,28 @@ +package dulkirmod.overlays + +import cc.polyfrost.oneconfig.hud.TextHud +import dulkirmod.config.DulkirConfig +import dulkirmod.utils.TabListUtils +import dulkirmod.utils.Utils + +class GardenInfoHud : TextHud(false) { + override fun getLines(lines: MutableList?, example: Boolean) { + if (!Utils.isInSkyblock()) return + if (TabListUtils.area != "Garden") return + var i = 0 + if (DulkirConfig.gardenMilestoneDisplay) { + lines?.add(i, TabListUtils.gardenMilestone) + ++i + } + if (DulkirConfig.visitorInfo) { + lines?.add(i, "Visitors: ${TabListUtils.numVisitors} - ${TabListUtils.timeTillNextVisitor}") + ++i + } + if (DulkirConfig.composterAlert) { + if (TabListUtils.emptyComposter) { + lines?.add(i, "Empty Composter!") + ++i + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/dulkirmod/overlays/KeyHud.kt b/src/main/kotlin/dulkirmod/overlays/KeyHud.kt new file mode 100644 index 0000000..36740bc --- /dev/null +++ b/src/main/kotlin/dulkirmod/overlays/KeyHud.kt @@ -0,0 +1,16 @@ +package dulkirmod.overlays +import cc.polyfrost.oneconfig.hud.TextHud +import dulkirmod.features.chat.DungeonKeyDisplay + + +class KeyHud : TextHud(false) { + + override fun getLines(lines: MutableList?, example: Boolean) { + if (example) { + lines?.add(0, "Wither Key Display") + return + } + if (DungeonKeyDisplay.hasKey) + lines?.add(0, "Key Obtained") + } +} \ No newline at end of file diff --git a/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt b/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt new file mode 100644 index 0000000..abed145 --- /dev/null +++ b/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt @@ -0,0 +1,29 @@ +package dulkirmod.overlays + +import cc.polyfrost.oneconfig.hud.TextHud +import dulkirmod.DulkirMod.Companion.mc +import dulkirmod.config.DulkirConfig +import dulkirmod.utils.TabListUtils +import dulkirmod.utils.Utils + +class YawDisplayHud : TextHud(false) { + override fun getLines(lines: MutableList?, example: Boolean) { + if (!Utils.isInSkyblock()) return + if (TabListUtils.area != "Garden") return + val pitch = mc.thePlayer.rotationPitch + var yaw = mc.thePlayer.rotationYaw % 360f + + if (yaw < -180.0f) { + yaw += 360.0f; + } else if (yaw > 180.0f) { + yaw -= 360.0f; + } + if (DulkirConfig.yaw3Decimals) { + lines?.add(0, String.format("Yaw: %.3f", yaw)) + } else { + lines?.add(0, String.format("Yaw: %.2f", yaw)) + } + if (DulkirConfig.showPitch) + lines?.add(1, String.format("Pitch: %.2f", pitch)) + } +} \ No newline at end of file -- cgit