spanish translation

.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 }}

.github/workflows/release.yml

@@ -1,16 +1,20 @@
 name: Java CI - Build Release
 
 on:
-  release:
-    types: [ published ]
+  push:
+    tags:
+      - 'v[0-9]+\.[0-9]+\.[0-9]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+'
 
 jobs:
   build:
     if: |
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
     with:
-      curse-publish-task: curseforge
+      curse-publish-task: publishMods
+      java-version: 21
     secrets:
       ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
       saps-token: ${{ secrets.SAPS_TOKEN }}

.gitignore

@@ -22,3 +22,6 @@ build
 eclipse
 run
 /classes
+
+.DS_Store
+.architectury-transformer

CHANGELOG.md

@@ -4,12 +4,62 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2001.1.5]
+## [2101.1.2]
+
+### Changed
+* FTB Teams commands which provide command completion for known teams are now smarter about suggesting only relevant teams 
+  * e.g. `/ftbteams server settings ...` now only lists known server teams, not other team types
+
+### Fixed
+* Fixed bug where renaming a team's display name didn't sync change to clients immediately, causing command completion to provide the previous name
+  * This also means any team names and colors will now be immediately visible on client display (e.g. FTB Chunks) if changed by command
+
+## [2101.1.1]
+
+### Added
+* Added a `tr_tr` translation, thanks @RuyaSavascisi
+
+### Changed
+* Overhauled and cleaned up many icon textures
+
+### Fixed
+* Fixed the `/ftbteams party settings_for ...` command not functioning correctly
+
+## [2101.1.0]
+
+### Changed
+* Ported to MC 1.21.1
+  * Will not run on MC 1.21
+
+### Added
+* Sidebar buttons for this and other FTB mods can now be enabled/disabled/rearranged (new functionality in FTB Library 2101.1.0)
+
+## [2100.1.0]
+
+### Changed
+* Ported to MC 1.21
+
+## [2006.1.0]
+
+### Changed
+* Ported to Minecraft 1.20.6. Support for Fabric and NeoForge.
+  * Forge support may be re-added if/when Architectury adds support for Forge
+
+## [2004.1.2]
+
+### Changed
+* Ported to Minecraft 1.20.4. Support for Fabric, Forge and NeoForge.
+
+## [2001.2.0]
 
 ### Changed
 * Technical addition: property defaults are now initialised lazily, via supplier
   * No player-visible change to this right now, but it makes it easier for mods to define config-based defaults, e.g. FTB Chunks team properties
   * Technically there is an API break, but only if you were trying to construct property objects yourself using the from-network constructor (and there was no good reason to do that!)
+* Deprecated the `CustomPartyCreationHandler` object and related API methods
+  * Replaced with simpler `FTBTeamsAPI#setPartyCreationFromAPIOnly(boolean)` method
+  * Intended for use in custom modpacks where players shouldn't create teams directly themselves (either via CLI or GUI)
+* Updated party team creation API to work without requiring the party-owning player to be online
 
 ### Added
 * Added fr_fr translation (thanks @HollishKid and @K0LALA)

build.gradle

@@ -1,8 +1,11 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
+apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'
+
 architectury {
 	minecraft = rootProject.minecraft_version
 }
@@ -33,7 +36,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"
@@ -72,6 +75,78 @@ allprojects {
 	java {
 		withSourcesJar()
 	}
+
+	publishing {
+		repositories {
+			if (ftbPublishing.ftbToken) {
+				maven {
+					url ftbPublishing.ftbURL
+					credentials {
+						username = ftbPublishing.ftbUser
+						password = ftbPublishing.ftbToken
+					}
+				}
+			}
+
+			if (ftbPublishing.sapsToken) {
+				maven {
+					url ftbPublishing.sapsURL
+					credentials {
+						username = ftbPublishing.sapsUser
+						password = ftbPublishing.sapsToken
+					}
+				}
+			}
+		}
+	}
 }
 
-task curseforgePublish
+publishMods {
+	dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
+	changelog = createChangelog(project)
+	version = mod_version
+
+	// TODO: Migrate to something else
+	def tag = providers.environmentVariable("TAG").getOrElse("release")
+	type = tag.endsWith("-beta") ? BETA : (tag.endsWith("-alpha") ? ALPHA : STABLE)
+
+	def createOptions = (String projectName) -> {
+		publishOptions {
+			file = project.provider { project(":$projectName").tasks.remapJar }.flatMap { it.archiveFile }
+			displayName = "[${projectName.toUpperCase()}][${minecraft_version}] ${readable_name} ${mod_version}"
+			modLoaders.add(projectName.toLowerCase())
+		}
+	}
+
+	def fabricOptions = createOptions("fabric")
+//	def forgeOptions = createOptions("forge")
+	def neoForgeOptions = createOptions("neoforge")
+
+	def curseForgeOptions = curseforgeOptions {
+		accessToken = providers.environmentVariable("CURSEFORGE_KEY")
+		minecraftVersions.add("${minecraft_version}")
+		javaVersions.add(JavaVersion.VERSION_21)
+	}
+
+	curseforge("curseforgeFabric") {
+		from(curseForgeOptions, fabricOptions)
+		projectId = curseforge_id_fabric
+		requires('architectury-api')
+		requires('fabric-api')
+		requires('ftb-library-fabric')
+	}
+
+	curseforge("curseforgeNeoForge") {
+		from(curseForgeOptions, neoForgeOptions)
+		projectId = curseforge_id_forge
+		requires('architectury-api')
+		requires('ftb-library-forge')
+	}
+
+//	curseforge("curseforgeForge") {
+//		from(curseForgeOptions, forgeOptions)
+//		projectId = curseforge_id_forge
+//		requires('architectury-api')
+//		requires('ftb-library-forge')
+//	}
+}

