From 937eeeb33639e9d889c73dd8fc5c3f834c278df0 Mon Sep 17 00:00:00 2001 From: odtheking Date: Mon, 2 Dec 2024 09:50:06 +0200 Subject: [PATCH] Compiles now --- .../me/odin/mixin/mixins/MixinGuiScreen.java | 1 - .../mixin/mixins/MixinRenderEntityItem.java | 13 ++++----- odin/src/main/kotlin/me/odin/ModCore.kt | 2 -- .../features/impl/floor7/p3/ArrowsDevice.kt | 2 +- .../features/impl/render/EtherWarpHelper.kt | 9 +++--- .../features/impl/skyblock/HidePlayers.kt | 1 - .../mixin/mixins/MixinRenderEntityItem.java | 11 +++---- .../mixins/entity/MixinEntityRenderer.java | 1 - .../features/impl/dungeon/AutoGFS.kt | 1 - .../features/impl/dungeon/AutoSell.kt | 8 +++-- .../features/impl/dungeon/CloseChest.kt | 1 - .../features/impl/dungeon/DungeonAbilities.kt | 3 +- .../features/impl/dungeon/GhostBlocks.kt | 5 +++- .../features/impl/floor7/FuckDiorite.kt | 1 - .../features/impl/floor7/p3/HoverTerms.kt | 5 +--- .../features/impl/floor7/p3/TerminalAura.kt | 1 - .../odinclient/features/impl/render/Camera.kt | 1 - .../features/impl/render/EtherWarpHelper.kt | 1 + .../features/impl/render/NoDebuff.kt | 5 ++-- .../features/impl/render/Trajectories.kt | 21 +++++++++----- .../features/impl/skyblock/AutoClicker.kt | 1 - .../features/impl/skyblock/AutoExperiments.kt | 1 - .../features/impl/skyblock/AutoHarp.kt | 1 - .../features/impl/skyblock/CancelInteract.kt | 1 - .../impl/skyblock/ChocolateFactory.kt | 4 +-- .../features/impl/skyblock/HidePlayers.kt | 1 - .../features/impl/skyblock/Triggerbot.kt | 9 ++++-- src/main/kotlin/me/odinmain/OdinUpdater.kt | 5 +++- .../kotlin/me/odinmain/commands/Commodore.kt | 4 ++- .../me/odinmain/commands/impl/DevCommand.kt | 6 ++-- .../commands/impl/DungeonWaypointCommand.kt | 1 - .../me/odinmain/commands/impl/OdinCommand.kt | 18 +++++------- .../me/odinmain/commands/impl/PetCommand.kt | 4 ++- .../odinmain/commands/impl/WaypointCommand.kt | 4 ++- .../odinmain/config/DungeonWaypointConfig.kt | 1 - .../me/odinmain/events/EventDispatcher.kt | 1 - .../me/odinmain/features/ModuleManager.kt | 28 +++++------------- .../features/impl/dungeon/BloodCamp.kt | 8 +++-- .../features/impl/dungeon/LeapMenu.kt | 29 +++++++------------ .../features/impl/dungeon/LividSolver.kt | 11 +++---- .../odinmain/features/impl/dungeon/MapInfo.kt | 4 ++- .../features/impl/dungeon/SpringBoots.kt | 9 ++---- .../features/impl/dungeon/TerracottaTimer.kt | 12 ++++---- .../features/impl/dungeon/WarpCooldown.kt | 6 ++++ .../impl/dungeon/puzzlesolvers/BeamsSolver.kt | 13 ++------- .../impl/dungeon/puzzlesolvers/BlazeSolver.kt | 13 ++++++--- .../dungeon/puzzlesolvers/IceFillSolver.kt | 1 - .../dungeon/puzzlesolvers/PuzzleSolvers.kt | 4 +-- .../dungeon/puzzlesolvers/TPMazeSolver.kt | 9 +++--- .../impl/dungeon/puzzlesolvers/WaterSolver.kt | 6 +--- .../dungeon/puzzlesolvers/WeirdosSolver.kt | 4 ++- .../features/impl/floor7/DragonCheck.kt | 1 - .../features/impl/floor7/DragonPriority.kt | 4 ++- .../features/impl/floor7/TerminalSimulator.kt | 1 - .../features/impl/floor7/TickTimers.kt | 23 ++++++--------- .../features/impl/floor7/WitherDragonEnum.kt | 10 ++++--- .../features/impl/floor7/WitherDragons.kt | 11 ++++--- .../features/impl/floor7/p3/ArrowAlign.kt | 8 ++--- .../features/impl/floor7/p3/TerminalSolver.kt | 17 +++++------ .../features/impl/floor7/p3/TerminalSounds.kt | 4 ++- .../features/impl/floor7/p3/TerminalTimes.kt | 6 ++-- .../impl/floor7/p3/termsim/TermSimGui.kt | 12 +++++--- .../features/impl/nether/BlazeAttunement.kt | 1 - .../features/impl/nether/EnrageDisplay.kt | 8 ++--- .../features/impl/nether/KuudraDisplay.kt | 3 -- .../features/impl/nether/KuudraReminders.kt | 1 - .../me/odinmain/features/impl/nether/NoPre.kt | 4 ++- .../features/impl/nether/RemovePerks.kt | 1 - .../features/impl/nether/VanqNotifier.kt | 5 +++- .../features/impl/render/Animations.kt | 8 +++-- .../features/impl/render/BPSDisplay.kt | 4 +-- .../features/impl/render/CPSDisplay.kt | 14 ++++----- .../me/odinmain/features/impl/render/DVD.kt | 8 ++--- .../features/impl/render/DevPlayers.kt | 8 +++-- .../features/impl/render/NameChanger.kt | 2 +- .../odinmain/features/impl/render/Sidebar.kt | 16 +++------- .../features/impl/render/SpaceHelmet.kt | 2 +- .../features/impl/skyblock/AbilityTimers.kt | 29 ++++++------------- .../features/impl/skyblock/ArrowHit.kt | 3 +- .../features/impl/skyblock/ChatCommands.kt | 3 +- .../features/impl/skyblock/DianaHelper.kt | 2 -- .../features/impl/skyblock/FarmKeys.kt | 3 +- .../impl/skyblock/InvincibilityTimer.kt | 4 +-- .../features/impl/skyblock/ItemsHighlight.kt | 5 ++-- .../features/impl/skyblock/MobSpawn.kt | 9 ++++-- .../features/impl/skyblock/PetKeybinds.kt | 1 - .../features/impl/skyblock/PlayerDisplay.kt | 4 ++- .../features/impl/skyblock/RagnarokAxe.kt | 6 +--- .../odinmain/features/impl/skyblock/Splits.kt | 3 +- .../impl/skyblock/WardrobeKeybinds.kt | 6 ++-- .../kotlin/me/odinmain/utils/AsyncUtils.kt | 5 +++- .../kotlin/me/odinmain/utils/ServerUtils.kt | 1 - .../kotlin/me/odinmain/utils/SplitsManager.kt | 5 +++- src/main/kotlin/me/odinmain/utils/Utils.kt | 8 +++-- src/main/kotlin/me/odinmain/utils/WebUtils.kt | 4 ++- .../me/odinmain/utils/render/RenderUtils.kt | 4 +-- .../me/odinmain/utils/render/Renderer.kt | 1 - .../me/odinmain/utils/skyblock/ChatUtils.kt | 7 +++-- .../utils/skyblock/DianaBurrowEstimate.kt | 1 + .../utils/skyblock/EtherWarpHelper.kt | 5 +++- .../me/odinmain/utils/skyblock/KuudraUtils.kt | 5 +++- .../odinmain/utils/skyblock/LocationUtils.kt | 4 ++- .../utils/skyblock/dungeon/Dungeon.kt | 3 +- .../utils/skyblock/dungeon/DungeonUtils.kt | 6 ++-- .../utils/skyblock/dungeon/tiles/Room.kt | 1 - .../me/odinmain/utils/ui/screens/UIHandler.kt | 10 ++++--- 106 files changed, 319 insertions(+), 323 deletions(-) diff --git a/odin/src/main/java/me/odin/mixin/mixins/MixinGuiScreen.java b/odin/src/main/java/me/odin/mixin/mixins/MixinGuiScreen.java index c88959659..2ed8f78e5 100644 --- a/odin/src/main/java/me/odin/mixin/mixins/MixinGuiScreen.java +++ b/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; diff --git a/odin/src/main/java/me/odin/mixin/mixins/MixinRenderEntityItem.java b/odin/src/main/java/me/odin/mixin/mixins/MixinRenderEntityItem.java index 8e6651ad5..915312fa8 100644 --- a/odin/src/main/java/me/odin/mixin/mixins/MixinRenderEntityItem.java +++ b/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); diff --git a/odin/src/main/kotlin/me/odin/ModCore.kt b/odin/src/main/kotlin/me/odin/ModCore.kt index 3e4ea610f..8e5692aff 100644 --- a/odin/src/main/kotlin/me/odin/ModCore.kt +++ b/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 diff --git a/odin/src/main/kotlin/me/odin/features/impl/floor7/p3/ArrowsDevice.kt b/odin/src/main/kotlin/me/odin/features/impl/floor7/p3/ArrowsDevice.kt index fd0791bd2..c3366cc58 100644 --- a/odin/src/main/kotlin/me/odin/features/impl/floor7/p3/ArrowsDevice.kt +++ b/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 diff --git a/odin/src/main/kotlin/me/odin/features/impl/render/EtherWarpHelper.kt b/odin/src/main/kotlin/me/odin/features/impl/render/EtherWarpHelper.kt index 832e8a311..355fa433f 100644 --- a/odin/src/main/kotlin/me/odin/features/impl/render/EtherWarpHelper.kt +++ b/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.") diff --git a/odin/src/main/kotlin/me/odin/features/impl/skyblock/HidePlayers.kt b/odin/src/main/kotlin/me/odin/features/impl/skyblock/HidePlayers.kt index 9dd71daea..a8651686a 100644 --- a/odin/src/main/kotlin/me/odin/features/impl/skyblock/HidePlayers.kt +++ b/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 diff --git a/odinclient/src/main/java/me/odinclient/mixin/mixins/MixinRenderEntityItem.java b/odinclient/src/main/java/me/odinclient/mixin/mixins/MixinRenderEntityItem.java index 1fcbb8d3c..774fa765e 100644 --- a/odinclient/src/main/java/me/odinclient/mixin/mixins/MixinRenderEntityItem.java +++ b/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); diff --git a/odinclient/src/main/java/me/odinclient/mixin/mixins/entity/MixinEntityRenderer.java b/odinclient/src/main/java/me/odinclient/mixin/mixins/entity/MixinEntityRenderer.java index 534cec87d..6395209b7 100644 --- a/odinclient/src/main/java/me/odinclient/mixin/mixins/entity/MixinEntityRenderer.java +++ b/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; diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoGFS.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoGFS.kt index 1f93a5361..34a99492e 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoGFS.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoSell.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoSell.kt index 33ae452f9..4c395fd31 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/AutoSell.kt +++ b/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( diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/CloseChest.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/CloseChest.kt index f4f3910e5..398767323 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/CloseChest.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/DungeonAbilities.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/DungeonAbilities.kt index 39737de42..5a938d9ea 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/DungeonAbilities.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/GhostBlocks.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/GhostBlocks.kt index 86ed2a0d9..713ecaeba 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/dungeon/GhostBlocks.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/FuckDiorite.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/FuckDiorite.kt index 22287d8d6..9fd91af32 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/FuckDiorite.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/HoverTerms.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/HoverTerms.kt index 2253303b6..2d4e5c707 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/HoverTerms.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/TerminalAura.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/TerminalAura.kt index c8ec56802..4577534dd 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/floor7/p3/TerminalAura.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/Camera.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/render/Camera.kt index f3bfe8c19..2309c5389 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/Camera.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/EtherWarpHelper.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/render/EtherWarpHelper.kt index 59ab40d1d..fed3086f8 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/EtherWarpHelper.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/NoDebuff.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/render/NoDebuff.kt index dfcbf49ba..68366b078 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/NoDebuff.kt +++ b/odinclient/src/main/kotlin/me/odinclient/features/impl/render/NoDebuff.kt @@ -1,7 +1,6 @@ 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 @@ -9,7 +8,9 @@ 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( diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/Trajectories.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/render/Trajectories.kt index 17864bfd0..9e78608cd 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/render/Trajectories.kt +++ b/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,6 +19,7 @@ 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 @@ -25,11 +27,16 @@ 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", diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoClicker.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoClicker.kt index 43fecee5f..4daf70128 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoClicker.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoExperiments.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoExperiments.kt index 49547ef6b..df67e4454 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoExperiments.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoHarp.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoHarp.kt index 31801b539..3a7432f8c 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/AutoHarp.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/CancelInteract.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/CancelInteract.kt index 73ddef8b6..59d2efe04 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/CancelInteract.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/ChocolateFactory.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/ChocolateFactory.kt index 1f9a64f2f..66633cd24 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/ChocolateFactory.kt +++ b/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), } diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/HidePlayers.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/HidePlayers.kt index 464e19f7b..e55e5a4c8 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/HidePlayers.kt +++ b/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 diff --git a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/Triggerbot.kt b/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/Triggerbot.kt index 9c3f163ac..7e6dbc4a3 100644 --- a/odinclient/src/main/kotlin/me/odinclient/features/impl/skyblock/Triggerbot.kt +++ b/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 diff --git a/src/main/kotlin/me/odinmain/OdinUpdater.kt b/src/main/kotlin/me/odinmain/OdinUpdater.kt index c825bddb6..fc22ef4d8 100644 --- a/src/main/kotlin/me/odinmain/OdinUpdater.kt +++ b/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 diff --git a/src/main/kotlin/me/odinmain/commands/Commodore.kt b/src/main/kotlin/me/odinmain/commands/Commodore.kt index bae7fcf1d..b00461fda 100644 --- a/src/main/kotlin/me/odinmain/commands/Commodore.kt +++ b/src/main/kotlin/me/odinmain/commands/Commodore.kt @@ -3,7 +3,9 @@ package me.odinmain.commands import com.github.stivais.commodore.Node -import com.github.stivais.commodore.utils.* +import com.github.stivais.commodore.utils.LegacyCommodore +import com.github.stivais.commodore.utils.findCorrespondingNode +import com.github.stivais.commodore.utils.getArgumentsRequired import me.odinmain.utils.skyblock.modMessage import net.minecraft.command.CommandBase import net.minecraft.command.ICommandSender diff --git a/src/main/kotlin/me/odinmain/commands/impl/DevCommand.kt b/src/main/kotlin/me/odinmain/commands/impl/DevCommand.kt index 5d95bcb0a..9fb3251be 100644 --- a/src/main/kotlin/me/odinmain/commands/impl/DevCommand.kt +++ b/src/main/kotlin/me/odinmain/commands/impl/DevCommand.kt @@ -1,7 +1,7 @@ package me.odinmain.commands.impl import com.github.stivais.commodore.utils.GreedyString -import kotlinx.coroutines.* +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.launch import me.odinmain.OdinMain.mc import me.odinmain.OdinMain.scope @@ -18,8 +18,10 @@ import me.odinmain.features.impl.nether.NoPre import me.odinmain.features.impl.render.DevPlayers.updateDevs import me.odinmain.utils.* import me.odinmain.utils.skyblock.* -import me.odinmain.utils.skyblock.dungeon.* +import me.odinmain.utils.skyblock.dungeon.Blessing +import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.DungeonUtils.getRelativeCoords +import me.odinmain.utils.skyblock.dungeon.ScanUtils import me.odinmain.utils.skyblock.dungeon.ScanUtils.getRoomCenter import net.minecraft.network.play.server.S02PacketChat import net.minecraft.util.ChatComponentText diff --git a/src/main/kotlin/me/odinmain/commands/impl/DungeonWaypointCommand.kt b/src/main/kotlin/me/odinmain/commands/impl/DungeonWaypointCommand.kt index 047445aea..8fdb515d3 100644 --- a/src/main/kotlin/me/odinmain/commands/impl/DungeonWaypointCommand.kt +++ b/src/main/kotlin/me/odinmain/commands/impl/DungeonWaypointCommand.kt @@ -11,7 +11,6 @@ import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints.glLis import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints.setWaypoints import me.odinmain.features.impl.dungeon.dungeonwaypoints.SecretWaypoints.resetSecrets import me.odinmain.utils.isHexaDecimal -import me.odinmain.utils.render.Color import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.modMessage import me.odinmain.utils.writeToClipboard diff --git a/src/main/kotlin/me/odinmain/commands/impl/OdinCommand.kt b/src/main/kotlin/me/odinmain/commands/impl/OdinCommand.kt index caf53e20b..9053d6f0e 100644 --- a/src/main/kotlin/me/odinmain/commands/impl/OdinCommand.kt +++ b/src/main/kotlin/me/odinmain/commands/impl/OdinCommand.kt @@ -1,20 +1,18 @@ package me.odinmain.commands.impl import com.github.stivais.commodore.utils.GreedyString -import me.odinmain.OdinMain.display import me.odinmain.commands.commodore +import me.odinmain.features.huds.HUDManager import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints -import me.odinmain.features.impl.render.ClickGUIModule -import me.odinmain.features.impl.render.ServerHud.colorizeFPS -import me.odinmain.features.impl.render.ServerHud.colorizePing -import me.odinmain.features.impl.render.ServerHud.colorizeTps -import me.odinmain.ui.clickgui.ClickGUI -import me.odinmain.ui.hud.EditHUDGui -import me.odinmain.utils.* +import me.odinmain.features.impl.render.ClickGUI +import me.odinmain.features.impl.render.ClickGUI.clickGUI +import me.odinmain.utils.ServerUtils +import me.odinmain.utils.equalsOneOf +import me.odinmain.utils.fillItemFromSack import me.odinmain.utils.skyblock.* import me.odinmain.utils.skyblock.dungeon.DungeonUtils -import java.awt.Desktop -import java.net.URI +import me.odinmain.utils.ui.screens.UIScreen.Companion.open +import me.odinmain.utils.writeToClipboard import kotlin.math.round val mainCommand = commodore("od", "odin") { diff --git a/src/main/kotlin/me/odinmain/commands/impl/PetCommand.kt b/src/main/kotlin/me/odinmain/commands/impl/PetCommand.kt index fe5ff4bb3..6f88c55f4 100644 --- a/src/main/kotlin/me/odinmain/commands/impl/PetCommand.kt +++ b/src/main/kotlin/me/odinmain/commands/impl/PetCommand.kt @@ -4,7 +4,9 @@ import me.odinmain.OdinMain.mc import me.odinmain.commands.commodore import me.odinmain.config.Config import me.odinmain.features.impl.skyblock.PetKeybinds.petList -import me.odinmain.utils.skyblock.* +import me.odinmain.utils.skyblock.isHolding +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.uuid val petCommand = commodore("petkeys") { diff --git a/src/main/kotlin/me/odinmain/commands/impl/WaypointCommand.kt b/src/main/kotlin/me/odinmain/commands/impl/WaypointCommand.kt index 3ad464c90..3eedd0c6f 100644 --- a/src/main/kotlin/me/odinmain/commands/impl/WaypointCommand.kt +++ b/src/main/kotlin/me/odinmain/commands/impl/WaypointCommand.kt @@ -3,10 +3,12 @@ package me.odinmain.commands.impl import me.odinmain.commands.commodore import me.odinmain.features.impl.render.WaypointManager import me.odinmain.utils.floor -import me.odinmain.utils.skyblock.* +import me.odinmain.utils.skyblock.PlayerUtils import me.odinmain.utils.skyblock.PlayerUtils.posX import me.odinmain.utils.skyblock.PlayerUtils.posY import me.odinmain.utils.skyblock.PlayerUtils.posZ +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.partyMessage val waypointCommand = commodore("waypoint", "odinwaypoint") { diff --git a/src/main/kotlin/me/odinmain/config/DungeonWaypointConfig.kt b/src/main/kotlin/me/odinmain/config/DungeonWaypointConfig.kt index 992031a07..31baa4b91 100644 --- a/src/main/kotlin/me/odinmain/config/DungeonWaypointConfig.kt +++ b/src/main/kotlin/me/odinmain/config/DungeonWaypointConfig.kt @@ -13,7 +13,6 @@ import me.odinmain.OdinMain.mc import me.odinmain.OdinMain.scope import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints.DungeonWaypoint -import me.odinmain.utils.render.Color import me.odinmain.utils.skyblock.modMessage import net.minecraft.util.AxisAlignedBB import java.io.ByteArrayOutputStream diff --git a/src/main/kotlin/me/odinmain/events/EventDispatcher.kt b/src/main/kotlin/me/odinmain/events/EventDispatcher.kt index dc99aec60..d2075ab09 100644 --- a/src/main/kotlin/me/odinmain/events/EventDispatcher.kt +++ b/src/main/kotlin/me/odinmain/events/EventDispatcher.kt @@ -9,7 +9,6 @@ import me.odinmain.utils.skyblock.dungeon.DungeonUtils.dungeonItemDrops import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inBoss import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inDungeons import me.odinmain.utils.skyblock.dungeon.DungeonUtils.isSecret -import me.odinmain.utils.skyblock.modMessage import me.odinmain.utils.skyblock.unformattedName import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.entity.item.EntityItem diff --git a/src/main/kotlin/me/odinmain/features/ModuleManager.kt b/src/main/kotlin/me/odinmain/features/ModuleManager.kt index 61a40a12c..03c5d4cd7 100644 --- a/src/main/kotlin/me/odinmain/features/ModuleManager.kt +++ b/src/main/kotlin/me/odinmain/features/ModuleManager.kt @@ -1,24 +1,21 @@ package me.odinmain.features -import me.odinmain.OdinMain.mc -import me.odinmain.events.impl.* +import me.odinmain.events.impl.ChatPacketEvent +import me.odinmain.events.impl.InputEvent +import me.odinmain.events.impl.PacketEvent +import me.odinmain.events.impl.ServerTickEvent import me.odinmain.features.impl.dungeon.* import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers -import me.odinmain.features.impl.floor7.* +import me.odinmain.features.impl.floor7.TerminalSimulator +import me.odinmain.features.impl.floor7.TickTimers +import me.odinmain.features.impl.floor7.WitherDragons import me.odinmain.features.impl.floor7.p3.* import me.odinmain.features.impl.nether.* import me.odinmain.features.impl.render.* -import me.odinmain.features.impl.render.ClickGUIModule.hudChat import me.odinmain.features.impl.skyblock.* import me.odinmain.features.settings.impl.KeybindSetting -import me.odinmain.ui.hud.EditHUDGui -import me.odinmain.ui.hud.HudElement -import me.odinmain.utils.capitalizeFirst -import me.odinmain.utils.profile -import me.odinmain.utils.render.getTextWidth import net.minecraft.network.Packet -import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent @@ -157,17 +154,6 @@ object ModuleManager { } } - @SubscribeEvent - fun onRenderOverlay(event: RenderGameOverlayEvent.Post) { - if ((mc.currentScreen != null && !hudChat) || event.type != RenderGameOverlayEvent.ElementType.ALL || mc.currentScreen == EditHUDGui) return - - profile("Odin Hud") { - for (i in 0 until huds.size) { - huds[i].draw(false) - } - } - } - fun getModuleByName(name: String?): Module? = modules.firstOrNull { it.name.equals(name, true) } fun generateFeatureList(): String { diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/BloodCamp.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/BloodCamp.kt index acd349884..59a11ade3 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/BloodCamp.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/BloodCamp.kt @@ -5,13 +5,14 @@ import me.odinmain.OdinMain.isLegitVersion import me.odinmain.events.impl.EntityLeaveWorldEvent import me.odinmain.events.impl.PostEntityMetadata import me.odinmain.events.impl.ServerTickEvent -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.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.ColorSetting +import me.odinmain.features.settings.impl.DropdownSetting +import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.utils.* import me.odinmain.utils.ServerUtils.averagePing -import me.odinmain.utils.render.Color import me.odinmain.utils.render.RenderUtils.renderVec import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.devMessage @@ -19,6 +20,7 @@ import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inBoss import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inDungeons import me.odinmain.utils.skyblock.getSkullValue +import me.odinmain.utils.ui.Colors import net.minecraft.entity.boss.BossStatus import net.minecraft.entity.item.EntityArmorStand import net.minecraft.entity.monster.EntityZombie diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/LeapMenu.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/LeapMenu.kt index 5aaae02ab..bf624ef2d 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/LeapMenu.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/LeapMenu.kt @@ -1,34 +1,29 @@ package me.odinmain.features.impl.dungeon import com.github.stivais.aurora.color.Color +import com.github.stivais.aurora.utils.withAlpha import io.github.moulberry.notenoughupdates.NEUApi -import me.odinmain.events.impl.GuiEvent -import me.odinmain.features.Category import me.odinmain.features.Module import me.odinmain.features.impl.dungeon.LeapHelper.leapHelperBossChatEvent import me.odinmain.features.impl.dungeon.LeapHelper.worldLoad import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.* -import me.odinmain.ui.clickgui.animations.impl.EaseInOut -import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha -import me.odinmain.ui.util.MouseUtils.getQuadrant import me.odinmain.utils.equalsOneOf import me.odinmain.utils.name -import me.odinmain.utils.render.* -import me.odinmain.utils.render.RenderUtils.drawTexturedModalRect -import me.odinmain.utils.skyblock.* import me.odinmain.utils.skyblock.dungeon.DungeonClass import me.odinmain.utils.skyblock.dungeon.DungeonPlayer import me.odinmain.utils.skyblock.dungeon.DungeonUtils.leapTeammates +import me.odinmain.utils.skyblock.getItemIndexInContainerChest +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.partyMessage +import me.odinmain.utils.ui.Colors import net.minecraft.client.gui.inventory.GuiChest -import net.minecraft.client.renderer.GlStateManager import net.minecraft.inventory.ContainerChest -import net.minecraft.util.ResourceLocation import net.minecraftforge.client.event.GuiOpenEvent +import net.minecraftforge.client.event.GuiScreenEvent import net.minecraftforge.fml.common.Loader import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.lwjgl.input.Keyboard -import org.lwjgl.opengl.Display object LeapMenu : Module( name = "Leap Menu", @@ -37,7 +32,7 @@ object LeapMenu : Module( val type by SelectorSetting("Sorting", "Odin Sorting", arrayListOf("Odin Sorting", "A-Z Class (BetterMap)", "A-Z Name", "Custom sorting", "No Sorting"), description = "How to sort the leap menu.") private val onlyClass by BooleanSetting("Only Classes", false, description = "Renders classes instead of names.") private val colorStyle by BooleanSetting("Color Style", default = false, description = "Which color style to use.") - private val backgroundColor by ColorSetting("Background Color", default = Color.DARK_GRAY.withAlpha(0.9f), allowAlpha = true, description = "Color of the background of the leap menu.") + private val backgroundColor by ColorSetting("Background Color", Colors.MINECRAFT_DARK_GRAY.withAlpha(0.9f), allowAlpha = true, description = "Color of the background of the leap menu.") private val roundedRect by BooleanSetting("Rounded Rect", true, description = "Toggles the rounded rect for the gui.") private val useNumberKeys by BooleanSetting("Use Number Keys", false, description = "Use keyboard keys to leap to the player you want, going from left to right, top to bottom.") private val topLeftKeybind by KeybindSetting("Top Left", Keyboard.KEY_1, "Used to click on the first person in the leap menu.").withDependency { useNumberKeys } @@ -51,6 +46,8 @@ object LeapMenu : Module( private val leapAnnounce by BooleanSetting("Leap Announce", false, description = "Announces when you leap to a player.") private val EMPTY = DungeonPlayer("Empty", DungeonClass.Unknown) + private val keybindList = listOf(topLeftKeybind, topRightKeybind, bottomLeftKeybind, bottomRightKeybind) + // fun leapMenu() = UI { // Grid(copies()).scope { @@ -152,15 +149,9 @@ object LeapMenu : Module( } init { - onMessage(Regex(".*")) { - leapHelperBossChatEvent(it) - } + onMessage(Regex(".*")) { leapHelperBossChatEvent(it) } onWorldLoad { worldLoad() } - - execute(100) { - getPlayer() - } } /*private val leapTeammates: MutableList = mutableListOf( diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/LividSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/LividSolver.kt index 2c3f62c7c..8511a2a1a 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/LividSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/LividSolver.kt @@ -1,27 +1,24 @@ package me.odinmain.features.impl.dungeon -import me.odinmain.features.Category +import com.github.stivais.aurora.color.Color import me.odinmain.features.Module -import me.odinmain.utils.render.Color import me.odinmain.utils.render.RenderUtils import me.odinmain.utils.render.RenderUtils.renderBoundingBox import me.odinmain.utils.skyblock.dungeon.DungeonUtils -import me.odinmain.utils.skyblock.dungeon.Floor import me.odinmain.utils.skyblock.getBlockAt import me.odinmain.utils.skyblock.getBlockStateAt import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.entity.item.EntityArmorStand import net.minecraft.init.Blocks import net.minecraft.util.BlockPos +import net.minecraftforge.client.event.RenderLivingEvent +import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent -import net.minecraftforge.client.event.RenderWorldLastEvent -import net.minecraftforge.client.event.RenderLivingEvent object LividSolver : Module( name = "Livid Solver", - description = "Automatically solves the Livid puzzle in dungeons.", - category = Category.DUNGEON + description = "Automatically solves the Livid puzzle in dungeons." ) { private data class Livid(val woolMeta: Int, val name: String, val color: String, val entity: EntityOtherPlayerMP? = null, val armorStand: EntityArmorStand? = null) diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/MapInfo.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/MapInfo.kt index 38260213b..47a4078bb 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/MapInfo.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/MapInfo.kt @@ -2,7 +2,9 @@ package me.odinmain.features.impl.dungeon import me.odinmain.features.Module 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.SelectorSetting +import me.odinmain.features.settings.impl.StringSetting object MapInfo : Module( name = "Map Info", diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/SpringBoots.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/SpringBoots.kt index 0e0e8a91c..a9777b649 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/SpringBoots.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/SpringBoots.kt @@ -1,20 +1,17 @@ -package me.odinmain.features.impl.skyblock +package me.odinmain.features.impl.dungeon import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.features.settings.impl.ColorSetting -import me.odinmain.features.settings.impl.HudSetting import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.utils.addVec import me.odinmain.utils.equalsOneOf import me.odinmain.utils.getSafe -import me.odinmain.utils.render.Color import me.odinmain.utils.render.Renderer -import me.odinmain.utils.render.getTextWidth -import me.odinmain.utils.render.mcText import me.odinmain.utils.skyblock.LocationUtils import me.odinmain.utils.skyblock.skyblockID import me.odinmain.utils.toAABB +import me.odinmain.utils.ui.Colors import net.minecraft.network.play.server.S29PacketSoundEffect import net.minecraft.util.Vec3 import net.minecraftforge.client.event.RenderWorldLastEvent @@ -36,7 +33,7 @@ object SpringBoots : Module( } }*/ private val renderGoal by BooleanSetting("Render Goal", true, description = "Render the goal block.") - private val goalColor by ColorSetting("Goal Color", Color.GREEN, description = "Color of the goal block.") + private val goalColor by ColorSetting("Goal Color", Colors.MINECRAFT_GREEN, description = "Color of the goal block.") private val offset by NumberSetting("Offset", 0.0, -10.0, 10.0, 0.1, description = "The offset of the goal block.") private val blocksList: List = listOf( diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/TerracottaTimer.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/TerracottaTimer.kt index 8b5333276..4f469da62 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/TerracottaTimer.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/TerracottaTimer.kt @@ -1,17 +1,19 @@ package me.odinmain.features.impl.dungeon +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.events.impl.ServerTickEvent import me.odinmain.features.Module -import me.odinmain.utils.* -import me.odinmain.utils.render.Color +import me.odinmain.utils.addVec +import me.odinmain.utils.equal import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.dungeon.DungeonUtils +import me.odinmain.utils.toVec3 +import me.odinmain.utils.ui.Colors import net.minecraft.util.Vec3 import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import java.util.Locale +import java.util.* import java.util.concurrent.CopyOnWriteArrayList object TerracottaTimer : Module( diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/WarpCooldown.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/WarpCooldown.kt index 1c24e5286..a1dc33755 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/WarpCooldown.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/WarpCooldown.kt @@ -4,7 +4,11 @@ import com.github.stivais.aurora.color.Color import me.odinmain.features.Module import me.odinmain.features.huds.HUD.Companion.needs import me.odinmain.features.huds.HUD.Companion.preview +import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.StringSetting +import me.odinmain.utils.clock.Clock +import me.odinmain.utils.skyblock.partyMessage import me.odinmain.utils.ui.TextHUD import me.odinmain.utils.ui.buildText @@ -12,6 +16,8 @@ object WarpCooldown : Module ( name = "Warp Cooldown", description = "Displays the time until you can warp into a dungeon again." ) { + private val announceKick: Boolean by BooleanSetting("Announce Kick", false, description = "Announce when you get kicked from skyblock.") + private val kickText: String by StringSetting("Kick Text", default = "Kicked!", description = "The text sent in party chat when you get kicked from skyblock.").withDependency { announceKick } private val showUnit by BooleanSetting("Show unit", default = false, description = "Displays unit of time for the cooldown.").hide() private var warpTimer = Clock(30_000L) diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BeamsSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BeamsSolver.kt index 5e7e8934c..aac4eba20 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BeamsSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BeamsSolver.kt @@ -9,16 +9,15 @@ import me.odinmain.events.impl.BlockChangeEvent import me.odinmain.events.impl.RoomEnterEvent import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.beamsAlpha import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.onPuzzleComplete -import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha import me.odinmain.utils.addVec import me.odinmain.utils.equalsOneOf -import me.odinmain.utils.render.Color import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.DungeonUtils.getRealCoords import me.odinmain.utils.skyblock.getBlockIdAt import me.odinmain.utils.toAABB import me.odinmain.utils.toVec3 +import me.odinmain.utils.ui.Colors import net.minecraft.init.Blocks import net.minecraft.util.BlockPos import java.io.InputStreamReader @@ -87,14 +86,8 @@ object BeamsSolver { } private val colors = listOf( - Colors.MINECRAFT_GOLD, - Color.GREEN, - Colors.MINECRAFT_LIGHT_PURPLE, - Colors.MINECRAFT_AQUA, - Colors.MINECRAFT_YELLOW, - Colors.MINECRAFT_DARK_RED, - Color.WHITE, - Colors.MINECRAFT_DARK_PURPLE + Colors.MINECRAFT_GOLD, Color.GREEN, Colors.MINECRAFT_LIGHT_PURPLE, Colors.MINECRAFT_AQUA, + Colors.MINECRAFT_YELLOW, Colors.MINECRAFT_DARK_RED, Color.WHITE, Colors.MINECRAFT_DARK_PURPLE ) } 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 index f248c9f47..d27346317 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BlazeSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/BlazeSolver.kt @@ -4,15 +4,20 @@ import me.odinmain.OdinMain.mc import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.blazeHeight import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.blazeWidth import me.odinmain.features.impl.dungeon.puzzlesolvers.PuzzleSolvers.onPuzzleComplete -import me.odinmain.utils.* +import me.odinmain.utils.equalsOneOf +import me.odinmain.utils.middle +import me.odinmain.utils.noControlCodes +import me.odinmain.utils.offset import me.odinmain.utils.render.RenderUtils.renderBoundingBox import me.odinmain.utils.render.RenderUtils.renderVec import me.odinmain.utils.render.Renderer -import me.odinmain.utils.skyblock.* -import me.odinmain.utils.skyblock.dungeon.* +import me.odinmain.utils.skyblock.LocationUtils +import me.odinmain.utils.skyblock.dungeon.DungeonUtils +import me.odinmain.utils.skyblock.dungeon.Puzzle +import me.odinmain.utils.skyblock.dungeon.PuzzleStatus +import me.odinmain.utils.skyblock.partyMessage import net.minecraft.entity.item.EntityArmorStand import net.minecraft.util.AxisAlignedBB -import kotlin.collections.set object BlazeSolver { private var blazes = mutableListOf() diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/IceFillSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/IceFillSolver.kt index d83c21a1d..d007a5e51 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/IceFillSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/IceFillSolver.kt @@ -8,7 +8,6 @@ import me.odinmain.events.impl.RoomEnterEvent import me.odinmain.utils.Vec2 import me.odinmain.utils.add import me.odinmain.utils.addVec -import me.odinmain.utils.render.Color import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.IceFillFloors import me.odinmain.utils.skyblock.dungeon.DungeonUtils diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/PuzzleSolvers.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/PuzzleSolvers.kt index 7063e8307..abc25f688 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/PuzzleSolvers.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/PuzzleSolvers.kt @@ -4,15 +4,12 @@ import com.github.stivais.aurora.color.Color import com.github.stivais.aurora.utils.withAlpha import me.odinmain.events.impl.BlockChangeEvent import me.odinmain.events.impl.RoomEnterEvent -import me.odinmain.features.Category import me.odinmain.features.Module import me.odinmain.features.impl.dungeon.puzzlesolvers.WaterSolver.waterInteract 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.equalsOneOf import me.odinmain.utils.profile -import me.odinmain.utils.render.Color import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.Island import me.odinmain.utils.skyblock.LocationUtils @@ -23,6 +20,7 @@ import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inBoss import me.odinmain.utils.skyblock.dungeon.DungeonUtils.inDungeons import me.odinmain.utils.skyblock.dungeon.tiles.RoomType import me.odinmain.utils.skyblock.partyMessage +import me.odinmain.utils.ui.Colors import net.minecraft.block.BlockChest import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement import net.minecraft.network.play.server.S08PacketPlayerPosLook 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 index 8deb70fa9..bd6d2d6d8 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/TPMazeSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/TPMazeSolver.kt @@ -7,14 +7,15 @@ 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.ui.clickgui.util.ColorUtil.withAlpha -import me.odinmain.utils.* -import me.odinmain.utils.render.Color +import me.odinmain.utils.isXZInterceptable import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.DungeonUtils.getRealCoords +import me.odinmain.utils.toAABB import net.minecraft.network.play.server.S08PacketPlayerPosLook -import net.minecraft.util.* +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.BlockPos +import net.minecraft.util.Vec3 import java.util.concurrent.CopyOnWriteArraySet object TPMazeSolver { diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/WaterSolver.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/WaterSolver.kt index 1b7cd6c2e..ec7a09107 100644 --- a/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/WaterSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/dungeon/puzzlesolvers/WaterSolver.kt @@ -4,7 +4,6 @@ import com.github.stivais.aurora.color.Color import com.google.gson.JsonObject import com.google.gson.JsonParser import me.odinmain.utils.equal -import me.odinmain.utils.render.Color import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.DungeonUtils.getRealCoords @@ -17,10 +16,7 @@ import net.minecraft.util.BlockPos import net.minecraft.util.Vec3 import java.io.InputStreamReader import java.nio.charset.StandardCharsets -import java.util.Locale -import kotlin.collections.component1 -import kotlin.collections.component2 -import kotlin.collections.set +import java.util.* object WaterSolver { 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 index ef7c42e4b..7ed43aec5 100644 --- 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,10 +1,12 @@ package me.odinmain.features.impl.dungeon.puzzlesolvers import me.odinmain.OdinMain.mc -import me.odinmain.utils.* +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.Vec3 import java.util.concurrent.CopyOnWriteArraySet diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/DragonCheck.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/DragonCheck.kt index ddf0b50ee..dff33241b 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/DragonCheck.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/DragonCheck.kt @@ -2,7 +2,6 @@ package me.odinmain.features.impl.floor7 import me.odinmain.OdinMain.mc import me.odinmain.features.impl.floor7.WitherDragons.currentTick -import me.odinmain.features.impl.floor7.WitherDragons.sendNotification import me.odinmain.features.impl.floor7.WitherDragons.sendSpray import me.odinmain.utils.isVecInXZ import me.odinmain.utils.skyblock.modMessage diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/DragonPriority.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/DragonPriority.kt index 2f6d53976..99581179f 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/DragonPriority.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/DragonPriority.kt @@ -10,7 +10,9 @@ import me.odinmain.features.impl.floor7.WitherDragons.soloDebuffOnAll import me.odinmain.utils.equalsOneOf import me.odinmain.utils.skyblock.PlayerUtils import me.odinmain.utils.skyblock.devMessage -import me.odinmain.utils.skyblock.dungeon.* +import me.odinmain.utils.skyblock.dungeon.Blessing +import me.odinmain.utils.skyblock.dungeon.DungeonClass +import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.modMessage object DragonPriority { diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/TerminalSimulator.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/TerminalSimulator.kt index 5c79fe389..43607df89 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/TerminalSimulator.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/TerminalSimulator.kt @@ -1,6 +1,5 @@ package me.odinmain.features.impl.floor7 -import me.odinmain.features.Category import me.odinmain.features.Module import me.odinmain.features.impl.floor7.p3.TerminalTypes import me.odinmain.features.impl.floor7.p3.termsim.* diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/TickTimers.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/TickTimers.kt index a0d60d20a..21ff823fb 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/TickTimers.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/TickTimers.kt @@ -1,13 +1,8 @@ package me.odinmain.features.impl.floor7 import me.odinmain.events.impl.ServerTickEvent -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.HudSetting -import me.odinmain.utils.render.Color -import me.odinmain.utils.render.mcTextAndWidth import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.* @@ -27,28 +22,28 @@ object TickTimers : Module( private var necronTime: Byte = -1 - private val goldorHud by HudSetting("Goldor Hud", 10f, 10f, 1f, true) { + /*private val goldorHud by HudSetting("Goldor Hud", 10f, 10f, 1f, true) { if (it) mcTextAndWidth(formatTimer(35, 60, "§7Tick:"), 1f, 1f, 2, Color.DARK_RED, shadow = true ,center = false) * 2 + 2f to 16f else if ((goldorStartTime >= 0 && startTimer) || goldorTickTime >= 0) { val (prefix: String, time: Int, max: Int) = if (goldorStartTime >= 0 && startTimer) Triple("§aStart:", goldorStartTime, 104) else Triple("§7Tick:", goldorTickTime, 60) mcTextAndWidth(formatTimer(time, max, prefix), 1f, 1f, 2, Color.DARK_RED, shadow = true ,center = false) * 2 + 2f to 16f } else 0f to 0f - } - private val startTimer: Boolean by BooleanSetting("Start timer", default = false, description = "Displays a timer counting down until devices/terms are able to be activated/completed.").withDependency { goldorHud.enabled } + }*/ + private val startTimer: Boolean by BooleanSetting("Start timer", default = false, description = "Displays a timer counting down until devices/terms are able to be activated/completed.")/*.withDependency { goldorHud.enabled }*/ private var goldorTickTime: Int = -1 private var goldorStartTime: Int = -1 - private val stormHud by HudSetting("Storm Pad Hud", 10f, 10f, 1f, true) { + /*private val stormHud by HudSetting("Storm Pad Hud", 10f, 10f, 1f, true) { if (it) mcTextAndWidth(formatTimer(15, 20, "§bPad:"), 1f, 1f, 2, Color.DARK_RED, shadow = true ,center = false) * 2 + 2f to 16f else if (padTickTime >= 0) mcTextAndWidth(formatTimer(padTickTime, 20, "§bPad:"), 1f, 1f, 2, Color.DARK_RED, shadow = true ,center = false) * 2 + 2f to 16f else 0f to 0f - } + }*/ private var padTickTime: Int = -1 init { - onMessage(Regex("\\[BOSS] Necron: I'm afraid, your journey ends now\\."), { enabled && necronHud.enabled }) { necronTime = 60 } + /* onMessage(Regex("\\[BOSS] Necron: I'm afraid, your journey ends now\\."), { enabled && necronHud.enabled }) { necronTime = 60 } onMessage(Regex("\\[BOSS] Goldor: Who dares trespass into my domain\\?"), { enabled && goldorHud.enabled }) { goldorTickTime = 60 } onMessage(Regex("The Core entrance is opening!"), { enabled && goldorHud.enabled }) { @@ -68,17 +63,17 @@ object TickTimers : Module( goldorTickTime = -1 goldorStartTime = -1 padTickTime = -1 - } + }*/ } @SubscribeEvent fun onServerTick(event: ServerTickEvent) { - if (necronTime >= 0 && necronHud.enabled) necronTime-- + /* if (necronTime >= 0 && necronHud.enabled) necronTime-- if (padTickTime >= 0 && stormHud.enabled) padTickTime-- if (padTickTime == 0 && stormHud.enabled) padTickTime = 20 if (goldorTickTime >= 0 && goldorHud.enabled) goldorTickTime-- if (goldorStartTime >= 0 && goldorHud.enabled) goldorStartTime-- - if (goldorTickTime == 0 && goldorStartTime <= 0 && goldorHud.enabled) { goldorTickTime = 60 } + if (goldorTickTime == 0 && goldorStartTime <= 0 && goldorHud.enabled) { goldorTickTime = 60 }*/ } private fun formatTimer(time: Int, max: Int, prefix: String): String { diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragonEnum.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragonEnum.kt index d865d50f5..f9a998390 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragonEnum.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragonEnum.kt @@ -16,12 +16,14 @@ import me.odinmain.features.impl.floor7.WitherDragons.sendSpawning import me.odinmain.features.impl.floor7.WitherDragons.sendTime import me.odinmain.features.impl.skyblock.ArrowHit.onDragonSpawn import me.odinmain.features.impl.skyblock.ArrowHit.resetOnDragons -import me.odinmain.utils.render.Color import me.odinmain.utils.skyblock.PersonalBest import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.ui.Colors import net.minecraft.entity.boss.EntityDragon import net.minecraft.network.play.server.S2APacketParticles -import net.minecraft.util.* +import net.minecraft.util.AxisAlignedBB +import net.minecraft.util.EnumParticleTypes +import net.minecraft.util.Vec3 enum class WitherDragonsEnum ( val spawnPos: Vec3, @@ -41,13 +43,13 @@ enum class WitherDragonsEnum ( ) { Red( Vec3(27.0, 14.0, 59.0), AxisAlignedBB(14.5, 13.0, 45.5, 39.5, 28.0, 70.5), 'c', Color.RED, 24.0..30.0, 56.0..62.0, skipKillTime = 50), - Orange(Vec3(85.0, 14.0, 56.0), AxisAlignedBB(72.0, 8.0, 47.0, 102.0,28.0, 77.0), '6', Color.ORANGE,82.0..88.0, 53.0..59.0, skipKillTime = 62), + Orange(Vec3(85.0, 14.0, 56.0), AxisAlignedBB(72.0, 8.0, 47.0, 102.0,28.0, 77.0), '6', Colors.MINECRAFT_GOLD,82.0..88.0, 53.0..59.0, skipKillTime = 62), Green( Vec3(27.0, 14.0, 94.0), AxisAlignedBB(7.0, 8.0, 80.0, 37.0, 28.0, 110.0), 'a', Color.GREEN, 23.0..29.0, 91.0..97.0, skipKillTime = 52), Blue( Vec3(84.0, 14.0, 94.0), AxisAlignedBB(71.5, 16.0, 82.5, 96.5, 26.0, 107.5), 'b', Color.BLUE, 82.0..88.0, 91.0..97.0, skipKillTime = 39), - Purple(Vec3(56.0, 14.0, 125.0), AxisAlignedBB(45.5, 13.0, 113.5,68.5, 23.0, 136.5), '5', Color.PURPLE,53.0..59.0, 122.0..128.0, skipKillTime = 38), + Purple(Vec3(56.0, 14.0, 125.0), AxisAlignedBB(45.5, 13.0, 113.5,68.5, 23.0, 136.5), '5', Colors.MINECRAFT_DARK_PURPLE,53.0..59.0, 122.0..128.0, skipKillTime = 38), None( Vec3(0.0, 0.0, 0.0), AxisAlignedBB(0.0, 0.0, 0.0, 0.0, 0.0, 0.0), 'f', Color.WHITE, 0.0..0.0, 0.0..0.0); diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragons.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragons.kt index 1b4ce3f30..0f154d540 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragons.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/WitherDragons.kt @@ -1,7 +1,8 @@ package me.odinmain.features.impl.floor7 +import com.github.stivais.aurora.color.Color +import com.github.stivais.aurora.utils.withAlpha import me.odinmain.events.impl.ServerTickEvent -import me.odinmain.features.Category import me.odinmain.features.Module import me.odinmain.features.impl.floor7.DragonCheck.dragonSpawn import me.odinmain.features.impl.floor7.DragonCheck.dragonSprayed @@ -11,11 +12,13 @@ import me.odinmain.features.impl.floor7.KingRelics.relicsBlockPlace import me.odinmain.features.impl.floor7.KingRelics.relicsOnMessage import me.odinmain.features.impl.floor7.KingRelics.relicsOnWorldLast 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.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.DropdownSetting +import me.odinmain.features.settings.impl.NumberSetting +import me.odinmain.features.settings.impl.SelectorSetting import me.odinmain.utils.addVec -import me.odinmain.utils.render.* import me.odinmain.utils.render.RenderUtils.renderVec +import me.odinmain.utils.render.Renderer import me.odinmain.utils.runIn import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.M7Phases diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/ArrowAlign.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/ArrowAlign.kt index 2683a05dd..54820e73b 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/ArrowAlign.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/ArrowAlign.kt @@ -4,8 +4,9 @@ import com.github.stivais.aurora.color.Color import me.odinmain.events.impl.PacketEvent import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting -import me.odinmain.utils.* -import me.odinmain.utils.render.Color +import me.odinmain.utils.addVec +import me.odinmain.utils.distanceSquaredTo +import me.odinmain.utils.flooredVec import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.M7Phases @@ -15,9 +16,6 @@ import net.minecraft.network.play.client.C02PacketUseEntity import net.minecraft.util.Vec3 import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import kotlin.collections.component1 -import kotlin.collections.component2 -import kotlin.collections.set object ArrowAlign : Module( name = "Arrow Align", diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSolver.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSolver.kt index f26288991..22a4ffe68 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSolver.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSolver.kt @@ -3,30 +3,29 @@ package me.odinmain.features.impl.floor7.p3 import com.github.stivais.aurora.color.Color import com.github.stivais.aurora.utils.withAlpha import io.github.moulberry.notenoughupdates.NEUApi -import me.odinmain.events.impl.* -import me.odinmain.features.Category +import me.odinmain.events.impl.GuiEvent +import me.odinmain.events.impl.TerminalEvent import me.odinmain.features.Module import me.odinmain.features.impl.floor7.p3.termGUI.CustomTermGui import me.odinmain.features.settings.AlwaysActive import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.* -import me.odinmain.ui.clickgui.util.ColorUtil -import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha -import me.odinmain.ui.util.MouseUtils import me.odinmain.utils.equalsOneOf import me.odinmain.utils.postAndCatch -import me.odinmain.utils.render.* import me.odinmain.utils.skyblock.PlayerUtils import me.odinmain.utils.skyblock.PlayerUtils.windowClick import me.odinmain.utils.skyblock.modMessage import me.odinmain.utils.skyblock.unformattedName +import me.odinmain.utils.ui.Colors import net.minecraft.client.gui.Gui import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.client.renderer.GlStateManager import net.minecraft.entity.player.InventoryPlayer import net.minecraft.inventory.ContainerChest import net.minecraft.inventory.ContainerPlayer -import net.minecraft.item.* +import net.minecraft.item.EnumDyeColor +import net.minecraft.item.Item +import net.minecraft.item.ItemStack import net.minecraft.network.play.server.S2FPacketSetSlot import net.minecraftforge.client.event.GuiScreenEvent import net.minecraftforge.event.entity.player.ItemTooltipEvent @@ -226,7 +225,7 @@ object TerminalSolver : Module( val needed = currentTerm.solution.count { it == gui.slotUnderMouse?.slotIndex } if (renderType == 3 && !(currentTerm.type == TerminalTypes.MELODY && cancelMelodySolver)) { - CustomTermGui.mouseClicked(MouseUtils.mouseX.toInt(), MouseUtils.mouseY.toInt(), Mouse.getEventButton()) + //CustomTermGui.mouseClicked(MouseUtils.mouseX.toInt(), MouseUtils.mouseY.toInt(), Mouse.getEventButton()) event.isCanceled = true return } @@ -252,7 +251,7 @@ object TerminalSolver : Module( fun onGuiKeyPress(event: GuiScreenEvent.KeyboardInputEvent.Pre) { if (!enabled || currentTerm.type == TerminalTypes.NONE || (currentTerm.type == TerminalTypes.MELODY && cancelMelodySolver)) return if (renderType == 3 && (Keyboard.isKeyDown(mc.gameSettings.keyBindDrop.keyCode) || Keyboard.getEventKey() in 2..10)) { - CustomTermGui.mouseClicked(MouseUtils.mouseX.toInt(), MouseUtils.mouseY.toInt(), if (Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(mc.gameSettings.keyBindDrop.keyCode)) 1 else 0) + //CustomTermGui.mouseClicked(MouseUtils.mouseX.toInt(), MouseUtils.mouseY.toInt(), if (Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(mc.gameSettings.keyBindDrop.keyCode)) 1 else 0) event.isCanceled = true } } diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSounds.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSounds.kt index f52eb48e9..009f0ddfc 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSounds.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSounds.kt @@ -1,6 +1,8 @@ package me.odinmain.features.impl.floor7.p3 -import me.odinmain.events.impl.* +import me.odinmain.events.impl.GuiEvent +import me.odinmain.events.impl.PacketEvent +import me.odinmain.events.impl.TerminalEvent import me.odinmain.features.Module import me.odinmain.features.impl.floor7.p3.TerminalSolver.currentTerm import me.odinmain.features.settings.Setting.Companion.withDependency diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalTimes.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalTimes.kt index 37afbc92f..7a772f829 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalTimes.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalTimes.kt @@ -1,9 +1,11 @@ package me.odinmain.features.impl.floor7.p3 -import me.odinmain.events.impl.* +import me.odinmain.events.impl.ServerTickEvent +import me.odinmain.events.impl.TerminalEvent import me.odinmain.features.Module import me.odinmain.features.impl.floor7.p3.termsim.TermSimGui -import me.odinmain.features.settings.impl.* +import me.odinmain.features.settings.impl.ActionSetting +import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.utils.noControlCodes import me.odinmain.utils.skyblock.PersonalBest import me.odinmain.utils.skyblock.modMessage diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/termsim/TermSimGui.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/termsim/TermSimGui.kt index e2b4843bf..0e38b1c83 100644 --- a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/termsim/TermSimGui.kt +++ b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/termsim/TermSimGui.kt @@ -6,16 +6,20 @@ import me.odinmain.events.impl.GuiEvent import me.odinmain.events.impl.PacketEvent import me.odinmain.features.impl.floor7.TerminalSimulator import me.odinmain.features.impl.floor7.TerminalSimulator.openRandomTerminal -import me.odinmain.features.impl.floor7.TerminalSimulator.sendOnlyPB +import me.odinmain.features.impl.floor7.TerminalSimulator.sendMessage import me.odinmain.features.impl.floor7.p3.TerminalSounds import me.odinmain.features.impl.floor7.p3.TerminalSounds.completeSounds import me.odinmain.features.impl.floor7.p3.TerminalSounds.playCompleteSound -import me.odinmain.utils.* +import me.odinmain.utils.postAndCatch +import me.odinmain.utils.runIn import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.entity.player.InventoryPlayer -import net.minecraft.inventory.* -import net.minecraft.item.* +import net.minecraft.inventory.ContainerChest +import net.minecraft.inventory.InventoryBasic +import net.minecraft.inventory.Slot +import net.minecraft.item.Item +import net.minecraft.item.ItemStack import net.minecraft.network.play.client.C0EPacketClickWindow import net.minecraft.network.play.server.S2FPacketSetSlot import net.minecraftforge.common.MinecraftForge diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/BlazeAttunement.kt b/src/main/kotlin/me/odinmain/features/impl/nether/BlazeAttunement.kt index 9896336e5..85d04d539 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/BlazeAttunement.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/BlazeAttunement.kt @@ -17,7 +17,6 @@ import net.minecraft.entity.monster.EntityBlaze import net.minecraft.entity.monster.EntityPigZombie import net.minecraft.entity.monster.EntitySkeleton import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import kotlin.collections.set object BlazeAttunement : Module( name = "Blaze Attunement", diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/EnrageDisplay.kt b/src/main/kotlin/me/odinmain/features/impl/nether/EnrageDisplay.kt index 524cf29a6..55b1ca34c 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/EnrageDisplay.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/EnrageDisplay.kt @@ -3,8 +3,8 @@ package me.odinmain.features.impl.nether import com.github.stivais.aurora.animations.Animation import com.github.stivais.aurora.dsl.seconds import com.github.stivais.aurora.transforms.impl.Alpha -import me.odinmain.events.impl.PacketReceivedEvent -import me.odinmain.events.impl.RealServerTick +import me.odinmain.events.impl.PacketEvent +import me.odinmain.events.impl.ServerTickEvent import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.features.settings.impl.SelectorSetting @@ -45,7 +45,7 @@ object EnrageDisplay : Module( private var enrageTimer = -1 @SubscribeEvent - fun onPacket(event: PacketReceivedEvent) { + fun onPacket(event: PacketEvent.Receive) { val packet = event.packet as? S29PacketSoundEffect ?: return if (packet.soundName == "mob.zombie.remedy" && packet.pitch == 1.0f && packet.volume == 0.5f) { if ( @@ -60,7 +60,7 @@ object EnrageDisplay : Module( } @SubscribeEvent - fun onTick(event: RealServerTick) { + fun onTick(event: ServerTickEvent) { enrageTimer-- if (enrageTimer == 0) { animation.animate(0.25.seconds, Animation.Style.EaseOutQuint) diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/KuudraDisplay.kt b/src/main/kotlin/me/odinmain/features/impl/nether/KuudraDisplay.kt index e1ddb4c6a..87c5868ad 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/KuudraDisplay.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/KuudraDisplay.kt @@ -5,13 +5,10 @@ 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.ColorSetting -import me.odinmain.features.settings.impl.HudSetting import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.utils.addVec import me.odinmain.utils.render.RenderUtils.renderBoundingBox import me.odinmain.utils.render.Renderer -import me.odinmain.utils.render.getMCTextWidth -import me.odinmain.utils.render.mcText import me.odinmain.utils.round import me.odinmain.utils.skyblock.KuudraUtils import me.odinmain.utils.skyblock.KuudraUtils.kuudraEntity diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/KuudraReminders.kt b/src/main/kotlin/me/odinmain/features/impl/nether/KuudraReminders.kt index 58b05c593..8e4dee95d 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/KuudraReminders.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/KuudraReminders.kt @@ -7,7 +7,6 @@ import me.odinmain.utils.isOtherPlayer import me.odinmain.utils.skyblock.KuudraUtils import me.odinmain.utils.skyblock.PlayerUtils import me.odinmain.utils.skyblock.partyMessage -import net.minecraftforge.event.world.NoteBlockEvent.Play object KuudraReminders : Module( name = "Kuudra Reminders", diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/NoPre.kt b/src/main/kotlin/me/odinmain/features/impl/nether/NoPre.kt index e8d00b43f..dc7758faf 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/NoPre.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/NoPre.kt @@ -4,9 +4,11 @@ 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.skyblock.* import me.odinmain.utils.skyblock.KuudraUtils.SupplyPickUpSpot import me.odinmain.utils.skyblock.KuudraUtils.giantZombies +import me.odinmain.utils.skyblock.PlayerUtils +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.partyMessage import net.minecraft.util.Vec3 object NoPre : Module( diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/RemovePerks.kt b/src/main/kotlin/me/odinmain/features/impl/nether/RemovePerks.kt index c055afc13..c5a89af0f 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/RemovePerks.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/RemovePerks.kt @@ -8,7 +8,6 @@ import me.odinmain.utils.equalsOneOf import me.odinmain.utils.name import me.odinmain.utils.skyblock.unformattedName import net.minecraft.client.gui.inventory.GuiChest -import net.minecraft.inventory.ContainerChest import net.minecraftforge.client.event.GuiScreenEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.lwjgl.input.Mouse diff --git a/src/main/kotlin/me/odinmain/features/impl/nether/VanqNotifier.kt b/src/main/kotlin/me/odinmain/features/impl/nether/VanqNotifier.kt index a27577737..85556c6c8 100644 --- a/src/main/kotlin/me/odinmain/features/impl/nether/VanqNotifier.kt +++ b/src/main/kotlin/me/odinmain/features/impl/nether/VanqNotifier.kt @@ -2,7 +2,10 @@ package me.odinmain.features.impl.nether import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting -import me.odinmain.utils.skyblock.* +import me.odinmain.utils.skyblock.PlayerUtils +import me.odinmain.utils.skyblock.allMessage +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.partyMessage object VanqNotifier: Module( name = "Vanq Notifier", diff --git a/src/main/kotlin/me/odinmain/features/impl/render/Animations.kt b/src/main/kotlin/me/odinmain/features/impl/render/Animations.kt index 3112a34ea..21e802baa 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/Animations.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/Animations.kt @@ -1,13 +1,17 @@ package me.odinmain.features.impl.render import me.odinmain.features.Module -import me.odinmain.features.settings.impl.* +import me.odinmain.features.settings.impl.ActionSetting +import me.odinmain.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.utils.skyblock.isHolding import net.minecraft.client.renderer.GlStateManager import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent -import kotlin.math.* +import kotlin.math.exp +import kotlin.math.sin +import kotlin.math.sqrt /** * Parts taken from [Floppa Client](https://github.com/FloppaCoding/FloppaClient) diff --git a/src/main/kotlin/me/odinmain/features/impl/render/BPSDisplay.kt b/src/main/kotlin/me/odinmain/features/impl/render/BPSDisplay.kt index 45f913c24..5ef7e19b4 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/BPSDisplay.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/BPSDisplay.kt @@ -1,6 +1,6 @@ package me.odinmain.features.impl.render -import me.odinmain.events.impl.PacketSentEvent +import me.odinmain.events.impl.PacketEvent import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.utils.round @@ -36,7 +36,7 @@ object BPSDisplay : Module( private var lastBrokenBlock = 0L @SubscribeEvent - fun onPacket(event: PacketSentEvent) { + fun onPacket(event: PacketEvent.Receive) { val packet = event.packet as? PacketPlayerDigging ?: return if (packet.status != START_DESTROY_BLOCK) return if (startTime == 0L) startTime = System.currentTimeMillis() diff --git a/src/main/kotlin/me/odinmain/features/impl/render/CPSDisplay.kt b/src/main/kotlin/me/odinmain/features/impl/render/CPSDisplay.kt index 5ed03bcb1..49762d700 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/CPSDisplay.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/CPSDisplay.kt @@ -1,7 +1,7 @@ package me.odinmain.features.impl.render import com.github.stivais.aurora.color.Color -import me.odinmain.events.impl.PacketSentEvent +import me.odinmain.events.impl.PacketEvent import me.odinmain.features.Module import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.BooleanSetting @@ -30,22 +30,18 @@ object CPSDisplay : Module( @SubscribeEvent fun onTick(event: ClientTickEvent) { - if (leftClicks.size != 0 && System.currentTimeMillis() - leftClicks.first() > 1000) { + if (leftClicks.isNotEmpty() && System.currentTimeMillis() - leftClicks.first() > 1000) { leftClicks.removeFirst() } - if (rightClicks.size != 0 && System.currentTimeMillis() - rightClicks.first() > 1000) { + if (rightClicks.isNotEmpty() && System.currentTimeMillis() - rightClicks.first() > 1000) { rightClicks.removeFirst() } } @SubscribeEvent - fun onPacket(event: PacketSentEvent) { + fun onPacket(event: PacketEvent.Send) { if (event.packet !is C08PacketPlayerBlockPlacement) return - if (countPackets) { - if (rightClicks.size == 0 || System.currentTimeMillis() - rightClicks.last() > 5) { - onRightClick() - } - } + if (countPackets && rightClicks.isEmpty() || System.currentTimeMillis() - rightClicks.last() > 5) onRightClick() } @JvmStatic diff --git a/src/main/kotlin/me/odinmain/features/impl/render/DVD.kt b/src/main/kotlin/me/odinmain/features/impl/render/DVD.kt index f5e5034bc..d9c51d3aa 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/DVD.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/DVD.kt @@ -5,11 +5,7 @@ import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.features.settings.impl.StringSetting -import me.odinmain.utils.render.Color import me.odinmain.utils.render.RenderUtils.bind -import me.odinmain.utils.render.getMCTextHeight -import me.odinmain.utils.render.mcText -import me.odinmain.utils.render.roundedRectangle import me.odinmain.utils.skyblock.PlayerUtils import me.odinmain.utils.skyblock.modMessage import net.minecraft.client.gui.ScaledResolution @@ -59,8 +55,8 @@ object DVD : Module( @SubscribeEvent fun onRenderOverlay(event: RenderGameOverlayEvent.Post) { if (event.type != RenderGameOverlayEvent.ElementType.ALL) return - roundedRectangle(x, y, boxWidth, boxHeight, color, if (roundedCorners) 12f else 0f) - mcText(text, x + boxWidth / 2, y + boxHeight / 2 - getMCTextHeight() * textScale / 2 , textScale, color, true) + /*roundedRectangle(x, y, boxWidth, boxHeight, color, if (roundedCorners) 12f else 0f) + mcText(text, x + boxWidth / 2, y + boxHeight / 2 - getMCTextHeight() * textScale / 2 , textScale, color, true)*/ Color.WHITE.bind() } diff --git a/src/main/kotlin/me/odinmain/features/impl/render/DevPlayers.kt b/src/main/kotlin/me/odinmain/features/impl/render/DevPlayers.kt index bca14a29b..fb0810585 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/DevPlayers.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/DevPlayers.kt @@ -4,8 +4,12 @@ import com.github.stivais.aurora.color.Color import com.github.stivais.aurora.utils.blue import com.github.stivais.aurora.utils.green import com.github.stivais.aurora.utils.red -import com.google.gson.* -import kotlinx.coroutines.* +import com.google.gson.GsonBuilder +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.runBlocking import me.odinmain.OdinMain.mc import me.odinmain.OdinMain.scope import me.odinmain.features.impl.render.ClickGUI.devSize diff --git a/src/main/kotlin/me/odinmain/features/impl/render/NameChanger.kt b/src/main/kotlin/me/odinmain/features/impl/render/NameChanger.kt index df191b1f8..08367dd67 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/NameChanger.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/NameChanger.kt @@ -1,6 +1,6 @@ package me.odinmain.features.impl.render -import me.odinmain.features.* +import me.odinmain.features.Module import me.odinmain.features.settings.impl.StringSetting /** diff --git a/src/main/kotlin/me/odinmain/features/impl/render/Sidebar.kt b/src/main/kotlin/me/odinmain/features/impl/render/Sidebar.kt index 41c8d658d..f0baa338e 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/Sidebar.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/Sidebar.kt @@ -1,17 +1,9 @@ package me.odinmain.features.impl.render -import me.odinmain.features.Category import me.odinmain.features.Module -import me.odinmain.features.settings.impl.* -import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha -import me.odinmain.utils.render.* -import me.odinmain.utils.render.RenderUtils.bind -import net.minecraft.client.gui.Gui.drawRect +import me.odinmain.features.settings.impl.BooleanSetting import net.minecraft.client.gui.ScaledResolution -import net.minecraft.client.renderer.GlStateManager -import net.minecraft.scoreboard.* -import net.minecraft.util.EnumChatFormatting -import kotlin.math.max +import net.minecraft.scoreboard.ScoreObjective object Sidebar : Module( name = "Sidebar", @@ -64,7 +56,7 @@ object Sidebar : Module( return this.enabled } - private fun drawString(str: String, x: Int, y: Int) { + /*private fun drawString(str: String, x: Int, y: Int) { if (customFont) text(str, x - 1, y + 3, Color.WHITE, 7, shadow = textShadow) else @@ -73,5 +65,5 @@ object Sidebar : Module( private fun getStringWidth(str: String): Int { return if (customFont) (getTextWidth(str, 7f) * 1.5).toInt() else mc.fontRendererObj.getStringWidth(str) - } + }*/ } \ No newline at end of file diff --git a/src/main/kotlin/me/odinmain/features/impl/render/SpaceHelmet.kt b/src/main/kotlin/me/odinmain/features/impl/render/SpaceHelmet.kt index 1762fdc21..d73f283a6 100644 --- a/src/main/kotlin/me/odinmain/features/impl/render/SpaceHelmet.kt +++ b/src/main/kotlin/me/odinmain/features/impl/render/SpaceHelmet.kt @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack import java.time.LocalDateTime import java.time.Month import java.time.format.TextStyle -import java.util.Locale +import java.util.* object SpaceHelmet : Module( name = "Space Helmet", diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/AbilityTimers.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/AbilityTimers.kt index a9a11dbd5..cf390f71a 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/AbilityTimers.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/AbilityTimers.kt @@ -1,19 +1,8 @@ package me.odinmain.features.impl.skyblock -import me.odinmain.events.impl.RealServerTick -import me.odinmain.features.Category +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.BooleanSetting -import me.odinmain.features.settings.impl.HudSetting -import me.odinmain.ui.hud.HudElement -import me.odinmain.utils.render.Color -import me.odinmain.utils.render.mcText -import me.odinmain.utils.render.mcTextAndWidth -import me.odinmain.utils.skyblock.LocationUtils -import me.odinmain.utils.skyblock.isHolding -import me.odinmain.utils.skyblock.skyblockID -import net.minecraft.network.play.server.S29PacketSoundEffect import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.* import kotlin.math.ceil @@ -22,14 +11,14 @@ object AbilityTimers : Module( name = "Ability Timers", description = "Various Timers for various items.", ) { - private val witherHud: HudElement by HudSetting("Wither Impact Hud", 10f, 10f, 1f, true) { + /*private val witherHud: HudElement by HudSetting("Wither Impact Hud", 10f, 10f, 1f, true) { if (witherImpactTicks <= 0 && (hideWhenDone || !LocationUtils.isInSkyblock) && !it) return@HudSetting 0f to 0f val width = if (compact) 6f else 65f mcText(witherImpactText, width/2f, 0f, 1f, Color.WHITE, shadow = true) width to 10f - } - private val compact: Boolean by BooleanSetting("Compact Mode", default = true, description = "Compacts the Hud to just one character wide.").withDependency { witherHud.enabled } - private val hideWhenDone: Boolean by BooleanSetting("Hide When Ready", default = true, description = "Hides the hud when the cooldown is over.").withDependency { witherHud.enabled } + }*/ + private val compact: Boolean by BooleanSetting("Compact Mode", default = true, description = "Compacts the Hud to just one character wide.")//.withDependency { witherHud.enabled } + private val hideWhenDone: Boolean by BooleanSetting("Hide When Ready", default = true, description = "Hides the hud when the cooldown is over.")//.withDependency { witherHud.enabled } /*private val tacHud by HudSetting("Tactical Insertion Hud", 10f, 10f, 1f, true) { if (tacTimer == 0 && !it) return@HudSetting 0f to 0f @@ -46,7 +35,7 @@ object AbilityTimers : Module( private var enrageTimer = 0 init { - onPacket(S29PacketSoundEffect::class.java) { + /*onPacket(S29PacketSoundEffect::class.java) { when { it.soundName == "mob.zombie.remedy" && it.pitch == 0.6984127f && it.volume == 1f && witherHud.enabled && witherImpactTicks != -1 -> witherImpactTicks = 100 it.soundName == "fire.ignite" && it.pitch == 0.74603176f && it.volume == 1f && isHolding("TACTICAL_INSERTION") && tacHud.enabled -> tacTimer = 60 @@ -59,7 +48,7 @@ object AbilityTimers : Module( onPacket(C08PacketPlayerBlockPlacement::class.java) { if (mc.thePlayer?.heldItem?.skyblockID?.equalsOneOf("ASTRAEA", "HYPERION", "VALKYRIE", "SCYLLA", "NECRON_BLADE") == false || witherImpactTicks != -1) return@onPacket witherImpactTicks = 0 - } + }*/ onWorldLoad { witherImpactTicks = -1 @@ -84,8 +73,8 @@ object AbilityTimers : Module( @SubscribeEvent fun onServerTick(event: ServerTickEvent) { - if (witherImpactTicks > 0 && witherHud.enabled) witherImpactTicks-- + /*if (witherImpactTicks > 0 && witherHud.enabled) witherImpactTicks-- if (tacTimer > 0 && tacHud.enabled) tacTimer-- - if (enrageTimer > 0 && enrageHud.enabled) enrageTimer-- + if (enrageTimer > 0 && enrageHud.enabled) enrageTimer--*/ } } \ No newline at end of file diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/ArrowHit.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/ArrowHit.kt index 9b39cfa22..30cbaf755 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/ArrowHit.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/ArrowHit.kt @@ -1,7 +1,8 @@ package me.odinmain.features.impl.skyblock import me.odinmain.features.Module -import me.odinmain.features.settings.impl.* +import me.odinmain.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.StringSetting import net.minecraft.network.play.server.S29PacketSoundEffect object ArrowHit : Module( diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/ChatCommands.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/ChatCommands.kt index 7f6c63eb2..fb50cab07 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/ChatCommands.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/ChatCommands.kt @@ -3,6 +3,7 @@ package me.odinmain.features.impl.skyblock import me.odinmain.events.impl.MessageSentEvent import me.odinmain.features.Module import me.odinmain.features.impl.dungeon.DungeonRequeue.disableRequeue +import me.odinmain.features.impl.render.ServerHud import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.features.settings.impl.DropdownSetting @@ -110,7 +111,7 @@ object ChatCommands : Module( "racism" -> if (racism) channelMessage("$name is ${Random.nextInt(1, 101)}% racist. Racism is not allowed!", name, channel) "ping" -> if (ping) channelMessage("Current Ping: ${floor(ServerUtils.averagePing).toInt()}ms", name, channel) "tps" -> if (tps) channelMessage("Current TPS: ${ServerUtils.averageTps.floor()}", name, channel) - "fps" -> if (fps) channelMessage("Current FPS: ${ServerUtils.fps}", name, channel) + "fps" -> if (fps) channelMessage("Current FPS: ${ServerHud.getFPS()}", name, channel) "time" -> if (time) channelMessage("Current Time: ${ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss z"))}", name, channel) "location" -> if (location) channelMessage("Current Location: ${LocationUtils.currentArea.displayName}", name, channel) "holding" -> if (holding) channelMessage("Holding: ${mc.thePlayer?.heldItem?.displayName?.noControlCodes ?: "Nothing :("}", name, channel) diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/DianaHelper.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/DianaHelper.kt index d9b388f90..353400709 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/DianaHelper.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/DianaHelper.kt @@ -7,11 +7,9 @@ import me.odinmain.events.impl.ClickEvent 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.addVec import me.odinmain.utils.clock.Clock import me.odinmain.utils.findNearestGrassBlock -import me.odinmain.utils.render.Color import me.odinmain.utils.render.Renderer import me.odinmain.utils.runIn import me.odinmain.utils.skyblock.* diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/FarmKeys.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/FarmKeys.kt index fc5069c2a..6f36f1cdf 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/FarmKeys.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/FarmKeys.kt @@ -1,7 +1,8 @@ package me.odinmain.features.impl.skyblock import me.odinmain.features.Module -import me.odinmain.features.settings.impl.* +import me.odinmain.features.settings.impl.KeybindSetting +import me.odinmain.features.settings.impl.NumberSetting import net.minecraft.client.settings.KeyBinding import org.lwjgl.input.Keyboard diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/InvincibilityTimer.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/InvincibilityTimer.kt index b619b6c1f..ae84171be 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/InvincibilityTimer.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/InvincibilityTimer.kt @@ -3,11 +3,9 @@ package me.odinmain.features.impl.skyblock import me.odinmain.events.impl.ChatPacketEvent import me.odinmain.events.impl.GuiEvent.DrawSlotOverlayEvent import me.odinmain.events.impl.ServerTickEvent -import me.odinmain.features.Category import me.odinmain.features.Module import me.odinmain.features.settings.impl.BooleanSetting -import me.odinmain.features.settings.impl.HudSetting -import me.odinmain.utils.render.* +import me.odinmain.utils.render.RenderUtils import me.odinmain.utils.skyblock.LocationUtils import me.odinmain.utils.skyblock.partyMessage import me.odinmain.utils.skyblock.skyblockID diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/ItemsHighlight.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/ItemsHighlight.kt index a9ff698fe..aca009ed8 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/ItemsHighlight.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/ItemsHighlight.kt @@ -8,15 +8,14 @@ import me.odinmain.features.settings.impl.BooleanSetting import me.odinmain.features.settings.impl.ColorSetting import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.features.settings.impl.SelectorSetting -import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha import me.odinmain.utils.containsOneOf -import me.odinmain.utils.render.Color import me.odinmain.utils.render.HighlightRenderer import me.odinmain.utils.render.Renderer import me.odinmain.utils.skyblock.dungeon.DungeonUtils.dungeonItemDrops import me.odinmain.utils.skyblock.getRarity import me.odinmain.utils.skyblock.lore import me.odinmain.utils.skyblock.unformattedName +import me.odinmain.utils.ui.Colors import net.minecraft.entity.item.EntityItem object ItemsHighlight : Module( @@ -54,7 +53,7 @@ object ItemsHighlight : Module( return when (colorStyle){ 0 -> getRarity(entity.entityItem.lore)?.color?.withAlpha(rarityAlpha) ?: Color.WHITE 1 -> when { - entity.ticksExisted <= 11 -> Color.YELLOW + entity.ticksExisted <= 11 -> Colors.MINECRAFT_YELLOW entity.getDistanceToEntity(mc.thePlayer) <= 3.5 -> Color.GREEN else -> Color.RED } diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/MobSpawn.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/MobSpawn.kt index 90e13f3eb..91a6a1001 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/MobSpawn.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/MobSpawn.kt @@ -2,9 +2,14 @@ package me.odinmain.features.impl.skyblock import me.odinmain.events.impl.PostEntityMetadata import me.odinmain.features.Module -import me.odinmain.features.settings.impl.* +import me.odinmain.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.NumberSetting +import me.odinmain.features.settings.impl.StringSetting import me.odinmain.utils.clock.Clock -import me.odinmain.utils.skyblock.* +import me.odinmain.utils.skyblock.PlayerUtils +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.partyMessage +import me.odinmain.utils.skyblock.sendChatMessage import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object MobSpawn: Module( diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/PetKeybinds.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/PetKeybinds.kt index bfee546d7..c3c05c096 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/PetKeybinds.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/PetKeybinds.kt @@ -1,6 +1,5 @@ package me.odinmain.features.impl.skyblock -import me.odinmain.events.impl.GuiEvent import me.odinmain.features.Module import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.* diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/PlayerDisplay.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/PlayerDisplay.kt index 7eb53ae28..cec1a4909 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/PlayerDisplay.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/PlayerDisplay.kt @@ -2,7 +2,9 @@ package me.odinmain.features.impl.skyblock import me.odinmain.features.Module 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.StringSetting import me.odinmain.utils.skyblock.LocationUtils import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/RagnarokAxe.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/RagnarokAxe.kt index 9f1aa58f8..413026903 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/RagnarokAxe.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/RagnarokAxe.kt @@ -3,11 +3,7 @@ package me.odinmain.features.impl.skyblock import me.odinmain.features.Module import me.odinmain.features.settings.Setting.Companion.withDependency import me.odinmain.features.settings.impl.BooleanSetting -import me.odinmain.utils.skyblock.PlayerUtils -import me.odinmain.utils.skyblock.getSBStrength -import me.odinmain.utils.skyblock.isHolding -import me.odinmain.utils.skyblock.modMessage -import me.odinmain.utils.skyblock.partyMessage +import me.odinmain.utils.skyblock.* import net.minecraft.network.play.server.S29PacketSoundEffect object RagnarokAxe : Module( diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/Splits.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/Splits.kt index 484e1b3d1..1ea864b51 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/Splits.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/Splits.kt @@ -1,7 +1,8 @@ package me.odinmain.features.impl.skyblock import me.odinmain.features.Module -import me.odinmain.features.settings.impl.* +import me.odinmain.features.settings.impl.BooleanSetting +import me.odinmain.features.settings.impl.NumberSetting object Splits : Module( name = "Splits", diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/WardrobeKeybinds.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/WardrobeKeybinds.kt index 96189f8a7..8b0d65e6f 100644 --- a/src/main/kotlin/me/odinmain/features/impl/skyblock/WardrobeKeybinds.kt +++ b/src/main/kotlin/me/odinmain/features/impl/skyblock/WardrobeKeybinds.kt @@ -1,9 +1,11 @@ package me.odinmain.features.impl.skyblock -import me.odinmain.events.impl.GuiEvent import me.odinmain.features.Module 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.KeybindSetting +import me.odinmain.features.settings.impl.NumberSetting import me.odinmain.utils.clock.Clock import me.odinmain.utils.name import me.odinmain.utils.skyblock.getItemIndexInContainerChest diff --git a/src/main/kotlin/me/odinmain/utils/AsyncUtils.kt b/src/main/kotlin/me/odinmain/utils/AsyncUtils.kt index 996ae2979..2fa31620f 100644 --- a/src/main/kotlin/me/odinmain/utils/AsyncUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/AsyncUtils.kt @@ -1,6 +1,9 @@ package me.odinmain.utils -import kotlinx.coroutines.* +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch import net.minecraft.inventory.ContainerChest diff --git a/src/main/kotlin/me/odinmain/utils/ServerUtils.kt b/src/main/kotlin/me/odinmain/utils/ServerUtils.kt index 53b954dd7..0405ae3e0 100644 --- a/src/main/kotlin/me/odinmain/utils/ServerUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/ServerUtils.kt @@ -4,7 +4,6 @@ import me.odinmain.OdinMain.mc import me.odinmain.events.impl.PacketEvent import me.odinmain.utils.clock.Executor import me.odinmain.utils.clock.Executor.Companion.register -import net.minecraft.entity.Entity import net.minecraft.network.Packet import net.minecraft.network.play.client.C16PacketClientStatus import net.minecraft.network.play.server.S01PacketJoinGame diff --git a/src/main/kotlin/me/odinmain/utils/SplitsManager.kt b/src/main/kotlin/me/odinmain/utils/SplitsManager.kt index 8087d6be1..1b66ab54e 100644 --- a/src/main/kotlin/me/odinmain/utils/SplitsManager.kt +++ b/src/main/kotlin/me/odinmain/utils/SplitsManager.kt @@ -3,7 +3,10 @@ package me.odinmain.utils import me.odinmain.events.impl.ChatPacketEvent import me.odinmain.features.impl.skyblock.Splits import me.odinmain.features.impl.skyblock.Splits.sendSplits -import me.odinmain.utils.skyblock.* +import me.odinmain.utils.skyblock.Island +import me.odinmain.utils.skyblock.LocationUtils +import me.odinmain.utils.skyblock.PersonalBest +import me.odinmain.utils.skyblock.modMessage import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/kotlin/me/odinmain/utils/Utils.kt b/src/main/kotlin/me/odinmain/utils/Utils.kt index 9ce1378b7..ceabf229d 100644 --- a/src/main/kotlin/me/odinmain/utils/Utils.kt +++ b/src/main/kotlin/me/odinmain/utils/Utils.kt @@ -7,7 +7,9 @@ import me.odinmain.OdinMain import me.odinmain.OdinMain.logger import me.odinmain.OdinMain.mc import me.odinmain.features.ModuleManager -import me.odinmain.utils.skyblock.* +import me.odinmain.utils.skyblock.modMessage +import me.odinmain.utils.skyblock.sendCommand +import me.odinmain.utils.skyblock.skyblockID import net.minecraft.client.gui.GuiScreen import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase @@ -24,7 +26,9 @@ import net.minecraftforge.fml.common.eventhandler.Event import org.lwjgl.opengl.GL11 import org.lwjgl.util.glu.GLU import java.util.* -import kotlin.math.* +import kotlin.math.floor +import kotlin.math.pow +import kotlin.math.round private val FORMATTING_CODE_PATTERN = Regex("§[0-9a-fk-or]", RegexOption.IGNORE_CASE) diff --git a/src/main/kotlin/me/odinmain/utils/WebUtils.kt b/src/main/kotlin/me/odinmain/utils/WebUtils.kt index 811c4c933..067f68aca 100644 --- a/src/main/kotlin/me/odinmain/utils/WebUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/WebUtils.kt @@ -1,7 +1,9 @@ package me.odinmain.utils import com.google.gson.JsonParser -import kotlinx.coroutines.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.coroutines.withTimeoutOrNull import me.odinmain.OdinMain.logger import me.odinmain.features.impl.render.DevPlayers import java.io.* diff --git a/src/main/kotlin/me/odinmain/utils/render/RenderUtils.kt b/src/main/kotlin/me/odinmain/utils/render/RenderUtils.kt index e796fa35c..35a2370e4 100644 --- a/src/main/kotlin/me/odinmain/utils/render/RenderUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/render/RenderUtils.kt @@ -4,12 +4,10 @@ import com.github.stivais.aurora.color.Color import com.github.stivais.aurora.utils.* import me.odinmain.OdinMain.mc import me.odinmain.features.impl.dungeon.dungeonwaypoints.DungeonWaypoints.DungeonWaypoint -import me.odinmain.ui.clickgui.util.ColorUtil.withAlpha import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.WorldRenderer import net.minecraft.client.renderer.entity.RenderManager -import net.minecraft.client.renderer.texture.TextureUtil import net.minecraft.client.renderer.vertex.DefaultVertexFormats import net.minecraft.entity.Entity import net.minecraft.util.AxisAlignedBB @@ -104,7 +102,7 @@ object RenderUtils { GlStateManager.disableLighting() if (disableTexture2D) GlStateManager.disableTexture2D() else GlStateManager.enableTexture2D() GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0) - translate(-renderManager.viewerPosX, -renderManager.viewerPosY, -renderManager.viewerPosZ) + GlStateManager.translate(-renderManager.viewerPosX, -renderManager.viewerPosY, -renderManager.viewerPosZ) } private fun postDraw() { diff --git a/src/main/kotlin/me/odinmain/utils/render/Renderer.kt b/src/main/kotlin/me/odinmain/utils/render/Renderer.kt index 5bba31087..0d3a4df94 100644 --- a/src/main/kotlin/me/odinmain/utils/render/Renderer.kt +++ b/src/main/kotlin/me/odinmain/utils/render/Renderer.kt @@ -7,7 +7,6 @@ import com.github.stivais.aurora.utils.withAlpha import me.odinmain.OdinMain.mc import me.odinmain.utils.addVec import me.odinmain.utils.fastEyeHeight -import me.odinmain.utils.min import me.odinmain.utils.render.RenderUtils.drawBeaconBeam import me.odinmain.utils.render.RenderUtils.outlineBounds import me.odinmain.utils.render.RenderUtils.renderVec diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/ChatUtils.kt b/src/main/kotlin/me/odinmain/utils/skyblock/ChatUtils.kt index 06d0429f0..915fc63c3 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/ChatUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/ChatUtils.kt @@ -6,8 +6,11 @@ import me.odinmain.features.impl.render.DevPlayers import me.odinmain.features.impl.skyblock.ChatCommands import me.odinmain.utils.noControlCodes import me.odinmain.utils.runOnMCThread -import net.minecraft.event.* -import net.minecraft.util.* +import net.minecraft.event.ClickEvent +import net.minecraft.event.HoverEvent +import net.minecraft.util.ChatComponentText +import net.minecraft.util.ChatStyle +import net.minecraft.util.EnumChatFormatting import net.minecraftforge.client.ClientCommandHandler import kotlin.math.roundToInt diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/DianaBurrowEstimate.kt b/src/main/kotlin/me/odinmain/utils/skyblock/DianaBurrowEstimate.kt index cf5c2a877..cc7ccea60 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/DianaBurrowEstimate.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/DianaBurrowEstimate.kt @@ -3,6 +3,7 @@ package me.odinmain.utils.skyblock import com.github.stivais.aurora.color.Color import me.odinmain.features.impl.skyblock.DianaHelper import me.odinmain.utils.* +import me.odinmain.utils.skyblock.DianaBurrowEstimate.ParticleType.entries import me.odinmain.utils.ui.Colors import net.minecraft.network.play.server.S29PacketSoundEffect import net.minecraft.network.play.server.S2APacketParticles diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/EtherWarpHelper.kt b/src/main/kotlin/me/odinmain/utils/skyblock/EtherWarpHelper.kt index 30199ac4f..e1d382016 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/EtherWarpHelper.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/EtherWarpHelper.kt @@ -5,7 +5,10 @@ import me.odinmain.utils.* import me.odinmain.utils.render.RenderUtils.renderVec import net.minecraft.util.BlockPos import net.minecraft.util.Vec3 -import kotlin.math.* +import kotlin.math.abs +import kotlin.math.floor +import kotlin.math.max +import kotlin.math.sign object EtherWarpHelper { data class EtherPos(val succeeded: Boolean, val pos: BlockPos?) { diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/KuudraUtils.kt b/src/main/kotlin/me/odinmain/utils/skyblock/KuudraUtils.kt index f3e9e215c..221c35447 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/KuudraUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/KuudraUtils.kt @@ -3,9 +3,12 @@ package me.odinmain.utils.skyblock import me.odinmain.OdinMain.mc import me.odinmain.events.impl.ChatPacketEvent import me.odinmain.events.impl.PacketEvent -import me.odinmain.utils.* import me.odinmain.utils.clock.Executor import me.odinmain.utils.clock.Executor.Companion.register +import me.odinmain.utils.equalsOneOf +import me.odinmain.utils.getSBMaxHealth +import me.odinmain.utils.noControlCodes +import me.odinmain.utils.runIn import net.minecraft.entity.item.EntityArmorStand import net.minecraft.entity.monster.EntityGiantZombie import net.minecraft.entity.monster.EntityMagmaCube diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/LocationUtils.kt b/src/main/kotlin/me/odinmain/utils/skyblock/LocationUtils.kt index b26c50ac8..7e7cbf12a 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/LocationUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/LocationUtils.kt @@ -3,9 +3,11 @@ package me.odinmain.utils.skyblock import me.odinmain.OdinMain.mc import me.odinmain.events.impl.PacketEvent import me.odinmain.features.impl.render.ClickGUI -import me.odinmain.utils.* +import me.odinmain.utils.cleanLine +import me.odinmain.utils.cleanSB import me.odinmain.utils.clock.Executor import me.odinmain.utils.clock.Executor.Companion.register +import me.odinmain.utils.sidebarLines import me.odinmain.utils.skyblock.dungeon.Dungeon import me.odinmain.utils.skyblock.dungeon.DungeonUtils import me.odinmain.utils.skyblock.dungeon.Floor diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/Dungeon.kt b/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/Dungeon.kt index cd842add5..2e1a2d6c1 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/Dungeon.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/Dungeon.kt @@ -8,7 +8,6 @@ import me.odinmain.events.impl.PacketEvent import me.odinmain.events.impl.RoomEnterEvent import me.odinmain.features.impl.dungeon.LeapMenu import me.odinmain.features.impl.dungeon.LeapMenu.odinSorting -import me.odinmain.features.impl.dungeon.MapInfo.shownTitle import me.odinmain.features.impl.dungeon.Mimic import me.odinmain.utils.* import me.odinmain.utils.skyblock.PlayerUtils.posX @@ -53,7 +52,7 @@ class Dungeon(val floor: Floor) { paul = hasBonusPaulScore() } - shownTitle = false + //shownTitle = false } fun enterDungeonRoom(event: RoomEnterEvent) { diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/DungeonUtils.kt b/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/DungeonUtils.kt index caf4c5cf4..b746f4f98 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/DungeonUtils.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/DungeonUtils.kt @@ -23,7 +23,9 @@ import net.minecraft.util.Vec3 import net.minecraftforge.event.entity.EntityJoinWorldEvent import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import kotlin.math.* +import kotlin.math.ceil +import kotlin.math.floor +import kotlin.math.roundToLong object DungeonUtils { @@ -181,7 +183,7 @@ object DungeonUtils { } @SubscribeEvent - fun onPacket(event: PacketReceivedEvent) { + fun onPacket(event: PacketEvent.Receive) { if (inDungeons) currentDungeon?.onPacket(event) } diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/tiles/Room.kt b/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/tiles/Room.kt index 07f060c21..276c6c1b0 100644 --- a/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/tiles/Room.kt +++ b/src/main/kotlin/me/odinmain/utils/skyblock/dungeon/tiles/Room.kt @@ -9,7 +9,6 @@ import me.odinmain.utils.Vec2 import net.minecraft.util.BlockPos import net.minecraft.util.Vec3 import java.lang.reflect.Type -import kotlin.collections.orEmpty data class Room( var rotation: Rotations = Rotations.NONE, diff --git a/src/main/kotlin/me/odinmain/utils/ui/screens/UIHandler.kt b/src/main/kotlin/me/odinmain/utils/ui/screens/UIHandler.kt index d8266fcdf..34981f07c 100644 --- a/src/main/kotlin/me/odinmain/utils/ui/screens/UIHandler.kt +++ b/src/main/kotlin/me/odinmain/utils/ui/screens/UIHandler.kt @@ -6,9 +6,11 @@ import me.odinmain.OdinMain.mc import me.odinmain.events.impl.GuiEvent import net.minecraft.client.gui.GuiScreen.getClipboardString import net.minecraft.client.gui.GuiScreen.setClipboardString +import net.minecraftforge.client.event.GuiScreenEvent import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.common.MinecraftForge import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import org.lwjgl.input.Keyboard import org.lwjgl.input.Mouse import org.lwjgl.opengl.Display @@ -47,8 +49,8 @@ class UIHandler(private val ui: AuroraUI): Window { } @SubscribeEvent - fun onMouseClick(event: GuiEvent.GuiMouseClickEvent) { - ui.eventManager.onMouseClick(event.button) + fun onMouseClick(event: GuiScreenEvent.MouseInputEvent.Pre) { + if (Mouse.getEventButtonState()) ui.eventManager.onMouseClick(Mouse.getEventButton()) } @SubscribeEvent @@ -57,8 +59,8 @@ class UIHandler(private val ui: AuroraUI): Window { } @SubscribeEvent - fun onKeyboardClick(event: GuiEvent.GuiKeyPressEvent) { - ui.eventManager.onKeyTyped(event.char) + fun onKeyboardClick(event: GuiScreenEvent.MouseInputEvent.Pre) { + ui.eventManager.onKeyTyped(Keyboard.getEventCharacter()) } override fun getClipboard(): String? {