SteamWar/MissileWars
SteamWar/MissileWars
Archiviert
13
0
Fork 0
Code Issues 4 Pull-Requests Releases Wiki Aktivität

Umbau der MissileWars Commands auf das neue Command Framework #53

Zusammengeführt
YoyoNow hat 3 Commits von MissileWarsCommandFramework nach master 2023-06-12 16:43:07 +02:00 zusammengeführt
Diskussion 2 Commits 3 Geänderte Dateien 7 +71 -270
8 geänderte Dateien mit 71 neuen und 270 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit b38baa5b7b werden angezeigt - Alle Commits anzeigen

18
src/de/steamwar/misslewars/MissileWars.java
Datei anzeigen

@ -19,9 +19,10 @@
package de.steamwar.misslewars;
import de.steamwar.misslewars.commands.CommandAcceptDecline;
import de.steamwar.misslewars.commands.CommandInvite;
import de.steamwar.misslewars.commands.CommandSpectate;
import de.steamwar.misslewars.commands.AcceptCommand;
import de.steamwar.misslewars.commands.DeclineCommand;
import de.steamwar.misslewars.commands.InviteCommand;
import de.steamwar.misslewars.commands.SpectateCommand;
import de.steamwar.misslewars.countdowns.EndCountdown;
import de.steamwar.misslewars.countdowns.ItemCountdown;
import de.steamwar.misslewars.countdowns.WaitingCountdown;
@ -73,15 +74,12 @@ public class MissileWars extends JavaPlugin {
new WaitingListener();
new FightListener();
new ChatListener();
getCommand("spectate").setExecutor(new CommandSpectate());
new SpectateCommand();
// Invitation Commands
CommandInvite commandInvite = new CommandInvite();
getCommand("invite").setExecutor(commandInvite);
getCommand("invite").setTabCompleter(commandInvite);
getCommand("accept").setExecutor(new CommandAcceptDecline());
getCommand("decline").setExecutor(new CommandAcceptDecline());
new InviteCommand();
new AcceptCommand();
new DeclineCommand();
new WaitingCountdown();
new ItemCountdown();

11
src/de/steamwar/misslewars/commands/AcceptCommand.java
Datei anzeigen

@ -2,7 +2,7 @@
*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
* Copyright (C) 2023 SteamWar.de-Serverteam
PsiRobot markierte diese Unterhaltung als gelöst Veraltet
YoyoNow hat 2023-04-21 21:40:37 +02:00 kommentiert
Veraltet
Review
Link kopieren

Bissle outdated!

Bissle outdated!
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -16,20 +16,20 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* /
*/
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:40:40 +02:00 kommentiert
Review
Link kopieren

Why?

Why?
package de.steamwar.misslewars.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class AcceptCommand extends SWCommand {
public AcceptCommand() {
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:40:50 +02:00 kommentiert
Review
Link kopieren

Leerzeile bitte davor

Leerzeile bitte davor
super("accept");
}
@ -39,8 +39,7 @@ public class AcceptCommand extends SWCommand {
MWTeam teamInvitation = MissileWars.getInvitation(player);
if (teamInvitation == null) {
player.sendMessage("§cDu wurdest nicht eingeladen.");
}
else {
} else {
teamInvitation.acceptInvite(player);
message(teamInvitation, "§7Der Spieler §e" + player.getName() + "§7 ist dem Team §abeigetreten§7.");
}

64
src/de/steamwar/misslewars/commands/CommandAcceptDecline.java
Datei anzeigen

@ -1,64 +0,0 @@
/*
*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* /
*/
package de.steamwar.misslewars.commands;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class CommandAcceptDecline implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
if (!Config.isChallenge()) {
player.sendMessage("§cDieser Command ist deaktiviert.");
return false;
}
MWTeam teamInvitation = MissileWars.getInvitation(player);
if (teamInvitation == null) {
player.sendMessage("§cDu wurdest nicht eingeladen.");
return false;
}
if (command.getName().equalsIgnoreCase("accept")) {
teamInvitation.acceptInvite(player);
message(teamInvitation, "§7Der Spieler §e" + player.getName() + "§7 ist dem Team §abeigetreten§7.");
} else {
MWTeam.removeInvitations(player);
message(teamInvitation, "§7Der Spieler §e" + player.getName() + "§7 hat die Einladung §cabgelehnt§7.");
}
return false;
}
private void message(MWTeam mwTeam, String s) {
mwTeam.getPlayers().forEach(player -> player.sendMessage(s));
}
}

95
src/de/steamwar/misslewars/commands/CommandInvite.java
Datei anzeigen

@ -1,95 +0,0 @@
/*
*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* /
*/
package de.steamwar.misslewars.commands;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class CommandInvite implements CommandExecutor, TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
if (!Config.isChallenge()) {
player.sendMessage("§cDieser Command ist deaktiviert.");
return false;
}
MWTeam team = MissileWars.getTeam(player);
if (!Config.RedLeader.equals(player.getUniqueId()) && !Config.BlueLeader.equals(player.getUniqueId()) || team == null) {
player.sendMessage("§cDu kannst keine Spieler einladen.");
return false;
}
if (args.length != 1) {
player.sendMessage("§c/invite <PLAYER>");
return false;
}
Player invitedPlayer = Bukkit.getPlayer(args[0]);
if (invitedPlayer == null) {
player.sendMessage("§cDieser Spieler ist nicht online.");
return false;
}
if (MissileWars.getTeam(invitedPlayer) != null) {
player.sendMessage("§cDieser Spieler ist bereits in einem Team.");
return false;
}
if (MissileWars.getInvitation(invitedPlayer) != null) {
player.sendMessage("§cDieser Spieler wurde bereits eingeladen.");
return false;
}
team.invitePlayer(invitedPlayer);
player.sendMessage("§7Du hast §e" + invitedPlayer.getName() + " §7eingeladen.");
invitedPlayer.sendMessage("§7Du wurdest von §e" + player.getName() + "§7 in das Team §e" + MissileWars.getTeam(player).getColoredName() + "§7 eingeladen.");
invitedPlayer.sendMessage("§8/§eaccept §8- §7Zum akzeptieren.");
invitedPlayer.sendMessage("§8/§edecline §8- §7Zum ablehnen.");
return false;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length == 1) {
return Bukkit.getOnlinePlayers()
.stream()
.filter(p -> MissileWars.getTeam(p) != null)
.filter(p -> MissileWars.getInvitation(p) != null)
.map(Player::getName)
.collect(Collectors.toList());
}
return new ArrayList<>();
}
}

