diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java
index b325ae3..788fe8b 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java
@@ -4,8 +4,15 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 
+import javax.annotation.Nullable;
+
 public interface IProxy {
+    @Nullable
     MinecraftServer getServer();
+
+    @Nullable
     Player getClientPlayer();
+
+    @Nullable
     Level getClientLevel();
 }
diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
index b2a190d..6272a4f 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
@@ -1,6 +1,5 @@
 package dev.micle.firefly_bush_backport.proxy;
 
-import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
 import dev.micle.firefly_bush_backport.config.Config;
 import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs;
@@ -12,23 +11,22 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.AddReloadListenerEvent;
-import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.event.lifecycle.*;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.event.lifecycle.*;
+import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.AddReloadListenerEvent;
+import net.neoforged.neoforge.event.server.ServerStartedEvent;
+import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 
 public class Proxy implements IProxy {
     private static MinecraftServer server = null;
 
     // Common setup
-    public Proxy() {
-        IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
-
+    public Proxy(IEventBus modEventBus, ModContainer modContainer) {
         Config.register();
         ModBlocks.register(modEventBus);
         ModItems.register(modEventBus);
@@ -42,9 +40,9 @@ public class Proxy implements IProxy {
         modEventBus.addListener(Proxy::imcProcess);
 
         // Register event bus listeners
-        MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners);
-        MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted);
-        MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping);
+        NeoForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners);
+        NeoForge.EVENT_BUS.addListener(Proxy::serverStarted);
+        NeoForge.EVENT_BUS.addListener(Proxy::serverStopping);
     }
 
     private static void setup(FMLCommonSetupEvent event) {}
@@ -80,8 +78,8 @@ public class Proxy implements IProxy {
 
     // Client setup
     public static class Client extends Proxy {
-        public Client() {
-            IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
+        public Client(IEventBus modEventBus, ModContainer modContainer) {
+            super(modEventBus, modContainer);
 
             // Register mod event bus listeners
             modEventBus.addListener(Client::setup);
@@ -112,9 +110,10 @@ public class Proxy implements IProxy {
 
     // Server setup
     public static class Server extends Proxy {
-        public Server() {
+        public Server(IEventBus modEventBus, ModContainer modContainer) {
+            super(modEventBus, modContainer);
+
             // Register mod event bus listeners
-            IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
             modEventBus.addListener(Server::setup);
         }