Merge fixes

odtheking · Dec 9, 2024 · 4220285 · 4220285
1 parent 5763bf3
commit 4220285
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BlazeSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BlazeSolver.kt
@@ -1,5 +1,6 @@
 package me.odinmain.features.impl.dungeon.puzzlesolvers
 
+import com.github.stivais.aurora.color.Color
 import me.odinmain.OdinMain.mc
 import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.onPuzzleComplete
 import me.odinmain.utils.equalsOneOf

diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BoulderSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BoulderSolver.kt
@@ -1,12 +1,12 @@
 package me.odinmain.features.impl.dungeon.puzzlesolvers
 
+import com.github.stivais.aurora.color.Color
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import me.odinmain.events.impl.RoomEnterEvent
 import me.odinmain.utils.addRotationCoords
 import me.odinmain.utils.equalsOneOf
 import me.odinmain.utils.removeFirstOrNull
-import me.odinmain.utils.render.Color
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.getBlockIdAt

diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/QuizSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/QuizSolver.kt
@@ -1,14 +1,15 @@
 package me.odinmain.features.impl.dungeon.puzzlesolvers
 
+import com.github.stivais.aurora.color.Color
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import me.odinmain.OdinMain.logger
 import me.odinmain.events.impl.RoomEnterEvent
 import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.onPuzzleComplete
-import me.odinmain.utils.render.*
+import me.odinmain.utils.render.RenderUtils
+import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils.getRealCoords
 import me.odinmain.utils.startsWithOneOf
-import me.odinmain.utils.toAABB
 import me.odinmain.utils.toVec3
 import net.minecraft.util.BlockPos
 import java.io.InputStreamReader

diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/TPMazeSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/TPMazeSolver.kt
@@ -4,9 +4,6 @@ import com.github.stivais.aurora.color.Color
 import com.github.stivais.aurora.utils.withAlpha
 import me.odinmain.OdinMain.mc
 import me.odinmain.events.impl.RoomEnterEvent
-import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.mazeColorMultiple
-import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.mazeColorOne
-import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.mazeColorVisited
 import me.odinmain.utils.isXZInterceptable
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils

diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/WeirdosSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/WeirdosSolver.kt
@@ -1,15 +1,14 @@
 package me.odinmain.features.impl.dungeon.puzzlesolvers
 
+import com.github.stivais.aurora.color.Color
 import me.odinmain.OdinMain.mc
 import me.odinmain.utils.addRotationCoords
 import me.odinmain.utils.noControlCodes
 import me.odinmain.utils.render.Renderer
 import me.odinmain.utils.skyblock.PlayerUtils
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
-import me.odinmain.utils.toAABB
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.util.BlockPos
-import net.minecraft.util.Vec3
 import java.util.concurrent.CopyOnWriteArraySet
 
 object WeirdosSolver {