support Minecraft 1.20.2+

Author: robinbraemer

.github/workflows/pullrequest.yml

@@ -8,7 +8,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2

.github/workflows/release.yml

@@ -18,11 +18,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '17'
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

.gitignore

@@ -1,5 +1,5 @@
-# Created by https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all
-# Edit at https://www.gitignore.io/?templates=git,java,maven,eclipse,netbeans,jetbrains+all
+# Created by https://www.gitignore.io/api/git,java,gradle,eclipse,netbeans,jetbrains+all
+# Edit at https://www.gitignore.io/?templates=git,gradle,maven,eclipse,netbeans,jetbrains+all
 
 ### Eclipse ###
 .metadata
@@ -52,22 +52,19 @@ local.properties
 
 # Annotation Processing
 .apt_generated/
+.apt_generated_test/
 
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies
 .worksheet
 
-### Eclipse Patch ###
-# Eclipse Core
-.project
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# Annotation Processing
-.apt_generated
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
 
+### Eclipse Patch ###
+# Spring Boot Tooling
 .sts4-cache/
 
 ### Git ###
@@ -109,9 +106,10 @@ local.properties
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+replay_pid*
 
 ### JetBrains+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
@@ -121,6 +119,9 @@ hs_err_pid*
 .idea/**/dictionaries
 .idea/**/shelf
 
+# AWS User-specific
+.idea/**/aws.xml
+
 # Generated files
 .idea/**/contentModel.xml
 
@@ -141,11 +142,14 @@ hs_err_pid*
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
 
 # CMake
 cmake-build-*/
@@ -168,6 +172,9 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 
+# SonarLint plugin
+.idea/sonarlint/
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
@@ -181,32 +188,13 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 
 ### JetBrains+all Patch ###
-# Ignores the whole .idea folder and all .iml files
-# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
-
-.idea/
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
 
-# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+.idea/*
 
-*.iml
-modules.xml
-.idea/misc.xml
-*.ipr
-
-# Sonarlint plugin
-.idea/sonarlint
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
+!.idea/codeStyles
+!.idea/runConfigurations
 
 ### NetBeans ###
 **/nbproject/private/
@@ -218,6 +206,29 @@ dist/
 nbdist/
 .nb-gradle/
 
-# End of https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all
-gradle/
-**/.gradle/
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# End of https://www.gitignore.io/api/git,java,gradle,eclipse,netbeans,jetbrains+all
+
+/core/src/main/resources/languages/

Jenkinsfile

@@ -57,8 +57,4 @@ public static boolean set(
         return true;
     }
 
-    @SuppressWarnings("unchecked")
-    public static <T extends ConnectApi> T castApi(Class<T> cast) {
-        return (T) api;
-    }
 }

api/src/main/java/com/minekube/connect/api/InstanceHolder.java

@@ -36,14 +36,13 @@
 public interface PlatformInjector {
 
     /**
-     * @return
+     * @return the server socket address
      */
     SocketAddress getServerSocketAddress();
 
     /**
      * Injects the server connection.
      *
-     * @return true if the connection has successfully been injected
      * @throws Exception if something went wrong while injecting the server connection
      */
     boolean inject() throws Exception;

api/src/main/java/com/minekube/connect/api/inject/PlatformInjector.java

@@ -24,7 +24,7 @@
  */
 
 object Versions {
-    const val spigotVersion = "1.13-R0.1-SNAPSHOT"
+    const val spigotVersion = "1.19.4-R0.1-SNAPSHOT"
     const val configUtilsVersion = "1.0-SNAPSHOT"
     const val guiceVersion = "5.0.1"
     const val nettyVersion = "4.1.49.Final"

build-logic/src/main/kotlin/Versions.kt

@@ -6,7 +6,7 @@ plugins {
 
 allprojects {
     group = "com.minekube.connect"
-    version = "0.4.0"
+    version = "0.5.0"
     description =
         "Connects the server/proxy to the global Connect network to reach more players while also supporting online mode server, bungee or velocity mode. Visit https://minekube.com/connect"
 }

build.gradle.kts

@@ -1,4 +1,4 @@
-var bungeeCommit = "ff5727c"
+var bungeeCommit = "master-SNAPSHOT"
 var gsonVersion = "2.8.0"
 var guavaVersion = "21.0"
 
@@ -13,9 +13,10 @@ relocate("net.kyori")
 relocate("cloud.commandframework")
 // used in cloud
 relocate("io.leangen.geantyref")
+// since 1.20
+relocate("org.yaml")
 
 // these dependencies are already present on the platform
 provided("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeCommit)
 provided("com.google.code.gson", "gson", gsonVersion)
 provided("com.google.guava", "guava", guavaVersion)
-provided("org.yaml", "snakeyaml", Versions.snakeyamlVersion)

bungee/build.gradle.kts

@@ -13,7 +13,6 @@ dependencies {
 
     api("com.google.inject", "guice", Versions.guiceVersion)
     api("cloud.commandframework", "cloud-core", Versions.cloudVersion)
-    api("org.yaml", "snakeyaml", Versions.snakeyamlVersion)
     api("org.bstats", "bstats-base", Versions.bstatsVersion)
 
     implementation("com.squareup.okhttp3:okhttp:4.9.3")

core/build.gradle.kts

@@ -1,3 +1,4 @@
+@file:Suppress("UnstableApiUsage")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
@@ -12,7 +13,8 @@ dependencyResolutionManagement {
         }
 
         // Paper, Velocity
-        maven("https://papermc.io/repo/repository/maven-public")
+//        maven("https://papermc.io/repo/repository/maven-public")
+        maven("https://repo.papermc.io/repository/maven-public")
         // Spigot
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
             mavenContent { snapshotsOnly() }