target 1.21.6

Author: deirn

.github/workflows/build_release.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           name: badpackets-${{ steps.vars.outputs.git_hash }}
           path: "./platform/*/build/libs/**.jar"
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:

gradle.properties

@@ -1,15 +1,15 @@
 org.gradle.jvmargs = -Xmx3G
 
-minecraft          = 1.21
+minecraft          = 1.21.6
 
 archiveBaseName    = badpackets
 group              = lol.bai
 majorVersion       = 0
 
-fabricLoader       = 0.15.11
-fabricApi          = 0.102.0+1.21
+fabricLoader       = 0.16.14
+fabricApi          = 0.127.0+1.21.6
 forge              = 51.0.8
-neo                = 21.0.8-beta
+neo                = 21.6.5-beta
 
 cf.projectId       = 615134
 mr.projectId       = ftdbN0KK

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase = GRADLE_USER_HOME
 distributionPath = wrapper/dists
 zipStoreBase     = GRADLE_USER_HOME
 zipStorePath     = wrapper/dists
-distributionUrl  = https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl  = https\://services.gradle.org/distributions/gradle-8.13-bin.zip

platform/fabric/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6.12"
+    id("fabric-loom") version "1.10.5"
 }
 
 setupPlatform()

platform/fabric/gradle.properties

@@ -3,9 +3,9 @@ cf.endpoint    = minecraft.curseforge.com
 cf.prefix      = [Fabric/Quilt]
 cf.releaseType = stable
 cf.loader      = Fabric, Quilt
-cf.gameVersion = 1.21, 1.21.1, 1.21.2, 1.21.3, 1.21.4
+cf.gameVersion = 1.21.6
 
 # Modrinth
 mr.releaseType = stable
 mr.loader      = fabric, quilt
-mr.gameVersion = 1.21, 1.21.1, 1.21.2, 1.21.3, 1.21.4
+mr.gameVersion = 1.21.6

platform/neo/build.gradle.kts

@@ -1,18 +1,30 @@
 plugins {
     idea
-    id("net.neoforged.gradle.userdev") version "7.0.142"
+    id("net.neoforged.moddev") version "2.0.95"
 }
 
 setupPlatform()
 
-dependencies {
-    implementation("net.neoforged:neoforge:${rootProp["neo"]}")
-}
+neoForge {
+    version = rootProp["neo"]
+
+    runs {
+        create("server") { server() }
+        create("client") {
+            client()
+            programArguments.addAll("--username", "A")
+        }
+
+        configureEach {
+            gameDirectory = file("run/${namer.determineName(this)}")
+        }
 
-runs {
-    configureEach {
-        modSource(sourceSets["main"])
-        modSource(sourceSets["testmod"])
+        mods {
+            create("badpackets") {
+                sourceSet(sourceSets["main"])
+                sourceSet(sourceSets["testmod"])
+            }
+        }
     }
 }
 

platform/neo/gradle.properties

@@ -3,9 +3,9 @@ cf.endpoint    = minecraft.curseforge.com
 cf.prefix      = [NeoForge]
 cf.releaseType = beta
 cf.loader      = NeoForge
-cf.gameVersion = 1.21, 1.21.1, 1.21.2, 1.21.3, 1.21.4
+cf.gameVersion = 1.21.6
 
 # Modrinth
 mr.releaseType = stable
 mr.loader      = neoforge
-mr.gameVersion = 1.21, 1.21.1, 1.21.2, 1.21.3, 1.21.4
+mr.gameVersion = 1.21.6

settings.gradle.kts

@@ -30,5 +30,5 @@ fun platform(name: String) {
 platform("mojmap")
 
 platform("fabric")
-platform("forge")
+//platform("forge")
 platform("neo")

src/main/java/lol/bai/badpackets/api/PacketSender.java

@@ -1,5 +1,6 @@
 package lol.bai.badpackets.api;
 
+import io.netty.channel.ChannelFutureListener;
 import lol.bai.badpackets.api.play.ClientPlayContext;
 import lol.bai.badpackets.api.play.PlayPackets;
 import lol.bai.badpackets.api.play.ServerPlayContext;
@@ -8,7 +9,6 @@
 import lol.bai.badpackets.impl.marker.ApiSide;
 import lol.bai.badpackets.impl.payload.UntypedPayload;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
@@ -78,7 +78,7 @@ default void send(CustomPacketPayload payload) {
      *
      * @param callback a callback in which will be called after the packet sent to the target.
      */
-    void send(CustomPacketPayload payload, @Nullable PacketSendListener callback);
+    void send(CustomPacketPayload payload, @Nullable ChannelFutureListener callback);
 
     /**
      * Send a packet to the target.
@@ -92,7 +92,7 @@ default void send(ResourceLocation id, FriendlyByteBuf buf) {
      *
      * @param callback a callback in which will be called after the packet sent to the target.
      */
-    default void send(ResourceLocation id, FriendlyByteBuf buf, @Nullable PacketSendListener callback) {
+    default void send(ResourceLocation id, FriendlyByteBuf buf, @Nullable ChannelFutureListener callback) {
         send(new UntypedPayload(UntypedPayload.type(id), buf), callback);
     }
 

src/main/java/lol/bai/badpackets/impl/handler/AbstractPacketHandler.java

@@ -1,6 +1,7 @@
 package lol.bai.badpackets.impl.handler;
 
 import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFutureListener;
 import lol.bai.badpackets.api.PacketReceiver;
 import lol.bai.badpackets.api.PacketSender;
 import lol.bai.badpackets.impl.Constants;
@@ -9,7 +10,6 @@
 import lol.bai.badpackets.impl.registry.ChannelRegistry;
 import net.minecraft.network.Connection;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
@@ -160,7 +160,7 @@ private void sendVanillaChannelRegisterPacket(Set<ResourceLocation> channels) {
     protected abstract Packet<?> createVanillaRegisterPacket(Set<ResourceLocation> channels, Consumer<B> buf);
 
     @Override
-    public void send(CustomPacketPayload payload, @Nullable PacketSendListener callback) {
+    public void send(CustomPacketPayload payload, @Nullable ChannelFutureListener callback) {
         connection.send(packetFactory.apply(payload), callback);
     }