Reenable Forge on 1.17, currently only launchable with dirty gradle hacks

build.gradle

@@ -1,8 +1,8 @@
 import java.util.stream.Collectors
 
 plugins {
-    id "architectury-plugin" version "3.2-SNAPSHOT"
-    id "dev.architectury.loom" version "0.8.0-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.3-SNAPSHOT"
+    id "dev.architectury.loom" version "0.7.4-SNAPSHOT" apply false
 }
 
 architectury {
@@ -61,6 +61,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
+        options.release = 16
     }
 
     java {

common/build.gradle

@@ -38,7 +38,7 @@ dependencies {
 
 architectury {
     injectInjectables = false
-    common(false)
+    common()
 }
 
 jar {

common/src/main/java/malte0811/ferritecore/mixin/config/FerriteConfig.java

@@ -80,7 +80,7 @@ public class FerriteConfig {
         private void finish() {
             try {
                 // This runs too early for arch's ExpectPlatform, so reflection it is
-                Class<?> handler = Class.forName("malte0811.ferritecore.mixin.config.ConfigFileHandler");
+                Class<?> handler = Class.forName("malte0811.ferritecore.mixin.platform.ConfigFileHandler");
                 Method finish = handler.getMethod("finish", List.class);
                 finish.invoke(null, options);
             } catch (Exception e) {

fabric/src/main/java/malte0811/ferritecore/mixin/config/ConfigFileHandler.java → fabric/src/main/java/malte0811/ferritecore/mixin/platform/ConfigFileHandler.java

@@ -1,7 +1,8 @@
-package malte0811.ferritecore.mixin.config;
+package malte0811.ferritecore.mixin.platform;
 
 import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
+import malte0811.ferritecore.mixin.config.FerriteConfig;
 import malte0811.ferritecore.util.Constants;
 
 import java.io.IOException;

forge/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 configurations {
-    shadow
+    shadowCommon
 }
 
 architectury {
@@ -20,7 +20,7 @@ dependencies {
     developmentForge(project(path: ":common")) {
         transitive = false
     }
-    shadow(project(path: ":common", configuration: "transformProductionForge")) {
+    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) {
         transitive = false
     }
 }
@@ -36,12 +36,12 @@ processResources {
 shadowJar {
     exclude "fabric.mod.json"
 
-    configurations = [project.configurations.shadow]
-    classifier "shadow"
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
 }
 
 remapJar {
     dependsOn(shadowJar)
-    input.set(shadowJar.archivePath)
+    input.set(shadowJar.archiveFile)
     classifier "forge"
 }

forge/src/main/java/malte0811/ferritecore/ModMainForge.java

@@ -2,23 +2,21 @@ package malte0811.ferritecore;
 
 import cpw.mods.modlauncher.api.INameMappingService;
 import malte0811.ferritecore.util.Constants;
-import net.minecraftforge.fml.ExtensionPoint;
+import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
-import net.minecraftforge.fml.network.FMLNetworkConstants;
-import org.apache.commons.lang3.tuple.Pair;
+import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
+import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
 
 @Mod(Constants.MODID)
 public class ModMainForge {
 
     public ModMainForge() {
         Constants.blockstateCacheFieldName = ObfuscationReflectionHelper.remapName(
-                INameMappingService.Domain.FIELD, "field_215707_c"
+                INameMappingService.Domain.FIELD, "f_60593_"
         );
         ModLoadingContext.get().registerExtensionPoint(
-                ExtensionPoint.DISPLAYTEST,
-                () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (s, b) -> true)
+                DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (s, b) -> true)
         );
     }
 }

forge/src/main/java/malte0811/ferritecore/mixin/config/ConfigFileHandler.java → forge/src/main/java/malte0811/ferritecore/mixin/platform/ConfigFileHandler.java

@@ -1,4 +1,4 @@
-package malte0811.ferritecore.mixin.config;
+package malte0811.ferritecore.mixin.platform;
 
 import com.electronwill.nightconfig.core.ConfigSpec;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;

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

@@ -13,13 +13,13 @@ Reduces memory usage.
 logoFile="logo.png"
 [[dependencies.ferritecore]]
     modId="forge"
-    mandatory=true
-    versionRange="[35.1.0,)"
-    ordering="NONE"
+    mandatory = true
+versionRange = "[37.0.44,)"
+ordering = "NONE"
     side="BOTH"
 [[dependencies.ferritecore]]
     modId="minecraft"
-    mandatory=true
-    versionRange="[1.16.4,)"
-    ordering="NONE"
+mandatory = true
+versionRange = "[1.17.1,)"
+ordering = "NONE"
     side="BOTH"

gradle.properties

@@ -9,4 +9,4 @@ maven_group=malte0811.ferritecore
 
 fabric_loader_version=0.11.3
 
-forge_version=36.0.1
+forge_version=37.0.44

settings.gradle

@@ -9,6 +9,6 @@ pluginManagement {
 
 include("common")
 include("fabric")
-//include("forge")
+include("forge")
 
 rootProject.name = "ferritecore"