Compiles now

odin/src/main/java/me/odin/mixin/mixins/MixinGuiScreen.java

@@ -2,7 +2,6 @@
 
 import me.odinmain.events.impl.GuiEvent;
 import net.minecraft.client.gui.GuiScreen;
-import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;

odin/src/main/java/me/odin/mixin/mixins/MixinRenderEntityItem.java

@@ -1,8 +1,7 @@
 package me.odin.mixin.mixins;
 
-import com.github.stivais.ui.color.Color;
-import com.github.stivais.ui.color.ColorUtils;
-import com.github.stivais.ui.color.ColorUtils.*;
+import com.github.stivais.aurora.color.Color;
+import com.github.stivais.aurora.utils.Color_utilitiesKt;
 import me.odinmain.utils.render.HighlightRenderer;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.GlStateManager;
@@ -73,10 +72,10 @@ private void doRenderInject(EntityItem entity, double x, double y, double z, flo
             GL11.glTexEnvi(8960, OpenGlHelper.GL_OPERAND0_ALPHA, 770);
             this.odinMod$brightnessBuffer.position(0);
             Color color = highlightEntity.getColor();
-            odinMod$brightnessBuffer.put(ColorUtils.getRed(color) / 255f);
-            odinMod$brightnessBuffer.put(ColorUtils.getGreen(color) / 255f);
-            odinMod$brightnessBuffer.put(ColorUtils.getBlue(color) / 255f);
-            odinMod$brightnessBuffer.put(ColorUtils.getAlpha(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getRed(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getGreen(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getBlue(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getAlpha(color) / 255f);
             this.odinMod$brightnessBuffer.flip();
             GL11.glTexEnv(8960, 8705, this.odinMod$brightnessBuffer);
             GlStateManager.setActiveTexture(OpenGlHelper.GL_TEXTURE2);

odin/src/main/kotlin/me/odin/ModCore.kt

@@ -6,9 +6,7 @@ import me.odin.features.impl.render.Camera
 import me.odin.features.impl.render.EtherWarpHelper
 import me.odin.features.impl.skyblock.HidePlayers
 import me.odinmain.OdinMain
-import me.odinmain.OdinMain.mc
 import me.odinmain.features.ModuleManager
-import me.odinmain.utils.render.RenderUtils
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.Mod.EventHandler

odin/src/main/kotlin/me/odin/features/impl/floor7/p3/ArrowsDevice.kt

@@ -2,7 +2,7 @@ package me.odin.features.impl.floor7.p3
 
 import com.github.stivais.aurora.color.Color
 import me.odinmain.events.impl.BlockChangeEvent
-import me.odinmain.events.impl.RealServerTick
+import me.odinmain.events.impl.ServerTickEvent
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.ActionSetting

odin/src/main/kotlin/me/odin/features/impl/render/EtherWarpHelper.kt

@@ -1,10 +1,8 @@
 package me.odin.features.impl.render
 
-import com.github.stivais.ui.color.Color
-import com.github.stivais.ui.color.withAlpha
+import com.github.stivais.aurora.utils.withAlpha
 import me.odin.mixin.accessors.IEntityPlayerSPAccessor
 import me.odinmain.events.impl.PacketEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.*
@@ -16,6 +14,7 @@ import me.odinmain.utils.skyblock.EtherWarpHelper
 import me.odinmain.utils.skyblock.EtherWarpHelper.etherPos
 import me.odinmain.utils.skyblock.PlayerUtils.playLoudSound
 import me.odinmain.utils.skyblock.usingEtherWarp
+import me.odinmain.utils.ui.Colors
 import net.minecraft.network.play.server.S29PacketSoundEffect
 import net.minecraft.util.Vec3
 import net.minecraftforge.client.event.RenderWorldLastEvent
@@ -26,9 +25,9 @@ object EtherWarpHelper : Module(
     description = "Helpful tools for Ether Warp."
 ) {
     private val render by BooleanSetting("Show Etherwarp Guess", true, description = "Shows where etherwarp will take you.")
-    private val color by ColorSetting("Color", Color.MINECRAFT_GOLD.withAlpha(.5f), allowAlpha = true, description = "Color of the box.").withDependency { render }
+    private val color by ColorSetting("Color", Colors.MINECRAFT_GOLD.withAlpha(.5f), allowAlpha = true, description = "Color of the box.").withDependency { render }
     private val renderFail by BooleanSetting("Show when failed", true, description = "Shows the box even when the guess failed.").withDependency { render }
-    private val wrongColor by ColorSetting("Wrong Color", Color.RED.withAlpha(.5f), allowAlpha = true, description = "Color of the box if guess failed.").withDependency { renderFail }
+    private val wrongColor by ColorSetting("Wrong Color", Colors.MINECRAFT_RED.withAlpha(.5f), allowAlpha = true, description = "Color of the box if guess failed.").withDependency { renderFail }
 
     private val style by SelectorSetting("Style", Renderer.DEFAULT_STYLE, Renderer.styles, description = Renderer.STYLE_DESCRIPTION)
     private val lineWidth by NumberSetting("Line Width", 2f, 0.1f, 10f, 0.1f, description = "The width of the box's lines.")

odin/src/main/kotlin/me/odin/features/impl/skyblock/HidePlayers.kt

@@ -8,7 +8,6 @@ import me.odinmain.utils.skyblock.Island
 import me.odinmain.utils.skyblock.LocationUtils
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.dungeon.M7Phases
-import net.minecraft.entity.player.EntityPlayer
 import net.minecraftforge.client.event.RenderPlayerEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 

odinclient/src/main/java/me/odinclient/mixin/mixins/MixinRenderEntityItem.java

@@ -1,6 +1,7 @@
 package me.odinclient.mixin.mixins;
 
-import me.odinmain.utils.render.Color;
+import com.github.stivais.aurora.color.Color;
+import com.github.stivais.aurora.utils.Color_utilitiesKt;
 import me.odinmain.utils.render.HighlightRenderer;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.GlStateManager;
@@ -71,10 +72,10 @@ private void doRenderInject(EntityItem entity, double x, double y, double z, flo
             GL11.glTexEnvi(8960, OpenGlHelper.GL_OPERAND0_ALPHA, 770);
             this.odinMod$brightnessBuffer.position(0);
             Color color = highlightEntity.getColor();
-            odinMod$brightnessBuffer.put(color.getR() / 255f);
-            odinMod$brightnessBuffer.put(color.getG() / 255f);
-            odinMod$brightnessBuffer.put(color.getB() / 255f);
-            odinMod$brightnessBuffer.put(color.getA() / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getRed(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getGreen(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getBlue(color) / 255f);
+            odinMod$brightnessBuffer.put(Color_utilitiesKt.getAlpha(color) / 255f);
             this.odinMod$brightnessBuffer.flip();
             GL11.glTexEnv(8960, 8705, this.odinMod$brightnessBuffer);
             GlStateManager.setActiveTexture(OpenGlHelper.GL_TEXTURE2);

odinclient/src/main/java/me/odinclient/mixin/mixins/entity/MixinEntityRenderer.java

@@ -9,7 +9,6 @@
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoGFS.kt

@@ -1,6 +1,5 @@
 package me.odinclient.features.impl.dungeon
 
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.features.settings.impl.NumberSetting

odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoSell.kt

@@ -2,12 +2,16 @@ package me.odinclient.features.impl.dungeon
 
 import me.odinmain.config.Config
 import me.odinmain.features.Module
-import me.odinmain.features.settings.impl.*
+import me.odinmain.features.settings.impl.ActionSetting
+import me.odinmain.features.settings.impl.ListSetting
+import me.odinmain.features.settings.impl.NumberSetting
+import me.odinmain.features.settings.impl.SelectorSetting
 import me.odinmain.utils.containsOneOf
 import me.odinmain.utils.equalsOneOf
 import me.odinmain.utils.name
-import me.odinmain.utils.skyblock.*
+import me.odinmain.utils.skyblock.PlayerUtils
 import me.odinmain.utils.skyblock.PlayerUtils.windowClick
+import me.odinmain.utils.skyblock.modMessage
 import net.minecraft.inventory.ContainerChest
 
 object AutoSell : Module(

odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/CloseChest.kt

@@ -1,7 +1,6 @@
 package me.odinclient.features.impl.dungeon
 
 import me.odinmain.events.impl.PacketEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.SelectorSetting
 import me.odinmain.utils.equalsOneOf

odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/DungeonAbilities.kt

@@ -2,7 +2,8 @@ package me.odinclient.features.impl.dungeon
 
 import me.odinclient.utils.skyblock.PlayerUtils.dropItem
 import me.odinmain.features.Module
-import me.odinmain.features.settings.impl.*
+import me.odinmain.features.settings.impl.BooleanSetting
+import me.odinmain.features.settings.impl.KeybindSetting
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.modMessage
 import org.lwjgl.input.Keyboard

odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/GhostBlocks.kt

@@ -8,11 +8,14 @@ import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.*
 import me.odinmain.utils.rangeAdd
 import me.odinmain.utils.runIn
-import me.odinmain.utils.skyblock.*
+import me.odinmain.utils.skyblock.LocationUtils
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils.WITHER_ESSENCE_ID
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils.getF7Phase
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inDungeons
+import me.odinmain.utils.skyblock.getBlockAt
+import me.odinmain.utils.skyblock.getItemSlot
+import me.odinmain.utils.skyblock.modMessage
 import net.minecraft.block.state.IBlockState
 import net.minecraft.enchantment.Enchantment
 import net.minecraft.init.Blocks

odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/FuckDiorite.kt

@@ -1,6 +1,5 @@
 package me.odinclient.features.impl.floor7
 
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.ActionSetting

odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/HoverTerms.kt

@@ -6,11 +6,8 @@ import me.odinmain.features.Module
 import me.odinmain.features.impl.floor7.p3.TerminalSolver
 import me.odinmain.features.impl.floor7.p3.TerminalSolver.currentTerm
 import me.odinmain.features.impl.floor7.p3.TerminalTypes
-import me.odinmain.features.impl.floor7.p3.termGUI.TermGui
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.features.settings.impl.NumberSetting
-import me.odinmain.ui.util.MouseUtils.mouseX
-import me.odinmain.ui.util.MouseUtils.mouseY
 import me.odinmain.utils.clock.Clock
 import me.odinmain.utils.skyblock.PlayerUtils
 import me.odinmain.utils.skyblock.PlayerUtils.windowClick
@@ -40,7 +37,7 @@ object HoverTerms : Module(
 
         val hoveredItem =
             when {
-                TerminalSolver.renderType == 3 && TerminalSolver.enabled -> TermGui.getHoveredItem(mouseX.toInt(), mouseY.toInt())
+                //TerminalSolver.renderType == 3 && TerminalSolver.enabled -> TermGui.getHoveredItem(mouseX.toInt(), mouseY.toInt())
                 else -> {
                     if (event.gui.slotUnderMouse?.inventory == mc.thePlayer?.inventory) return
                     event.gui.slotUnderMouse?.slotIndex

odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/TerminalAura.kt

@@ -2,7 +2,6 @@ package me.odinclient.features.impl.floor7.p3
 
 import me.odinmain.events.impl.PacketEvent
 import me.odinmain.events.impl.PostEntityMetadata
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.impl.floor7.p3.TerminalSolver
 import me.odinmain.features.impl.floor7.p3.TerminalTypes

odinclient/src/main/kotlin/me/odinclient/features/impl/render/Camera.kt

@@ -1,6 +1,5 @@
 package me.odinclient.features.impl.render
 
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.BooleanSetting

odinclient/src/main/kotlin/me/odinclient/features/impl/render/EtherWarpHelper.kt

@@ -23,6 +23,7 @@ import me.odinmain.utils.skyblock.LocationUtils
 import me.odinmain.utils.skyblock.PlayerUtils.playLoudSound
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.usingEtherWarp
+import me.odinmain.utils.ui.Colors
 import net.minecraft.network.play.server.S29PacketSoundEffect
 import net.minecraft.util.MathHelper
 import net.minecraft.util.Vec3

odinclient/src/main/kotlin/me/odinclient/features/impl/render/NoDebuff.kt

@@ -1,15 +1,16 @@
 package me.odinclient.features.impl.render
 
 import me.odinmain.events.impl.PacketEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.utils.equalsOneOf
 import net.minecraft.block.material.Material
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.network.play.server.S2APacketParticles
 import net.minecraft.util.EnumParticleTypes
-import net.minecraftforge.client.event.*
+import net.minecraftforge.client.event.EntityViewRenderEvent
+import net.minecraftforge.client.event.RenderBlockOverlayEvent
+import net.minecraftforge.client.event.RenderGameOverlayEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object NoDebuff : Module(

odinclient/src/main/kotlin/me/odinclient/features/impl/render/Trajectories.kt

@@ -2,13 +2,14 @@ package me.odinclient.features.impl.render
 
 import com.github.stivais.aurora.utils.withAlpha
 import me.odinmain.events.impl.RenderEntityModelEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
-import me.odinmain.features.settings.impl.*
-import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha
-import me.odinmain.utils.*
-import me.odinmain.utils.render.*
+import me.odinmain.features.settings.impl.BooleanSetting
+import me.odinmain.features.settings.impl.ColorSetting
+import me.odinmain.features.settings.impl.NumberSetting
+import me.odinmain.utils.addVec
+import me.odinmain.utils.render.OutlineUtils
+import me.odinmain.utils.render.RenderUtils
 import me.odinmain.utils.render.RenderUtils.renderVec
 import me.odinmain.utils.render.RenderUtils.renderX
 import me.odinmain.utils.render.RenderUtils.renderY
@@ -18,18 +19,24 @@ import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.isHolding
 import me.odinmain.utils.skyblock.isLeap
 import me.odinmain.utils.skyblock.isShortbow
+import me.odinmain.utils.ui.Colors
 import net.minecraft.entity.Entity
 import net.minecraft.entity.boss.EntityWither
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.monster.EntityBlaze
 import net.minecraft.entity.projectile.EntityArrow
 import net.minecraft.item.ItemBow
 import net.minecraft.item.ItemEnderPearl
-import net.minecraft.util.*
+import net.minecraft.util.AxisAlignedBB
+import net.minecraft.util.EnumFacing
 import net.minecraft.util.MathHelper.sqrt_double
+import net.minecraft.util.MovingObjectPosition
+import net.minecraft.util.Vec3
 import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.math.*
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.math.sqrt
 
 object Trajectories : Module(
     name = "Trajectories",

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoClicker.kt

@@ -2,7 +2,6 @@ package me.odinclient.features.impl.skyblock
 
 import me.odinclient.utils.skyblock.PlayerUtils.leftClick
 import me.odinclient.utils.skyblock.PlayerUtils.rightClick
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.BooleanSetting

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoExperiments.kt

@@ -1,7 +1,6 @@
 package me.odinclient.features.impl.skyblock
 
 import me.odinmain.events.impl.GuiEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.features.settings.impl.NumberSetting

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoHarp.kt

@@ -1,6 +1,5 @@
 package me.odinclient.features.impl.skyblock
 
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.utils.name
 import me.odinmain.utils.skyblock.LocationUtils.isInSkyblock

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/CancelInteract.kt

@@ -1,6 +1,5 @@
 package me.odinclient.features.impl.skyblock
 
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.utils.containsOneOf

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/ChocolateFactory.kt

@@ -1,12 +1,12 @@
 package me.odinclient.features.impl.skyblock
 
+import com.github.stivais.aurora.color.Color
 import me.odinmain.events.impl.GuiEvent
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.features.settings.impl.NumberSetting
 import me.odinmain.utils.name
 import me.odinmain.utils.noControlCodes
-import me.odinmain.utils.render.Color
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.*
 import me.odinmain.utils.skyblock.PlayerUtils.windowClick
@@ -120,7 +120,7 @@ object ChocolateFactory : Module(
     private enum class ChocolateEggs(
         val texture: String, val type: String, val color: Color, val index: Int
     ) {
-        Breakfast(BunnyEggTextures.BREAKFAST_EGG_TEXTURE, "§6Breakfast Egg", Color.ORANGE, 0),
+        Breakfast(BunnyEggTextures.BREAKFAST_EGG_TEXTURE, "§6Breakfast Egg", Color.RED, 0),
         Lunch(BunnyEggTextures.LUNCH_EGG_TEXTURE, "§9Lunch Egg ", Color.BLUE, 1),
         Dinner(BunnyEggTextures.DINNER_EGG_TEXTURE, "§aDinner Egg", Color.GREEN, 2),
     }

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/HidePlayers.kt

@@ -1,6 +1,5 @@
 package me.odinclient.features.impl.skyblock
 
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.Setting.Companion.withDependency
 import me.odinmain.features.settings.impl.BooleanSetting

odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/Triggerbot.kt

@@ -6,12 +6,17 @@ import me.odinmain.features.Module
 import me.odinmain.features.impl.floor7.p3.ArrowAlign.clicksRemaining
 import me.odinmain.features.impl.floor7.p3.ArrowAlign.currentFrameRotations
 import me.odinmain.features.settings.Setting.Companion.withDependency
-import me.odinmain.features.settings.impl.*
+import me.odinmain.features.settings.impl.BooleanSetting
+import me.odinmain.features.settings.impl.DropdownSetting
+import me.odinmain.features.settings.impl.NumberSetting
 import me.odinmain.utils.*
 import me.odinmain.utils.clock.Clock
-import me.odinmain.utils.skyblock.*
+import me.odinmain.utils.skyblock.Island
+import me.odinmain.utils.skyblock.LocationUtils
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.dungeon.M7Phases
+import me.odinmain.utils.skyblock.skyblockID
+import me.odinmain.utils.skyblock.unformattedName
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.item.EntityEnderCrystal

src/main/kotlin/me/odinmain/OdinUpdater.kt

@@ -4,7 +4,10 @@ import com.google.gson.Gson
 import com.google.gson.JsonArray
 import me.odinmain.utils.downloadFile
 import me.odinmain.utils.fetchURLData
-import net.minecraft.client.gui.*
+import net.minecraft.client.gui.GuiButton
+import net.minecraft.client.gui.GuiMainMenu
+import net.minecraft.client.gui.GuiScreen
+import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.event.ClickEvent
 import net.minecraft.util.ChatComponentText