diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55e5add..8f1ac0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Build with Maven verify run: ./mvnw -B verify diff --git a/pom.xml b/pom.xml index 6af7891..abc8a93 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ works.reload parent - 1.0.5 + 1.2.0 org.wensheng diff --git a/src/main/java/org/wensheng/juicyraspberrypie/RemoteSession.java b/src/main/java/org/wensheng/juicyraspberrypie/RemoteSession.java index ca528b5..a6d759b 100644 --- a/src/main/java/org/wensheng/juicyraspberrypie/RemoteSession.java +++ b/src/main/java/org/wensheng/juicyraspberrypie/RemoteSession.java @@ -52,6 +52,7 @@ import java.net.Socket; import java.nio.charset.StandardCharsets; import java.util.ArrayDeque; +import java.util.Deque; import java.util.logging.Level; import java.util.logging.Logger; @@ -76,9 +77,9 @@ class RemoteSession { @SuppressWarnings("PMD.DoNotUseThreads") private Thread outThread; - private final ArrayDeque inQueue = new ArrayDeque<>(); + private final Deque inQueue = new ArrayDeque<>(); - private final ArrayDeque outQueue = new ArrayDeque<>(); + private final Deque outQueue = new ArrayDeque<>(); private boolean running = true; @@ -256,6 +257,7 @@ private class OutputThread implements Runnable { public OutputThread() { } + @SuppressWarnings("PMD.DoNotUseThreads") @Override public void run() { logger.log(Level.INFO, "Starting output thread!"); diff --git a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/EventQueue.java b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/EventQueue.java index 84c6026..79d3658 100644 --- a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/EventQueue.java +++ b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/EventQueue.java @@ -6,6 +6,7 @@ import org.wensheng.juicyraspberrypie.command.Handler; import java.util.ArrayDeque; +import java.util.Deque; /** * An event queue for handling events. @@ -16,7 +17,7 @@ public abstract class EventQueue implements Handler, Listener { /** * The event queue. */ - private final ArrayDeque events = new ArrayDeque<>(); + private final Deque events = new ArrayDeque<>(); /** * The plugin to associate with this event queue. diff --git a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/block/Hits.java b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/block/Hits.java index 5d403fa..56043d1 100644 --- a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/block/Hits.java +++ b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/block/Hits.java @@ -47,11 +47,7 @@ public String handle(final Instruction instruction) { final Block block = event.getClickedBlock(); if (block != null) { final Location loc = block.getLocation(); - stringBuilder.append(getBlockLocation(loc)); - stringBuilder.append(','); - stringBuilder.append(event.getBlockFace().name()); - stringBuilder.append(','); - stringBuilder.append(event.getPlayer().getUniqueId()); + stringBuilder.append(getBlockLocation(loc)).append(',').append(event.getBlockFace().name()).append(',').append(event.getPlayer().getUniqueId()); } else { stringBuilder.append("0,0,0,Fail,0"); } diff --git a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/chat/Posts.java b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/chat/Posts.java index a4a0eb5..fe55747 100644 --- a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/chat/Posts.java +++ b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/chat/Posts.java @@ -27,11 +27,7 @@ public String handle(final Instruction instruction) { while (isQueueEmpty()) { final AsyncPlayerChatEvent event = pollEvent(); final Player player = event.getPlayer(); - stringBuilder.append(player.getName()); - stringBuilder.append(','); - stringBuilder.append(player.getUniqueId()); - stringBuilder.append(','); - stringBuilder.append(event.getMessage()); + stringBuilder.append(player.getName()).append(',').append(player.getUniqueId()).append(',').append(event.getMessage()); if (!isQueueEmpty()) { stringBuilder.append('|'); } diff --git a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/projectile/Hits.java b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/projectile/Hits.java index d541e13..49327ce 100644 --- a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/projectile/Hits.java +++ b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/events/projectile/Hits.java @@ -36,10 +36,7 @@ public String handle(final Instruction instruction) { if (player != null) { final Block block = arrow.getLocation().getBlock(); final Location loc = block.getLocation(); - stringBuilder.append(getBlockLocation(loc)); - stringBuilder.append(','); - stringBuilder.append(player.getUniqueId()); - stringBuilder.append(','); + stringBuilder.append(getBlockLocation(loc)).append(',').append(player.getUniqueId()).append(','); final Entity hitEntity = event.getHitEntity(); if (hitEntity != null) { stringBuilder.append(hitEntity.getUniqueId()); diff --git a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/world/GetPlayerIds.java b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/world/GetPlayerIds.java index 2f80576..235ecea 100644 --- a/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/world/GetPlayerIds.java +++ b/src/main/java/org/wensheng/juicyraspberrypie/command/handlers/world/GetPlayerIds.java @@ -27,10 +27,7 @@ public GetPlayerIds(final Server server) { public String handle(final Instruction instruction) { final StringBuilder bdr = new StringBuilder(); for (final Player p : server.getOnlinePlayers()) { - bdr.append(p.getName()); - bdr.append(','); - bdr.append(p.getUniqueId()); - bdr.append('|'); + bdr.append(p.getName()).append(',').append(p.getUniqueId()).append('|'); } if (!bdr.isEmpty()) { bdr.deleteCharAt(bdr.length() - 1);