Revert "Merge branch 'dev/3.0.0' into ping-passthrough-dev"

This reverts commit 4a32358, reversing
changes made to 2c41819.

Author: TheMiningTeamYT

.github/workflows/gradle.yml

@@ -14,10 +14,10 @@ jobs:
         persist-credentials: false
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v4
-    - name: Set up JDK 21
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: 21
-        distribution: 'zulu'
+        java-version: 17
+        distribution: 'temurin'
     - name: Build with Gradle
       run: ./gradlew build

api/src/main/java/com/velocitypowered/api/command/CommandManager.java

@@ -7,10 +7,8 @@
 
 package com.velocitypowered.api.command;
 
-import com.mojang.brigadier.suggestion.Suggestions;
 import com.velocitypowered.api.event.command.CommandExecuteEvent;
 import java.util.Collection;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -118,27 +116,6 @@ default void register(String alias, Command command, String... otherAliases) {
    */
   CompletableFuture<Boolean> executeImmediatelyAsync(CommandSource source, String cmdLine);
 
-  /**
-   * Asynchronously collects suggestions to fill in the given command {@code cmdLine}.
-   * Returns only the raw completion suggestions without tooltips.
-   *
-   * @param source  the source to execute the command for
-   * @param cmdLine the partially completed command
-   * @return a {@link CompletableFuture} eventually completed with a {@link List}, possibly empty
-   */
-  CompletableFuture<List<String>> offerSuggestions(CommandSource source, String cmdLine);
-
-  /**
-   * Asynchronously collects suggestions to fill in the given command {@code cmdLine}.
-   * Returns the brigadier {@link Suggestions} with tooltips for each result.
-   *
-   * @param source  the source to execute the command for
-   * @param cmdLine the partially completed command
-   * @return a {@link CompletableFuture} eventually completed with {@link Suggestions}, possibly
-   *         empty
-   */
-  CompletableFuture<Suggestions> offerBrigadierSuggestions(CommandSource source, String cmdLine);
-
   /**
    * Returns an immutable collection of the case-insensitive aliases registered
    * on this manager.

api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java

@@ -90,9 +90,7 @@ public boolean isSupported() {
   MINECRAFT_1_21(767, "1.21", "1.21.1"),
   MINECRAFT_1_21_2(768, "1.21.2", "1.21.3"),
   MINECRAFT_1_21_4(769, "1.21.4"),
-  MINECRAFT_1_21_5(770, "1.21.5"),
-  MINECRAFT_1_21_6(771, "1.21.6"),
-  MINECRAFT_1_21_7(772, "1.21.7", "1.21.8");
+  MINECRAFT_1_21_5(770, /*1073742067,*/ "1.21.5");
 
   private static final int SNAPSHOT_BIT = 30;
 

build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts

@@ -2,15 +2,8 @@ import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.withType
 import java.io.ByteArrayOutputStream
 
