Merge remote-tracking branch 'upstream/master' into client-vehicle

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+tab_width = 4
+max_line_length = off
+
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 9999
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false

.github/workflows/build.yml

@@ -16,7 +16,6 @@ on:
       - 'LICENSE'
       - 'Jenkinsfile '
       - 'README.md'
-      - 'licenseheader.txt'
 
 jobs:
   build:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2019-2023 GeyserMC. http://geysermc.org
+Copyright (c) 2019-2024 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

core/build.gradle.kts

@@ -75,7 +75,7 @@ tasks.processResources {
         expand(
             "branch" to info.branch,
             "buildNumber" to info.buildNumber,
-            "projectVersion" to project.version,
+            "projectVersion" to info.version,
             "commit" to info.commit,
             "commitAbbrev" to info.commitAbbrev,
             "commitMessage" to info.commitMessage,
@@ -89,20 +89,25 @@ sourceSets {
         blossom {
             val info = GitInfo()
             javaSources {
-                property("version", "${project.version} (${info.gitVersion})")
+                property("version", info.version)
                 property("gitVersion", info.gitVersion)
                 property("buildNumber", info.buildNumber.toString())
                 property("branch", info.branch)
                 property("commit", info.commit)
                 property("repository", info.repository)
+                property("devVersion", info.isDev.toString())
             }
         }
     }
 }
 
-fun Project.buildNumber(): Int =
+fun buildNumber(): Int =
     (System.getenv("BUILD_NUMBER"))?.let { Integer.parseInt(it) } ?: -1
 
+fun isDevBuild(branch: String, repository: String): Boolean {
+    return branch != "master" || repository.equals("https://github.com/GeyserMC/Geyser", ignoreCase = true).not()
+}
+
 inner class GitInfo {
     val branch: String
     val commit: String
@@ -115,22 +120,25 @@ inner class GitInfo {
     val commitMessage: String
     val repository: String
 
+    val isDev: Boolean
+
     init {
-        // On Jenkins, a detached head is checked out, so indra cannot determine the branch.
-        // Fortunately, this environment variable is available.
-        branch = indraGit.branchName() ?: System.getenv("BRANCH_NAME") ?: "DEV"
+        branch = indraGit.branchName() ?: "DEV"
 
         val commit = indraGit.commit()
         this.commit = commit?.name ?: "0".repeat(40)
         commitAbbrev = commit?.name?.substring(0, 7) ?: "0".repeat(7)
 
         gitVersion = "git-${branch}-${commitAbbrev}"
-        version = "${project.version} ($gitVersion)"
-        buildNumber = buildNumber()
 
         val git = indraGit.git()
         commitMessage = git?.commit()?.message ?: ""
         repository = git?.repository?.config?.getString("remote", "origin", "url") ?: ""
+
+        buildNumber = buildNumber()
+        isDev = isDevBuild(branch, repository)
+        val projectVersion = if (isDev) project.version else project.version.toString().replace("SNAPSHOT", "b${buildNumber}")
+        version = "$projectVersion ($gitVersion)"
     }
 }
 
@@ -148,4 +156,4 @@ tasks.register<DownloadFilesTask>("downloadBedrockData") {
     suffixedFiles = listOf("block_palette.nbt", "creative_items.json", "runtime_item_states.json")
 
     destinationDir = "$projectDir/src/main/resources/bedrock"
-}
+}

core/src/main/java-templates/org/geysermc/geyser/BuildData.java

@@ -34,4 +34,9 @@ public class BuildData {
     public static final String BRANCH = "{{ branch }}";
     public static final String COMMIT = "{{ commit }}";
     public static final String REPOSITORY = "{{ repository }}";
+    private static final String DEV = "{{ devVersion }}";
+
+    public static boolean isDevBuild() {
+        return Boolean.parseBoolean(DEV);
+    }
 }

core/src/main/java/org/geysermc/geyser/GeyserImpl.java

@@ -122,6 +122,7 @@ public class GeyserImpl implements GeyserApi {
     public static final String BRANCH = BuildData.BRANCH;
     public static final String COMMIT = BuildData.COMMIT;
     public static final String REPOSITORY = BuildData.REPOSITORY;
+    public static final boolean IS_DEV = BuildData.isDevBuild();
 
     /**
      * Oauth client ID for Microsoft authentication
@@ -207,6 +208,12 @@ public void initialize() {
         logger.info("");
         logger.info(GeyserLocale.getLocaleStringLog("geyser.core.load", NAME, VERSION));
         logger.info("");
+        if (IS_DEV) {
+            // TODO cloud use language string
+            //logger.info(GeyserLocale.getLocaleStringLog("geyser.core.dev_build", "https://discord.gg/geysermc"));
+            logger.info("You are running a development build of Geyser! Please report any bugs you find on our Discord server: %s".formatted("https://discord.gg/geysermc"));
+            logger.info("");
+        }
         logger.info("******************************************");
 
         /* Initialize registries */
@@ -684,9 +691,10 @@ public void reloadGeyser() {
      *
      * @return true if the version number is not 'DEV'.
      */
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isProductionEnvironment() {
         // First is if Blossom runs, second is if Blossom doesn't run
-        //noinspection ConstantConditions,MismatchedStringCase - changes in production
+        //noinspection ConstantConditions - changes in production
         return !("git-local/dev-0000000".equals(GeyserImpl.GIT_VERSION) || "${gitVersion}".equals(GeyserImpl.GIT_VERSION));
     }
 

core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java

@@ -25,8 +25,8 @@
 
 package org.geysermc.geyser.command.defaults;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.api.util.PlatformType;
 import org.geysermc.geyser.command.GeyserCommand;
@@ -37,8 +37,7 @@
 import org.geysermc.geyser.text.GeyserLocale;
 import org.geysermc.geyser.util.WebUtils;
 
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
 import java.util.List;
 
 public class VersionCommand extends GeyserCommand {
@@ -72,27 +71,36 @@ public void execute(GeyserSession session, GeyserCommandSource sender, String[]
                 GeyserImpl.NAME, GeyserImpl.VERSION, javaVersions, bedrockVersions));
 
         // Disable update checking in dev mode and for players in Geyser Standalone
-        if (GeyserImpl.getInstance().isProductionEnvironment() && !(!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) {
-            sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.checking", sender.locale()));
-            try {
-                String buildXML = WebUtils.getBody("https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/" +
-                        URLEncoder.encode(GeyserImpl.BRANCH, StandardCharsets.UTF_8) + "/lastSuccessfulBuild/api/xml?xpath=//buildNumber");
-                if (buildXML.startsWith("<buildNumber>")) {
-                    int latestBuildNum = Integer.parseInt(buildXML.replaceAll("<(\\\\)?(/)?buildNumber>", "").trim());
-                    int buildNum = this.geyser.buildNumber();
-                    if (latestBuildNum == buildNum) {
-                        sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.no_updates", sender.locale()));
-                    } else {
-                        sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.outdated",
-                                sender.locale(), (latestBuildNum - buildNum), Constants.GEYSER_DOWNLOAD_LOCATION));
-                    }
-                } else {
-                    throw new AssertionError("buildNumber missing");
-                }
-            } catch (Exception e) {
-                GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.version.failed"), e);
-                sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.version.failed", sender.locale()));
+        if (!GeyserImpl.getInstance().isProductionEnvironment() || (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) {
+            return;
+        }
+
+        if (GeyserImpl.IS_DEV) {
+            // TODO cloud use language string
+            sender.sendMessage("You are running a development build of Geyser! Please report any bugs you find on our Discord server: %s"
+                    .formatted("https://discord.gg/geysermc"));
+            //sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.core.dev_build", sender.locale(), "https://discord.gg/geysermc"));
+            return;
+        }
+
+        sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.checking", sender.locale()));
+        try {
+            int buildNumber = this.geyser.buildNumber();
+            JsonNode response = WebUtils.getJson("https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest");
+            int latestBuildNumber = response.get("build").asInt();
+
+            if (latestBuildNumber == buildNumber) {
+                sender.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.version.no_updates", sender.locale()));
+                return;
             }
+
+            sender.sendMessage(GeyserLocale.getPlayerLocaleString(
+                    "geyser.commands.version.outdated",
+                    sender.locale(), (latestBuildNumber - buildNumber), "https://geysermc.org/download"
+            ));
+        } catch (IOException e) {
+            GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.version.failed"), e);
+            sender.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.version.failed", sender.locale()));
         }
     }
 

core/src/main/java/org/geysermc/geyser/entity/type/PaintingEntity.java

@@ -86,7 +86,11 @@ public void updateHeadLookRotation(float headYaw) {
 
     private Vector3f fixOffset(PaintingType paintingName) {
         Vector3f position = super.position;
-        position = position.add(0.5, 0.5, 0.5);
+        // ViaVersion already adds the offset for us on older versions,
+        // so no need to do it then otherwise it will be spaced
+        if (session.isEmulatePost1_18Logic()) {
+            position = position.add(0.5, 0.5, 0.5);
+        }
         double widthOffset = paintingName.getWidth() > 1 && paintingName.getWidth() != 3 ? 0.5 : 0;
         double heightOffset = paintingName.getHeight() > 1 && paintingName.getHeight() != 3 ? 0.5 : 0;
 

core/src/main/java/org/geysermc/geyser/registry/type/BlockMappings.java

@@ -44,7 +44,7 @@
 
 @Builder
 @Value
-public class BlockMappings implements DefinitionRegistry<GeyserBedrockBlock> {
+public class BlockMappings implements DefinitionRegistry<BlockDefinition> {
     GeyserBedrockBlock bedrockAir;
     BlockDefinition bedrockWater;
     BlockDefinition bedrockMovingBlock;
@@ -134,7 +134,7 @@ public BlockDefinition getStructureBlockFromMode(String mode) {
     }
 
     @Override
-    public boolean isRegistered(GeyserBedrockBlock bedrockBlock) {
+    public boolean isRegistered(BlockDefinition bedrockBlock) {
         return getDefinition(bedrockBlock.getRuntimeId()) == bedrockBlock;
     }
 }

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -57,7 +57,6 @@
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.cloudburstmc.protocol.bedrock.packet.*;
-import org.cloudburstmc.protocol.common.DefinitionRegistry;
 import org.cloudburstmc.protocol.common.util.OptionalBoolean;
 import org.geysermc.api.util.BedrockPlatform;
 import org.geysermc.api.util.InputMode;
@@ -1487,7 +1486,7 @@ public void sendForm(org.geysermc.cumulus.util.FormBuilder<?, ?> formBuilder) {
 
     private void startGame() {
         this.upstream.getCodecHelper().setItemDefinitions(this.itemMappings);
-        this.upstream.getCodecHelper().setBlockDefinitions((DefinitionRegistry) this.blockMappings); //FIXME
+        this.upstream.getCodecHelper().setBlockDefinitions(this.blockMappings);
         this.upstream.getCodecHelper().setCameraPresetDefinitions(CameraDefinitions.CAMERA_DEFINITIONS);
 
         StartGamePacket startGamePacket = new StartGamePacket();

core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelParticlesTranslator.java

@@ -60,6 +60,7 @@
 
 @Translator(packet = ClientboundLevelParticlesPacket.class)
 public class JavaLevelParticlesTranslator extends PacketTranslator<ClientboundLevelParticlesPacket> {
+    private static final int MAX_PARTICLES = 100;
 
     @Override
     public void translate(GeyserSession session, ClientboundLevelParticlesPacket packet) {
@@ -71,7 +72,8 @@ public void translate(GeyserSession session, ClientboundLevelParticlesPacket pac
                 session.sendUpstreamPacket(particleCreateFunction.apply(position));
             } else {
                 Random random = ThreadLocalRandom.current();
-                for (int i = 0; i < packet.getAmount(); i++) {
+                int amount = Math.min(MAX_PARTICLES, packet.getAmount());
+                for (int i = 0; i < amount; i++) {
                     double offsetX = random.nextGaussian() * (double) packet.getOffsetX();
                     double offsetY = random.nextGaussian() * (double) packet.getOffsetY();
                     double offsetZ = random.nextGaussian() * (double) packet.getOffsetZ();
@@ -213,4 +215,4 @@ private static NbtMap buildVec3PositionTag(Vector3f position) {
                 .putFloat("z", position.getZ())
                 .build();
     }
-}
+}