Replace references to NEU with Firmament

52 files changed, 296 insertions, 300 deletions

diff --git a/src/main/kotlin/moe/nea/notenoughupdates/NotEnoughUpdates.kt b/src/main/kotlin/moe/nea/firmament/Firmament.kt
index 7563a7a..ec6cd3e 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/NotEnoughUpdates.kt
+++ b/src/main/kotlin/moe/nea/firmament/Firmament.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates
+package moe.nea.firmament
 
 import com.mojang.brigadier.CommandDispatcher
 import io.ktor.client.*
@@ -21,20 +21,20 @@ import kotlinx.coroutines.*
 import kotlinx.serialization.json.Json
 import kotlin.coroutines.EmptyCoroutineContext
 import net.minecraft.command.CommandRegistryAccess
-import moe.nea.notenoughupdates.commands.registerNeuCommand
-import moe.nea.notenoughupdates.dbus.NEUDbusObject
-import moe.nea.notenoughupdates.features.FeatureManager
-import moe.nea.notenoughupdates.repo.RepoManager
-import moe.nea.notenoughupdates.util.SBData
-import moe.nea.notenoughupdates.util.data.IDataHolder
+import moe.nea.firmament.commands.registerFirmamentCommand
+import moe.nea.firmament.dbus.FirmamentDbusObject
+import moe.nea.firmament.features.FeatureManager
+import moe.nea.firmament.repo.RepoManager
+import moe.nea.firmament.util.SBData
+import moe.nea.firmament.util.data.IDataHolder
 
-object NotEnoughUpdates : ModInitializer, ClientModInitializer {
-    const val MOD_ID = "notenoughupdates"
+object Firmament : ModInitializer, ClientModInitializer {
+    const val MOD_ID = "firmament"
 
-    val DEBUG = System.getProperty("notenoughupdates.debug") == "true"
-    val DATA_DIR: Path = Path.of(".notenoughupdates").also { Files.createDirectories(it) }
-    val CONFIG_DIR: Path = Path.of("config/notenoughupdates").also { Files.createDirectories(it) }
-    val logger = LogManager.getLogger("NotEnoughUpdates")
+    val DEBUG = System.getProperty("firmament.debug") == "true"
+    val DATA_DIR: Path = Path.of(".firmament").also { Files.createDirectories(it) }
+    val CONFIG_DIR: Path = Path.of("config/firmament").also { Files.createDirectories(it) }
+    val logger = LogManager.getLogger("Firmament")
     val metadata: ModMetadata by lazy { FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow().metadata }
     val version: Version by lazy { metadata.version }
 
@@ -50,7 +50,7 @@ object NotEnoughUpdates : ModInitializer, ClientModInitializer {
                 json(json)
             }
             install(UserAgent) {
-                agent = "NotEnoughUpdates1.19/$version"
+                agent = "Firmament/$version"
             }
         }
     }
