Update Minecraft & Fabric Loader; stop including Mixin Extras

Author: embeddedt

fabric/build.gradle

@@ -41,7 +41,6 @@ repositories {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
-    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${rootProject.mixinextras_version}")))
 
     modCompileOnly(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modCompileOnly(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }

fabric/src/main/java/org/embeddedt/modernfix/fabric/mappings/MappingsClearer.java

@@ -4,7 +4,6 @@
 import net.fabricmc.loader.api.MappingResolver;
 import net.fabricmc.loader.impl.launch.FabricLauncherBase;
 import net.fabricmc.loader.impl.launch.MappingConfiguration;
-import net.fabricmc.mapping.tree.TinyMappingFactory;
 import org.embeddedt.modernfix.util.CommonModUtil;
 
 import java.lang.reflect.Constructor;
@@ -18,7 +17,9 @@
 public class MappingsClearer {
     @SuppressWarnings("unchecked")
     public static void clear() {
-        if(FabricLoader.getInstance().isDevelopmentEnvironment())
+        // TODO: Port this to Fabric Loader 0.15
+
+        if(true) //FabricLoader.getInstance().isDevelopmentEnvironment())
             return; // never do this in dev
         CommonModUtil.runWithoutCrash(() -> {
             // For now, force the mapping resolver to be initialized. Fabric Loader 0.14.23 stops initializing it early,
@@ -33,7 +34,7 @@ public static void clear() {
             MappingConfiguration config = FabricLauncherBase.getLauncher().getMappingConfiguration();
             Field mappingsField = MappingConfiguration.class.getDeclaredField("mappings");
             mappingsField.setAccessible(true);
-            mappingsField.set(config, TinyMappingFactory.EMPTY_TREE);
+            //mappingsField.set(config, TinyMappingFactory.EMPTY_TREE);
 
             // clear useless intermediary->intermediary mappings
             MappingResolver resolver = FabricLoader.getInstance().getMappingResolver();

fabric/src/main/resources/fabric.mod.json

@@ -42,7 +42,8 @@
     "modernfix-common.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.16.2"
+    "minecraft": ">=1.16.2",
+    "fabricloader": ">=0.15.0"
   },
   "breaks": {
     "dashloader": "<5.0.0-beta.1"

gradle.properties

@@ -5,20 +5,20 @@ junit_version=5.10.0-M1
 mixinextras_version=0.3.1
 
 mod_id=modernfix
-minecraft_version=1.20.3
+minecraft_version=1.20.4
 enabled_platforms=fabric,neoforge
-forge_version=20.3.1-beta
+forge_version=20.4.12-beta
 # parchment_version=2023.07.09
 refined_storage_version=4392788
 jei_version=16.0.0.28
 rei_version=13.0.678
 ctm_version=1.20.1-1.1.8+4
 kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
-supported_minecraft_versions=1.20.3
+supported_minecraft_versions=1.20.4
 
-fabric_loader_version=0.14.25
-fabric_api_version=0.90.11+1.20.3
+fabric_loader_version=0.15.1
+fabric_api_version=0.91.1+1.20.4
 
 continuity_version=3.0.0-beta.4+1.20.2