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

Merge pull request 'simplify-WorldEditCommands' (#120) from simplify-WorldEditCommands into master

Quellcode durchsuchen 
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
YoyoNow 2020-11-19 10:28:54 +01:00
Commit 80ac2de1c9
13 geänderte Dateien mit 89 neuen und 397 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

22
BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
Datei anzeigen

@ -20,7 +20,6 @@
package de.steamwar.bausystem;
import de.steamwar.bausystem.commands.*;
import de.steamwar.bausystem.commands.worldedit.*;
import de.steamwar.bausystem.tracer.ShowManager;
import de.steamwar.bausystem.tracer.TNTTracer;
import de.steamwar.bausystem.tracer.TraceListener;
@ -49,6 +48,7 @@ import org.bukkit.scheduler.BukkitTask;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.logging.Level;
@ -119,15 +119,17 @@ public class BauSystem extends JavaPlugin implements Listener {
getCommand("detonator").setExecutor(new CommandDetonator());
getCommand("detonator").setTabCompleter(new CommandDetonatorTabCompleter());
getCommand("/1").setExecutor(new WECommandPos1());
getCommand("/2").setExecutor(new WECommandPos2());
getCommand("/90").setExecutor(new WECommandRotate90());
getCommand("/-90").setExecutor(new WECommandRotateN90());
getCommand("/180").setExecutor(new WECommandRotate180());
getCommand("/c").setExecutor(new WECommandCopy());
getCommand("/p").setExecutor(new WECommandPaste());
getCommand("/flopy").setExecutor(new WECommandFlopy());
getCommand("/flopyp").setExecutor(new WECommandFlopyp());
new ChainedCommand("/1", "/pos1");
new ChainedCommand("/2", "/pos2");
new ChainedCommand("/90", "/rotate 90");
new ChainedCommand("/-90", "/rotate -90");
new ChainedCommand("/180", "/rotate 180");
new ChainedCommand("/c", "/copy");
new ChainedCommand("/p", Arrays.asList("-a", "-b", "-e", "-n", "-o", "-s", "-m"), "/paste {}");
new ChainedCommand("/flopy", "/copy", "/flip");
new ChainedCommand("/flopyp", Arrays.asList("-a", "-b", "-e", "-n", "-o", "-s", "-m"), "/copy", "/flip", "/paste {}");
new ChainedCommand("/u", "/undo {}");
new ChainedCommand("/r", "/redo {}");
Bukkit.getPluginManager().registerEvents(this, this);
Bukkit.getPluginManager().registerEvents(new RegionListener(), this);

75
BauSystem_Main/src/de/steamwar/bausystem/commands/ChainedCommand.java Normale Datei
Datei anzeigen

@ -0,0 +1,75 @@
/*
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.bausystem.commands;
import de.steamwar.bausystem.BauSystem;
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;
public class ChainedCommand implements CommandExecutor, TabCompleter {
private String[] commands;
private List<String> tabCompletes;
public ChainedCommand(String command, final List<String> tabCompletes, final String... commands) {
BauSystem.getPlugin().getCommand(command).setExecutor(this);
BauSystem.getPlugin().getCommand(command).setTabCompleter(this);
this.commands = commands;
this.tabCompletes = tabCompletes;
if (tabCompletes == null) {
this.tabCompletes = new ArrayList<>();
}
}
public ChainedCommand(String command, final String... commands) {
this(command, null, commands);
}
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) {
return false;
}
Player player = (Player) sender;
String argsString = "";
if (args.length != 0) argsString = String.join(" ", args);
for (String cmd : commands) {
if (!player.performCommand(cmd.replace("{}", argsString))) {
return false;
}
}
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String s, String[] args) {
return tabCompletes;
}
}

58
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommand.java
Datei anzeigen

@ -1,58 +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.bausystem.commands.worldedit;
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;
public abstract class WECommand implements CommandExecutor, TabCompleter {
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String s, String[] args) {
return new ArrayList<>();
}
protected final boolean performCommand(Player p, String command) {
return p.performCommand(command);
}
protected final boolean performCommands(Player p, String... commands) {
for (String command : commands) {
if (!performCommand(p, command)) return false;
}
return true;
}
protected final List<String> manageList(List<String> strings, String[] args, int index) {
for (int i = strings.size() - 1; i >= 0; i--) {
if (!strings.get(i).startsWith(args[index])) {
strings.remove(i);
}
}
return strings;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandCopy.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandCopy extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/copy");
return false;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandFlopy.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandFlopy extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/copy", "/flip");
return false;
}
}

42
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandFlopyp.java
Datei anzeigen

@ -1,42 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.Arrays;
import java.util.List;
public class WECommandFlopyp extends WECommand {
public List<String> onTabComplete(CommandSender sender, Command command, String s, String[] args) {
return Arrays.asList("-a", "-b", "-e", "-n", "-o", "-s", "-m");
}
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/copy", "/flip", "/paste " + String.join(" ", args));
return false;
}
}

42
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandPaste.java
Datei anzeigen

@ -1,42 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.Arrays;
import java.util.List;
public class WECommandPaste extends WECommand {
public List<String> onTabComplete(CommandSender sender, Command command, String s, String[] args) {
return Arrays.asList("-a", "-b", "-e", "-n", "-o", "-s", "-m");
}
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/paste " + String.join(" ", args));
return false;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandPos1.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandPos1 extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/pos1");
return false;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandPos2.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandPos2 extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/pos2");
return false;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandRotate180.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandRotate180 extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/rotate 180");
return false;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandRotate90.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandRotate90 extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/rotate 90");
return false;
}
}

35
BauSystem_Main/src/de/steamwar/bausystem/commands/worldedit/WECommandRotateN90.java
Datei anzeigen

@ -1,35 +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.bausystem.commands.worldedit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class WECommandRotateN90 extends WECommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (!(sender instanceof Player)) return false;
performCommands((Player) sender, "/rotate -90");
return false;
}
}

2
BauSystem_Main/src/plugin.yml
Datei anzeigen

@ -43,3 +43,5 @@ commands:
/c:
/flopy:
/flopyp:
/u:
/r: