Merge branch 'master' into feature/plugins

# Conflicts: # connector/src/main/java/org/geysermc/connector/GeyserConnector.java # connector/src/main/resources/languages
bundabrg · Jul 9, 2020 · f1d63cf · f1d63cf
2 parents ef70200 + cbb2586
commit f1d63cf
Show file tree

Hide file tree

Showing 41 changed files with 393 additions and 124 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "connector/src/main/resources/mappings"]
 	path = connector/src/main/resources/mappings
 	url = https://github.com/GeyserMC/mappings.git
-    branch = feature/1.16
 [submodule "connector/src/main/resources/languages"]
 	path = connector/src/main/resources/languages
 	url = https://github.com/GeyserMC/languages.git
diff --git a/...igot/src/main/java/org/geysermc/platform/spigot/world/GeyserSpigotBlockPlaceListener.java b/...igot/src/main/java/org/geysermc/platform/spigot/world/GeyserSpigotBlockPlaceListener.java
@@ -47,7 +47,7 @@ public class GeyserSpigotBlockPlaceListener implements Listener {
 
     @EventHandler
     public void place(final BlockPlaceEvent event) {
-        for (GeyserSession session : connector.getPlayers().values()) {
+        for (GeyserSession session : connector.getPlayers()) {
             if (event.getPlayer() == Bukkit.getPlayer(session.getPlayerEntity().getUsername())) {
                 LevelSoundEventPacket placeBlockSoundPacket = new LevelSoundEventPacket();
                 placeBlockSoundPacket.setSound(SoundEvent.PLACE);

diff --git a/...ap/standalone/src/main/java/org/geysermc/platform/standalone/gui/GeyserStandaloneGUI.java b/...ap/standalone/src/main/java/org/geysermc/platform/standalone/gui/GeyserStandaloneGUI.java
@@ -42,7 +42,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.net.InetSocketAddress;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -292,10 +291,10 @@ public void startUpdateThread() {
                 // Update player table
                 playerTableModel.getDataVector().removeAllElements();
 
-                for (Map.Entry<InetSocketAddress, GeyserSession> player : GeyserConnector.getInstance().getPlayers().entrySet()) {
+                for (GeyserSession player : GeyserConnector.getInstance().getPlayers()) {
                     Vector row = new Vector();
-                    row.add(player.getKey().getHostName());
-                    row.add(player.getValue().getPlayerEntity().getUsername());
+                    row.add(player.getSocketAddress().getHostName());
+                    row.add(player.getPlayerEntity().getUsername());
 
                     playerTableModel.addRow(row);
                 }

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -103,9 +103,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.GeyserMC</groupId>
-            <artifactId>MCProtocolLib</artifactId>
-            <version>feature~1.16-1.12.1-1-g10bb8e2-319</version>
+            <groupId>com.github.steveice10</groupId>
+            <artifactId>mcprotocollib</artifactId>
+            <version>ed6e845095</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -127,20 +127,20 @@
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
-            <artifactId>text-api</artifactId>
-            <version>3.0.3</version>
+            <artifactId>adventure-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
-            <artifactId>text-serializer-gson</artifactId>
-            <version>3.0.3</version>
+            <artifactId>adventure-text-serializer-gson</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
-            <artifactId>text-serializer-legacy</artifactId>
-            <version>3.0.3</version>
+            <artifactId>adventure-text-serializer-legacy</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
@@ -48,6 +48,7 @@
 import org.geysermc.connector.network.translators.effect.EffectRegistry;
 import org.geysermc.connector.network.translators.item.ItemRegistry;
 import org.geysermc.connector.network.translators.item.ItemTranslator;
+import org.geysermc.connector.network.translators.item.PotionMixRegistry;
 import org.geysermc.connector.network.translators.sound.SoundHandlerRegistry;
 import org.geysermc.connector.network.translators.sound.SoundRegistry;
 import org.geysermc.connector.network.translators.world.WorldManager;
@@ -64,9 +65,9 @@
 import java.net.InetSocketAddress;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -82,7 +83,7 @@ public class GeyserConnector {
     public static final String NAME = "Geyser";
     public static final String VERSION = "DEV"; // A fallback for running in IDEs
 
-    private final Map<InetSocketAddress, GeyserSession> players = new HashMap<>();
+    private final List<GeyserSession> players = new ArrayList<>();
 
     private static GeyserConnector instance;
 
@@ -140,6 +141,7 @@ private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) {
         ItemRegistry.init();
         ItemTranslator.init();
         LocaleUtils.init();
+        PotionMixRegistry.init();
         SoundRegistry.init();
         SoundHandlerRegistry.init();
 
@@ -178,7 +180,9 @@ private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) {
             try {
                 Class<?> cls = Class.forName("org.geysermc.platform.standalone.GeyserStandaloneBootstrap");
                 isGui = (boolean) cls.getMethod("isUseGui").invoke(cls.cast(bootstrap));
-            } catch (Exception e) { e.printStackTrace(); }
+            } catch (Exception e) {
+                logger.debug("Failed detecting if standalone is using a GUI; if this is a GeyserConnect instance this can be safely ignored.");
+            }
         }
 
         // Enable Plugins
@@ -210,7 +214,7 @@ public void shutdown() {
         if (players.size() >= 1) {
             bootstrap.getGeyserLogger().info(LanguageUtils.getLocaleStringLog("geyser.core.shutdown.kick.log", players.size()));
 
-            for (GeyserSession playerSession : players.values()) {
+            for (GeyserSession playerSession : players) {
                 playerSession.disconnect(LanguageUtils.getPlayerLocaleString("geyser.core.shutdown.kick.message", playerSession.getClientData().getLanguageCode()));
             }
 
@@ -252,11 +256,11 @@ public void run() {
     }
 
     public void addPlayer(GeyserSession player) {
-        players.put(player.getSocketAddress(), player);
+        players.add(player);
     }
 
     public void removePlayer(GeyserSession player) {
-        players.remove(player.getSocketAddress());
+        players.remove(player);
     }
 
     public static GeyserConnector start(PlatformType platformType, GeyserBootstrap bootstrap) {

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java
@@ -47,9 +47,9 @@ public ListCommand(GeyserConnector connector, String name, String description, S
     public void execute(CommandSender sender, String[] args) {
         String message = "";
         if (sender instanceof GeyserSession) {
-            message = LanguageUtils.getPlayerLocaleString("geyser.commands.list.message", ((GeyserSession) sender).getClientData().getLanguageCode(), connector.getPlayers().size(), connector.getPlayers().values().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
+            message = LanguageUtils.getPlayerLocaleString("geyser.commands.list.message", ((GeyserSession) sender).getClientData().getLanguageCode(), connector.getPlayers().size(), connector.getPlayers().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
         } else {
-            message = LanguageUtils.getLocaleStringLog("geyser.commands.list.message", connector.getPlayers().size(), connector.getPlayers().values().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
+            message = LanguageUtils.getLocaleStringLog("geyser.commands.list.message", connector.getPlayers().size(), connector.getPlayers().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
         }
 
         sender.sendMessage(message);

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/OffhandCommand.java
@@ -59,7 +59,7 @@ public void execute(CommandSender sender, String[] args) {
             return;
         }
         // Needed for Bukkit - sender is not an instance of GeyserSession
-        for (GeyserSession session : connector.getPlayers().values()) {
+        for (GeyserSession session : connector.getPlayers()) {
             if (sender.getName().equals(session.getPlayerEntity().getUsername())) {
                 ClientPlayerActionPacket releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.SWAP_HANDS, new Position(0,0,0),
                         BlockFace.DOWN);

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java
@@ -56,7 +56,7 @@ public void execute(CommandSender sender, String[] args) {
 
         sender.sendMessage(message);
 
-        for (GeyserSession session : connector.getPlayers().values()) {
+        for (GeyserSession session : connector.getPlayers()) {
             session.disconnect(LanguageUtils.getPlayerLocaleString("geyser.commands.reload.kick", session.getClientData().getLanguageCode()));
         }
         connector.reload();

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java
@@ -33,6 +33,9 @@
 import org.geysermc.connector.utils.LanguageUtils;
 import org.geysermc.connector.utils.WebUtils;
 
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 public class VersionCommand extends GeyserCommand {
@@ -56,20 +59,21 @@ public void execute(CommandSender sender, String[] args) {
                 Properties gitProp = new Properties();
                 gitProp.load(FileUtils.getResource("git.properties"));
 
-                String buildXML = WebUtils.getBody("https://ci.nukkitx.com/job/GeyserMC/job/Geyser/job/" + gitProp.getProperty("git.branch") + "/lastSuccessfulBuild/api/xml?xpath=//master/buildNumber");
+                String buildXML = WebUtils.getBody("https://ci.nukkitx.com/job/GeyserMC/job/Geyser/job/" + URLEncoder.encode(gitProp.getProperty("git.branch"), StandardCharsets.UTF_8.toString()) + "/lastSuccessfulBuild/api/xml?xpath=//buildNumber");
                 if (buildXML.startsWith("<buildNumber>")) {
-                    int latestBuildNum = Integer.parseInt(buildXML.replaceAll("<(\\\\)?buildNumber>", ""));
+                    int latestBuildNum = Integer.parseInt(buildXML.replaceAll("<(\\\\)?(/)?buildNumber>", "").trim());
                     int buildNum = Integer.parseInt(gitProp.getProperty("git.build.number"));
                     if (latestBuildNum != buildNum) {
                         sender.sendMessage(LanguageUtils.getLocaleStringLog("geyser.commands.version.no_updates"));
                     } else {
                         sender.sendMessage(LanguageUtils.getLocaleStringLog("geyser.commands.version.outdated", (latestBuildNum - buildNum), "http://ci.geysermc.org/"));
                     }
                 } else {
-                    throw new AssertionError();
+                    throw new AssertionError("buildNumber missing");
                 }
-            } catch (Exception e) {
-                sender.sendMessage("Failed to check for updates");
+            } catch (IOException | AssertionError | NumberFormatException e) {
+                GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.commands.version.failed"), e);
+                sender.sendMessage(LanguageUtils.getLocaleStringLog("geyser.commands.version.failed"));
             }
         }
     }

diff --git a/connector/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java b/connector/src/main/java/org/geysermc/connector/common/ping/GeyserPingInfo.java
@@ -36,6 +36,7 @@
 import java.util.Collection;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GeyserPingInfo {
 
     private String description;

diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
@@ -284,11 +284,11 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
 
                     // Shield code
                     if (session.getPlayerEntity().getEntityId() == entityId && metadata.getFlags().getFlag(EntityFlag.SNEAKING)) {
-                        if ((session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() == ItemRegistry.SHIELD) ||
-                                (session.getInventoryCache().getPlayerInventory().getItem(45) != null && session.getInventoryCache().getPlayerInventory().getItem(45).getId() == ItemRegistry.SHIELD)) {
+                        if ((session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() == ItemRegistry.SHIELD.getJavaId()) ||
+                                (session.getInventoryCache().getPlayerInventory().getItem(45) != null && session.getInventoryCache().getPlayerInventory().getItem(45).getId() == ItemRegistry.SHIELD.getJavaId())) {
                             ClientPlayerUseItemPacket useItemPacket;
                             metadata.getFlags().setFlag(EntityFlag.BLOCKING, true);
-                            if (session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() == ItemRegistry.SHIELD) {
+                            if (session.getInventory().getItemInHand() != null && session.getInventory().getItemInHand().getId() == ItemRegistry.SHIELD.getJavaId()) {
                                 useItemPacket = new ClientPlayerUseItemPacket(Hand.MAIN_HAND);
                             }
                             // Else we just assume it's the offhand, to simplify logic and to assure the packet gets sent
@@ -299,7 +299,7 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
                         }
                     } else if (session.getPlayerEntity().getEntityId() == entityId && !metadata.getFlags().getFlag(EntityFlag.SNEAKING) && metadata.getFlags().getFlag(EntityFlag.BLOCKING)) {
                         metadata.getFlags().setFlag(EntityFlag.BLOCKING, false);
-                        metadata.getFlags().setFlag(EntityFlag.IS_AVOIDING_BLOCK, true); //TODO: CHECK
+                        metadata.getFlags().setFlag(EntityFlag.IS_AVOIDING_BLOCK, true);
                         ClientPlayerActionPacket releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(0, 0, 0), BlockFace.DOWN);
                         session.sendDownstreamPacket(releaseItemPacket);
                     }
@@ -337,7 +337,7 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
                 if (entityMetadata.getValue().equals(Pose.SLEEPING)) {
                     metadata.getFlags().setFlag(EntityFlag.SLEEPING, true);
                     // Has to be a byte or it does not work
-                    metadata.put(EntityData.PLAYER_FLAGS, (byte) 2); //TODO: CHECK
+                    metadata.put(EntityData.PLAYER_FLAGS, (byte) 2);
                     if (entityId == session.getPlayerEntity().getEntityId()) {
                         Vector3i lastInteractionPos = session.getLastInteractionPosition();
                         metadata.put(EntityData.BED_POSITION, lastInteractionPos);

diff --git a/connector/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java b/connector/src/main/java/org/geysermc/connector/entity/FishingHookEntity.java
@@ -37,7 +37,7 @@ public class FishingHookEntity extends Entity {
     public FishingHookEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation, ProjectileData data) {
         super(entityId, geyserId, entityType, position, motion, rotation);
 
-        for (GeyserSession session : GeyserConnector.getInstance().getPlayers().values()) {
+        for (GeyserSession session : GeyserConnector.getInstance().getPlayers()) {
             Entity entity = session.getEntityCache().getEntityByJavaId(data.getOwnerId());
             if (entity == null && session.getPlayerEntity().getEntityId() == data.getOwnerId()) {
                 entity = session.getPlayerEntity();
@@ -63,8 +63,6 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             }
         }
 
-        //TODO Is ID 8 needed?
-
         super.updateBedrockMetadata(entityMetadata, session);
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/PaintingEntity.java b/connector/src/main/java/org/geysermc/connector/entity/PaintingEntity.java
@@ -52,7 +52,7 @@ public void spawnEntity(GeyserSession session) {
         AddPaintingPacket addPaintingPacket = new AddPaintingPacket();
         addPaintingPacket.setUniqueEntityId(geyserId);
         addPaintingPacket.setRuntimeEntityId(geyserId);
-        addPaintingPacket.setMotive(paintingName.getBedrockName()); //TODO: This is what it's called now?
+        addPaintingPacket.setMotive(paintingName.getBedrockName());
         addPaintingPacket.setPosition(fixOffset(true));
         addPaintingPacket.setDirection(direction);
         session.sendUpstreamPacket(addPaintingPacket);

diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/MagmaCubeEntity.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/Geyser
+ *
+ */
+
+package org.geysermc.connector.entity.living;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class MagmaCubeEntity extends SlimeEntity {
+
+    public MagmaCubeEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+
+    @Override
+    public void moveRelative(GeyserSession session, double relX, double relY, double relZ, Vector3f rotation, boolean isOnGround) {
+        updateJump(session, isOnGround);
+        super.moveRelative(session, relX, relY, relZ, rotation, isOnGround);
+    }
+
+    @Override
+    public void moveAbsolute(GeyserSession session, Vector3f position, Vector3f rotation, boolean isOnGround, boolean teleported) {
+        updateJump(session, isOnGround);
+        super.moveAbsolute(session, position, rotation, isOnGround, teleported);
+    }
+
+    public void updateJump(GeyserSession session, boolean newOnGround) {
+        if (newOnGround != onGround) {
+            // Add the jumping effect to the magma cube
+            metadata.put(EntityData.CLIENT_EVENT, (byte) (newOnGround ? 1 : 2));
+            updateBedrockMetadata(session);
+        }
+    }
+}
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
@@ -43,7 +43,7 @@ public EndermanEntity(long entityId, long geyserId, EntityType entityType, Vecto
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
         // Held block
         if (entityMetadata.getId() == 15) {
-            metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId((int) entityMetadata.getValue())); //TODO: Check
+            metadata.put(EntityData.CARRIED_BLOCK, BlockTranslator.getBedrockBlockId((int) entityMetadata.getValue()));
         }
         // 'Angry' - mouth open
         if (entityMetadata.getId() == 16) {