resolve conflicts

Author: LPMC Dev

.github/workflows/JavaDoc.yml

@@ -0,0 +1,54 @@
+name: Build & Deploy Javadoc
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      - name: Build Javadoc
+        run: ./gradlew javadoc
+
+      - name: Configure GitHub Pages
+        uses: actions/configure-pages@v5
+
+      - name: Upload Javadoc artifact
+        uses: actions/upload-pages-artifact@v4
+        with:
+          path: build/docs/javadoc
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+
+    steps:
+      - name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v4

README.md

@@ -15,11 +15,11 @@
 
 <p align="center">
    <img alt="Version" src="https://img.shields.io/badge/version-2.0.0-blue.svg?cacheSeconds=2592000" />
-   <a href="https://www.minecraft.net/en-us/article/minecraft-1-21-100-bedrock-changelog">
-      <img alt="Minecraft" src="https://img.shields.io/badge/minecraft-v1.21.100%20(Bedrock)-56383E" />
+   <a href="https://www.minecraft.net/en-us/article/the-copper-age---minecraft--bedrock-edition-1-21-111-changelog">
+      <img alt="Minecraft" src="https://img.shields.io/badge/minecraft-v1.21.111%20(Bedrock)-56383E" />
    </a>
    <a href="https://github.com/Mojang/bedrock-protocol-docs">
-      <img alt="Protocol" src="https://img.shields.io/badge/protocol-827-blue" />
+      <img alt="Protocol" src="https://img.shields.io/badge/protocol-844-blue" />
    </a>
    <a href="https://github.com/PowerNukkitX/PowerNukkitX/actions?query=branch%3Amaster+is%3Asuccess" target="_blank">
       <img alt="Action" src="https://img.shields.io/badge/action-all%20builds-FF9B21" />
@@ -58,30 +58,18 @@
 - 🪴 **Terra Generator**
 - ✏️ **Full Vanilla Command Support**
 - 🗃️ **Full Item, Block and Container Support**
