sign_update: Paper component support

DenizenScript · Sep 19, 2021 · 2074ee4 · 2074ee4
1 parent 75e6914
commit 2074ee4
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/utilities/PaperAdvancedTextImpl.java b/paper/src/main/java/com/denizenscript/denizen/paper/utilities/PaperAdvancedTextImpl.java
@@ -7,13 +7,17 @@
 import net.kyori.adventure.text.Component;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PaperAdvancedTextImpl extends AdvancedTextImpl {
 
     @Override
@@ -76,4 +80,13 @@ public void sendResourcePack(Player player, String url, String hash, boolean for
             player.setResourcePack(url, CoreUtilities.toLowerCase(hash), forced, PaperModule.parseFormattedText(prompt, ChatColor.WHITE));
         }
     }
+
+    @Override
+    public void sendSignUpdate(Player player, Location loc, String[] text) {
+        List<Component> components = new ArrayList<>();
+        for (String line : text) {
+            components.add(PaperModule.parseFormattedText(line, ChatColor.BLACK));
+        }
+        player.sendSignChange(loc, components);
+    }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -3373,7 +3373,8 @@ else if (getPlayerEntity().getGameMode() == GameMode.SPECTATOR) {
                 String[] split = mechanism.getValue().asString().split("\\|", 2);
                 if (LocationTag.matches(split[0]) && split.length > 1) {
                     ListTag lines = ListTag.valueOf(split[1], mechanism.context);
-                    getPlayerEntity().sendSignChange(LocationTag.valueOf(split[0], mechanism.context), lines.toArray(new String[4]));
+                    LocationTag location = LocationTag.valueOf(split[0], mechanism.context);
+                    AdvancedTextImpl.instance.sendSignUpdate(getPlayerEntity(), location, lines.toArray(new String[4]));
                 }
                 else {
                     Debug.echoError("Must specify a valid location and at least one sign line!");

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java
@@ -54,7 +54,7 @@ public AgeCommand() {
     //
     // @Usage
     // Use to mature some animals so that they are old enough to breed.
-    // - age <player.location.find.entities.within[20]> adult
+    // - age <player.location.find_entities.within[20]> adult
     // -->
 
     private enum AgeType {ADULT, BABY}

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java
@@ -63,7 +63,7 @@ public EquipCommand() {
     //
     // @Usage
     // Use to equip a saddle on all nearby pigs.
-    // - equip <player.location.find.entities[pig].within[10]> saddle:saddle
+    // - equip <player.location.find_entities[pig].within[10]> saddle:saddle
     // -->
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LeashCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LeashCommand.java
@@ -51,7 +51,7 @@ public LeashCommand() {
     //
     // @Usage
     // Use to attach the closest cow in 10 blocks to the fence the player is looking at.
-    // - leash <player.location.find.entities[cow].within[10].first> holder:<player.cursor_on>
+    // - leash <player.location.find_entities[cow].within[10].first> holder:<player.cursor_on>
     //
     // @Usage
     // Use to release the target entity.

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java
@@ -51,7 +51,7 @@ public RemoveCommand() {
     //
     // @Usage
     // Use to remove all nearby entities around the player, excluding the player itself.
-    // - remove <player.location.find.entities.within[10].exclude[<player>]>
+    // - remove <player.location.find_entities.within[10].exclude[<player>]>
     //
     // @Usage
     // Use to remove all dropped items in the world called cookies.

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/AdvancedTextImpl.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/AdvancedTextImpl.java
@@ -2,6 +2,7 @@
 
 import com.denizenscript.denizen.nms.NMSHandler;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -56,4 +57,8 @@ public void sendResourcePack(Player player, String url, String hash, boolean for
         }
         player.setResourcePack(url, hashData);
     }
+
+    public void sendSignUpdate(Player player, Location loc, String[] text) {
+        player.sendSignChange(loc, text);
+    }
 }