Remove storage dsl

Avanatiker · Avanatiker · commit 9a0e51ca7e02 · 2025-08-25T07:20:09.000+02:00
diff --git a/src/main/kotlin/com/lambda/config/settings/CharSetting.kt b/src/main/kotlin/com/lambda/config/settings/CharSetting.kt
@@ -25,7 +25,7 @@ import com.lambda.brigadier.argument.word
 import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
diff --git a/src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt b/src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt
@@ -21,7 +21,7 @@ import com.google.gson.JsonElement
 import com.google.gson.JsonNull
 import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 
 open class FunctionSetting<T>(
     override val name: String,
diff --git a/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt b/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt
@@ -19,7 +19,7 @@ package com.lambda.config.settings
 
 import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import imgui.ImGui
 import imgui.ImGui.calcTextSize
 import imgui.ImGui.dummy
diff --git a/src/main/kotlin/com/lambda/config/settings/StringSetting.kt b/src/main/kotlin/com/lambda/config/settings/StringSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import imgui.flag.ImGuiInputTextFlags
 import net.minecraft.command.CommandRegistryAccess
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt
@@ -21,7 +21,7 @@ import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import imgui.flag.ImGuiSelectableFlags.DontClosePopups
 import java.lang.reflect.Type
 
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/MapSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/MapSetting.kt
@@ -18,7 +18,7 @@
 package com.lambda.config.settings.collections
 
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import java.lang.reflect.Type
 
 /**
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt
@@ -21,7 +21,7 @@ import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import imgui.flag.ImGuiSelectableFlags.DontClosePopups
 import java.lang.reflect.Type
 
diff --git a/src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt b/src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
diff --git a/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt b/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt
@@ -25,7 +25,7 @@ import com.lambda.brigadier.argument.word
 import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.Describable
 import com.lambda.util.StringUtils.capitalize
 import com.lambda.util.extension.CommandBuilder
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.BlockUtils.blockPos
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/BlockSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/BlockSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.block.Block
 import net.minecraft.command.CommandRegistryAccess
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/ColorSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/ColorSetting.kt
@@ -24,7 +24,7 @@ import com.lambda.brigadier.execute
 import com.lambda.brigadier.optional
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 import java.awt.Color
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/KeybindSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/KeybindSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.word
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.KeyCode
 import com.lambda.util.KeyboardUtils
 import com.lambda.util.StringUtils.capitalize
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 import net.minecraft.util.math.Vec3d
diff --git a/src/main/kotlin/com/lambda/config/settings/numeric/DoubleSetting.kt b/src/main/kotlin/com/lambda/config/settings/numeric/DoubleSetting.kt
@@ -23,7 +23,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.settings.NumericSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
diff --git a/src/main/kotlin/com/lambda/config/settings/numeric/FloatSetting.kt b/src/main/kotlin/com/lambda/config/settings/numeric/FloatSetting.kt
@@ -22,7 +22,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.settings.NumericSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
diff --git a/src/main/kotlin/com/lambda/config/settings/numeric/IntegerSetting.kt b/src/main/kotlin/com/lambda/config/settings/numeric/IntegerSetting.kt
@@ -22,7 +22,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.settings.NumericSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
diff --git a/src/main/kotlin/com/lambda/config/settings/numeric/LongSetting.kt b/src/main/kotlin/com/lambda/config/settings/numeric/LongSetting.kt
@@ -22,7 +22,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.settings.NumericSetting
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
diff --git a/src/main/kotlin/com/lambda/gui/ImGuiBuilder.kt b/src/main/kotlin/com/lambda/gui/ImGuiBuilder.kt
@@ -34,9 +34,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.gui.dsl
+package com.lambda.gui
 
-import com.lambda.gui.dsl.ImGuiBuilder.text
+import com.lambda.gui.ImGuiBuilder.text
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.util.math.Vec2d
 import imgui.*
@@ -1770,7 +1770,7 @@ object ImGuiBuilder {
      * @param value Float value
      * @param block Content of the scope
      *
-     * @see imgui.flag.ImGuiStyleVar
+     * @see ImGuiStyleVar
      */
     @ImGuiDsl
     inline fun withStyleVar(styleVar: Int, value: Float, block: ProcedureBlock) {
diff --git a/src/main/kotlin/com/lambda/gui/Layout.kt b/src/main/kotlin/com/lambda/gui/Layout.kt
@@ -17,8 +17,6 @@
 
 package com.lambda.gui
 
-import com.lambda.gui.dsl.ImGuiBuilder
-
 interface Layout {
     fun ImGuiBuilder.buildLayout()
 }
diff --git a/src/main/kotlin/com/lambda/gui/MenuBar.kt b/src/main/kotlin/com/lambda/gui/MenuBar.kt
@@ -27,7 +27,6 @@ import com.lambda.event.EventFlow
 import com.lambda.graphics.texture.TextureOwner.upload
 import com.lambda.gui.DearImGui.EXTERNAL_LINK
 import com.lambda.gui.components.QuickSearch
-import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafe
@@ -41,12 +40,9 @@ import imgui.ImGui.closeCurrentPopup
 import imgui.flag.ImGuiCol
 import imgui.flag.ImGuiStyleVar
 import imgui.flag.ImGuiWindowFlags
-import imgui.type.ImString
 import net.fabricmc.loader.api.FabricLoader
-import net.minecraft.client.Keyboard
 import net.minecraft.util.Util
 import net.minecraft.world.GameMode
-import java.nio.file.Path
 import java.util.Locale
 
 object MenuBar {
diff --git a/src/main/kotlin/com/lambda/gui/components/ClickGuiLayout.kt b/src/main/kotlin/com/lambda/gui/components/ClickGuiLayout.kt
@@ -22,7 +22,7 @@ import com.lambda.event.events.GuiEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.gui.MenuBar.buildMenuBar
 import com.lambda.gui.components.QuickSearch.renderQuickSearch
-import com.lambda.gui.dsl.ImGuiBuilder.buildLayout
+import com.lambda.gui.ImGuiBuilder.buildLayout
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.tag.ModuleTag.Companion.shownTags
diff --git a/src/main/kotlin/com/lambda/gui/components/HudGuiLayout.kt b/src/main/kotlin/com/lambda/gui/components/HudGuiLayout.kt
@@ -20,7 +20,7 @@ package com.lambda.gui.components
 import com.lambda.core.Loadable
 import com.lambda.event.events.GuiEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.gui.dsl.ImGuiBuilder.buildLayout
+import com.lambda.gui.ImGuiBuilder.buildLayout
 import com.lambda.module.HudModule
 import com.lambda.module.ModuleRegistry
 import imgui.flag.ImGuiWindowFlags
diff --git a/src/main/kotlin/com/lambda/gui/components/ModuleEntry.kt b/src/main/kotlin/com/lambda/gui/components/ModuleEntry.kt
@@ -19,13 +19,11 @@ package com.lambda.gui.components
 
 import com.lambda.config.AbstractSetting
 import com.lambda.gui.Layout
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.Module
 import com.lambda.util.NamedEnum
-import com.lambda.util.KeyCode
 import imgui.ImGui
 import imgui.flag.ImGuiTabBarFlags
-import imgui.flag.ImGuiCol
 
 class ModuleEntry(val module: Module): Layout {
     override fun ImGuiBuilder.buildLayout() {
diff --git a/src/main/kotlin/com/lambda/gui/components/QuickSearch.kt b/src/main/kotlin/com/lambda/gui/components/QuickSearch.kt
@@ -27,7 +27,7 @@ import com.lambda.event.events.KeyboardEvent
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
 import com.lambda.gui.LambdaScreen
 import com.lambda.gui.Layout
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.Module
 import com.lambda.module.ModuleRegistry
 import com.lambda.util.KeyCode
diff --git a/src/main/kotlin/com/lambda/gui/dsl/ImStorageDsl.kt b/src/main/kotlin/com/lambda/gui/dsl/ImStorageDsl.kt
diff --git a/src/main/kotlin/com/lambda/module/hud/Coordinates.kt b/src/main/kotlin/com/lambda/module/hud/Coordinates.kt
@@ -17,7 +17,7 @@
 
 package com.lambda.module.hud
 
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafe
diff --git a/src/main/kotlin/com/lambda/module/hud/ModuleList.kt b/src/main/kotlin/com/lambda/module/hud/ModuleList.kt
@@ -17,7 +17,7 @@
 
 package com.lambda.module.hud
 
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.HudModule
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.tag.ModuleTag
diff --git a/src/main/kotlin/com/lambda/module/hud/TPS.kt b/src/main/kotlin/com/lambda/module/hud/TPS.kt
@@ -17,7 +17,7 @@
 
 package com.lambda.module.hud
 
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.Formatting.string
diff --git a/src/main/kotlin/com/lambda/module/hud/TaskFlowHUD.kt b/src/main/kotlin/com/lambda/module/hud/TaskFlowHUD.kt
@@ -17,7 +17,7 @@
 
 package com.lambda.module.hud
 
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 import com.lambda.task.RootTask
diff --git a/src/main/kotlin/com/lambda/module/hud/Watermark.kt b/src/main/kotlin/com/lambda/module/hud/Watermark.kt
@@ -18,7 +18,7 @@
 package com.lambda.module.hud
 
 import com.lambda.graphics.texture.TextureOwner.upload
-import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.ImGuiBuilder
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 
