Re-enable Forge on 1.18

common/build.gradle

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

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

@@ -6,7 +6,7 @@ import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
+import net.minecraftforge.network.NetworkConstants;
 
 @Mod(Constants.MODID)
 public class ModMainForge {
@@ -16,7 +16,7 @@ public class ModMainForge {
                 INameMappingService.Domain.FIELD, "f_60593_"
         );
         ModLoadingContext.get().registerExtensionPoint(
-                DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (s, b) -> true)
+                DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (s, b) -> true)
         );
     }
 }

gradle.properties

@@ -1,8 +1,8 @@
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx1G
 org.gradle.daemon=false
-minecraft_version=1.18-rc1
+minecraft_version=1.18
 archives_base_name=ferritecore
 mod_version=4.0.0
 maven_group=malte0811.ferritecore
 fabric_loader_version=0.11.3
-forge_version=37.0.59
+forge_version=38.0.14

settings.gradle

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