From 6bc135ad37a4b5f4dd769ad9063346028ed9b5ce Mon Sep 17 00:00:00 2001
From: Skye <skye@is-quite.gay>
Date: Fri, 17 Jul 2026 12:51:50 +0900
Subject: [PATCH] Check Fabric for mod container

---
 loader/src/main/java/net/neoforged/fml/ModList.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/loader/src/main/java/net/neoforged/fml/ModList.java b/loader/src/main/java/net/neoforged/fml/ModList.java
index 0cf71d4ef..9edf1121f 100644
--- a/loader/src/main/java/net/neoforged/fml/ModList.java
+++ b/loader/src/main/java/net/neoforged/fml/ModList.java
@@ -134,7 +134,12 @@ void setLoadedMods(final List<ModContainer> modContainers) {
 
     public Optional<? extends ModContainer> getModContainerById(String modId) {
         // Kilt: Point to loader
-        return Optional.ofNullable(Kilt.Companion.getLoader().getMod(modId)).map(NeoForgeMod::getContainer);
+        if (Kilt.Companion.getLoader().getNeoForgeToFabricMods().containsKey(modId))
+            return FabricLoader.getInstance().getModContainer(Kilt.Companion.getLoader().getNeoForgeToFabricMods().get(modId)).map(WrappedFabricModContainer::get);
+
+        return Optional.ofNullable(Kilt.Companion.getLoader().getMod(modId)).map(NeoForgeMod::getContainer)
+            .or(() -> FabricLoader.getInstance().getModContainer(modId).map(WrappedFabricModContainer::get))
+            .or(() -> FabricLoader.getInstance().getModContainer(modId.replace("_", "-")).map(WrappedFabricModContainer::get));
 //        return Optional.ofNullable(this.indexedMods.get(modId));
     }