Merge branch 'master' of github.com:Polyfrost/OneConfig

36 files changed, 388 insertions, 204 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 43b495a..e9d942f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
 import gg.essential.gradle.util.noServerRunConfigs
+import gg.essential.gradle.util.prebundle
 
 plugins {
     kotlin("jvm")
@@ -59,6 +61,15 @@ repositories {
     maven("https://repo.polyfrost.cc/releases")
 }
 
+val relocated = registerRelocationAttribute("relocate") {
+    relocate("gg.essential", "cc.polyfrost.oneconfig.libs")
+    relocate("me.kbrewster", "cc.polyfrost.oneconfig.libs")
+}
+
+val shadeRelocated: Configuration by configurations.creating {
+    attributes { attribute(relocated, true) }
+}
+
 val shade: Configuration by configurations.creating {
     configurations.implementation.get().extendsFrom(this)
 }
@@ -94,25 +105,33 @@ dependencies {
         isTransitive = false
     }
 
-    shade("gg.essential:universalcraft-$platform:211") {
+    shadeRelocated("gg.essential:universalcraft-$platform:211") {
         isTransitive = false
     }
 
-    shade("com.github.KevinPriv:keventbus:c52e0a2ea0") {
+    shadeRelocated("com.github.KevinPriv:keventbus:c52e0a2ea0") {
         isTransitive = false
     }
 
     // for other mods and universalcraft
-    shade("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
-    shade("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21")
-    shade("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
-    shade("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
-    shade("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
-    shade("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1")
-    shade("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.1")
-    shade("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.3.3")
-    shade("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.3")
-    shade("org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm:1.3.3")
+    val kotlinVersion: String by project
+    val coroutinesVersion: String by project
+    val serializationVersion: String by project
+    val atomicfuVersion: String by project
+    val datetimeVersion: String by project
+    shade("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+    shade("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
+    shade("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
+    shade("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+
+    shade("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+    shade("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$coroutinesVersion")
+    shade("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
+    shade("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:$serializationVersion")
+    shade("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:$serializationVersion")
+    shade("org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm:$serializationVersion")
+    shade("org.jetbrains.kotlinx:atomicfu-jvm:$atomicfuVersion")
+    shade("org.jetbrains.kotlinx:kotlinx-datetime-jvm:$datetimeVersion")
 
     shade("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
         isTransitive = false
@@ -135,6 +154,7 @@ dependencies {
     lwjglNative("org.lwjgl:lwjgl-tinyfd:3.3.1:natives-macos")
     lwjglNative("org.lwjgl:lwjgl-nanovg:3.3.1:natives-macos")
     shade(lwjglJar.get().outputs.files)
+    shade(prebundle(shadeRelocated))
 
     dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21")
 }
@@ -186,6 +206,9 @@ tasks {
             exclude("fabric.mod.json")
             if (project.platform.isLegacyForge) {
                 exclude("mods.toml")
+                exclude("META-INF/versions/**")
+                exclude("**/module-info.class")
+                exclude("**/package-info.class")
             } else {
                 exclude("mcmod.info")
             }
@@ -199,9 +222,6 @@ tasks {
         archiveClassifier.set("dev")
         configurations = listOf(shade, lwjglNative)
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-        relocate("gg.essential", "cc.polyfrost.oneconfig.libs")
-        relocate("me.kbrewster", "cc.polyfrost.oneconfig.libs")
     }
     remapJar {
         input.set(shadowJar.get().archiveFile)
diff --git a/gradle.properties b/gradle.properties
index 2d80be3..8471818 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,3 +10,9 @@ org.gradle.parallel=true
 org.gradle.configureoncommand=true
 org.gradle.parallel.threads=4
 org.gradle.jvmargs=-Xmx2G
+
+kotlinVersion=1.7.0
+coroutinesVersion=1.6.2
+serializationVersion=1.3.3
+atomicfuVersion=0.17.3
+datetimeVersion=0.3.3
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4995b5d..da56434 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
         maven("https://maven.architectury.dev/")
     }
     plugins {
-        val egtVersion = "0.1.7"
+        val egtVersion = "0.1.10"
         id("gg.essential.multi-version.root") version egtVersion
     }
     resolutionStrategy {
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java b/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java
index d455411..d62247c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java
@@ -1,6 +1,6 @@
 package cc.polyfrost.oneconfig.config.core;
 
-import gg.essential.universal.UKeyboard;
+import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java b/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java
index 05bb196..8492806 100644
--- a/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java
@@ -1,7 +1,7 @@
 package cc.polyfrost.oneconfig.events;
 
-import me.kbrewster.eventbus.EventBus;
-import me.kbrewster.eventbus.invokers.LMFInvoker;
+import cc.polyfrost.oneconfig.libs.eventbus.EventBus;
+import cc.polyfrost.oneconfig.libs.eventbus.invokers.LMFInvoker;
 
 /**
  * Manages all events from OneConfig.
@@ -10,13 +10,9 @@ public final class EventManager {
     /**
      * The instance of the {@link EventManager}.
      */
-    private static final EventManager INSTANCE = new EventManager();
+    public static final EventManager INSTANCE = new EventManager();
     private final EventBus eventBus = new EventBus(new LMFInvoker(), Throwable::printStackTrace);
 
-    public static EventManager getEventManager() {
-        return INSTANCE;
-    }
-
     private EventManager() {
 
     }
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
index 13174ab..939bbaa 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
@@ -4,9 +4,9 @@ import cc.polyfrost.oneconfig.internal.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.hud.BasicHud;
 import cc.polyfrost.oneconfig.internal.hud.HudCore;
 import cc.polyfrost.oneconfig.renderer.RenderManager;
-import gg.essential.universal.UKeyboard;
-import gg.essential.universal.UMatrixStack;
-import gg.essential.universal.UScreen;
+import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
+import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
+import cc.polyfrost.oneconfig.libs.universal.UScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
index 07a60ee..3172336 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
@@ -17,10 +17,10 @@ import cc.polyfrost.oneconfig.renderer.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
-import gg.essential.universal.UKeyboard;
-import gg.essential.universal.UMatrixStack;
-import gg.essential.universal.UResolution;
-import gg.essential.universal.UScreen;
+import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
+import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
+import cc.polyfrost.oneconfig.libs.universal.UResolution;
+import cc.polyfrost.oneconfig.libs.universal.UScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
index 893d628..e5d187f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
@@ -14,7 +14,7 @@ import cc.polyfrost.oneconfig.renderer.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
 import cc.polyfrost.oneconfig.utils.color.ColorUtils;
-import gg.essential.universal.wrappers.UPlayer;
+import cc.polyfrost.oneconfig.libs.universal.wrappers.UPlayer;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.fml.common.ModMetadata;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java
index 5c239c0..b7d1a68 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java
@@ -10,7 +10,7 @@ import cc.polyfrost.oneconfig.renderer.RenderManager;
 import cc.polyfrost.oneconfig.renderer.font.Fonts;
 import cc.polyfrost.oneconfig.internal.assets.SVGs;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
-import gg.essential.universal.UKeyboard;
+import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
 
 import java.lang.reflect.Field;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
index 559b2b2..a43b969 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
@@ -10,7 +10,7 @@ import cc.polyfrost.oneconfig.renderer.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.MathUtils;
 import cc.polyfrost.oneconfig.utils.TextUtils;
-import gg.essential.universal.UKeyboard;
+import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java b/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java
index 29c6d89..738ed21 100644
--- a/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java
+++ b/src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java
@@ -1,7 +1,7 @@
 package cc.polyfrost.oneconfig.hud;
 
 import cc.polyfrost.oneconfig.renderer.RenderManager;
-import gg.essential.universal.UMinecraft;
+import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
 
 import java.util.List;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
index 389e200..b3c6823 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
@@ -58,8 +58,8 @@ public class OneConfig {
         GuiUtils.getDeltaTime(); // called to make sure static initializer is called
         BlurHandler.INSTANCE.load();
         CommandManager.INSTANCE.registerCommand(OneConfigCommand.class);
-        EventManager.getEventManager().register(new HudCore());
-        EventManager.getEventManager().register(HypixelUtils.INSTANCE);
+        EventManager.INSTANCE.register(new HudCore());
+        EventManager.INSTANCE.register(HypixelUtils.INSTANCE);
         reloadModsList();
         initialized = true;
     }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/gui/BlurHandler.java b/src/main/java/cc/polyfrost/oneconfig/internal/gui/BlurHandler.java
index d248df8..4aa94d9 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/gui/BlurHandler.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/gui/BlurHandler.java
@@ -6,9 +6,9 @@ import cc.polyfrost.oneconfig.events.event.ScreenOpenEvent;
 import cc.polyfrost.oneconfig.events.event.Stage;
 import cc.polyfrost.oneconfig.gui.OneConfigGui;
 import cc.polyfrost.oneconfig.internal.mixin.ShaderGroupAccessor;
-import gg.essential.universal.UMinecraft;
-import gg.essential.universal.UScreen;
-import me.kbrewster.eventbus.Subscribe;
+import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
+import cc.polyfrost.oneconfig.libs.universal.UScreen;
+import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.shader.Shader;
@@ -43,7 +43,7 @@ public class BlurHandler {
      * Simply initializes the blur mod so events are properly handled by forge.
      */
     public void load() {
-        EventManager.getEventManager().register(this);
+        EventManager.INSTANCE.register(this);
     }
 
     @Subscribe
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/hud/HudCore.java b/src/main/java/cc/polyfrost/oneconfig/internal/hud/HudCore.java
index 7c92799..04a5e69 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/hud/HudCore.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/hud/HudCore.java
@@ -2,8 +2,8 @@ package cc.polyfrost.oneconfig.internal.hud;
 
 import cc.polyfrost.oneconfig.events.event.HudRenderEvent;
 import cc.polyfrost.oneconfig.hud.BasicHud;
-import gg.essential.universal.UResolution;
-import me.kbrewster.eventbus.Subscribe;
+import cc.polyfrost.oneconfig.libs.universal.UResolution;
+import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java
index 8422e1e..f08d37e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java
@@ -12,6 +12,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class GuiIngameForgeMixin {
     @Inject(method = "renderGameOverlay", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/GuiIngameForge;post(Lnet/minecraftforge/client/event/RenderGameOverlayEvent$ElementType;)V", shift = At.Shift.AFTER, remap = false), remap = true)
     private void onRenderGameOverlay(float partialTicks, CallbackInfo ci) {
-        EventManager.getEventManager().post(new HudRenderEvent(partialTicks));
+        EventManager.INSTANCE.post(new HudRenderEvent(partialTicks));
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java
index 6456cf9..8a28bed 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java
@@ -27,28 +27,28 @@ public class MinecraftMixin {
 
     @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/client/FMLClientHandler;onInitializationComplete()V", shift = At.Shift.AFTER, remap = false), remap = true)
     private void onInit(CallbackInfo ci) {
-        EventManager.getEventManager().post(new InitializationEvent());
+        EventManager.INSTANCE.post(new InitializationEvent());
         OneConfig.init();
     }
 
     @Inject(method = "runGameLoop", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;onRenderTickStart(F)V", shift = At.Shift.AFTER, remap = false), remap = true)
     private void onRenderTickStart(CallbackInfo ci) {
-        EventManager.getEventManager().post(new RenderEvent(Stage.START, timer.renderPartialTicks));
+        EventManager.INSTANCE.post(new RenderEvent(Stage.START, timer.renderPartialTicks));
     }
 
     @Inject(method = "runGameLoop", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;onRenderTickEnd(F)V", shift = At.Shift.AFTER, remap = false), remap = true)
     private void onRenderTickEnd(CallbackInfo ci) {
-        EventManager.getEventManager().post(new RenderEvent(Stage.END, timer.renderPartialTicks));
+        EventManager.INSTANCE.post(new RenderEvent(Stage.END, timer.renderPartialTicks));
     }
 
     @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;onPreClientTick()V", shift = At.Shift.AFTER, remap = false), remap = true)
     private void onClientTickStart(CallbackInfo ci) {
-        EventManager.getEventManager().post(new TickEvent(Stage.START));
+        EventManager.INSTANCE.post(new TickEvent(Stage.START));
     }
 
     @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;onPostClientTick()V", shift = At.Shift.AFTER, remap = false), remap = true)
     private void onClientTickEnd(CallbackInfo ci) {
-        EventManager.getEventManager().post(new TickEvent(Stage.END));
+        EventManager.INSTANCE.post(new TickEvent(Stage.END));
     }
 
     @ModifyArg(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/eventhandler/EventBus;post(Lnet/minecraftforge/fml/common/eventhandler/Event;)Z", remap = false), remap = true)
@@ -56,7 +56,7 @@ public class MinecraftMixin {
         if (a instanceof GuiOpenEvent) {
             GuiOpenEvent forgeEvent = (GuiOpenEvent) a;
             ScreenOpenEvent event = new ScreenOpenEvent(forgeEvent.gui);
-            EventManager.getEventManager().post(event);
+            EventManager.INSTANCE.post(event);
             if (event.isCancelled) {
                 forgeEvent.setCanceled(true);
             }
@@ -67,11 +67,11 @@ public class MinecraftMixin {
 
     @Inject(method = "runGameLoop", at = @At(value = "FIELD", target = "Lnet/minecraft/util/Timer;renderPartialTicks:F", opcode = Opcodes.PUTFIELD, shift = At.Shift.AFTER))
     private void onNonDeltaTickTimerUpdate(CallbackInfo ci) {
-        EventManager.getEventManager().post(new TimerUpdateEvent(timer, false));
+        EventManager.INSTANCE.post(new TimerUpdateEvent(timer, false));
     }
 
     @Inject(method = "runGameLoop", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Timer;updateTimer()V", shift = At.Shift.AFTER, ordinal = 1))
     private void onDeltaTickTimerUpdate(CallbackInfo ci) {
-        EventManager.getEventManager().post(new TimerUpdateEvent(timer, true));
+        EventManager.INSTANCE.post(new TimerUpdateEvent(timer, true));
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java
index 0673c77..877d540 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java
@@ -17,7 +17,7 @@ public class NetHandlerPlayClientMixin {
     @Inject(method = "addToSendQueue", at = @At("HEAD"), cancellable = true)
     private void onSendPacket(Packet<?> p_147297_1_, CallbackInfo ci) {
         SendPacketEvent event = new SendPacketEvent(p_147297_1_);
-        EventManager.getEventManager().post(event);
+        EventManager.INSTANCE.post(event);
         if (event.isCancelled) {
             ci.cancel();
         }
@@ -27,7 +27,7 @@ public class NetHandlerPlayClientMixin {
     private void onClientChat(S02PacketChat packetIn, CallbackInfo ci) {
         if (packetIn.getType() == 0) {
             ChatReceiveEvent event = new ChatReceiveEvent(packetIn.getChatComponent());
-            EventManager.getEventManager().post(event);
+            EventManager.INSTANCE.post(event);
             if (event.isCancelled) {
                 ci.cancel();
             }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java
index 89346f6..51988f2 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java
@@ -15,7 +15,7 @@ public class NetworkManagerMixin {
     @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/Packet;)V", at = @At("HEAD"), cancellable = true)
     private void onReceivePacket(ChannelHandlerContext p_channelRead0_1_, Packet<?> p_channelRead0_2_, CallbackInfo ci) {
         ReceivePacketEvent event = new ReceivePacketEvent(p_channelRead0_2_);
-        EventManager.getEventManager().post(event);
+        EventManager.INSTANCE.post(event);
         if (event.isCancelled) {
             ci.cancel();
         }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java
index 5e9b1bc..d1fce6a 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java
@@ -16,6 +16,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class WorldClientMixin {
     @Inject(method = "<init>", at = @At("RETURN"))
     private void onWorldLoad(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_, CallbackInfo ci) {
-        EventManager.getEventManager().post(new WorldLoadEvent());
+        EventManager.INSTANCE.post(new WorldLoadEvent());
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/package-info.java b/src/main/java/cc/polyfrost/oneconfig/internal/package-info.java
new file mode 100644
index 0000000..4a8a6a5
--- /dev/null
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * The package where all internal OneConfig shenanigans go on.
+ * This package is hidden from devs and is subject to change at any time with no warning.
+ * <p><b>It is recommended you do not interact with this package in any way.</b></p>
+ */
+package cc.polyfrost.oneconfig.internal;
\ No newline at end of file
diff --git a/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java b/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java
index 7ab39e0..765a595 100644
--- a/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java
@@ -10,9 +10,9 @@ import cc.polyfrost.oneconfig.internal.assets.Images;
 import cc.polyfrost.oneconfig.internal.assets.SVGs;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.NetworkUtils;
-import gg.essential.universal.UGraphics;
-import gg.essential.universal.UMinecraft;
-import gg.essential.universal.UResolution;
+import cc.polyfrost.oneconfig.libs.universal.UGraphics;
+import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
+import cc.polyfrost.oneconfig.libs.universal.UResolution;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.shader.Framebuffer;
 import org.lwjgl.nanovg.NVGColor;
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestCommand_Test.java b/src/main/java/cc/polyfrost/oneconfig/test/TestCommand_Test.java
index 31a503b..33ed5b7 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/TestCommand_Test.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestCommand_Test.java
@@ -4,20 +4,20 @@ import cc.polyfrost.oneconfig.utils.commands.annotations.Command;
 import cc.polyfrost.oneconfig.utils.commands.annotations.Main;
 import cc.polyfrost.oneconfig.utils.commands.annotations.Name;
 import cc.polyfrost.oneconfig.utils.commands.annotations.SubCommand;
-import gg.essential.universal.UChat;
+import cc.polyfrost.oneconfig.libs.universal.UChat;
 
-@Command(value = "test", aliases = {"t"})
+@Command(value = "test", aliases = {"t"}, description = "Description of the test command")
 public class TestCommand_Test {
 
-    @Main
+    @Main(description = "The main command.")
     private static void main() {  // /test
         UChat.chat("Main command");
     }
 
-    @SubCommand(value = "subcommand", aliases = {"s"})
+    @SubCommand(value = "subcommand", aliases = {"s"}, description = "Subcommand 1.")
     private static class TestSubCommand {
 
-        @Main(priority = 999)
+        @Main(priority = 999, description = "Description of method")
         private static void main(int a, float b, @Name("named c") S