From 69b650bc415fd30646631ef8820277c4be89a70a Mon Sep 17 00:00:00 2001 From: jman13378 Date: Sun, 9 Jul 2023 03:47:44 -0400 Subject: [PATCH] Changed soem internal messages and updated the issues --- .github/ISSUE_TEMPLATE/bug_report.yml | 12 ++++++ .github/ISSUE_TEMPLATE/need-help.yml | 20 +++++++-- resource/plugin.yml | 2 +- .../commands/Commandpanelversion.java | 2 +- .../editor/CommandPanelsEditor.java | 2 +- .../commandpanels/editor/PanelDownloader.java | 41 ++++++++++++++++--- 6 files changed, 67 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 38c06ee..7b8c4ce 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -40,6 +40,18 @@ body: attributes: label: What CommandPanels version are you using? options: + - latest + - 3.19.0.3 + - 3.19.0.2 + - 3.19.0.1 + - 3.19.0.0 + - 3.18.6.2 + - 3.18.6.1 + - 3.18.6.0 + - 3.18.5.1 + - 3.18.5.0 + - 3.18.4.1 + - 3.18.4.0 - 3.18.3.0 - 3.18.2.0 - 3.18.1.4 diff --git a/.github/ISSUE_TEMPLATE/need-help.yml b/.github/ISSUE_TEMPLATE/need-help.yml index fb82898..50d72bb 100644 --- a/.github/ISSUE_TEMPLATE/need-help.yml +++ b/.github/ISSUE_TEMPLATE/need-help.yml @@ -1,6 +1,6 @@ name: Need help description: Create an issue for a problem you are having. -labels: ["help wanted"] +labels: [ "help wanted" ] body: - type: checkboxes id: searched @@ -32,12 +32,24 @@ body: - 1.18 - 1.19 validations: - required: true + required: true - type: dropdown id: commandpanels_version attributes: label: What CommandPanels version are you using? options: + - latest + - 3.19.0.3 + - 3.19.0.2 + - 3.19.0.1 + - 3.19.0.0 + - 3.18.6.2 + - 3.18.6.1 + - 3.18.6.0 + - 3.18.5.1 + - 3.18.5.0 + - 3.18.4.1 + - 3.18.4.0 - 3.18.3.0 - 3.18.2.0 - 3.18.1.4 @@ -64,7 +76,7 @@ body: - 3.17.1.0 - Any other version validations: - required: true + required: true - type: dropdown id: server_software attributes: @@ -82,7 +94,7 @@ body: - Velocity - Travertine validations: - required: true + required: true - type: textarea id: what-happened attributes: diff --git a/resource/plugin.yml b/resource/plugin.yml index 55b7fcf..9c8881d 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.19.0.3 +version: 3.19.0.3-DEV main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/commands/Commandpanelversion.java b/src/me/rockyhawk/commandpanels/commands/Commandpanelversion.java index 02cfda4..8531ffc 100644 --- a/src/me/rockyhawk/commandpanels/commands/Commandpanelversion.java +++ b/src/me/rockyhawk/commandpanels/commands/Commandpanelversion.java @@ -11,7 +11,7 @@ public class Commandpanelversion implements CommandExecutor { CommandPanels plugin; public Commandpanelversion(CommandPanels pl) { this.plugin = pl; } - @EventHandler + @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { if (label.equalsIgnoreCase("cpv") || label.equalsIgnoreCase("commandpanelversion") || label.equalsIgnoreCase("cpanelv")) { diff --git a/src/me/rockyhawk/commandpanels/editor/CommandPanelsEditor.java b/src/me/rockyhawk/commandpanels/editor/CommandPanelsEditor.java index 8172bf4..c36e145 100644 --- a/src/me/rockyhawk/commandpanels/editor/CommandPanelsEditor.java +++ b/src/me/rockyhawk/commandpanels/editor/CommandPanelsEditor.java @@ -24,7 +24,7 @@ public class CommandPanelsEditor implements CommandExecutor { this.plugin = pl; } - @EventHandler + @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { if (sender.hasPermission("commandpanel.edit")) { if (!(sender instanceof Player)) { diff --git a/src/me/rockyhawk/commandpanels/editor/PanelDownloader.java b/src/me/rockyhawk/commandpanels/editor/PanelDownloader.java index 8ce83e1..6021e67 100644 --- a/src/me/rockyhawk/commandpanels/editor/PanelDownloader.java +++ b/src/me/rockyhawk/commandpanels/editor/PanelDownloader.java @@ -1,8 +1,13 @@ package me.rockyhawk.commandpanels.editor; import me.rockyhawk.commandpanels.CommandPanels; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.ComponentBuilder; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; import java.io.*; import java.net.URL; @@ -13,19 +18,23 @@ import java.util.logging.Level; public class PanelDownloader { CommandPanels plugin; - public PanelDownloader(CommandPanels pl) { this.plugin = pl; } + + public PanelDownloader(CommandPanels pl) { + this.plugin = pl; + } + public void downloadPanel(CommandSender sender, String url, String fileName) { BufferedInputStream in = null; FileOutputStream fout = null; //add extension if not already added - if(!fileName.endsWith(".yml") && !fileName.endsWith(".yaml")) { + if (!fileName.endsWith(".yml") && !fileName.endsWith(".yaml")) { fileName = fileName + ".yml"; } //Check if fileName contains file:// try { - if(URLDecoder.decode(url, StandardCharsets.UTF_8.toString()).contains("file://")) { + if (URLDecoder.decode(url, StandardCharsets.UTF_8.toString()).contains("file://")) { sender.sendMessage(plugin.tag + ChatColor.RED + "Invalid URL. Using file:// is not supported."); return; } @@ -55,10 +64,32 @@ public class PanelDownloader { byte[] data = new byte[1024]; int count; - while((count = in.read(data, 0, 1024)) != -1) { + while ((count = in.read(data, 0, 1024)) != -1) { fout.write(data, 0, count); } - sender.sendMessage(plugin.tag + ChatColor.GREEN + "Finished downloading."); + if (sender instanceof Player) { + YamlConfiguration panels = YamlConfiguration.loadConfiguration(file); + if (panels.getConfigurationSection("panels").getKeys(false).size()>1) { + sender.sendMessage(plugin.tag + ChatColor.GREEN + "Finished downloading," + + ChatColor.UNDERLINE +ChatColor.YELLOW+ " Panel '" + fileName + "'"); + } else { + + BaseComponent[] components = new ComponentBuilder(plugin.tag + + net.md_5.bungee.api.ChatColor.GREEN + "Finished downloading, " + + ChatColor.UNDERLINE + "Panel '" + fileName + "'.\n" + + ChatColor.YELLOW + ChatColor.UNDERLINE + " Click Here to open the panel.") + .event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/cp " + + panels.getConfigurationSection("panels").getKeys(false).toArray()[0])) + .create(); + Player player =(Player) sender; + player.spigot().sendMessage(components); + + } + + } else { + sender.sendMessage(plugin.tag + ChatColor.GREEN + "Finished downloading, " + + ChatColor.UNDERLINE +ChatColor.YELLOW+ "Panel '" + fileName + "'"); + } } catch (Exception var22) { sender.sendMessage(plugin.tag + ChatColor.RED + "Could not download panel."); } finally {