Merge branch 'master' into feature/plugins

bootstrap/pom.xml

@@ -22,7 +22,7 @@
         </repository>
         <repository>
             <id>sponge-repo</id>
-            <url>https://repo.spongepowered.org/maven</url>
+            <url>https://repo.spongepowered.org/repository/maven-public/</url>
         </repository>
         <repository>
             <id>bungeecord-repo</id>

bootstrap/spigot/pom.xml

@@ -30,9 +30,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.geysermc.adapters</groupId>
+            <groupId>org.geysermc.geyser.adapters</groupId>
             <artifactId>spigot-all</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java

@@ -28,7 +28,6 @@
 import com.github.steveice10.mc.protocol.MinecraftConstants;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.geysermc.adapters.spigot.SpigotAdapters;
 import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.bootstrap.GeyserBootstrap;
@@ -41,6 +40,7 @@
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.geyser.adapters.spigot.SpigotAdapters;
 import org.geysermc.platform.spigot.command.GeyserSpigotCommandExecutor;
 import org.geysermc.platform.spigot.command.GeyserSpigotCommandManager;
 import org.geysermc.platform.spigot.command.SpigotCommandSender;
@@ -70,6 +70,11 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
 
     private GeyserConnector connector;
 
+    /**
+     * The Minecraft server version, formatted as <code>1.#.#</code>
+     */
+    private String minecraftVersion;
+
     @Override
     public void onEnable() {
         // This is manually done instead of using Bukkit methods to save the config because otherwise comments get removed
@@ -119,6 +124,9 @@ public void onEnable() {
 
         geyserConfig.loadFloodgate(this);
 
+        // Turn "(MC: 1.16.4)" into 1.16.4.
+        this.minecraftVersion = Bukkit.getServer().getVersion().split("\\(MC: ")[1].split("\\)")[0];
+
         this.connector = GeyserConnector.start(PlatformType.SPIGOT, this);
 
         if (geyserConfig.isLegacyPingPassthrough()) {
@@ -243,6 +251,11 @@ public BootstrapDumpInfo getDumpInfo() {
         return new GeyserSpigotDumpInfo();
     }
 
+    @Override
+    public String getMinecraftServerVersion() {
+        return this.minecraftVersion;
+    }
+
     public boolean isCompatible(String version, String whichVersion) {
         int[] currentVersion = parseVersion(version);
         int[] otherVersion = parseVersion(whichVersion);
@@ -281,10 +294,7 @@ private int[] parseVersion(String versionParam) {
      * @return the server version before ViaVersion finishes initializing
      */
     public ProtocolVersion getServerProtocolVersion() {
-        String bukkitVersion = Bukkit.getServer().getVersion();
-        // Turn "(MC: 1.16.4)" into 1.16.4.
-        String version = bukkitVersion.split("\\(MC: ")[1].split("\\)")[0];
-        return ProtocolVersion.getClosest(version);
+        return ProtocolVersion.getClosest(this.minecraftVersion);
     }
 
     /**

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/world/manager/GeyserSpigot1_12NativeWorldManager.java

@@ -27,10 +27,10 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.geysermc.adapters.spigot.SpigotAdapters;
-import org.geysermc.adapters.spigot.SpigotWorldAdapter;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.world.block.BlockTranslator;
+import org.geysermc.geyser.adapters.spigot.SpigotAdapters;
+import org.geysermc.geyser.adapters.spigot.SpigotWorldAdapter;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.BlockStorage;
 

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/world/manager/GeyserSpigot1_12WorldManager.java

@@ -75,6 +75,10 @@ public int getBlockAt(GeyserSession session, int x, int y, int z) {
         if (player == null) {
             return BlockTranslator.JAVA_AIR_ID;
         }
+        if (!player.getWorld().isChunkLoaded(x >> 4, z >> 4)) {
+            // Prevent nasty async errors if a player is loading in
+            return BlockTranslator.JAVA_AIR_ID;
+        }
         // Get block entity storage
         BlockStorage storage = Via.getManager().getConnection(player.getUniqueId()).get(BlockStorage.class);
         Block block = player.getWorld().getBlockAt(x, y, z);

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java

@@ -27,10 +27,10 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.geysermc.adapters.spigot.SpigotAdapters;
-import org.geysermc.adapters.spigot.SpigotWorldAdapter;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.world.block.BlockTranslator;
+import org.geysermc.geyser.adapters.spigot.SpigotAdapters;
+import org.geysermc.geyser.adapters.spigot.SpigotWorldAdapter;
 
 public class GeyserSpigotNativeWorldManager extends GeyserSpigotWorldManager {
     protected final SpigotWorldAdapter adapter;

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java

@@ -167,4 +167,9 @@ public void onServerStop(GameStoppedEvent event) {
     public BootstrapDumpInfo getDumpInfo() {
         return new GeyserSpongeDumpInfo();
     }
+
+    @Override
+    public String getMinecraftServerVersion() {
+        return Sponge.getPlatform().getMinecraftVersion().getName();
+    }
 }

connector/src/main/java/org/geysermc/connector/GeyserConnector.java

@@ -255,6 +255,20 @@ private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) {
                 }
                 return valueMap;
             }));
+
+            String minecraftVersion = bootstrap.getMinecraftServerVersion();
+            if (minecraftVersion != null) {
+                Map<String, Map<String, Integer>> versionMap = new HashMap<>();
+                Map<String, Integer> platformMap = new HashMap<>();
+                platformMap.put(platformType.getPlatformName(), 1);
+                versionMap.put(minecraftVersion, platformMap);
+
+                metrics.addCustomChart(new Metrics.DrilldownPie("minecraftServerVersion", () -> {
+                    // By the end, we should return, for example:
+                    // 1.16.5 => (Spigot, 1)
+                    return versionMap;
+                }));
+            }
         }
 
         boolean isGui = false;

connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java

@@ -33,6 +33,7 @@
 import org.geysermc.connector.network.translators.world.GeyserWorldManager;
 import org.geysermc.connector.network.translators.world.WorldManager;
 
+import javax.annotation.Nullable;
 import java.nio.file.Path;
 
 public interface GeyserBootstrap {
@@ -99,4 +100,18 @@ default WorldManager getWorldManager() {
      * @return The info about the bootstrap
      */
     BootstrapDumpInfo getDumpInfo();
+
+    /**
+     * Returns the Minecraft version currently being used on the server. This should be only be implemented on platforms
+     * that have direct server access - platforms such as proxies always have to be on their latest version to support
+     * the newest Minecraft version, but older servers can use ViaVersion to enable newer versions to join.
+     * <br>
+     * If used, this should not be null before {@link org.geysermc.connector.GeyserConnector} initialization.
+     *
+     * @return the Minecraft version being used on the server, or <code>null</code> if not applicable
+     */
+    @Nullable
+    default String getMinecraftServerVersion() {
+        return null;
+    }
 }

connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java

@@ -43,7 +43,7 @@ public class BoatEntity extends Entity {
      */
     private static final String BUOYANCY_DATA = "{\"apply_gravity\":true,\"base_buoyancy\":1.0,\"big_wave_probability\":0.02999999932944775," +
             "\"big_wave_speed\":10.0,\"drag_down_on_buoyancy_removed\":0.0,\"liquid_blocks\":[\"minecraft:water\"," +
-            "\"minecraft:flowing_water\"],\"simulate_waves\":false}}";
+            "\"minecraft:flowing_water\"],\"simulate_waves\":false}";
 
     private boolean isPaddlingLeft;
     private float paddleTimeLeft;

connector/src/main/java/org/geysermc/connector/metrics/Metrics.java

@@ -36,6 +36,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -75,7 +76,7 @@ public class Metrics {
 
     private final static ObjectMapper mapper = new ObjectMapper();
 
-    private GeyserConnector connector;
+    private final GeyserConnector connector;
 
     /**
      * Class constructor.
@@ -156,13 +157,15 @@ private ObjectNode getServerData() {
         String osName = System.getProperty("os.name");
         String osArch = System.getProperty("os.arch");
         String osVersion = System.getProperty("os.version");
+        String javaVersion = System.getProperty("java.version");
         int coreCount = Runtime.getRuntime().availableProcessors();
 
         ObjectNode data = mapper.createObjectNode();
 
         data.put("serverUUID", serverUUID);
 
         data.put("playerAmount", playerAmount);
+        data.put("javaVersion", javaVersion);
         data.put("osName", osName);
         data.put("osArch", osArch);
         data.put("osVersion", osVersion);
@@ -241,7 +244,7 @@ private static byte[] compress(final String str) throws IOException {
         }
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-        gzip.write(str.getBytes("UTF-8"));
+        gzip.write(str.getBytes(StandardCharsets.UTF_8));
         gzip.close();
         return outputStream.toByteArray();
     }

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java

@@ -27,6 +27,8 @@
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.LongTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.nukkitx.nbt.NbtList;
 import com.nukkitx.nbt.NbtMapBuilder;
 import com.nukkitx.nbt.NbtType;
@@ -39,7 +41,10 @@
 public class EndGatewayBlockEntityTranslator extends BlockEntityTranslator {
     @Override
     public void translateTag(NbtMapBuilder builder, CompoundTag tag, int blockState) {
-        builder.put("Age", (int) ((long) tag.get("Age").getValue()));
+        Tag ageTag = tag.get("Age");
+        if (ageTag instanceof LongTag) {
+            builder.put("Age", (int) ((long) ageTag.getValue()));
+        }
         // Java sometimes does not provide this tag, but Bedrock crashes if it doesn't exist
         // Linked coordinates
         IntList tagsList = new IntArrayList();

connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java

@@ -101,7 +101,7 @@ private static void generateAssetCache() {
                 ASSET_MAP.put(entry.getKey(), asset);
             }
         } catch (Exception e) {
-            GeyserConnector.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace())));
+            GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace())));
         }
     }
 
@@ -260,7 +260,7 @@ private static void downloadEN_US(File localeFile) {
             // Delete the nolonger needed client/server jar
             Files.delete(tmpFilePath);
         } catch (Exception e) {
-            throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.en_us"), e);
+            GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.en_us"), e);
         }
     }