diff --git a/fabric/build.gradle b/fabric/build.gradle
index 992dcef52..ed4bf7e56 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -136,9 +136,9 @@ sourcesJar {
     dependsOn commonSources
     from commonSources.archiveFile.map { zipTree(it) }
 
-    def fabricLikeSources = project(":fabricLike").sourcesJar
-    dependsOn fabricLikeSources
-    from fabricLikeSources.archiveFile.map { zipTree(it) }
+//    def fabricLikeSources = project(":fabricLike").sourcesJar
+//    dependsOn fabricLikeSources
+//    from fabricLikeSources.archiveFile.map { zipTree(it) }
 }
 
 //components.java {
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinClientLevel.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java
similarity index 98%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinClientLevel.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java
index 5b27ac20b..801140e63 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinClientLevel.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinClientPacketListener.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java
similarity index 97%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinClientPacketListener.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java
index 3ab1d8128..7bfba6905 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinClientPacketListener.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.lod.core.api.internal.ClientApi;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinDebugScreenOverlay.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java
similarity index 93%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinDebugScreenOverlay.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java
index a998bd0ff..3e97b5215 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinDebugScreenOverlay.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java
similarity index 98%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinFogRenderer.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java
index 879cc94d8..cbf1e14b9 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinFogRenderer.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.core.config.Config;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinGameRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java
similarity index 97%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinGameRenderer.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java
index 983e31c47..ca204659c 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinGameRenderer.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.core.api.internal.ClientApi;
 import net.minecraft.client.renderer.GameRenderer;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java
similarity index 98%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinLevelRenderer.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java
index e09ec4b2f..ce1dfa66a 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinLevelRenderer.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinLightmap.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java
similarity index 95%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinLightmap.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java
index 1bed35d16..fc909c5ed 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinLightmap.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 
 import com.mojang.blaze3d.platform.NativeImage;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java
similarity index 97%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinMinecraft.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java
index 75b552baa..7c72be43e 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinMinecraft.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.lod.core.config.Config;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java
similarity index 98%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinOptionsScreen.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java
index 8f4741eb2..780dfaeb1 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinOptionsScreen.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.gui.GetConfigScreen;
 import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinTextureUtil.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinTextureUtil.java
similarity index 95%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinTextureUtil.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinTextureUtil.java
index 9a34c5251..838498a34 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/client/MixinTextureUtil.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinTextureUtil.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.TextureUtil;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/events/MixinBlockUpdate.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java
similarity index 97%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/events/MixinBlockUpdate.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java
index 70d7b54a3..0aa6a3452 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/events/MixinBlockUpdate.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.fabriclike.mixins.events;
+package com.seibel.lod.fabric.mixins.events;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/events/MixinServerLevel.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java
similarity index 97%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/events/MixinServerLevel.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java
index de12f01a3..678163a79 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/events/MixinServerLevel.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.fabriclike.mixins.events;
+package com.seibel.lod.fabric.mixins.events;
 
 import net.minecraft.server.level.ServerLevel;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/MixinChunkGenerator.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java
similarity index 97%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/MixinChunkGenerator.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java
index 9bf1911eb..4fae15c45 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/MixinChunkGenerator.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.fabriclike.mixins.server;
+package com.seibel.lod.fabric.mixins.server;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraft.world.level.chunk.ChunkGenerator;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/MixinChunkMap.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java
similarity index 96%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/MixinChunkMap.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java
index a2cb68f56..a43432d55 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/MixinChunkMap.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.fabriclike.mixins.server;
+package com.seibel.lod.fabric.mixins.server;
 
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.ServerLevelWrapper;
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/unsafe/MixinThreadingDetector.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java
similarity index 96%
rename from fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/unsafe/MixinThreadingDetector.java
rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java
index a2029a2d7..8496c6b50 100644
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/mixins/server/unsafe/MixinThreadingDetector.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.fabriclike.mixins.server.unsafe;
+package com.seibel.lod.fabric.mixins.server.unsafe;
 
 import org.spongepowered.asm.mixin.Mixin;
 
diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java
index 94985c889..16ad9fed9 100644
--- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java
@@ -22,7 +22,6 @@ package com.seibel.lod.fabric.wrappers;
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
-import com.seibel.lod.fabriclike.wrappers.FabricLikeDependencySetup;
 
 /**
  * Binds all necessary dependencies, so we
@@ -38,11 +37,9 @@ public class FabricDependencySetup
 {
 	public static void createInitialBindings() {
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
-		FabricLikeDependencySetup.createInitialBindings();
 	}
 	
 	public static void runDelayedSetup() {
-		FabricLikeDependencySetup.runDelayedSetup();
 		SingletonInjector.INSTANCE.runDelayedSetup();
 	}
 }
diff --git a/fabric/src/main/resources/DistantHorizons.fabric.mixins.json b/fabric/src/main/resources/DistantHorizons.fabric.mixins.json
index be21a82d5..4113ef197 100644
--- a/fabric/src/main/resources/DistantHorizons.fabric.mixins.json
+++ b/fabric/src/main/resources/DistantHorizons.fabric.mixins.json
@@ -3,9 +3,22 @@
   "minVersion": "0.8",
   "package": "com.seibel.lod.fabric.mixins",
   "mixins": [
+    "server.unsafe.MixinThreadingDetector",
+    "server.MixinChunkGenerator",
+    "server.MixinChunkMap",
     "server.MixinUtilBackgroundThread"
   ],
   "client": [
+    "client.MixinClientLevel",
+    "client.MixinClientPacketListener",
+    "client.MixinDebugScreenOverlay",
+    "client.MixinFogRenderer",
+    "client.MixinGameRenderer",
+    "client.MixinLevelRenderer",
+    "client.MixinLightmap",
+    "client.MixinOptionsScreen",
+    "client.MixinMinecraft",
+    "client.MixinTextureUtil",
     "mods.sodium.MixinSodiumChunkRenderer"
   ],
   "injectors": {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 9efe99039..c738c5377 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -33,7 +33,6 @@
   },
 
   "mixins": [
-    "DistantHorizons.fabric.fabricLike.mixins.json",
     "DistantHorizons.fabric.mixins.json"
   ],
 
diff --git a/fabricLike/build.gradle b/fabricLike/build.gradle
deleted file mode 100644
index 085c3483e..000000000
--- a/fabricLike/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-// TODO: Once forge is fixed, attempt to move the stuff from this submodule to the common submodule
-
-
-plugins {
-    id "org.spongepowered.gradle.vanilla" version "0.2.1-SNAPSHOT"
-}
-
-minecraft {
-    accessWideners(project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener"))
-    version(rootProject.minecraft_version)
-}
-
-
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-//    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-    // So mixins can be written in common
-    compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
-}
-
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.mod_readable_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
diff --git a/fabricLike/src/main/java/com/seibel/lod/fabriclike/wrappers/FabricLikeDependencySetup.java b/fabricLike/src/main/java/com/seibel/lod/fabriclike/wrappers/FabricLikeDependencySetup.java
deleted file mode 100644
index ae1a23a89..000000000
--- a/fabricLike/src/main/java/com/seibel/lod/fabriclike/wrappers/FabricLikeDependencySetup.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.fabriclike.wrappers;
-
-import com.seibel.lod.core.dependencyInjection.SingletonInjector;
-
-/**
- * Binds all necessary dependencies, so we
- * can access them in Core. <br>
- * This needs to be called before any Core classes
- * are loaded.
- * 
- * @author James Seibel
- * @author Ran
- * @version 3-5-2022
- */
-public class FabricLikeDependencySetup {
-	public static void createInitialBindings() {}
-	
-	public static void runDelayedSetup() {}
-}
diff --git a/fabricLike/src/main/resources/DistantHorizons.fabricLike.mixins.json b/fabricLike/src/main/resources/DistantHorizons.fabricLike.mixins.json
deleted file mode 100644
index fe1319a1f..000000000
--- a/fabricLike/src/main/resources/DistantHorizons.fabricLike.mixins.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.seibel.lod.fabriclike.mixins",
-  "mixins": [
-    "server.unsafe.MixinThreadingDetector",
-    "server.MixinChunkGenerator",
-    "server.MixinChunkMap"
-  ],
-  "client": [
-    "client.MixinClientLevel",
-    "client.MixinClientPacketListener",
-    "client.MixinDebugScreenOverlay",
-    "client.MixinFogRenderer",
-    "client.MixinGameRenderer",
-    "client.MixinLevelRenderer",
-    "client.MixinLightmap",
-    "client.MixinOptionsScreen",
-    "client.MixinMinecraft",
-    "client.MixinTextureUtil"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
diff --git a/fabricLike/src/main/resources/LICENSE-MinecraftForge.txt b/fabricLike/src/main/resources/LICENSE-MinecraftForge.txt
deleted file mode 100644
index fe17b67bd..000000000
--- a/fabricLike/src/main/resources/LICENSE-MinecraftForge.txt
+++ /dev/null
@@ -1,458 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/quilt/build.gradle b/quilt/build.gradle
deleted file mode 100644
index 3e8de18d0..000000000
--- a/quilt/build.gradle
+++ /dev/null
@@ -1,139 +0,0 @@
-plugins {
-    id "org.quiltmc.loom" version "1.1.+"
-}
-
-loom {
-    accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener")
-
-    // "runs" isn't required, but when we do need it then it can be useful
-    runs {
-        client {
-            client()
-            setConfigName("Quilt Client")
-            ideConfigGenerated(true)
-            runDir("run")
-        }
-        server {
-            server()
-            setConfigName("Quilt Server")
-            ideConfigGenerated(true)
-            runDir("run")
-        }
-    }
-}
-
-remapJar {
-    // Set the input jar for the task, also valid for remapSourcesJar
-    inputFile = project(":quilt").file("build/libs/DistantHorizons-quilt-${rootProject.versionStr}-all.jar")
-}
-
-configurations {
-    // The addModJar basically embeds the mod to the built jar
-    addModJar
-    include.extendsFrom addModJar
-    modImplementation.extendsFrom addModJar
-}
-
-def addMod(path, enabled) {
-    if (enabled == "2")
-        dependencies { modImplementation(path) }
-    else if (enabled == "1")
-        dependencies { modCompileOnly(path) }
-}
-
-dependencies {
-    minecraft "com.mojang:minecraft:${minecraft_version}"
-    mappings loom.layered() {
-        // Mojmap mappings
-        officialMojangMappings()
-        // Parchment mappings (it adds parameter mappings & javadoc)
-        parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-    }
-    // Quilt loader
-    modImplementation "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
-
-    // Quilted Fabric API
-    modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilted_api_version}" // For now until quilt has a better way of doing this, just use quilt's qfapi
-//    addModJar(fabricApi.module("fabric-events-interaction-v0" , rootProject.quilted_api_version))
-//    addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.quilted_api_version))
-//    addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.quilted_api_version))
-//    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.quilted_api_version))
-//    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.quilted_api_version)) // TODO: Remove this as it is only needed in 1 line (QuiltClientProxy)
-//    addModJar(fabricApi.module("fabric-api-base", rootProject.quilted_api_version))
-
-    // Mod Menu
-    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}")
-
-
-
-    // Starlight
-    addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
-
-    // Phosphor
-    addMod("curse.maven:phosphor-372124:${rootProject.phosphor_version_fabric}", rootProject.enable_phosphor)
-
-    // Sodium
-    addMod("maven.modrinth:sodium:${rootProject.sodium_version}", rootProject.enable_sodium)
-
-	// Lithium
-    addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium)
-
-    // Iris
-    addMod("maven.modrinth:iris:${rootProject.iris_version}", rootProject.enable_iris)
-
-    // BCLib
-    addMod("com.github.paulevsGitch:BCLib:${rootProject.bclib_version}", rootProject.enable_bclib)
-}
-
-
-task deleteResources(type: Delete) {
-    delete file("build/resources/main")
-}
-
-processResources {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
-    dependsOn(deleteDuplicatedCommonLoaderResources)
-}
-
-runClient {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
-    dependsOn(deleteDuplicatedCommonLoaderResources)
-    jvmArgs "-XX:-OmitStackTraceInFastThrow"
-    finalizedBy(deleteResources)
-}
-
-//jar {
-//    classifier "dev"
-//}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-
-    def fabricLikeSources = project(":fabricLike").sourcesJar
-    dependsOn fabricLikeSources
-    from fabricLikeSources.archiveFile.map { zipTree(it) }
-}
-
-//components.java {
-//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-//        skip()
-//    }
-//}
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.mod_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
\ No newline at end of file
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/FabricClientProxy.java b/quilt/src/main/java/com/seibel/lod/quilt/FabricClientProxy.java
deleted file mode 100644
index 21e827857..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/FabricClientProxy.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.quilt;
-
-import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.lod.core.api.internal.ClientApi;
-import com.mojang.blaze3d.platform.InputConstants;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-
-import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
-import com.seibel.lod.core.dependencyInjection.SingletonInjector;
-import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.quilt.wrappers.modAccessor.SodiumAccessor;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
-import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
-import net.fabricmc.fabric.api.event.player.UseBlockCallback;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.TitleScreen;
-
-import java.util.HashSet;
-
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.phys.HitResult;
-import org.apache.logging.log4j.Logger;
-import org.lwjgl.glfw.GLFW;
-
-/**
- * This handles all events sent to the client,
- * and is the starting point for most of the mod.
- * 
- * @author coolGi
- * @author Ran
- * @version 11-23-2021
- */
-@Environment(EnvType.CLIENT)
-public class FabricClientProxy
-{
-	private final ClientApi clientApi = ClientApi.INSTANCE;
-	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	// TODO we shouldn't be filtering keys on the Forge/Fabric side, only in ClientApi
-	private static final int[] KEY_TO_CHECK_FOR = { GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8, GLFW.GLFW_KEY_P};
-	
-	HashSet<Integer> previouslyPressKeyCodes = new HashSet<>();
-	
-	
-	
-	/**
-	 * Registers Fabric Events
-	 * @author Ran
-	 */
-	public void registerEvents()
-	{
-		LOGGER.info("Registering Fabric Client Events");
-		
-		
-		/* Register the mod needed event callbacks */
-		
-		// ClientTickEvent
-		ClientTickEvents.START_CLIENT_TICK.register((client) -> 
-		{
-			//LOGGER.info("ClientTickEvent.START_CLIENT_TICK");
-			ClientApi.INSTANCE.clientTickEvent();
-		});
-		
-		// ClientLevelLoadEvent - Done in MixinClientPacketListener
-		// ClientLevelUnloadEvent - Done in MixinClientPacketListener
-		
-		// ClientChunkLoadEvent
-		// TODO: Is using setClientLightReady one still better?
-		//#if PRE_MC_1_18_1 // in 1.18+, we use mixin hook in setClientLightReady(true)
-		ClientChunkEvents.CHUNK_LOAD.register((level, chunk) ->
-		{
-			ClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-			ClientApi.INSTANCE.clientChunkLoadEvent(
-					new ChunkWrapper(chunk, level, wrappedLevel),
-					wrappedLevel
-			);
-		});
-		
-		// (kinda) block break event
-		AttackBlockCallback.EVENT.register((player, level, interactionHand, blockPos, direction) ->
-		{
-			// if we have access to the server, use the chunk save event instead 
-			if (MC.clientConnectedToDedicatedServer())
-			{
-				// Since fabric doesn't have a client-side break-block API event, this is the next best thing
-				ChunkAccess chunk = level.getChunk(blockPos);
-				if (chunk != null)
-				{
-//					LOGGER.info("attack block at blockpos: " + blockPos);
-					
-					ClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
-					ClientApi.INSTANCE.clientChunkLoadEvent(
-							new ChunkWrapper(chunk, level, wrappedLevel),
-							wrappedLevel
-					);
-				}
-			}
-			
-			// don't stop the callback
-			return InteractionResult.PASS;
-		});
-		
-		// (kinda) block place event
-		UseBlockCallback.EVENT.register((player, level, hand, hitResult) -> 
-		{
-			// if we have access to the server, use the chunk save event instead 
-			if (MC.clientConnectedToDedicatedServer())
-			{
-				// Since fabric doesn't have a client-side place-block API event, this is the next best thing
-				if (hitResult.getType() == HitResult.Type.BLOCK
-						&& !hitResult.isInside())
-				{
-					ChunkAccess chunk = level.getChunk(hitResult.getBlockPos());
-					if (chunk != null)
-					{
-//						LOGGER.info("use block at blockpos: " + hitResult.getBlockPos());
-						
-						ClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
-						ClientApi.INSTANCE.clientChunkLoadEvent(
-								new ChunkWrapper(chunk, level, wrappedLevel),
-								wrappedLevel
-						);
-					}
-				}
-			}
-			
-			// don't stop the callback
-			return InteractionResult.PASS;
-		});
-		
-		//#endif
-		// ClientChunkSaveEvent
-		ClientChunkEvents.CHUNK_UNLOAD.register((level, chunk) ->
-		{
-			ClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-			ClientApi.INSTANCE.clientChunkSaveEvent(
-					new ChunkWrapper(chunk, level, wrappedLevel),
-					wrappedLevel
-			);
-		});
-		
-		// RendererStartupEvent - Done in MixinGameRenderer
-		// RendererShutdownEvent - Done in MixinGameRenderer
-		
-		SodiumAccessor sodiumAccessor = (SodiumAccessor) ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class);
-		
-		// ClientRenderLevelTerrainEvent
-		WorldRenderEvents.AFTER_SETUP.register((renderContext) ->
-		{
-			if (sodiumAccessor != null)
-			{
-				sodiumAccessor.levelWrapper = ClientLevelWrapper.getWrapper(renderContext.world());
-				sodiumAccessor.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
-				sodiumAccessor.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
-				sodiumAccessor.partialTicks = renderContext.tickDelta();
-			}
-			else
-			{
-				clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
-						McObjectConverter.Convert(renderContext.matrixStack().last().pose()),
-						McObjectConverter.Convert(renderContext.projectionMatrix()),
-						renderContext.tickDelta());
-			}
-		});
-
-		// Debug keyboard event
-		// FIXME: Use better hooks so it doesn't trigger even in text boxes
-		ClientTickEvents.END_CLIENT_TICK.register(client -> 
-		{
-			if (client.player != null && isValidTime())
-			{
-				onKeyInput();
-			}
-		});
-	}
-	
-	private boolean isValidTime() { return !(Minecraft.getInstance().screen instanceof TitleScreen); }
-
-//	public void blockChangeEvent(LevelAccessor world, BlockPos pos) {
-//		if (!isValidTime()) return;
-//		IChunkWrapper chunk = new ChunkWrapper(world.getChunk(pos), world);
-//		DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(world.dimensionType());
-//
-//		// recreate the LOD where the blocks were changed
-//		// TODO: serverApi.blockChangeEvent(chunk, dimType);
-//	}
-	
-	public void onKeyInput()
-	{
-		HashSet<Integer> currentKeyDown = new HashSet<>();
-		
-		// Note: Minecraft's InputConstants is same as GLFW Key values
-		//TODO: Use mixin to hook directly into the GLFW Keyboard event in minecraft KeyboardHandler
-		// Check all keys we need
-		for (int keyCode = GLFW.GLFW_KEY_A; keyCode <= GLFW.GLFW_KEY_Z; keyCode++)
-		{
-			if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			{
-				currentKeyDown.add(keyCode);
-			}
-		}
-		
-		for (int keyCode : KEY_TO_CHECK_FOR)
-		{
-			if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			{
-				currentKeyDown.add(keyCode);
-			}
-		}
-		
-		// Diff and trigger events
-		for (int keyCode : currentKeyDown)
-		{
-			if (!previouslyPressKeyCodes.contains(keyCode))
-			{
-				ClientApi.INSTANCE.keyPressedEvent(keyCode);
-			}
-		}
-		
-		// Update the set
-		previouslyPressKeyCodes = currentKeyDown;
-	}
-	
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/FabricDedicatedServerMain.java b/quilt/src/main/java/com/seibel/lod/quilt/FabricDedicatedServerMain.java
deleted file mode 100644
index eb7591daf..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/FabricDedicatedServerMain.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.seibel.lod.quilt;
-
-import com.seibel.lod.common.wrappers.DependencySetup;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftDedicatedServerWrapper;
-import com.seibel.lod.core.util.LodUtil;
-import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.minecraft.server.dedicated.DedicatedServer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-@Environment(EnvType.SERVER)
-public class FabricDedicatedServerMain implements DedicatedServerModInitializer
-{
-	private static final Logger LOGGER = LogManager.getLogger(FabricDedicatedServerMain.class.getSimpleName());
-	
-	public static FabricServerProxy server_proxy;
-    public boolean hasPostSetupDone = false;
-
-    @Override
-    public void onInitializeServer() {
-        DependencySetup.createServerBindings();
-        FabricMain.init();
-
-        server_proxy = new FabricServerProxy(true);
-        server_proxy.registerEvents();
-
-        ServerLifecycleEvents.SERVER_STARTING.register((server) -> {
-            if (hasPostSetupDone) return;
-            hasPostSetupDone = true;
-            LodUtil.assertTrue(server instanceof DedicatedServer);
-            MinecraftDedicatedServerWrapper.INSTANCE.dedicatedServer = (DedicatedServer) server;
-            FabricMain.postInit();
-            LOGGER.info("Dedicated server inited at {}", server.getServerDirectory());
-        });
-    }
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/FabricMain.java b/quilt/src/main/java/com/seibel/lod/quilt/FabricMain.java
deleted file mode 100644
index 6bb74134c..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/FabricMain.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.quilt;
-
-import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
-import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
-import com.seibel.lod.common.LodCommonMain;
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.config.Config;
-import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
-import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
-import com.seibel.lod.core.dependencyInjection.SingletonInjector;
-import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.*;
-import com.seibel.lod.quilt.wrappers.modAccessor.BCLibAccessor;
-import com.seibel.lod.quilt.wrappers.modAccessor.OptifineAccessor;
-import com.seibel.lod.quilt.wrappers.modAccessor.SodiumAccessor;
-import com.seibel.lod.quilt.wrappers.modAccessor.StarlightAccessor;
-import com.seibel.lod.quilt.wrappers.FabricDependencySetup;
-
-import org.apache.logging.log4j.Logger;
-
-/**
- * Initialize and setup the Mod. <br>
- * If you are looking for the real start of the mod
- * check out the ClientProxy.
- * 
- * @author coolGi
- * @author Ran
- * @version 9-2-2022
- */
-public class FabricMain
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-
-	public static void postInit() {
-		LOGGER.info("Post-Initializing Mod");
-		FabricDependencySetup.runDelayedSetup();
-
-		if (Config.Client.Graphics.FogQuality.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib"))
-			ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog
-
-		LOGGER.info("Mod Post-Initialized");
-	}
-
-
-	// This loads the mod after minecraft loads which doesn't causes a lot of issues
-	public static void init()
-	{
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
-		
-		LOGGER.info("Initializing Mod");
-		LodCommonMain.startup(null);
-		FabricDependencySetup.createInitialBindings();
-		LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-
-		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium")) {
-			ModAccessorInjector.INSTANCE.bind(ISodiumAccessor.class, new SodiumAccessor());
-		}
-		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("starlight")) {
-			ModAccessorInjector.INSTANCE.bind(IStarlightAccessor.class, new StarlightAccessor());
-		}
-		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("optifine")) {
-			ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
-		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib")) {
-			ModAccessorInjector.INSTANCE.bind(IBCLibAccessor.class, new BCLibAccessor());
-		}
-		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
-
-		// Init config
-		// The reason im initialising in this rather than the post init process is cus im using this for the auto updater
-		LodCommonMain.initConfig();
-	}
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/FabricServerProxy.java b/quilt/src/main/java/com/seibel/lod/quilt/FabricServerProxy.java
deleted file mode 100644
index 24fe8dfdc..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/FabricServerProxy.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.seibel.lod.quilt;
-
-import com.seibel.lod.common.networking.Networking;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.lod.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.core.api.internal.ServerApi;
-import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import org.apache.logging.log4j.Logger;
-
-import java.util.function.Supplier;
-
-/**
- * This handles all events sent to the server,
- * and is the starting point for most of the mod.
- *
- * @author Ran
- * @author Tomlee
- * @version 5-11-2022
- */
-public class FabricServerProxy
-{
-	private static final ServerApi SERVER_API = ServerApi.INSTANCE;
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	private final boolean isDedicated;
-	public static Supplier<Boolean> isGenerationThreadChecker = null;
-	
-	
-	
-	public FabricServerProxy(boolean isDedicated)
-	{
-		this.isDedicated = isDedicated;
-	}
-	
-	
-	
-	private boolean isValidTime()
-	{
-		if (isDedicated)
-		{
-			return true;
-		}
-		
-		//FIXME: This may cause init issue...
-		return !(Minecraft.getInstance().screen instanceof TitleScreen);
-	}
-	
-	private ClientLevelWrapper getClientLevelWrapper(ClientLevel level) { return ClientLevelWrapper.getWrapper(level); }
-	private ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); }
-	
-	/** Registers Fabric Events */
-	public void registerEvents()
-	{
-		LOGGER.info("Registering Fabric Server Events");
-		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-		
-		/* Register the mod needed event callbacks */
-		
-		// TEST EVENT
-		//ServerTickEvents.END_SERVER_TICK.register(this::tester);
-		
-		// ServerTickEvent
-		ServerTickEvents.END_SERVER_TICK.register((server) -> SERVER_API.serverTickEvent());
-		
-		// ServerWorldLoadEvent
-		//TODO: Check if both of these use the correct timed events. (i.e. is it 'ed' or 'ing' one?)
-		ServerLifecycleEvents.SERVER_STARTING.register((server) -> 
-		{
-			if (isValidTime())
-			{
-				ServerApi.INSTANCE.serverLoadEvent(isDedicated);
-			}
-		});
-		// ServerWorldUnloadEvent
-		ServerLifecycleEvents.SERVER_STOPPED.register((server) -> 
-		{
-			if (isValidTime())
-			{
-				ServerApi.INSTANCE.serverUnloadEvent();
-			}
-		});
-		
-		// ServerLevelLoadEvent
-		ServerWorldEvents.LOAD.register((server, level) -> 
-		{
-			if (isValidTime())
-			{
-				ServerApi.INSTANCE.serverLevelLoadEvent(getServerLevelWrapper(level));
-			}
-		});
-		// ServerLevelUnloadEvent
-		ServerWorldEvents.UNLOAD.register((server, level) -> 
-		{
-			if (isValidTime())
-			{
-				ServerApi.INSTANCE.serverLevelUnloadEvent(getServerLevelWrapper(level));
-			}
-		});
-		
-		// ServerChunkLoadEvent
-		ServerChunkEvents.CHUNK_LOAD.register((server, chunk) -> 
-		{
-			ILevelWrapper level = getServerLevelWrapper((ServerLevel) chunk.getLevel());
-			if (isValidTime())
-			{
-				ServerApi.INSTANCE.serverChunkLoadEvent(
-						new ChunkWrapper(chunk, chunk.getLevel(), level),
-						level);
-			}
-		});
-		// ServerChunkSaveEvent - Done in MixinChunkMap
-	}
-	
-	// This just exists here for testing purposes, it'll be removed in the future
-	public void tester(MinecraftServer server)
-	{ // I disabled the Networking functions for now so this will not work atm - coolGi
-		for (ServerPlayer player : server.getPlayerList().getPlayers())
-		{
-			FriendlyByteBuf payload = Networking.createNew();
-			payload.writeInt(1);
-			System.out.println("Sending int 1");
-			Networking.send(player, payload);
-		}
-	}
-	
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/QuiltClientMain.java b/quilt/src/main/java/com/seibel/lod/quilt/QuiltClientMain.java
deleted file mode 100644
index 3b01a24eb..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/QuiltClientMain.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.seibel.lod.quilt;
-
-import com.seibel.lod.common.wrappers.DependencySetup;
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.loader.api.minecraft.ClientOnly;
-import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
-import org.quiltmc.qsl.lifecycle.api.client.event.ClientLifecycleEvents;
-
-@ClientOnly
-public class QuiltClientMain implements ClientModInitializer
-{
-	public static FabricClientProxy client_proxy;
-	public static FabricServerProxy server_proxy;
-	
-	
-	// Do if implements ClientModInitializer
-	// This loads the mod before minecraft loads which causes a lot of issues
-	@Override
-	public void onInitializeClient(ModContainer mod) {
-		DependencySetup.createClientBindings();
-		FabricMain.init();
-
-		server_proxy = new FabricServerProxy(false);
-		server_proxy.registerEvents();
-
-		client_proxy = new FabricClientProxy();
-		client_proxy.registerEvents();
-
-		ClientLifecycleEvents.READY.register((mc) -> FabricMain.postInit());
-	}
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/mixins/FabricMixinPlugin.java b/quilt/src/main/java/com/seibel/lod/quilt/mixins/FabricMixinPlugin.java
deleted file mode 100644
index a1e4a5db7..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/mixins/FabricMixinPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.seibel.lod.quilt.mixins;
-
-import org.objectweb.asm.tree.ClassNode;
-import org.quiltmc.loader.api.QuiltLoader;
-import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
-import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author coolGi
- * @author cortex
- */
-// TODO: Move to common if possible
-public class FabricMixinPlugin implements IMixinConfigPlugin {
-
-    @Override
-    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (mixinClassName.contains(".mods.")) { // If the mixin wants to go into a mod then we check if that mod is loaded or not
-            return QuiltLoader.isModLoaded(
-                    mixinClassName
-                            // What these 2 regex's do is get the mod name that we are checking out of the mixinClassName
-                            // Eg. "com.seibel.lod.mixins.mods.sodium.MixinSodiumChunkRenderer" turns into "sodium"
-                            .replaceAll("^.*mods.", "") // Replaces everything before the mods
-                            .replaceAll("\\..*$", "") // Replaces everything after the mod name
-            );
-        }
-        return true;
-    }
-
-
-    @Override
-    public void onLoad(String mixinPackage) {
-
-    }
-
-    @Override
-    public String getRefMapperConfig() {
-        return null;
-    }
-
-    @Override
-    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
-
-    }
-
-    @Override
-    public List<String> getMixins() {
-        return null;
-    }
-
-    @Override
-    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
-
-    @Override
-    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
-}
\ No newline at end of file
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/mixins/mods/sodium/MixinSodiumChunkRenderer.java b/quilt/src/main/java/com/seibel/lod/quilt/mixins/mods/sodium/MixinSodiumChunkRenderer.java
deleted file mode 100644
index dbb663c75..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/mixins/mods/sodium/MixinSodiumChunkRenderer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.seibel.lod.quilt.mixins.mods.sodium;
-
-import com.seibel.lod.core.api.internal.ClientApi;
-import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.quilt.wrappers.modAccessor.SodiumAccessor;
-import me.jellysquid.mods.sodium.client.gl.device.CommandList;
-import me.jellysquid.mods.sodium.client.render.chunk.ChunkCameraContext;
-import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderList;
-import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderMatrices;
-import me.jellysquid.mods.sodium.client.render.chunk.RegionChunkRenderer;
-import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(RegionChunkRenderer.class)
-public class MixinSodiumChunkRenderer {
-    @Unique SodiumAccessor accessor = null;
-    @Inject(remap = false, method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/render/chunk/ShaderChunkRenderer;begin(Lme/jellysquid/mods/sodium/client/render/chunk/passes/BlockRenderPass;)V", shift = At.Shift.AFTER))
-    private void injectDHLoDRendering(ChunkRenderMatrices matrices, CommandList commandList, ChunkRenderList list, BlockRenderPass pass, ChunkCameraContext camera, CallbackInfo ci) {
-        if (accessor == null) {
-            accessor = (SodiumAccessor)ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class);
-        }
-        if (pass.equals(BlockRenderPass.SOLID)) {
-            //TODO: use matrices.modelView() and matrices.projection() instead of
-            // SodiumAccessor.mcModelViewMatrix,
-            // SodiumAccessor.mcProjectionMatrix,
-            ClientApi.INSTANCE.renderLods(accessor.levelWrapper,
-                    accessor.mcModelViewMatrix,
-                    accessor.mcProjectionMatrix,
-                    accessor.partialTicks);
-        }
-    }
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/mixins/server/MixinUtilBackgroundThread.java b/quilt/src/main/java/com/seibel/lod/quilt/mixins/server/MixinUtilBackgroundThread.java
deleted file mode 100644
index b8ebbbdee..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/mixins/server/MixinUtilBackgroundThread.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.mixins.server;
-
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
-import com.seibel.lod.quilt.FabricServerProxy;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.seibel.lod.core.util.objects.DummyRunExecutorService;
-
-import net.minecraft.Util;
-
-@Mixin(Util.class)
-public class MixinUtilBackgroundThread
-{
-	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
-	{
-		if (FabricServerProxy.isGenerationThreadChecker != null && FabricServerProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(new DummyRunExecutorService());
-		}
-	}
-
-	#if POST_MC_1_17_1
-	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
-			at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
-	{
-		if (FabricServerProxy.isGenerationThreadChecker != null && FabricServerProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	#endif
-	#if POST_MC_1_18_1
-	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
-			at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
-	{
-		if (FabricServerProxy.isGenerationThreadChecker != null && FabricServerProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	#endif
-
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/FabricDependencySetup.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/FabricDependencySetup.java
deleted file mode 100644
index bd7145862..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/FabricDependencySetup.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.wrappers;
-
-import com.seibel.lod.core.dependencyInjection.SingletonInjector;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.quilt.wrappers.modAccessor.ModChecker;
-import com.seibel.lod.fabriclike.wrappers.FabricLikeDependencySetup;
-
-/**
- * Binds all necessary dependencies, so we
- * can access them in Core. <br>
- * This needs to be called before any Core classes
- * are loaded.
- * 
- * @author James Seibel
- * @author Ran
- * @version 3-5-2022
- */
-public class FabricDependencySetup
-{
-	public static void createInitialBindings() {
-		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
-		FabricLikeDependencySetup.createInitialBindings();
-	}
-	
-	public static void runDelayedSetup() {
-		FabricLikeDependencySetup.runDelayedSetup();
-		SingletonInjector.INSTANCE.runDelayedSetup();
-	}
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/config/ModMenuIntegration.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/config/ModMenuIntegration.java
deleted file mode 100644
index 2ccb4fafe..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/config/ModMenuIntegration.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.wrappers.config;
-
-import com.seibel.lod.common.wrappers.gui.GetConfigScreen;
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-
-/**
- * For making the config show up in modmenu
- */
-public class ModMenuIntegration implements ModMenuApi {
-    // For the custom config code
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> GetConfigScreen.getScreen(parent);
-    }
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/BCLibAccessor.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/BCLibAccessor.java
deleted file mode 100644
index c54472d90..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/BCLibAccessor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.seibel.lod.quilt.wrappers.modAccessor;
-
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor;
-import ru.bclib.config.ClientConfig;
-import ru.bclib.config.Configs;
-import ru.bclib.util.BackgroundInfo;
-
-import java.awt.*;
-
-public class BCLibAccessor implements IBCLibAccessor {
-    @Override
-    public String getModName() {
-        return "BCLib";
-    }
-
-    public void setRenderCustomFog(boolean newValue) {
-        // Change the value of CUSTOM_FOG_RENDERING in the bclib client config
-        Configs.CLIENT_CONFIG.set(ClientConfig.CUSTOM_FOG_RENDERING, newValue);
-    }
-
-    @Override
-    public Color getFogColor() {
-        return new Color(BackgroundInfo.fogColorRed, BackgroundInfo.fogColorGreen, BackgroundInfo.fogColorBlue);
-    }
-}
\ No newline at end of file
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/ModChecker.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/ModChecker.java
deleted file mode 100644
index 482f48d74..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/ModChecker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.wrappers.modAccessor;
-
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import org.quiltmc.loader.api.QuiltLoader;
-
-public class ModChecker implements IModChecker {
-    public static final ModChecker INSTANCE = new ModChecker();
-
-    @Override
-    public boolean isModLoaded(String modid) {
-        return QuiltLoader.isModLoaded(modid);
-    }
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/OptifineAccessor.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/OptifineAccessor.java
deleted file mode 100644
index 74f4af83e..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/OptifineAccessor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.wrappers.modAccessor;
-
-import java.util.HashSet;
-
-import com.seibel.lod.core.pos.DhChunkPos;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-
-public class OptifineAccessor extends AbstractOptifineAccessor
-{
-
-	@Override
-	public String getModName()
-	{
-		return "Optifine-Fabric-1.18.X";
-	}
-
-	@Override
-	public HashSet<DhChunkPos> getNormalRenderedChunks()
-	{
-		// TODO: Impl proper methods here
-		return null;
-	}
-	
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/SodiumAccessor.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/SodiumAccessor.java
deleted file mode 100644
index eb0a86860..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/SodiumAccessor.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.wrappers.modAccessor;
-
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import com.seibel.lod.core.pos.DhChunkPos;
-import com.seibel.lod.core.dependencyInjection.SingletonInjector;
-import com.seibel.lod.core.util.math.Mat4f;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-
-
-import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper;
-import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
-import net.minecraft.client.Minecraft;
-#if PRE_MC_1_17_1
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.phys.AABB;
-#else
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
-
-public class SodiumAccessor implements ISodiumAccessor {
-	private final IWrapperFactory factory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-	private final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
-
-	public IClientLevelWrapper levelWrapper;
-	public Mat4f mcModelViewMatrix;
-	public Mat4f mcProjectionMatrix;
-	public float partialTicks;
-
-	@Override
-	public String getModName() {
-		return "Sodium-Fabric";
-	}
-
-	#if POST_MC_1_17_1
-	@Override
-	public HashSet<DhChunkPos> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
-		LevelHeightAccessor height =  Minecraft.getInstance().level;
-
-		#if POST_MC_1_18_1
-		// 0b11 = Lighted chunk & loaded chunk
-		return renderer.getChunkTracker().getChunks(0b00).filter(
-			(long l) -> {
-				return true;
-			}).mapToObj(DhChunkPos::new).collect(Collectors.toCollection(HashSet::new));
-		#else
-		// TODO: Maybe use a mixin to make this more efficient, and maybe ignore changes behind the camera
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DHChunkPos chunk) -> {
-			return (renderer.isBoxVisible(
-					chunk.getMinBlockX()+1, height.getMinBuildHeight()+1, chunk.getMinBlockZ()+1,
-					chunk.getMinBlockX()+15, height.getMaxBuildHeight()-1, chunk.getMinBlockZ()+15));
-		}).collect(Collectors.toCollection(HashSet::new));
-		#endif
-	}
-	#else
-	@Override
-	public HashSet<DHChunkPos> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance();
-		LevelAccessor height = Minecraft.getInstance().level;
-		// TODO: Maybe use a mixin to make this more efficient
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DHChunkPos chunk) -> {
-			FakeChunkEntity AABB = new FakeChunkEntity(chunk.getX(), chunk.getZ(), height.getMaxBuildHeight());
-			return (renderer.isEntityVisible(AABB));
-		}).collect(Collectors.toCollection(HashSet::new));
-	}
-
-	private static class FakeChunkEntity extends Entity {
-		public int cx;
-		public int cz;
-		public int my;
-		public FakeChunkEntity(int chunkX, int chunkZ, int maxHeight) {
-			super(EntityType.AREA_EFFECT_CLOUD, null);
-			cx = chunkX;
-			cz = chunkZ;
-			my = maxHeight;
-		}
-		@Override
-		public AABB getBoundingBoxForCulling() {
-			return new AABB(cx*16+1, 1, cz*16+1,
-					cx*16+15, my-1, cz*16+15);
-		}
-		@Override
-		protected void defineSynchedData() {}
-		@Override
-		protected void readAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		protected void addAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		public Packet<?> getAddEntityPacket() {
-			throw new UnsupportedOperationException("This is a FAKE CHUNK ENTITY... For tricking the Sodium to check a AABB.");
-		}
-	}
-	#endif
-
-}
diff --git a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/StarlightAccessor.java b/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/StarlightAccessor.java
deleted file mode 100644
index bfee01f18..000000000
--- a/quilt/src/main/java/com/seibel/lod/quilt/wrappers/modAccessor/StarlightAccessor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2022  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package com.seibel.lod.quilt.wrappers.modAccessor;
-
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
-
-
-public class StarlightAccessor implements IStarlightAccessor {
-
-	@Override
-	public String getModName() {
-		return "Starlight-Fabric-1.18.X";
-	}
-	
-	public StarlightAccessor() {
-		
-	}
-}
diff --git a/quilt/src/main/resources/DistantHorizons.quilt.mixins.json b/quilt/src/main/resources/DistantHorizons.quilt.mixins.json
deleted file mode 100644
index 41fcd37e3..000000000
--- a/quilt/src/main/resources/DistantHorizons.quilt.mixins.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.seibel.lod.quilt.mixins",
-  "mixins": [
-    "server.MixinUtilBackgroundThread"
-  ],
-  "client": [
-    "mods.sodium.MixinSodiumChunkRenderer"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "plugin": "com.seibel.lod.quilt.mixins.FabricMixinPlugin"
-}
diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json
deleted file mode 100644
index 642b60169..000000000
--- a/quilt/src/main/resources/quilt.mod.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "schema_version": 1,
-  "quilt_loader": {
-    "group": "${group}",
-    "id": "lod",
-    "version": "${version}",
-
-    "metadata": {
-      "name": "${mod_name}",
-      "description": "${description}",
-      "contributors": $quilt_contributors,
-
-      "contact": {
-        "homepage": "${homepage}",
-        "sources": "${source}",
-        "issues": "${issues}"
-      },
-
-      "license": "LGPL-3.0",
-      "icon": "icon.png"
-    },
-
-    "intermediate_mappings": "net.fabricmc:intermediary",
-
-
-    "entrypoints": {
-      "client_init": [
-        "com.seibel.lod.quilt.QuiltClientMain"
-      ],
-      "server": [
-        "com.seibel.lod.quilt.FabricDedicatedServerMain"
-      ],
-
-      "modmenu": [
-        "com.seibel.lod.quilt.wrappers.config.ModMenuIntegration"
-      ]
-    },
-
-
-    "depends": [
-      "quilt_loader",
-      "quilted_fabric_api_base",
-      "quilted_fabric_lifecycle_events_v1",
-      "quilted_fabric_key_binding_api_v1",
-      "quilted_fabric_key_binding_api_v1",
-      "quilted_fabric_resource_loader_v0",
-      {
-        "id": "minecraft",
-        "versions": $compatible_minecraft_versions
-      },
-      {
-        "id": "java",
-        "versions": ">=${java_version}"
-      }
-    ]
-  },
-  "access_widener": "lod.accesswidener",
-
-  "mixin": [
-    "DistantHorizons.quilt.fabricLike.mixins.json",
-    "DistantHorizons.quilt.mixins.json"
-  ],
-
-  "minecraft": {
-    "environment": "*"
-  },
-
-  "custom": {
-    "modmenu": {
-      "links": {
-        "modmenu.discord": "${discord}"
-      }
-    }
-  }
-}
diff --git a/settings.gradle b/settings.gradle
index 35ddae696..d7876192d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -75,8 +75,8 @@ project(":api").projectDir = file('coreSubProjects/api')
 // Minecraft dependent sub-projects
 include("common")
 // Enables or disables the subprojects depending on whats in the version.properties
-if (gradle.builds_for.contains("fabric") || gradle.builds_for.contains("quilt"))
-    include("fabricLike")
+//if (gradle.builds_for.contains("fabric") || gradle.builds_for.contains("quilt"))
+//    include("fabricLike")
 if (gradle.builds_for.contains("fabric"))
     include("fabric")
 if (gradle.builds_for.contains("quilt"))
diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties
index 130043652..20bbc845a 100644
--- a/versionProperties/1.18.2.properties
+++ b/versionProperties/1.18.2.properties
@@ -4,7 +4,7 @@ minecraft_version=1.18.2
 parchment_version=2022.11.06
 compatible_minecraft_versions=["1.18.2"]
 accessWidenerVersion=1_18
-builds_for=["fabric", "quilt", "forge"]
+builds_for=["fabric", "forge"]
 
 # Fabric loader
 fabric_loader_version=0.14.14