Prepare for 1.21.9

Author: Pascalpex

.github/workflows/build.yml

@@ -22,4 +22,4 @@ jobs:
         uses: actions/[email protected]
         with:
           name: PexNPC
-          path: build/libs/PexNPC-2.1.jar
+          path: build/libs/PexNPC-2.2.jar

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "de.pascalpex"
-version = "2.1"
+version = "2.2"
 
 repositories {
     mavenCentral()
@@ -19,7 +19,7 @@ dependencies {
     testImplementation(platform("org.junit:junit-bom:5.13.4"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     compileOnly("me.clip:placeholderapi:2.11.6")
-    paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.9-pre2-R0.1-SNAPSHOT")
 }
 
 java {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/de/pascalpex/pexnpc/commands/subcommands/ListSubcommand.java

@@ -19,7 +19,7 @@ public class ListSubcommand implements Command<CommandSourceStack> {
     public int run(CommandContext<CommandSourceStack> context) {
         CommandSender sender = context.getSource().getSender();
 
-        sender.sendMessage(MessageHandler.basicMessage("All loaded NPCs:"));
+        sender.sendMessage(MessageHandler.prefixedMini("All loaded NPCs (<gold>" + PexNPC.getPlacedNpcs().size() + "<aqua>):"));
         for (PlaceableNPC placeableNPC : PexNPC.getPlacedNpcs()) {
             NPC npc = placeableNPC.getNpc();
             String name = npc.getName();

src/main/java/de/pascalpex/pexnpc/npc/NPCSender.java

@@ -13,6 +13,7 @@
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.entity.Avatar;
 import net.minecraft.world.entity.player.PlayerModelPart;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.scores.PlayerTeam;
@@ -101,7 +102,7 @@ private static List<Packet<?>> buildNPCPackets(PlaceableNPC placeableNPC) {
 
         SynchedEntityData entityData = serverPlayer.getEntityData();
         if (!entityData.isDirty()) {
-            entityData.markDirty(new EntityDataAccessor<>(17, EntityDataSerializers.BYTE));
+            entityData.markDirty(new EntityDataAccessor<>(Avatar.DATA_PLAYER_MODE_CUSTOMISATION.id(), EntityDataSerializers.BYTE));
         }
         List<SynchedEntityData.DataValue<?>> dirtyEntityData = entityData.packDirty();
         if (dirtyEntityData != null) {

src/main/java/de/pascalpex/pexnpc/npc/PlaceableNPC.java

@@ -1,7 +1,10 @@
 package de.pascalpex.pexnpc.npc;
 
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.Multimap;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
 import de.pascalpex.pexnpc.files.Config;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
@@ -10,6 +13,7 @@
 import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Avatar;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.CraftServer;
@@ -51,9 +55,13 @@ public PlaceableNPC(NPC npc) {
         builder.append(suffix);
         suffix = builder.toString();
 
-        GameProfile gameProfile = new GameProfile(UUID.randomUUID(), actualName);
         NPCSkin skin = npc.getSkin();
-        gameProfile.getProperties().put("textures", new Property("textures", skin.texture(), skin.signature()));
+        Multimap<String, Property> profileProperties = new ImmutableMultimap.Builder<String, Property>()
+                .put("textures", new Property("textures", skin.texture(), skin.signature()))
+                .build();
+
+        GameProfile gameProfile = new GameProfile(UUID.randomUUID(), actualName, new PropertyMap(profileProperties));
+
 
         Location loc = npc.getLocation();
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
@@ -67,10 +75,10 @@ public PlaceableNPC(NPC npc) {
         int skinMode = Config.getSkinMode();
         switch (skinMode) {
             case 2:
-                watcher.set(new EntityDataAccessor<>(17, EntityDataSerializers.BYTE), (byte) 126);
+                watcher.set(new EntityDataAccessor<>(Avatar.DATA_PLAYER_MODE_CUSTOMISATION.id(), EntityDataSerializers.BYTE), (byte) 126);
                 break;
             case 3:
-                watcher.set(new EntityDataAccessor<>(17, EntityDataSerializers.BYTE), (byte) 127);
+                watcher.set(new EntityDataAccessor<>(Avatar.DATA_PLAYER_MODE_CUSTOMISATION.id(), EntityDataSerializers.BYTE), (byte) 127);
                 break;
             default:
                 break;

src/main/java/de/pascalpex/pexnpc/util/SkinDownloader.java

@@ -34,9 +34,9 @@ public static NPCSkin downloadSkin(String playerName) throws IOException, URISyn
     public static NPCSkin downloadSKin(Player player) {
         ServerPlayer p = ((CraftPlayer) player).getHandle();
         GameProfile profile = p.getGameProfile();
-        Property property = profile.getProperties().get("textures").iterator().next();
-        String texture = property.value();
-        String signature = property.signature();
+        Property property = profile.properties().get("textures").iterator().next();
+        String texture = property == null ? "" : property.value();
+        String signature = property == null ? "" : property.signature();
 
         return new NPCSkin(texture, signature);
     }

src/main/resources/paper-plugin.yml

@@ -1,10 +1,10 @@
 name: PexNPC
-version: '2.1'
+version: '2.2'
 author: Pascalpex
 prefix: PexNPC
 main: de.pascalpex.pexnpc.PexNPC
 description: Lightweight, packet based NPC plugin with fast updates
-api-version: '1.21.8'
+api-version: '1.21.9'
 bootstrapper: de.pascalpex.pexnpc.PexNPCBootstrap
 loader: de.pascalpex.pexnpc.PexNPCLoader
 dependencies: