chore: ported to 1.20.6

FTBTeam · May 10, 2024 · 2506022 · 2506022
1 parent 01c956f
commit 2506022
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,6 +18,7 @@ jobs:
     with:
       curse-publish-task: ""
       maven-snapshots: true
+      java-version: 21
     secrets:
       ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
-      saps-token: ${{ secrets.SAPS_TOKEN }}
+      saps-token: ${{ secrets.SAPS_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,8 @@ jobs:
     uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
     with:
       curse-publish-task: curseforge
+      java-version: 21
     secrets:
       ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
       saps-token: ${{ secrets.SAPS_TOKEN }}
-      curse-token: ${{ secrets.CURSEFORGE_KEY }}
+      curse-token: ${{ secrets.CURSEFORGE_KEY }}
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.5-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {
@@ -33,7 +33,7 @@ allprojects {
 	// needs to be done AFTER version is set
 	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
 
-	sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 17
+	sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 21
 
 	compileJava {
 		options.encoding = "UTF-8"

diff --git a/common/build.gradle b/common/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 def ENV = System.getenv()
 
 architectury {
-	common("forge", "fabric", "neoforge")
+	common(/* "forge", */ "fabric", "neoforge")
 }
 
 publishing {

diff --git a/gradle.properties b/gradle.properties
@@ -3,20 +3,20 @@ org.gradle.daemon=false
 mod_id=ftbranks
 archives_base_name=ftb-ranks
 maven_group=dev.ftb.mods
-mod_version=2004.2.0
+mod_version=2006.1.0
 mod_author=FTB Team
 
-minecraft_version=1.20.4
+minecraft_version=1.20.6
 
 # Deps
-forge_version=49.0.31
-neoforge_version=20.4.196
+forge_version=50.0.9
+neoforge_version=20.6.49-beta
 neoforge_loader_version=1
-fabric_loader_version=0.15.7
-fabric_api_version=0.96.4+1.20.4
-architectury_version=11.1.17
+fabric_loader_version=0.15.10
+fabric_api_version=0.97.8+1.20.6
+architectury_version=12.0.28
 
-ftb_library_version=2004.2.0
+ftb_library_version=2006.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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -47,7 +47,7 @@ processResources {
 
 	inputs.property "version", project.version
 
-	filesMatching("META-INF/mods.toml") {
+	filesMatching("META-INF/neoforge.mods.toml") {
 		expand "version": project.version,
 				"archversion": project.architectury_version,
 				"neoforgeversion": project.neoforge_version,

diff --git a/neoforge/src/main/java/dev/ftb/mods/ftbranks/neoforge/FTBRanksNeoForge.java b/neoforge/src/main/java/dev/ftb/mods/ftbranks/neoforge/FTBRanksNeoForge.java
@@ -5,8 +5,6 @@
 import dev.ftb.mods.ftbranks.impl.decorate.MessageDecorator;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.level.ServerPlayer;
-import net.neoforged.fml.IExtensionPoint.DisplayTest;
-import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.ServerChatEvent;
@@ -22,8 +20,6 @@ public FTBRanksNeoForge() {
 
 		// Nope.
 		// PermissionAPI.setPermissionHandler(new PermissionAPIWrapper(PermissionAPI.getPermissionHandler()));
-
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> DisplayTest.IGNORESERVERONLY, (a, b) -> true));
 	}
 
 	private void playerNameFormatting(PlayerEvent.NameFormat event) {

diff --git a/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
@@ -11,6 +11,7 @@ authors = "FTB Team"
 description = '''
 A simple mod that lets you create ranks for players, similar to Discord roles, and manage permissions for them
 '''
+displayTest="IGNORE_SERVER_VERSION"
 
 [[mixins]]
 config = "ftbranks-common.mixins.json"

diff --git a/settings.gradle b/settings.gradle
@@ -1,14 +1,14 @@
 pluginManagement {
 	repositories {
+		maven { url "https://maven.architectury.dev/" }
 		maven { url "https://maven.creeperhost.net/" }
-		maven { url "https://maven.shedaniel.me/" }
 		gradlePluginPortal()
 	}
 }
 
 include("common")
 include("fabric")
-include("forge")
+//include("forge")
 include("neoforge")
 
-rootProject.name = 'FTB-Ranks-1.20.4'
+rootProject.name = 'FTB-Ranks-1.20.6'