Merge pull request #147 from litetex-oss/dev

Release

Author: litetex

.github/workflows/release.yml

@@ -117,7 +117,7 @@ jobs:
           * [Modrinth](https://modrinth.com/mod/${{ steps.metadata.outputs.archivesBaseName }})
           * the GitHub release assets below
           * [Maven Central](https://repo.maven.apache.org/maven2/net/litetex/mcm/)
-          ${{ (steps.check-for-curseforge.outputs.has) && format('[CurseForge](https://www.curseforge.com/minecraft/mc-mods/{0})', steps.metadata.outputs.archivesBaseName) || '' }}
+          ${{ (steps.check-for-curseforge.outputs.has) && format('* [CurseForge](https://www.curseforge.com/minecraft/mc-mods/{0})', steps.metadata.outputs.archivesBaseName) || '' }}
 
   publish:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.0.2
+* Fixed: `$` inside `fabric.mod.json` is usually replaced by the build process #145
+  * Added a note that this may require escaping using a `\`
+  * Made it possible to use `§` instead of `$`
+    * Updated the demo accordingly
+
 # 4.0.1
 * Made animated GIF decoding more reliable
   * This should fix broken textures #135

README.md

@@ -96,8 +96,9 @@ Here's a simple implementation:
     "cape": {
       // Gives everyone a christmas cape
       // You can also use variables here, like $uuid. See above for more details
+      // You may have to escape the $ with \ or you can alternatively use § instead of $
       // Alternative: "uriTemplate"
-      "url": "https://raw.githubusercontent.com/litetex-oss/mcm-cape-provider/refs/heads/dev/custom-cape-demo/uuid.png",
+      "url": "https://example.org/textures/§uuid.png",
       "changeCapeUrl": "https://...",
       "rateLimitedReqPerSec": 20 // Default is 20
     }

src/main/java/net/litetex/capes/provider/CustomProvider.java

@@ -39,10 +39,30 @@ public String name()
 	@Override
 	public String getBaseUrl(final GameProfile profile)
 	{
-		return this.config.uriTemplate()
-			.replace("$name", profile.getName())
-			.replace("$id", profile.getId().toString())
-			.replace("$idNoHyphen", profile.getId().toString().replace("-", ""));
+		final String idString = profile.getId().toString();
+		String uriTemplate = this.config.uriTemplate();
+		if(uriTemplate.indexOf('$') != -1)
+		{
+			uriTemplate = this.fillInTemplate(uriTemplate, '$', idString, profile);
+		}
+		else if(uriTemplate.indexOf('§') != -1)
+		{
+			uriTemplate = this.fillInTemplate(uriTemplate, '§', idString, profile);
+		}
+		
+		return uriTemplate;
+	}
+	
+	protected String fillInTemplate(
+		final String uriTemplate,
+		final char prefix,
+		final String idString,
+		final GameProfile profile)
+	{
+		return uriTemplate
+			.replace(prefix + "name", profile.getName())
+			.replace(prefix + "id", idString)
+			.replace(prefix + "idNoHyphen", idString.replace("-", ""));
 	}
 
 	@Override