From ba619ccebe7a313bac3b59e7f7e2085bb9cb74ee Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 24 Mar 2023 21:53:19 +0100
Subject: Code cleanup

---
 .../at/hannibal2/skyhanni/data/GuiEditManager.kt   | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
index d20605a6c..b68271c78 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
@@ -14,7 +14,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import org.lwjgl.input.Keyboard
-import org.lwjgl.util.vector.Vector2f
 import java.util.*
 
 class GuiEditManager {
@@ -89,27 +88,25 @@ class GuiEditManager {
 
         fun isInGui() = Minecraft.getMinecraft().currentScreen is GuiPositionEditor
 
-        fun Position.getDummySize(random: Boolean = false): Vector2f {
+        fun Position.getDummySize(random: Boolean = false): Vector2i {
             if (random) {
-                return Vector2f(15f, 15f)
+                return Vector2i(15, 15)
             } else {
-                val (x, y) = currentBorderSize[internalName] ?: return Vector2f(1f, 1f)
-                return Vector2f(x.toFloat(), y.toFloat())
+                val (x, y) = currentBorderSize[internalName] ?: return Vector2i(1, 1)
+                return Vector2i(x, y)
             }
         }
 
-        fun Position.getAbsX_(): Int {
+        fun Position.getAbsX(): Int {
             val width = getDummySize(true).x
-            return getAbsX(ScaledResolution(Minecraft.getMinecraft()), width.toInt())
+            return getAbsX0(ScaledResolution(Minecraft.getMinecraft()), width)
         }
 
-        fun Position.getAbsY_(): Int {
+        fun Position.getAbsY(): Int {
             val height = getDummySize(true).y
-            return getAbsY(ScaledResolution(Minecraft.getMinecraft()), height.toInt())
-        }
-
-        fun Position.isCenterX_(): Boolean {
-            return false
+            return getAbsY0(ScaledResolution(Minecraft.getMinecraft()), height)
         }
     }
-}
\ No newline at end of file
+}
+
+class Vector2i(val x: Int, val y: Int)
\ No newline at end of file
-- 
cgit