Team Tags

src/main/java/com/createcivilization/capitol/common/config/CapitolConfig.java

@@ -48,6 +48,14 @@ public class CapitolConfig {
 	public static final ModConfigSpec.ConfigValue<List<? extends String>> BLOCK_PLACE_EXCEPTIONS;
 	public static final ModConfigSpec.ConfigValue<List<? extends String>> ITEM_USE_EXCEPTIONS;
 
+	// Roles
+
+	public static final ModConfigSpec.BooleanValue DISPLAY_TAGS_IN_CHAT;
+	public static final ModConfigSpec.BooleanValue DISPLAY_TAGS_IN_TAB_LIST;
+
+	// Teams
+	public static final ModConfigSpec.IntValue TEAM_TAG_MAX_LENGTH;
+
 	public enum ListType {
 		ONLY,
 		ALL_BUT
@@ -169,6 +177,26 @@ public enum ListType {
 
 		builder.pop();
 
+		builder.comment("Role settings").push("roles");
+
+		DISPLAY_TAGS_IN_CHAT = builder
+			.comment("Whether chat messages with have the players team tag attached.")
+			.define("displayTagsInChat", true);
+
+		DISPLAY_TAGS_IN_TAB_LIST = builder
+			.comment("Whether the tab list will have the players team tag attached.")
+			.define("displayTagsInTabList", true);
+
+		builder.pop();
+
+		builder.comment("Role settings").push("team");
+
+		TEAM_TAG_MAX_LENGTH = builder
+			.comment("Max length for a team to have as a tag.")
+			.defineInRange("teamTagMaxLength", 3, 0, 16);
+
+		builder.pop();
+
 		SPEC = builder.build();
 	}
 }

src/main/java/com/createcivilization/capitol/common/data/TeamRole.java

@@ -1,10 +1,11 @@
 package com.createcivilization.capitol.common.data;
 
+import java.awt.*;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
-public record TeamRole(int id, UUID teamId, String name, long permissions) {
+public record TeamRole(int id, UUID teamId, String name, long permissions, Color color) {
 
 	public static final String OWNER_ROLE_NAME = "owner";
 	public static final String DEFAULT_ROLE_NAME = "default";
@@ -22,11 +23,17 @@ public boolean hasPermission(Permission perm) {
 	}
 
 	public static TeamRole fromResultSet(ResultSet rs) throws SQLException {
+		Color color = null;
+		if (rs.getInt("color") != -1) {
+			color = new Color(rs.getInt("color"));
+		}
+
 		return new TeamRole(
 			rs.getInt("id"),
 			UUID.fromString(rs.getString("team_id")),
 			rs.getString("name"),
-			rs.getLong("permissions")
+			rs.getLong("permissions"),
+			color
 		);
 	}
 

src/main/java/com/createcivilization/capitol/common/managers/DatabaseManager.java

@@ -67,6 +67,7 @@ private static void createTables() throws SQLException {
 					"team_id TEXT NOT NULL," +
 					"name TEXT NOT NULL," +
 					"permissions INTEGER NOT NULL DEFAULT 0," +
+					"color INTEGER NOT NULL DEFAULT -1,"+
 					"UNIQUE (team_id, name)," +
 					"FOREIGN KEY (team_id) REFERENCES teams (id) ON DELETE CASCADE)"
 			);

src/main/java/com/createcivilization/capitol/common/modules/database/CapitolDatabase.java

@@ -8,9 +8,11 @@
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 
+import java.awt.*;
 import java.sql.*;
 import java.time.Instant;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class CapitolDatabase extends Database {
@@ -78,19 +80,31 @@ public void setTeamPermissions(Team team, long permissions) {
 	 * @param team        the team this role belongs to
 	 * @param name        the role name (e.g. "owner", "default")
 	 * @param permissions the bitfield of {@link Permission} flags
+	 * @param color       the color this role will override to for nation tags
 	 */
-	public void addRole(Team team, String name, long permissions) {
+	public void addRole(Team team, String name, long permissions, Color color) {
 		try (PreparedStatement ps = getConnection().prepareStatement(
-			"INSERT INTO team_roles (team_id, name, permissions) VALUES (?, ?, ?)")) {
+			"INSERT INTO team_roles (team_id, name, permissions, color) VALUES (?, ?, ?, ?)")) {
 			ps.setString(1, team.getId().toString());
 			ps.setString(2, name);
 			ps.setLong(3, permissions);
+			ps.setInt(4, color == null ? -1 : color.getRGB()); // -1 if the role has no associated color
 			ps.execute();
 		} catch (SQLException e) {
 			Capitol.LOGGER.error("Error while adding role to database.", e);
 			throw new RuntimeException(e);
 		}
 	}
+	/**
+	 * Inserts a new role into the {@code team_roles} table.
+	 *
+	 * @param team        the team this role belongs to
+	 * @param name        the role name (e.g. "owner", "default")
+	 * @param permissions the bitfield of {@link Permission} flags
+	 */
+	public void addRole(Team team, String name, long permissions) {
+		addRole(team, name, permissions, null);
+	}
 
 	/**
 	 * Retrieves a role by its auto-incremented database ID.
@@ -200,6 +214,19 @@ public void updateRoleName(Team team, String roleName, String newName) {
 		}
 	}
 
+	public void updateRoleColor(Team team, String roleName, Color color) {
+		try (PreparedStatement ps = getConnection().prepareStatement(
+			"UPDATE team_roles SET color = ? WHERE team_id = ? AND name = ?")) {
+			ps.setInt(1, color == null ? -1 : color.getRGB());
+			ps.setString(2, team.getId().toString());
+			ps.setString(3, roleName);
+			ps.execute();
+		} catch (SQLException e) {
+			Capitol.LOGGER.error("Error while updating role color in database.", e);
+			throw new RuntimeException(e);
+		}
+	}
+
 	/**
 	 * Deletes a role by team and role name.
 	 *
@@ -308,7 +335,7 @@ public void addTeam(Team team) {
 			throw new RuntimeException(e);
 		}
 
-		addRole(team, TeamRole.OWNER_ROLE_NAME, TeamRole.ownerPermissions());
+		addRole(team, TeamRole.OWNER_ROLE_NAME, TeamRole.ownerPermissions(), new Color(0x800080));
 		addRole(team, TeamRole.DEFAULT_ROLE_NAME, TeamRole.defaultPermissions());
 	}
 

src/main/java/com/createcivilization/capitol/server/commands/claim/ClaimCommand.java

@@ -175,10 +175,10 @@ private static int auto(CommandContext<CommandSourceStack> context) {
 
 		if (AutoClaimEvents.isAutoClaimer(player)) {
 			AutoClaimEvents.removeAutoClaimer(player);
-			context.getSource().sendSuccess(() -> Component.translatable("commands.capitol.claim.auto_claim.stop").withStyle(ChatFormatting.GREEN), true);
+			context.getSource().sendSuccess(() -> Component.translatable("commands.capitol.claim.auto_claiming.stop").withStyle(ChatFormatting.GREEN), true);
 		} else {
 			AutoClaimEvents.updateAutoClaimer(player);
-			context.getSource().sendSuccess(() -> Component.translatable("commands.capitol.claim.auto_claim.start").withStyle(ChatFormatting.GREEN), true);
+			context.getSource().sendSuccess(() -> Component.translatable("commands.capitol.claim.auto_claiming.start").withStyle(ChatFormatting.GREEN), true);
 		}
 		return 1;
 	}

src/main/java/com/createcivilization/capitol/server/commands/help/HelpCommand.java

@@ -31,7 +31,7 @@ private static int showHelp(CommandContext<CommandSourceStack> context) {
 		msg.append(entry("/capitol team invite <player>", Component.translatable("commands.capitol.help.team.invite")));
 		msg.append(entry("/capitol team kick <player>", Component.translatable("commands.capitol.help.team.kick")));
 		msg.append(entry("/capitol team disband", Component.translatable("commands.capitol.help.team.disband")));
-		msg.append(entry("/capitol team role edit <name> remove|rename|assign|permission", Component.translatable("commands.capitol.help.team.role.edit")));
+		msg.append(entry("/capitol team role edit <name> remove|rename|assign|permission|list", Component.translatable("commands.capitol.help.team.role.edit")));
 		msg.append(entry("/capitol team role create <name>", Component.translatable("commands.capitol.help.team.role.create")));
 		msg.append(entry("/capitol team protection <name>", Component.translatable("commands.capitol.help.team.protection")));
 		msg.append(entry("/capitol team player <player> permission <perm>", Component.translatable("commands.capitol.help.team.player.permission")));

src/main/java/com/createcivilization/capitol/server/commands/invite/InviteCommand.java

@@ -38,7 +38,7 @@ public static LiteralArgumentBuilder<CommandSourceStack> register() {
 	}
 
 	private static int acceptInvite(CommandContext<CommandSourceStack> context) {
-		Player player = context.getSource().getPlayer();
+		ServerPlayer player = context.getSource().getPlayer();
 		if (player == null) return 0;
 
 		Team team = resolveInvitedTeam(context, player);
@@ -48,6 +48,9 @@ private static int acceptInvite(CommandContext<CommandSourceStack> context) {
 		DatabaseManager.database.addPlayerToTeam(player, team, role);
 		InviteHandler.clearInvites(player);
 
+		player.refreshDisplayName();
+		player.refreshTabListName(); // needs to be a ServerPlayer for this.
+
 		MutableComponent joinMsg = Component.translatable("commands.capitol.invites.join.announcement",
 			Component.literal(player.getName().getString()).withStyle(ChatFormatting.WHITE),
 			Component.literal(team.getName()).withStyle(ChatFormatting.GOLD))

src/main/java/com/createcivilization/capitol/server/commands/team/TeamCommand.java

@@ -1,5 +1,6 @@
 package com.createcivilization.capitol.server.commands.team;
 
+import com.createcivilization.capitol.common.config.CapitolConfig;
 import com.createcivilization.capitol.common.data.*;
 import com.createcivilization.capitol.common.managers.DatabaseManager;
 import com.createcivilization.capitol.common.modules.database.CapitolDatabase;
@@ -198,6 +199,11 @@ private static int createTeam(CommandContext<CommandSourceStack> context) {
 		).replace("#", "");
 		String tag = StringArgumentType.getString(context, "tag");
 
+		if (tag.length() > CapitolConfig.TEAM_TAG_MAX_LENGTH.get()) {
+			context.getSource().sendFailure(Component.translatable("commands.capitol.team.create.tag_too_long", CapitolConfig.TEAM_TAG_MAX_LENGTH.get()).withStyle(ChatFormatting.RED));
+			return 0;
+		}
+
 		String description;
 		try {
 			description = StringArgumentType.getString(context, "description");
@@ -339,4 +345,8 @@ private static int confirmDisband(CommandContext<CommandSourceStack> context) {
 		context.getSource().sendSuccess(() -> Component.translatable("commands.capitol.team.disband.success").withStyle(ChatFormatting.GREEN), true);
 		return 1;
 	}
+
+	public static Map<String, String> getNamedColors() {
+		return NAMED_COLORS;
+	}
 }