Add Forge 26.1 support + enable ClothConfig for Fabric/NeoForge (#1058)

Rakambda · web-flow · commit 535867edacec · 2026-03-26T20:24:05.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -87,6 +87,12 @@ allprojects {
         }
     }
 
+    pluginManager.withPlugin("idea") {
+        if (tasks.findByName("idePostSync") == null) {
+            tasks.register("idePostSync")
+        }
+    }
+
     if (version == null || version == "unspecified") {
         try {
             def details = versionDetails()
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -15,10 +15,10 @@ dependencies {
         exclude(group = "net.fabricmc.fabric-api")
     }
 
-//    modImplementation(libs.clothConfigFabric) {
-//        exclude(group = "net.fabricmc.fabric-api")
-//        exclude(module = "modmenu")
-//    }
+    implementation(libs.clothConfigFabric) {
+        exclude(group = "net.fabricmc.fabric-api")
+        exclude(module = "modmenu")
+    }
 }
 
 tasks {
diff --git a/fabric/src/client/java/fr/rakambda/fallingtree/fabric/client/ModMenuImpl.java b/fabric/src/client/java/fr/rakambda/fallingtree/fabric/client/ModMenuImpl.java
@@ -2,30 +2,35 @@
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
+import fr.rakambda.fallingtree.common.FallingTreeCommon;
+import fr.rakambda.fallingtree.fabric.FallingTree;
+import fr.rakambda.fallingtree.fabric.client.cloth.ClothConfigHook;
+import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import java.lang.reflect.InvocationTargetException;
 
 public class ModMenuImpl implements ModMenuApi{
 	private static final Logger log = LogManager.getLogger(ModMenuImpl.class);
 	
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory(){
-		// if(FabricLoader.getInstance().isModLoaded("cloth-config")){
-		// 	return (screen) -> {
-		// 		try{
-		// 			return Class.forName("fr.rakambda.fallingtree.fabric.client.cloth.ClothConfigHook")
-		// 					.asSubclass(ClothConfigHook.class)
-		// 					.getConstructor(FallingTreeCommon.class)
-		// 					.newInstance(FallingTree.getMod())
-		// 					.load()
-		// 					.apply(screen);
-		// 		}
-		// 		catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
-		// 			log.error("Failed to hook into ClothConfig", e);
-		// 		}
-		// 		return null;
-		// 	};
-		// }
-		return screen -> null;
+		if(FabricLoader.getInstance().isModLoaded("cloth-config")){
+			return (screen) -> {
+				try{
+					return Class.forName("fr.rakambda.fallingtree.fabric.client.cloth.ClothConfigHook")
+							.asSubclass(ClothConfigHook.class)
+							.getConstructor(FallingTreeCommon.class)
+							.newInstance(FallingTree.getMod())
+							.load()
+							.apply(screen);
+				}
+				catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
+					log.error("Failed to hook into ClothConfig", e);
+				}
+				return null;
+			};
+		}
+		return _ -> null;
 	}
 }
diff --git a/fabric/src/client/java/fr/rakambda/fallingtree/fabric/client/cloth/ClothConfigHook.java b/fabric/src/client/java/fr/rakambda/fallingtree/fabric/client/cloth/ClothConfigHook.java
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -4,65 +4,56 @@ plugins {
 
 minecraft {
     mappings channel: "official", version: "${libs.versions.minecraftVersion.get()}"
-    copyIdeResources = true
-    reobf = false
 
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    accessTransformers.from(layout.projectDirectory.file('src/main/resources/META-INF/accesstransformer.cfg'))
 
     runs {
         configureEach {
-            property "forge.logging.markers", "REGISTRIES"
-            property "forge.logging.console.level", "error"
-            property "eventbus.api.strictRuntimeChecks", "true"
+            systemProperty "forge.enabledGameTestNamespaces", "fallingtree"
+            systemProperty "forge.logging.markers", "REGISTRIES"
+            systemProperty "forge.logging.console.level", "error"
+            systemProperty "eventbus.api.strictRuntimeChecks", "true"
         }
 
         client {
-            taskName "runFTForgeClient"
-            workingDirectory project.file("./run/client")
+            workingDir = layout.projectDirectory.dir("./run/client")
         }
 
         server {
-            taskName "runFTForgeServer"
-            workingDirectory project.file("./run/server")
+            workingDir = layout.projectDirectory.dir("./run/server")
             args "--nogui"
         }
 
         gameTestServer {
-            taskName "runFTForgeTestServer"
-            workingDirectory project.file("./run/test")
-            property "forge.enabledGameTestNamespaces", "fallingtree"
+            workingDir = layout.projectDirectory.dir("./run/test")
         }
 
         data {
-            taskName "runFTForgeData"
-            workingDirectory project.file("./run/data")
-            args '--mod', 'fallingtree', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+            workingDir = layout.projectDirectory.dir("./run/data")
+            args '--mod', 'fallingtree', '--all', '--output', layout.projectDirectory.dir('src/generated/resources/'), '--existing', layout.projectDirectory.dir('src/main/resources/')
         }
     }
 }
 
+repositories {
+    minecraft.mavenizer(it)
+    maven fg.forgeMaven
+    maven fg.minecraftLibsMaven
+}
+
 configurations {
     library
     implementation.extendsFrom library
 }
 
-minecraft.runs.all {
-    lazyToken('minecraft_classpath') {
-        configurations.library.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
-    }
-}
-
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    minecraft(libs.forge)
+    implementation(minecraft.dependency(libs.forge))
     library(project(":common"))
 
 //    implementation("me.shedaniel.cloth:cloth-config-forge:${libs.versions.clothConfigVersion.get()}")
 
-    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
-
     annotationProcessor(libs.forgeEventbusValidator)
 }
 
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java
@@ -28,7 +28,7 @@ public FallingTree(FMLJavaModLoadingContext context){
 		// 	}
 		// }
 		
-		if(ModList.get().isLoaded("veinminer")){
+		if(ModList.isLoaded("veinminer")){
 			log.warn("VeinMiner is present, this may lead to incompatibilities. It is recommended to run the following command: /veinminer groups remove Wood");
 		}
 		
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/ChunkPosWrapper.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/ChunkPosWrapper.java
@@ -16,11 +16,11 @@ public class ChunkPosWrapper implements IChunkPos{
 	
 	@Override
 	public int getX(){
-		return raw.x;
+		return raw.x();
 	}
 	
 	@Override
 	public int getZ(){
-		return raw.z;
+		return raw.z();
 	}
 }
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/PlayerWrapper.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/PlayerWrapper.java
@@ -36,7 +36,7 @@ public void sendMessage(@NonNull IComponent component, @NonNull NotificationMode
 			}
 		}
 		else{
-			raw.displayClientMessage(text, true);
+			raw.sendOverlayMessage(text);
 		}
 	}
 	
@@ -76,7 +76,7 @@ public ILevel getLevel(){
 	@Override
 	@NonNull
 	public Set<String> getTags(){
-		return raw.getTags();
+		return raw.entityTags();
 	}
 	
 	@Override
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/network/PlayerJoinListener.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/network/PlayerJoinListener.java
@@ -31,7 +31,7 @@ public void onPlayerLoggedInEvent(@Nonnull PlayerEvent.PlayerLoggedInEvent event
 				log.info("Player connected to a local world, not setting up proxy config");
 			}
 			
-			if(ModList.get().isLoaded("veinminer")){
+			if(ModList.isLoaded("veinminer")){
 				new PlayerWrapper(event.getEntity()).sendMessage(mod.translate("chat.fallingtree.veinminer_incompatibility"), NotificationMode.CHAT);
 			}
 		}
diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
@@ -1,4 +1 @@
-public net.minecraft.world.entity.item.FallingBlockEntity f_31946_ # blockState
-public net.minecraft.world.entity.item.FallingBlockEntity blockState # blockState
-public net.minecraft.server.level.ServerPlayer f_8924_ # server
 public net.minecraft.server.level.ServerPlayer server # server
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[61,)"
+loaderVersion = "[62,)"
 issueTrackerURL = "https://github.com/${repoUser}/${repoName}/issues"
 license = "LGPL-3.0"
 
@@ -15,7 +15,7 @@ authors = "Rakambda"
 [[dependencies.fallingtree]]
 modId = "forge"
 mandatory = true
-versionRange = "[61,)"
+versionRange = "[62,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.fallingtree]]
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,9 +1,9 @@
 {
   "pack" : {
     "description" : "FallingTree resources",
-    "max_format" : 94,
+    "max_format" : 101,
     "min_format" : [
-      94,
+      101,
       1
     ]
   }
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 modId=fallingtree
 modName=FallingTree
 includeFabric=true
-includeForge=false
+includeForge=true
 includeNeoForge=true
 # Repository
 repoUser=Rakambda
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,18 +8,18 @@ log4j2-version = "2.25.3"
 
 # Minecraft / Loaders
 minecraftVersion = "26.1"
-fabric-loader-version = "0.18.4"
-fabric-api-version = "0.144.0+26.1"
-forge-version = "1.21.11-61.0.7"
-forgeEventbusValidator-version = "7.0-beta.12"
-neoforgeVersion = "26.1.0.1-beta"
+fabric-loader-version = "0.18.5"
+fabric-api-version = "0.144.3+26.1"
+forge-version = "26.1-62.0.3"
+forgeEventbusValidator-version = "7.0.1"
+neoforgeVersion = "26.1.0.5-beta"
 
 # Mod dependencies
-modmenu-version = "18.0.0-alpha.6"
-clothConfigVersion = "20.0.149"
+modmenu-version = "18.0.0-alpha.8"
+clothConfigVersion = "26.1.154"
 
 fabric-loom-version = "1.15-SNAPSHOT"
-forge-plugin-version = "[6.0.46,6.2)"
+forge-plugin-version = "[7.0.17,8)"
 neoforge-plugin-version = "2.0.141"
 curse-version = "1.1.28"
 modrinth-version = "2.9.0"
diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -59,7 +59,7 @@ configurations.runtimeClasspath {
 dependencies {
     implementation(project(":common"))
 
-//    compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${libs.versions.clothConfigVersion.get()}")
+    compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${libs.versions.clothConfigVersion.get()}")
 }
 
 tasks {
@@ -69,7 +69,7 @@ tasks {
         from("src/main/resources", "../common/src/main/resources")
 
         filesMatching("META-INF/neoforge.mods.toml") {
-            expand(project.properties + mapOf<String, String>("minecraftVersion" to libs.versions.minecraftVersion.get()))
+            expand(project.properties + mapOf("minecraftVersion" to libs.versions.minecraftVersion.get()))
         }
     }
 }
diff --git a/neoforge/src/main/java/fr/rakambda/fallingtree/neoforge/FallingTreeClient.java b/neoforge/src/main/java/fr/rakambda/fallingtree/neoforge/FallingTreeClient.java
@@ -1,27 +1,31 @@
 package fr.rakambda.fallingtree.neoforge;
 
+import fr.rakambda.fallingtree.common.FallingTreeCommon;
+import fr.rakambda.fallingtree.neoforge.client.cloth.ClothConfigHook;
 import lombok.extern.log4j.Log4j2;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.Mod;
 import org.jspecify.annotations.NonNull;
+import java.lang.reflect.InvocationTargetException;
 
 @Log4j2
 @Mod(value = FallingTree.MOD_ID, dist = Dist.CLIENT)
 public class FallingTreeClient {
 	public FallingTreeClient(@NonNull IEventBus modEventBus, @NonNull ModContainer modContainer){
-		// if(ModList.get().isLoaded("cloth_config")){
-		// 	try{
-		// 		Class.forName("fr.rakambda.fallingtree.neoforge.client.cloth.ClothConfigHook")
-		// 				.asSubclass(ClothConfigHook.class)
-		// 				.getConstructor(FallingTreeCommon.class)
-		// 				.newInstance(FallingTree.getMod())
-		// 				.load(modContainer);
-		// 	}
-		// 	catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
-		// 		log.error("Failed to hook into ClothConfig", e);
-		// 	}
-		// }
+		if(ModList.get().isLoaded("cloth_config")){
+			try{
+				Class.forName("fr.rakambda.fallingtree.neoforge.client.cloth.ClothConfigHook")
+						.asSubclass(ClothConfigHook.class)
+						.getConstructor(FallingTreeCommon.class)
+						.newInstance(FallingTree.getMod())
+						.load(modContainer);
+			}
+			catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
+				log.error("Failed to hook into ClothConfig", e);
+			}
+		}
 	}
 }
diff --git a/neoforge/src/main/java/fr/rakambda/fallingtree/neoforge/client/cloth/ClothConfigHook.java b/neoforge/src/main/java/fr/rakambda/fallingtree/neoforge/client/cloth/ClothConfigHook.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,13 +16,6 @@ pluginManagement {
         }
         gradlePluginPortal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "net.minecraftforge.gradle") {
-                useModule("${requested.id}:ForgeGradle:${requested.version}")
-            }
-        }
-    }
 }
 
 plugins {

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,12 @@ allprojects {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ pluginManager.withPlugin("idea") {`
	`91`	`+ if (tasks.findByName("idePostSync") == null) {`
	`92`	`+ tasks.register("idePostSync")`
	`93`	`+ }`
	`94`	`+ }`
	`95`	`+`
`90`	`96`	`if (version == null \|\| version == "unspecified") {`
`91`	`97`	`try {`
`92`	`98`	`def details = versionDetails()`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ dependencies {`
`15`	`15`	`exclude(group = "net.fabricmc.fabric-api")`
`16`	`16`	`}`
`17`	`17`
`18`		`-// modImplementation(libs.clothConfigFabric) {`
`19`		`-// exclude(group = "net.fabricmc.fabric-api")`
`20`		`-// exclude(module = "modmenu")`
`21`		`-// }`
	`18`	`+ implementation(libs.clothConfigFabric) {`
	`19`	`+ exclude(group = "net.fabricmc.fabric-api")`
	`20`	`+ exclude(module = "modmenu")`
	`21`	`+ }`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public FallingTree(FMLJavaModLoadingContext context){`
`28`	`28`	`// }`
`29`	`29`	`// }`
`30`	`30`
`31`		`- if(ModList.get().isLoaded("veinminer")){`
	`31`	`+ if(ModList.isLoaded("veinminer")){`
`32`	`32`	`log.warn("VeinMiner is present, this may lead to incompatibilities. It is recommended to run the following command: /veinminer groups remove Wood");`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ public class ChunkPosWrapper implements IChunkPos{`
`16`	`16`
`17`	`17`	`@Override`
`18`	`18`	`public int getX(){`
`19`		`- return raw.x;`
	`19`	`+ return raw.x();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
`23`	`23`	`public int getZ(){`
`24`		`- return raw.z;`
	`24`	`+ return raw.z();`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void sendMessage(@NonNull IComponent component, @NonNull NotificationMode`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`else{`
`39`		`- raw.displayClientMessage(text, true);`
	`39`	`+ raw.sendOverlayMessage(text);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`@@ -76,7 +76,7 @@ public ILevel getLevel(){`
`76`	`76`	`@Override`
`77`	`77`	`@NonNull`
`78`	`78`	`public Set<String> getTags(){`
`79`		`- return raw.getTags();`
	`79`	`+ return raw.entityTags();`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void onPlayerLoggedInEvent(@Nonnull PlayerEvent.PlayerLoggedInEvent event`
`31`	`31`	`log.info("Player connected to a local world, not setting up proxy config");`
`32`	`32`	`}`
`33`	`33`
`34`		`- if(ModList.get().isLoaded("veinminer")){`
	`34`	`+ if(ModList.isLoaded("veinminer")){`
`35`	`35`	`new PlayerWrapper(event.getEntity()).sendMessage(mod.translate("chat.fallingtree.veinminer_incompatibility"), NotificationMode.CHAT);`
`36`	`36`	`}`
`37`	`37`	`}`