Update to 1.21.2 (#57)

* Update to 24w33a

* Update mappings to 24w33a+build.27

by sakuraryoko

* Update to 24w39a

* Update workflow actions

* Update missing actions

Author: DrexHD

.github/workflows/build.yml

@@ -19,20 +19,21 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
+          distribution: 'microsoft'
       - name: make gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/docs.yml

@@ -10,15 +10,15 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
                 with:
                     fetch-depth: 0
 
-            -   uses: actions/setup-python@v2
+            -   uses: actions/setup-python@v5
                 with:
                     python-version: 3.x
 
-            -   uses: actions/cache@v2
+            -   uses: actions/cache@v4
                 with:
                     key:  ${{ github.ref }}
                     path: .cache

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/loom-cache
@@ -20,11 +20,12 @@ jobs:
           key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             gradle-
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'microsoft'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -39,7 +40,7 @@ jobs:
           CURSEFORGE: ${{ secrets.CURSEFORGE }}
           CHANGELOG: ${{ github.event.release.body }}
       - name: Upload GitHub release
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@v3.0
         with:
           files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6.+'
+	id 'fabric-loom' version '1.7.+'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'com.matthewprenger.cursegradle' version '1.4.0'

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.21
-	yarn_mappings=1.21+build.2
-	loader_version=0.15.11
+	minecraft_version=24w39a
+	yarn_mappings=24w39a+build.8
+	loader_version=0.16.5
 
 	#Fabric api
-	fabric_version=0.100.1+1.21
+	fabric_version=0.105.1+1.21.2
 
 	# Mod Properties
-	mod_version = 2.4.1+1.21
+	mod_version = 2.4.1+1.21.2
 	maven_group = eu.pb4
 	archives_base_name = placeholder-api
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/eu/pb4/placeholders/api/PlaceholderContext.java

@@ -122,7 +122,8 @@ public static PlaceholderContext of(Entity entity, ViewObject view) {
         if (entity instanceof ServerPlayerEntity player) {
             return of(player, view);
         } else {
-            return new PlaceholderContext(entity.getServer(), entity::getCommandSource, (ServerWorld) entity.getWorld(), null, entity, null, view);
+            var world = (ServerWorld) entity.getWorld();
+            return new PlaceholderContext(entity.getServer(), () -> entity.getCommandSource(world), world, null, entity, null, view);
         }
     }
 

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

@@ -1,11 +1,19 @@
 package eu.pb4.placeholders.api.node;
 
+import com.mojang.datafixers.util.Either;
 import eu.pb4.placeholders.api.ParserContext;
+import net.minecraft.text.ParsedSelector;
 import net.minecraft.text.Text;
 
-public record ScoreNode(String name, String objective) implements TextNode {
+public record ScoreNode(Either<ParsedSelector, String> name, String objective) implements TextNode {
+
+    public ScoreNode(String name, String objective) {
+        this(ParsedSelector.parse(name).result()
+            .map(Either::<ParsedSelector, String>left).orElse(Either.right(name)), objective);
+    }
+
     @Override
     public Text toText(ParserContext context, boolean removeBackslashes) {
-        return Text.score(name, objective);
+        return name.map(selector -> Text.score(selector, objective), name -> Text.score(name, objective));
     }
 }

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

@@ -1,14 +1,15 @@
 package eu.pb4.placeholders.api.node;
 
 import eu.pb4.placeholders.api.ParserContext;
+import net.minecraft.text.ParsedSelector;
 import net.minecraft.text.Text;
 
 import java.util.Optional;
 
-public record SelectorNode(String pattern, Optional<TextNode> separator) implements TextNode {
+public record SelectorNode(ParsedSelector selector, Optional<TextNode> separator) implements TextNode {
     @Override
     public Text toText(ParserContext context, boolean removeBackslashes) {
-        return Text.selector(pattern, separator.map(x -> x.toText(context, removeBackslashes)));
+        return Text.selector(selector, separator.map(x -> x.toText(context, removeBackslashes)));
     }
 
     @Override

src/main/java/eu/pb4/placeholders/impl/GeneralUtils.java

@@ -225,11 +225,11 @@ public static ParentNode convertToNodes(Text input) {
 
             list.add(TranslatedNode.ofFallback(content.getKey(), content.getFallback(), args.toArray()));
         } else if (input.getContent() instanceof ScoreTextContent content) {
-            list.add(new ScoreNode(content.getName(), content.getObjective()));
+            list.add(new ScoreNode(content.name(), content.objective()));
         } else if (input.getContent() instanceof KeybindTextContent content) {
             list.add(new KeybindNode(content.getKey()));
         } else if (input.getContent() instanceof SelectorTextContent content) {
-            list.add(new SelectorNode(content.getPattern(), content.getSeparator().map(GeneralUtils::convertToNodes)));
+            list.add(new SelectorNode(content.selector(), content.separator().map(GeneralUtils::convertToNodes)));
         } else if (input.getContent() instanceof NbtTextContent content) {
             list.add(new NbtNode(content.getPath(), content.shouldInterpret(), content.getSeparator().map(GeneralUtils::convertToNodes), content.getDataSource()));
         }