diff --git a/BauSystem_12/src/de/steamwar/bausystem/world/ScriptListener_12.java b/BauSystem_12/src/de/steamwar/bausystem/world/ScriptListener_12.java new file mode 100644 index 0000000..061befa --- /dev/null +++ b/BauSystem_12/src/de/steamwar/bausystem/world/ScriptListener_12.java @@ -0,0 +1,31 @@ +/* + 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 . +*/ + +package de.steamwar.bausystem.world; + +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +class ScriptListener_12 { + private ScriptListener_12(){} + + static boolean isNoBook(ItemStack item){ + return item.getType() != Material.BOOK_AND_QUILL && item.getType() != Material.WRITTEN_BOOK; + } +} diff --git a/BauSystem_15/src/de/steamwar/bausystem/world/ScriptListener_15.java b/BauSystem_15/src/de/steamwar/bausystem/world/ScriptListener_15.java new file mode 100644 index 0000000..3964be0 --- /dev/null +++ b/BauSystem_15/src/de/steamwar/bausystem/world/ScriptListener_15.java @@ -0,0 +1,31 @@ +/* + 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 . +*/ + +package de.steamwar.bausystem.world; + +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +class ScriptListener_15 { + private ScriptListener_15(){} + + static boolean isNoBook(ItemStack item){ + return item.getType() != Material.WRITABLE_BOOK && item.getType() != Material.WRITTEN_BOOK; + } +} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java index d62aab6..bed84dc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java @@ -45,7 +45,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitTask; -import java.util.Arrays; import java.util.UUID; import java.util.logging.Level; @@ -100,18 +99,6 @@ public class BauSystem extends JavaPlugin implements Listener { getCommand("detonator").setExecutor(new CommandDetonator()); getCommand("detonator").setTabCompleter(new CommandDetonatorTabCompleter()); - 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); Bukkit.getPluginManager().registerEvents(new ScriptListener(), this); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/ChainedCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/ChainedCommand.java deleted file mode 100644 index 0bf3018..0000000 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/ChainedCommand.java +++ /dev/null @@ -1,75 +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 . -*/ - -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 tabCompletes; - - public ChainedCommand(String command, final List 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 onTabComplete(CommandSender sender, Command command, String s, String[] args) { - return tabCompletes; - } - -} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java b/BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java index 7bfdedf..0719a4f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java @@ -72,6 +72,22 @@ public class RegionListener implements Listener { } } + private static final String[] shortcutCommands = {"//1", "//2", "//90", "//-90", "//180", "//p", "//c", "//flopy", "//floppy", "//flopyp", "//floppyp", "//u", "//r"}; + + private boolean isWorldEditCommand(String command) { + for(String shortcut : shortcutCommands) + if(command.startsWith(shortcut)) + return true; + + switch(Core.getVersion()){ + case 12: + return RegionListener_12.isWorldEditCommand(command); + case 15: + default: + return RegionListener_15.isWorldEditCommand(command); + } + } + @EventHandler public void onSignChange(SignChangeEvent event) { for(int i = 0; i <= 3; ++i) { @@ -82,13 +98,4 @@ public class RegionListener implements Listener { event.setLine(i, line); } } - - private static boolean isWorldEditCommand(String command) { - switch(Core.getVersion()){ - case 15: - return RegionListener_15.isWorldEditCommand(command); - default: - return RegionListener_12.isWorldEditCommand(command); - } - } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java b/BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java index 69d0b09..2be2361 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java @@ -19,12 +19,13 @@ package de.steamwar.bausystem.world; +import de.steamwar.core.Core; import org.bukkit.Bukkit; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; @@ -39,7 +40,7 @@ public class ScriptListener implements Listener { return; ItemStack item = event.getItem(); - if(item == null || (item.getType() != Material.WRITABLE_BOOK && item.getType() != Material.WRITTEN_BOOK) || item.getItemMeta() == null) + if(item == null || isNoBook(item) || item.getItemMeta() == null) return; event.setCancelled(true); @@ -47,10 +48,27 @@ public class ScriptListener implements Listener { BookMeta meta = (BookMeta) item.getItemMeta(); for(String page : meta.getPages()){ for(String command : page.split("\n")){ + if (command.startsWith("#")) continue; + + PlayerCommandPreprocessEvent preprocessEvent = new PlayerCommandPreprocessEvent(player, "/" + command); + Bukkit.getServer().getPluginManager().callEvent(preprocessEvent); + if(preprocessEvent.isCancelled()) + continue; + Bukkit.getLogger().log(Level.INFO, player.getName() + " dispatched command: " + command); Bukkit.getServer().dispatchCommand(player, command); } } } + private boolean isNoBook(ItemStack item){ + switch(Core.getVersion()){ + case 12: + return ScriptListener_12.isNoBook(item); + case 15: + default: + return ScriptListener_15.isNoBook(item); + } + } + } diff --git a/BauSystem_Main/src/plugin.yml b/BauSystem_Main/src/plugin.yml index c167863..0c6a0f4 100644 --- a/BauSystem_Main/src/plugin.yml +++ b/BauSystem_Main/src/plugin.yml @@ -33,15 +33,3 @@ commands: lockschem: detonator: aliases: dt - - /1: - /2: - /180: - /90: - /-90: - /p: - /c: - /flopy: - /flopyp: - /u: - /r: