Merge 1.20.6 into 1.21

Author: embeddedt

gradle.properties

@@ -7,7 +7,7 @@ mixinextras_version=0.3.2
 mod_id=modernfix
 minecraft_version=1.21-pre1
 enabled_platforms=fabric
-forge_version=20.6.42-beta
+forge_version=20.6.100-beta
 # parchment_version=2023.07.09
 refined_storage_version=4392788
 jei_version=16.0.0.28

neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java

@@ -12,6 +12,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.fml.ModLoader;
+import net.neoforged.fml.ModLoadingIssue;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.fml.loading.LoadingModList;
@@ -71,7 +72,11 @@ public MinecraftServer getCurrentServer() {
     }
 
     public boolean isEarlyLoadingNormally() {
-        return !LoadingModList.get().hasErrors();
+        var issues = LoadingModList.get().getModLoadingIssues();
+        if (issues.isEmpty()) {
+            return true;
+        }
+        return issues.stream().noneMatch(issue -> issue.severity() == ModLoadingIssue.Severity.ERROR);
     }
 
     public boolean isLoadingNormally() {

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -47,7 +47,7 @@ modId = "neoforge" #mandatory
 # Does this dependency have to exist - if not, ordering below must be specified
 type = "required" #mandatory
 # The version range of the dependency
-versionRange = "[20.6.42-beta,)" #mandatory
+versionRange = "[20.6.100-beta,)" #mandatory
 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
 ordering = "NONE"
 # Side this dependency is applied on - BOTH, CLIENT or SERVER