55
src/de/steamwar/misslewars/commands/CommandSpectate.java
Datei anzeigen

@ -1,55 +0,0 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 SteamWar.de-Serverteam
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.misslewars.commands;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import org.bukkit.GameMode;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class CommandSpectate implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
if (Config.isChallenge()) {
player.sendMessage("§cDieser Command ist deaktiviert.");
return false;
}
MWTeam mwTeam = MissileWars.getTeam(player);
if (mwTeam == null) return false;
if (mwTeam.size() == 1) {
player.sendMessage("§cDu bist alleine im Team, zuschauen ist daher nicht möglich.");
return false;
}
MissileWars.leave(player);
player.setGameMode(GameMode.SPECTATOR);
player.getInventory().clear();
player.updateInventory();
return true;
}
}

13
src/de/steamwar/misslewars/commands/DeclineCommand.java
Datei anzeigen

@ -2,7 +2,7 @@
*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
* Copyright (C) 2023 SteamWar.de-Serverteam
PsiRobot markierte diese Unterhaltung als gelöst Veraltet
YoyoNow hat 2023-04-21 21:41:01 +02:00 kommentiert
Veraltet
Review
Link kopieren

s.o.

s.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -16,21 +16,20 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* /
*/
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:41:05 +02:00 kommentiert
Review
Link kopieren

s.o.

s.o.
package de.steamwar.misslewars.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class DeclineCommand extends SWCommand {
public DeclineCommand() {
super("decline");
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:41:10 +02:00 kommentiert
Review
Link kopieren

s.o.

s.o.
}
@ -40,8 +39,7 @@ public class DeclineCommand extends SWCommand {
MWTeam teamInvitation = MissileWars.getInvitation(player);
if (teamInvitation == null) {
player.sendMessage("§cDu wurdest nicht eingeladen.");
}
else {
} else {
MWTeam.removeInvitations(player);
message(teamInvitation, "§7Der Spieler §e" + player.getName() + "§7 hat die Einladung §cabgelehnt§7.");
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:43:40 +02:00 kommentiert
Review
Link kopieren

else gehört in die gleiche Zeile mit }

else gehört in die gleiche Zeile mit }
}
@ -64,5 +62,4 @@ public class DeclineCommand extends SWCommand {
private void message(MWTeam mwTeam, String s) {
mwTeam.getPlayers().forEach(player -> player.sendMessage(s));
}
}

74
src/de/steamwar/misslewars/commands/InviteCommand.java
Datei anzeigen

