fix: crash when using mixin constraints on neo(forge) (#7)

Moulberry · Feb 28, 2025 · 39d89b7 · 39d89b7
1 parent 8e8cfbf
commit 39d89b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 27 deletions.
diff --git a/src/forge/java/com/moulberry/mixinconstraints/ForgeAbstractionsImpl.java b/src/forge/java/com/moulberry/mixinconstraints/ForgeAbstractionsImpl.java
@@ -1,17 +1,13 @@
 package com.moulberry.mixinconstraints;
 
 import com.moulberry.mixinconstraints.util.Abstractions;
+import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.forgespi.language.IModFileInfo;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.Restriction;
 
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.forgespi.language.IModInfo;
-
-import java.util.List;
-
 public class ForgeAbstractionsImpl extends Abstractions {
 	@Override
 	protected boolean isDevEnvironment() {
@@ -20,14 +16,8 @@ protected boolean isDevEnvironment() {
 
 	@Override
 	protected String getModVersion(String modid) {
-		List<IModInfo> infoList = LoadingModList.get().getModFileById(modid).getMods();
-		if(infoList.isEmpty()) {
-			return null;
-		} else if(infoList.size() > 1) {
-			MixinConstraints.LOGGER.warn("Multiple mods with id {} found, using first one", modid);
-		}
-
-		return infoList.get(0).getVersion().toString();
+		IModFileInfo info = LoadingModList.get().getModFileById(modid);
+		return info == null || info.getMods().isEmpty() ? null : info.versionString();
 	}
 
 	@Override

diff --git a/src/neoforge/java/com/moulberry/mixinconstraints/NeoForgeAbstractionsImpl.java b/src/neoforge/java/com/moulberry/mixinconstraints/NeoForgeAbstractionsImpl.java
@@ -1,16 +1,13 @@
 package com.moulberry.mixinconstraints;
 
 import com.moulberry.mixinconstraints.util.Abstractions;
-import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLLoader;
+import net.neoforged.fml.loading.LoadingModList;
+import net.neoforged.neoforgespi.language.IModFileInfo;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.Restriction;
 
-import net.neoforged.neoforgespi.language.IModInfo;
-
-import java.util.List;
-
 public class NeoForgeAbstractionsImpl extends Abstractions {
 	@Override
 	protected boolean isDevEnvironment() {
@@ -19,14 +16,8 @@ protected boolean isDevEnvironment() {
 
 	@Override
 	protected String getModVersion(String modid) {
-		List<IModInfo> infoList = ModList.get().getModFileById(modid).getMods();
-		if(infoList.isEmpty()) {
-			return null;
-		} else if(infoList.size() > 1) {
-			MixinConstraints.LOGGER.warn("Multiple mods with id {} found, using first one", modid);
-		}
-
-		return infoList.get(0).getVersion().toString();
+		IModFileInfo info = LoadingModList.get().getModFileById(modid);
+		return info == null || info.getMods().isEmpty() ? null : info.versionString();
 	}
 
 	@Override