Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Remove Event-related SQL classes and update relevant references across modules

Browse Source 
Signed-off-by: Chaoscaot <max@maxsp.de>
This commit is contained in:
Chaoscaot
2025-10-30 23:14:25 +01:00
parent eea1073892
commit 4e6933f2fd
30 changed files with 679 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
+2 -2
View File
@@ -64,8 +64,8 @@ public class EventStarter {
EventFight next;
while((next = nextFight(fights)) != null){
Team blue = Team.get(next.getTeamBlue());
Team red = Team.get(next.getTeamRed());
Team blue = Team.byId(next.getTeamBlue());
Team red = Team.byId(next.getTeamRed());
//Don't start EventServer if not the event bungee
String command;
VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class ServerStarter {
fightMap = eventFight.getMap();
gameMode = eventFight.getSpielmodus();
String serverName = Team.get(eventFight.getTeamBlue()).getTeamKuerzel() + "_vs_" + Team.get(eventFight.getTeamRed()).getTeamKuerzel();
String serverName = Team.byId(eventFight.getTeamBlue()).getTeamKuerzel() + "_vs_" + Team.byId(eventFight.getTeamRed()).getTeamKuerzel();
serverNameProvider = port -> serverName;
worldName = serverToWorldName(serverName + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME));
return this;
VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
+4 -4
View File
@@ -87,8 +87,8 @@ public class EventCommand extends SWCommand {
DateTimeFormatter format = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_TIME_FORMAT"));
for (EventFight fight : EventFight.getEvent(currentEvent.getEventID())) {
Team blue = Team.get(fight.getTeamBlue());
Team red = Team.get(fight.getTeamRed());
Team blue = Team.byId(fight.getTeamBlue());
Team red = Team.byId(fight.getTeamRed());
StringBuilder fline = new StringBuilder(sender.parseToLegacy("EVENT_CURRENT_FIGHT", fight.getStartTime().toLocalDateTime().format(format), blue.getTeamColor(), blue.getTeamKuerzel(), red.getTeamColor(), red.getTeamKuerzel()));
if (fight.hasFinished()) {
@@ -125,7 +125,7 @@ public class EventCommand extends SWCommand {
@Override
public Team map(Chatter sender, PreviousArguments previousArguments, String s) {
if ("PUB".equalsIgnoreCase(s) || "public".equalsIgnoreCase(s)) {
return Team.get(0);
return Team.byId(0);
}
return Team.get(s);
}
@@ -137,7 +137,7 @@ public class EventCommand extends SWCommand {
for (EventFight fight : EventFight.getEvent(currentEvent.getEventID())) {
if (fight.hasFinished()) continue;
teamMapper.apply(fight).forEach(integer -> {
Team team = Team.get(integer);
Team team = Team.byId(integer);
teams.add(team.getTeamName());
teams.add(team.getTeamKuerzel());
});
VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
+17 -17
View File
@@ -83,7 +83,7 @@ public class TeamCommand extends SWCommand {
@Register(value = "create", description = "TEAM_CREATE_USAGE")
public void create(@Validator("isNotInTeam") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name){
SteamwarUser user = sender.user();
Team team = Team.get(user.getTeam());
Team team = Team.byId(user.getTeam());
if(checkTeamKuerzel(sender, team, kuerzel) || checkTeamName(sender, team, name))
return;
@@ -116,7 +116,7 @@ public class TeamCommand extends SWCommand {
sender.system("TEAM_JOIN_USAGE");
StringBuilder sb = new StringBuilder();
for(int inv : invs){
Team team = Team.get(inv);
Team team = Team.byId(inv);
sb.append(team.getTeamName()).append(" ");
}
sender.system("TEAM_JOIN_INVITED", sb.toString());
@@ -124,7 +124,7 @@ public class TeamCommand extends SWCommand {
}
for(int inv : invs){
Team team = Team.get(inv);
Team team = Team.byId(inv);
if(team.getTeamKuerzel().equalsIgnoreCase(args[0]) || team.getTeamName().equalsIgnoreCase(args[0])){
t = inv;
break;
@@ -139,13 +139,13 @@ public class TeamCommand extends SWCommand {
user.setTeam(t);
teamInvitations.remove(user.getId());
sender.system("TEAM_JOIN_JOINED", Team.get(t).getTeamName());
sender.system("TEAM_JOIN_JOINED", Team.byId(t).getTeamName());
}
@Register("stepback")
public void stepBack(@Validator("isLeader") Chatter sender) {
SteamwarUser user = sender.user();
Team team = Team.get(user.getTeam());
Team team = Team.byId(user.getTeam());
if(noRemainingLeaders(team, user)){
sender.system("TEAM_OTHER_LEADER_REQUIRED");
@@ -159,7 +159,7 @@ public class TeamCommand extends SWCommand {
@Register("leave")
public void leave(@Validator("isInTeam") Chatter sender) {
SteamwarUser user = sender.user();
Team team = Team.get(user.getTeam());
Team team = Team.byId(user.getTeam());
int teamSize = team.size();
if(teamSize > 1 && user.isLeader() && noRemainingLeaders(team, user)) {
@@ -182,7 +182,7 @@ public class TeamCommand extends SWCommand {
@Register(value = "invite", description = "TEAM_INVITE_USAGE")
public void invite(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_INVITE_NO_PLAYER") SteamwarUser target){
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if(notDuringEvent(sender))
return;
@@ -205,7 +205,7 @@ public class TeamCommand extends SWCommand {
@Register(value = "remove", description = "TEAM_REMOVE_USAGE")
public void remove(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_REMOVE_NOT_PLAYER") @Mapper("memberList") SteamwarUser target){
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if (target.isLeader()) {
sender.system("TEAM_REMOVE_NOT_LEADER");
@@ -239,7 +239,7 @@ public class TeamCommand extends SWCommand {
@Override
public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
return Team.get(sender.user().getTeam()).getMembers().stream()
return Team.byId(sender.user().getTeam()).getMembers().stream()
.map(SteamwarUser::byId)
.map(SteamwarUser::getUserName)
.toList();
@@ -249,7 +249,7 @@ public class TeamCommand extends SWCommand {
@Register(value = "changekurzel", description = "TEAM_KUERZEL_USAGE")
public void changekuerzel(@Validator("isLeader") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel){
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if(notDuringEvent(sender))
return;
@@ -263,7 +263,7 @@ public class TeamCommand extends SWCommand {
@Register(value = "changename", description = "TEAM_NAME_USAGE")
public void changename(@Validator("isLeader") Chatter sender, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name){
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if(notDuringEvent(sender))
return;
@@ -291,7 +291,7 @@ public class TeamCommand extends SWCommand {
@Register("info")
public void info(@Validator("isInTeam") Chatter sender){
info(sender, Team.get(sender.user().getTeam()));
info(sender, Team.byId(sender.user().getTeam()));
}
@Register(value = "info", description = "TEAM_INFO_USAGE")
@@ -371,7 +371,7 @@ public class TeamCommand extends SWCommand {
@Register("event")
public void event(@Validator("isInTeam") Chatter sender) {
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
sender.system("TEAM_EVENT_USAGE");
Set<Event> events = TeamTeilnahme.getEvents(team.getTeamId());
@@ -385,7 +385,7 @@ public class TeamCommand extends SWCommand {
@Register("event")
public void event(@Validator("isLeader") Chatter sender, Event event){
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if(notDuringEvent(sender))
return;
@@ -409,7 +409,7 @@ public class TeamCommand extends SWCommand {
@Register("tp")
public void tp(@Validator("isInTeam") PlayerChatter sender) {
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
tp(sender, team);
}
@@ -450,7 +450,7 @@ public class TeamCommand extends SWCommand {
@Register(value = "server", description = "TEAM_SERVER_USAGE")
public void server(@Validator("isLeader") Chatter sender, String server, @Min(intValue = 1) @Max(intValue = 65535) @ErrorMessage("TEAM_SERVER_PORT_INVALID") int port){
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoTeamServer)) {
return;
}
@@ -508,7 +508,7 @@ public class TeamCommand extends SWCommand {
@Register("color")
@Register("changecolor")
public void changeColor(@Validator("isLeader") PlayerChatter sender) {
Team team = Team.get(sender.user().getTeam());
Team team = Team.byId(sender.user().getTeam());
if(notDuringEvent(sender))
return;
VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class TpCommand extends SWCommand {
}
if (Event.get() != null) {
EventStarter.getEventServer().keySet().forEach(teamId -> {
Team team = Team.get(teamId);
Team team = Team.byId(teamId);
list.add(team.getTeamName());
list.add(team.getTeamKuerzel());
});
VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class WhoisCommand extends SWCommand {
public void whois(Chatter sender, SteamwarUser user, WhoisParameterTypes... parameters) {
EnumSet<WhoisParameterTypes> parameterTypes = parameters.length == 0 ? EnumSet.noneOf(WhoisParameterTypes.class) : EnumSet.copyOf(Arrays.asList(parameters));
Team team = Team.get(user.getTeam());
Team team = Team.byId(user.getTeam());
sender.system("WHOIS_USERNAME", user.getUserName());
sender.system("WHOIS_PREFIX", user.prefix().getColorCode() + user.prefix().getChatPrefix());
VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
+2 -2
View File
@@ -96,8 +96,8 @@ public class EventChannel {
Instant now = Instant.now();
EventFight.getEvent(event.getEventID()).forEach(eventFight -> {
Team teamBlue = Team.get(eventFight.getTeamBlue());
Team teamRed = Team.get(eventFight.getTeamRed());
Team teamBlue = Team.byId(eventFight.getTeamBlue());
Team teamRed = Team.byId(eventFight.getTeamRed());
if (eventFight.getStartTime().toLocalDateTime().getDayOfYear() != LocalDate.now().getDayOfYear()) {
return;
VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
+1 -1
View File
@@ -247,7 +247,7 @@ public class ChatListener extends BasicListener {
sender,
msgReceiver == null ? receiver : msgReceiver,
highlightMentions(message, chatColorCode, receiver),
sender.getTeam() == 0 ? "" : "§" + Team.get(sender.getTeam()).getTeamColor() + Team.get(sender.getTeam()).getTeamKuerzel() + " ",
sender.getTeam() == 0 ? "" : "§" + Team.byId(sender.getTeam()).getTeamColor() + Team.byId(sender.getTeam()).getTeamKuerzel() + " ",
UserElo.getEmblem(sender, rankedModes),
prefix.getColorCode(),
prefix.getChatPrefix().length() == 0 ? "§f" : prefix.getChatPrefix() + " ",