merge upstream

Dreamail · Dec 24, 2022 · 07196b0 · 07196b0
2 parents 0993866 + 6485200
commit 07196b0
Show file tree

Hide file tree

Showing 466 changed files with 13,968 additions and 5,425 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,47 +9,50 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'gradle'
       - name: submodules-init
         uses: snickerbockers/submodules-init@v4
-      - name: Build with Maven
-        run: mvn -B package -T 2C
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Archive artifacts (Geyser Fabric)
+        uses: actions/upload-artifact@v2
+        if: success()
+        with:
+          name: Geyser Fabric
+          path: bootstrap/fabric/build/libs/Geyser-Fabric.jar
       - name: Archive artifacts (Geyser Standalone)
         uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Standalone
-          path: bootstrap/standalone/target/Geyser.jar
+          path: bootstrap/standalone/build/libs/Geyser-Standalone.jar
       - name: Archive artifacts (Geyser Spigot)
         uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Spigot
-          path: bootstrap/spigot/target/Geyser-Spigot.jar
+          path: bootstrap/spigot/build/libs/Geyser-Spigot.jar
       - name: Archive artifacts (Geyser BungeeCord)
         uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser BungeeCord
-          path: bootstrap/bungeecord/target/Geyser-BungeeCord.jar
+          path: bootstrap/bungeecord/build/libs/Geyser-BungeeCord.jar
       - name: Archive artifacts (Geyser Sponge)
         uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Sponge
-          path: bootstrap/sponge/target/Geyser-Sponge.jar
+          path: bootstrap/sponge/build/libs/Geyser-Sponge.jar
       - name: Archive artifacts (Geyser Velocity)
         uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Velocity
-          path: bootstrap/velocity/target/Geyser-Velocity.jar
+          path: bootstrap/velocity/build/libs/Geyser-Velocity.jar
diff --git a/.gitignore b/.gitignore
@@ -235,8 +235,12 @@ nbdist/
 
 # End of https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all,visualstudiocode
 
+### Gradle ###
+.gradle
+
 ### Geyser ###
 run/
+extensions/
 config.yml
 logs/
 key.pem
@@ -245,6 +249,11 @@ locales/
 /packs/
 /dump.json
 /saved-refresh-tokens.json
+<<<<<<< HEAD
 /languages/
 
