Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2026-06-04 21:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Uplift Paper version to 26.1.2

Browse Source 
Upgraded Gradle to 9.5.1

Updated deprecated functions

General code clean up
This commit is contained in:
ncurran02
2026-05-13 18:09:51 +10:00
parent bea8f86300
commit 1a1719290f
109 changed files with 364 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/java/dev/plex/util/BlockUtils.java
+9 -9
View File
@@ -8,14 +8,14 @@ public class BlockUtils
public static Location relative(Location origin, BlockFace face)
{
return switch (face)
{
case UP -> origin.add(0, 1, 0);
case DOWN -> origin.subtract(0, 1, 0);
case NORTH -> origin.subtract(0, 0, 1);
case SOUTH -> origin.add(0, 0, 1);
case WEST -> origin.subtract(1, 0, 0);
case EAST -> origin.add(1, 0, 0);
default -> origin.add(face.getModX(), face.getModY(), face.getModZ());
};
{
case UP -> origin.add(0, 1, 0);
case DOWN -> origin.subtract(0, 1, 0);
case NORTH -> origin.subtract(0, 0, 1);
case SOUTH -> origin.add(0, 0, 1);
case WEST -> origin.subtract(1, 0, 0);
case EAST -> origin.add(1, 0, 0);
default -> origin.add(face.getModX(), face.getModY(), face.getModZ());
};
}
}
server/src/main/java/dev/plex/util/BuildInfo.java
+2
View File
@@ -1,8 +1,10 @@
package dev.plex.util;
import dev.plex.Plex;
import java.io.InputStream;
import java.util.Properties;
import lombok.Getter;
public class BuildInfo
server/src/main/java/dev/plex/util/PlexLog.java
+16 -4
View File
@@ -13,7 +13,10 @@ public class PlexLog
{
for (int i = 0; i < strings.length; i++)
{
if (strings[i] == null) continue;
if (strings[i] == null)
{
continue;
}
if (message.contains("{" + i + "}"))
{
message = message.replace("{" + i + "}", strings[i].toString());
@@ -31,7 +34,10 @@ public class PlexLog
{
for (int i = 0; i < strings.length; i++)
{
if (strings[i] == null) continue;
if (strings[i] == null)
{
continue;
}
if (message.contains("{" + i + "}"))
{
message = message.replace("{" + i + "}", strings[i].toString());
@@ -44,7 +50,10 @@ public class PlexLog
{
for (int i = 0; i < strings.length; i++)
{
if (strings[i] == null) continue;
if (strings[i] == null)
{
continue;
}
if (message.contains("{" + i + "}"))
{
message = message.replace("{" + i + "}", strings[i].toString());
@@ -59,7 +68,10 @@ public class PlexLog
{
for (int i = 0; i < strings.length; i++)
{
if (strings[i] == null) continue;
if (strings[i] == null)
{
continue;
}
if (message.contains("{" + i + "}"))
{
message = message.replace("{" + i + "}", strings[i].toString());
server/src/main/java/dev/plex/util/PlexUtils.java
+3 -1
View File
@@ -7,6 +7,7 @@ import dev.plex.PlexBase;
import dev.plex.listener.impl.ChatListener;
import dev.plex.storage.StorageType;
import dev.plex.util.minimessage.SafeMiniMessage;
import java.sql.Connection;
import java.sql.SQLException;
import java.time.Month;
@@ -18,6 +19,7 @@ import java.util.Stack;
import java.util.UUID;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.TextDecoration;
@@ -133,7 +135,7 @@ public class PlexUtils implements PlexBase
List<Command> cmds = PluginCommandYamlParser.parse(plugin);
for (Command pluginCmd : cmds)
{
List<String> cmdAliases = pluginCmd.getAliases().size() > 0 ? pluginCmd.getAliases().stream().map(String::toLowerCase).toList() : null;
List<String> cmdAliases = !pluginCmd.getAliases().isEmpty() ? pluginCmd.getAliases().stream().map(String::toLowerCase).toList() : null;
if (pluginCmd.getName().equalsIgnoreCase(cmd) || (cmdAliases != null && cmdAliases.contains(cmd.toLowerCase())))
{
return true;
server/src/main/java/dev/plex/util/RandomUtil.java
+1
View File
@@ -1,6 +1,7 @@
package dev.plex.util;
import java.util.concurrent.ThreadLocalRandom;
import net.kyori.adventure.text.format.NamedTextColor;
public class RandomUtil
server/src/main/java/dev/plex/util/ReflectionsUtil.java
+1
View File
@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.ClassPath;
import com.google.common.reflect.TypeToken;
import dev.plex.Plex;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
server/src/main/java/dev/plex/util/TimeUtils.java
+2
View File
@@ -1,6 +1,7 @@
package dev.plex.util;
import dev.plex.Plex;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
@@ -10,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TimeZone;
import org.apache.commons.lang3.math.NumberUtils;
public class TimeUtils
server/src/main/java/dev/plex/util/UpdateChecker.java
+13 -12
View File
@@ -1,20 +1,21 @@
package dev.plex.util;
import com.google.common.base.Charsets;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonSyntaxException;
import dev.plex.PlexBase;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nonnull;
import lombok.NonNull;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.apache.commons.io.FileUtils;
@@ -44,11 +45,11 @@ public class UpdateChecker implements PlexBase
private int distance = -4;
// Adapted from Paper
private int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash)
private int fetchDistanceFromGitHub(@NonNull String repo, @NonNull String branch, @NonNull String hash)
{
try
{
HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection();
HttpURLConnection connection = (HttpURLConnection) URI.create("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).toURL().openConnection();
connection.connect();
if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND)
{
@@ -58,16 +59,16 @@ public class UpdateChecker implements PlexBase
{
return -3; // Rate limited likely
}
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8)))
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)))
{
JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
String status = obj.get("status").getAsString();
return switch (status)
{
case "identical" -> 0;
case "behind" -> obj.get("behind_by").getAsInt();
default -> -1;
};
{
case "identical" -> 0;
case "behind" -> obj.get("behind_by").getAsInt();
default -> -1;
};
}
catch (JsonSyntaxException | NumberFormatException e)
{
@@ -186,7 +187,7 @@ public class UpdateChecker implements PlexBase
try
{
FileUtils.copyURLToFile(
new URL(url + "/lastSuccessfulBuild/artifact/build/libs/" + jarFile),
URI.create(url + "/lastSuccessfulBuild/artifact/build/libs/" + jarFile).toURL(),
copyTo
);
sender.sendMessage(PlexUtils.mmDeserialize("<green>New JAR file downloaded successfully."));
server/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java
+1
View File
@@ -8,6 +8,7 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import dev.plex.Plex;
import java.lang.reflect.Type;
import java.time.Instant;
import java.time.ZoneId;
server/src/main/java/dev/plex/util/item/ItemBuilder.java
+2
View File
@@ -1,7 +1,9 @@
package dev.plex.util.item;
import dev.plex.util.minimessage.SafeMiniMessage;
import java.util.Arrays;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.Material;
server/src/main/java/dev/plex/util/minimessage/SafeMiniMessage.java
+2
View File
@@ -1,7 +1,9 @@
package dev.plex.util.minimessage;
import com.google.common.collect.ImmutableList;
import java.util.List;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.Context;
import net.kyori.adventure.text.minimessage.MiniMessage;
server/src/main/java/dev/plex/util/redis/MessageUtil.java
+3
View File
@@ -7,7 +7,9 @@ import dev.plex.hook.VaultHook;
import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils;
import dev.plex.util.minimessage.SafeMiniMessage;
import java.util.UUID;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@@ -15,6 +17,7 @@ import org.bukkit.entity.Player;
import org.json.JSONException;
import org.json.JSONObject;
import redis.clients.jedis.JedisPubSub;
import static dev.plex.util.PlexUtils.messageComponent;
public class MessageUtil
server/src/main/java/dev/plex/util/sql/SQLUtil.java
+2
View File
@@ -11,6 +11,7 @@ import dev.plex.storage.annotation.SQLTable;
import dev.plex.storage.annotation.VarcharLimit;
import dev.plex.util.PlexLog;
import dev.plex.util.ReflectionsUtil;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.time.ZonedDateTime;
@@ -20,6 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
server/src/main/java/dev/plex/util/sql/Table.java
+2
View File
@@ -1,8 +1,10 @@
package dev.plex.util.sql;
import com.google.common.collect.Maps;
import java.lang.reflect.Field;
import java.util.Map;
import lombok.Data;
import lombok.experimental.Accessors;