common/build.gradle

@@ -1,15 +1,13 @@
 dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-	modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+	modApi "dev.architectury:architectury:${rootProject.architectury_api_version}"
 
 	modApi "dev.ftb.mods:ftb-library:${rootProject.ftb_library_version}"
 }
 
-def ENV = System.getenv()
-
 architectury {
-	common()
+	common(/*"forge",*/ "fabric", "neoforge")
 }
 
 publishing {
@@ -20,26 +18,4 @@ publishing {
 			from components.java
 		}
 	}
-
-	repositories {
-		if (ftbPublishing.ftbToken) {
-			maven {
-				url ftbPublishing.ftbURL
-				credentials {
-					username = ftbPublishing.ftbUser
-					password = ftbPublishing.ftbToken
-				}
-			}
-		}
-
-		if (ftbPublishing.sapsToken) {
-			maven {
-				url ftbPublishing.sapsURL
-				credentials {
-					username = ftbPublishing.sapsUser
-					password = ftbPublishing.sapsToken
-				}
-			}
-		}
-	}
-}
+}

common/src/main/java/dev/ftb/mods/ftbteams/FTBTeams.java

@@ -40,7 +40,7 @@ public FTBTeams() {
 
 		EnvExecutor.runInEnv(Env.CLIENT, () -> FTBTeamsClient::init);
 
-		FTBTeamsNet.init();
+		FTBTeamsNet.register();
 	}
 
 	private void serverAboutToStart(MinecraftServer server) {
@@ -83,7 +83,4 @@ private void playerLoggedOut(ServerPlayer player) {
 			TeamManagerImpl.INSTANCE.playerLoggedOut(player);
 		}
 	}
-
-	public void setup() {
-	}
 }

common/src/main/java/dev/ftb/mods/ftbteams/FTBTeamsAPIImpl.java

@@ -15,7 +15,7 @@
 public enum FTBTeamsAPIImpl implements FTBTeamsAPI.API {
     INSTANCE;
 
-    private CustomPartyCreationHandler partyCreationOverride = null;
+    private boolean partyCreationFromAPIOnly = false;
 
     @Override
     public boolean isManagerLoaded() {
@@ -38,21 +38,26 @@ public ClientTeamManager getClientManager() {
     }
 
     @Override
-    public CustomPartyCreationHandler getCustomPartyCreationHandler() {
-        return partyCreationOverride;
+    public CustomPartyCreationHandler setCustomPartyCreationHandler(CustomPartyCreationHandler partyCreationOverride) {
+        return null;
     }
 
     @Override
-    public TeamMessage createMessage(UUID sender, Component text) {
-        return new TeamMessageImpl(sender, System.currentTimeMillis(), text);
+    public CustomPartyCreationHandler getCustomPartyCreationHandler() {
+        return null;
     }
 
     @Override
-    public CustomPartyCreationHandler setCustomPartyCreationHandler(CustomPartyCreationHandler partyCreationOverride) {
-        CustomPartyCreationHandler prev = this.partyCreationOverride;
-        this.partyCreationOverride = partyCreationOverride;
-        return prev;
+    public void setPartyCreationFromAPIOnly(boolean apiOnly) {
+        partyCreationFromAPIOnly = apiOnly;
     }
 
+    public boolean isPartyCreationFromAPIOnly() {
+        return partyCreationFromAPIOnly;
+    }
 
+    @Override
+    public TeamMessage createMessage(UUID sender, Component text) {
+        return new TeamMessageImpl(sender, System.currentTimeMillis(), text);
+    }
 }

common/src/main/java/dev/ftb/mods/ftbteams/api/CustomPartyCreationHandler.java

@@ -3,6 +3,7 @@
 import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
 
 @FunctionalInterface
+@Deprecated
 public interface CustomPartyCreationHandler {
     void createParty(MouseButton button);
 }

common/src/main/java/dev/ftb/mods/ftbteams/api/FTBTeamsAPI.java

@@ -34,7 +34,7 @@ public static FTBTeamsAPI.API api() {
 	 * @return a new resource location
 	 */
 	public static ResourceLocation rl(String path) {
-		return new ResourceLocation(MOD_ID, path);
+		return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
 	}
 
 	/**
@@ -92,17 +92,39 @@ public interface API {
 		 *
 		 * @param handler the new handler to use
 		 * @return the previous handler
+		 * @deprecated use {@link #setPartyCreationFromAPIOnly(boolean)}
 		 */
+		@Deprecated
 		@Nullable
 		CustomPartyCreationHandler setCustomPartyCreationHandler(@Nullable CustomPartyCreationHandler handler);
 
 		/**
 		 * Get the custom party creation handler in effect, if any
 		 * @return the current custom handler, or null if none is in effect
+		 * @deprecated see {@link #setPartyCreationFromAPIOnly(boolean)}
 		 */
+		@Deprecated
 		@Nullable
 		CustomPartyCreationHandler getCustomPartyCreationHandler();
 
+		/**
+		 * By setting api-only team creation to true, this prevents players from creating party teams using either the
+		 * command interface or GUI interface of FTB Teams. Parties will only be creatable by other mods via the
+		 * FTB Teams API. This is intended for use with custom modpacks which link party creation with e.g. base
+		 * creation.
+		 * <p>
+		 * By default, FTB Teams allows party creation via all methods.
+		 *
+		 * @param apiOnly true to allow party creation via API only, false to allow normal creation
+		 */
+		void setPartyCreationFromAPIOnly(boolean apiOnly);
+
+		/**
+		 * Create a team message with a timestamp of the current system time.
+		 * @param sender the sending player
+		 * @param text the message content
+		 * @return a new TeamMessage object
+		 */
 		TeamMessage createMessage(UUID sender, Component text);
 	}
-}
+}