From 4dacb4532fec4f8dd5eefd23c54479c8afadf8b5 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Tue, 21 May 2024 05:03:52 -0400
Subject: [PATCH] Clean up a few warnings, update library
---
core/pom.xml | 2 +-
.../java/me/pikamug/quests/BukkitQuestsPlugin.java | 2 +-
.../quests/commands/BukkitQuestsSubCommand.java | 2 +-
.../quests/convo/actions/menu/ActionMenuPrompt.java | 2 +-
.../convo/conditions/menu/ConditionMenuPrompt.java | 2 +-
.../quests/convo/quests/menu/QuestMenuPrompt.java | 2 +-
.../quests/listeners/BukkitPartiesListener.java | 6 +++---
.../quests/listeners/BukkitUniteListener.java | 12 ++++++------
.../java/me/pikamug/quests/player/BukkitQuester.java | 6 +++---
.../java/me/pikamug/quests/quests/BukkitQuest.java | 2 +-
.../java/me/pikamug/quests/util/BukkitItemUtil.java | 4 ++--
.../main/java/me/pikamug/quests/util/BukkitLang.java | 2 +-
.../java/me/pikamug/quests/util/BukkitMiscUtil.java | 4 ++--
13 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 766fc1dbd..e154f489f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -171,7 +171,7 @@
de.tr7zw
item-nbt-api-plugin
- 2.12.3
+ 2.12.4
xyz.upperlevel.spigot.book
diff --git a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
index c3d6aea29..b8686cb57 100644
--- a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
+++ b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
@@ -592,7 +592,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
*/
@Override
public void saveResourceAs(String resourcePath, final String outputPath, final boolean replace) {
- if (resourcePath == null || resourcePath.equals("")) {
+ if (resourcePath == null || resourcePath.isEmpty()) {
throw new IllegalArgumentException("ResourcePath cannot be null or empty");
}
diff --git a/core/src/main/java/me/pikamug/quests/commands/BukkitQuestsSubCommand.java b/core/src/main/java/me/pikamug/quests/commands/BukkitQuestsSubCommand.java
index 38e5ba59c..cbfa6a13c 100644
--- a/core/src/main/java/me/pikamug/quests/commands/BukkitQuestsSubCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/BukkitQuestsSubCommand.java
@@ -127,7 +127,7 @@ public abstract class BukkitQuestsSubCommand {
s.append(args[i]).append(delimiter);
}
s = new StringBuilder(s.substring(0, s.length()));
- return s.toString().trim().equals("") ? null : s.toString().trim();
+ return s.toString().trim().isEmpty() ? null : s.toString().trim();
}
public static Map sort(final Map unsortedMap) {
diff --git a/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java b/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
index 808dfc158..3a507a5e8 100644
--- a/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
+++ b/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
@@ -199,7 +199,7 @@ public class ActionMenuPrompt extends ActionsEditorNumericPrompt {
context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questEditorInvalidQuestName"));
return new ActionSelectCreatePrompt(context);
}
- if (input.equals("")) {
+ if (input.isEmpty()) {
context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("itemCreateInvalidInput"));
return new ActionSelectCreatePrompt(context);
}
diff --git a/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java b/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
index eaf1745d7..ea92b792d 100644
--- a/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
+++ b/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
@@ -198,7 +198,7 @@ public class ConditionMenuPrompt extends ConditionsEditorNumericPrompt {
context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questEditorInvalidQuestName"));
return new ConditionSelectCreatePrompt(context);
}
- if (input.equals("")) {
+ if (input.isEmpty()) {
context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("itemCreateInvalidInput"));
return new ConditionSelectCreatePrompt(context);
}
diff --git a/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java b/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
index c58baa112..8f7de173e 100644
--- a/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
+++ b/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
@@ -182,7 +182,7 @@ public class QuestMenuPrompt extends QuestsEditorNumericPrompt {
context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questEditorInvalidQuestName"));
return new QuestSelectCreatePrompt(context);
}
- if (input.equals("")) {
+ if (input.isEmpty()) {
context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("itemCreateInvalidInput"));
return new QuestSelectCreatePrompt(context);
}
diff --git a/core/src/main/java/me/pikamug/quests/listeners/BukkitPartiesListener.java b/core/src/main/java/me/pikamug/quests/listeners/BukkitPartiesListener.java
index ee4356858..52875c0a3 100644
--- a/core/src/main/java/me/pikamug/quests/listeners/BukkitPartiesListener.java
+++ b/core/src/main/java/me/pikamug/quests/listeners/BukkitPartiesListener.java
@@ -29,7 +29,7 @@ public class BukkitPartiesListener implements Listener {
if (event.getCreator() != null) {
final Player p = Bukkit.getServer().getPlayer(event.getCreator().getPlayerUUID());
if (p != null) {
- if (BukkitLang.get("questPartiesCreate").length() > 0) {
+ if (!BukkitLang.get("questPartiesCreate").isEmpty()) {
BukkitLang.send(p, ChatColor.YELLOW + BukkitLang.get("questPartiesCreate"));
}
}
@@ -39,7 +39,7 @@ public class BukkitPartiesListener implements Listener {
@EventHandler
public void onPlayerJoinEvent(final BukkitPartiesPlayerPostJoinEvent event) {
final Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
- if (p != null && BukkitLang.get("questPartiesLeave").length() > 0) {
+ if (p != null && !BukkitLang.get("questPartiesLeave").isEmpty()) {
BukkitLang.send(p, ChatColor.GREEN + BukkitLang.get(p, "questPartiesJoin"));
event.getParty().broadcastMessage(ChatColor.GREEN + BukkitLang.get("questPartiesJoinBroadcast")
.replace("", event.getPartyPlayer().getName()), event.getPartyPlayer());
@@ -49,7 +49,7 @@ public class BukkitPartiesListener implements Listener {
@EventHandler
public void onPlayerLeaveEvent(final BukkitPartiesPlayerPostLeaveEvent event) {
final Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
- if (p != null && BukkitLang.get("questPartiesLeave").length() > 0) {
+ if (p != null && !BukkitLang.get("questPartiesLeave").isEmpty()) {
BukkitLang.send(p, ChatColor.RED + BukkitLang.get(p, "questPartiesLeave"));
event.getParty().broadcastMessage(ChatColor.RED + BukkitLang.get("questPartiesLeaveBroadcast")
.replace("", event.getPartyPlayer().getName()), event.getPartyPlayer());
diff --git a/core/src/main/java/me/pikamug/quests/listeners/BukkitUniteListener.java b/core/src/main/java/me/pikamug/quests/listeners/BukkitUniteListener.java
index 41f30fb69..948578202 100644
--- a/core/src/main/java/me/pikamug/quests/listeners/BukkitUniteListener.java
+++ b/core/src/main/java/me/pikamug/quests/listeners/BukkitUniteListener.java
@@ -28,7 +28,7 @@ public class BukkitUniteListener implements Listener {
if (event.getCreator() != null) {
final Player p = Bukkit.getServer().getPlayer(event.getCreator());
if (p != null) {
- if (BukkitLang.get("questPartiesCreate").length() > 0) {
+ if (!BukkitLang.get("questPartiesCreate").isEmpty()) {
BukkitLang.send(p, ChatColor.YELLOW + BukkitLang.get("questPartiesCreate"));
}
}
@@ -40,7 +40,7 @@ public class BukkitUniteListener implements Listener {
if (event.getDisbander() != null) {
final Player p = Bukkit.getServer().getPlayer(event.getDisbander());
if (p != null) {
- if (BukkitLang.get("questPartiesDelete").length() > 0) {
+ if (!BukkitLang.get("questPartiesDelete").isEmpty()) {
BukkitLang.send(p, ChatColor.RED + BukkitLang.get("questPartiesDelete"));
}
}
@@ -50,9 +50,9 @@ public class BukkitUniteListener implements Listener {
@EventHandler
public void onPlayerJoinEvent(final PartyJoinEvent event) {
final Player p = Bukkit.getServer().getPlayer(event.getPlayer());
- if (p != null && BukkitLang.get("questPartiesLeave").length() > 0) {
+ if (p != null && !BukkitLang.get("questPartiesLeave").isEmpty()) {
BukkitLang.send(p, ChatColor.GREEN + BukkitLang.get(p, "questPartiesJoin"));
- if (BukkitLang.get("questPartiesJoinBroadcast").length() > 0) {
+ if (!BukkitLang.get("questPartiesJoinBroadcast").isEmpty()) {
for (final Player online : Bukkit.getOnlinePlayers()) {
if (event.getPlayer().equals(online.getUniqueId())) {
continue;
@@ -69,9 +69,9 @@ public class BukkitUniteListener implements Listener {
@EventHandler
public void onPlayerLeaveEvent(final PartyLeaveEvent event) {
final Player p = Bukkit.getServer().getPlayer(event.getPlayer());
- if (p != null && BukkitLang.get("questPartiesLeave").length() > 0) {
+ if (p != null && !BukkitLang.get("questPartiesLeave").isEmpty()) {
BukkitLang.send(p, ChatColor.RED + BukkitLang.get(p, "questPartiesLeave"));
- if (BukkitLang.get("questPartiesLeaveBroadcast").length() > 0) {
+ if (!BukkitLang.get("questPartiesLeaveBroadcast").isEmpty()) {
for (final Player online : Bukkit.getOnlinePlayers()) {
if (event.getPlayer().equals(online.getUniqueId())) {
continue;
diff --git a/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java b/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
index 361f66884..68607e40d 100644
--- a/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
+++ b/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
@@ -896,7 +896,7 @@ public class BukkitQuester implements Quester {
plugin.getLogger().info(getOfflinePlayer().getUniqueId() + " quit quest " + quest.getName());
}
for (final String message : messages) {
- if (message != null && !message.equals("") && getOfflinePlayer().isOnline()) {
+ if (message != null && !message.isEmpty() && getOfflinePlayer().isOnline()) {
sendMessage(message);
}
}
@@ -1582,7 +1582,7 @@ public class BukkitQuester implements Quester {
}
if (!ignoreOverrides && !stage.getObjectiveOverrides().isEmpty()) {
for (final String s: stage.getObjectiveOverrides()) {
- String message = (s.trim().length() > 0 ? "- " : "") + ChatColor.GREEN + BukkitConfigUtil
+ String message = (!s.trim().isEmpty() ? "- " : "") + ChatColor.GREEN + BukkitConfigUtil
.parseString(s, quest, quester.getPlayer());
if (plugin.getDependencies().getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);
@@ -4321,7 +4321,7 @@ public class BukkitQuester implements Quester {
index = 0;
}
}
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
final Quest quest = plugin.getQuestById(list.get(index));
compassTargetQuestId = quest.getId();
final Stage stage = getCurrentStage(quest);
diff --git a/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java b/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
index d1e1d3ee6..3001b2624 100644
--- a/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
+++ b/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
@@ -995,7 +995,7 @@ public class BukkitQuest implements Quest {
for (final String s : rewards.getCommands()) {
if (!rewards.getCommandsOverrideDisplay().isEmpty()
&& rewards.getCommandsOverrideDisplay().size() > index) {
- if (!rewards.getCommandsOverrideDisplay().get(index).trim().equals("")) {
+ if (!rewards.getCommandsOverrideDisplay().get(index).trim().isEmpty()) {
quester.sendMessage("- " + ChatColor.DARK_GREEN
+ rewards.getCommandsOverrideDisplay().get(index));
}
diff --git a/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java b/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
index 6e4d4c84e..3f62e2adc 100644
--- a/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
+++ b/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
@@ -273,7 +273,7 @@ public class BukkitItemUtil {
final EnchantmentStorageMeta esMeta;
for (final String targ : args) {
final String arg = targ.replace("minecraft|", "minecraft:");
- if (arg.equals("")) {
+ if (arg.isEmpty()) {
continue;
}
if (arg.startsWith("name-")) {
@@ -429,7 +429,7 @@ public class BukkitItemUtil {
meta.setLore(lore);
}
for (final String flag : flags) {
- if (flag != null && !flag.equals("")) {
+ if (flag != null && !flag.isEmpty()) {
try {
meta.addItemFlags(ItemFlag.valueOf(flag));
} catch (final NullPointerException npe) {
diff --git a/core/src/main/java/me/pikamug/quests/util/BukkitLang.java b/core/src/main/java/me/pikamug/quests/util/BukkitLang.java
index f9590fd06..7b0456854 100644
--- a/core/src/main/java/me/pikamug/quests/util/BukkitLang.java
+++ b/core/src/main/java/me/pikamug/quests/util/BukkitLang.java
@@ -180,7 +180,7 @@ public class BukkitLang {
* @param message The message to be sent
*/
public static void send(final Player player, final String message) {
- if (message != null && !ChatColor.stripColor(message).equals("")) {
+ if (message != null && !ChatColor.stripColor(message).isEmpty()) {
player.sendMessage(message);
}
}
diff --git a/core/src/main/java/me/pikamug/quests/util/BukkitMiscUtil.java b/core/src/main/java/me/pikamug/quests/util/BukkitMiscUtil.java
index 468201e6b..6ba5cce53 100644
--- a/core/src/main/java/me/pikamug/quests/util/BukkitMiscUtil.java
+++ b/core/src/main/java/me/pikamug/quests/util/BukkitMiscUtil.java
@@ -69,7 +69,7 @@ public class BukkitMiscUtil {
}
}
}
- if (message.length() > 0) {
+ if (!message.isEmpty()) {
message = message.substring(1, message.length() - 1);
} else {
message = "-1 " + BukkitLang.get("timeSeconds");
@@ -260,7 +260,7 @@ public class BukkitMiscUtil {
currentLength += piece.length() + 1;
}
}
- if (!line.toString().equals(""))
+ if (!line.toString().isEmpty())
if (lineColor != null) {
toReturn.add(lineColor + line.toString());
} else {