Update tag/placeholder docs, make player tag support dynamic values

Author: Patbox

docs/user/default-placeholders.md

@@ -50,6 +50,7 @@ Prior to 1.19, arguments were separated with a slash (`/`) instead of space.
 - `%player:objective [objective]%` - The value of player's scoreboard objective.
 - `%player:biome%` (2.7.2+) - Biome at player's location
 - `%player:biome_raw%` (2.7.2+) - Raw biome id at player's location
+- `%player:head%` (2.8.0+) - Shows player's head texture.
 
 ### World
 

docs/user/quicktext.md

@@ -116,7 +116,8 @@ Hover tag allows adding simple hover on text. It can be used to display addition
 
 This tag allows you to change font to any build in one or one provided by resource pack.
 
-You can use it by simply adding `#!xml <font '[VALUE]'>`, where `'[VALUE]'` is just a font name.
+- `#!xml <font '[VALUE]'>` - Sets font within tagwhere (`'[VALUE]'` is just a font name).
+
 Minecraft has 3 build-in fonts  `default`, `uniform` and `alt`.
 
 ### Inserting
@@ -155,13 +156,50 @@ This tag allows you to add information about player control keys, with respectin
 
 You can use it with `#!xml <keybind '[VALUE]'>` or `#!xml <keybind value:'[VALUE]'>`, where `'[VALUE]'` is a control key used.
 