+- 💖 **Most vanilla like third party server software**
 - 🗿 **More features to discover...**
 
 ## Install
 
 1. Make sure you have `JDK21` installed, if not [download from here](https://www.graalvm.org/downloads)
-2. Download the [`PowerNukkitX-Run.zip`](https://github.com/PowerNukkitX/PowerNukkitX/releases/download/snapshot/powernukkitx-run.zip)
-3. Unzip `PowerNukkitX-Run.zip` to the directory you want.
-4. Set Java environment variables or unzip JDK to the same directory as the previous step.
+2. Download the [`powernukkitx.jar`](https://github.com/PowerNukkitX/PowerNukkitX/releases/download/snapshot/powernukkitx.jar)
+3. Start the server
 
-You want to use PowerNukkitX without the CLI?
-
-1. Make sure you have `JDK21` installed, if not [download from here](https://www.graalvm.org/downloads)
-2. Download the [`powernukkitx-shaded.jar`](https://github.com/PowerNukkitX/PowerNukkitX/releases/download/snapshot/powernukkitx-shaded.jar)
-
-## Usage
-
-Start PowerNukkitX when using the CLI
-```sh
-java -jar cli.jar
-```
-
-Starting PowerNukkitX when using the shaded jar (Without CLI)
+Starting PowerNukkitX
 ```sh
-java -jar --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED .\powernukkitx-shaded.jar
+java -Dfile.encoding=UTF-8 -Djansi.passthrough=true -Dterminal.ansi=true -XX:+UseZGC -XX:+ZGenerational -XX:+UseStringDeduplication --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -jar .\powernukkitx-shaded.jar
 ```
 
 ## Community & Support

build.gradle.kts

@@ -1,11 +1,21 @@
 import java.nio.charset.StandardCharsets
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.StandardCopyOption
+// Explicit Gradle API imports to fix Kotlin DSL unresolved references
+import org.gradle.external.javadoc.CoreJavadocOptions
+import org.gradle.api.tasks.AbstractCopyTask
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.api.tasks.javadoc.Javadoc
+import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Copy
+import org.gradle.api.publish.maven.MavenPublication
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.testing.jacoco.tasks.JacocoReport
 
 plugins {
     `java-library`
     `maven-publish`
+    java
     idea
     jacoco
     id("io.github.goooler.shadow") version "8.1.7"
@@ -17,15 +27,8 @@ group = "org.powernukkitx"
 version = "2.0.0-SNAPSHOT"
 description = "PNX Server"
 java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven("https://repo.maven.apache.org/maven2/")
-    maven("https://jitpack.io")
-    maven("https://repo.opencollab.dev/maven-releases/")
-    maven("https://repo.opencollab.dev/maven-snapshots/")
-}
 
 dependencies {
     api(libs.bundles.netty)
@@ -127,7 +130,7 @@ tasks.register<DefaultTask>("buildForGithubAction") {
 }
 
 tasks.build {
-    dependsOn(tasks.shadowJar)
+    dependsOn("shadowJar")
     group = "alpha build"
 }
 
@@ -147,36 +150,38 @@ tasks.test {
     useJUnitPlatform()
     jvmArgs(listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED"))
     jvmArgs(listOf("--add-opens", "java.base/java.io=ALL-UNNAMED"))
-    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+    finalizedBy("jacocoTestReport") // report is always generated after tests run
 }
 
-tasks.jacocoTestReport {
+tasks.named<JacocoReport>("jacocoTestReport") {
     reports {
         csv.required = false
         xml.required = true
         html.required = false
     }
-    dependsOn(tasks.test) // tests are required to run before generating the report
+    dependsOn("test") // tests are required to run before generating the report
 }
 
 tasks.withType<AbstractCopyTask>() {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 tasks.named<AbstractArchiveTask>("sourcesJar") {
-    destinationDirectory = layout.buildDirectory
+    destinationDirectory.set(layout.buildDirectory)
 }
 
-tasks.jar {
-    destinationDirectory = layout.buildDirectory
-    doLast {//execution phase
-        val f: RegularFile = archiveFile.get()
-        val tf: RegularFile = layout.buildDirectory.file("${project.description}.jar").get()
-        Files.copy(Path.of(f.asFile.absolutePath), Path.of(tf.asFile.absolutePath), StandardCopyOption.REPLACE_EXISTING)
-    }
+// Improve build reproducibility for better caching
+tasks.withType<AbstractArchiveTask> {
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
 }
 
-tasks.shadowJar {
+tasks.named<org.gradle.jvm.tasks.Jar>("jar") {
+    destinationDirectory.set(layout.buildDirectory)
+    archiveFileName.set("${project.description}.jar")
+}
+
+tasks.named<ShadowJar>("shadowJar") {
     dependsOn("copyDependencies")
     manifest {
         attributes(
@@ -186,7 +191,7 @@ tasks.shadowJar {
 
     transform(com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer::class.java) //required to fix shadowJar log4j2 issue
 
-    destinationDirectory = layout.buildDirectory
+    destinationDirectory.set(layout.buildDirectory)
 }
 
 tasks.register<Copy>("copyDependencies") {
@@ -247,4 +252,4 @@ tasks.withType<JavaCompile> {
 
 tasks.withType<Javadoc> {
     options.encoding = "UTF-8"
-}
+}

gradle.properties

@@ -1,4 +1,9 @@
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Djava.net.preferIPv4Stack=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.problems=warn
+org.gradle.vfs.watch=true
+org.gradle.warning.mode=summary
+org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError
+systemProp.file.encoding=UTF-8

gradle/wrapper/gradle-wrapper.properties

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

scripts/kaooot-fetch-all.sh

@@ -0,0 +1,25 @@
+cd ../src/main/resources/gamedata/kaooot/
+
+BASE_URL="https://github.com/Kaooot/bedrock-network-data/raw/refs/heads/master/preview/1.21.110.26/"
+
+FILES=(
+  "biome_definitions.nbt"
+  "biomes.json"
+  "block_tags.json"
+  "creative_items.json"
+  "entity_identifiers.nbt"
+  "item_components.nbt"
+  "item_tags.json"
+  "recipes.json"
+  "trim_data.json"
+)
+
+for FILE in "${FILES[@]}"; do
+  echo "Fetching $FILE..."
+  wget -O $FILE "$BASE_URL$FILE" > /dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    echo "Failed to fetch $FILE"
+  else
+    echo "Successfully fetched $FILE"
+  fi
+done

settings.gradle.kts

@@ -1 +1,24 @@
-rootProject.name = "powernukkitx"
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+        maven("https://jitpack.io")
+        maven("https://repo.opencollab.dev/maven-releases/")
+        maven("https://repo.opencollab.dev/maven-snapshots/")
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven("https://repo.maven.apache.org/maven2/")
+        maven("https://jitpack.io")
+        maven("https://repo.opencollab.dev/maven-releases/")
+        maven("https://repo.opencollab.dev/maven-snapshots/")
+    }
+}
+
+rootProject.name = "powernukkitx"

src/main/java/cn/nukkit/Player.java

@@ -26,7 +26,7 @@
 import cn.nukkit.entity.EntityInteractable;
 import cn.nukkit.entity.EntityLiving;
 import cn.nukkit.entity.EntityRideable;
-import cn.nukkit.entity.data.EntityDataTypes;
+import cn.nukkit.entity.custom.CustomEntityComponents;
 import cn.nukkit.entity.data.EntityFlag;
 import cn.nukkit.entity.data.PlayerFlag;
 import cn.nukkit.entity.data.Skin;
@@ -1501,11 +1501,6 @@ protected void onBlock(Entity entity, EntityDamageEvent e, boolean animate) {
         }
     }
 
-    @Override
-    public double getStepHeight() {
-        return 0.6f;
-    }
-
     /**
      * @return {@link #lastAttackEntity}
      */
@@ -2641,6 +2636,16 @@ public void sendCameraPresets() {
         dataPacket(pk);
     }
 
+    @Override
+    public Set<String> typeFamily() {
+        return Set.of("player");
+    }
+
+    @Override
+    public boolean isPersistent() {
+        return true;
+    }
+
     @Override
     public float getHeight() {
         if (this.riding instanceof EntityHorse) {
@@ -5069,7 +5074,7 @@ public boolean pickupEntity(Entity entity, boolean near) {
                 entity.close();
                 return true;
             } else if (entity instanceof EntityItem entityItem) {
-                if (entityItem.getPickupDelay() <= 0) {
+                if (entityItem.getPickupDelay() <= 0 && !entityItem.isDisplayOnly()) {
                     Item item = entityItem.getItem();
 
                     if (item != null) {

src/main/java/cn/nukkit/block/Block.java

@@ -47,7 +47,7 @@
 @Slf4j
 public abstract class Block extends Position implements Metadatable, AxisAlignedBB, BlockID {
     public static final Block[] EMPTY_ARRAY = new Block[0];
-    public static final double DEFAULT_FRICTION_FACTOR = 0.6;
+    public static final double DEFAULT_FRICTION_FACTOR = 0.4;
     public static final double DEFAULT_AIR_FLUID_FRICTION = 0.95;
     public static final Long2ObjectOpenHashMap<BlockColor> VANILLA_BLOCK_COLOR_MAP = new Long2ObjectOpenHashMap<>();
     protected BlockState blockstate;

src/main/java/cn/nukkit/block/BlockBell.java

@@ -1,6 +1,7 @@
 package cn.nukkit.block;
 
 import cn.nukkit.Player;
+import cn.nukkit.block.copper.chain.AbstractBlockCopperChain;
 import cn.nukkit.block.property.CommonBlockProperties;
 import cn.nukkit.block.property.enums.Attachment;
 import cn.nukkit.blockentity.BlockEntity;
@@ -280,8 +281,8 @@ private boolean checkSupport(Block support, BlockFace attachmentFace) {
 
         if (attachmentFace == BlockFace.DOWN) {
             return switch (support.getId()) {
-                case CHAIN, HOPPER, IRON_BARS -> true;
-                default -> support instanceof BlockFence || support instanceof BlockWallBase;
+                case IRON_CHAIN, HOPPER, IRON_BARS -> true;
+                default -> support instanceof BlockFence || support instanceof BlockWallBase || support instanceof AbstractBlockCopperChain;
             };
         }