From fc53f6b7a4696c8b33aa32cdb320ca71489e7d7a Mon Sep 17 00:00:00 2001 From: benrobson Date: Fri, 12 Feb 2021 12:25:34 +1100 Subject: [PATCH 1/3] Added a config.yml to configure export values. --- src/main/java/network/warzone/scaffold/Scaffold.java | 4 +++- .../network/warzone/scaffold/commands/ScaffoldCommands.java | 6 +++--- src/main/resources/config.yml | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/config.yml diff --git a/src/main/java/network/warzone/scaffold/Scaffold.java b/src/main/java/network/warzone/scaffold/Scaffold.java index 303b7b7..848c737 100644 --- a/src/main/java/network/warzone/scaffold/Scaffold.java +++ b/src/main/java/network/warzone/scaffold/Scaffold.java @@ -17,7 +17,7 @@ public final class Scaffold extends JavaPlugin implements TabCompleter { - private static Scaffold instance; + public static Scaffold instance; public static Scaffold get() { return instance; } @@ -32,6 +32,8 @@ public void onEnable() { //TODO Disabled large number warning for now but add back later with some changes //getServer().getPluginManager().registerEvents(new ScaffoldListener(), this); + this.saveDefaultConfig(); + this.commands = new CommandsManager() { @Override public boolean hasPermission(CommandSender sender, String perm) { diff --git a/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java b/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java index 7ded090..1d1365f 100644 --- a/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java +++ b/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java @@ -205,8 +205,8 @@ public static void close(CommandContext cmd, CommandSender sender) { @CommandPermissions("scaffold.command.export") @Command(aliases = "export", desc = "Export a world.", min = 0, max = 1, usage = "") - public static void upload(CommandContext cmd, CommandSender sender) { - if (!sender.hasPermission("scaffold.command.upload")) { + public static void export(CommandContext cmd, CommandSender sender) { + if (!sender.hasPermission("scaffold.command.export")) { sender.sendMessage(ChatColor.RED + "You do not have permission."); return; } @@ -238,7 +238,7 @@ public static void upload(CommandContext cmd, CommandSender sender) { sender.sendMessage(ChatColor.YELLOW + "Uploading world..."); try { - HttpResponse response = Unirest.post("https://transfer.sh/").header("Max-Downloads", "1").header("Max-Days", "3").field("upload-file", zip).asString(); + HttpResponse response = Unirest.post("https://transfer.sh/").header("Max-Downloads", Scaffold.get().getConfig().getString("export.maxdownloads")).header("Max-Days", Scaffold.get().getConfig().getString("export.maxdays")).field("upload-file", zip).asString(); String link = response.getBody(); zip.delete(); sender.sendMessage(ChatColor.GOLD + "Upload complete: " + link); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..8448e5b --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,5 @@ +export: + # Maximum amount of downloads before link is dead. + maxdownloads: 1 + # Maxomum amount of days before link is dead. + maxdays: 3 \ No newline at end of file From 5b5c117825bbee163e760e1600a3770c8f1d7cc5 Mon Sep 17 00:00:00 2001 From: benrobson Date: Fri, 12 Feb 2021 12:28:30 +1100 Subject: [PATCH 2/3] Fix config spelling mistake. --- src/main/resources/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 8448e5b..4512757 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,5 @@ export: # Maximum amount of downloads before link is dead. maxdownloads: 1 - # Maxomum amount of days before link is dead. + # Maximum amount of days before link is dead. maxdays: 3 \ No newline at end of file From f5a608e797678c0c98e5ae6997f7df03c9ddeb14 Mon Sep 17 00:00:00 2001 From: benrobson Date: Tue, 23 Feb 2021 19:10:42 +1100 Subject: [PATCH 3/3] Added a getConfig method to the export command. --- .../network/warzone/scaffold/commands/ScaffoldCommands.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java b/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java index 1d1365f..d053b55 100644 --- a/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java +++ b/src/main/java/network/warzone/scaffold/commands/ScaffoldCommands.java @@ -14,6 +14,8 @@ import org.bukkit.*; import org.bukkit.World.Environment; import org.bukkit.command.CommandSender; +import org.bukkit.configuration.Configuration; +import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -28,6 +30,7 @@ import java.util.concurrent.ThreadLocalRandom; public class ScaffoldCommands { + static FileConfiguration config = Scaffold.get().getConfig(); @CommandPermissions("scaffold.command.lock") @Command(aliases = "lock", desc = "Lock a world at this time.", min = 1, max = 1, usage = "") @@ -238,7 +241,7 @@ public static void export(CommandContext cmd, CommandSender sender) { sender.sendMessage(ChatColor.YELLOW + "Uploading world..."); try { - HttpResponse response = Unirest.post("https://transfer.sh/").header("Max-Downloads", Scaffold.get().getConfig().getString("export.maxdownloads")).header("Max-Days", Scaffold.get().getConfig().getString("export.maxdays")).field("upload-file", zip).asString(); + HttpResponse response = Unirest.post("https://transfer.sh/").header("Max-Downloads", config.getString("export.maxdownloads")).header("Max-Days", config.getString("export.maxdays")).field("upload-file", zip).asString(); String link = response.getBody(); zip.delete(); sender.sendMessage(ChatColor.GOLD + "Upload complete: " + link);