Merge branch '2.0' into feat/1.21.4-support

Author: booky10

.github/workflows/gradle-publish.yml

@@ -62,3 +62,9 @@ jobs:
         with:
           name: fabric-build
           path: fabric/build/libs
+
+      - name: Upload build artifacts sponge
+        uses: actions/upload-artifact@v4
+        with:
+          name: sponge-build
+          path: sponge/build/libs

api/build.gradle.kts

@@ -113,11 +113,11 @@ mappingCompression {
 }
 
 tasks {
+    assemble {
+        setDependsOn(dependsOn.filterNot { it == "shadowNoAdventure" })
+    }
+
     javadoc {
-        setDestinationDir(file("${project.layout.buildDirectory.asFile.get()}/docs/javadoc"))
-        options {
-            (this as CoreJavadocOptions).addBooleanOption("Xdoclint:none", true)
-        }
         mustRunAfter(generateVersionsFile)
     }
 

api/src/main/java/com/github/retrooper/packetevents/protocol/component/builtin/item/ItemPotionContents.java

@@ -18,6 +18,7 @@
 
 package com.github.retrooper.packetevents.protocol.component.builtin.item;
 
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.potion.Potion;
 import com.github.retrooper.packetevents.protocol.potion.PotionEffect;
 import com.github.retrooper.packetevents.protocol.potion.Potions;
@@ -32,28 +33,44 @@ public class ItemPotionContents {
     private @Nullable Potion potion;
     private @Nullable Integer customColor;
     private List<PotionEffect> customEffects;
+    private @Nullable String customName;
 
     public ItemPotionContents(
             @Nullable Potion potion,
             @Nullable Integer customColor,
             List<PotionEffect> customEffects
+    ) {
+        this(potion, customColor, customEffects, null);
+    }
+
+    public ItemPotionContents(
+            @Nullable Potion potion,
+            @Nullable Integer customColor,
+            List<PotionEffect> customEffects,
+            @Nullable String customName
     ) {
         this.potion = potion;
         this.customColor = customColor;
         this.customEffects = customEffects;
+        this.customName = customName;
     }
 
     public static ItemPotionContents read(PacketWrapper<?> wrapper) {
         Potion potionId = wrapper.readOptional(ew -> ew.readMappedEntity(Potions::getById));
         Integer customColor = wrapper.readOptional(PacketWrapper::readInt);
         List<PotionEffect> customEffects = wrapper.readList(PotionEffect::read);
-        return new ItemPotionContents(potionId, customColor, customEffects);
+        String customName = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2)
+                ? wrapper.readOptional(PacketWrapper::readString) : null;
+        return new ItemPotionContents(potionId, customColor, customEffects, customName);
     }
 
     public static void write(PacketWrapper<?> wrapper, ItemPotionContents contents) {
         wrapper.writeOptional(contents.potion, PacketWrapper::writeMappedEntity);
         wrapper.writeOptional(contents.customColor, PacketWrapper::writeInt);
         wrapper.writeList(contents.customEffects, PotionEffect::write);
+        if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2)) {
+            wrapper.writeOptional(contents.customName, PacketWrapper::writeString);
+        }
     }
 
     public @Nullable Potion getPotion() {
@@ -84,18 +101,27 @@ public void setCustomEffects(List<PotionEffect> customEffects) {
         this.customEffects = customEffects;
     }
 
+    public @Nullable String getCustomName() {
+        return this.customName;
+    }
+
+    public void setCustomName(@Nullable String customName) {
+        this.customName = customName;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
         if (!(obj instanceof ItemPotionContents)) return false;
         ItemPotionContents that = (ItemPotionContents) obj;
         if (!Objects.equals(this.potion, that.potion)) return false;
         if (!Objects.equals(this.customColor, that.customColor)) return false;
-        return this.customEffects.equals(that.customEffects);
+        if (!this.customEffects.equals(that.customEffects)) return false;
+        return Objects.equals(this.customName, that.customName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.potion, this.customColor, this.customEffects);
+        return Objects.hash(this.potion, this.customColor, this.customEffects, this.customName);
     }
 }

api/src/main/java/com/github/retrooper/packetevents/protocol/world/BlockFace.java

@@ -153,6 +153,33 @@ public BlockFace getCW() {
         }
     }
 
+    /**
+     * Returns an integer representing cardinal directions with south as the starting index at 0. UP and DOWN return -1
+     * <p>
+     * Used by Mojang for calculations involving mob AI, decorations, paintings, item frames, maps,
+     * structure generation, campfires, stairs, connecting blocks, and flowerbeds.
+     * Also used for getting directions and block faces as rotations.
+     *
+     * @return integer horizontal id
+     */
+    public int getHorizontalId() {
+        switch (this) {
+            case DOWN:
+            case UP:
+                return -1;
+            case NORTH:
+                return 2;
+            case SOUTH:
+                return 0;
+            case WEST:
+                return 1;
+            case EAST:
+                return 3;
+            default:
+                throw new IllegalArgumentException("Invalid block face input for getHorizontalId");
+        }
+    }
+
     public short getFaceValue() {
         return faceValue;
     }