-// This interface is needed as a workaround to get an instance of ExecOperations
-interface Injected {
-    @get:Inject
-    val execOps: ExecOperations
-}
-
 val currentShortRevision = ByteArrayOutputStream().use {
-    val execOps = objects.newInstance<Injected>().execOps
-    execOps.exec {
+    exec {
         executable = "git"
         args = listOf("rev-parse", "HEAD")
         standardOutput = it

build-logic/src/main/kotlin/velocity-publish.gradle.kts

@@ -8,7 +8,7 @@ extensions.configure<PublishingExtension> {
         maven {
             credentials(PasswordCredentials::class.java)
 
-            name = if (version.toString().endsWith("SNAPSHOT")) "paperSnapshots" else "paper" // "paper" is seemingly not defined
+            name = "paper"
             val base = "https://repo.papermc.io/repository/maven"
             val releasesRepoUrl = "$base-releases/"
             val snapshotsRepoUrl = "$base-snapshots/"

build.gradle.kts

@@ -20,11 +20,11 @@ subprojects {
         testImplementation(rootProject.libs.junit)
     }
 
-    testing.suites.named<JvmTestSuite>("test") {
-        useJUnitJupiter()
-        targets.all {
-            testTask.configure {
-                reports.junitXml.required = true
+    tasks {
+        test {
+            useJUnitPlatform()
+            reports {
+                junitXml.required.set(true)
             }
         }
     }

gradle/libs.versions.toml

@@ -2,20 +2,19 @@
 configurate3 = "3.7.3"
 configurate4 = "4.1.2"
 flare = "2.0.1"
-log4j = "2.24.3"
-netty = "4.2.4.Final"
+log4j = "2.24.1"
+netty = "4.2.0.Final"
 
 [plugins]
-fill = "io.papermc.fill.gradle:1.0.3"
 indra-publishing = "net.kyori.indra.publishing:2.0.6"
-shadow = "com.gradleup.shadow:8.3.6"
+shadow = "io.github.goooler.shadow:8.1.5"
 spotless = "com.diffplug.spotless:6.25.0"
 
 [libraries]
-adventure-bom = "net.kyori:adventure-bom:4.24.0"
-adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:4.24.0"
+adventure-bom = "net.kyori:adventure-bom:4.19.0"
+adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:4.19.0"
 adventure-facet = "net.kyori:adventure-platform-facet:4.3.4"
-asm = "org.ow2.asm:asm:9.8"
+asm = "org.ow2.asm:asm:9.7.1"
 auto-service = "com.google.auto.service:auto-service:1.0.1"
 auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.0.1"
 brigadier = "com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT"
@@ -34,7 +33,7 @@ disruptor = "com.lmax:disruptor:4.0.0"
 fastutil = "it.unimi.dsi:fastutil:8.5.15"
 flare-core = { module = "space.vectrix.flare:flare", version.ref = "flare" }
 flare-fastutil = { module = "space.vectrix.flare:flare-fastutil", version.ref = "flare" }
-jline = "org.jline:jline-terminal-jansi:3.30.2"
+jline = "org.jline:jline-terminal-jansi:3.27.1"
 jopt = "net.sf.jopt-simple:jopt-simple:5.0.4"
 junit = "org.junit.jupiter:junit-jupiter:5.10.2"
 jspecify = "org.jspecify:jspecify:0.3.0"
@@ -57,7 +56,7 @@ netty-transport-native-epoll = { module = "io.netty:netty-transport-native-epoll
 netty-transport-native-kqueue = { module = "io.netty:netty-transport-native-kqueue", version.ref = "netty" }
 netty-transport-native-iouring = { module = "io.netty:netty-transport-native-io_uring", version.ref = "netty" }
 nightconfig = "com.electronwill.night-config:toml:3.6.7"
-slf4j = "org.slf4j:slf4j-api:2.0.17"
+slf4j = "org.slf4j:slf4j-api:2.0.12"
 snakeyaml = "org.yaml:snakeyaml:1.33"
 spotbugs-annotations = "com.github.spotbugs:spotbugs-annotations:4.7.3"
 terminalconsoleappender = "net.minecrell:terminalconsoleappender:1.3.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

proxy/build.gradle.kts

@@ -1,11 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
-import io.papermc.fill.model.BuildChannel
 
 plugins {
     application
     id("velocity-init-manifest")
     alias(libs.plugins.shadow)
-    alias(libs.plugins.fill)
 }
 
 application {
@@ -102,32 +100,13 @@ tasks {
     runShadow {
         workingDir = file("run").also(File::mkdirs)
         standardInput = System.`in`
-        jvmArgs("-Dvelocity.packet-decode-logging=true")
     }
     named<JavaExec>("run") {
         workingDir = file("run").also(File::mkdirs)
         standardInput = System.`in` // Doesn't work?
     }
 }
 
-val projectVersion = version as String
-fill {
-    project("velocity")
-
-    build {
-        channel = BuildChannel.STABLE
-        versionFamily("3.0.0")
-        version(projectVersion)
-
-        downloads {
-            register("server:default") {
-                file = tasks.shadowJar.flatMap { it.archiveFile }
-                nameResolver.set { project, _, version, build -> "$project-$version-$build.jar" }
-            }
-        }
-    }
-}
-
 dependencies {
     implementation(project(":velocity-api"))
     implementation(project(":velocity-native"))

proxy/src/main/java/com/velocitypowered/proxy/Velocity.java

@@ -47,11 +47,6 @@ public class Velocity {
       System.setProperty("io.netty.native.workdir", System.getProperty("velocity.natives-tmpdir"));
     }
 
-    // Restore allocator used before Netty 4.2 due to oom issues with the adaptive allocator
-    if (System.getProperty("io.netty.allocator.type") == null) {
-      System.setProperty("io.netty.allocator.type", "pooled");
-    }
-
     // Disable the resource leak detector by default as it reduces performance. Allow the user to
     // override this if desired.
     if (!VelocityProperties.hasProperty("io.netty.leakDetection.level")) {