From e2924f4cba24ad4dc899ad6e7fba034b33b6daa0 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 7 Oct 2021 19:12:17 +0200 Subject: [PATCH] feat: Improve wording of allowed-plugins message (#1341) Fixes #1319 --- .../core/configuration/Settings.java | 4 +-- .../core/util/EditSessionBuilder.java | 29 ++++++++---------- .../sk89q/worldedit/EditSessionBuilder.java | 30 ++++++++----------- 3 files changed, 28 insertions(+), 35 deletions(-) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java index 235f92a1d..04d1e753e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java @@ -461,9 +461,9 @@ public class Settings extends Config { @Comment({ "Don't bug console when these plugins slow down WorldEdit operations", - " - You'll see a message in console if you need to change this option" + " - You'll see a message in console or ingame if you need to change this option" }) - public List ALLOWED_PLUGINS = new ArrayList<>(Collections.singleton(("ExamplePlugin"))); + public List ALLOWED_PLUGINS = new ArrayList<>(Collections.singleton(("com.example.ExamplePlugin"))); @Comment("Should debug messages be sent when third party extents are used?") public boolean DEBUG = true; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/EditSessionBuilder.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/EditSessionBuilder.java index 18d78a3fa..c9f36105e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/EditSessionBuilder.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/EditSessionBuilder.java @@ -256,23 +256,20 @@ public class EditSessionBuilder { event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn .getClass() .getName())); - event.getActor().printDebug(TextComponent.of( - " - For area restrictions and block logging, it is recommended to use the FaweAPI")); - event.getActor().printDebug(TextComponent.of(" - To allow " + toReturn - .getClass() - .getName() + ", add it to the FAWE `allowed-plugins` list in config.yml")); - event.getActor().printDebug(TextComponent.of( - " - If you are unsure which plugin tries to use the extent, you can find some additional information below:")); - event.getActor().printDebug(TextComponent.of(" - " + toReturn.getClass().getClassLoader())); + event.getActor().print(TextComponent.of( + "- For area restrictions and block logging, it is recommended that third party plugins use the FAWE" + + " API")); + event.getActor().print(TextComponent.of("- Add the following line to the `allowed-plugins` list in the " + + "FAWE config.yml to let FAWE recognize the extent:")); + event.getActor().print(toReturn.getClass().getName()); } else { - LOGGER.debug("Potentially unsafe extent blocked: " + toReturn.getClass().getName()); - LOGGER.debug(" - For area restrictions and block logging, it is recommended to use the FaweAPI"); - LOGGER.debug(" - To allow " + toReturn - .getClass() - .getName() + ", add it to the FAWE `allowed-plugins` list in config.yml"); - LOGGER.debug( - " - If you are unsure which plugin tries to use the extent, you can find some additional information below:"); - LOGGER.debug(" - " + toReturn.getClass().getClassLoader()); + LOGGER.warn("Potentially unsafe extent blocked: " + toReturn.getClass().getName()); + LOGGER.warn( + " - For area restrictions and block logging, it is recommended that third party plugins use the FAWE API"); + LOGGER.warn( + " - Add the following classpath to the `allowed-plugins` list in the FAWE config.yml to let FAWE " + + "recognize the extent:"); + LOGGER.warn(toReturn.getClass().getName()); } } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java index 4e618d672..b6312f034 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java @@ -167,7 +167,6 @@ public final class EditSessionBuilder { } /** - * * Get the {@link BlockBag} associated with the edit if present or null */ @Nullable @@ -664,23 +663,20 @@ public final class EditSessionBuilder { event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn .getClass() .getName())); - event.getActor().printDebug(TextComponent.of( - " - For area restrictions and block logging, it is recommended to use the FaweAPI")); - event.getActor().printDebug(TextComponent.of(" - To allow " + toReturn - .getClass() - .getName() + ", add it to the FAWE `allowed-plugins` list in config.yml")); - event.getActor().printDebug(TextComponent.of( - " - If you are unsure which plugin tries to use the extent, you can find some additional information below:")); - event.getActor().printDebug(TextComponent.of(" - " + toReturn.getClass().getClassLoader())); + event.getActor().print(TextComponent.of( + "- For area restrictions and block logging, it is recommended that third party plugins use the FAWE" + + " API")); + event.getActor().print(TextComponent.of("- Add the following line to the `allowed-plugins` list in the " + + "FAWE config.yml to let FAWE recognize the extent:")); + event.getActor().print(toReturn.getClass().getName()); } else { - LOGGER.debug("Potentially unsafe extent blocked: " + toReturn.getClass().getName()); - LOGGER.debug(" - For area restrictions and block logging, it is recommended to use the FaweAPI"); - LOGGER.debug(" - To allow " + toReturn - .getClass() - .getName() + ", add it to the FAWE `allowed-plugins` list in config.yml"); - LOGGER.debug( - " - If you are unsure which plugin tries to use the extent, you can find some additional information below:"); - LOGGER.debug(" - " + toReturn.getClass().getClassLoader()); + LOGGER.warn("Potentially unsafe extent blocked: " + toReturn.getClass().getName()); + LOGGER.warn( + " - For area restrictions and block logging, it is recommended that third party plugins use the FAWE API"); + LOGGER.warn( + " - Add the following classpath to the `allowed-plugins` list in the FAWE config.yml to let FAWE " + + "recognize the extent:"); + LOGGER.warn(toReturn.getClass().getName()); } } }