From 65b68087b84aaccc78fc3664ace7ed04a993adc6 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Mon, 28 Feb 2022 10:07:45 -0500
Subject: [PATCH] Bump Geyser to 2.0.2 and Java to 1.18.2
---
README.md | 2 +-
ap/pom.xml | 4 ++--
api/base/pom.xml | 2 +-
api/geyser/pom.xml | 4 ++--
api/pom.xml | 2 +-
bootstrap/bungeecord/pom.xml | 4 ++--
bootstrap/pom.xml | 4 ++--
bootstrap/spigot/pom.xml | 4 ++--
bootstrap/sponge/pom.xml | 4 ++--
bootstrap/standalone/pom.xml | 4 ++--
bootstrap/velocity/pom.xml | 4 ++--
common/pom.xml | 2 +-
core/pom.xml | 10 +++++-----
.../org/geysermc/geyser/network/MinecraftProtocol.java | 7 ++-----
pom.xml | 2 +-
15 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/README.md b/README.md
index 593514e52..885ec920b 100644
--- 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.17.41 + 1.18.0 - 1.18.10 and Minecraft Java 1.18/1.18.1.
+### Currently supporting Minecraft Bedrock 1.17.41 + 1.18.0 - 1.18.10 and Minecraft Java 1.18.2.
## Setting Up
Take a look [here](https://github.com/GeyserMC/Geyser/wiki/Setup) for how to set up Geyser.
diff --git a/ap/pom.xml b/ap/pom.xml
index dce28a7d7..75f98275c 100644
--- a/ap/pom.xml
+++ b/ap/pom.xml
@@ -6,9 +6,9 @@
org.geysermc
geyser-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
ap
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
\ No newline at end of file
diff --git a/api/base/pom.xml b/api/base/pom.xml
index 17edb1a85..37e97ef7e 100644
--- a/api/base/pom.xml
+++ b/api/base/pom.xml
@@ -5,7 +5,7 @@
org.geysermc
api-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
4.0.0
diff --git a/api/geyser/pom.xml b/api/geyser/pom.xml
index 26f4ddf30..9255bc579 100644
--- a/api/geyser/pom.xml
+++ b/api/geyser/pom.xml
@@ -5,7 +5,7 @@
org.geysermc
api-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
4.0.0
@@ -26,7 +26,7 @@
org.geysermc
base-api
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
diff --git a/api/pom.xml b/api/pom.xml
index bc70be6c3..bae0da039 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
api-parent
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 45a08c7db..f06a219bb 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
bootstrap-bungeecord
@@ -14,7 +14,7 @@
org.geysermc
core
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 58c651455..381f68bc2 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
bootstrap-parent
pom
@@ -34,7 +34,7 @@
org.geysermc
ap
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
provided
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 6eda527f3..3a8939ce3 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
bootstrap-spigot
@@ -25,7 +25,7 @@
org.geysermc
core
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index ab3b7d970..6285c6dbf 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
bootstrap-sponge
@@ -14,7 +14,7 @@
org.geysermc
core
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index d0ef39bcf..6babc6933 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
bootstrap-standalone
@@ -18,7 +18,7 @@
org.geysermc
core
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index ff052471d..1621d6ee6 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
bootstrap-velocity
@@ -14,7 +14,7 @@
org.geysermc
core
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
diff --git a/common/pom.xml b/common/pom.xml
index fde2605bc..a563b7aff 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
common
diff --git a/core/pom.xml b/core/pom.xml
index f2812fea0..4a6d8b5ec 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
core
@@ -21,19 +21,19 @@
org.geysermc
ap
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
provided
org.geysermc
geyser-api
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
org.geysermc
common
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
compile
@@ -155,7 +155,7 @@
com.github.GeyserMC
MCProtocolLib
- 6a23a780
+ 7efa636
compile
diff --git a/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java b/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java
index c4bd05b13..c35b744e1 100644
--- a/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java
+++ b/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java
@@ -32,10 +32,7 @@ import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
import com.nukkitx.protocol.bedrock.v475.Bedrock_v475;
import com.nukkitx.protocol.bedrock.v486.Bedrock_v486;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.StringJoiner;
+import java.util.*;
/**
* Contains information about the supported protocols in Geyser.
@@ -92,7 +89,7 @@ public final class MinecraftProtocol {
* @return the supported Minecraft: Java Edition version names
*/
public static List getJavaVersions() {
- return Arrays.asList("1.18", "1.18.1");
+ return Collections.singletonList(DEFAULT_JAVA_CODEC.getMinecraftVersion());
}
/**
diff --git a/pom.xml b/pom.xml
index f00da7fc8..0599716fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.geysermc
geyser-parent
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
pom
Geyser
Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.