Snapshot port, remove deprecated stuff, some renames

Author: Patbox

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.13.+'
+	id 'net.fabricmc.fabric-loom' version '1.14.+'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -50,13 +50,12 @@ loom {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	//modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modCompileOnly("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
-	modLocalRuntime("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
+	compileOnly("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
+	localRuntime("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
 	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
 	// You may need to force-disable transitiveness on them.
@@ -81,12 +80,12 @@ tasks.withType(JavaCompile).configureEach {
 	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
 	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
 	// We'll use that if it's available, but otherwise we'll use the older option.
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
@@ -107,11 +106,11 @@ publishing {
 		mavenJava(MavenPublication) {
 			//artifactId = base.archivesName.get()
 			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
+			artifact(jar) {
+				builtBy jar
 			}
 			artifact(sourcesJar) {
-				builtBy remapSourcesJar
+				builtBy sourcesJar
 			}
 		}
 	}
@@ -144,13 +143,13 @@ if (System.getenv("MODRINTH")) {
 		projectId = 'eXts2L7r'// The ID of your modrinth project, slugs will not work.
 		versionNumber = "" + version // The version of the mod to upload.
 		versionType = "release"
-		uploadFile = remapJar // This links to a task that builds your mod jar and sets "uploadFile" to the mod jar.
+		uploadFile = jar // This links to a task that builds your mod jar and sets "uploadFile" to the mod jar.
 		gameVersions = [((String) project.minecraft_version)]
 		changelog = System.getenv("CHANGELOG")
 		loaders = ["fabric", "quilt"]
 	}
 
-	remapJar {
+	jar {
 		finalizedBy project.tasks.modrinth
 	}
 }
@@ -168,18 +167,18 @@ curseforge {
 			addGameVersion((project.minecraft_version.contains("-") ? ((String) project.minecraft_version.split("-")[0] + "-snapshot") : project.minecraft_version))
 			addGameVersion "Fabric"
 			addGameVersion "Quilt"
-			mainArtifact(remapJar)
+			mainArtifact(jar)
 
 			afterEvaluate {
-				uploadTask.dependsOn("remapJar")
+				uploadTask.dependsOn("jar")
 			}
 		}
 	}
 
 	options {
 		forgeGradleIntegration = false
 	}
-	remapJar {
+	jar {
 		finalizedBy project.tasks.curseforge
 	}
 }

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-minecraft_version=1.21.11
-loader_version=0.18.2
-loom_version=1.13-SNAPSHOT
+minecraft_version=26.1-snapshot-1
+loader_version=0.18.4
+loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_version=0.140.0+1.21.11
+fabric_version=0.140.2+26.1
 
 	# Mod Properties
-	mod_version = 2.9.0+1.21.11
+	mod_version = 3.0.0-beta.1+26.1-snapshot-1
 	maven_group = eu.pb4
 	archives_base_name = placeholder-api

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -28,31 +28,10 @@ public record PlaceholderContext(MinecraftServer server,
                                  ViewObject view
 ) {
 
-    public PlaceholderContext(MinecraftServer server,
-                              CommandSourceStack source,
-                              @Nullable ServerLevel world,
-                              @Nullable ServerPlayer player,
-                              @Nullable Entity entity,
-                              @Nullable GameProfile gameProfile,
-                              ViewObject view
-    ) {
-        this(server, () -> source, world, player, entity, gameProfile, view);
-    }
-
     public CommandSourceStack source() {
         return this.lazySource.get();
     }
 
-    public PlaceholderContext(MinecraftServer server,
-                              CommandSourceStack source,
-                              @Nullable ServerLevel world,
-                              @Nullable ServerPlayer player,
-                              @Nullable Entity entity,
-                              @Nullable GameProfile gameProfile) {
-        this(server, source, world, player, entity, gameProfile, ViewObject.DEFAULT);
-    }
-
-
     public static ParserContext.Key<PlaceholderContext> KEY = new ParserContext.Key<>("placeholder_context", PlaceholderContext.class);
 
     public boolean hasWorld() {
@@ -115,7 +94,7 @@ public static PlaceholderContext of(CommandSourceStack source) {
     }
 
     public static PlaceholderContext of(CommandSourceStack source, ViewObject view) {
-        return new PlaceholderContext(source.getServer(), source, source.getLevel(), source.getPlayer(), source.getEntity(), source.getPlayer() != null ? source.getPlayer().getGameProfile() : null, view);
+        return new PlaceholderContext(source.getServer(), () -> source, source.getLevel(), source.getPlayer(), source.getEntity(), source.getPlayer() != null ? source.getPlayer().getGameProfile() : null, view);
     }
 
     public static PlaceholderContext of(Entity entity) {

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

@@ -1,13 +1,12 @@
 package eu.pb4.placeholders.api;
 
-import eu.pb4.placeholders.api.parsers.TextParserV1;
+import eu.pb4.placeholders.api.parsers.TagParser;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 
 public final class PlaceholderResult {
     private final Component text;
-    private String string;
     private final boolean valid;
 
     private PlaceholderResult(Component text, String reason) {
@@ -29,21 +28,6 @@ public Component text() {
         return this.text;
     }
 
-    /**
-     * Returns text component as String (without formatting) from placeholder
-     * It's not recommended for general usage, as it makes it text static/unable to change depending on player's language or other settings
-     * and removes all styling.
-     *
-     * @return String
-     */
-    @Deprecated
-    public String string() {
-        if (this.string == null) {
-            this.string = this.text.getString();
-        }
-        return this.string;
-    }
-
     /**
      * Checks if placeholder was valid
      *
@@ -86,7 +70,16 @@ public static PlaceholderResult value(Component text) {
      * @return PlaceholderResult
      */
     public static PlaceholderResult value(String text) {
-        return new PlaceholderResult(TextParserV1.DEFAULT.parseText(text, null), null);
+        return new PlaceholderResult(TagParser.DEFAULT.parseComponent(text, ParserContext.of()), null);
+    }
+
+    /**
+     * Create result for placeholder
+     *
+     * @return PlaceholderResult
+     */
+    public static PlaceholderResult value(String text, ParserContext context) {
+        return new PlaceholderResult(TagParser.DEFAULT.parseComponent(text,context), null);
     }
 }