diff --git a/build.gradle.kts b/build.gradle.kts index fec1afb..fe527ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,21 +8,24 @@ import moe.nea.licenseextractificator.LicenseDiscoveryTask import net.fabricmc.loom.LoomGradleExtension +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { java `maven-publish` - id("com.google.devtools.ksp") version "1.9.23-1.0.20" - kotlin("jvm") version "1.9.23" - kotlin("plugin.serialization") version "1.9.23" -// id("com.bnorm.power.kotlin-power-assert") version "0.13.0" - id("dev.architectury.loom") version "1.6.397" + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.plugin.serialization) + alias(libs.plugins.kotlin.plugin.powerassert) + alias(libs.plugins.kotlin.plugin.ksp) + alias(libs.plugins.loom) id("com.github.johnrengelman.shadow") version "8.1.1" id("moe.nea.licenseextractificator") -// id("io.github.juuxel.loom-vineflower") version "1.11.0" } +version = getGitTagInfo() +group = rootProject.property("maven_group").toString() + java { withSourcesJar() toolchain { @@ -30,13 +33,11 @@ java { } } -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = "21" -} -val compileTestKotlin: KotlinCompile by tasks -compileTestKotlin.kotlinOptions { - jvmTarget = "21" + +tasks.withType(KotlinCompile::class) { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_21) + } } allprojects { @@ -80,17 +81,54 @@ allprojects { maven("https://repo.hypixel.net/repository/Hypixel/") maven("https://maven.azureaaron.net/snapshots") maven("https://maven.azureaaron.net/releases") + maven("https://www.cursemaven.com") mavenLocal() } } kotlin { sourceSets.all { languageSettings { -// languageVersion = "2.0" enableLanguageFeature("BreakContinueInInlineLambdas") } } } +val compatSourceSets: MutableSet = mutableSetOf() +fun createIsolatedSourceSet(name: String, path: String = "compat/$name"): SourceSet { + val ss = sourceSets.create(name) { + this.java.setSrcDirs(listOf(layout.projectDirectory.dir("src/$path/java"))) + this.kotlin.setSrcDirs(listOf(layout.projectDirectory.dir("src/$path/kotlin"))) + } + compatSourceSets.add(ss) + loom.createRemapConfigurations(ss) + val mainSS = sourceSets.main.get() + configurations { + (ss.implementationConfigurationName) { + extendsFrom(getByName(mainSS.compileClasspathConfigurationName)) + } + (ss.annotationProcessorConfigurationName) { + extendsFrom(getByName(mainSS.annotationProcessorConfigurationName)) + } + (mainSS.runtimeOnlyConfigurationName) { + extendsFrom(getByName(ss.runtimeClasspathConfigurationName)) + } + } + dependencies { + runtimeOnly(ss.output) + (ss.implementationConfigurationName)(sourceSets.main.get().output) + } + tasks.jar { + from(ss.output) + } + return ss +} + +val SourceSet.modImplementationConfigurationName + get() = + loom.remapConfigurations.find { + it.targetConfigurationName.get() == this.implementationConfigurationName + }!!.sourceConfiguration +val configuredSourceSet = createIsolatedSourceSet("configured") +val sodiumSourceSet = createIsolatedSourceSet("sodium") val shadowMe by configurations.creating { exclude(group = "org.jetbrains.kotlin") @@ -148,10 +186,11 @@ dependencies { modRuntimeOnly(libs.fabric.api.deprecated) modApi(libs.architectury) modCompileOnly(libs.jarvis.api) - modCompileOnly(libs.sodium) include(libs.jarvis.fabric) modCompileOnly(libs.femalegender) + (configuredSourceSet.modImplementationConfigurationName)(libs.configured) + (sodiumSourceSet.modImplementationConfigurationName)(libs.sodium) // Actual dependencies modCompileOnly(libs.rei.api) { @@ -189,9 +228,6 @@ tasks.test { useJUnitPlatform() } -version = getGitTagInfo() -group = rootProject.property("maven_group").toString() - loom { clientOnlyMinecraftJar() accessWidenerPath.set(project.file("src/main/resources/firmament.accesswidener")) @@ -201,6 +237,10 @@ loom { property("devauth.enabled", "true") property("fabric.log.level", "info") property("firmament.debug", "true") + property("firmament.classroots", + compatSourceSets.joinToString(File.pathSeparator) { + File(it.output.classesDirs.asPath).absolutePath + }) property("mixin.debug", "true") parseEnvFile(file(".env")).forEach { (t, u) -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5cf8a27..335df1e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,14 @@ [versions] minecraft = "1.21" -fabric_loader = "0.15.11" + +# Update from https://kotlinlang.org/ +kotlin = "2.0.20" +# Update from https://github.com/google/ksp/releases +kotlin_ksp = "2.0.20-1.0.24" + +# Update from https://linkie.shedaniel.me/dependencies?loader=fabric +fabric_loader = "0.16.3" fabric_api = "0.100.4+1.21" fabric_kotlin = "1.11.0+kotlin.2.0.0" yarn = "1.21+build.7" @@ -12,25 +19,58 @@ rei = "16.0.729" modmenu = "11.0.1" architectury = "13.0.3" -qolify = "1.3.0-1.20.2" -citresewn = "1.1.3+1.20" +# Update from https://maven.architectury.dev/dev/architectury/loom/dev.architectury.loom.gradle.plugin/ +loom = "1.7.412" + +# Update from https://modrinth.com/mod/qolify/versions?l=fabric +qolify = "1.6.0-1.21.1" + +# Update from https://modrinth.com/mod/sodium/versions?l=fabric sodium = "mc1.21-0.5.11" -freecammod = "U5eR0FyR" + +# Update from https://modrinth.com/mod/freecam/versions?l=fabric +freecammod = "vomskVK3" + +# Update from https://modrinth.com/mod/no-chat-reports/versions?l=fabric ncr = "Fabric-1.21-v2.8.0" + +# Update from https://modrinth.com/mod/female-gender/versions?l=fabric femalegender = "kJmjQvAS" + +# Update from https://modrinth.com/mod/explosive-enhancement/versions?l=fabric explosiveenhancement = "1.2.3-1.21.0" -notenoughanimations = "WaI2x21x" + +# Update from https://modrinth.com/mod/not-enough-animations/versions?l=fabric +notenoughanimations = "BQ8qstAV" devauth = "1.2.0" -ktor = "2.3.0" + +# Update from https://ktor.io/ +ktor = "2.3.12" + +# Update from https://repo.nea.moe/#/releases/moe/nea/neurepoparser neurepoparser = "1.5.0" + +# Update from https://github.com/HotswapProjects/HotswapAgent/releases hotswap_agent = "1.4.2-SNAPSHOT" + +# Update from https://github.com/LlamaLad7/MixinExtras/tags mixinextras = "0.3.5" + jarvis = "1.1.3" nealisp = "1.0.0" + +# Update from https://github.com/NotEnoughUpdates/MoulConfig/tags moulconfig = "3.0.0-beta.15" + +# Update from https://www.curseforge.com/minecraft/mc-mods/configured/files/all?page=1&pageSize=20 +configured = "5441234" + +# Update from https://modrinth.com/mod/hypixel-mod-api/versions hypixelmodapi = "1.0.1" hypixelmodapi_fabric = "1.0.1+build.1+mc1.21" + +# Update from https://github.com/shedaniel/fabric-asm or https://maven.shedaniel.me/me/shedaniel/mm/ manninghamMills = "2.4.1" [libraries] @@ -52,6 +92,7 @@ manninghamMills = { module = "me.shedaniel:mm", version.ref = "manninghamMills" aaronhmapi = { module = "net.azureaaron:hm-api", version = "1.0.0+1.21" } hypixelmodapi = { module = "net.hypixel:mod-api", version.ref = "hypixelmodapi" } hypixelmodapi_fabric = { module = "maven.modrinth:hypixel-mod-api", version.ref = "hypixelmodapi_fabric" } +configured = { module = "curse.maven:configured-457570", version.ref = "configured" } # Runtime: notenoughanimations = { module = "maven.modrinth:not-enough-animations", version.ref = "notenoughanimations" } hotswap = { module = "virtual.github.hotswapagent:hotswap-agent", version.ref = "hotswap_agent" } @@ -60,7 +101,6 @@ rei_fabric = { module = "me.shedaniel:RoughlyEnoughItems-fabric", version.ref = devauth = { module = "me.djtheredstoner:DevAuth-fabric", version.ref = "devauth" } modmenu = { module = "maven.modrinth:modmenu", version.ref = "modmenu" } qolify = { module = "maven.modrinth:qolify", version.ref = "qolify" } -citresewn = { module = "maven.modrinth:cit-resewn", version.ref = "citresewn" } ncr = { module = "maven.modrinth:no-chat-reports", version.ref = "ncr" } sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" } freecammod = { module = "maven.modrinth:freecam", version.ref = "freecammod" } @@ -78,9 +118,13 @@ runtime_optional = [ "devauth", "freecammod", "sodium", - # "qolify", - # "citresewn", - # "ncr", +# "qolify", + "ncr", ] - +[plugins] +kotlin_jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin_plugin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +kotlin_plugin_powerassert = { id = "org.jetbrains.kotlin.plugin.power-assert", version.ref = "kotlin" } +kotlin_plugin_ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin_ksp" } +loom = { id = "dev.architectury.loom", version.ref = "loom" } diff --git a/src/main/kotlin/moe/nea/firmament/compat/SodiumChunkReloader.kt b/src/compat/sodium/java/SodiumChunkReloader.kt similarity index 53% rename from src/main/kotlin/moe/nea/firmament/compat/SodiumChunkReloader.kt rename to src/compat/sodium/java/SodiumChunkReloader.kt index 4bb231a..9456861 100644 --- a/src/main/kotlin/moe/nea/firmament/compat/SodiumChunkReloader.kt +++ b/src/compat/sodium/java/SodiumChunkReloader.kt @@ -1,12 +1,10 @@ -package moe.nea.firmament.compat - import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer import moe.nea.firmament.mixins.accessor.sodium.AccessorSodiumWorldRenderer class SodiumChunkReloader : Runnable { override fun run() { - (SodiumWorldRenderer.instanceNullable() as AccessorSodiumWorldRenderer) - .renderSectionManager_firmament - .updateChunks(false) + (SodiumWorldRenderer.instanceNullable() as? AccessorSodiumWorldRenderer) + ?.renderSectionManager_firmament + ?.markGraphDirty() } } diff --git a/src/main/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java b/src/compat/sodium/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java similarity index 88% rename from src/main/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java rename to src/compat/sodium/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java index b759204..d585cbc 100644 --- a/src/main/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java +++ b/src/compat/sodium/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java @@ -9,6 +9,6 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(SodiumWorldRenderer.class) @Pseudo public interface AccessorSodiumWorldRenderer { - @Accessor("renderSectionManager") + @Accessor(value = "renderSectionManager", remap = false) RenderSectionManager getRenderSectionManager_firmament(); } diff --git a/src/main/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java b/src/compat/sodium/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java similarity index 100% rename from src/main/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java rename to src/compat/sodium/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java diff --git a/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java b/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java new file mode 100644 index 0000000..e3644c0 --- /dev/null +++ b/src/main/java/moe/nea/firmament/init/AutoDiscoveryPlugin.java @@ -0,0 +1,173 @@ +package moe.nea.firmament.init; + + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +public class AutoDiscoveryPlugin { + private static final List mixinPlugins = new ArrayList<>(); + + public static List getMixinPlugins() { + return mixinPlugins; + } + + private String mixinPackage; + + public void setMixinPackage(String mixinPackage) { + this.mixinPackage = mixinPackage; + mixinPlugins.add(this); + } + + /** + * Resolves the base class root for a given class URL. This resolves either the JAR root, or the class file root. + * In either case the return value of this + the class name will resolve back to the original class url, or to other + * class urls for other classes. + */ + public URL getBaseUrlForClassUrl(URL classUrl) { + String string = classUrl.toString(); + if (classUrl.getProtocol().equals("jar")) { + try { + return new URL(string.substring(4).split("!")[0]); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + if (string.endsWith(".class")) { + try { + return new URL(string.replace("\\", "/") + .replace(getClass().getCanonicalName() + .replace(".", "/") + ".class", "")); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + return classUrl; + } + + /** + * Get the package that contains all the mixins. This value is set using {@link #setMixinPackage}. + */ + public String getMixinPackage() { + return mixinPackage; + } + + /** + * Get the path inside the class root to the mixin package + */ + public String getMixinBaseDir() { + return mixinPackage.replace(".", "/"); + } + + /** + * A list of all discovered mixins. + */ + private List mixins = null; + + /** + * Try to add mixin class ot the mixins based on the filepath inside of the class root. + * Removes the {@code .class} file suffix, as well as the base mixin package. + *

This method cannot be called after mixin initialization.

+ * + * @param className the name or path of a class to be registered as a mixin. + */ + public void tryAddMixinClass(String className) { + if (!className.endsWith(".class")) return; + String norm = (className.substring(0, className.length() - ".class".length())) + .replace("\\", "/") + .replace("/", "."); + if (norm.startsWith(getMixinPackage() + ".") && !norm.endsWith(".")) { + mixins.add(norm.substring(getMixinPackage().length() + 1)); + } + } + + private void tryDiscoverFromContentFile(URL url) { + Path file; + try { + file = Paths.get(getBaseUrlForClassUrl(url).toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + System.out.println("Base directory found at " + file); + if (!Files.exists(file)) { + System.out.println("Skipping non-existing mixin root: " + file); + return; + } + if (Files.isDirectory(file)) { + walkDir(file); + } else { + walkJar(file); + } + System.out.println("Found mixins: " + mixins); + + } + + /** + * Search through the JAR or class directory to find mixins contained in {@link #getMixinPackage()} + */ + public List getMixins() { + if (mixins != null) return mixins; + System.out.println("Trying to discover mixins"); + mixins = new ArrayList<>(); + URL classUrl = getClass().getProtectionDomain().getCodeSource().getLocation(); + System.out.println("Found classes at " + classUrl); + tryDiscoverFromContentFile(classUrl); + var classRoots = System.getProperty("firmament.classroots"); + if (classRoots != null && !classRoots.isBlank()) { + System.out.println("Found firmament class roots: " + classRoots); + for (String s : classRoots.split(File.pathSeparator)) { + if (s.isBlank()) { + continue; + } + try { + tryDiscoverFromContentFile(new File(s).toURI().toURL()); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + } + return mixins; + } + + /** + * Search through directory for mixin classes based on {@link #getMixinBaseDir}. + * + * @param classRoot The root directory in which classes are stored for the default package. + */ + private void walkDir(Path classRoot) { + System.out.println("Trying to find mixins from directory"); + try (Stream classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) { + classes.map(it -> classRoot.relativize(it).toString()) + .forEach(this::tryAddMixinClass); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Read through a JAR file, trying to find all mixins inside. + */ + private void walkJar(Path file) { + System.out.println("Trying to find mixins from jar file"); + try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(file))) { + ZipEntry next; + while ((next = zis.getNextEntry()) != null) { + tryAddMixinClass(next.getName()); + zis.closeEntry(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/src/main/java/moe/nea/firmament/init/MixinPlugin.java b/src/main/java/moe/nea/firmament/init/MixinPlugin.java index ea8709b..e7a02b5 100644 --- a/src/main/java/moe/nea/firmament/init/MixinPlugin.java +++ b/src/main/java/moe/nea/firmament/init/MixinPlugin.java @@ -12,9 +12,12 @@ import java.util.Set; public class MixinPlugin implements IMixinConfigPlugin { + AutoDiscoveryPlugin autoDiscoveryPlugin = new AutoDiscoveryPlugin(); + @Override public void onLoad(String mixinPackage) { MixinExtrasBootstrap.init(); + autoDiscoveryPlugin.setMixinPackage(mixinPackage); } @Override @@ -37,7 +40,7 @@ public class MixinPlugin implements IMixinConfigPlugin { @Override public List getMixins() { - return null; + return autoDiscoveryPlugin.getMixins(); } @Override diff --git a/src/main/kotlin/moe/nea/firmament/Firmament.kt b/src/main/kotlin/Firmament.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/Firmament.kt rename to src/main/kotlin/Firmament.kt diff --git a/src/main/kotlin/moe/nea/firmament/apis/Profiles.kt b/src/main/kotlin/apis/Profiles.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/apis/Profiles.kt rename to src/main/kotlin/apis/Profiles.kt diff --git a/src/main/kotlin/moe/nea/firmament/apis/Routes.kt b/src/main/kotlin/apis/Routes.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/apis/Routes.kt rename to src/main/kotlin/apis/Routes.kt diff --git a/src/main/kotlin/moe/nea/firmament/apis/UrsaManager.kt b/src/main/kotlin/apis/UrsaManager.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/apis/UrsaManager.kt rename to src/main/kotlin/apis/UrsaManager.kt diff --git a/src/main/kotlin/moe/nea/firmament/commands/CaseInsensitiveLiteralCommandNode.kt b/src/main/kotlin/commands/CaseInsensitiveLiteralCommandNode.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/commands/CaseInsensitiveLiteralCommandNode.kt rename to src/main/kotlin/commands/CaseInsensitiveLiteralCommandNode.kt diff --git a/src/main/kotlin/moe/nea/firmament/commands/RestArgumentType.kt b/src/main/kotlin/commands/RestArgumentType.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/commands/RestArgumentType.kt rename to src/main/kotlin/commands/RestArgumentType.kt diff --git a/src/main/kotlin/moe/nea/firmament/commands/dsl.kt b/src/main/kotlin/commands/dsl.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/commands/dsl.kt rename to src/main/kotlin/commands/dsl.kt diff --git a/src/main/kotlin/moe/nea/firmament/commands/rome.kt b/src/main/kotlin/commands/rome.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/commands/rome.kt rename to src/main/kotlin/commands/rome.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/AllowChatEvent.kt b/src/main/kotlin/events/AllowChatEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/AllowChatEvent.kt rename to src/main/kotlin/events/AllowChatEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/AttackBlockEvent.kt b/src/main/kotlin/events/AttackBlockEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/AttackBlockEvent.kt rename to src/main/kotlin/events/AttackBlockEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/BakeExtraModelsEvent.kt b/src/main/kotlin/events/BakeExtraModelsEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/BakeExtraModelsEvent.kt rename to src/main/kotlin/events/BakeExtraModelsEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ClientStartedEvent.kt b/src/main/kotlin/events/ClientStartedEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ClientStartedEvent.kt rename to src/main/kotlin/events/ClientStartedEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/CommandEvent.kt b/src/main/kotlin/events/CommandEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/CommandEvent.kt rename to src/main/kotlin/events/CommandEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/CustomItemModelEvent.kt b/src/main/kotlin/events/CustomItemModelEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/CustomItemModelEvent.kt rename to src/main/kotlin/events/CustomItemModelEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/EarlyResourceReloadEvent.kt b/src/main/kotlin/events/EarlyResourceReloadEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/EarlyResourceReloadEvent.kt rename to src/main/kotlin/events/EarlyResourceReloadEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/EntityDespawnEvent.kt b/src/main/kotlin/events/EntityDespawnEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/EntityDespawnEvent.kt rename to src/main/kotlin/events/EntityDespawnEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/EntityInteractionEvent.kt b/src/main/kotlin/events/EntityInteractionEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/EntityInteractionEvent.kt rename to src/main/kotlin/events/EntityInteractionEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/EntityUpdateEvent.kt b/src/main/kotlin/events/EntityUpdateEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/EntityUpdateEvent.kt rename to src/main/kotlin/events/EntityUpdateEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/FeaturesInitializedEvent.kt b/src/main/kotlin/events/FeaturesInitializedEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/FeaturesInitializedEvent.kt rename to src/main/kotlin/events/FeaturesInitializedEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/FinalizeResourceManagerEvent.kt b/src/main/kotlin/events/FinalizeResourceManagerEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/FinalizeResourceManagerEvent.kt rename to src/main/kotlin/events/FinalizeResourceManagerEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/FirmamentEvent.kt b/src/main/kotlin/events/FirmamentEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/FirmamentEvent.kt rename to src/main/kotlin/events/FirmamentEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/FirmamentEventBus.kt b/src/main/kotlin/events/FirmamentEventBus.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/FirmamentEventBus.kt rename to src/main/kotlin/events/FirmamentEventBus.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/HandledScreenClickEvent.kt b/src/main/kotlin/events/HandledScreenClickEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/HandledScreenClickEvent.kt rename to src/main/kotlin/events/HandledScreenClickEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/HandledScreenForegroundEvent.kt b/src/main/kotlin/events/HandledScreenForegroundEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/HandledScreenForegroundEvent.kt rename to src/main/kotlin/events/HandledScreenForegroundEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/HandledScreenKeyPressedEvent.kt b/src/main/kotlin/events/HandledScreenKeyPressedEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/HandledScreenKeyPressedEvent.kt rename to src/main/kotlin/events/HandledScreenKeyPressedEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/HandledScreenPushREIEvent.kt b/src/main/kotlin/events/HandledScreenPushREIEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/HandledScreenPushREIEvent.kt rename to src/main/kotlin/events/HandledScreenPushREIEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/HotbarItemRenderEvent.kt b/src/main/kotlin/events/HotbarItemRenderEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/HotbarItemRenderEvent.kt rename to src/main/kotlin/events/HotbarItemRenderEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/HudRenderEvent.kt b/src/main/kotlin/events/HudRenderEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/HudRenderEvent.kt rename to src/main/kotlin/events/HudRenderEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/IsSlotProtectedEvent.kt b/src/main/kotlin/events/IsSlotProtectedEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/IsSlotProtectedEvent.kt rename to src/main/kotlin/events/IsSlotProtectedEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt b/src/main/kotlin/events/ItemTooltipEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt rename to src/main/kotlin/events/ItemTooltipEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/MaskCommands.kt b/src/main/kotlin/events/MaskCommands.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/MaskCommands.kt rename to src/main/kotlin/events/MaskCommands.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ModifyChatEvent.kt b/src/main/kotlin/events/ModifyChatEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ModifyChatEvent.kt rename to src/main/kotlin/events/ModifyChatEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/OutgoingPacketEvent.kt b/src/main/kotlin/events/OutgoingPacketEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/OutgoingPacketEvent.kt rename to src/main/kotlin/events/OutgoingPacketEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ParticleSpawnEvent.kt b/src/main/kotlin/events/ParticleSpawnEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ParticleSpawnEvent.kt rename to src/main/kotlin/events/ParticleSpawnEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/PlayerInventoryUpdate.kt b/src/main/kotlin/events/PlayerInventoryUpdate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/PlayerInventoryUpdate.kt rename to src/main/kotlin/events/PlayerInventoryUpdate.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ProcessChatEvent.kt b/src/main/kotlin/events/ProcessChatEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ProcessChatEvent.kt rename to src/main/kotlin/events/ProcessChatEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ReloadRegistrationEvent.kt b/src/main/kotlin/events/ReloadRegistrationEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ReloadRegistrationEvent.kt rename to src/main/kotlin/events/ReloadRegistrationEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ScreenChangeEvent.kt b/src/main/kotlin/events/ScreenChangeEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ScreenChangeEvent.kt rename to src/main/kotlin/events/ScreenChangeEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ScreenRenderPostEvent.kt b/src/main/kotlin/events/ScreenRenderPostEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ScreenRenderPostEvent.kt rename to src/main/kotlin/events/ScreenRenderPostEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/ServerConnectedEvent.kt b/src/main/kotlin/events/ServerConnectedEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/ServerConnectedEvent.kt rename to src/main/kotlin/events/ServerConnectedEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/SkyblockServerUpdateEvent.kt b/src/main/kotlin/events/SkyblockServerUpdateEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/SkyblockServerUpdateEvent.kt rename to src/main/kotlin/events/SkyblockServerUpdateEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/SlotClickEvent.kt b/src/main/kotlin/events/SlotClickEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/SlotClickEvent.kt rename to src/main/kotlin/events/SlotClickEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/SlotRenderEvents.kt b/src/main/kotlin/events/SlotRenderEvents.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/SlotRenderEvents.kt rename to src/main/kotlin/events/SlotRenderEvents.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/SoundReceiveEvent.kt b/src/main/kotlin/events/SoundReceiveEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/SoundReceiveEvent.kt rename to src/main/kotlin/events/SoundReceiveEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/TickEvent.kt b/src/main/kotlin/events/TickEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/TickEvent.kt rename to src/main/kotlin/events/TickEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/TooltipEvent.kt b/src/main/kotlin/events/TooltipEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/TooltipEvent.kt rename to src/main/kotlin/events/TooltipEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/UseBlockEvent.kt b/src/main/kotlin/events/UseBlockEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/UseBlockEvent.kt rename to src/main/kotlin/events/UseBlockEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/WorldKeyboardEvent.kt b/src/main/kotlin/events/WorldKeyboardEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/WorldKeyboardEvent.kt rename to src/main/kotlin/events/WorldKeyboardEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/WorldReadyEvent.kt b/src/main/kotlin/events/WorldReadyEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/WorldReadyEvent.kt rename to src/main/kotlin/events/WorldReadyEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt b/src/main/kotlin/events/WorldRenderLastEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt rename to src/main/kotlin/events/WorldRenderLastEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/registration/ChatEvents.kt b/src/main/kotlin/events/registration/ChatEvents.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/registration/ChatEvents.kt rename to src/main/kotlin/events/registration/ChatEvents.kt diff --git a/src/main/kotlin/moe/nea/firmament/events/subscription/Subscription.kt b/src/main/kotlin/events/subscription/Subscription.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/events/subscription/Subscription.kt rename to src/main/kotlin/events/subscription/Subscription.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt b/src/main/kotlin/features/FeatureManager.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt rename to src/main/kotlin/features/FeatureManager.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/FirmamentFeature.kt b/src/main/kotlin/features/FirmamentFeature.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/FirmamentFeature.kt rename to src/main/kotlin/features/FirmamentFeature.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/chat/AutoCompletions.kt b/src/main/kotlin/features/chat/AutoCompletions.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/chat/AutoCompletions.kt rename to src/main/kotlin/features/chat/AutoCompletions.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/chat/ChatLinks.kt b/src/main/kotlin/features/chat/ChatLinks.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/chat/ChatLinks.kt rename to src/main/kotlin/features/chat/ChatLinks.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/chat/QuickCommands.kt b/src/main/kotlin/features/chat/QuickCommands.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/chat/QuickCommands.kt rename to src/main/kotlin/features/chat/QuickCommands.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DebugLogger.kt b/src/main/kotlin/features/debug/DebugLogger.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/debug/DebugLogger.kt rename to src/main/kotlin/features/debug/DebugLogger.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt b/src/main/kotlin/features/debug/DebugView.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt rename to src/main/kotlin/features/debug/DebugView.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt b/src/main/kotlin/features/debug/DeveloperFeatures.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt rename to src/main/kotlin/features/debug/DeveloperFeatures.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/MinorTrolling.kt b/src/main/kotlin/features/debug/MinorTrolling.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/debug/MinorTrolling.kt rename to src/main/kotlin/features/debug/MinorTrolling.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt b/src/main/kotlin/features/debug/PowerUserTools.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt rename to src/main/kotlin/features/debug/PowerUserTools.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt rename to src/main/kotlin/features/diana/AncestralSpadeSolver.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt b/src/main/kotlin/features/diana/DianaWaypoints.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt rename to src/main/kotlin/features/diana/DianaWaypoints.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt b/src/main/kotlin/features/diana/NearbyBurrowsSolver.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt rename to src/main/kotlin/features/diana/NearbyBurrowsSolver.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/events/anniversity/AnniversaryFeatures.kt b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/events/anniversity/AnniversaryFeatures.kt rename to src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/events/carnival/CarnivalFeatures.kt b/src/main/kotlin/features/events/carnival/CarnivalFeatures.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/events/carnival/CarnivalFeatures.kt rename to src/main/kotlin/features/events/carnival/CarnivalFeatures.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/events/carnival/MinesweeperHelper.kt b/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/events/carnival/MinesweeperHelper.kt rename to src/main/kotlin/features/events/carnival/MinesweeperHelper.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/fixes/CompatibliltyFeatures.kt b/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/fixes/CompatibliltyFeatures.kt rename to src/main/kotlin/features/fixes/CompatibliltyFeatures.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt b/src/main/kotlin/features/fixes/Fixes.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt rename to src/main/kotlin/features/fixes/Fixes.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt b/src/main/kotlin/features/inventory/CraftingOverlay.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt rename to src/main/kotlin/features/inventory/CraftingOverlay.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt rename to src/main/kotlin/features/inventory/ItemRarityCosmetics.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/PriceData.kt rename to src/main/kotlin/features/inventory/PriceData.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/SaveCursorPosition.kt b/src/main/kotlin/features/inventory/SaveCursorPosition.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/SaveCursorPosition.kt rename to src/main/kotlin/features/inventory/SaveCursorPosition.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt b/src/main/kotlin/features/inventory/SlotLocking.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt rename to src/main/kotlin/features/inventory/SlotLocking.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButton.kt b/src/main/kotlin/features/inventory/buttons/InventoryButton.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButton.kt rename to src/main/kotlin/features/inventory/buttons/InventoryButton.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonEditor.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtonEditor.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonEditor.kt rename to src/main/kotlin/features/inventory/buttons/InventoryButtonEditor.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonTemplates.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtonTemplates.kt rename to src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtons.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButtons.kt rename to src/main/kotlin/features/inventory/buttons/InventoryButtons.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageBackingHandle.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageBackingHandle.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageBackingHandle.kt rename to src/main/kotlin/features/inventory/storageoverlay/StorageBackingHandle.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageData.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageData.kt rename to src/main/kotlin/features/inventory/storageoverlay/StorageData.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt rename to src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayCustom.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayCustom.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayCustom.kt rename to src/main/kotlin/features/inventory/storageoverlay/StorageOverlayCustom.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayScreen.kt rename to src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverviewScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverviewScreen.kt rename to src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StoragePageSlot.kt b/src/main/kotlin/features/inventory/storageoverlay/StoragePageSlot.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StoragePageSlot.kt rename to src/main/kotlin/features/inventory/storageoverlay/StoragePageSlot.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt rename to src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/Histogram.kt b/src/main/kotlin/features/mining/Histogram.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/mining/Histogram.kt rename to src/main/kotlin/features/mining/Histogram.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt b/src/main/kotlin/features/mining/PickaxeAbility.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt rename to src/main/kotlin/features/mining/PickaxeAbility.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt b/src/main/kotlin/features/mining/PristineProfitTracker.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt rename to src/main/kotlin/features/mining/PristineProfitTracker.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/notifications/Notifications.kt b/src/main/kotlin/features/notifications/Notifications.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/notifications/Notifications.kt rename to src/main/kotlin/features/notifications/Notifications.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/AlwaysPredicate.kt b/src/main/kotlin/features/texturepack/AlwaysPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/AlwaysPredicate.kt rename to src/main/kotlin/features/texturepack/AlwaysPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/AndPredicate.kt b/src/main/kotlin/features/texturepack/AndPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/AndPredicate.kt rename to src/main/kotlin/features/texturepack/AndPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/BakedModelExtra.kt b/src/main/kotlin/features/texturepack/BakedModelExtra.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/BakedModelExtra.kt rename to src/main/kotlin/features/texturepack/BakedModelExtra.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/BakedOverrideData.kt b/src/main/kotlin/features/texturepack/BakedOverrideData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/BakedOverrideData.kt rename to src/main/kotlin/features/texturepack/BakedOverrideData.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt b/src/main/kotlin/features/texturepack/CustomBlockTextures.kt similarity index 98% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt rename to src/main/kotlin/features/texturepack/CustomBlockTextures.kt index 18da54c..0f2c2e6 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt +++ b/src/main/kotlin/features/texturepack/CustomBlockTextures.kt @@ -30,7 +30,6 @@ import net.minecraft.util.math.BlockPos import net.minecraft.util.profiler.Profiler import moe.nea.firmament.Firmament import moe.nea.firmament.annotations.Subscribe -import moe.nea.firmament.compat.SodiumChunkReloader import moe.nea.firmament.events.BakeExtraModelsEvent import moe.nea.firmament.events.EarlyResourceReloadEvent import moe.nea.firmament.events.FinalizeResourceManagerEvent @@ -169,7 +168,7 @@ object CustomBlockTextures { } private val sodiumReloadTask = runCatching { - SodiumChunkReloader() + Class.forName("moe.nea.firmament.compat.sodium.SodiumChunkReloader").getConstructor().newInstance() as Runnable }.getOrElse { if (FabricLoader.getInstance().isModLoaded("sodium")) logger.error("Could not create sodium chunk reloader") diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt b/src/main/kotlin/features/texturepack/CustomGlobalArmorOverrides.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt rename to src/main/kotlin/features/texturepack/CustomGlobalArmorOverrides.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt b/src/main/kotlin/features/texturepack/CustomGlobalTextures.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt rename to src/main/kotlin/features/texturepack/CustomGlobalTextures.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt b/src/main/kotlin/features/texturepack/CustomModelOverrideParser.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt rename to src/main/kotlin/features/texturepack/CustomModelOverrideParser.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt b/src/main/kotlin/features/texturepack/CustomSkyBlockTextures.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt rename to src/main/kotlin/features/texturepack/CustomSkyBlockTextures.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/DisplayNamePredicate.kt b/src/main/kotlin/features/texturepack/DisplayNamePredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/DisplayNamePredicate.kt rename to src/main/kotlin/features/texturepack/DisplayNamePredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/ExtraAttributesPredicate.kt b/src/main/kotlin/features/texturepack/ExtraAttributesPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/ExtraAttributesPredicate.kt rename to src/main/kotlin/features/texturepack/ExtraAttributesPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/FirmamentModelPredicate.kt b/src/main/kotlin/features/texturepack/FirmamentModelPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/FirmamentModelPredicate.kt rename to src/main/kotlin/features/texturepack/FirmamentModelPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/FirmamentModelPredicateParser.kt b/src/main/kotlin/features/texturepack/FirmamentModelPredicateParser.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/FirmamentModelPredicateParser.kt rename to src/main/kotlin/features/texturepack/FirmamentModelPredicateParser.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/ItemPredicate.kt b/src/main/kotlin/features/texturepack/ItemPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/ItemPredicate.kt rename to src/main/kotlin/features/texturepack/ItemPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/JsonUnbakedModelFirmExtra.kt b/src/main/kotlin/features/texturepack/JsonUnbakedModelFirmExtra.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/JsonUnbakedModelFirmExtra.kt rename to src/main/kotlin/features/texturepack/JsonUnbakedModelFirmExtra.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/LorePredicate.kt b/src/main/kotlin/features/texturepack/LorePredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/LorePredicate.kt rename to src/main/kotlin/features/texturepack/LorePredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/ModelOverrideData.kt b/src/main/kotlin/features/texturepack/ModelOverrideData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/ModelOverrideData.kt rename to src/main/kotlin/features/texturepack/ModelOverrideData.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/ModelOverrideFilterSet.kt b/src/main/kotlin/features/texturepack/ModelOverrideFilterSet.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/ModelOverrideFilterSet.kt rename to src/main/kotlin/features/texturepack/ModelOverrideFilterSet.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/NotPredicate.kt b/src/main/kotlin/features/texturepack/NotPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/NotPredicate.kt rename to src/main/kotlin/features/texturepack/NotPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/NumberMatcher.kt b/src/main/kotlin/features/texturepack/NumberMatcher.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/NumberMatcher.kt rename to src/main/kotlin/features/texturepack/NumberMatcher.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/OrPredicate.kt b/src/main/kotlin/features/texturepack/OrPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/OrPredicate.kt rename to src/main/kotlin/features/texturepack/OrPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/PetPredicate.kt b/src/main/kotlin/features/texturepack/PetPredicate.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/PetPredicate.kt rename to src/main/kotlin/features/texturepack/PetPredicate.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/RarityMatcher.kt b/src/main/kotlin/features/texturepack/RarityMatcher.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/RarityMatcher.kt rename to src/main/kotlin/features/texturepack/RarityMatcher.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt b/src/main/kotlin/features/texturepack/StringMatcher.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt rename to src/main/kotlin/features/texturepack/StringMatcher.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt b/src/main/kotlin/features/world/FairySouls.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt rename to src/main/kotlin/features/world/FairySouls.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/world/NPCWaypoints.kt b/src/main/kotlin/features/world/NPCWaypoints.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/world/NPCWaypoints.kt rename to src/main/kotlin/features/world/NPCWaypoints.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/world/NavigableWaypoint.kt b/src/main/kotlin/features/world/NavigableWaypoint.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/world/NavigableWaypoint.kt rename to src/main/kotlin/features/world/NavigableWaypoint.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/world/NavigationHelper.kt b/src/main/kotlin/features/world/NavigationHelper.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/world/NavigationHelper.kt rename to src/main/kotlin/features/world/NavigationHelper.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/world/NpcWaypointGui.kt b/src/main/kotlin/features/world/NpcWaypointGui.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/world/NpcWaypointGui.kt rename to src/main/kotlin/features/world/NpcWaypointGui.kt diff --git a/src/main/kotlin/moe/nea/firmament/features/world/Waypoints.kt b/src/main/kotlin/features/world/Waypoints.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/features/world/Waypoints.kt rename to src/main/kotlin/features/world/Waypoints.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/BarComponent.kt b/src/main/kotlin/gui/BarComponent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/BarComponent.kt rename to src/main/kotlin/gui/BarComponent.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/FirmButtonComponent.kt b/src/main/kotlin/gui/FirmButtonComponent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/FirmButtonComponent.kt rename to src/main/kotlin/gui/FirmButtonComponent.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/FirmHoverComponent.kt b/src/main/kotlin/gui/FirmHoverComponent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/FirmHoverComponent.kt rename to src/main/kotlin/gui/FirmHoverComponent.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/FixedComponent.kt b/src/main/kotlin/gui/FixedComponent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/FixedComponent.kt rename to src/main/kotlin/gui/FixedComponent.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/ImageComponent.kt b/src/main/kotlin/gui/ImageComponent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/ImageComponent.kt rename to src/main/kotlin/gui/ImageComponent.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/TickComponent.kt b/src/main/kotlin/gui/TickComponent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/TickComponent.kt rename to src/main/kotlin/gui/TickComponent.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt b/src/main/kotlin/gui/config/AllConfigsGui.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/AllConfigsGui.kt rename to src/main/kotlin/gui/config/AllConfigsGui.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/BooleanHandler.kt b/src/main/kotlin/gui/config/BooleanHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/BooleanHandler.kt rename to src/main/kotlin/gui/config/BooleanHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/ClickHandler.kt b/src/main/kotlin/gui/config/ClickHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/ClickHandler.kt rename to src/main/kotlin/gui/config/ClickHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/DurationHandler.kt b/src/main/kotlin/gui/config/DurationHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/DurationHandler.kt rename to src/main/kotlin/gui/config/DurationHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/GuiAppender.kt b/src/main/kotlin/gui/config/GuiAppender.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/GuiAppender.kt rename to src/main/kotlin/gui/config/GuiAppender.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/HudMetaHandler.kt b/src/main/kotlin/gui/config/HudMetaHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/HudMetaHandler.kt rename to src/main/kotlin/gui/config/HudMetaHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/IntegerHandler.kt b/src/main/kotlin/gui/config/IntegerHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/IntegerHandler.kt rename to src/main/kotlin/gui/config/IntegerHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/JAnyHud.kt b/src/main/kotlin/gui/config/JAnyHud.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/JAnyHud.kt rename to src/main/kotlin/gui/config/JAnyHud.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/KeyBindingHandler.kt b/src/main/kotlin/gui/config/KeyBindingHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/KeyBindingHandler.kt rename to src/main/kotlin/gui/config/KeyBindingHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfig.kt b/src/main/kotlin/gui/config/ManagedConfig.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfig.kt rename to src/main/kotlin/gui/config/ManagedConfig.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfigElement.kt b/src/main/kotlin/gui/config/ManagedConfigElement.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/ManagedConfigElement.kt rename to src/main/kotlin/gui/config/ManagedConfigElement.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/ManagedOption.kt b/src/main/kotlin/gui/config/ManagedOption.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/ManagedOption.kt rename to src/main/kotlin/gui/config/ManagedOption.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/config/StringHandler.kt b/src/main/kotlin/gui/config/StringHandler.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/config/StringHandler.kt rename to src/main/kotlin/gui/config/StringHandler.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/EntityModifier.kt b/src/main/kotlin/gui/entity/EntityModifier.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/EntityModifier.kt rename to src/main/kotlin/gui/entity/EntityModifier.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/EntityRenderer.kt b/src/main/kotlin/gui/entity/EntityRenderer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/EntityRenderer.kt rename to src/main/kotlin/gui/entity/EntityRenderer.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/EntityWidget.kt b/src/main/kotlin/gui/entity/EntityWidget.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/EntityWidget.kt rename to src/main/kotlin/gui/entity/EntityWidget.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt b/src/main/kotlin/gui/entity/FakeWorld.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt rename to src/main/kotlin/gui/entity/FakeWorld.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/GuiPlayer.kt b/src/main/kotlin/gui/entity/GuiPlayer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/GuiPlayer.kt rename to src/main/kotlin/gui/entity/GuiPlayer.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyAge.kt b/src/main/kotlin/gui/entity/ModifyAge.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyAge.kt rename to src/main/kotlin/gui/entity/ModifyAge.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyCharged.kt b/src/main/kotlin/gui/entity/ModifyCharged.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyCharged.kt rename to src/main/kotlin/gui/entity/ModifyCharged.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyEquipment.kt b/src/main/kotlin/gui/entity/ModifyEquipment.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyEquipment.kt rename to src/main/kotlin/gui/entity/ModifyEquipment.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyHorse.kt b/src/main/kotlin/gui/entity/ModifyHorse.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyHorse.kt rename to src/main/kotlin/gui/entity/ModifyHorse.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyInvisible.kt b/src/main/kotlin/gui/entity/ModifyInvisible.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyInvisible.kt rename to src/main/kotlin/gui/entity/ModifyInvisible.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyName.kt b/src/main/kotlin/gui/entity/ModifyName.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyName.kt rename to src/main/kotlin/gui/entity/ModifyName.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyPlayerSkin.kt b/src/main/kotlin/gui/entity/ModifyPlayerSkin.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyPlayerSkin.kt rename to src/main/kotlin/gui/entity/ModifyPlayerSkin.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyRiding.kt b/src/main/kotlin/gui/entity/ModifyRiding.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyRiding.kt rename to src/main/kotlin/gui/entity/ModifyRiding.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyWither.kt b/src/main/kotlin/gui/entity/ModifyWither.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/entity/ModifyWither.kt rename to src/main/kotlin/gui/entity/ModifyWither.kt diff --git a/src/main/kotlin/moe/nea/firmament/gui/hud/MoulConfigHud.kt b/src/main/kotlin/gui/hud/MoulConfigHud.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/gui/hud/MoulConfigHud.kt rename to src/main/kotlin/gui/hud/MoulConfigHud.kt diff --git a/src/main/kotlin/moe/nea/firmament/jarvis/JarvisIntegration.kt b/src/main/kotlin/jarvis/JarvisIntegration.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/jarvis/JarvisIntegration.kt rename to src/main/kotlin/jarvis/JarvisIntegration.kt diff --git a/src/main/kotlin/moe/nea/firmament/keybindings/FirmamentKeyBindings.kt b/src/main/kotlin/keybindings/FirmamentKeyBindings.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/keybindings/FirmamentKeyBindings.kt rename to src/main/kotlin/keybindings/FirmamentKeyBindings.kt diff --git a/src/main/kotlin/moe/nea/firmament/keybindings/IKeyBinding.kt b/src/main/kotlin/keybindings/IKeyBinding.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/keybindings/IKeyBinding.kt rename to src/main/kotlin/keybindings/IKeyBinding.kt diff --git a/src/main/kotlin/moe/nea/firmament/keybindings/SavedKeyBinding.kt b/src/main/kotlin/keybindings/SavedKeyBinding.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/keybindings/SavedKeyBinding.kt rename to src/main/kotlin/keybindings/SavedKeyBinding.kt diff --git a/src/main/kotlin/moe/nea/firmament/modmenu/FirmamentModMenuPlugin.kt b/src/main/kotlin/modmenu/FirmamentModMenuPlugin.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/modmenu/FirmamentModMenuPlugin.kt rename to src/main/kotlin/modmenu/FirmamentModMenuPlugin.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt b/src/main/kotlin/rei/FirmamentReiPlugin.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt rename to src/main/kotlin/rei/FirmamentReiPlugin.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntryRenderer.kt b/src/main/kotlin/rei/NEUItemEntryRenderer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/NEUItemEntryRenderer.kt rename to src/main/kotlin/rei/NEUItemEntryRenderer.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntrySerializer.kt b/src/main/kotlin/rei/NEUItemEntrySerializer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/NEUItemEntrySerializer.kt rename to src/main/kotlin/rei/NEUItemEntrySerializer.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/SBItemEntryDefinition.kt b/src/main/kotlin/rei/SBItemEntryDefinition.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/SBItemEntryDefinition.kt rename to src/main/kotlin/rei/SBItemEntryDefinition.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt b/src/main/kotlin/rei/SkyblockCraftingRecipeDynamicGenerator.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt rename to src/main/kotlin/rei/SkyblockCraftingRecipeDynamicGenerator.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/SkyblockItemIdFocusedStackProvider.kt b/src/main/kotlin/rei/SkyblockItemIdFocusedStackProvider.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/SkyblockItemIdFocusedStackProvider.kt rename to src/main/kotlin/rei/SkyblockItemIdFocusedStackProvider.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/math.kt b/src/main/kotlin/rei/math.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/math.kt rename to src/main/kotlin/rei/math.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt b/src/main/kotlin/rei/recipes/SBCraftingRecipe.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt rename to src/main/kotlin/rei/recipes/SBCraftingRecipe.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBEssenceUpgradeRecipe.kt b/src/main/kotlin/rei/recipes/SBEssenceUpgradeRecipe.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/recipes/SBEssenceUpgradeRecipe.kt rename to src/main/kotlin/rei/recipes/SBEssenceUpgradeRecipe.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt b/src/main/kotlin/rei/recipes/SBForgeRecipe.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt rename to src/main/kotlin/rei/recipes/SBForgeRecipe.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBKatRecipe.kt b/src/main/kotlin/rei/recipes/SBKatRecipe.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/recipes/SBKatRecipe.kt rename to src/main/kotlin/rei/recipes/SBKatRecipe.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBMobDropRecipe.kt b/src/main/kotlin/rei/recipes/SBMobDropRecipe.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/recipes/SBMobDropRecipe.kt rename to src/main/kotlin/rei/recipes/SBMobDropRecipe.kt diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt b/src/main/kotlin/rei/recipes/SBRecipe.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt rename to src/main/kotlin/rei/recipes/SBRecipe.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/BetterRepoRecipeCache.kt b/src/main/kotlin/repo/BetterRepoRecipeCache.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/BetterRepoRecipeCache.kt rename to src/main/kotlin/repo/BetterRepoRecipeCache.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/EssenceRecipeProvider.kt b/src/main/kotlin/repo/EssenceRecipeProvider.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/EssenceRecipeProvider.kt rename to src/main/kotlin/repo/EssenceRecipeProvider.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/ExpLadder.kt b/src/main/kotlin/repo/ExpLadder.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/ExpLadder.kt rename to src/main/kotlin/repo/ExpLadder.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/HypixelStaticData.kt b/src/main/kotlin/repo/HypixelStaticData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/HypixelStaticData.kt rename to src/main/kotlin/repo/HypixelStaticData.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/ItemCache.kt b/src/main/kotlin/repo/ItemCache.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/ItemCache.kt rename to src/main/kotlin/repo/ItemCache.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/ItemNameLookup.kt b/src/main/kotlin/repo/ItemNameLookup.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/ItemNameLookup.kt rename to src/main/kotlin/repo/ItemNameLookup.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/RepoDownloadManager.kt b/src/main/kotlin/repo/RepoDownloadManager.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/RepoDownloadManager.kt rename to src/main/kotlin/repo/RepoDownloadManager.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt b/src/main/kotlin/repo/RepoManager.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt rename to src/main/kotlin/repo/RepoManager.kt diff --git a/src/main/kotlin/moe/nea/firmament/repo/RepoModResourcePack.kt b/src/main/kotlin/repo/RepoModResourcePack.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/repo/RepoModResourcePack.kt rename to src/main/kotlin/repo/RepoModResourcePack.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/Base64Util.kt b/src/main/kotlin/util/Base64Util.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/Base64Util.kt rename to src/main/kotlin/util/Base64Util.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/BazaarPriceStrategy.kt b/src/main/kotlin/util/BazaarPriceStrategy.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/BazaarPriceStrategy.kt rename to src/main/kotlin/util/BazaarPriceStrategy.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/ClipboardUtils.kt b/src/main/kotlin/util/ClipboardUtils.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/ClipboardUtils.kt rename to src/main/kotlin/util/ClipboardUtils.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/CommonSoundEffects.kt b/src/main/kotlin/util/CommonSoundEffects.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/CommonSoundEffects.kt rename to src/main/kotlin/util/CommonSoundEffects.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/DurabilityBarEvent.kt b/src/main/kotlin/util/DurabilityBarEvent.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/DurabilityBarEvent.kt rename to src/main/kotlin/util/DurabilityBarEvent.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/ErrorBoundary.kt b/src/main/kotlin/util/ErrorBoundary.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/ErrorBoundary.kt rename to src/main/kotlin/util/ErrorBoundary.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/FirmFormatters.kt b/src/main/kotlin/util/FirmFormatters.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/FirmFormatters.kt rename to src/main/kotlin/util/FirmFormatters.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/FragmentGuiScreen.kt b/src/main/kotlin/util/FragmentGuiScreen.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/FragmentGuiScreen.kt rename to src/main/kotlin/util/FragmentGuiScreen.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/GetRectangle.kt b/src/main/kotlin/util/GetRectangle.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/GetRectangle.kt rename to src/main/kotlin/util/GetRectangle.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/HoveredItemStack.kt b/src/main/kotlin/util/HoveredItemStack.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/HoveredItemStack.kt rename to src/main/kotlin/util/HoveredItemStack.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/IdentifierSerializer.kt b/src/main/kotlin/util/IdentifierSerializer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/IdentifierSerializer.kt rename to src/main/kotlin/util/IdentifierSerializer.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/IdentityCharacteristics.kt b/src/main/kotlin/util/IdentityCharacteristics.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/IdentityCharacteristics.kt rename to src/main/kotlin/util/IdentityCharacteristics.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/ItemUtil.kt b/src/main/kotlin/util/ItemUtil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/ItemUtil.kt rename to src/main/kotlin/util/ItemUtil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/LegacyFormattingCode.kt b/src/main/kotlin/util/LegacyFormattingCode.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/LegacyFormattingCode.kt rename to src/main/kotlin/util/LegacyFormattingCode.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/LegacyTagParser.kt b/src/main/kotlin/util/LegacyTagParser.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/LegacyTagParser.kt rename to src/main/kotlin/util/LegacyTagParser.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/LoadResource.kt b/src/main/kotlin/util/LoadResource.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/LoadResource.kt rename to src/main/kotlin/util/LoadResource.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/Locraw.kt b/src/main/kotlin/util/Locraw.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/Locraw.kt rename to src/main/kotlin/util/Locraw.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/LogIfNull.kt b/src/main/kotlin/util/LogIfNull.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/LogIfNull.kt rename to src/main/kotlin/util/LogIfNull.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/MC.kt b/src/main/kotlin/util/MC.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/MC.kt rename to src/main/kotlin/util/MC.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/MinecraftDispatcher.kt b/src/main/kotlin/util/MinecraftDispatcher.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/MinecraftDispatcher.kt rename to src/main/kotlin/util/MinecraftDispatcher.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/MoulConfigFragment.kt b/src/main/kotlin/util/MoulConfigFragment.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/MoulConfigFragment.kt rename to src/main/kotlin/util/MoulConfigFragment.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt b/src/main/kotlin/util/MoulConfigUtils.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt rename to src/main/kotlin/util/MoulConfigUtils.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/MutableMapWithMaxSize.kt b/src/main/kotlin/util/MutableMapWithMaxSize.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/MutableMapWithMaxSize.kt rename to src/main/kotlin/util/MutableMapWithMaxSize.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/SBData.kt b/src/main/kotlin/util/SBData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/SBData.kt rename to src/main/kotlin/util/SBData.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/ScoreboardUtil.kt b/src/main/kotlin/util/ScoreboardUtil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/ScoreboardUtil.kt rename to src/main/kotlin/util/ScoreboardUtil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/ScreenUtil.kt b/src/main/kotlin/util/ScreenUtil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/ScreenUtil.kt rename to src/main/kotlin/util/ScreenUtil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/SequenceUtil.kt b/src/main/kotlin/util/SequenceUtil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/SequenceUtil.kt rename to src/main/kotlin/util/SequenceUtil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/SkyBlockIsland.kt b/src/main/kotlin/util/SkyBlockIsland.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/SkyBlockIsland.kt rename to src/main/kotlin/util/SkyBlockIsland.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/SkyblockId.kt rename to src/main/kotlin/util/SkyblockId.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/SortedMapSerializer.kt b/src/main/kotlin/util/SortedMapSerializer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/SortedMapSerializer.kt rename to src/main/kotlin/util/SortedMapSerializer.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/TemplateUtil.kt b/src/main/kotlin/util/TemplateUtil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/TemplateUtil.kt rename to src/main/kotlin/util/TemplateUtil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/TimeMark.kt b/src/main/kotlin/util/TimeMark.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/TimeMark.kt rename to src/main/kotlin/util/TimeMark.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/Timer.kt b/src/main/kotlin/util/Timer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/Timer.kt rename to src/main/kotlin/util/Timer.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/WarpUtil.kt b/src/main/kotlin/util/WarpUtil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/WarpUtil.kt rename to src/main/kotlin/util/WarpUtil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/assertions.kt b/src/main/kotlin/util/assertions.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/assertions.kt rename to src/main/kotlin/util/assertions.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/async/input.kt b/src/main/kotlin/util/async/input.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/async/input.kt rename to src/main/kotlin/util/async/input.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/colorconversion.kt b/src/main/kotlin/util/colorconversion.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/colorconversion.kt rename to src/main/kotlin/util/colorconversion.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/customgui/CoordRememberingSlot.kt b/src/main/kotlin/util/customgui/CoordRememberingSlot.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/customgui/CoordRememberingSlot.kt rename to src/main/kotlin/util/customgui/CoordRememberingSlot.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/customgui/CustomGui.kt b/src/main/kotlin/util/customgui/CustomGui.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/customgui/CustomGui.kt rename to src/main/kotlin/util/customgui/CustomGui.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/customgui/HasCustomGui.kt b/src/main/kotlin/util/customgui/HasCustomGui.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/customgui/HasCustomGui.kt rename to src/main/kotlin/util/customgui/HasCustomGui.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/data/DataHolder.kt b/src/main/kotlin/util/data/DataHolder.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/data/DataHolder.kt rename to src/main/kotlin/util/data/DataHolder.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/data/IDataHolder.kt b/src/main/kotlin/util/data/IDataHolder.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/data/IDataHolder.kt rename to src/main/kotlin/util/data/IDataHolder.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/data/ProfileSpecificDataHolder.kt b/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/data/ProfileSpecificDataHolder.kt rename to src/main/kotlin/util/data/ProfileSpecificDataHolder.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/filter/IteratorFilterSet.kt b/src/main/kotlin/util/filter/IteratorFilterSet.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/filter/IteratorFilterSet.kt rename to src/main/kotlin/util/filter/IteratorFilterSet.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/item/NbtItemData.kt b/src/main/kotlin/util/item/NbtItemData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/item/NbtItemData.kt rename to src/main/kotlin/util/item/NbtItemData.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/item/SkullItemData.kt b/src/main/kotlin/util/item/SkullItemData.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/item/SkullItemData.kt rename to src/main/kotlin/util/item/SkullItemData.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/json/BlockPosSerializer.kt b/src/main/kotlin/util/json/BlockPosSerializer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/json/BlockPosSerializer.kt rename to src/main/kotlin/util/json/BlockPosSerializer.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt b/src/main/kotlin/util/json/DashlessUUIDSerializer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt rename to src/main/kotlin/util/json/DashlessUUIDSerializer.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/json/InstantAsLongSerializer.kt b/src/main/kotlin/util/json/InstantAsLongSerializer.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/json/InstantAsLongSerializer.kt rename to src/main/kotlin/util/json/InstantAsLongSerializer.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/json/SingletonSerializableList.kt b/src/main/kotlin/util/json/SingletonSerializableList.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/json/SingletonSerializableList.kt rename to src/main/kotlin/util/json/SingletonSerializableList.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/listutil.kt b/src/main/kotlin/util/listutil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/listutil.kt rename to src/main/kotlin/util/listutil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/propertyutil.kt b/src/main/kotlin/util/propertyutil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/propertyutil.kt rename to src/main/kotlin/util/propertyutil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/regex.kt b/src/main/kotlin/util/regex.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/regex.kt rename to src/main/kotlin/util/regex.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/render/FacingThePlayerContext.kt b/src/main/kotlin/util/render/FacingThePlayerContext.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/render/FacingThePlayerContext.kt rename to src/main/kotlin/util/render/FacingThePlayerContext.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/render/LerpUtils.kt b/src/main/kotlin/util/render/LerpUtils.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/render/LerpUtils.kt rename to src/main/kotlin/util/render/LerpUtils.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/render/RenderCircleProgress.kt b/src/main/kotlin/util/render/RenderCircleProgress.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/render/RenderCircleProgress.kt rename to src/main/kotlin/util/render/RenderCircleProgress.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/render/RenderContextDSL.kt b/src/main/kotlin/util/render/RenderContextDSL.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/render/RenderContextDSL.kt rename to src/main/kotlin/util/render/RenderContextDSL.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/render/RenderInWorldContext.kt b/src/main/kotlin/util/render/RenderInWorldContext.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/render/RenderInWorldContext.kt rename to src/main/kotlin/util/render/RenderInWorldContext.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/render/TranslatedScissors.kt b/src/main/kotlin/util/render/TranslatedScissors.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/render/TranslatedScissors.kt rename to src/main/kotlin/util/render/TranslatedScissors.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/stringutil.kt b/src/main/kotlin/util/stringutil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/stringutil.kt rename to src/main/kotlin/util/stringutil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/textutil.kt b/src/main/kotlin/util/textutil.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/textutil.kt rename to src/main/kotlin/util/textutil.kt diff --git a/src/main/kotlin/moe/nea/firmament/util/uuid.kt b/src/main/kotlin/util/uuid.kt similarity index 100% rename from src/main/kotlin/moe/nea/firmament/util/uuid.kt rename to src/main/kotlin/util/uuid.kt