11

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
   build:
 
     if: "github.event_name == 'workflow_dispatch'"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2.4.2

build.gradle

@@ -20,7 +20,7 @@ tasks {
 
 allprojects {
     group = "com.github.kaspiandev.antipopup"
-    version = "10.1"
+    version = "11"
 
     repositories {
         mavenCentral()
@@ -39,7 +39,7 @@ allprojects {
         }
         maven {
             name = "codemc"
-            url = "https://repo.codemc.io/repository/maven-releases/"
+            url = "https://repo.codemc.io/repository/maven-public/"
         }
     }
 

gradle.properties

@@ -1,4 +1,4 @@
-userdevVer=1.7.1
+userdevVer=2.0.0-beta.16
 shadowVer=8.1.7
 tinyRemapperVer=0.10.3
-packetEventsVer=2.7.0
+packetEventsVer=2.8.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -7,5 +7,6 @@ pluginManagement {
 
 rootProject.name = "AntiPopup"
 include "spigot", "shared", "nms", "v1.19.2", "v1.19.3", "v1.19.4",
-        "v1.20.1", "v1.20.2", "v1.20.4", "v1.20.6", "v1.21", "v1.21.2", "v1.21.4", "velocity"
+        "v1.20.1", "v1.20.2", "v1.20.4", "v1.20.6", "v1.21",
+        "v1.21.2", "v1.21.4", "v1.21.5", "velocity"
 

spigot/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     implementation project(path: ":v1.21", configuration: "reobf")
     implementation project(path: ":v1.21.2", configuration: "reobf")
     implementation project(path: ":v1.21.4", configuration: "reobf")
+    implementation project(path: ":v1.21.5", configuration: "reobf")
 
     compileOnly "org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT"
     compileOnly "com.viaversion:viaversion:5.2.0"

spigot/src/main/java/com/github/kaspiandev/antipopup/spigot/AntiPopup.java

@@ -14,6 +14,7 @@
 import com.github.kaspiandev.antipopup.nms.v1_21.PlayerInjector_v1_21;
 import com.github.kaspiandev.antipopup.nms.v1_21_2.PlayerInjector_v1_21_2;
 import com.github.kaspiandev.antipopup.nms.v1_21_4.PlayerInjector_v1_21_4;
+import com.github.kaspiandev.antipopup.nms.v1_21_5.PlayerInjector_v1_21_5;
 import com.github.kaspiandev.antipopup.spigot.api.Api;
 import com.github.kaspiandev.antipopup.spigot.hook.HookManager;
 import com.github.kaspiandev.antipopup.spigot.hook.viaversion.ViaVersionHook;
@@ -121,6 +122,7 @@ public void onEnable() {
         if (config.isBlockChatReports()) {
             if (!config.isExperimentalMode()) {
                 PlayerListener playerListener = switch (serverManager.getVersion()) {
+                    case V_1_21_5 -> new PlayerListener(new PlayerInjector_v1_21_5());
                     case V_1_21_4 -> new PlayerListener(new PlayerInjector_v1_21_4());
                     case V_1_21_2, V_1_21_3 -> new PlayerListener(new PlayerInjector_v1_21_2());
                     case V_1_21, V_1_21_1 -> new PlayerListener(new PlayerInjector_v1_21());

v1.21.5/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id "java"
+    id "io.papermc.paperweight.userdev" version "${userdevVer}"
+}
+
+dependencies {
+    compileOnly project(path: ":shared")
+    compileOnly project(path: ":nms")
+
+    paperweightDevelopmentBundle "io.papermc.paper:dev-bundle:1.21.5-R0.1-SNAPSHOT"
+    //pluginRemapper "net.fabricmc:tiny-remapper:0.11.1:fat"
+}
+
+java {
+    disableAutoTargetJvm()
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}