From 6512c37e24e383fac374c1e1b0f184a459c9831a Mon Sep 17 00:00:00 2001 From: Allink <44676012+allinkdev@users.noreply.github.com> Date: Sun, 10 Jul 2022 16:48:29 +0100 Subject: [PATCH] Add scissors config, command & disable command books (1.19) (#41) * Add Scissors configuration file & command * Disable running commands in books by default --- ...0003-Add-Scissors-configuration-file.patch | 24 + ...-Scissors-configuration-file-command.patch | 434 ++++++++++++++++++ ...running-commands-in-books-by-default.patch | 82 ++++ 3 files changed, 540 insertions(+) create mode 100644 patches/api/0003-Add-Scissors-configuration-file.patch create mode 100644 patches/server/0035-Add-Scissors-configuration-file-command.patch create mode 100644 patches/server/0036-Disable-running-commands-in-books-by-default.patch diff --git a/patches/api/0003-Add-Scissors-configuration-file.patch b/patches/api/0003-Add-Scissors-configuration-file.patch new file mode 100644 index 0000000..d5735f8 --- /dev/null +++ b/patches/api/0003-Add-Scissors-configuration-file.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Allink +Date: Sun, 10 Jul 2022 10:12:04 +0100 +Subject: [PATCH] Add Scissors configuration file + + +diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java +index 56e261efa654e4a6872ccea28f0461df13845d13..8bb4f6dc2fd484f9487bf3f75e746bf0962491b4 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -1937,6 +1937,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + } + // Paper end + ++ // Scissors start ++ @NotNull ++ public org.bukkit.configuration.file.YamlConfiguration getScissorsConfig() { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ // Scissors end ++ + /** + * Sends the component to the player + * diff --git a/patches/server/0035-Add-Scissors-configuration-file-command.patch b/patches/server/0035-Add-Scissors-configuration-file-command.patch new file mode 100644 index 0000000..cb4711e --- /dev/null +++ b/patches/server/0035-Add-Scissors-configuration-file-command.patch @@ -0,0 +1,434 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Allink +Date: Sun, 10 Jul 2022 10:15:20 +0100 +Subject: [PATCH] Add Scissors configuration file & command + + +diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java +index 06bff37e4c1fddd3be6343049a66787c63fb420c..d00f35538602151bc8eb564541417a5324eefd18 100644 +--- a/src/main/java/co/aikar/timings/TimingsExport.java ++++ b/src/main/java/co/aikar/timings/TimingsExport.java +@@ -241,7 +241,8 @@ public class TimingsExport extends Thread { + parent.put("config", createObject( + pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), + pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), +- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) ++ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), ++ pair("scissors", mapAsJSON(Bukkit.spigot().getScissorsConfig(), null)) // Scissors + )); + + new TimingsExport(listeners, parent, history).start(); +diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java +new file mode 100644 +index 0000000000000000000000000000000000000000..797677d892d83cf54d9a60af1e277b67ed3d6e95 +--- /dev/null ++++ b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java +@@ -0,0 +1,150 @@ ++package me.totalfreedom.scissors; ++ ++import com.google.common.base.Functions; ++import com.google.common.base.Joiner; ++import com.google.common.collect.ImmutableSet; ++import com.google.common.collect.Iterables; ++import com.google.common.collect.Lists; ++import net.minecraft.resources.ResourceLocation; ++import net.minecraft.server.MinecraftServer; ++import org.bukkit.Bukkit; ++import org.bukkit.ChatColor; ++import org.bukkit.Location; ++import org.bukkit.command.Command; ++import org.bukkit.command.CommandSender; ++ ++import java.io.File; ++import java.util.*; ++import java.util.stream.Collectors; ++ ++public class ScissorsCommand extends Command ++{ ++ ++ private static final String BASE_PERM = "bukkit.command.scissors."; ++ private static final ImmutableSet SUBCOMMANDS = ImmutableSet.builder().add("reload", "version").build(); ++ ++ public ScissorsCommand(String name) ++ { ++ super(name); ++ this.description = "Scissors related commands"; ++ this.usageMessage = "/scissors [" + Joiner.on(" | ").join(SUBCOMMANDS) + "]"; ++ this.setPermission("bukkit.command.scissors;" + Joiner.on(';').join(SUBCOMMANDS.stream().map(s -> BASE_PERM + s).collect(Collectors.toSet()))); ++ } ++ ++ private static boolean testPermission(CommandSender commandSender, String permission) ++ { ++ if (commandSender.hasPermission(BASE_PERM + permission) || commandSender.hasPermission("bukkit.command.scissors")) ++ return true; ++ commandSender.sendMessage(Bukkit.getPermissionMessage()); // Sorry, kashike ++ return false; ++ } ++ ++ // Code from Mojang - copyright them ++ public static List getListMatchingLast(CommandSender sender, String[] args, String... matches) ++ { ++ return getListMatchingLast(sender, args, Arrays.asList(matches)); ++ } ++ ++ public static boolean matches(String s, String s1) ++ { ++ return s1.regionMatches(true, 0, s, 0, s.length()); ++ } ++ ++ public static List getListMatchingLast(CommandSender sender, String[] strings, Collection collection) ++ { ++ String last = strings[strings.length - 1]; ++ ArrayList results = Lists.newArrayList(); ++ ++ if (!collection.isEmpty()) ++ { ++ Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator(); ++ ++ while (iterator.hasNext()) ++ { ++ String s1 = (String) iterator.next(); ++ ++ if (matches(last, s1) && (sender.hasPermission(BASE_PERM + s1) || sender.hasPermission("bukkit.command.scissors"))) ++ { ++ results.add(s1); ++ } ++ } ++ ++ if (results.isEmpty()) ++ { ++ iterator = collection.iterator(); ++ ++ while (iterator.hasNext()) ++ { ++ Object object = iterator.next(); ++ ++ if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath())) ++ { ++ results.add(String.valueOf(object)); ++ } ++ } ++ } ++ } ++ ++ return results; ++ } ++ ++ @Override ++ public List tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException ++ { ++ if (args.length <= 1) ++ return getListMatchingLast(sender, args, SUBCOMMANDS); ++ ++ return Collections.emptyList(); ++ } ++ // end copy stuff ++ ++ @Override ++ public boolean execute(CommandSender sender, String commandLabel, String[] args) ++ { ++ if (!testPermission(sender)) return true; ++ ++ if (args.length == 0) ++ { ++ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); ++ return false; ++ } ++ if (SUBCOMMANDS.contains(args[0].toLowerCase(Locale.ENGLISH))) ++ { ++ if (!testPermission(sender, args[0].toLowerCase(Locale.ENGLISH))) return true; ++ } ++ switch (args[0].toLowerCase(Locale.ENGLISH)) ++ { ++ case "reload": ++ doReload(sender); ++ break; ++ case "ver": ++ if (!testPermission(sender, "version")) ++ break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set) ++ case "version": ++ Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version"); ++ if (ver != null) ++ { ++ ver.execute(sender, commandLabel, new String[0]); ++ break; ++ } ++ // else - fall through to default ++ default: ++ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); ++ return false; ++ } ++ ++ return true; ++ } ++ ++ private void doReload(CommandSender sender) ++ { ++ Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues."); ++ Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server."); ++ ++ MinecraftServer console = MinecraftServer.getServer(); ++ ScissorsConfig.init((File) console.options.valueOf("scissors-settings")); ++ console.server.reloadCount++; ++ ++ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Scissors config reload complete."); ++ } ++} +diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..7cffc17d6527dc8788453c6040cc7a5e0cbebd2c +--- /dev/null ++++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java +@@ -0,0 +1,179 @@ ++package me.totalfreedom.scissors; ++ ++ ++import com.google.common.base.Throwables; ++import net.minecraft.server.MinecraftServer; ++import org.bukkit.Bukkit; ++import org.bukkit.command.Command; ++import org.bukkit.configuration.InvalidConfigurationException; ++import org.bukkit.configuration.file.YamlConfiguration; ++ ++import java.io.File; ++import java.io.IOException; ++import java.lang.reflect.InvocationTargetException; ++import java.lang.reflect.Method; ++import java.lang.reflect.Modifier; ++import java.util.HashMap; ++import java.util.List; ++import java.util.Map; ++import java.util.logging.Level; ++import java.util.regex.Pattern; ++ ++// TODO - Migrate to new format ++public class ScissorsConfig ++{ ++ ++ private static final String HEADER = """ ++ This is the main configuration file for Scissors. ++ As you can see, there's tons to configure. Some options may impact gameplay, so use ++ with caution, and make sure you know what each option does before configuring. ++ ++ If you need help with the configuration or have any questions related to Scissors, ++ join us in our Discord. ++ ++ Discord: https://discord.com/invite/mtVQcHn58h ++ Website: https://scissors.gg/\s ++ Docs: https://scissors.gg/javadoc/1.19/\s ++ """; ++ private static final Pattern SPACE = Pattern.compile(" "); ++ private static final Pattern NOT_NUMERIC = Pattern.compile("[^-\\d.]"); ++ /*========================================================================*/ ++ public static YamlConfiguration config; ++ static int version; ++ /*========================================================================*/ ++ static Map commands; ++ private static File CONFIG_FILE; ++ ++ public static void init(File configFile) ++ { ++ CONFIG_FILE = configFile; ++ config = new YamlConfiguration(); ++ try ++ { ++ config.load(CONFIG_FILE); ++ } ++ catch (IOException ex) ++ { ++ } ++ catch (InvalidConfigurationException ex) ++ { ++ Bukkit.getLogger().log(Level.SEVERE, "Could not load scissors.yml, please correct your syntax errors", ex); ++ throw Throwables.propagate(ex); ++ } ++ ++ commands = new HashMap<>(); ++ commands.put("scissors", new ScissorsCommand("scissors")); ++ ++ config.options().header(HEADER); ++ config.options().copyDefaults(true); ++ ++ version = getInt("config-version", 1); ++ set("config-version", 1); ++ readConfig(ScissorsConfig.class, null); ++ } ++ ++ protected static void logError(String s) ++ { ++ Bukkit.getLogger().severe(s); ++ } ++ ++ protected static void fatal(String s) ++ { ++ throw new RuntimeException("Fatal scissors.yml config error: " + s); ++ } ++ ++ public static void registerCommands() ++ { ++ for (Map.Entry entry : commands.entrySet()) ++ { ++ MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Scissors", entry.getValue()); ++ } ++ } ++ ++ static void readConfig(Class clazz, Object instance) ++ { ++ for (Method method : clazz.getDeclaredMethods()) ++ { ++ if (Modifier.isPrivate(method.getModifiers())) ++ { ++ if (method.getParameterTypes().length == 0 && method.getReturnType() == Void.TYPE) ++ { ++ try ++ { ++ method.setAccessible(true); ++ method.invoke(instance); ++ } ++ catch (InvocationTargetException ex) ++ { ++ throw Throwables.propagate(ex.getCause()); ++ } ++ catch (Exception ex) ++ { ++ Bukkit.getLogger().log(Level.SEVERE, "Error invoking " + method, ex); ++ } ++ } ++ } ++ } ++ saveConfig(); ++ } ++ ++ static void saveConfig() ++ { ++ try ++ { ++ config.save(CONFIG_FILE); ++ } ++ catch (IOException ex) ++ { ++ Bukkit.getLogger().log(Level.SEVERE, "Could not save " + CONFIG_FILE, ex); ++ } ++ } ++ ++ public static boolean runCommandsInBooks = false; ++ ++ private static void runCommandsInBooks() { ++ runCommandsInBooks = getBoolean("runCommandsInBooks", false); ++ } ++ ++ private static void set(String path, Object val) ++ { ++ config.set(path, val); ++ } ++ ++ private static boolean getBoolean(String path, boolean def) ++ { ++ config.addDefault(path, def); ++ return config.getBoolean(path, config.getBoolean(path)); ++ } ++ ++ private static double getDouble(String path, double def) ++ { ++ config.addDefault(path, def); ++ return config.getDouble(path, config.getDouble(path)); ++ } ++ ++ private static float getFloat(String path, float def) ++ { ++ // TODO: Figure out why getFloat() always returns the default value. ++ return (float) getDouble(path, def); ++ } ++ ++ private static int getInt(String path, int def) ++ { ++ config.addDefault(path, def); ++ return config.getInt(path, config.getInt(path)); ++ } ++ ++ private static List getList(String path, T def) ++ { ++ config.addDefault(path, def); ++ return config.getList(path, config.getList(path)); ++ } ++ ++ private static String getString(String path, String def) ++ { ++ config.addDefault(path, def); ++ return config.getString(path, config.getString(path)); ++ } ++} ++ +diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java +index 0a843e0afbcb1af8e2641515eb244b791b819b8c..f5c0375b171516c0ae734644b4449db8900143df 100644 +--- a/src/main/java/net/minecraft/server/Main.java ++++ b/src/main/java/net/minecraft/server/Main.java +@@ -114,6 +114,7 @@ public class Main { + // Paper start - load config files for access below if needed + org.bukkit.configuration.file.YamlConfiguration bukkitConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("bukkit-settings")); + org.bukkit.configuration.file.YamlConfiguration spigotConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("spigot-settings")); ++ org.bukkit.configuration.file.YamlConfiguration scissorsConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("scissors-settings")); // Scissors - TODO Change this + // Paper end + + Path path1 = Paths.get("eula.txt"); +diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +index aea18838a17fc52e1bf8cd84cd185565e6e2246d..1e62404a42169ca1b02df256f2a88d36ae4e1214 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -226,7 +226,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now + io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider + // Paper end +- ++ // Scissors start ++ try { ++ me.totalfreedom.scissors.ScissorsConfig.init((java.io.File) options.valueOf("scissors-settings")); ++ } catch (Exception e) { ++ DedicatedServer.LOGGER.error("Unable to load server configuration", e); ++ return false; ++ } ++ me.totalfreedom.scissors.ScissorsConfig.registerCommands(); ++ // Scissors end + this.setPvpAllowed(dedicatedserverproperties.pvp); + this.setFlightAllowed(dedicatedserverproperties.allowFlight); + this.setMotd(dedicatedserverproperties.motd); +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 23ba68c2af8512b51b635f373551d1bcd649a7f3..8480c44af5660a12f8c2f5fad4469b0a53bba2da 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -958,6 +958,8 @@ public final class CraftServer implements Server { + } + + org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot ++ me.totalfreedom.scissors.ScissorsConfig.init(((File) console.options.valueOf("scissors-settings"))); // Scissors ++ + this.console.paperConfigurations.reloadConfigs(this.console); + for (ServerLevel world : this.console.getAllLevels()) { + // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty +@@ -989,6 +991,7 @@ public final class CraftServer implements Server { + this.reloadData(); + org.spigotmc.SpigotConfig.registerCommands(); // Spigot + io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper ++ me.totalfreedom.scissors.ScissorsConfig.registerCommands(); // Scissors + this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); + this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); + +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 3d624f3c980fa0f8ebcec36474768764265fa7cd..d6bb902d8ad6c4acc9555f3db2c331e991720ae4 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -165,6 +165,14 @@ public class Main { + .defaultsTo("Unknown Server") + .describedAs("Name"); + // Paper end ++ ++ // Scissors start ++ acceptsAll(asList("scissors", "scissors-settings"), "File for scissors settings") ++ .withRequiredArg() ++ .ofType(File.class) ++ .defaultsTo(new File("scissors.yml")) ++ .describedAs("Yml file"); ++ // Scissors end + } + }; + diff --git a/patches/server/0036-Disable-running-commands-in-books-by-default.patch b/patches/server/0036-Disable-running-commands-in-books-by-default.patch new file mode 100644 index 0000000..fdc8a86 --- /dev/null +++ b/patches/server/0036-Disable-running-commands-in-books-by-default.patch @@ -0,0 +1,82 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Allink +Date: Sun, 10 Jul 2022 10:29:03 +0100 +Subject: [PATCH] Disable running commands in books by default + + +diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java +index 31911c09fe15753ae32fa39417bdc9e9de552a88..8ef33e2e2374c456cb9d4aab8ed6f1742951f402 100644 +--- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java ++++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java +@@ -2,6 +2,8 @@ package net.minecraft.world.item; + + import java.util.List; + import javax.annotation.Nullable; ++ ++import me.totalfreedom.scissors.ScissorsConfig; + import net.minecraft.ChatFormatting; + import net.minecraft.commands.CommandSourceStack; + import net.minecraft.core.BlockPos; +@@ -9,8 +11,7 @@ import net.minecraft.nbt.CompoundTag; + import net.minecraft.nbt.ListTag; + import net.minecraft.nbt.StringTag; + import net.minecraft.nbt.Tag; +-import net.minecraft.network.chat.Component; +-import net.minecraft.network.chat.ComponentUtils; ++import net.minecraft.network.chat.*; + import net.minecraft.stats.Stats; + import net.minecraft.util.StringUtil; + import net.minecraft.world.InteractionHand; +@@ -111,8 +112,7 @@ public class WrittenBookItem extends Item { + + public static boolean resolveBookComponents(ItemStack book, @Nullable CommandSourceStack commandSource, @Nullable Player player) { + CompoundTag compoundTag = book.getTag(); +- if (io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.resolveSelectorsInBooks && compoundTag != null && !compoundTag.getBoolean("resolved")) { // Paper +- compoundTag.putBoolean("resolved", true); ++ if (compoundTag != null) { // Paper + if (!makeSureTagIsValid(compoundTag)) { + return false; + } else { +@@ -161,8 +161,41 @@ public class WrittenBookItem extends Item { + component2 = Component.literal(text); + } + +- return Component.Serializer.toJson(component2); ++ return Component.Serializer.toJson(!ScissorsConfig.runCommandsInBooks ? sanitize(component2, 0) : component2); // Scissors - Allow server owners to disable run command in books ++ } ++ ++ // Scissors start - Allow server owners to disable run command in books ++ public static Component sanitize(Component component, int depth) { ++ if (depth > 128) { ++ return Component.nullToEmpty("Sanitization function depth limit exceeded"); ++ } ++ ++ MutableComponent component2 = component.copy(); ++ ++ final Style style = component2.getStyle(); ++ final ClickEvent clickEvent = style.getClickEvent(); ++ ++ if(clickEvent != null && clickEvent.getAction().equals(ClickEvent.Action.RUN_COMMAND)) ++ { ++ final String clickEventValue = clickEvent.getValue(); ++ ++ component2 = component2.copy().setStyle(style ++ .withClickEvent(null) ++ .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.nullToEmpty("Would've " + (clickEventValue.startsWith("/") ? "ran": "said") + ": " + clickEvent.getValue()))) ++ ); ++ } ++ ++ final List processedExtra = component2.getSiblings() ++ .stream() ++ .map(comp -> sanitize(comp, depth + 1)) ++ .toList(); ++ ++ component2.getSiblings().clear(); ++ component2.getSiblings().addAll(processedExtra); ++ ++ return component2; + } ++ // Scissors end + + @Override + public boolean isFoil(ItemStack stack) {