diff --git a/src/main/java/net/minestom/server/UpdateManager.java b/src/main/java/net/minestom/server/UpdateManager.java index b7f84c9e9..0d4982305 100644 --- a/src/main/java/net/minestom/server/UpdateManager.java +++ b/src/main/java/net/minestom/server/UpdateManager.java @@ -1,5 +1,6 @@ package net.minestom.server; +import com.google.common.collect.Queues; import net.minestom.server.entity.EntityManager; import net.minestom.server.instance.Instance; import net.minestom.server.instance.InstanceManager; @@ -9,7 +10,11 @@ import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; import java.util.List; -import java.util.concurrent.*; +import java.util.Queue; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import java.util.function.LongConsumer; /** @@ -26,8 +31,8 @@ public final class UpdateManager { private ThreadProvider threadProvider; - private final ConcurrentLinkedQueue tickStartCallbacks = new ConcurrentLinkedQueue<>(); - private final ConcurrentLinkedQueue tickEndCallbacks = new ConcurrentLinkedQueue<>(); + private final Queue tickStartCallbacks = Queues.newConcurrentLinkedQueue(); + private final Queue tickEndCallbacks = Queues.newConcurrentLinkedQueue(); { // DEFAULT THREAD PROVIDER @@ -106,7 +111,7 @@ public final class UpdateManager { * @param callbacks the callbacks to execute * @param value the value to give to the consumers */ - private void doTickCallback(ConcurrentLinkedQueue callbacks, long value) { + private void doTickCallback(Queue callbacks, long value) { if (!callbacks.isEmpty()) { LongConsumer callback; while ((callback = callbacks.poll()) != null) { diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index 5eaaa3ae1..2fd03d444 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -1,5 +1,6 @@ package net.minestom.server.entity; +import com.google.common.collect.Queues; import net.minestom.server.MinecraftServer; import net.minestom.server.Viewable; import net.minestom.server.chat.ColoredText; @@ -40,7 +41,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; @@ -132,7 +132,7 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P protected Pose pose = Pose.STANDING; // list of scheduled tasks to be executed during the next entity tick - protected final ConcurrentLinkedQueue> nextTick = new ConcurrentLinkedQueue<>(); + protected final Queue> nextTick = Queues.newConcurrentLinkedQueue(); // Tick related private long ticks; diff --git a/src/main/java/net/minestom/server/entity/EntityManager.java b/src/main/java/net/minestom/server/entity/EntityManager.java index 97b48c88c..ef9683b01 100644 --- a/src/main/java/net/minestom/server/entity/EntityManager.java +++ b/src/main/java/net/minestom/server/entity/EntityManager.java @@ -1,5 +1,6 @@ package net.minestom.server.entity; +import com.google.common.collect.Queues; import net.minestom.server.MinecraftServer; import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ColoredText; @@ -11,8 +12,8 @@ import net.minestom.server.network.packet.server.play.KeepAlivePacket; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; +import java.util.Queue; import java.util.UUID; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Consumer; public final class EntityManager { @@ -23,7 +24,7 @@ public final class EntityManager { private static final long KEEP_ALIVE_KICK = 30_000; private static final ColoredText TIMEOUT_TEXT = ColoredText.of(ChatColor.RED + "Timeout"); - private final ConcurrentLinkedQueue waitingPlayers = new ConcurrentLinkedQueue<>(); + private final Queue waitingPlayers = Queues.newConcurrentLinkedQueue(); /** * Connects waiting players. diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index 1c0e0bd05..6fe926f4b 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -1,5 +1,6 @@ package net.minestom.server.entity; +import com.google.common.collect.Queues; import net.minestom.server.MinecraftServer; import net.minestom.server.advancements.AdvancementTab; import net.minestom.server.attribute.Attribute; @@ -65,7 +66,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; @@ -134,7 +134,7 @@ public class Player extends LivingEntity implements CommandSender { private final AtomicInteger teleportId = new AtomicInteger(); protected boolean onGround; - private final ConcurrentLinkedQueue packets = new ConcurrentLinkedQueue<>(); + private final Queue packets = Queues.newConcurrentLinkedQueue(); private final boolean levelFlat; private final PlayerSettings settings; private float exp; diff --git a/src/main/java/net/minestom/server/instance/Instance.java b/src/main/java/net/minestom/server/instance/Instance.java index 3036c4b27..c8b6ebbd8 100644 --- a/src/main/java/net/minestom/server/instance/Instance.java +++ b/src/main/java/net/minestom/server/instance/Instance.java @@ -1,5 +1,6 @@ package net.minestom.server.instance; +import com.google.common.collect.Queues; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMaps; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; @@ -39,7 +40,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CopyOnWriteArraySet; import java.util.function.Consumer; @@ -93,7 +93,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta protected UUID uniqueId; // list of scheduled tasks to be executed during the next instance tick - protected final ConcurrentLinkedQueue> nextTick = new ConcurrentLinkedQueue<>(); + protected final Queue> nextTick = Queues.newConcurrentLinkedQueue(); // instance custom data private Data data; diff --git a/src/main/java/net/minestom/server/scoreboard/Sidebar.java b/src/main/java/net/minestom/server/scoreboard/Sidebar.java index 8d130d777..d7d38d767 100644 --- a/src/main/java/net/minestom/server/scoreboard/Sidebar.java +++ b/src/main/java/net/minestom/server/scoreboard/Sidebar.java @@ -1,5 +1,6 @@ package net.minestom.server.scoreboard; +import com.google.common.collect.Queues; import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet; import net.minestom.server.chat.ChatParser; import net.minestom.server.chat.ColoredText; @@ -13,8 +14,8 @@ import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; import java.util.Iterator; +import java.util.Queue; import java.util.Set; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicInteger; @@ -45,7 +46,7 @@ public class Sidebar implements Scoreboard { private final Set viewers = new CopyOnWriteArraySet<>(); - private final ConcurrentLinkedQueue lines = new ConcurrentLinkedQueue<>(); + private final Queue lines = Queues.newConcurrentLinkedQueue(); private final IntLinkedOpenHashSet availableColors = new IntLinkedOpenHashSet(); private final String objectiveName;