Fix REI config crash on Ornithe related to gson upgrade

Author: thecatcore

build.gradle

@@ -39,6 +39,11 @@ repositories {
 	}
 }
 
+configurations {
+	riftImplementation
+	implementation.extendsFrom riftImplementation
+}
+
 unimined.minecraft(sourceSets.shim) {
 	version project.minecraft_version
 
@@ -56,7 +61,6 @@ unimined.minecraft {
 	version project.minecraft_version
 
 	mappings {
-		calamus()
 		searge()
 		mcp(project.mcp_channel, "${project.mcp_version}-${project.minecraft_version}")
 
@@ -69,6 +73,10 @@ unimined.minecraft {
 		accessWidener = file("src/main/resources/fabricated-rift.accesswidener")
 	}
 
+	mods.remap(configurations.riftImplementation) {
+		namespace("official")
+	}
+
 	defaultRemapJar = false
 }
 
@@ -104,11 +112,14 @@ dependencies {
 	}
 	implementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-logger-api-v1:1.0.4+common+ae4aa0d092")
 
+	// Ornithe Dependencies
 	fabricApi.osl("1.13.2", "0.16.3").forEach {
 		ornitheModImplementation(it)
 	}
-
 	ornitheModImplementation("com.terraformersmc:modmenu:0.3.0+mc1.13.2")
+
+	// Rift mods fixes for Ornithe
+	ornitheImplementation("maven.modrinth:rei:VvjG778i")
 }
 
 processResources {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/legacyFabric/resources/mixins.fabricated-rift-mods.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "package": "io.github.fabriccompatibilitylayers.fabricatedrift.mixin",
+  "mixins": [
+  ],
+  "client": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

src/main/java/io/github/fabriccompatibilitylayers/fabricatedrift/FabricatedRift.java

@@ -61,7 +61,6 @@ public void afterRemapping() {
 
     @Override
     public void afterAllRemappings() {
-
     }
 
     @Override

src/main/java/org/dimdev/riftloader/RiftLoader.java

@@ -15,6 +15,7 @@
 import org.dimdev.utils.InstanceListMap;
 import org.dimdev.utils.InstanceMap;
 import org.dimdev.utils.ReflectionUtils;
+import org.spongepowered.asm.mixin.Mixins;
 
 import java.io.File;
 import java.io.IOException;
@@ -166,6 +167,8 @@ private void initMods() {
             }
         }
 
+        Mixins.addConfiguration("mixins.fabricated-rift-mods.json");
+
         // Load the listener classes
         List<Listener> allListeners = new ArrayList<>();
         for (ModInfo modInfo : modInfoMap.values()) {

src/ornithe/java/io/github/fabriccompatibilitylayers/fabricatedrift/mixin/rei/ConfigManagerImplMixin.java

@@ -0,0 +1,20 @@
+package io.github.fabriccompatibilitylayers.fabricatedrift.mixin.rei;
+
+import com.google.gson.*;
+import me.shedaniel.rei.client.ConfigManagerImpl;
+import me.shedaniel.rei.gui.config.RecipeScreenType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ConfigManagerImpl.class)
+public class ConfigManagerImplMixin {
+    @Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/google/gson/GsonBuilder;create()Lcom/google/gson/Gson;"))
+    private static Gson registerGsonAdapters(GsonBuilder instance) {
+        return instance.registerTypeAdapter(RecipeScreenType.class, (JsonDeserializer<RecipeScreenType>) (jsonElement, type, jsonDeserializationContext) ->
+                        jsonElement.isJsonPrimitive() && ((JsonPrimitive) jsonElement).isString() ? RecipeScreenType.valueOf(jsonElement.getAsString()) : null)
+                .registerTypeAdapter(RecipeScreenType.class, (JsonSerializer<RecipeScreenType>) (recipeScreenType, type, jsonSerializationContext) ->
+                        new JsonPrimitive(recipeScreenType.name()))
+                .create();
+    }
+}

src/ornithe/resources/mixins.fabricated-rift-mods.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "package": "io.github.fabriccompatibilitylayers.fabricatedrift.mixin",
+  "mixins": [
+    "rei.ConfigManagerImplMixin"
+  ],
+  "client": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}