little trolling

8 files changed, 206 insertions, 202 deletions

diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
index 5b928a8..44a6611 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
@@ -17,7 +17,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
-import java.util.ServiceLoader;
 
 /**
  * The main class of OneConfig.
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java
index 2a49f74..ebf4f0a 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java
@@ -1,20 +1,20 @@
 //#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import cc.polyfrost.oneconfig.events.EventManager;
- import cc.polyfrost.oneconfig.events.event.HudRenderEvent;
- import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
- import net.minecraftforge.client.GuiIngameForge;
- 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.CallbackInfo;
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.HudRenderEvent;
+import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
+import net.minecraftforge.client.GuiIngameForge;
+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.CallbackInfo;
 
- @Mixin(value = GuiIngameForge.class, remap = false)
- 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.INSTANCE.post(new HudRenderEvent(new UMatrixStack(), partialTicks));
-     }
- }
+@Mixin(value = GuiIngameForge.class, remap = false)
+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.INSTANCE.post(new HudRenderEvent(new UMatrixStack(), partialTicks));
+    }
+}
 //#endif
\ No newline at end of file
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java
index 46d9bbc..23d7d84 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java
@@ -1,100 +1,100 @@
 //#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import cc.polyfrost.oneconfig.internal.OneConfig;
- import cc.polyfrost.oneconfig.events.EventManager;
- import cc.polyfrost.oneconfig.events.event.*;
- import net.minecraft.client.Minecraft;
- import net.minecraft.util.Timer;
- import net.minecraftforge.client.event.GuiOpenEvent;
- import net.minecraftforge.fml.common.eventhandler.Event;
- import org.objectweb.asm.Opcodes;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.Shadow;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
- import org.spongepowered.asm.mixin.injection.ModifyArg;
- import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.*;
+import cc.polyfrost.oneconfig.internal.OneConfig;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.Timer;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.fml.common.eventhandler.Event;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
- @Mixin(Minecraft.class)
- public class MinecraftMixin {
-     @Shadow
-     private Timer timer;
+@Mixin(Minecraft.class)
+public class MinecraftMixin {
+    @Shadow
+    private Timer timer;
 
-     @Inject(method = "shutdownMinecraftApplet", at = @At("HEAD"))
-     private void onShutdown(CallbackInfo ci) {
-         EventManager.INSTANCE.post(new PreShutdownEvent());
-     }
+    @Inject(method = "shutdownMinecraftApplet", at = @At("HEAD"))
+    private void onShutdown(CallbackInfo ci) {
+        EventManager.INSTANCE.post(new PreShutdownEvent());
+    }
 
-     @Inject(method = "startGame", at = @At("HEAD"))
-     private void onStart(CallbackInfo ci) {
-         EventManager.INSTANCE.post(new StartEvent());
-         Runtime.getRuntime().addShutdownHook(new Thread(() -> EventManager.INSTANCE.post(new ShutdownEvent())));
-     }
+    @Inject(method = "startGame", at = @At("HEAD"))
+    private void onStart(CallbackInfo ci) {
+        EventManager.INSTANCE.post(new StartEvent());
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> EventManager.INSTANCE.post(new ShutdownEvent())));
+    }
 
-     @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/client/FMLClientHandler;beginMinecraftLoading(Lnet/minecraft/client/Minecraft;Ljava/util/List;Lnet/minecraft/client/resources/IReloadableResourceManager;)V", remap = false), remap = true)
-     private void onPreLaunch(CallbackInfo ci) {
-         OneConfig.preLaunch();
-     }
+    @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/client/FMLClientHandler;beginMinecraftLoading(Lnet/minecraft/client/Minecraft;Ljava/util/List;Lnet/minecraft/client/resources/IReloadableResourceManager;)V", remap = false), remap = true)
+    private void onPreLaunch(CallbackInfo ci) {
+        OneConfig.preLaunch();
+    }
 
-     @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.INSTANCE.post(new InitializationEvent());
-         OneConfig.init();
-     }
+    @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.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.INSTANCE.post(new RenderEvent(Stage.START, timer.renderPartialTicks));
-     }
+    @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.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.INSTANCE.post(new RenderEvent(Stage.END, 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.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.INSTANCE.post(new TickEvent(Stage.START));
-     }
+    @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.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.INSTANCE.post(new TickEvent(Stage.END));
-     }
+    @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.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)
-     private Event onGuiOpenEvent(Event a) {
-         if (a instanceof GuiOpenEvent) {
-             GuiOpenEvent forgeEvent = (GuiOpenEvent) a;
-             ScreenOpenEvent event = new ScreenOpenEvent(forgeEvent.gui);
-             EventManager.INSTANCE.post(event);
-             if (event.isCancelled) {
-                 forgeEvent.setCanceled(true);
-             }
-             return forgeEvent;
-         }
-         return a;
-     }
+    @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)
+    private Event onGuiOpenEvent(Event a) {
+        if (a instanceof GuiOpenEvent) {
+            GuiOpenEvent forgeEvent = (GuiOpenEvent) a;
+            ScreenOpenEvent event = new ScreenOpenEvent(forgeEvent.gui);
+            EventManager.INSTANCE.post(event);
+            if (event.isCancelled) {
+                forgeEvent.setCanceled(true);
+            }
+            return forgeEvent;
+        }
+        return a;
+    }
 
-     @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.INSTANCE.post(new TimerUpdateEvent(timer, false));
-     }
+    @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.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.INSTANCE.post(new TimerUpdateEvent(timer, true));
-     }
+    @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.INSTANCE.post(new TimerUpdateEvent(timer, true));
+    }
 
-     @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;fireKeyInput()V"))
-     private void onKeyEvent(CallbackInfo ci) {
-         EventManager.INSTANCE.post(new KeyInputEvent());
-     }
+    @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;fireKeyInput()V"))
+    private void onKeyEvent(CallbackInfo ci) {
+        EventManager.INSTANCE.post(new KeyInputEvent());
+    }
 
-     @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;fireMouseInput()V"))
-     private void onMouseEvent(CallbackInfo ci) {
-         EventManager.INSTANCE.post(new MouseInputEvent());
-     }
- }
+    @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLCommonHandler;fireMouseInput()V"))
+    private void onMouseEvent(CallbackInfo ci) {
+        EventManager.INSTANCE.post(new MouseInputEvent());
+    }
+}
 //#endif
\ No newline at end of file
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java
index 0496e98..5ae6730 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java
@@ -1,38 +1,29 @@
 //#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import cc.polyfrost.oneconfig.events.EventManager;
- import cc.polyfrost.oneconfig.events.event.ChatReceiveEvent;
- import cc.polyfrost.oneconfig.events.event.SendPacketEvent;
- import net.minecraft.client.network.NetHandlerPlayClient;
- import net.minecraft.network.Packet;
- import net.minecraft.network.play.server.S02PacketChat;
- 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.CallbackInfo;
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.ChatReceiveEvent;
+import cc.polyfrost.oneconfig.events.event.SendPacketEvent;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S02PacketChat;
+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.CallbackInfo;
 
- @Mixin(value = NetHandlerPlayClient.class, priority = Integer.MAX_VALUE)
- public class NetHandlerPlayClientMixin {
+@Mixin(value = NetHandlerPlayClient.class, priority = Integer.MAX_VALUE)
+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.INSTANCE.post(event);
-         if (event.isCancelled) {
-             ci.cancel();
-         }
-     }
-
-     @Inject(method = "handleChat", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/event/ForgeEventFactory;onClientChat(BLnet/minecraft/util/IChatComponent;)Lnet/minecraft/util/IChatComponent;", remap = false), cancellable = true, remap = true)
-     private void onClientChat(S02PacketChat packetIn, CallbackInfo ci) {
-         if (packetIn.getType() == 0) {
-             ChatReceiveEvent event = new ChatReceiveEvent(packetIn.getChatComponent());
-             EventManager.INSTANCE.post(event);
-             if (event.isCancelled) {
-                 ci.cancel();
-             }
-         }
-     }
- }
+    @Inject(method = "handleChat", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/event/ForgeEventFactory;onClientChat(BLnet/minecraft/util/IChatComponent;)Lnet/minecraft/util/IChatComponent;", remap = false), cancellable = true, remap = true)
+    private void onClientChat(S02PacketChat packetIn, CallbackInfo ci) {
+        if (packetIn.getType() == 0) {
+            ChatReceiveEvent event = new ChatReceiveEvent(packetIn.getChatComponent());
+            EventManager.INSTANCE.post(event);
+            if (event.isCancelled) {
+                ci.cancel();
+            }
+        }
+    }
+}
 //#endif
\ No newline at end of file
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java
index ac81645..5b99446 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java
@@ -1,25 +1,43 @@
 //#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import cc.polyfrost.oneconfig.events.EventManager;
- import cc.polyfrost.oneconfig.events.event.ReceivePacketEvent;
- import io.netty.channel.ChannelHandlerContext;
- import net.minecraft.network.NetworkManager;
- import net.minecraft.network.Packet;
- 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.CallbackInfo;
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.ReceivePacketEvent;
+import cc.polyfrost.oneconfig.events.event.SendPacketEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+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.CallbackInfo;
 
- @Mixin(value = NetworkManager.class, priority = Integer.MAX_VALUE)
- 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.INSTANCE.post(event);
-         if (event.isCancelled) {
-             ci.cancel();
-         }
-     }
- }
+@Mixin(value = NetworkManager.class, priority = Integer.MAX_VALUE)
+public class NetworkManagerMixin {
+
+    @Inject(method = "sendPacket(Lnet/minecraft/network/Packet;Lio/netty/util/concurrent/GenericFutureListener;[Lio/netty/util/concurrent/GenericFutureListener;)V", at = @At("HEAD"), cancellable = true)
+    private void onSendPacket(Packet<?> packetIn, GenericFutureListener<? extends Future<? super Void>> listener, GenericFutureListener<? extends Future<? super Void>>[] listeners, CallbackInfo ci) {
+        onSendPacket(packetIn, ci);
+    }
+
+    @Inject(method = "sendPacket(Lnet/minecraft/network/Packet;)V", at = @At("HEAD"), cancellable = true)
+    private void onSendPacket(Packet<?> packetIn, CallbackInfo ci) {
+        SendPacketEvent event = new SendPacketEvent(packetIn);
+        EventManager.INSTANCE.post(event);
+        if (event.isCancelled) {
+            ci.cancel();
+        }
+    }
+
+    @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.INSTANCE.post(event);
+        if (event.isCancelled) {
+            ci.cancel();
+        }
+    }
+}
 //#endif
\ No newline at end of file
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/OptifineConfigMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/OptifineConfigMixin.java
index 3794daf..eb6fc03 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/OptifineConfigMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/OptifineConfigMixin.java
@@ -1,23 +1,21 @@
-//#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import cc.polyfrost.oneconfig.internal.plugin.hooks.OptifineConfigHook;
- import org.spongepowered.asm.mixin.Dynamic;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.Pseudo;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
- import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import cc.polyfrost.oneconfig.internal.plugin.hooks.OptifineConfigHook;
+import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
- @Pseudo
- @Mixin(targets = "Config", remap = false)
- public class OptifineConfigMixin {
-     @Dynamic("OptiFine")
-     @Inject(method = "isFastRender", at = @At("HEAD"), cancellable = true)
-     private static void cancelFastRender(CallbackInfoReturnable<Boolean> cir) {
-         if (OptifineConfigHook.shouldNotApplyFastRender()) {
-             cir.setReturnValue(false);
-         }
-     }
- }
-//#endif
\ No newline at end of file
+@Pseudo
+@Mixin(targets = "Config", remap = false)
+public class OptifineConfigMixin {
+    @Dynamic("OptiFine")
+    @Inject(method = "isFastRender", at = @At("HEAD"), cancellable = true)
+    private static void cancelFastRender(CallbackInfoReturnable<Boolean> cir) {
+        if (OptifineConfigHook.shouldNotApplyFastRender()) {
+            cir.setReturnValue(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/VigilantMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/VigilantMixin.java
index 11a5590..04e3fe9 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/VigilantMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/VigilantMixin.java
@@ -1,10 +1,8 @@
-//#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import gg.essential.vigilance.Vigilant;
- import org.spongepowered.asm.mixin.Mixin;
+import gg.essential.vigilance.Vigilant;
+import org.spongepowered.asm.mixin.Mixin;
 
- @Mixin(Vigilant.class)
- public class VigilantMixin {
- }
-//#endif
\ No newline at end of file
+@Mixin(Vigilant.class)
+public class VigilantMixin {
+}
\ No newline at end of file
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java
index fbf39fc..05c6920 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java
@@ -1,23 +1,23 @@
 //#if MC==10809
- package cc.polyfrost.oneconfig.internal.mixin;
+package cc.polyfrost.oneconfig.internal.mixin;
 
- import cc.polyfrost.oneconfig.events.EventManager;
- import cc.polyfrost.oneconfig.events.event.WorldLoadEvent;
- import net.minecraft.client.multiplayer.WorldClient;
- import net.minecraft.client.network.NetHandlerPlayClient;
- import net.minecraft.profiler.Profiler;
- import net.minecraft.world.EnumDifficulty;
- import net.minecraft.world.WorldSettings;
- 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.CallbackInfo;
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.WorldLoadEvent;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.WorldSettings;
+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.CallbackInfo;
 
- @Mixin(WorldClient.class)
- 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.INSTANCE.post(new WorldLoadEvent());
-     }
- }
+@Mixin(WorldClient.class)
+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.INSTANCE.post(new WorldLoadEvent());
+    }
+}
 //#endif
\ No newline at end of file