Merge branch 'GeyserMC:master' into main

Author: Hellohi3654

connector/pom.xml

@@ -13,8 +13,8 @@
     <properties>
         <adventure.version>4.8.0</adventure.version>
         <fastutil.version>8.5.2</fastutil.version>
-        <jackson.version>2.10.2</jackson.version>
-        <netty.version>4.1.59.Final</netty.version>
+        <jackson.version>2.12.4</jackson.version>
+        <netty.version>4.1.66.Final</netty.version>
     </properties>
 
     <dependencies>
@@ -167,7 +167,7 @@
         <dependency>
             <groupId>com.github.GeyserMC</groupId>
             <artifactId>PacketLib</artifactId>
-            <version>25eb4c4</version>
+            <version>86c9c38</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java

@@ -30,7 +30,9 @@
 import com.nukkitx.protocol.bedrock.BedrockServerSession;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.DefaultEventLoopGroup;
 import io.netty.channel.socket.DatagramPacket;
+import io.netty.util.concurrent.DefaultThreadFactory;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.common.ping.GeyserPingInfo;
 import org.geysermc.connector.configuration.GeyserConfiguration;
@@ -56,6 +58,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
     private static final int MAGIC_RAKNET_LENGTH = 338;
 
     private final GeyserConnector connector;
