From d80bfc749567eccffae68fb8e10ebb67d7397ac4 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Fri, 4 Feb 2022 11:16:23 +0100 Subject: [PATCH] docs: Update wiki link --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- README.adoc | 2 +- .../core/configuration/Settings.java | 2 +- .../factory/parser/mask/RichMaskParser.java | 10 +++++----- .../parser/pattern/RichPatternParser.java | 11 +++++------ .../parser/transform/RichTransformParser.java | 16 ++++++++++------ .../worldedit/command/WorldEditCommands.java | 2 +- .../worldedit/internal/util/InfoEntryPoint.java | 2 +- 10 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 24954f4ee..7783568df 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -7,7 +7,7 @@ body: attributes: value: | Thanks for taking the time to fill out this bug report for FastAsyncWorldEdit! Fill out the following form to your best ability to help us fix the problem. - Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki). + Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/fastasyncworldedit-documentation/). Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form! - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4dbfd5dca..286581514 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://discord.gg/intellectualsites about: Our support Discord, please ask questions and seek support here. - name: FastAsyncWorldEdit Wiki - url: https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki + url: https://intellectualsites.github.io/fastasyncworldedit-documentation/ about: Look at the wiki page for answers for setup instructions command syntax and more. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index c7ee98f98..1c72a256c 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -7,7 +7,7 @@ body: attributes: value: | Thanks for taking the time to fill out this feature request for FastAsyncWorldEdit! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added. - For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki). + For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/fastasyncworldedit-documentation/). - type: textarea attributes: diff --git a/README.adoc b/README.adoc index 7aef55d42..4dfc0f6d5 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,7 @@ Java Edition required. FastAsyncWorldEdit is compatible with Bukkit, Spigot and === Links * link:https://discord.gg/intellectualsites[Discord] -* link:https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki[Wiki] +* link:https://intellectualsites.github.io/fastasyncworldedit-documentation/[Wiki] * link:https://github.com/IntellectualSites/FastAsyncWorldEdit/issues[Report Issue] * link:https://intellectualsites.crowdin.com/fastasyncworldedit[Crowdin (Translations)] * link:https://javadoc.io/doc/com.fastasyncworldedit/FastAsyncWorldEdit-Bukkit/latest/index.html[JavaDocs for the -bukkit module] 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 04551e11b..2824c55ca 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 @@ -35,7 +35,7 @@ public class Settings extends Config { public String ISSUES = "https://github.com/IntellectualSites/FastAsyncWorldEdit/issues"; @Final @SuppressWarnings("unused") - public String WIKI = "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki"; + public String WIKI = "https://intellectualsites.github.io/fastasyncworldedit-documentation/"; @Final public String DATE; // These values are set from FAWE before loading @Final diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java index c4257c73f..7b0696122 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichMaskParser.java @@ -89,10 +89,10 @@ public class RichMaskParser extends FaweParser { throw new SuggestInputParseException( new NoMatchException(Caption.of("fawe.error.parse.unknown-mask", full, TextComponent - .of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Patterns" + .of("https://intellectualsites.github.io/fastasyncworldedit-documentation/patterns/patterns" ) .clickEvent(ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Patterns" + "https://intellectualsites.github.io/fastasyncworldedit-documentation/patterns/patterns" )) )), full, @@ -143,10 +143,10 @@ public class RichMaskParser extends FaweParser { throw new SuggestInputParseException( new NoMatchException(Caption.of("fawe.error.parse.unknown-mask", full, TextComponent - .of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Masks" + .of("https://intellectualsites.github.io/fastasyncworldedit-documentation/masks/masks" ) .clickEvent(ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Masks" + "https://intellectualsites.github.io/fastasyncworldedit-documentation/masks/masks" )) )), full, @@ -178,7 +178,7 @@ public class RichMaskParser extends FaweParser { try { String cmdArgs = ((args.isEmpty()) ? "" : " " + StringMan.join(args, " ")); List split = - CommandArgParser.forArgString(cmdArgs).parseArgs().collect(Collectors.toList()); + CommandArgParser.forArgString(cmdArgs).parseArgs().toList(); List argStrings = split .stream() .map(Substring::getSubstring) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RichPatternParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RichPatternParser.java index 3f17f493f..4971ee878 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RichPatternParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RichPatternParser.java @@ -81,12 +81,11 @@ public class RichPatternParser extends FaweParser { throw new SuggestInputParseException( new NoMatchException(Caption.of("fawe.error.parse.unknown-pattern", full, TextComponent - .of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki" + - "/Patterns" + .of("https://intellectualsites.github.io/fastasyncworldedit-documentation/patterns/patterns" ) .clickEvent( ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Patterns" + "https://intellectualsites.github.io/fastasyncworldedit-documentation/patterns/patterns" )) )), full, @@ -132,11 +131,11 @@ public class RichPatternParser extends FaweParser { } catch (NoMatchException e) { throw new NoMatchException(Caption.of("fawe.error.parse.unknown-pattern", full, TextComponent - .of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Patterns" + .of("https://intellectualsites.github.io/fastasyncworldedit-documentation/patterns/patterns" ) .clickEvent( com.sk89q.worldedit.util.formatting.text.event.ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Patterns" + "https://intellectualsites.github.io/fastasyncworldedit-documentation/patterns/patterns" )) )); } @@ -154,7 +153,7 @@ public class RichPatternParser extends FaweParser { try { String cmdArgs = ((args.isEmpty()) ? "" : " " + StringMan.join(args, " ")); List split = - CommandArgParser.forArgString(cmdArgs).parseArgs().collect(Collectors.toList()); + CommandArgParser.forArgString(cmdArgs).parseArgs().toList(); List argStrings = split .stream() .map(Substring::getSubstring) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RichTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RichTransformParser.java index 555134c68..ccc025fca 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RichTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RichTransformParser.java @@ -78,10 +78,12 @@ public class RichTransformParser extends FaweParser { } else { throw new NoMatchException(Caption.of("fawe.error.parse.unknown-transform", pe.getFull(), TextComponent - .of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Transforms" + .of("https://intellectualsites.github" + + ".io/fastasyncworldedit-documentation/transforms/transforms" ) .clickEvent(ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Transforms" + "https://intellectualsites.github" + + ".io/fastasyncworldedit-documentation/transforms/transforms" )) )); } @@ -93,10 +95,12 @@ public class RichTransformParser extends FaweParser { } catch (Throwable e) { throw new NoMatchException(Caption.of("fawe.error.parse.unknown-transform", pe.getFull(), TextComponent - .of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Transforms" + .of("https://intellectualsites.github" + + ".io/fastasyncworldedit-documentation/transforms/transforms" ) .clickEvent(ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Transforms" + "https://intellectualsites.github" + + ".io/fastasyncworldedit-documentation/transforms/transforms" )) )); } @@ -146,9 +150,9 @@ public class RichTransformParser extends FaweParser { } if (union.isEmpty()) { throw new NoMatchException(Caption.of("fawe.error.parse.unknown-transform", input, - TextComponent.of("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Transforms" + TextComponent.of("https://intellectualsites.github.io/fastasyncworldedit-documentation/transforms/transforms" ).clickEvent(ClickEvent.openUrl( - "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki/Transforms" + "https://intellectualsites.github.io/fastasyncworldedit-documentation/transforms/transforms" )) )); } else if (union.size() == 1) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index c6ca4d7a8..136b52433 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -77,7 +77,7 @@ public class WorldEditCommands { actor.print(TextComponent.of("FastAsyncWorldEdit" + fVerStr)); actor.print(TextComponent.of("Authors: Empire92, MattBDev, IronApollo, dordsor21 and NotMyFault")); actor.print(TextComponent.of("Wiki: https://git.io/JMEPa") - .clickEvent(ClickEvent.openUrl("https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki"))); + .clickEvent(ClickEvent.openUrl("https://intellectualsites.github.io/fastasyncworldedit-documentation/"))); actor.print(TextComponent.of("Discord: https://discord.gg/intellectualsites") .clickEvent(ClickEvent.openUrl("https://discord.gg/intellectualsites"))); UpdateNotification.doUpdateNotification(actor); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/InfoEntryPoint.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/InfoEntryPoint.java index 10411eeeb..aecd2a0db 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/InfoEntryPoint.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/InfoEntryPoint.java @@ -33,7 +33,7 @@ import java.net.URISyntaxException; public class InfoEntryPoint { - private static final String INSTALL_URL = "https://github.com/IntellectualSites/FastAsyncWorldEdit-Documentation/wiki"; + private static final String INSTALL_URL = "https://intellectualsites.github.io/fastasyncworldedit-documentation/"; private static final String SUPPORT_URL = "https://discord.gg/intellectualsites"; private static String getMessage(boolean html) {