Compare commits

...

2 commits

Author SHA1 Message Date
grng
d10e195b35 done (untested code) 2024-07-25 00:41:36 +01:00
grng
08cfd82d09 code that i havnt tested, gn chat 2024-07-25 00:35:52 +01:00
3 changed files with 37 additions and 21 deletions

10
build.ps1 Normal file
View file

@ -0,0 +1,10 @@
# Check if the test_server directory exists, if not, create it
if (-not (Test-Path -Path test_server)) {
New-Item -ItemType Directory -Path test_server
}
# mvn clean package dependency:copy -DskipTests -DoutputDirectory=test_server/plugins
Set-Location -Path test_server
java -jar server.jar -nogui
Set-Location -Path ..

View file

@ -15,7 +15,7 @@ import rip.iwakura.civilcore.types.DbPlayer;
public class PlayerHandler implements Listener {
private CivilCore civilCore = null;
private final CivilCore civilCore;
public PlayerHandler(CivilCore civilCore) {
this.civilCore = civilCore;
@ -33,7 +33,7 @@ public class PlayerHandler implements Listener {
String prefix = (inTeamChat ? ChatColor.DARK_BLUE + "TC " + ChatColor.RESET : "")
+ (dbPlayer.team.prefix == null ?
"" :
ChatColor.translateAlternateColorCodes('&', dbPlayer.team.prefix) + " ");
ChatColor.translateAlternateColorCodes('&', "[" + dbPlayer.team.prefix + "]") + " ");
String message = String.format("%s%s: %s", prefix, player_name, e.getMessage());
if (!inTeamChat) {

View file

@ -1,47 +1,53 @@
package rip.iwakura.civilcore.commands;
import java.sql.SQLException;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerEvent;
import net.md_5.bungee.api.ChatColor;
import org.jetbrains.annotations.NotNull;
import rip.iwakura.civilcore.Utils;
import rip.iwakura.civilcore.CivilCore;
import rip.iwakura.civilcore.types.DbPlayer;
import rip.iwakura.civilcore.types.Team;
import java.util.Objects;
public class TeamChatCommand implements CommandExecutor {
private CivilCore civilCore = null;
private final CivilCore civilCore;
public TeamChatCommand(CivilCore civilCore) {
this.civilCore = civilCore;
}
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
args = Utils.parser(args).toArray(new String[0]);
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
args = Objects.requireNonNull(Utils.parser(args)).toArray(new String[0]);
if (!(sender instanceof Player)) return true;
Player p = (Player) sender;
if (!(sender instanceof Player p)) return true;
if (args.length == 0) {
if (civilCore.teamChatRegister.contains(p)) {
civilCore.teamChatRegister.remove(p);
p.sendMessage(ChatColor.GREEN + "You are now in the " + ChatColor.GOLD + "GLOBAL" + ChatColor.GREEN + " channel");
} else {
civilCore.teamChatRegister.add(p);
p.sendMessage(ChatColor.GREEN + "You are now in the " + ChatColor.GOLD + "TEAM" + ChatColor.GREEN + " channel");
}
return true;
}
String message = String.join(" ", args);
if (civilCore.teamChatRegister.contains(p)) {
civilCore.teamChatRegister.remove(p);
p.sendMessage(ChatColor.RED + "Team chat has been disabled.");
return true;
Bukkit.broadcastMessage(ChatColor.DARK_GREEN + "TEAM > " + ChatColor.GREEN + p.getName() + ": " + message);
civilCore.teamChatRegister.add(p);
} else {
civilCore.teamChatRegister.add(p);
Bukkit.broadcastMessage(p.getName() + ": " + message);
civilCore.teamChatRegister.remove(p);
}
if (civilCore.db.getPlayerByName(p.getName()).team.name == null) {
p.sendMessage(ChatColor.RED + "You aren't in a team :(");
return true;
}
civilCore.teamChatRegister.add(p);
p.sendMessage(ChatColor.GREEN + "Team chat has been enabled.");
return true;
}