Update moulconfig

8 files changed, 20 insertions, 21 deletions

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b869648..91f6c00 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ mixinextras = "0.3.5"
 jarvis = "1.1.1"
 nealisp = "1.0.0"
 explosiveenhancement = "1.2.2-1.20.x"
-moulconfig = "3.0.0-beta.3"
+moulconfig = "3.0.0-beta.5"
 
 
 [libraries]
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonEditor.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonEditor.kt
index f4a8f14..4342945 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonEditor.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonEditor.kt
@@ -6,8 +6,8 @@
 
 package moe.nea.firmament.features.inventory.buttons
 
-import io.github.moulberry.moulconfig.common.IItemStack
-import io.github.moulberry.moulconfig.xml.Bind
+import io.github.notenoughupdates.moulconfig.common.IItemStack
+import io.github.notenoughupdates.moulconfig.xml.Bind
 import io.github.notenoughupdates.moulconfig.platform.ModernItemStack
 import me.shedaniel.math.Point
 import me.shedaniel.math.Rectangle
diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt b/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
index ddda5a5..89ef264 100644
--- a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
@@ -6,7 +6,7 @@
 
 package moe.nea.firmament.features.mining
 
-import io.github.moulberry.moulconfig.xml.Bind
+import io.github.notenoughupdates.moulconfig.xml.Bind
 import moe.nea.jarvis.api.Point
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
diff --git a/src/main/kotlin/moe/nea/firmament/gui/BarComponent.kt b/src/main/kotlin/moe/nea/firmament/gui/BarComponent.kt
index f59d6b1..a1eb23c 100644
--- a/src/main/kotlin/moe/nea/firmament/gui/BarComponent.kt
+++ b/src/main/kotlin/moe/nea/firmament/gui/BarComponent.kt
@@ -9,11 +9,11 @@ package moe.nea.firmament.gui
 import com.mojang.blaze3d.systems.RenderSystem
 import io.github.cottonmc.cotton.gui.client.ScreenDrawing
 import io.github.cottonmc.cotton.gui.widget.data.Texture
-import io.github.moulberry.moulconfig.common.MyResourceLocation
-import io.github.moulberry.moulconfig.common.RenderContext
-import io.github.moulberry.moulconfig.gui.GuiComponent
-import io.github.moulberry.moulconfig.gui.GuiImmediateContext
-import io.github.moulberry.moulconfig.observer.GetSetter
+import io.github.notenoughupdates.moulconfig.common.MyResourceLocation
+import io.github.notenoughupdates.moulconfig.common.RenderContext
+import io.github.notenoughupdates.moulconfig.gui.GuiComponent
+import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext
+import io.github.notenoughupdates.moulconfig.observer.GetSetter
 import io.github.notenoughupdates.moulconfig.platform.ModernRenderContext
 import me.shedaniel.math.Color
 import net.minecraft.client.gui.DrawContext
diff --git a/src/main/kotlin/moe/nea/firmament/gui/hud/MoulConfigHud.kt b/src/main/kotlin/moe/nea/firmament/gui/hud/MoulConfigHud.kt
index d56f713..ec884bb 100644
--- a/src/main/kotlin/moe/nea/firmament/gui/hud/MoulConfigHud.kt
+++ b/src/main/kotlin/moe/nea/firmament/gui/hud/MoulConfigHud.kt
@@ -6,8 +6,8 @@
 
 package moe.nea.firmament.gui.hud
 
-import io.github.moulberry.moulconfig.gui.GuiContext
-import io.github.moulberry.moulconfig.gui.component.TextComponent
+import io.github.notenoughupdates.moulconfig.gui.GuiContext
+import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
 import io.github.notenoughupdates.moulconfig.gui.GuiComponentWrapper
 import net.minecraft.resource.ResourceManager
 import net.minecraft.resource.SynchronousResourceReloader
diff --git a/src/main/kotlin/moe/nea/firmament/util/FragmentGuiScreen.kt b/src/main/kotlin/moe/nea/firmament/util/FragmentGuiScreen.kt
index 22756d0..b484980 100644
--- a/src/main/kotlin/moe/nea/firmament/util/FragmentGuiScreen.kt
+++ b/src/main/kotlin/moe/nea/firmament/util/FragmentGuiScreen.kt
@@ -6,7 +6,7 @@
 
 package moe.nea.firmament.util
 
-import io.github.moulberry.moulconfig.gui.GuiContext
+import io.github.notenoughupdates.moulconfig.gui.GuiContext
 import me.shedaniel.math.Dimension
 import me.shedaniel.math.Point
 import me.shedaniel.math.Rectangle
diff --git a/src/main/kotlin/moe/nea/firmament/util/MoulConfigFragment.kt b/src/main/kotlin/moe/nea/firmament/util/MoulConfigFragment.kt
index bb4a860..1e8be61 100644
--- a/src/main/kotlin/moe/nea/firmament/util/MoulConfigFragment.kt
+++ b/src/main/kotlin/moe/nea/firmament/util/MoulConfigFragment.kt
@@ -6,12 +6,11 @@
 
 package moe.nea.firmament.util
 
-import io.github.moulberry.moulconfig.gui.GuiContext
-import io.github.moulberry.moulconfig.gui.GuiImmediateContext
 import io.github.notenoughupdates.moulconfig.gui.GuiComponentWrapper
+import io.github.notenoughupdates.moulconfig.gui.GuiContext
+import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext
 import me.shedaniel.math.Point
 import net.minecraft.client.gui.DrawContext
-import moe.nea.firmament.util.MC
 
 class MoulConfigFragment(
     context: GuiContext,
diff --git a/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt b/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt
index 9ca0a73..0b56c7c 100644
--- a/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt
+++ b/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt
@@ -6,12 +6,12 @@
 
 package moe.nea.firmament.util
 
-import io.github.moulberry.moulconfig.common.MyResourceLocation
-import io.github.moulberry.moulconfig.gui.GuiContext
-import io.github.moulberry.moulconfig.xml.ChildCount
-import io.github.moulberry.moulconfig.xml.XMLContext
-import io.github.moulberry.moulconfig.xml.XMLGuiLoader
-import io.github.moulberry.moulconfig.xml.XMLUniverse
+import io.github.notenoughupdates.moulconfig.common.MyResourceLocation
+import io.github.notenoughupdates.moulconfig.gui.GuiContext
+import io.github.notenoughupdates.moulconfig.xml.ChildCount
+import io.github.notenoughupdates.moulconfig.xml.XMLContext
+import io.github.notenoughupdates.moulconfig.xml.XMLGuiLoader
+import io.github.notenoughupdates.moulconfig.xml.XMLUniverse
 import javax.xml.namespace.QName
 import me.shedaniel.math.Color
 import org.w3c.dom.Element