GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-27 10:49:10 +00:00
Code Issues Releases Activity

Deploy the Cumulus changes for Geyser so Floodgate can use them

Browse Source
This commit is contained in:
Tim203
2022-01-26 12:10:15 +01:00
parent 3011d89db6
commit 53de9f4a31
15 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@@ -23,6 +23,7 @@ pipeline {
stage ('Deploy') {
when {
branch "master"
branch "feature/cumulus-1.1" // allow Floodgate to build
}
steps {

4
ap/pom.xml
View File

@@ -6,9 +6,9 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>ap</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</project>

2
api/base/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>api-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
api/geyser/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>api-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>base-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
api/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>api-parent</artifactId>

4
bootstrap/bungeecord/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>bootstrap-bungeecord</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Used for better working with internals without reflection -->

4
bootstrap/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>bootstrap-parent</artifactId>
<packaging>pom</packaging>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>ap</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
bootstrap/spigot/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>bootstrap-spigot</artifactId>
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

4
bootstrap/sponge/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>bootstrap-sponge</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

4
bootstrap/standalone/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>bootstrap-standalone</artifactId>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

4
bootstrap/velocity/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>bootstrap-velocity</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

2
common/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>

8
core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>
@@ -21,19 +21,19 @@
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>ap</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>geyser-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>common</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Jackson JSON and YAML serialization -->

2
core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
View File

@@ -60,7 +60,7 @@ public class JavaCustomPayloadTranslator extends PacketTranslator<ClientboundCus
// receive: first byte is form type, second and third are the id, remaining is the form data
// respond: first and second byte id, remaining is form response data
FormType type = FormType.getByOrdinal(data[0]);
FormType type = FormType.fromOrdinal(data[0]);
if (type == null) {
throw new NullPointerException(
"Got type " + data[0] + " which isn't a valid form type!");

2
pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-cumulus-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geyser</name>
<description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description>