@ -1,43 +1,58 @@
/*
PsiRobot markierte diese Unterhaltung als gelöst Veraltet
YoyoNow hat 2023-04-21 21:42:26 +02:00 kommentiert
Veraltet
Review
Link kopieren

Hier fehlt der License Header

Hier fehlt der License Header
*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2023 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.misslewars.commands;
import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
PsiRobot markierte diese Unterhaltung als gelöst Veraltet
YoyoNow hat 2023-04-21 21:42:00 +02:00 kommentiert
Veraltet
Review
Link kopieren

Hier Statt einen String zu nutzen kannst du auch einen Player nehmen, und dann würde ich auch den String... varargs weglassen

Hier Statt einen String zu nutzen kannst du auch einen Player nehmen, und dann würde ich auch den String... varargs weglassen
import de.steamwar.command.TypeValidator;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.Collection;
import java.util.stream.Collectors;
public class InviteCommand extends SWCommand implements TabCompleter {
public class InviteCommand extends SWCommand {
public InviteCommand() {
super("invite", "inv");
}
@Register
public void onCommand(@Validator Player player, String playerName, String... varargs) {
public void onCommand(@Validator Player player, @AllowNull @OptionalValue("") Player invitedPlayer) {
MWTeam team = MissileWars.getTeam(player);
Player invitedPlayer = Bukkit.getPlayer(playerName);
if (!Config.RedLeader.equals(player.getUniqueId()) && !Config.BlueLeader.equals(player.getUniqueId()) || team == null) {
player.sendMessage("§cDu kannst keine Spieler einladen.");
}
else if (invitedPlayer == null) {
} else if (invitedPlayer == null) {
player.sendMessage("§cDieser Spieler ist nicht online.");
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:42:11 +02:00 kommentiert
Review
Link kopieren

So nicht.

So nicht.
YoyoNow hat 2023-04-21 21:44:22 +02:00 kommentiert
Review
Link kopieren

Ich komme gleich kurz vorbei und erkläre wie du das machst.

Ich komme gleich kurz vorbei und erkläre wie du das machst.
}
else if (MissileWars.getTeam(invitedPlayer) != null) {
} else if (MissileWars.getTeam(invitedPlayer) != null) {
player.sendMessage("§cDieser Spieler ist bereits in einem Team.");
}
else if (MissileWars.getInvitation(invitedPlayer) != null) {
} else if (MissileWars.getInvitation(invitedPlayer) != null) {
player.sendMessage("§cDieser Spieler wurde bereits eingeladen.");
}
else {
} else {
team.invitePlayer(invitedPlayer);
player.sendMessage("§7Du hast §e" + invitedPlayer.getName() + " §7eingeladen.");
invitedPlayer.sendMessage("§7Du wurdest von §e" + player.getName() + "§7 in das Team §e" + MissileWars.getTeam(player).getColoredName() + "§7 eingeladen.");
@ -46,17 +61,24 @@ public class InviteCommand extends SWCommand implements TabCompleter {
}
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length == 1) {
return Bukkit.getOnlinePlayers()
.stream()
.filter(p -> MissileWars.getTeam(p) != null)
.filter(p -> MissileWars.getInvitation(p) != null)
.map(Player::getName)
.collect(Collectors.toList());
}
return new ArrayList<>();
@ClassMapper(value = Player.class, local = true)
public TypeMapper<Player> typeMapper() {
return new TypeMapper<Player>() {
@Override
public Player map(CommandSender commandSender, String[] previousArguments, String s) {
return Bukkit.getPlayer(s);
}
@Override
public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
return Bukkit.getOnlinePlayers()
.stream()
.filter(p -> MissileWars.getTeam(p) != null)
.filter(p -> MissileWars.getInvitation(p) != null)
.map(Player::getName)
.collect(Collectors.toList());
}
};
}
@ClassValidator(value = Player.class, local = true)

11
src/de/steamwar/misslewars/commands/SpectateCommand.java
Datei anzeigen

@ -2,7 +2,7 @@
*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
* Copyright (C) 2023 SteamWar.de-Serverteam
PsiRobot markierte diese Unterhaltung als gelöst Veraltet
YoyoNow hat 2023-04-21 21:42:33 +02:00 kommentiert
Veraltet
Review
Link kopieren

s.o.

s.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -16,28 +16,27 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* /
*/
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:42:36 +02:00 kommentiert
Review
Link kopieren

s.o.

s.o.
package de.steamwar.misslewars.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import de.steamwar.misslewars.Config;
import de.steamwar.misslewars.MWTeam;
import de.steamwar.misslewars.MissileWars;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import org.bukkit.GameMode;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class SpectateCommand extends SWCommand {
public SpectateCommand() {
super("spectate", "spec");
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:42:41 +02:00 kommentiert
Review
Link kopieren

s.o.

s.o.
}
@Register
public void onCommand(@Validator Player player, String... varargs) {
public void onCommand(@Validator Player player) {
MWTeam mwTeam = MissileWars.getTeam(player);
PsiRobot markierte diese Unterhaltung als gelöst
YoyoNow hat 2023-04-21 21:42:57 +02:00 kommentiert
Review
Link kopieren

Auch hier würde ich String... varargs weglassen

Auch hier würde ich String... varargs weglassen
if (mwTeam == null) return;
if (mwTeam.size() == 1) {