-.DS_Store
+.DS_Store
+=======
+/custom_mappings/
+/languages/
+>>>>>>> 6485200c1ffd47a69bd041290cb75668f4269394
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
     agent any
     tools {
-        maven 'Maven 3'
-        jdk 'Java 16'
+        gradle 'Gradle 7'
+        jdk 'Java 17'
     }
     options {
         buildDiscarder(logRotator(artifactNumToKeepStr: '20'))
@@ -11,11 +11,16 @@ pipeline {
         stage ('Build') {
             steps {
                 sh 'git submodule update --init --recursive'
-                sh 'mvn clean package'
+                rtGradleRun(
+                    usesPlugin: true,
+                    tool: 'Gradle 7',
+                    buildFile: 'build.gradle.kts',
+                    tasks: 'clean build',
+                )
             }
             post {
                 success {
-                    archiveArtifacts artifacts: 'bootstrap/**/target/*.jar', excludes: 'bootstrap/**/target/original-*.jar', fingerprint: true
+                    archiveArtifacts artifacts: 'bootstrap/**/build/libs/Geyser-*.jar', fingerprint: true
                 }
             }
         }
@@ -28,23 +33,25 @@ pipeline {
             }
 
             steps {
-                rtMavenDeployer(
-                        id: "maven-deployer",
+                rtGradleDeployer(
+                        id: "GRADLE_DEPLOYER",
                         serverId: "opencollab-artifactory",
                         releaseRepo: "maven-releases",
                         snapshotRepo: "maven-snapshots"
                 )
-                rtMavenResolver(
-                        id: "maven-resolver",
-                        serverId: "opencollab-artifactory",
-                        releaseRepo: "maven-deploy-release",
-                        snapshotRepo: "maven-deploy-snapshot"
+                rtGradleResolver(
+                        id: "GRADLE_RESOLVER",
+                        serverId: "opencollab-artifactory"
                 )
-                rtMavenRun(
-                        pom: 'pom.xml',
-                        goals: 'javadoc:jar source:jar install -pl :core -am -DskipTests',
-                        deployerId: "maven-deployer",
-                        resolverId: "maven-resolver"
+                rtGradleRun(
+                        usesPlugin: true,
+                        tool: 'Gradle 7',
+                        rootDir: "",
+                        useWrapper: true,
+                        buildFile: 'build.gradle.kts',
+                        tasks: 'artifactoryPublish',
+                        deployerId: "GRADLE_DEPLOYER",
+                        resolverId: "GRADLE_RESOLVER"
                 )
                 rtPublishBuildInfo(
                         serverId: "opencollab-artifactory"
@@ -94,7 +101,6 @@ pipeline {
         success {
             script {
                 if (env.BRANCH_NAME == 'master') {
-                    build propagate: false, wait: false, job: 'GeyserMC/Geyser-Fabric/master', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
                     build propagate: false, wait: false, job: 'GeyserMC/GeyserConnect/master', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
                 }
             }

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
-### Currently supporting Minecraft Bedrock 1.19.0 - 1.19.10/1.19.11 and Minecraft Java 1.19.0.
+### Currently supporting Minecraft Bedrock 1.19.20 - 1.19.51 and Minecraft Java 1.19.3.
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.
@@ -34,7 +34,6 @@ Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Ge
 
 ## What's Left to be Added/Fixed
 - Near-perfect movement (to the point where anticheat on large servers is unlikely to ban you)
-- Resource pack conversion/CustomModelData
 - Some Entity Flags
 - Structure block UI
 
@@ -43,9 +42,8 @@ There are a few things Geyser is unable to support due to various differences be
 
 ## Compiling
 1. Clone the repo to your computer
-2. [Install Maven](https://maven.apache.org/install.html)
-3. Navigate to the Geyser root directory and run `git submodule update --init --recursive`. This command downloads all the needed submodules for Geyser and is a crucial step in this process.
-4. Run `mvn clean install` and locate to the `target` folder.
+2. Navigate to the Geyser root directory and run `git submodule update --init --recursive`. This command downloads all the needed submodules for Geyser and is a crucial step in this process.
+3. Run `gradlew build` and locate to `bootstrap/build` folder.
 
 ## Contributing
 Any contributions are appreciated. Please feel free to reach out to us on [Discord](http://discord.geysermc.org/) if

diff --git a/ap/build.gradle.kts b/ap/build.gradle.kts
diff --git a/ap/pom.xml b/ap/pom.xml
diff --git a/...sermc/processor/BlockEntityProcessor.java → ...eyser/processor/BlockEntityProcessor.java b/...sermc/processor/BlockEntityProcessor.java → ...eyser/processor/BlockEntityProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;

diff --git a/...rg/geysermc/processor/ClassProcessor.java → ...ermc/geyser/processor/ClassProcessor.java b/...rg/geysermc/processor/ClassProcessor.java → ...ermc/geyser/processor/ClassProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -39,6 +39,7 @@
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
@@ -163,10 +164,15 @@ private BufferedReader createReader() throws IOException {
             this.processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Reading existing " + this.annotationClassName + " list from " + this.outputPath);
             return Files.newBufferedReader(this.outputPath);
         }
+
         FileObject obj = this.processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, "", this.annotationClassName);
         if (obj != null) {
             this.processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Reading existing " + this.annotationClassName + " list from " + obj.toUri());
-            return new BufferedReader(obj.openReader(false));
+            try {
+                return new BufferedReader(obj.openReader(false));
+            } catch (NoSuchFileException ignored) {
+                return null;
+            }
         }
         return null;
     }

diff --git a/...processor/CollisionRemapperProcessor.java → ...processor/CollisionRemapperProcessor.java b/...processor/CollisionRemapperProcessor.java → ...processor/CollisionRemapperProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;

diff --git a/...ermc/processor/ItemRemapperProcessor.java → ...yser/processor/ItemRemapperProcessor.java b/...ermc/processor/ItemRemapperProcessor.java → ...yser/processor/ItemRemapperProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;

diff --git a/.../processor/PacketTranslatorProcessor.java → .../processor/PacketTranslatorProcessor.java b/.../processor/PacketTranslatorProcessor.java → .../processor/PacketTranslatorProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;

diff --git a/...ermc/processor/SoundHandlerProcessor.java → ...yser/processor/SoundHandlerProcessor.java b/...ermc/processor/SoundHandlerProcessor.java → ...yser/processor/SoundHandlerProcessor.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.processor;
+package org.geysermc.geyser.processor;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;

diff --git a/ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1,5 @@
+org.geysermc.geyser.processor.BlockEntityProcessor
+org.geysermc.geyser.processor.CollisionRemapperProcessor
+org.geysermc.geyser.processor.ItemRemapperProcessor
+org.geysermc.geyser.processor.PacketTranslatorProcessor
+org.geysermc.geyser.processor.SoundHandlerProcessor
diff --git a/api/base/build.gradle.kts b/api/base/build.gradle.kts
@@ -0,0 +1,7 @@
+dependencies {
+    api(libs.cumulus)
+    api(libs.events) {
+        exclude(group = "com.google.guava", module = "guava")
+        exclude(group = "org.lanternpowered", module = "lmbda")
+    }
+}
diff --git a/api/base/pom.xml b/api/base/pom.xml
diff --git a/api/base/src/main/java/org/geysermc/api/Geyser.java b/api/base/src/main/java/org/geysermc/api/Geyser.java
@@ -39,6 +39,7 @@ public class Geyser {
      *
      * @return the base api
      */
+    @NonNull
     public static GeyserApiBase api() {
         if (api == null) {
             throw new RuntimeException("Api has not been registered yet!");
@@ -69,7 +70,7 @@ public static <T extends GeyserApiBase> T api(@NonNull Class<T> apiClass) {
 
     /**
      * Registers the given api type. The api cannot be
-     * registered if {@link #registered()} is true as
+     * registered if {@link #isRegistered()} is true as
      * an api has already been specified.
      *
      * @param api the api
@@ -88,7 +89,7 @@ public static void set(@NonNull GeyserApiBase api) {
      *
      * @return if the api has been registered
      */
-    public static boolean registered() {
+    public static boolean isRegistered() {
         return api != null;
     }
 }