Extra placeholders, handle font tag better, color aliases for color tag

Author: Patbox

docs/dev/adding-placeholders.md

@@ -12,7 +12,7 @@ Example
 
     ```java
     Placeholders.register(
-             new Identifier("example", "placeholder"),
+             Identifier.of("example", "placeholder"),
              (ctx, arg) -> PlaceholderResult.value(Text.literal("Hello World!"))
     );
     ```
@@ -37,7 +37,7 @@ Here is example for a placeholder, which requires a player:
 ===+ "Java"
 
     ```java
-    Placeholders.register(new Identifier("player", "displayname"), (ctx, arg) -> {
+    Placeholders.register(Identifier.of("player", "displayname"), (ctx, arg) -> {
         if (!ctx.hasPlayer())
             return PlaceholderResult.invalid("No player!");
 
@@ -65,7 +65,7 @@ Argument itself is a string, so you can parse it in any way.
 ===+ "Java"
 
     ```java
-    PlaceholderAPI.register(new Identifier("server", "name_from_uuid"), (ctx, arg) -> {
+    PlaceholderAPI.register(Identifier.of("server", "name_from_uuid"), (ctx, arg) -> {
         if (arg == null)
             return PlaceholderResult.invalid("No argument!");
 

docs/dev/text-nodes.md

@@ -31,7 +31,7 @@ Examples:
 - LiteralNode - Used for direct text, requires special parsing by parsers,
 - TranslationNode - Used for translated text, also requires special parsing,
 - DirectTextNode - Allows you to insert non-transformable text, can be used for static placeholders, 
-- PlaceholderNode (Internal) - Used for representing parsed placeholder without fetching it's final value.
+- PlaceholderNode (Internal) - Used for representing parsed placeholder without fetching its final value.
 
 ### Parent Text Nodes
 This type is used for joining multiple Value/Parent Text Nodes into single object. Additionally, 

docs/user/default-placeholders.md

@@ -24,11 +24,15 @@ Prior to 1.19, arguments were separated with a slash (`/`) instead of space.
 - `%player:displayname%` - The player's display name (used on chat).
 - `%player:displayname_visual%` - The player's display name (without hover and click action).
 - `%player:displayname_unformatted%` - The player's display name (without formatting).
+- `%player:uuid%` - The player's uuid.
 - `%player:ping%` - The player's ping.
 - `%player:ping_colored%` - The player's ping (colored).
 - `%player:pos_x%` - The player's `x` coordinate.
 - `%player:pos_y%` - The player's `y` coordinate.
 - `%player:pos_z%` - The player's `z` coordinate.
+  `%player:pos_x_scaled [compared world id]%` (2.7.2+) - The player's scaled `x` coordinate. Compared world defaults to Overworld.
+- `%player:pos_y_scaled [compared world id]%` (2.7.2+) - The player's scaled `y` coordinate. Compared world defaults to Overworld.
+- `%player:pos_z_scaled [compared world id]%` (2.7.2+) - The player's scaled `z` coordinate. Compared world defaults to Overworld.
 - `%player:facing%` (2.5.1+) - The player's horizontal direction.
 - `%player:facing_axis%` (2.5.1+) - The player's horizontal direction in format of `+/-A` (A si replaced with axis).
 - `%player:horizontal_facing%` (2.5.1+) - The player's horizontal facing direction.
@@ -44,6 +48,8 @@ Prior to 1.19, arguments were separated with a slash (`/`) instead of space.
 - `%player:statistic [statistic]%`/`%player:statistic [type] [statistic]%` - The formatted value of player's statistic.
 - `%player:statistic_raw [statistic]%`/`%player:statistic_raw [type] [statistic]%` - The value of player's statistic.
 - `%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
 
 ### World
 
@@ -60,6 +66,7 @@ Prior to 1.19, arguments were separated with a slash (`/`) instead of space.
 - `%world:mob_cap%`/`%world:mob_cap [group]%` - Shows maximum amount of mobs that can spawn is player's world.
 - `%world:id%` - The world's ID.
 - `%world:name%` - The world's name.
+- `%world:weather%` (2.7.2+) - The world's weather.
 
 ### Server
 
@@ -68,6 +75,7 @@ Prior to 1.19, arguments were separated with a slash (`/`) instead of space.
 - `%server:mspt%` - The server's MSPT.
 - `%server:mspt_colored%` - The server's MSPT (colored).
 - `%server:time%`/`%server:time [formatting]%` - The server's time.
+- `%server:time_new format:[format] zone:[time zone]%` (2.4.0-pre1+) - The world's time with timezone The `format` and `zone` fields are optional.
 - `%server:uptime%`/`%server:uptime [formatting]%` (2.1.2+)- The server's uptime.
 - `%server:version%` - The server's version.
 - `%server:name%` - The server's name.

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.21.6
-	yarn_mappings=1.21.6+build.1
+	minecraft_version=1.21.8
+	yarn_mappings=1.21.8+build.1
 	loader_version=0.16.14
 
 	#Fabric api
-fabric_version=0.127.0+1.21.6
+fabric_version=0.130.0+1.21.8
 
 	# Mod Properties
-	mod_version = 2.7.1+1.21.6
+	mod_version = 2.7.2+1.21.8
 	maven_group = eu.pb4
 	archives_base_name = placeholder-api

src/main/java/eu/pb4/placeholders/api/arguments/StringArgs.java

@@ -1,5 +1,11 @@
 package eu.pb4.placeholders.api.arguments;
 
+import com.mojang.datafixers.util.Either;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import eu.pb4.placeholders.impl.StringArgOps;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.util.function.CharPredicate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
@@ -179,6 +185,22 @@ public String get(String name, int id, String defaultValue) {
         return x != null ? x : defaultValue;
     }
 
+    public <T> DataResult<T> get(String name, Codec<T> codec) {
+        var val = get(name);
+        var map = getNested(name);
+        return val == null && map == null ? DataResult.error(() -> "Empty")
+                : codec.decode(StringArgOps.INSTANCE,
+                val != null ? Either.left(val) : Either.right(map)).map(Pair::getFirst);
+    }
+
+    public <T> DataResult<T> get(String name, Codec<T> codec, RegistryWrapper.WrapperLookup wrapperLookup) {
+        var val = get(name);
+        var map = getNested(name);
+        return val == null && map == null ? DataResult.error(() -> "Empty")
+                : codec.decode(wrapperLookup.getOps(StringArgOps.INSTANCE),
+                val != null ? Either.left(val) : Either.right(map)).map(Pair::getFirst);
+    }
+
     @Nullable
     public String getNext(String name) {
         var x = this.keyed.get(name);

src/main/java/eu/pb4/placeholders/api/node/parent/DynamicColorNode.java

@@ -6,15 +6,33 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextColor;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
+import java.util.function.Function;
 
 public final class DynamicColorNode extends SimpleStylingNode implements DynamicShadowNode.SimpleColoredTransformer {
+    private static final Function<String, TextColor> DEFAULT_RESOLVER = string -> TextColor.parse(string).result().orElse(null);
     private final TextNode color;
+    private final Function<String, TextColor> resolver;
 
     public DynamicColorNode(TextNode[] children, TextNode color) {
+        this(children, color, DEFAULT_RESOLVER);
+    }
+    public DynamicColorNode(TextNode[] children, TextNode color, Function<String, @Nullable TextColor> resolver) {
         super(children);
         this.color = color;
+        this.resolver = resolver;
+    }
+
+    public static Function<String, @Nullable TextColor> extendedTextColorParse(Function<String, @Nullable TextColor> resolver) {
+        return string -> {
+            var x = resolver.apply(string);
+            if (x != null) {
+                return x;
+            }
+            return TextColor.parse(string).result().orElse(null);
+        };
     }
 
     @Override
@@ -24,8 +42,8 @@ public boolean isDynamicNoChildren() {
 
     @Override
     protected Style style(ParserContext context) {
-        var c = TextColor.parse(color.toText(context).getString());
-        return c.result().map(Style.EMPTY::withColor).orElse(Style.EMPTY);
+        var c = this.resolver.apply(color.toText(context).getString());
+        return c != null ? Style.EMPTY.withColor(c) : Style.EMPTY;
     }
 
     @Override