+    private final DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(new DefaultThreadFactory("Geyser player thread"));
 
     public ConnectorServerEventHandler(GeyserConnector connector) {
         this.connector = connector;
@@ -162,7 +165,7 @@ public BedrockPong onQuery(InetSocketAddress inetSocketAddress) {
     public void onSessionCreation(BedrockServerSession bedrockServerSession) {
         bedrockServerSession.setLogging(true);
         bedrockServerSession.setCompressionLevel(connector.getConfig().getBedrock().getCompressionLevel());
-        bedrockServerSession.setPacketHandler(new UpstreamPacketHandler(connector, new GeyserSession(connector, bedrockServerSession)));
+        bedrockServerSession.setPacketHandler(new UpstreamPacketHandler(connector, new GeyserSession(connector, bedrockServerSession, eventLoopGroup.next())));
         // Set the packet codec to default just in case we need to send disconnect packets.
         bedrockServerSession.setPacketCodec(BedrockProtocol.DEFAULT_BEDROCK_CODEC);
     }

connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java

@@ -52,6 +52,11 @@ private boolean translateAndDefault(BedrockPacket packet) {
         return PacketTranslatorRegistry.BEDROCK_TRANSLATOR.translate(packet.getClass(), packet, session);
     }
 
+    @Override
+    boolean defaultHandler(BedrockPacket packet) {
+        return translateAndDefault(packet);
+    }
+
     @Override
     public boolean handle(LoginPacket loginPacket) {
         BedrockPacketCodec packetCodec = BedrockProtocol.getBedrockCodec(loginPacket.getProtocolVersion());
@@ -156,7 +161,7 @@ public boolean handle(ResourcePackClientResponsePacket packet) {
 
     @Override
     public boolean handle(ModalFormResponsePacket packet) {
-        session.getFormCache().handleResponse(packet);
+        session.getEventLoop().execute(() -> session.getFormCache().handleResponse(packet));
         return true;
     }
 
@@ -209,11 +214,6 @@ public boolean handle(MovePlayerPacket packet) {
         return translateAndDefault(packet);
     }
 
-    @Override
-    boolean defaultHandler(BedrockPacket packet) {
-        return translateAndDefault(packet);
-    }
-
     @Override
     public boolean handle(ResourcePackChunkRequestPacket packet) {
         ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket();

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -57,9 +57,9 @@
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
 import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
 import com.nukkitx.protocol.bedrock.packet.*;
+import io.netty.channel.EventLoop;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
@@ -102,14 +102,21 @@
 import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Getter
 public class GeyserSession implements CommandSender {
 
     private final GeyserConnector connector;
     private final UpstreamSession upstream;
+    /**
+     * The loop where all packets and ticking is processed to prevent concurrency issues.
+     */
+    private final EventLoop eventLoop;
     private TcpClientSession downstream;
     @Setter
     private AuthData authData;
@@ -158,11 +165,6 @@ public class GeyserSession implements CommandSender {
     @Getter(AccessLevel.NONE)
     private final AtomicInteger itemNetId = new AtomicInteger(2);
 
-    @Getter(AccessLevel.NONE)
-    private final Object inventoryLock = new Object();
-    @Getter(AccessLevel.NONE)
-    private CompletableFuture<Void> inventoryFuture;
-
     @Setter
     private ScheduledFuture<?> craftingGridFuture;
 
@@ -183,8 +185,8 @@ public class GeyserSession implements CommandSender {
     @Setter
     private ItemMappings itemMappings;
 
-    private final Map<Vector3i, SkullPlayerEntity> skullCache = new ConcurrentHashMap<>();
-    private final Long2ObjectMap<ClientboundMapItemDataPacket> storedMaps = Long2ObjectMaps.synchronize(new Long2ObjectOpenHashMap<>());
+    private final Map<Vector3i, SkullPlayerEntity> skullCache = new Object2ObjectOpenHashMap<>();
+    private final Long2ObjectMap<ClientboundMapItemDataPacket> storedMaps = new Long2ObjectOpenHashMap<>();
 
     /**
      * Stores the map between Java and Bedrock biome network IDs.
@@ -426,9 +428,10 @@ public class GeyserSession implements CommandSender {
 
     private MinecraftProtocol protocol;
 
-    public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServerSession) {
+    public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServerSession, EventLoop eventLoop) {
         this.connector = connector;
         this.upstream = new UpstreamSession(bedrockServerSession);
+        this.eventLoop = eventLoop;
 
         this.advancementsCache = new AdvancementsCache(this);
         this.bookEditCache = new BookEditCache(this);
@@ -447,7 +450,6 @@ public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServ
 
         this.playerInventory = new PlayerInventory();
         this.openInventory = null;
-        this.inventoryFuture = CompletableFuture.completedFuture(null);
         this.craftingRecipes = new Int2ObjectOpenHashMap<>();
         this.unlockedRecipes = new ObjectOpenHashSet<>();
         this.lastRecipeNetId = new AtomicInteger(1);
@@ -664,7 +666,7 @@ private void connectDownstream() {
         boolean floodgate = this.remoteAuthType == AuthType.FLOODGATE;
 
         // Start ticking
-        tickThread = connector.getGeneralThreadPool().scheduleAtFixedRate(this::tick, 50, 50, TimeUnit.MILLISECONDS);
+        tickThread = eventLoop.scheduleAtFixedRate(this::tick, 50, 50, TimeUnit.MILLISECONDS);
 
         downstream = new TcpClientSession(this.remoteAddress, this.remotePort, protocol);
         disableSrvResolving();
@@ -1095,39 +1097,6 @@ private void startGame() {
         upstream.sendPacket(startGamePacket);
     }
 
-    /**
-     * Adds a new inventory task.
-     * Inventory tasks are executed one at a time, in order.
-     *
-     * @param task the task to run
-     */
-    public void addInventoryTask(Runnable task) {
-        synchronized (inventoryLock) {
-            inventoryFuture = inventoryFuture.thenRun(task).exceptionally(throwable -> {
-                GeyserConnector.getInstance().getLogger().error("Error processing inventory task", throwable.getCause());
-                return null;
-            });
-        }
-    }
-
-    /**
-     * Adds a new inventory task with a delay.
-     * The delay is achieved by scheduling with the Geyser general thread pool.
-     * Inventory tasks are executed one at a time, in order.
-     *
-     * @param task the delayed task to run
-     * @param delayMillis delay in milliseconds
-     */
-    public void addInventoryTask(Runnable task, long delayMillis) {
-        synchronized (inventoryLock) {
-            Executor delayedExecutor = command -> GeyserConnector.getInstance().getGeneralThreadPool().schedule(command, delayMillis, TimeUnit.MILLISECONDS);
-            inventoryFuture = inventoryFuture.thenRunAsync(task, delayedExecutor).exceptionally(throwable -> {
-                GeyserConnector.getInstance().getLogger().error("Error processing inventory task", throwable.getCause());
-                return null;
-            });
-        }
-    }
-
     /**
      * @return the next Bedrock item network ID to use for a new item
      */
@@ -1229,7 +1198,18 @@ public void sendUpstreamPacketImmediately(BedrockPacket packet) {
      * @param packet the java edition packet from MCProtocolLib
      */
     public void sendDownstreamPacket(Packet packet) {
-        if (downstream != null && (protocol.getSubProtocol().equals(SubProtocol.GAME) || packet.getClass() == LoginPluginResponsePacket.class)) {
+        if (!closed && this.downstream != null) {
+            EventLoop eventLoop = this.downstream.getChannel().eventLoop();
+            if (eventLoop.inEventLoop()) {
+                sendDownstreamPacket0(packet);
+            } else {
+                eventLoop.execute(() -> sendDownstreamPacket0(packet));
+            }
+        }
+    }
+
+    private void sendDownstreamPacket0(Packet packet) {
+        if (protocol.getSubProtocol().equals(SubProtocol.GAME) || packet.getClass() == LoginPluginResponsePacket.class) {
             downstream.send(packet);
         } else {
             connector.getLogger().debug("Tried to send downstream packet " + packet.getClass().getSimpleName() + " before connected to the server");

connector/src/main/java/org/geysermc/connector/network/session/cache/EntityCache.java

@@ -26,6 +26,8 @@
 package org.geysermc.connector.network.session.cache;
 
 import it.unimi.dsi.fastutil.longs.*;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import lombok.Getter;
 import org.geysermc.connector.entity.Tickable;
@@ -44,15 +46,15 @@ public class EntityCache {
     private final GeyserSession session;
 
     @Getter
-    private Long2ObjectMap<Entity> entities = Long2ObjectMaps.synchronize(new Long2ObjectOpenHashMap<>());
+    private final Long2ObjectMap<Entity> entities = new Long2ObjectOpenHashMap<>();
     /**
      * A list of all entities that must be ticked.
      */
-    private final List<Tickable> tickableEntities = Collections.synchronizedList(new ArrayList<>());
-    private Long2LongMap entityIdTranslations = Long2LongMaps.synchronize(new Long2LongOpenHashMap());
-    private Map<UUID, PlayerEntity> playerEntities = Collections.synchronizedMap(new HashMap<>());
-    private Map<UUID, BossBar> bossBars = Collections.synchronizedMap(new HashMap<>());
-    private final Long2LongMap cachedPlayerEntityLinks = Long2LongMaps.synchronize(new Long2LongOpenHashMap());
+    private final List<Tickable> tickableEntities = new ObjectArrayList<>();
+    private final Long2LongMap entityIdTranslations = new Long2LongOpenHashMap();
+    private final Map<UUID, PlayerEntity> playerEntities = new Object2ObjectOpenHashMap<>();
+    private final Map<UUID, BossBar> bossBars = new Object2ObjectOpenHashMap<>();
+    private final Long2LongMap cachedPlayerEntityLinks = new Long2LongOpenHashMap();
 
     @Getter
     private final AtomicLong nextEntityId = new AtomicLong(2L);
@@ -156,13 +158,6 @@ public void updateBossBars() {
         bossBars.values().forEach(BossBar::updateBossBar);
     }
 
-    public void clear() {
-        entities = null;
-        entityIdTranslations = null;
-        playerEntities = null;
-        bossBars = null;
-    }
-
     public long getCachedPlayerEntityLink(long playerId) {
         return cachedPlayerEntityLinks.remove(playerId);
     }

connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java

@@ -29,6 +29,7 @@
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateLightPacket;
 import com.github.steveice10.packetlib.packet.Packet;
 import com.nukkitx.protocol.bedrock.BedrockPacket;
+import io.netty.channel.EventLoop;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
@@ -89,7 +90,12 @@ public <P extends T> boolean translate(Class<? extends P> clazz, P packet, Geyse
             try {
                 PacketTranslator<P> translator = (PacketTranslator<P>) translators.get(clazz);
                 if (translator != null) {
-                    translator.translate(packet, session);
+                    EventLoop eventLoop = session.getEventLoop();
+                    if (eventLoop.inEventLoop()) {
+                        translator.translate(packet, session);
+                    } else {
+                        eventLoop.execute(() -> translator.translate(packet, session));
+                    }
                     return true;
                 } else {
                     if ((GeyserConnector.getInstance().getPlatformType() != PlatformType.STANDALONE || !(packet instanceof BedrockPacket)) && !IGNORED_PACKETS.contains(clazz)) {

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockAnimateTranslator.java

@@ -48,7 +48,7 @@ public void translate(AnimatePacket packet, GeyserSession session) {
         switch (packet.getAction()) {
             case SWING_ARM:
                 // Delay so entity damage can be processed first
-                session.getConnector().getGeneralThreadPool().schedule(() ->
+                session.getEventLoop().schedule(() ->
                         session.sendDownstreamPacket(new ClientPlayerSwingArmPacket(Hand.MAIN_HAND)),
                         25,
                         TimeUnit.MILLISECONDS

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java

@@ -39,29 +39,27 @@ public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerC
 
     @Override
     public void translate(ContainerClosePacket packet, GeyserSession session) {
-        session.addInventoryTask(() -> {
-            byte windowId = packet.getId();
+        byte windowId = packet.getId();
 
-            //Client wants close confirmation
-            session.sendUpstreamPacket(packet);
-            session.setClosingInventory(false);
+        //Client wants close confirmation
+        session.sendUpstreamPacket(packet);
+        session.setClosingInventory(false);
 
-            if (windowId == -1 && session.getOpenInventory() instanceof MerchantContainer) {
-                // 1.16.200 - window ID is always -1 sent from Bedrock
-                windowId = (byte) session.getOpenInventory().getId();
-            }
+        if (windowId == -1 && session.getOpenInventory() instanceof MerchantContainer) {
+            // 1.16.200 - window ID is always -1 sent from Bedrock
+            windowId = (byte) session.getOpenInventory().getId();
+        }
 
-            Inventory openInventory = session.getOpenInventory();
-            if (openInventory != null) {
-                if (windowId == openInventory.getId()) {
-                    ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(windowId);
-                    session.sendDownstreamPacket(closeWindowPacket);
-                    InventoryUtils.closeInventory(session, windowId, false);
-                } else if (openInventory.isPending()) {
-                    InventoryUtils.displayInventory(session, openInventory);
-                    openInventory.setPending(false);
-                }
+        Inventory openInventory = session.getOpenInventory();
+        if (openInventory != null) {
+            if (windowId == openInventory.getId()) {
+                ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(windowId);
+                session.sendDownstreamPacket(closeWindowPacket);
+                InventoryUtils.closeInventory(session, windowId, false);
+            } else if (openInventory.isPending()) {
+                InventoryUtils.displayInventory(session, openInventory);
+                openInventory.setPending(false);
             }
-        });
+        }
     }
 }