feat: Improve wording of allowed-plugins message (#1341)

Fixes #1319
This commit is contained in:
NotMyFault 2021-10-07 19:12:17 +02:00 committed by GitHub
parent 546ad86841
commit e2924f4cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 35 deletions

View File

@ -461,9 +461,9 @@ public class Settings extends Config {
@Comment({ @Comment({
"Don't bug console when these plugins slow down WorldEdit operations", "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<String> ALLOWED_PLUGINS = new ArrayList<>(Collections.singleton(("ExamplePlugin"))); public List<String> ALLOWED_PLUGINS = new ArrayList<>(Collections.singleton(("com.example.ExamplePlugin")));
@Comment("Should debug messages be sent when third party extents are used?") @Comment("Should debug messages be sent when third party extents are used?")
public boolean DEBUG = true; public boolean DEBUG = true;

View File

@ -256,23 +256,20 @@ public class EditSessionBuilder {
event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn
.getClass() .getClass()
.getName())); .getName()));
event.getActor().printDebug(TextComponent.of( event.getActor().print(TextComponent.of(
" - For area restrictions and block logging, it is recommended to use the FaweAPI")); "- For area restrictions and block logging, it is recommended that third party plugins use the FAWE" +
event.getActor().printDebug(TextComponent.of(" - To allow " + toReturn " API"));
.getClass() event.getActor().print(TextComponent.of("- Add the following line to the `allowed-plugins` list in the " +
.getName() + ", add it to the FAWE `allowed-plugins` list in config.yml")); "FAWE config.yml to let FAWE recognize the extent:"));
event.getActor().printDebug(TextComponent.of( event.getActor().print(toReturn.getClass().getName());
" - 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()));
} else { } else {
LOGGER.debug("Potentially unsafe extent blocked: " + toReturn.getClass().getName()); LOGGER.warn("Potentially unsafe extent blocked: " + toReturn.getClass().getName());
LOGGER.debug(" - For area restrictions and block logging, it is recommended to use the FaweAPI"); LOGGER.warn(
LOGGER.debug(" - To allow " + toReturn " - For area restrictions and block logging, it is recommended that third party plugins use the FAWE API");
.getClass() LOGGER.warn(
.getName() + ", add it to the FAWE `allowed-plugins` list in config.yml"); " - Add the following classpath to the `allowed-plugins` list in the FAWE config.yml to let FAWE " +
LOGGER.debug( "recognize the extent:");
" - If you are unsure which plugin tries to use the extent, you can find some additional information below:"); LOGGER.warn(toReturn.getClass().getName());
LOGGER.debug(" - " + toReturn.getClass().getClassLoader());
} }
} }
} }

View File

@ -167,7 +167,6 @@ public final class EditSessionBuilder {
} }
/** /**
*
* Get the {@link BlockBag} associated with the edit if present or null * Get the {@link BlockBag} associated with the edit if present or null
*/ */
@Nullable @Nullable
@ -664,23 +663,20 @@ public final class EditSessionBuilder {
event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn
.getClass() .getClass()
.getName())); .getName()));
event.getActor().printDebug(TextComponent.of( event.getActor().print(TextComponent.of(
" - For area restrictions and block logging, it is recommended to use the FaweAPI")); "- For area restrictions and block logging, it is recommended that third party plugins use the FAWE" +
event.getActor().printDebug(TextComponent.of(" - To allow " + toReturn " API"));
.getClass() event.getActor().print(TextComponent.of("- Add the following line to the `allowed-plugins` list in the " +
.getName() + ", add it to the FAWE `allowed-plugins` list in config.yml")); "FAWE config.yml to let FAWE recognize the extent:"));
event.getActor().printDebug(TextComponent.of( event.getActor().print(toReturn.getClass().getName());
" - 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()));
} else { } else {
LOGGER.debug("Potentially unsafe extent blocked: " + toReturn.getClass().getName()); LOGGER.warn("Potentially unsafe extent blocked: " + toReturn.getClass().getName());
LOGGER.debug(" - For area restrictions and block logging, it is recommended to use the FaweAPI"); LOGGER.warn(
LOGGER.debug(" - To allow " + toReturn " - For area restrictions and block logging, it is recommended that third party plugins use the FAWE API");
.getClass() LOGGER.warn(
.getName() + ", add it to the FAWE `allowed-plugins` list in config.yml"); " - Add the following classpath to the `allowed-plugins` list in the FAWE config.yml to let FAWE " +
LOGGER.debug( "recognize the extent:");
" - If you are unsure which plugin tries to use the extent, you can find some additional information below:"); LOGGER.warn(toReturn.getClass().getName());
LOGGER.debug(" - " + toReturn.getClass().getClassLoader());
} }
} }
} }