+### Atlas (2.8.0+1.21.9+)
+
+!!! question inline end "Atlas"
+
+    You can read more about atlases on the [Minecraft Wiki](https://minecraft.wiki/w/Atlas)
+
+!!! note inline end
+
+    This tag is self containing, so it doesn't contain a closing tag.
+
+This tag allows you to display a texture from select atlas. If not set correctly, it will show missing
+texture.
+
+- `#!xml <atlas '[ATLAS ID]' '[TEXTURE ID]'>` - Quick format of atlas tag.
+- `#!xml <atlas atlas:'[ATLAS ID]' texture:'[TEXTURE ID]'>` - Full format of atlas tag.
+
+Where `'[ATLAS ID]'` is a atlas identifier used and `'[TEXURE ID]'` is a texture within that atlas.
+
+### Player (2.8.0+1.21.9+)
+!!! note inline end
+
+    This tag is self containing, so it doesn't contain a closing tag.
+
+This tag allows you to display a player head. If not set correctly, it will show one of default textures.
+
+- `#!xml <atlas '[NAME / UUID]'>` - Shorthand format for showing player head.
+- `#!xml <atlas name:'[NAME]' hat:[BOOLEAN]>` - Show player head by name (and toggle hat).
+- `#!xml <atlas uuid:'[NAME]' hat:[BOOLEAN]>` - Show player head by uuid (and toggle hat).
+- `#!xml <atlas texture:'[TEXTURE VALUE]' hat:[BOOLEAN]>` - Show player head by raw remote texture value (and toggle hat).
+
+Where `'[NAME]'` is player name, 
+`'[UUID]'` is player uuid, `'[TEXTURE VALUE]'` is skin texture value (not resource pack one!)
+and `[BOOLEAN]` is true or false.
+
+
+
 ### Gradients
 
 This tag allows you to add gradients to the text. However, it has multiple limitation that can
 block its usage. Currently, you can't use dynamic values (translations, control keys, placeholders, etc)
 within them, as they require static text.
 
 There 2 types of gradients:
+
 - `#!xml <gradient (type:[type]) [color 1] [color 2] ...>`/`#!xml <gr (type:[type]) [color 1] [color 2] ...>` - I can take multiple colors to move between them
   smoothly. You can replace the optional `(type:[type])` with `type:oklab` (default), `type:hvs` or `type:hard` to change how thge gradient is handled
 - `#!xml <hard_gradient [color 1] [color 2] ...>`/`#!xml <hgr [color 1] [color 2] ...>` - I can take multiple colors to move between them
@@ -181,6 +219,7 @@ works with placeholders, which gives a bit more flexibility.
 This tag can work without arguments making it clear all formatting or with them limiting clearing to selected types.
 
 Examples:
+
 - `#!xml <clear>` - Removes all formatting, leaving only text.
 - `#!xml <clear hover>` - Removes all hovers.
 - `#!xml <clear hover color>` - Removes all hovers and colors.

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-minecraft_version=1.21.9-rc1
-yarn_mappings=1.21.9-rc1+build.2
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.1
 loader_version=0.17.2
 loom_version=1.11-SNAPSHOT
 
 # Fabric API
-fabric_version=0.133.13+1.21.9
+fabric_version=0.135.0+1.21.10
 
 	# Mod Properties
-	mod_version = 2.8.0+1.21.9
+	mod_version = 2.8.1+1.21.10
 	maven_group = eu.pb4
 	archives_base_name = placeholder-api

src/main/java/eu/pb4/placeholders/api/node/DynamicPlayerHeadNode.java

@@ -0,0 +1,35 @@
+package eu.pb4.placeholders.api.node;
+
+import eu.pb4.placeholders.api.ParserContext;
+import net.minecraft.component.type.ProfileComponent;
+import net.minecraft.text.Text;
+import net.minecraft.text.object.PlayerTextObjectContents;
+
+import java.util.UUID;
+
+public record DynamicPlayerHeadNode(TextNode name, boolean hat, Type type) implements TextNode {
+    @Override
+    public Text toText(ParserContext context, boolean removeBackslashes) {
+        var val = this.name.toText(context).getString();
+
+        if (type == Type.UUID || type == Type.EITHER) {
+            try {
+                return Text.object(new PlayerTextObjectContents(ProfileComponent.ofDynamic(UUID.fromString(val)), hat));
+            } catch (Throwable e) {
+                // ignore
+            }
+        }
+
+        if (type == Type.NAME || type == Type.EITHER) {
+            return Text.object(new PlayerTextObjectContents(ProfileComponent.ofDynamic(val), hat));
+        }
+
+        return Text.object(new PlayerTextObjectContents(ProfileComponent.ofDynamic(""), hat));
+    }
+
+    public enum Type {
+        UUID,
+        NAME,
+        EITHER
+    }
+}

src/main/java/eu/pb4/placeholders/impl/textparser/BuiltinTags.java

@@ -218,15 +218,20 @@ public static void register() {
                             (nodes, data, parser) -> {
                                 var hat = SimpleArguments.bool(data.get("hat"), true);
 
-                                var next = data.getNext("name", "");
-                                var maybeUuid = data.get("uuid");
                                 var texture = data.get("texture");
 
                                 if (texture != null) {
                                     PropertyMap map = new PropertyMap(ImmutableMultimap.of("textures", new Property("textures", texture, null)));
                                     return new ObjectNode(new PlayerTextObjectContents(ProfileComponent.ofStatic(new GameProfile(Util.NIL_UUID, "", map)), hat));
                                 }
 
+                                var next = data.getNext("name", "");
+                                var maybeUuid = data.get("uuid");
+
+                                if (maybeUuid != null) {
+                                    return new DynamicPlayerHeadNode(parser.parseNode(maybeUuid), hat, DynamicPlayerHeadNode.Type.UUID);
+                                }
+
                                 UUID uuid = null;
                                 if (maybeUuid == null) {
                                     try {
@@ -245,10 +250,10 @@ public static void register() {
                                 }
 
                                 if (next != null) {
-                                    return new ObjectNode(new PlayerTextObjectContents(ProfileComponent.ofDynamic(next), hat));
+                                    return new DynamicPlayerHeadNode(parser.parseNode(next), hat, DynamicPlayerHeadNode.Type.EITHER);
                                 }
 
-                                return new ObjectNode(new AtlasTextObjectContents(emptyId, emptyId));
+                                return new ObjectNode(new PlayerTextObjectContents(ProfileComponent.ofDynamic(""), hat));
                             }
                     )
             );