build.gradle.kts

@@ -1,7 +1,7 @@
 import java.io.ByteArrayOutputStream
 
 // TODO UPDATE
-val fullVersion = "2.6.0"
+val fullVersion = "2.6.1"
 val snapshot = true
 
 group = "com.github.retrooper"
@@ -70,11 +70,5 @@ allprojects {
         withType<Jar> {
             archiveVersion = rootProject.ext["versionNoHash"] as String
         }
-
-        withType<Javadoc> {
-            title = "packetevents-${project.name} v${rootProject.version}"
-            options.encoding = Charsets.UTF_8.name()
-            options.overview = rootProject.file("buildSrc/src/main/resources/javadoc-overview.html").toString()
-        }
     }
 }

buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts

@@ -35,6 +35,16 @@ tasks {
         options.release = 8
     }
 
+    javadoc {
+        title = "packetevents-${project.name} v${rootProject.version}"
+        options.encoding = Charsets.UTF_8.name()
+        options.overview = rootProject.file("buildSrc/src/main/resources/javadoc-overview.html").toString()
+        setDestinationDir(file("${project.layout.buildDirectory.asFile.get()}/docs/javadoc"))
+        options {
+            (this as CoreJavadocOptions).addBooleanOption("Xdoclint:none", true)
+        }
+    }
+
     processResources {
         inputs.property("version", project.version)
         filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json", "fabric.mod.json")) {

buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts

@@ -28,9 +28,46 @@ tasks {
         mergeServiceFiles()
     }
 
+    create<ShadowJar>("shadowNoAdventure") {
+        group = rootProject.name
+        description = "Create a combined JAR of project and runtime dependencies without Adventure dependencies."
+        archiveFileName = "packetevents-${project.name}-no-adv-${rootProject.ext["versionNoHash"]}.jar"
+        archiveClassifier = null
+
+        val shadowJar = shadowJar.get()
+        val sourceSets = project.extensions.getByType<SourceSetContainer>()
+
+        manifest.inheritFrom(shadowJar.manifest)
+
+        from(sourceSets.main.get().output)
+        configurations = shadowJar.configurations
+
+        relocate("net.kyori.adventure.text.serializer", "io.github.retrooper.packetevents.adventure.serializer")
+        relocate("net.kyori.option", "io.github.retrooper.packetevents.adventure.option")
+        relocate("org.bstats", "io.github.retrooper.packetevents.bstats")
+
+        dependencies {
+            exclude(dependency("net.kyori:adventure-api:.*"))
+            exclude(dependency("net.kyori:adventure-key:.*"))
+            exclude(dependency("net.kyori:adventure-nbt:.*"))
+            exclude(dependency("net.kyori:examination-api:.*"))
+            exclude(dependency("net.kyori:examination-string:.*"))
+            exclude(dependency("com.google.code.gson:gson:.*"))
+            exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "module-info.class")
+        }
+
+        mergeServiceFiles()
+    }
+
     assemble {
         dependsOn(shadowJar)
     }
+
+    if (project.properties.contains("no-adv")) {
+        assemble {
+            dependsOn("shadowNoAdventure")
+        }
+    }
 }
 
 configurations.implementation.get().extendsFrom(configurations.shadow.get())

buildSrc/src/main/resources/javadoc-overview.html

@@ -1,7 +1,6 @@
 <body>
 <p>
-    PacketEvents is a fast and efficient multi-platform packet processing library for Minecraft.
-    Our packet wrappers are easy to use with multi-version support.
+    Precision meets performance—a powerful tool for mastering Minecraft packet manipulation with speed and finesse.
 </p>
 
 <p>Javadoc links:</p>
@@ -10,6 +9,8 @@
     <li><a href="https://javadocs.packetevents.com/spigot/">packetevents-spigot</a></li>
     <li><a href="https://javadocs.packetevents.com/velocity/">packetevents-velocity</a></li>
     <li><a href="https://javadocs.packetevents.com/bungeecord/">packetevents-bungeecord</a></li>
+    <li><a href="https://javadocs.packetevents.com/fabric/">packetevents-fabric</a></li>
+    <li><a href="https://javadocs.packetevents.com/sponge/">packetevents-sponge</a></li>
     <li><a href="https://javadocs.packetevents.com/netty-common/">packetevents-netty-common</a></li>
 </ul>
 </body>

fabric/build.gradle.kts

@@ -43,11 +43,13 @@ tasks {
         }
     }
 
-    sequenceOf(remapJar, remapSourcesJar).forEach {
-        it {
-            archiveBaseName = "${rootProject.name}-fabric"
-            archiveVersion = rootProject.ext["versionNoHash"] as String
-        }
+    remapJar {
+        archiveBaseName = "${rootProject.name}-fabric"
+        archiveVersion = rootProject.ext["versionNoHash"] as String
+    }
+
+    remapSourcesJar {
+        archiveVersion = rootProject.ext["versionNoHash"] as String
     }
 }