Fake block packet handling: cleanup, update, fixes

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 The Denizen Script Team
+Copyright (c) 2019-2026 The Denizen Script Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,7 +3,7 @@ The Denizen Scripting Language - Spigot Impl
 
 An implementation of the Denizen Scripting Language for Spigot servers, with strong Citizens interlinks to emphasize the power of using Denizen with NPCs!
 
-**Version 1.3.1**: Compatible with Spigot 1.17.1, 1.18.2, 1.19.4, 1.20.6, and 1.21.8!
+**Version 1.3.3**: Compatible with Spigot 1.17.1, 1.18.2, 1.19.4, 1.20.6, 1.21.11, 26.1.2, and 26.2!
 
 **Learn about Denizen from the Beginner's guide:** https://guide.denizenscript.com/guides/background/index.html
 
@@ -45,7 +45,7 @@ An implementation of the Denizen Scripting Language for Spigot servers, with str
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
+            <version>1.3.3-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>
@@ -78,7 +78,7 @@ Copyright (C) 2013-2019 The Denizen Script Team, All Rights Reserved.
 
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 The Denizen Script Team
+Copyright (c) 2019-2026 The Denizen Script Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

dist/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -60,6 +60,18 @@
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen-v26_1</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen-v26_2</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen-paper</artifactId>

paper/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-paper</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
 
     <repositories>
         <repository>
@@ -25,13 +25,13 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21.8-R0.1-SNAPSHOT</version>
+            <version>[26.2.build,)</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.citizensnpcs</groupId>
             <artifactId>citizens-main</artifactId>
-            <version>2.0.38-SNAPSHOT</version>
+            <version>2.0.42-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>

paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java

@@ -6,6 +6,7 @@
 import com.denizenscript.denizen.nms.interfaces.packets.PacketOutChat;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.ItemTag;
+import com.denizenscript.denizen.paper.datacomponents.ComponentAdaptersRegistry;
 import com.denizenscript.denizen.paper.events.*;
 import com.denizenscript.denizen.paper.properties.*;
 import com.denizenscript.denizen.paper.tags.PaperTagBase;
@@ -20,6 +21,9 @@
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PaperModule {
 
     public static void init() {
@@ -67,7 +71,7 @@ public static void init() {
         ScriptEvent.registerScriptEvent(PlayerJumpsScriptEventPaperImpl.class);
         ScriptEvent.registerScriptEvent(PlayerLecternPageChangeScriptEvent.class);
         ScriptEvent.registerScriptEvent(PlayerLoomPatternSelectScriptEvent.class);
-        ScriptEvent.registerScriptEvent(PlayerNameEntityScriptEvent.class);
+        ScriptEvent.registerScriptEvent(PlayerNamesEntityScriptEvent.class);
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20)) {
             ScriptEvent.registerScriptEvent(PlayerOpenSignScriptEvent.class);
         }
@@ -76,6 +80,9 @@ public static void init() {
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_18)) {
             ScriptEvent.registerScriptEvent(PlayerRaiseLowerItemScriptEventPaperImpl.class);
         }
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            ScriptEvent.registerScriptEvent(PlayerReceivesLinksScriptEvent.class);
+        }
         ScriptEvent.registerScriptEvent(PlayerSelectsStonecutterRecipeScriptEvent.class);
         ScriptEvent.registerScriptEvent(PlayerSetSpawnScriptEvent.class);
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20)) {
@@ -100,6 +107,9 @@ public static void init() {
             ScriptEvent.registerScriptEvent(TNTPrimesScriptEvent.class);
         }
         ScriptEvent.registerScriptEvent(UnknownCommandScriptEvent.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            ScriptEvent.registerScriptEvent(VaultChangesStateScriptEvent.class);
+        }
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19)) {
             ScriptEvent.registerScriptEvent(WardenChangesAngerLevelScriptEvent.class);
         }
@@ -127,6 +137,12 @@ public static void init() {
         PropertyParser.registerProperty(EntityWitherInvulnerable.class, EntityTag.class);
         PropertyParser.registerProperty(ItemArmorStand.class, ItemTag.class);
 
+        // Components system
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            PropertyParser.registerProperty(ItemRemovedComponents.class, ItemTag.class);
+            ComponentAdaptersRegistry.register();
+        }
+
         // Paper object extensions
         PaperElementExtensions.register();
         PaperEntityExtensions.register();
@@ -162,6 +178,14 @@ public static String stringifyComponent(Component component) {
         return FormattedTextHelper.stringify(FormattedTextHelper.parseJson(componentToJson(component)));
     }
 
+    public static List<String> stringifyComponentList(List<Component> components) {
+        List<String> result = new ArrayList<>(components.size());
+        for (Component component : components) {
+            result.add(stringifyComponent(component));
+        }
+        return result;
+    }
+
     public static Component jsonToComponent(String json) {
         if (json == null) {
             return null;

paper/src/main/java/com/denizenscript/denizen/paper/datacomponents/ComponentAdaptersRegistry.java

@@ -0,0 +1,13 @@
+package com.denizenscript.denizen.paper.datacomponents;
+
+public class ComponentAdaptersRegistry {
+
+    public static void register() {
+        DataComponentAdapter.register(new FoodAdapter());
+        DataComponentAdapter.register(new GliderAdapter());
+        DataComponentAdapter.register(new ItemModelAdapter());
+        DataComponentAdapter.register(new MaxDurabilityAdapter());
+        DataComponentAdapter.register(new MaxStackSizeAdapter());
+        DataComponentAdapter.register(new RarityAdapter());
+    }
+}