diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-11-22 12:53:20 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-11-22 12:53:20 +0100 |
| commit | 7137b0a07ba4c4efe65282a18ebc68f25ffa1796 (patch) | |
| tree | ba69ae6e3ba3c758906dfad41b9035af258e923c /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 4ff0a7de8109b748cdaa707e9714478140095171 (diff) | |
| download | skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.tar.gz skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.tar.bz2 skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.zip | |
The cleanup after the cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
3 files changed, 23 insertions, 11 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt index 78cc8684d..9d00958f2 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt @@ -1,18 +1,24 @@ package at.hannibal2.skyhanni.utils data class CachedItemData( - /** -1 = not loaded */ + // -1 = not loaded var petCandies: Int? = -1, - /** "" = not loaded */ + + // "" = not loaded var heldItem: String? = "", - /** -1 = not loaded */ + + // -1 = not loaded var sackInASack: Int? = -1, - /** null = not loaded */ + + // null = not loaded var riftTransferable: Boolean? = null, - /** null = not loaded */ + + // null = not loaded var riftExportable: Boolean? = null, - /** null = not loaded */ + + // null = not loaded var itemRarityLastCheck: Long = 0L, // Cant use SimpleTimeMark here - /** null = not loaded */ + + // null = not loaded var itemRarity: LorenzRarity? = null, ) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt index e8acae501..68f7a0d49 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt @@ -53,9 +53,9 @@ class ParkourHelper( if (visible) { for ((index, location) in locations.withIndex()) { - if (location.offsetCenter() - .distanceToPlayer() < detectionRange && Minecraft.getMinecraft().thePlayer.onGround - ) { + val onGround = Minecraft.getMinecraft().thePlayer.onGround + val closeEnough = location.offsetCenter().distanceToPlayer() < detectionRange + if (closeEnough && onGround) { current = index } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt index 790550103..2576b4248 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt @@ -1,7 +1,13 @@ package at.hannibal2.skyhanni.utils.shader import at.hannibal2.skyhanni.utils.LorenzUtils -import org.lwjgl.opengl.* +import org.lwjgl.opengl.ARBFragmentShader +import org.lwjgl.opengl.ARBShaderObjects +import org.lwjgl.opengl.ARBVertexShader +import org.lwjgl.opengl.ContextCapabilities +import org.lwjgl.opengl.GL11 +import org.lwjgl.opengl.GL20 +import org.lwjgl.opengl.GLContext /** * Class to check shaders support, OpenGL capabilities, and shader helper functions |