Skip to content

Commit 013964c

Browse files
committed
Modlist isnt initialized early enough, switch to LoadingModList instead & JIJ mixin extras on forge
1 parent 11ac1d0 commit 013964c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

forge/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ dependencies {
146146
}
147147

148148
compileOnly("io.github.llamalad7:mixinextras-common:${mixin_extras_version}")
149-
implementation(annotationProcessor("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}"))
149+
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}")))
150150
}
151151

152152
processResources {

forge/src/main/java/com/railwayteam/railways/util/forge/UtilsImpl.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,25 @@
1111
import net.minecraftforge.api.distmarker.OnlyIn;
1212
import net.minecraftforge.common.MinecraftForge;
1313
import net.minecraftforge.event.level.ChunkEvent;
14-
import net.minecraftforge.fml.ModList;
1514
import net.minecraftforge.fml.loading.FMLLoader;
1615
import net.minecraftforge.fml.loading.FMLPaths;
16+
import net.minecraftforge.fml.loading.LoadingModList;
17+
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
1718
import net.minecraftforge.network.PacketDistributor;
1819
import org.jetbrains.annotations.Nullable;
1920

2021
import java.nio.file.Path;
22+
import java.util.List;
2123

2224
public class UtilsImpl {
2325
public static boolean isModLoaded(String id, @Nullable String fabricId) {
24-
return ModList.get().isLoaded(id);
26+
List<ModInfo> mods = LoadingModList.get().getMods();
27+
for (ModInfo mod : mods) {
28+
if (mod.getModId().equals(id)) {
29+
return true;
30+
}
31+
}
32+
return false;
2533
}
2634

2735
public static Path configDir() {

0 commit comments

Comments
 (0)