diff --git a/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java
index a1ea46796..d0fcfcca1 100644
--- a/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java
+++ b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java
@@ -62,8 +62,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.client.event.ScreenEvent;
-import net.minecraftforge.eventbus.api.Event;
+import net.neoforged.neoforge.client.event.ScreenEvent;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -397,7 +396,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             return super.keyPressed(keyCode, scanCode, modifiers);
 
         if (JeiSettings.isJeiLoaded() && JeiSettings.isJeiSearchSynced()) {
-            JeiAccess.setFilterText(this.searchBar.getValue());
+            OccultismJeiIntegration.get().setFilterText(this.searchBar.getValue());
         }
         return true;
     }
diff --git a/src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java
index 64d03c900..4d7dbe6ca 100644
--- a/src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java
+++ b/src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java
@@ -53,10 +53,7 @@
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
-import net.neoforged.neoforge.client.event.EntityRenderersEvent;
-import net.neoforged.neoforge.client.event.RegisterGuiOverlaysEvent;
-import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
-import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
+import net.neoforged.neoforge.client.event.*;
 import net.neoforged.neoforge.client.settings.KeyConflictContext;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
@@ -166,7 +163,7 @@ public static void onClientSetup(FMLClientSetupEvent event) {
         //Register client side event handlers
         NeoForge.EVENT_BUS.register(Occultism.SELECTED_BLOCK_RENDERER);
         NeoForge.EVENT_BUS.register(Occultism.THIRD_EYE_EFFECT_RENDERER);
-        MinecraftForge.EVENT_BUS.addListener((ScreenEvent.MouseButtonPressed.Pre e) -> StorageControllerGuiBase.onScreenMouseClickedPre(e));
+        NeoForge.EVENT_BUS.addListener((ScreenEvent.MouseButtonPressed.Pre e) -> StorageControllerGuiBase.onScreenMouseClickedPre(e));
 
         //Register Tile Entity Renderers
         BlockEntityRenderers.register(OccultismBlockEntities.STORAGE_CONTROLLER.get(), StorageControllerGeoRenderer::new);