From 4a15053a5d8b2229d1a7eb631029a53f85f51f72 Mon Sep 17 00:00:00 2001 From: Leon D Date: Sat, 6 Apr 2024 02:44:02 +0100 Subject: [PATCH] Fixed two major bugs relating to the language selector. --- dependency-reduced-pom.xml | 2 +- pom.xml | 2 +- .../java/com/leon/bugreport/BugReportLanguage.java | 5 +++-- .../java/com/leon/bugreport/BugReportManager.java | 2 +- .../com/leon/bugreport/DefaultLanguageSelector.java | 12 ++++++++++++ .../java/com/leon/bugreport/discord/LinkDiscord.java | 4 ++-- .../leon/bugreport/gui/BugReportConfirmationGUI.java | 6 ++++-- src/main/resources/config.yml | 4 ++-- src/main/resources/plugin.yml | 2 +- 9 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 7046b8f..7a9ce2e 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.leon.bugreport BugReports - 0.11.0 + 0.11.1 diff --git a/pom.xml b/pom.xml index 9a36cfd..b51b207 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.leon.bugreport BugReports - 0.11.0 + 0.11.1 17 17 diff --git a/src/main/java/com/leon/bugreport/BugReportLanguage.java b/src/main/java/com/leon/bugreport/BugReportLanguage.java index b6ae170..b42be33 100644 --- a/src/main/java/com/leon/bugreport/BugReportLanguage.java +++ b/src/main/java/com/leon/bugreport/BugReportLanguage.java @@ -45,8 +45,9 @@ public static String getEnglishVersionFromLanguage(String displayName) { "Enable Category Selection", "Set Max Reports Per Player", "Set Language", "On", "Off", "Language", "Cancelled", "Cancel", "Archive", "Unarchive", "Delete", "Other Settings", "Enable Title Message", "Enable Player Heads", "Enable Report Book", - "View Status", "Edit Status", "Add Status", "Rename Status", "Remove Status", - "Status Name", "Status Material", "Status Color", "Status Description" + "View Status", "Edit Status", "Rename Status", "Remove Status", + "Status Name", "Status Material", "Status Color", "Status Description", "Status Selection", + "Delete Bug Report?", "Archive Bug Report?" }; for (String lang : languageTexts.keySet()) { diff --git a/src/main/java/com/leon/bugreport/BugReportManager.java b/src/main/java/com/leon/bugreport/BugReportManager.java index f6cb895..abc19d2 100644 --- a/src/main/java/com/leon/bugreport/BugReportManager.java +++ b/src/main/java/com/leon/bugreport/BugReportManager.java @@ -146,7 +146,7 @@ public static void checkConfig() { put("enableBugReportNotifications", true); put("discordEmbedTitle", "New Bug Report"); put("discordEmbedColor", "Yellow"); - put("discordEmbedFooter", "Bug Report V0.11.0"); + put("discordEmbedFooter", "Bug Report V0.11.1"); put("discordEmbedThumbnail", "https://www.spigotmc.org/data/resource_icons/110/110732.jpg"); put("discordEnableThumbnail", true); put("discordEnableUserAuthor", true); diff --git a/src/main/java/com/leon/bugreport/DefaultLanguageSelector.java b/src/main/java/com/leon/bugreport/DefaultLanguageSelector.java index 23502a0..e6db770 100644 --- a/src/main/java/com/leon/bugreport/DefaultLanguageSelector.java +++ b/src/main/java/com/leon/bugreport/DefaultLanguageSelector.java @@ -35,6 +35,18 @@ public class DefaultLanguageSelector { put("otherSettings", "Other Settings"); put("enableTitleMessage", "Enable Title Message"); put("enablePlayerHeads", "Enable Player Heads"); + put("enableReportBook", "Enable Report Book"); + put("viewStatus", "View Status"); + put("editStatus", "Edit Status"); + put("renameStatus", "Rename Status"); + put("removeStatus", "Remove Status"); + put("statusName", "Status Name"); + put("statusMaterial", "Status Material"); + put("statusColor", "Status Color"); + put("statusDescription", "Status Description"); + put("statusSelection", "Status Selection"); + put("confirmationDelete", "Delete Bug Report?"); + put("confirmationArchive", "Archive Bug Report?"); put("missingValueMessage", "Missing '%key%' in reportCategories in config.yml"); put("missingReportCategoryMessage", "Missing reportCategories in config.yml"); put("wentWrongLoadingCategoriesMessage", "Something went wrong while loading the report categories"); diff --git a/src/main/java/com/leon/bugreport/discord/LinkDiscord.java b/src/main/java/com/leon/bugreport/discord/LinkDiscord.java index c66ae44..a86a137 100644 --- a/src/main/java/com/leon/bugreport/discord/LinkDiscord.java +++ b/src/main/java/com/leon/bugreport/discord/LinkDiscord.java @@ -15,7 +15,7 @@ public class LinkDiscord { private static final String EMBED_TITLE = "New Bug Report"; - private static final String EMBED_FOOTER_TEXT = "Bug Report V0.11.0"; + private static final String EMBED_FOOTER_TEXT = "Bug Report V0.11.1"; private static final String EMBED_THUMBNAIL = "https://www.spigotmc.org/data/resource_icons/110/110732.jpg"; private static final String EMBED_AUTHOR = "true"; private static final String EMBED_DATE = "true"; @@ -95,7 +95,7 @@ public void sendBugReport(String message, String world, String username, String connection.setRequestMethod("GET"); connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("User-Agent", "BugReport/0.11.0"); + connection.setRequestProperty("User-Agent", "BugReport/0.11.1"); connection.setConnectTimeout(5000); connection.setReadTimeout(5000); connection.setDoOutput(true); diff --git a/src/main/java/com/leon/bugreport/gui/BugReportConfirmationGUI.java b/src/main/java/com/leon/bugreport/gui/BugReportConfirmationGUI.java index 3ce5a43..03613c7 100644 --- a/src/main/java/com/leon/bugreport/gui/BugReportConfirmationGUI.java +++ b/src/main/java/com/leon/bugreport/gui/BugReportConfirmationGUI.java @@ -81,8 +81,10 @@ public void onInventoryClick(@NotNull InventoryClickEvent event) { if (BugReportManager.debugMode) plugin.getLogger().info("Clicked inventory: " + TitleText); - boolean isArchivedDetails = TitleText.startsWith("Archive Bug Report?"); - boolean isDeletedDetails = TitleText.startsWith("Delete Bug Report?"); + String englishTitle = BugReportLanguage.getEnglishVersionFromLanguage(TitleText); + + boolean isArchivedDetails = englishTitle.startsWith("Archive Bug Report?"); + boolean isDeletedDetails = englishTitle.startsWith("Delete Bug Report?"); if (!isArchivedDetails && !isDeletedDetails) { return; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index afd96e3..22c83f3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -12,7 +12,7 @@ enableBugReportNotifications: true # Gold, Gray, Green, Light_Purple, Red, White, Yellow discordEmbedColor: Green discordEmbedTitle: New Bug Report -discordEmbedFooter: Bug Report v0.11.0 +discordEmbedFooter: Bug Report v0.11.1 discordEmbedThumbnail: https://www.spigotmc.org/data/resource_icons/110/110732.jpg discordEnableThumbnail: true discordEnableUserAuthor: true @@ -91,4 +91,4 @@ statuses: description: Report is ignored icon: minecraft:white_dye color: WHITE - id: 4 \ No newline at end of file + id: 4 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index fd4b655..db38cc9 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: BugReport -version: 0.11.0 +version: 0.11.1 main: com.leon.bugreport.BugReportPlugin api-version: 1.13 author: ItsLeon15