@@ -59,20 +59,20 @@ object NotEnoughUpdates : ModInitializer, ClientModInitializer {
     val dbusConnection = DBusConnectionBuilder.forSessionBus()
         .build()
     val coroutineScope =
-        CoroutineScope(EmptyCoroutineContext + CoroutineName("NotEnoughUpdates")) + SupervisorJob(globalJob)
+        CoroutineScope(EmptyCoroutineContext + CoroutineName("Firmament")) + SupervisorJob(globalJob)
 
     private fun registerCommands(
         dispatcher: CommandDispatcher<FabricClientCommandSource>,
         @Suppress("UNUSED_PARAMETER")
         ctx: CommandRegistryAccess
     ) {
-        registerNeuCommand(dispatcher)
+        registerFirmamentCommand(dispatcher)
     }
 
     override fun onInitialize() {
 
-        dbusConnection.requestBusName("moe.nea.notenoughupdates")
-        dbusConnection.exportObject(NEUDbusObject)
+        dbusConnection.requestBusName("moe.nea.firmament")
+        dbusConnection.exportObject(FirmamentDbusObject)
         IDataHolder.registerEvents()
         RepoManager.initialize()
         SBData.init()
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/commands/dsl.kt b/src/main/kotlin/moe/nea/firmament/commands/dsl.kt
index 6190d88..5ead624 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/commands/dsl.kt
+++ b/src/main/kotlin/moe/nea/firmament/commands/dsl.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates.commands
+package moe.nea.firmament.commands
 
 import com.mojang.brigadier.arguments.ArgumentType
 import com.mojang.brigadier.builder.ArgumentBuilder
@@ -7,7 +7,7 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder
 import com.mojang.brigadier.context.CommandContext
 import java.lang.reflect.ParameterizedType
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
-import moe.nea.notenoughupdates.util.iterate
+import moe.nea.firmament.util.iterate
 
 
 typealias DefaultSource = FabricClientCommandSource
diff --git a/src/main/kotlin/moe/nea/firmament/commands/rome.kt b/src/main/kotlin/moe/nea/firmament/commands/rome.kt
new file mode 100644
index 0000000..bdbaa3f
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/commands/rome.kt
@@ -0,0 +1,66 @@
+package moe.nea.firmament.commands
+
+import com.mojang.brigadier.CommandDispatcher
+import io.github.cottonmc.cotton.gui.client.CottonClientScreen
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.minecraft.text.Text
+import moe.nea.firmament.features.world.FairySouls
+import moe.nea.firmament.gui.repoGui
+import moe.nea.firmament.repo.RepoManager
+import moe.nea.firmament.util.SBData
+import moe.nea.firmament.util.ScreenUtil.setScreenLater
+
+
+fun firmamentCommand() = literal("firmament") {
+    thenLiteral("repo") {
+        thenLiteral("reload") {
+            thenLiteral("fetch") {
+                thenExecute {
+                    source.sendFeedback(Text.translatable("firmament.repo.reload.network")) // TODO better reporting
+                    RepoManager.launchAsyncUpdate()
+                }
+            }
+            thenExecute {
+                source.sendFeedback(Text.translatable("firmament.repo.reload.disk"))
+                RepoManager.reload()
+            }
+        }
+        thenExecute {
+            setScreenLater(CottonClientScreen(repoGui()))
+        }
+    }
+    thenLiteral("dev") {
+        thenLiteral("config") {
+            thenExecute {
+                FairySouls.TConfig.showConfigEditor()
+            }
+        }
+        thenLiteral("sbdata") {
+            thenExecute {
+                source.sendFeedback(Text.translatable("firmament.sbinfo.profile", SBData.profileCuteName))
+                val locrawInfo = SBData.locraw
+                if (locrawInfo == null) {
+                    source.sendFeedback(Text.translatable("firmament.sbinfo.nolocraw"))
+                } else {
+                    source.sendFeedback(Text.translatable("firmament.sbinfo.server", locrawInfo.server))
+                    source.sendFeedback(Text.translatable("firmament.sbinfo.gametype", locrawInfo.gametype))
+                    source.sendFeedback(Text.translatable("firmament.sbinfo.mode", locrawInfo.mode))
+                    source.sendFeedback(Text.translatable("firmament.sbinfo.map", locrawInfo.map))
+                }
+
+            }
+        }
+    }
+}
+
+
+fun registerFirmamentCommand(dispatcher: CommandDispatcher<FabricClientCommandSource>) {
+    val firmament = dispatcher.register(firmamentCommand())
+    dispatcher.register(literal("firm") {
+        redirect(firmament)
+    })
+}
+
+
+
+
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/dbus/NEUDbusInterface.kt b/src/main/kotlin/moe/nea/firmament/dbus/FirmamentDbusInterface.kt
index 28ff370..24b7dc8 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/dbus/NEUDbusInterface.kt
+++ b/src/main/kotlin/moe/nea/firmament/dbus/FirmamentDbusInterface.kt
@@ -1,10 +1,10 @@
-package moe.nea.notenoughupdates.dbus
+package moe.nea.firmament.dbus
 
 import org.freedesktop.dbus.annotations.DBusInterfaceName
 import org.freedesktop.dbus.interfaces.DBusInterface
 
-@DBusInterfaceName("moe.nea.NotEnoughUpdates")
-interface NEUDbusInterface : DBusInterface {
+@DBusInterfaceName("moe.nea.Firmament")
+interface FirmamentDbusInterface : DBusInterface {
     fun sayHello(): String
     fun getCurrentRepoCommit(): String
     fun requestRepoReDownload()
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/dbus/NEUDbusObject.kt b/src/main/kotlin/moe/nea/firmament/dbus/FirmamentDbusObject.kt
index 4e3d362..48d4cf7 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/dbus/NEUDbusObject.kt
+++ b/src/main/kotlin/moe/nea/firmament/dbus/FirmamentDbusObject.kt
@@ -1,10 +1,10 @@
-package moe.nea.notenoughupdates.dbus
+package moe.nea.firmament.dbus
 
-import moe.nea.notenoughupdates.repo.RepoManager
+import moe.nea.firmament.repo.RepoManager
 
-object NEUDbusObject : NEUDbusInterface {
+object FirmamentDbusObject : FirmamentDbusInterface {
     override fun sayHello(): String {
-        return "Hello from NEU"
+        return "Hello from Firmanet"
     }
 
     override fun getCurrentRepoCommit(): String {
@@ -16,6 +16,6 @@ object NEUDbusObject : NEUDbusInterface {
     }
 
     override fun getObjectPath(): String {
-        return "/moe/nea/NotEnoughUpdates"
+        return "/moe/nea/Firmament"
     }
 }
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/NEUEvent.kt b/src/main/kotlin/moe/nea/firmament/events/NEUEvent.kt
index 81dc6fc..722ea64 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/NEUEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/NEUEvent.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 /**
  * An event that can be fired by a [NEUEventBus].
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/NEUEventBus.kt b/src/main/kotlin/moe/nea/firmament/events/NEUEventBus.kt
index 7eb0ecd..b3b9152 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/NEUEventBus.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/NEUEventBus.kt
@@ -1,7 +1,7 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 import java.util.concurrent.CopyOnWriteArrayList
-import moe.nea.notenoughupdates.NotEnoughUpdates
+import moe.nea.firmament.Firmament
 
 /**
  * A pubsub event bus.
@@ -27,7 +27,7 @@ open class NEUEventBus<T : NEUEvent> {
                 try {
                     function.invocation(event)
                 } catch (e: Exception) {
-                    NotEnoughUpdates.logger.error("Caught exception during processing event $event", e)
+                    Firmament.logger.error("Caught exception during processing event $event", e)
                 }
             }
         }
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/ParticleSpawnEvent.kt b/src/main/kotlin/moe/nea/firmament/events/ParticleSpawnEvent.kt
index 23c67a0..bbf7289 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/ParticleSpawnEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/ParticleSpawnEvent.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 import net.minecraft.particle.ParticleEffect
 import net.minecraft.util.math.Vec3d
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/ScreenOpenEvent.kt b/src/main/kotlin/moe/nea/firmament/events/ScreenOpenEvent.kt
index 793f066..ee162ab 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/ScreenOpenEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/ScreenOpenEvent.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 import net.minecraft.client.gui.screen.Screen
 
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/ServerChatLineReceivedEvent.kt b/src/main/kotlin/moe/nea/firmament/events/ServerChatLineReceivedEvent.kt
index 681ec6c..7e8531c 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/ServerChatLineReceivedEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/ServerChatLineReceivedEvent.kt
@@ -1,7 +1,7 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 import net.minecraft.text.Text
-import moe.nea.notenoughupdates.util.unformattedString
+import moe.nea.firmament.util.unformattedString
 
 /**
  * This event gets published whenever the client receives a chat message from the server.
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/SkyblockServerUpdateEvent.kt b/src/main/kotlin/moe/nea/firmament/events/SkyblockServerUpdateEvent.kt
index 541b4c6..ae3227f 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/SkyblockServerUpdateEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/SkyblockServerUpdateEvent.kt
@@ -1,6 +1,6 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
-import moe.nea.notenoughupdates.util.Locraw
+import moe.nea.firmament.util.Locraw
 
 /**
  * This event gets published whenever `/locraw` is queried and HyPixel returns a location different to the old one.
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/WorldReadyEvent.kt b/src/main/kotlin/moe/nea/firmament/events/WorldReadyEvent.kt
index 5f305f1..5b01258 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/WorldReadyEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/WorldReadyEvent.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 class WorldReadyEvent : NEUEvent() {
     companion object : NEUEventBus<WorldReadyEvent>()
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/events/WorldRenderLastEvent.kt b/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt
index 60b7e06..c23d923 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/events/WorldRenderLastEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt
@@ -1,4 +1,4 @@
-package moe.nea.notenoughupdates.events
+package moe.nea.firmament.events
 
 import org.joml.Matrix4f
 import net.minecraft.client.render.Camera
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt b/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt
index 2512992..68205f4 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt
@@ -1,11 +1,11 @@
-package moe.nea.notenoughupdates.features
+package moe.nea.firmament.features
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
-import moe.nea.notenoughupdates.NotEnoughUpdates
-import moe.nea.notenoughupdates.features.fishing.FishingWarning
-import moe.nea.notenoughupdates.features.world.FairySouls
-import moe.nea.notenoughupdates.util.data.DataHolder
+import moe.nea.firmament.Firmament
+import moe.nea.firmament.features.fishing.FishingWarning
+import moe.nea.firmament.features.world.FairySouls
+import moe.nea.firmament.util.data.DataHolder
 
 object FeatureManager : DataHolder<FeatureManager.Config>(serializer(), "features", ::Config) {
     @Serializable
@@ -33,7 +33,7 @@ object FeatureManager : DataHolder<FeatureManager.Config>(serializer(), "feature
     fun loadFeature(feature: NEUFeature) {
         synchronized(features) {
             if (feature.identifier in features) {
-                NotEnoughUpdates.logger.error("Double registering feature ${feature.identifier}. Ignoring second instance $feature")
+                Firmament.logger.error("Double registering feature ${feature.identifier}. Ignoring second instance $feature")
                 return
             }
             features[feature.identifier] = feature
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/features/NEUFeature.kt b/src/main/kotlin/moe/nea/firmament/features/NEUFeature.kt
index 39cfb35..f231003 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/features/NEUFeature.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/NEUFeature.kt
@@ -1,6 +1,6 @@
-package moe.nea.notenoughupdates.features
+package moe.nea.firmament.features
 
-import moe.nea.notenoughupdates.util.config.ManagedConfig
+import moe.nea.firmament.util.config.ManagedConfig
 
 interface NEUFeature {
     val name: String
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/features/fishing/FishingWarning.kt b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt
index c44201c..cdeb24c 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/features/fishing/FishingWarning.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt