From 3ada55989f80336ae895871fea2d0f4b442eabff Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Mon, 26 Apr 2021 16:25:15 +0200 Subject: [PATCH 1/3] [ci skip] Setup new issue templates (#2951) * Setup issue templates * Exchange issue url --- .github/CODEOWNERS | 2 +- .github/ISSUE_TEMPLATE/bug_report.yml | 102 +++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 8 ++ .github/ISSUE_TEMPLATE/feature_request.yml | 29 ++++++ .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/auto-comment.yml | 8 -- .github/stale.yml | 18 ++++ README.md | 6 +- 8 files changed, 162 insertions(+), 13 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml delete mode 100644 .github/auto-comment.yml create mode 100644 .github/stale.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f0809ab2a..053b50484 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -@IntellectualSites/plotsquared-team +* @IntellectualSites/plotsquared-team diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 000000000..0bf52729c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,102 @@ +name: Bug report +description: Create a report to help us improve +labels: 'Requires Testing' + +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report for PlotSquared! 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://wiki.intellectualsites.com/PlotSquared). + + - type: dropdown + attributes: + label: Server Implementation + description: Which server Implementation are you using? If your server implementation is not listed, it is not supported. Switch to a supported version first. + multiple: false + options: + - Paper + - Spigot + - Tuinity + - Purpur + validations: + required: true + + - type: dropdown + attributes: + label: Server Version + description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first. + multiple: false + options: + - '1.16.5' + - '1.15.2' + - '1.14.4' + - '1.13.2' + validations: + required: true + + - type: textarea + attributes: + label: Describe the bug + description: A clear and concise description of what the bug is. + validations: + required: true + + - type: textarea + attributes: + label: To Reproduce + description: Steps to reproduce this behaviour + placeholder: | + 1. Go to '...' + 2. Click on '...' + 3. Scroll down to '...' + 4. See error + validations: + required: true + + - type: textarea + attributes: + label: Expected behaviour + description: A clear and concise description of what you expected to happen. + validations: + required: true + + - type: textarea + attributes: + label: Screenshots / Videos + description: If applicable, add screenshots to help explain your problem. + + - type: input + attributes: + label: Error log (if applicable) + description: If you are reporting a console error, upload any relevant log excerpts to either https://paste.gg/ or https://gist.github.com, save and the paste the link in this box. + + - type: input + attributes: + label: Plot Debugpaste + description: Run `/plot debugpaste` in your console or ingame and provide the output link here. + validations: + required: true + + - type: input + attributes: + label: PlotSquared Version + description: What version of PlotSquared are you running? (`/version PlotSquared`) + placeholder: "For example: PlotSquared version 5.13.11-Premium" + validations: + required: true + + - type: checkboxes + attributes: + label: Checklist + description: Make sure you have followed each of the steps outlined here. + options: + - label: I have included a Plot debugpaste. + required: true + - label: I am using the newest build from https://www.spigotmc.org/resources/77506/ and the issue still persists. + required: true + + - type: textarea + attributes: + label: Anything else? + description: You can provide additional context below. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..ac267d10a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: IntellectualSites Discord + url: https://discord.gg/intellectualsites + about: Our support Discord, please ask questions and seek support here. + - name: PlotSquared Wiki + url: https://wiki.intellectualsites.com/PlotSquared + about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 000000000..18bb172e6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,29 @@ +name: Feature request +description: Suggest an idea for this project +labels: 'Enhancement' + +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this feature request for PlotSquared! 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://wiki.intellectualsites.com/PlotSquared). + + - type: textarea + attributes: + label: What feature do you want to see added? + description: A clear and concise description of your feature request. + validations: + required: true + + - type: textarea + attributes: + label: Are there any alternatives? + description: List any alternatives you might have tried + validations: + required: true + + - type: textarea + attributes: + label: Anything else? + description: You can provide additional context below. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f55841917..59c5ea33c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ **Fixes {Link to issue}** diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml deleted file mode 100644 index 38721ffb9..000000000 --- a/.github/auto-comment.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Comment to a new issue. -issueOpened: > - Thank your for raising a issue. We will try and get back to you as soon as possible. - - Please make sure that you followed the issue template, and provided all neccessary information. - Failure to do so will prevent us from resolving the issue in a timely manner. - - Please note that suggestions are now to be submitted to https://git.io/fN5B4 rather than this issue tracker! diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..7d95c1f66 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,18 @@ +daysUntilStale: 60 +daysUntilClose: 7 +only: issues +exemptLabels: + - "Bug" + - "Enhancement" + - "Approved" + - "Priority" + - "Under investigation" +staleLabel: "resolution: stale" +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. If the issue is still present and can be reproduced, please let the team know. + Thank you for your contributions. +closeComment: > + This issue has been automatically closed because it has not had activity in + a long time. If the issue still applies to the most recent supported + version, please reply to this issue and the team will reopen it. diff --git a/README.md b/README.md index 71c4c3f46..aea90c822 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- +

--- @@ -25,10 +25,10 @@ is to provide a lag-free and smooth experience. ## Links -* [Download](https://www.spigotmc.org/resources/plotsquared-v5.77506/) +* [Download](https://www.spigotmc.org/resources/77506/) * [Discord](https://discord.gg/intellectualsites) * [Wiki](https://wiki.intellectualsites.com/plotsquared/home) -* [Issues](https://issues.intellectualsites.com/projects/ps) +* [Issues](https://github.com/IntellectualSites/PlotSquared/issues) * [Translations](https://intellectualsites.crowdin.com/plotsquared/) ### Developer Resources From 823beaf26805f1e1cdb5e9affe18d0fbef236819 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 27 Apr 2021 11:46:14 +0200 Subject: [PATCH 2/3] Update a few dependencies --- .github/FUNDING.yml | 4 ++-- Bukkit/build.gradle | 6 +++--- Bukkit/pom.xml | 6 +++--- Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 9b0dbc13e..67079dc67 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,8 +1,8 @@ # These are supported funding model platforms -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +github: [NotMyFault, dordsor21, SirYwell] patreon: IntellectualSites # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username +open_collective: IntellectualSites ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 3e7aca2db..8b4503914 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -42,7 +42,7 @@ dependencies { compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false } compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false } compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1'){ transitive = false } - implementation("de.notmyfault:serverlib:1.0.1") + implementation("org.incendo.serverlib:ServerLib:2.1.0") } sourceCompatibility = 1.8 @@ -102,7 +102,7 @@ shadowJar { include(dependency("org.khelekore:prtree:1.7.0-SNAPSHOT")) include(dependency("com.sk89q:squirrelid:1.0.0-SNAPSHOT")) include(dependency("com.intellectualsites.paster:Paster:1.0.2-SNAPSHOT")) - include(dependency("de.notmyfault:serverlib:1.0.1")) + include(dependency("org.incendo.serverlib:ServerLib:2.1.0")) } relocate('net.kyori.text', 'com.plotsquared.formatting.text') relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib") @@ -110,7 +110,7 @@ shadowJar { relocate('com.sk89q.squirrelid', 'com.plotsquared.squirrelid') relocate('org.khelekore.prtree', 'com.plotsquared.prtree') relocate('com.intellectualsites.paster', 'com.plotsquared.core.paster') - relocate('de.notmyfault', 'com.plotsquared.bukkit') + relocate('org.incendo.serverlib', 'com.plotsquared.bukkit') archiveFileName = "${project.name}-${parent.version}.jar" destinationDirectory = file "../target" } diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index 86ec1a9b3..a42a6fa55 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -183,9 +183,9 @@ - de.notmyfault - serverlib - 1.0.1 + org.incendo.serverlib + ServerLib + 2.1.0 runtime diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index 0ace2605e..a1e944c40 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -118,7 +118,6 @@ import com.plotsquared.core.uuid.offline.OfflineModeUUIDService; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.extension.platform.Actor; -import de.notmyfault.serverlib.ServerLib; import io.papermc.lib.PaperLib; import lombok.Getter; import lombok.NonNull; @@ -140,6 +139,7 @@ import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; +import org.incendo.serverlib.ServerLib; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -408,6 +408,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< // Check if we are in a safe environment ServerLib.checkUnsafeForks(); + ServerLib.checkJavaLTS(); } private void unload() { From 5cdb7e76fd44776aea4ffe65c721bf9c72f46078 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Wed, 28 Apr 2021 20:06:19 +0200 Subject: [PATCH 3/3] Update wiki and issue links --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- .../com/plotsquared/core/command/DebugPaste.java | 2 +- .../java/com/plotsquared/core/command/PluginCmd.java | 2 +- .../com/plotsquared/core/configuration/Settings.java | 12 ++++++------ README.md | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0bf52729c..2caf583d0 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 PlotSquared! 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://wiki.intellectualsites.com/PlotSquared). + 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/PlotSquared/wiki). - type: dropdown attributes: diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ac267d10a..0d20c325a 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: PlotSquared Wiki - url: https://wiki.intellectualsites.com/PlotSquared + url: https://github.com/IntellectualSites/PlotSquared/wiki about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 18bb172e6..1d30e6ecc 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 PlotSquared! 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://wiki.intellectualsites.com/PlotSquared). + For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki). - type: textarea attributes: diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index e88869ead..1028ea2e5 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -103,7 +103,7 @@ public class DebugPaste extends SubCommand { b.append("OS Arch: ").append(System.getProperty("os.arch")).append('\n'); b.append("# Okay :D Great. You are now ready to create your bug report!"); b.append( - "\n# You can do so at https://issues.intellectualsites.com/projects/ps"); + "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues"); b.append("\n# or via our Discord at https://discord.gg/intellectualsites"); final IncendoPaster incendoPaster = new IncendoPaster("plotsquared"); diff --git a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java index 0165a916f..07ca09329 100644 --- a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java @@ -47,7 +47,7 @@ public class PluginCmd extends SubCommand { MainUtil.sendMessage(player, "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault $2& $1SirYwell"); MainUtil.sendMessage(player, - "$2>> $1&lWiki$2: $1https://wiki.intellectualsites.com/plotsquared/home"); + "$2>> $1&lWiki$2: $1https://github.com/IntellectualSites/PlotSquared/wiki"); MainUtil .sendMessage(player, "$2>> $1&lPremium$2: $1" + PremiumVerification.isPremium()); }); diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java index c5efe94df..1b568fe69 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java @@ -208,7 +208,7 @@ public class Settings extends Config { public List WORLDS = new ArrayList<>(Collections.singletonList("*")); - @Comment("See: https://wiki.intellectualsites.com/en/plotsquared/optimization/plot-analysis for a description of each value.") + @Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis for a description of each value.") public static final class CALIBRATION { public int VARIETY = 0; public int VARIETY_SD = 0; @@ -225,7 +225,7 @@ public class Settings extends Config { @Comment({"Chunk processor related settings", - "See https://wiki.intellectualsites.com/en/plotsquared/optimization/chunk-processor for more information."}) + "See https://github.com/IntellectualSites/PlotSquared/wiki/Chunk-processor for more information."}) public static class Chunk_Processor { @Comment("Auto trim will not save chunks which aren't claimed") public static boolean AUTO_TRIM = false; @@ -276,7 +276,7 @@ public class Settings extends Config { @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false; @Comment("Replace wall when merging") public static boolean MERGE_REPLACE_WALL = true; @Comment({"Blocks that may not be used in plot components", - "Checkout the wiki article regarding plot components before modifying: https://wiki.intellectualsites.com/en/plotsquared/installation/plot-components"}) public static List + "Checkout the wiki article regarding plot components before modifying: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"}) public static List INVALID_BLOCKS = Arrays.asList( // Acacia Stuff "acacia_button", "acacia_fence_gate", "acacia_door", "acacia_pressure_plate", @@ -391,7 +391,7 @@ public class Settings extends Config { @Comment({"Schematic Settings", - "See https://wiki.intellectualsites.com/en/plotsquared/schematics/on-claim for more information."}) + "See https://github.com/IntellectualSites/PlotSquared/wiki/Schematic-on-Claim for more information."}) public static final class Schematics { @Comment( "Whether schematic based generation should paste schematic on top of plots, or from Y=1") @@ -457,7 +457,7 @@ public class Settings extends Config { @Comment({"Backup related settings", - "See https://wiki.intellectualsites.com/en/plotsquared/backups for more information."}) + "See https://github.com/IntellectualSites/PlotSquared/wiki/Backups for more information."}) public static final class Backup { @Comment("Automatically backup plots when destructive commands are performed, e.g. /plot clear") public static boolean AUTOMATIC_BACKUPS = true; @@ -586,7 +586,7 @@ public class Settings extends Config { @Comment("Make road regeneration persistent across restarts") public static boolean PERSISTENT_ROAD_REGEN = false; @Comment({"Enable the `/plot component` preset GUI", - "Read more about components here: https://wiki.intellectualsites.com/en/plotsquared/installation/plot-components"}) public static boolean COMPONENT_PRESETS = true; + "Read more about components here: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"}) public static boolean COMPONENT_PRESETS = true; @Comment("Use UUID cache to complete usernames") public static boolean EXTENDED_USERNAME_COMPLETION = true; @Comment("Command aliases that will be tab completed") diff --git a/README.md b/README.md index aea90c822..41a5c4179 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,14 @@ is to provide a lag-free and smooth experience. * [Download](https://www.spigotmc.org/resources/77506/) * [Discord](https://discord.gg/intellectualsites) -* [Wiki](https://wiki.intellectualsites.com/plotsquared/home) +* [Wiki](https://github.com/IntellectualSites/PlotSquared/wiki) * [Issues](https://github.com/IntellectualSites/PlotSquared/issues) * [Translations](https://intellectualsites.crowdin.com/plotsquared/) ### Developer Resources -* [API Documentation](https://wiki.intellectualsites.com/en/plotsquared/developer/development-portal) -* [Event API](https://wiki.intellectualsites.com/en/plotsquared/developer/events) -* [Flag API](https://wiki.intellectualsites.com/en/plotsquared/developer/flags) +* [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/API-Documentation) +* [Event API](https://github.com/IntellectualSites/PlotSquared/wiki/Events) +* [Flag API](https://github.com/IntellectualSites/PlotSquared/wiki/API-Flag) # Building Gradle is the **recommended** way to build the project. Use `./gradlew build` in the main project directory to build the project. Gradle is required if you intend to build or develop the Sponge module.