Skip to content

Commit d473fb2

Browse files
beanbag44beanbag44
committed
use relocated imgui
1 parent 5823447 commit d473fb2

File tree

20 files changed

+203
-201
lines changed

20 files changed

+203
-201
lines changed

‎build.gradle.kts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ configurations.all {
6767

6868
repositories {
6969
mavenLocal() // Allow the use of local repositories
70+
maven("https://maven.lambda-client.org/releases")
7071
maven("https://maven.2b2t.vc/releases") // Baritone
7172
maven("https://jitpack.io") // KDiscordIPC
7273
maven("https://api.modrinth.com/maven")
@@ -158,11 +159,11 @@ dependencies {
158159
includeLib("com.github.emyfops:KDiscordIPC:$discordIPCVersion")
159160
includeLib("com.pngencoder:pngencoder:$pngEncoderVersion")
160161

161-
includeLib("io.github.spair:imgui-java-binding:$spairVersion")
162-
includeLib("io.github.spair:imgui-java-lwjgl3:$spairVersion")
163-
includeLib("io.github.spair:imgui-java-natives-windows:$spairVersion")
164-
includeLib("io.github.spair:imgui-java-natives-linux:$spairVersion")
165-
includeLib("io.github.spair:imgui-java-natives-macos:$spairVersion")
162+
includeLib("com.lambda:lambda-imgui-java-binding:$spairVersion")
163+
includeLib("com.lambda:lambda-imgui-java-lwjgl3:$spairVersion")
164+
includeLib("com.lambda:lambda-imgui-java-natives-windows:$spairVersion")
165+
includeLib("com.lambda:lambda-imgui-java-natives-linux:$spairVersion")
166+
includeLib("com.lambda:lambda-imgui-java-natives-macos:$spairVersion")
166167

167168
// Ktor
168169
includeLib("io.ktor:ktor-client-core:$ktorVersion")

‎src/main/kotlin/com/lambda/config/Configurable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import com.lambda.event.Muteable
4646
import com.lambda.util.Communication.logError
4747
import com.lambda.util.KeyCode
4848
import com.lambda.util.Nameable
49-
import imgui.flag.ImGuiInputTextFlags
49+
import com.lambda.imgui.flag.ImGuiInputTextFlags
5050
import net.minecraft.block.Block
5151
import net.minecraft.item.Item
5252
import net.minecraft.registry.Registries

‎src/main/kotlin/com/lambda/config/settings/NumericSetting.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import com.lambda.config.SettingCore
2323
import com.lambda.config.SettingEditorDsl
2424
import com.lambda.config.SettingGroupEditor
2525
import com.lambda.gui.dsl.ImGuiBuilder
26-
import imgui.ImGui
27-
import imgui.ImGui.calcTextSize
28-
import imgui.ImGui.dummy
29-
import imgui.flag.ImGuiCol
26+
import com.lambda.imgui.ImGui
27+
import com.lambda.imgui.ImGui.calcTextSize
28+
import com.lambda.imgui.ImGui.dummy
29+
import com.lambda.imgui.flag.ImGuiCol
3030
import java.text.NumberFormat
3131
import java.util.*
3232

‎src/main/kotlin/com/lambda/config/settings/StringSetting.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import com.lambda.config.SettingEditorDsl
2828
import com.lambda.config.SettingGroupEditor
2929
import com.lambda.gui.dsl.ImGuiBuilder
3030
import com.lambda.util.extension.CommandBuilder
31-
import imgui.flag.ImGuiInputTextFlags
31+
import com.lambda.imgui.flag.ImGuiInputTextFlags
3232
import net.minecraft.command.CommandRegistryAccess
3333

3434
/**

‎src/main/kotlin/com/lambda/config/settings/collections/CollectionSetting.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import com.lambda.config.SettingGroupEditor
2727
import com.lambda.context.SafeContext
2828
import com.lambda.gui.dsl.ImGuiBuilder
2929
import com.lambda.threading.runSafe
30-
import imgui.ImGuiListClipper
31-
import imgui.callback.ImListClipperCallback
32-
import imgui.flag.ImGuiChildFlags
33-
import imgui.flag.ImGuiSelectableFlags.DontClosePopups
30+
import com.lambda.imgui.ImGuiListClipper
31+
import com.lambda.imgui.callback.ImListClipperCallback
32+
import com.lambda.imgui.flag.ImGuiChildFlags
33+
import com.lambda.imgui.flag.ImGuiSelectableFlags.DontClosePopups
3434
import java.lang.reflect.Type
3535

3636
/**

‎src/main/kotlin/com/lambda/config/settings/complex/KeybindSetting.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import com.lambda.util.KeyCode
3838
import com.lambda.util.Mouse
3939
import com.lambda.util.StringUtils.capitalize
4040
import com.lambda.util.extension.CommandBuilder
41-
import imgui.ImGui.isMouseClicked
42-
import imgui.flag.ImGuiCol
43-
import imgui.flag.ImGuiHoveredFlags
44-
import imgui.flag.ImGuiMouseButton
41+
import com.lambda.imgui.ImGui.isMouseClicked
42+
import com.lambda.imgui.flag.ImGuiCol
43+
import com.lambda.imgui.flag.ImGuiHoveredFlags
44+
import com.lambda.imgui.flag.ImGuiMouseButton
4545
import net.minecraft.command.CommandRegistryAccess
4646
import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_SHIFT
4747
import org.lwjgl.glfw.GLFW.GLFW_KEY_RIGHT_SUPER

‎src/main/kotlin/com/lambda/gui/DearImGui.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import com.lambda.gui.components.ClickGuiLayout
2525
import com.lambda.util.stream
2626
import com.mojang.blaze3d.opengl.GlStateManager
2727
import com.mojang.blaze3d.systems.RenderSystem
28-
import imgui.ImFontConfig
29-
import imgui.ImFontGlyphRangesBuilder
30-
import imgui.ImGui
31-
import imgui.ImGuiIO
32-
import imgui.extension.implot.ImPlot
33-
import imgui.flag.ImGuiConfigFlags
34-
import imgui.gl3.ImGuiImplGl3
35-
import imgui.glfw.ImGuiImplGlfw
28+
import com.lambda.imgui.ImFontConfig
29+
import com.lambda.imgui.ImFontGlyphRangesBuilder
30+
import com.lambda.imgui.ImGui
31+
import com.lambda.imgui.ImGuiIO
32+
import com.lambda.imgui.extension.implot.ImPlot
33+
import com.lambda.imgui.flag.ImGuiConfigFlags
34+
import com.lambda.imgui.gl3.ImGuiImplGl3
35+
import com.lambda.imgui.glfw.ImGuiImplGlfw
3636
import net.minecraft.client.gl.GlBackend
3737
import net.minecraft.client.texture.GlTexture
3838
import org.lwjgl.opengl.GL30.GL_FRAMEBUFFER

‎src/main/kotlin/com/lambda/gui/MenuBar.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ import com.lambda.util.Diagnostics.gatherDiagnostics
4646
import com.lambda.util.FolderRegister
4747
import com.lambda.util.FolderRegister.minecraft
4848
import com.mojang.blaze3d.platform.TextureUtil
49-
import imgui.ImGui
50-
import imgui.ImGui.closeCurrentPopup
51-
import imgui.flag.ImGuiCol
52-
import imgui.flag.ImGuiStyleVar
53-
import imgui.flag.ImGuiWindowFlags
49+
import com.lambda.imgui.ImGui
50+
import com.lambda.imgui.ImGui.closeCurrentPopup
51+
import com.lambda.imgui.flag.ImGuiCol
52+
import com.lambda.imgui.flag.ImGuiStyleVar
53+
import com.lambda.imgui.flag.ImGuiWindowFlags
5454
import net.fabricmc.loader.api.FabricLoader
5555
import net.minecraft.client.gui.screen.DebugOptionsScreen
5656
import net.minecraft.network.packet.c2s.play.ChangeGameModeC2SPacket

‎src/main/kotlin/com/lambda/gui/components/ClickGuiLayout.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ import com.lambda.util.Describable
4545
import com.lambda.util.KeyCode
4646
import com.lambda.util.NamedEnum
4747
import com.lambda.util.WindowUtils.setLambdaWindowIcon
48-
import imgui.ImGui
49-
import imgui.extension.implot.ImPlot
50-
import imgui.flag.ImGuiCol
51-
import imgui.flag.ImGuiCond
52-
import imgui.flag.ImGuiHoveredFlags
53-
import imgui.flag.ImGuiWindowFlags
48+
import com.lambda.imgui.ImGui
49+
import com.lambda.imgui.extension.implot.ImPlot
50+
import com.lambda.imgui.flag.ImGuiCol
51+
import com.lambda.imgui.flag.ImGuiCond
52+
import com.lambda.imgui.flag.ImGuiHoveredFlags
53+
import com.lambda.imgui.flag.ImGuiWindowFlags
5454
import net.minecraft.SharedConstants
5555
import net.minecraft.client.gui.screen.ChatScreen
5656
import net.minecraft.client.gui.screen.Screen

‎src/main/kotlin/com/lambda/gui/components/HudGuiLayout.kt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ import com.lambda.gui.snap.SnapManager.updateDragAndSnapping
3333
import com.lambda.module.HudModule
3434
import com.lambda.module.ModuleRegistry
3535
import com.lambda.util.NamedEnum
36-
import imgui.ImColor
37-
import imgui.ImDrawList
38-
import imgui.ImGui
39-
import imgui.flag.ImDrawListFlags
40-
import imgui.flag.ImGuiStyleVar
41-
import imgui.flag.ImGuiWindowFlags
36+
import com.lambda.imgui.ImColor
37+
import com.lambda.imgui.ImDrawList
38+
import com.lambda.imgui.ImGui
39+
import com.lambda.imgui.flag.ImDrawListFlags
40+
import com.lambda.imgui.flag.ImGuiCol
41+
import com.lambda.imgui.flag.ImGuiStyleVar
42+
import com.lambda.imgui.flag.ImGuiWindowFlags
4243
import java.awt.Color
4344
import kotlin.math.PI
4445

@@ -156,7 +157,7 @@ object HudGuiLayout : Loadable, Configurable(HudConfig) {
156157

157158
val pushedColor = if (hasBg) {
158159
val packed = ImColor.rgba(bg.red, bg.green, bg.blue, bg.alpha)
159-
ImGui.pushStyleColor(imgui.flag.ImGuiCol.WindowBg, packed)
160+
ImGui.pushStyleColor(ImGuiCol.WindowBg, packed)
160161
true
161162
} else false
162163

0 commit comments

Comments
 (0)