EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Lazy merge v5/v6

Browse Source
This commit is contained in:
NotMyFault
2021-04-28 20:17:10 +02:00
parent 361b936aa0
commit ffe298710d
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/plotsquared/core/command/Command.java
View File

@ -322,7 +322,7 @@ public abstract class Command {
}
if (this.allCommands.isEmpty()) {
player.sendMessage(
StaticCaption.of("Not Implemented: https://issues.intellectualsites.com/newIssue?project=PS"));
StaticCaption.of("Not Implemented: https://github.com/IntellectualSites/PlotSquared/issues"));
return CompletableFuture.completedFuture(false);
}
Command cmd = getCommand(args[0]);

4
Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
View File

@ -115,7 +115,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");
@ -123,7 +123,7 @@ public class DebugPaste extends SubCommand {
try {
final File logFile =
new File(PlotSquared.platform().getDirectory(), "../../logs/latest.log");
new File("logs/latest.log");
if (Files.size(logFile.toPath()) > 14_000_000) {
throw new IOException(
"The latest.log is larger than 14MB. Please reboot your server and submit a new paste.");

2
Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
View File

@ -51,7 +51,7 @@ public class PluginCmd extends SubCommand {
player.sendMessage(StaticCaption.of(
"<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
player.sendMessage(StaticCaption.of(
"<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://wiki.intellectualsites.com/plotsquared/home>https://wiki.intellectualsites.com/plotsquared/home</gold>"));
"<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://github.com/IntellectualSites/PlotSquared/wiki>https://github.com/IntellectualSites/PlotSquared/wiki</gold>"));
player.sendMessage(StaticCaption.of(
"<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
player.sendMessage(

12
Core/src/main/java/com/plotsquared/core/configuration/Settings.java
View File

@ -215,7 +215,7 @@ public class Settings extends Config {
public List<String> 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;
@ -235,7 +235,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")
@ -296,7 +296,7 @@ public class Settings extends Config {
@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"})
"Checkout the wiki article regarding plot components before modifying: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"})
public static List<String>
INVALID_BLOCKS = Arrays.asList(
// Acacia Stuff
@ -418,7 +418,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(
@ -530,7 +530,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")
@ -728,7 +728,7 @@ public class Settings extends Config {
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"})
"Read more about components here: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"})
public static boolean COMPONENT_PRESETS = true;
@Comment("Enable per user locale")
public static boolean PER_USER_LOCALE = false;