Merge pull request #42 from FTBTeam/feature/1.20.2-port

feat: port to 1.20.2
FTBTeam · Nov 14, 2023 · baddd1a · baddd1a
2 parents 3694447 + 9e7a6f2
commit baddd1a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,7 @@ logs
 eclipse
 run
 .vscode
-**/extra-mods-*/
+**/extra-mods-*/
+
+.DS_Store
+.architectury-transformer
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
 }
 
 architectury {

diff --git a/fabric/src/main/java/dev/ftb/mods/ftbranks/fabric/FTBRanksFabric.java b/fabric/src/main/java/dev/ftb/mods/ftbranks/fabric/FTBRanksFabric.java
@@ -8,8 +8,6 @@
 import net.fabricmc.fabric.api.message.v1.ServerMessageDecoratorEvent;
 import net.minecraft.network.chat.MutableComponent;
 
-import java.util.concurrent.CompletableFuture;
-
 public class FTBRanksFabric implements ModInitializer {
 	@Override
 	public void onInitialize() {
@@ -19,10 +17,10 @@ public void onInitialize() {
 			if (sender != null) {
 				MutableComponent mutableComponent = message.copy();
 				if (MessageDecorator.decorateMessage(sender, mutableComponent)) {
-					return CompletableFuture.completedFuture(mutableComponent);
+					return mutableComponent;
 				}
 			}
-			return CompletableFuture.completedFuture(message);
+			return message;
 		});
 
 		PlayerDisplayNameCallback.EVENT.register(PlayerNameFormatting::formatPlayerName);

diff --git a/forge/src/main/java/dev/ftb/mods/ftbranks/forge/FTBRanksForge.java b/forge/src/main/java/dev/ftb/mods/ftbranks/forge/FTBRanksForge.java
@@ -13,7 +13,6 @@
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.network.NetworkConstants;
 
 @Mod(FTBRanks.MOD_ID)
 public class FTBRanksForge {
@@ -28,7 +27,7 @@ public FTBRanksForge() {
 		// Nope.
 		// PermissionAPI.setPermissionHandler(new PermissionAPIWrapper(PermissionAPI.getPermissionHandler()));
 
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> DisplayTest.IGNORESERVERONLY, (a, b) -> true));
 	}
 
 	private void playerNameFormatting(PlayerEvent.NameFormat event) {

diff --git a/gradle.properties b/gradle.properties
@@ -3,15 +3,19 @@ org.gradle.daemon=false
 mod_id=ftbranks
 archives_base_name=ftb-ranks
 maven_group=dev.ftb.mods
-mod_version=2001.1.3
+mod_version=2002.1.0
 mod_author=FTB Team
 
-minecraft_version=1.20.1
-architectury_version=9.0.8
-fabric_loader_version=0.14.21
-fabric_api_version=0.83.1+1.20.1
-ftb_library_version=2001.1.2
-forge_version=47.0.1
+minecraft_version=1.20.2
+
+# Deps
+forge_version=48.0.37
+neoforge_version=20.2.51-beta
+fabric_loader_version=0.14.24
+fabric_api_version=0.90.7+1.20.2
+architectury_version=10.0.8
+
+ftb_library_version=2002.1.0-SNAPSHOT
 
 curseforge_id_forge=314905
 curseforge_id_fabric=472659

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -10,4 +10,4 @@ include("common")
 include("fabric")
 include("forge")
 
-rootProject.name = 'FTB-Ranks-1.20.1'
+rootProject.name = 'FTB-Ranks-1.20.2'