Skip to content

Commit

Permalink
Fixed two major bugs relating to the language selector.
Browse files Browse the repository at this point in the history
  • Loading branch information
Leon D authored and Leon D committed Apr 6, 2024
1 parent 40a2d99 commit 4a15053
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.leon.bugreport</groupId>
<artifactId>BugReports</artifactId>
<version>0.11.0</version>
<version>0.11.1</version>
<build>
<plugins>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.leon.bugreport</groupId>
<artifactId>BugReports</artifactId>
<version>0.11.0</version>
<version>0.11.1</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/leon/bugreport/BugReportLanguage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leon/bugreport/BugReportManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/leon/bugreport/DefaultLanguageSelector.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/leon/bugreport/discord/LinkDiscord.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -91,4 +91,4 @@ statuses:
description: Report is ignored
icon: minecraft:white_dye
color: WHITE
id: 4
id: 4
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 4a15053

Please sign in to comment.