diff --git a/pom.xml b/pom.xml
index 8dd4dd4..9c312e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
com.destroystokyo.paper
paper-api
- 1.14.1-R0.1-SNAPSHOT
+ 1.14.2-R0.1-SNAPSHOT
diff --git a/src/main/java/com/alttd/altitudeapi/commands/CommandArgumentBuilder.java b/src/main/java/com/alttd/altitudeapi/commands/CommandArgumentBuilder.java
index 5f35af1..7500415 100644
--- a/src/main/java/com/alttd/altitudeapi/commands/CommandArgumentBuilder.java
+++ b/src/main/java/com/alttd/altitudeapi/commands/CommandArgumentBuilder.java
@@ -133,7 +133,7 @@ public class CommandArgumentBuilder
public static CommandArgumentBuilder createBuilder(Class type)
{
- return new CommandArgumentBuilder();
+ return new CommandArgumentBuilder<>();
}
}
diff --git a/src/main/java/com/alttd/altitudeapi/commands/ValidBaseCommand.java b/src/main/java/com/alttd/altitudeapi/commands/ValidBaseCommand.java
index f5e4f24..6fb40f8 100644
--- a/src/main/java/com/alttd/altitudeapi/commands/ValidBaseCommand.java
+++ b/src/main/java/com/alttd/altitudeapi/commands/ValidBaseCommand.java
@@ -170,7 +170,7 @@ public abstract class ValidBaseCommand extends ValidCommand
* @param sender the sender of the command.
* @param label the labels that this command has.
*/
- public void help(CommandSender sender, String label[])
+ public void help(CommandSender sender, String[] label)
{
List allowedSubs = new LinkedList<>();
for (ValidCommand sub : subCommands)
diff --git a/src/main/java/com/alttd/altitudeapi/commands/ValidCommand.java b/src/main/java/com/alttd/altitudeapi/commands/ValidCommand.java
index 53d1e1f..1550ffc 100644
--- a/src/main/java/com/alttd/altitudeapi/commands/ValidCommand.java
+++ b/src/main/java/com/alttd/altitudeapi/commands/ValidCommand.java
@@ -261,7 +261,7 @@ public abstract class ValidCommand
}
else
{
- return Arrays.asList();
+ return Collections.emptyList();
}
}
else
@@ -473,11 +473,11 @@ public abstract class ValidCommand
*/
protected boolean matches(String label)
{
- label = label.toLowerCase();
if (label == null)
{
return false;
}
+ label = label.toLowerCase();
if (label.equals(getName()))
{
return true;
diff --git a/src/main/java/com/alttd/altitudeapi/utils/CollectionUtils.java b/src/main/java/com/alttd/altitudeapi/utils/CollectionUtils.java
index 668d0a0..c63677a 100644
--- a/src/main/java/com/alttd/altitudeapi/utils/CollectionUtils.java
+++ b/src/main/java/com/alttd/altitudeapi/utils/CollectionUtils.java
@@ -198,7 +198,7 @@ public class CollectionUtils
*/
public static T randomValue(Collection collection)
{
- return randomValue(collection, null);
+ return randomValue(collection, (T) null);
}
/**
@@ -210,6 +210,7 @@ public class CollectionUtils
*
* @return a random value from the collection.
*/
+ @SafeVarargs
public static T randomValue(Collection collection, T... ignored)
{
// if it's null or empty, we don't care
diff --git a/src/main/java/com/alttd/altitudeapi/utils/StringUtils.java b/src/main/java/com/alttd/altitudeapi/utils/StringUtils.java
index 70882d1..381d955 100644
--- a/src/main/java/com/alttd/altitudeapi/utils/StringUtils.java
+++ b/src/main/java/com/alttd/altitudeapi/utils/StringUtils.java
@@ -11,7 +11,7 @@ public class StringUtils
for (int i = start; i < end; i++)
{
- sb.append(strings[i] + " ");
+ sb.append(strings[i]).append(" ");
}
return sb.toString().trim();
@@ -20,10 +20,7 @@ public class StringUtils
public static String[] add(String[] array, String add)
{
String[] values = new String[array.length + 1];
- for (int i = 0; i < array.length; i++)
- {
- values[i] = array[i];
- }
+ System.arraycopy(array, 0, values, 0, array.length);
values[array.length] = add;
return values;
}
@@ -49,11 +46,11 @@ public class StringUtils
return str;
}
- final int newCodePoints[] = new int[strLen]; // cannot be longer than
+ final int[] newCodePoints = new int[strLen]; // cannot be longer than
// the char array
int outOffset = 0;
newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint
- for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen;)
+ for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen; )
{
final int codepoint = str.codePointAt(inOffset);
newCodePoints[outOffset++] = codepoint; // copy the remaining ones
diff --git a/src/main/java/com/alttd/altitudeapi/utils/items/ItemDb.java b/src/main/java/com/alttd/altitudeapi/utils/items/ItemDb.java
index 569fff8..9f8b79f 100644
--- a/src/main/java/com/alttd/altitudeapi/utils/items/ItemDb.java
+++ b/src/main/java/com/alttd/altitudeapi/utils/items/ItemDb.java
@@ -259,15 +259,11 @@ public class ItemDb
try (final BufferedReader reader = new BufferedReader(new FileReader(file)))
{
final List lines = new ArrayList<>(9000);
- String line = null;
- do
+ String line;
+ while ((line = reader.readLine()) != null)
{
- if ((line = reader.readLine()) == null)
- {
- break;
- }
lines.add(line);
- } while (true);
+ }
return lines;
}
catch (IOException ex)