Merge pull request #46 from FTBTeam/dev

Dev

Author: desht

.gitignore

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

CHANGELOG.md

@@ -4,6 +4,28 @@ 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).
 
+## [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)
+
+### Fixed
+* Fixed the `/ftbteams party info` command always showing your own party info, regardless of team that was passed to the command
+
 ## [2001.1.4]
 
 ### Fixed

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.5-SNAPSHOT" apply false
 }
 
 architectury {

common/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 def ENV = System.getenv()
 
 architectury {
-	common()
+	common("forge", "fabric", "neoforge")
 }
 
 publishing {
@@ -42,4 +42,4 @@ publishing {
 			}
 		}
 	}
-}
+}

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

@@ -92,17 +92,33 @@ 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 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 team 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);
+
 		TeamMessage createMessage(UUID sender, Component text);
 	}
 }

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

@@ -1,11 +1,13 @@
 package dev.ftb.mods.ftbteams.api;
 
+import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftbteams.api.property.TeamProperties;
 import dev.ftb.mods.ftbteams.api.property.TeamProperty;
 import dev.ftb.mods.ftbteams.api.property.TeamPropertyCollection;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
@@ -216,4 +218,14 @@ default boolean isClientTeam() {
      * @return true if the team object is still valid, false otherwise
      */
     boolean isValid();
+
+    /**
+     * Create a party team from this team, which must be an individual player's team. The player must not be in an
+     * existing team.
+     *
+     * @param description the long description text (an empty string is acceptable)
+     * @param color the color for the new team; if null, then a random color is chosen
+     * @return the newly-created party team
+     */
+    Team createParty(String description, @Nullable Color4I color);
 }

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

@@ -1,8 +1,11 @@
 package dev.ftb.mods.ftbteams.api;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import dev.ftb.mods.ftblibrary.icon.Color4I;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Map;
@@ -111,4 +114,16 @@ public interface TeamManager {
      * any data in the compound returned by {@link #getExtraData()}.
      */
     void markDirty();
+
+    /**
+     * Attempt to create a party team for the given player
+     * @param player the player to create the team for
+     * @param name the human-readable team name (something like "{player}'s team" is suggested)
+     * @param description a text description of the team, may be null
+     * @param color a color definition; if null, a random color will be picked
+     * @return the new party team
+     * @throws CommandSyntaxException if there was any kind of failure creating the team,
+     * most commonly that the player is already in a party
+     */
+    Team createPartyTeam(ServerPlayer player, String name, @Nullable String description, @Nullable Color4I color) throws CommandSyntaxException;
 }

common/src/main/java/dev/ftb/mods/ftbteams/api/event/TeamCreatedEvent.java

@@ -2,16 +2,22 @@
 
 import dev.ftb.mods.ftbteams.api.Team;
 import net.minecraft.server.level.ServerPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 /**
  * Fired server-side when a new team is created; could be a player, party, or server team.
  */
 public class TeamCreatedEvent extends TeamEvent {
 	private final ServerPlayer creator;
+	private final UUID creatorId;
 
-	public TeamCreatedEvent(Team team, ServerPlayer creator) {
+	public TeamCreatedEvent(Team team, @Nullable ServerPlayer creator, @NotNull UUID creatorId) {
 		super(team);
 		this.creator = creator;
+		this.creatorId = creatorId;
 	}
 
 	/**
@@ -22,4 +28,13 @@ public TeamCreatedEvent(Team team, ServerPlayer creator) {
 	public ServerPlayer getCreator() {
 		return creator;
 	}
+
+	/**
+	 * Get the UUID of the player responsible for creation of the team.
+	 *
+	 * @return the creator's UUID
+	 */
+	public UUID getCreatorId() {
+		return creatorId;
+	}
 }