Add forge support (#768)

RakambdaOrg · Oct 27, 2024 · 5f92a1a · 5f92a1a
1 parent 12f95ce
commit 5f92a1a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 412 deletions.
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     minecraft(libs.forge)
     library(project(":common"))
 
-    implementation("me.shedaniel.cloth:cloth-config-forge:${libs.versions.clothConfigVersion.get()}")
+//    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' } }

diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java
@@ -1,14 +1,10 @@
 package fr.rakambda.fallingtree.forge;
 
-import fr.rakambda.fallingtree.common.FallingTreeCommon;
-import fr.rakambda.fallingtree.forge.client.cloth.ClothConfigHook;
 import fr.rakambda.fallingtree.forge.common.FallingTreeCommonsImpl;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
-import java.lang.reflect.InvocationTargetException;
 
 @Log4j2
 @Mod(FallingTree.MOD_ID)
@@ -18,18 +14,18 @@ public class FallingTree{
 	private static final FallingTreeCommonsImpl mod = new FallingTreeCommonsImpl();
 
 	public FallingTree(){
-		if(ModList.get().isLoaded("cloth_config")){
-			try{
-				Class.forName("fr.rakambda.fallingtree.forge.client.cloth.ClothConfigHook")
-						.asSubclass(ClothConfigHook.class)
-						.getConstructor(FallingTreeCommon.class)
-						.newInstance(mod)
-						.load();
-			}
-			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.forge.client.cloth.ClothConfigHook")
+		// 				.asSubclass(ClothConfigHook.class)
+		// 				.getConstructor(FallingTreeCommon.class)
+		// 				.newInstance(mod)
+		// 				.load();
+		// 	}
+		// 	catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
+		// 		log.error("Failed to hook into ClothConfig", e);
+		// 	}
+		// }
 
 		mod.registerForge(MinecraftForge.EVENT_BUS);
 	}

diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/client/cloth/ClothConfigHook.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/client/cloth/ClothConfigHook.java
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(@NotNull IComponent component, @NotNull NotificationMode
 			}
 		}
 		else{
-			raw.sendSystemMessage(text);
+			raw.displayClientMessage(text, true);
 		}
 	}
 

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 = "[52,)"
+loaderVersion = "[53,)"
 issueTrackerURL = "https://github.com/${repoUser}/${repoName}/issues"
 license = "LGPL-3.0"
 
@@ -15,7 +15,7 @@ authors = "Rakambda"
 [[dependencies.fallingtree]]
 modId = "forge"
 mandatory = true
-versionRange = "[52,)"
+versionRange = "[53,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.fallingtree]]
@@ -27,6 +27,6 @@ side = "BOTH"
 [[dependencies.fallingtree]]
 modId = "cloth-config"
 mandatory = false
-versionRange = "[15.0.0,)"
+versionRange = "[16.0.0,)"
 ordering = "NONE"
 side = "CLIENT"
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -3,6 +3,6 @@
         "description": {
           "text": "FallingTree"
         },
-        "pack_format": 34
+        "pack_format": 42
     }
 }
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
@@ -10,7 +10,7 @@ log4j2-version = "2.24.1"
 minecraftVersion = "1.21.3"
 fabric-loader-version = "0.16.7"
 fabric-api-version = "0.106.1+1.21.3"
-forge-version = "1.21.1-52.0.4"
+forge-version = "1.21.3-53.0.4"
 neoforge-version = "21.3.0-beta"
 
 # Mod dependencies
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     		else{
-    			raw.sendSystemMessage(text);
+    			raw.displayClientMessage(text, true);
     		}
     	}
@@ Expand Down @@