ported to aurora

build.gradle.kts

@@ -16,7 +16,9 @@ blossom {
 
 allprojects {
     repositories {
+//        mavenLocal()
         mavenCentral()
+        maven("https://jitpack.io")
         maven("https://repo.spongepowered.org/maven/")
         maven("https://repo.essential.gg/repository/maven-public/")
     }
@@ -44,7 +46,11 @@ allprojects {
         annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
         implementation("org.spongepowered:mixin:0.7.11-SNAPSHOT") { isTransitive = false }
 
-        implementation("com.github.odtheking:odin-lwjgl:5065fe5c1e")
+        //implementation("com.github.stivais:AuroraUI:0.9.1-beta")
+        // todo: create releases for aurora
+        implementation("com.github.stivais:AuroraUI:90cb4e84e8")
+
+        implementation("com.github.odtheking:odin-lwjgl:faeaa48b39")
 
         sourceSets.main {
             java.srcDir(file("$projectDir/src/main/kotlin"))

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

@@ -1,8 +1,7 @@
 package me.odin.mixin.mixins;
 
-import com.github.stivais.ui.color.ColorUtils;
+import com.github.stivais.aurora.color.Color;
 import me.odinmain.events.impl.RenderEntityModelEvent;
-import com.github.stivais.ui.color.Color;
 import me.odinmain.utils.render.HighlightRenderer;
 import me.odinmain.utils.render.RenderUtils;
 import net.minecraft.client.model.ModelBase;
@@ -23,6 +22,7 @@
 
 import java.nio.FloatBuffer;
 
+import static com.github.stivais.aurora.utils.Color_utilitiesKt.*;
 import static me.odinmain.utils.Utils.postAndCatch;
 import static org.lwjgl.opengl.GL11.*;
 
@@ -74,10 +74,10 @@ private  <T extends EntityLivingBase> void setBrightness(T entity, float partial
             GL11.glTexEnvi(8960, OpenGlHelper.GL_OPERAND0_ALPHA, 770);
             this.brightnessBuffer.position(0);
             Color color = highlightEntity.getColor();
-            brightnessBuffer.put(ColorUtils.getRed(color) / 255f);
-            brightnessBuffer.put(ColorUtils.getGreen(color) / 255f);
-            brightnessBuffer.put(ColorUtils.getBlue(color) / 255f);
-            brightnessBuffer.put(ColorUtils.getAlpha(color) / 255f);
+            brightnessBuffer.put(getRed(color) / 255f);
+            brightnessBuffer.put(getGreen(color) / 255f);
+            brightnessBuffer.put(getBlue(color) / 255f);
+            brightnessBuffer.put(getAlpha(color) / 255f);
             this.brightnessBuffer.flip();
             GL11.glTexEnv(8960, 8705, this.brightnessBuffer);
             GlStateManager.setActiveTexture(OpenGlHelper.GL_TEXTURE2);

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

@@ -1,18 +1,22 @@
 package me.odin.features.impl.floor7.p3
 
-import com.github.stivais.ui.color.Color
+import com.github.stivais.aurora.color.Color
 import me.odinmain.events.impl.BlockChangeEvent
 import me.odinmain.events.impl.RealServerTick
-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.utils.*
+import me.odinmain.features.settings.impl.ActionSetting
+import me.odinmain.features.settings.impl.BooleanSetting
+import me.odinmain.features.settings.impl.ColorSetting
+import me.odinmain.features.settings.impl.KeybindSetting
+import me.odinmain.utils.distanceSquaredTo
+import me.odinmain.utils.equalsOneOf
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.PlayerUtils
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.dungeon.M7Phases
 import me.odinmain.utils.skyblock.modMessage
+import me.odinmain.utils.toVec3
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.init.Blocks
 import net.minecraft.util.AxisAlignedBB

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

@@ -1,7 +1,6 @@
 package me.odinclient.mixin.mixins;
 
-import com.github.stivais.ui.color.Color;
-import com.github.stivais.ui.color.ColorUtils;
+import com.github.stivais.aurora.color.Color;
 import me.odinmain.utils.render.HighlightRenderer;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.GlStateManager;
@@ -19,6 +18,7 @@
 
 import java.nio.FloatBuffer;
 
+import static com.github.stivais.aurora.utils.Color_utilitiesKt.*;
 import static org.lwjgl.opengl.GL11.*;
 
 @Mixin(RenderEntityItem.class)
@@ -70,10 +70,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(getRed(color) / 255f);
+            odinMod$brightnessBuffer.put(getGreen(color) / 255f);
+            odinMod$brightnessBuffer.put(getBlue(color) / 255f);
+            odinMod$brightnessBuffer.put(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/MixinRendererLivingEntity.java

@@ -1,7 +1,6 @@
 package me.odinclient.mixin.mixins;
 
-import com.github.stivais.ui.color.Color;
-import com.github.stivais.ui.color.ColorUtils;
+import com.github.stivais.aurora.color.Color;
 import me.odinmain.events.impl.RenderEntityModelEvent;
 import me.odinmain.utils.render.HighlightRenderer;
 import me.odinmain.utils.render.RenderUtils;
@@ -23,6 +22,7 @@
 
 import java.nio.FloatBuffer;
 
+import static com.github.stivais.aurora.utils.Color_utilitiesKt.*;
 import static me.odinmain.utils.Utils.postAndCatch;
 import static org.lwjgl.opengl.GL11.*;
 
@@ -74,10 +74,10 @@ private  <T extends EntityLivingBase> void setBrightness(T entity, float partial
             GL11.glTexEnvi(8960, OpenGlHelper.GL_OPERAND0_ALPHA, 770);
             this.brightnessBuffer.position(0);
             Color color = highlightEntity.getColor();
-            brightnessBuffer.put(ColorUtils.getRed(color) / 255f);
-            brightnessBuffer.put(ColorUtils.getGreen(color) / 255f);
-            brightnessBuffer.put(ColorUtils.getBlue(color) / 255f);
-            brightnessBuffer.put(ColorUtils.getAlpha(color) / 255f);
+            brightnessBuffer.put(getRed(color) / 255f);
+            brightnessBuffer.put(getGreen(color) / 255f);
+            brightnessBuffer.put(getBlue(color) / 255f);
+            brightnessBuffer.put(getAlpha(color) / 255f);
             this.brightnessBuffer.flip();
             GL11.glTexEnv(8960, 8705, this.brightnessBuffer);
             GlStateManager.setActiveTexture(OpenGlHelper.GL_TEXTURE2);

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

@@ -1,6 +1,6 @@
 package me.odinclient.features.impl.floor7.p3
 
-import com.github.stivais.ui.color.Color
+import com.github.stivais.aurora.color.Color
 import me.odinclient.utils.skyblock.PlayerUtils.rightClick
 import me.odinmain.events.impl.BlockChangeEvent
 import me.odinmain.events.impl.RealServerTick
@@ -14,7 +14,9 @@ import me.odinmain.utils.render.RenderUtils.renderY
 import me.odinmain.utils.render.RenderUtils.renderZ
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.*
-import me.odinmain.utils.skyblock.dungeon.*
+import me.odinmain.utils.skyblock.dungeon.DungeonClass
+import me.odinmain.utils.skyblock.dungeon.DungeonUtils
+import me.odinmain.utils.skyblock.dungeon.M7Phases
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.settings.KeyBinding
 import net.minecraft.entity.item.EntityArmorStand

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

@@ -1,21 +1,23 @@
 package me.odinclient.features.impl.floor7.p3
 
-import com.github.stivais.ui.color.Color
-import com.github.stivais.ui.color.withAlpha
+import com.github.stivais.aurora.color.Color
+import com.github.stivais.aurora.utils.withAlpha
 import me.odinclient.utils.skyblock.PlayerUtils.rightClick
 import me.odinmain.events.impl.BlockChangeEvent
 import me.odinmain.events.impl.PostEntityMetadata
-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
 import me.odinmain.features.settings.impl.NumberSetting
 import me.odinmain.utils.*
 import me.odinmain.utils.clock.Clock
 import me.odinmain.utils.render.Renderer
-import me.odinmain.utils.skyblock.*
+import me.odinmain.utils.skyblock.devMessage
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.dungeon.M7Phases
+import me.odinmain.utils.skyblock.getBlockIdAt
+import me.odinmain.utils.skyblock.modMessage
+import me.odinmain.utils.ui.Colors
 import net.minecraft.block.BlockButtonStone
 import net.minecraft.entity.item.EntityItem
 import net.minecraft.init.Blocks
@@ -141,7 +143,7 @@ object SimonSays : Module(
         val isInSSRange = mc.thePlayer.getDistanceSqToCenter(BlockPos(108, 120, 93)) <= 1.45 * 1.45
         Renderer.drawCylinder(
             Vec3(108.5, 120.0, 93.5), 1.45f, 1.45f, .6f, 35,
-            1, 0f, 90f, 90f, (if (isInSSRange) Color.GREEN else Color.MINECRAFT_GOLD).withAlpha(.5f)
+            1, 0f, 90f, 90f, (if (isInSSRange) Color.GREEN else Colors.MINECRAFT_GOLD).withAlpha(.5f)
         )
 
         if (

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

@@ -1,14 +1,17 @@
 package me.odinclient.features.impl.render
 
-import com.github.stivais.ui.color.Color
+import com.github.stivais.aurora.color.Color
 import me.odinmain.events.impl.RenderChestEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
-import me.odinmain.features.settings.impl.*
+import me.odinmain.features.settings.impl.BooleanSetting
+import me.odinmain.features.settings.impl.ColorSetting
+import me.odinmain.features.settings.impl.SelectorSetting
 import me.odinmain.utils.equalsOneOf
 import me.odinmain.utils.render.Renderer
-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.getBlockAt
 import me.odinmain.utils.toAABB
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.init.Blocks

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

@@ -1,12 +1,11 @@
 package me.odinclient.features.impl.render
 
-import com.github.stivais.ui.color.Color
-import com.github.stivais.ui.color.withAlpha
+import com.github.stivais.aurora.color.Color
+import com.github.stivais.aurora.utils.withAlpha
 import me.odinclient.mixin.accessors.IEntityPlayerSPAccessor
 import me.odinclient.utils.skyblock.PlayerUtils
 import me.odinmain.events.impl.ClickEvent
 import me.odinmain.events.impl.PacketReceivedEvent
-import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints.toBlockPos
 import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints.toVec3
@@ -17,11 +16,14 @@ import me.odinmain.utils.*
 import me.odinmain.utils.clock.Clock
 import me.odinmain.utils.render.RenderUtils.renderVec
 import me.odinmain.utils.render.Renderer
-import me.odinmain.utils.skyblock.*
 import me.odinmain.utils.skyblock.EtherWarpHelper
 import me.odinmain.utils.skyblock.EtherWarpHelper.etherPos
+import me.odinmain.utils.skyblock.Island
+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
@@ -35,7 +37,7 @@ object EtherWarpHelper : Module(
 ) {
     private val zeroPing by BooleanSetting("Zero Ping", false, description = "Teleports you to the exact position of the etherwarp.").withDependency { isDev }
     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 }
 

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

@@ -1,7 +1,6 @@
 package me.odinclient.features.impl.render
 
-import com.github.stivais.ui.color.Color
-import me.odinmain.features.Category
+import com.github.stivais.aurora.color.Color
 import me.odinmain.features.Module
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.utils.addVec

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

@@ -1,34 +1,42 @@
 package me.odinclient.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.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.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
 import me.odinmain.utils.render.RenderUtils.renderZ
+import me.odinmain.utils.render.Renderer
 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",
@@ -43,7 +51,7 @@ object Trajectories : Module(
     private val width by NumberSetting("Line Width", 1f, 0.1f, 5.0, 0.1f, description = "The width of the line.")
     private val planeSize by NumberSetting("Plane Size", 2f, 0.1f, 5.0, 0.1f, description = "The size of the plane.").withDependency { plane }
     private val boxSize by NumberSetting("Box Size", 0.5f, 0.5f, 3.0f, 0.1f, description = "The size of the box.").withDependency { boxes }
-    private val color by ColorSetting("Color", Color.MINECRAFT_AQUA, true, description = "The color of the trajectory.")
+    private val color by ColorSetting("Color", Colors.MINECRAFT_AQUA, true, description = "The color of the trajectory.")
 
     private var boxRenderQueue: MutableList<AxisAlignedBB> = mutableListOf()
     private var entityRenderQueue = mutableListOf<Entity>()

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

@@ -1,15 +1,16 @@
 package me.odinclient.features.impl.skyblock
 
-import com.github.stivais.ui.color.Color
+import com.github.stivais.aurora.color.Color
 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
-import me.odinmain.utils.*
+import me.odinmain.utils.name
+import me.odinmain.utils.noControlCodes
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.*
 import me.odinmain.utils.skyblock.PlayerUtils.windowClick
+import me.odinmain.utils.ui.Colors
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.inventory.Container
 import net.minecraft.inventory.ContainerChest
@@ -132,7 +133,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.MINECRAFT_GOLD, 0),
+        Breakfast(BunnyEggTextures.BREAKFAST_EGG_TEXTURE, "§6Breakfast Egg", Colors.MINECRAFT_GOLD, 0),
         Lunch(BunnyEggTextures.LUNCH_EGG_TEXTURE, "§9Lunch Egg ", Color.BLUE, 1),
         Dinner(BunnyEggTextures.DINNER_EGG_TEXTURE, "§aDinner Egg", Color.GREEN, 2),
     }