Fix TokenizedTaks passing Objects directly to ReplaceTokens (#130)

neoforged · Mar 16, 2024 · 9b23c1e · 9b23c1e
1 parent 2878f69
commit 9b23c1e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/platform/src/main/java/net/neoforged/gradle/platform/tasks/CreateClasspathFiles.java b/platform/src/main/java/net/neoforged/gradle/platform/tasks/CreateClasspathFiles.java
@@ -33,7 +33,7 @@ public CreateClasspathFiles() {
 
     @TaskAction
     public void doTask() throws Exception {
-        final Map<String, Object> tokens = new HashMap<>(getTokens().get());
+        final Map<String, String> tokens = new HashMap<>(getTokens().get());
 
         ArtifactPathsCollector modulePathCollector = new ArtifactPathsCollector(getObjectFactory(), getPathSeparator().get(), "libraries/");
         ArtifactPathsCollector classpathCollector = new ArtifactPathsCollector(getObjectFactory(), getPathSeparator().get(), "libraries/");

diff --git a/platform/src/main/java/net/neoforged/gradle/platform/tasks/CreateLegacyInstaller.java b/platform/src/main/java/net/neoforged/gradle/platform/tasks/CreateLegacyInstaller.java
@@ -63,9 +63,9 @@ public CreateLegacyInstaller() {
         from(getData(), spec -> {
             spec.into("data");
             spec.filter(s -> {
-                final Map<String, Object> tokens = getTokens().get();
-                for (Map.Entry<String, Object> entry : tokens.entrySet()) {
-                    s = s.replace(String.format("@%s@", entry.getKey()), entry.getValue().toString());
+                final Map<String, String> tokens = getTokens().get();
+                for (Map.Entry<String, String> entry : tokens.entrySet()) {
+                    s = s.replace(String.format("@%s@", entry.getKey()), entry.getValue());
                 }
                 return s;
             });

diff --git a/platform/src/main/java/net/neoforged/gradle/platform/tasks/TokenizedTask.java b/platform/src/main/java/net/neoforged/gradle/platform/tasks/TokenizedTask.java
@@ -8,13 +8,13 @@
 public interface TokenizedTask extends Task {
 
     @Input
-    MapProperty<String, Object> getTokens();
+    MapProperty<String, String> getTokens();
 
     default void token(String key, Object value) {
-        getTokens().put(key, value);
+        getTokens().put(key, value.toString());
     }
 
     default void token(String key, Provider<?> value) {
-        getTokens().put(key, value);
+        getTokens().put(key, value.map(Object::toString));
     }
 }