Merge pull request #170 from litetex-oss/dev

Release

Author: litetex

.github/workflows/broken-links.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Create Issue From File
         if: steps.lychee.outputs.exit_code != 0
-        uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
+        uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6
         with:
           issue-number: ${{ steps.find-issue.outputs.number }}
           title: Link Checker Report

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.1.1
+* Update Cosmetica API #166
+* Improved mod compatibility
+
 # 4.1.0
 * Updated to 1.21.9
 

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 ext {
-    checkstyleVersion = '11.1.0'
+    checkstyleVersion = '12.0.0'
 
     pmdVersion = '7.17.0'
 
@@ -91,14 +91,13 @@ dependencies {
 
     modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
     modCompileOnly "maven.modrinth:skinshuffle:${project.skinshuffle_version}"
-    modCompileOnly "maven.modrinth:cicada:${project.cicada_version}"
     modCompileOnly "maven.modrinth:minecraftcapes:${project.minecraftcapes_version}"
 
     // Only needed during development
-//    modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
+    modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
     modLocalRuntime "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
     modLocalRuntime "me.djtheredstoner:DevAuth-fabric:1.2.1"
-//    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.7-v2.14.0"
+    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.10-v2.16.0"
 }
 
 processResources {

gradle.properties

@@ -1,7 +1,7 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
-yarn_mappings=1.21.9+build.1
+yarn_mappings=1.21.10+build.2
 loader_version=0.17.2
 # Mod Properties
 mod_version=4.1.1-SNAPSHOT
@@ -12,8 +12,7 @@ mod_desc=Use capes from various providers
 mod_license_spdx_id=LGPL-2.1-or-later
 mod_license_url=https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
 # Additional
-fabric_api_version=0.133.14+1.21.9
-modmenu_version=15.0.0
+fabric_api_version=0.135.0+1.21.10
+modmenu_version=16.0.0-rc.1
 skinshuffle_version=2.9.5+1.21.6
-cicada_version=0.14.2+1.21.6-and-above
-minecraftcapes_version=fabric-1.21.8-12.4.0
+minecraftcapes_version=fabric-1.21.10-12.4.0

src/main/java/net/litetex/capes/mixins/compat/cicada/CapeHandlerMixin.java

@@ -1,7 +1,12 @@
 package net.litetex.capes.provider;
 
+import java.io.IOException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.List;
 
+import com.google.gson.Gson;
 import com.mojang.authlib.GameProfile;
 
 import net.litetex.capes.provider.antifeature.AntiFeature;
@@ -11,6 +16,8 @@
 
 public class CosmeticaProvider implements CapeProvider
 {
+	private static final String BASE64_PREFIX = "data:image/png;base64,";
+	
 	@Override
 	public String id()
 	{
@@ -26,9 +33,50 @@ public String name()
 	@Override
 	public String getBaseUrl(final GameProfile profile)
 	{
-		return "https://api.cosmetica.cc/get/cloak?username=" + profile.name()
-			+ "&uuid=" + profile.id().toString()
-			+ "&nothirdparty";
+		return "https://api.cosmetica.cc/v2/get/info"
+			+ "?uuid=" + profile.id().toString()
+			+ "&nothirdparty"
+			+ "&excludemodels";
+	}
+	
+	@Override
+	public ResolvedTextureInfo resolveTexture(
+		final HttpClient.Builder clientBuilder,
+		final HttpRequest.Builder requestBuilder,
+		final GameProfile profile) throws IOException, InterruptedException
+	{
+		requestBuilder.setHeader("Accept", "application/json");
+		
+		try(final HttpClient client = clientBuilder.build())
+		{
+			final HttpResponse<String> response =
+				client.send(requestBuilder.GET().build(), HttpResponse.BodyHandlers.ofString());
+			
+			if(response.statusCode() / 100 != 2)
+			{
+				return null;
+			}
+			
+			record CapeData(String image)
+			{
+			}
+			record ResponseData(CapeData cape)
+			{
+			}
+			
+			final ResponseData responseData = new Gson().fromJson(response.body(), ResponseData.class);
+			if(responseData == null
+				|| responseData.cape() == null
+				|| responseData.cape().image() == null
+				|| !responseData.cape().image().startsWith(BASE64_PREFIX))
+			{
+				return null;
+			}
+			
+			return new ResolvedTextureInfo.Base64TextureInfo(
+				responseData.cape().image().substring(BASE64_PREFIX.length())
+			);
+		}
 	}
 
 	@Override
@@ -53,7 +101,15 @@ public String homepageUrl()
 	public List<AntiFeature> antiFeatures()
 	{
 		return List.of(
-			AntiFeatures.ABANDONED // Last updated 2024-05
+			AntiFeatures.ABANDONED, // Last updated 2024-05
+			AntiFeatures.BAD_CONNECTION // Response can take up to 3s
 		);
 	}
+	
+	@Override
+	public double rateLimitedReqPerSec()
+	{
+		// has an underperforming backend
+		return 10;
+	}
 }

src/main/java/net/litetex/capes/mixins/compat/cicada/ConversationManagerMixin.java

@@ -43,7 +43,8 @@ public ResolvedTextureInfo resolveTexture(
 		final GameProfile profile) throws IOException, InterruptedException
 	{
 		requestBuilder
-			.setHeader("User-Agent", "minecraftcapes-mod/" + SharedConstants.getGameVersion().name());
+			.setHeader("User-Agent", "minecraftcapes-mod/" + SharedConstants.getGameVersion().name())
+			.setHeader("Accept", "application/json");
 
 		try(final HttpClient client = clientBuilder.build())
 		{

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

@@ -46,7 +46,7 @@ public ResolvedTextureInfo resolveTexture(
 
 			final HttpRequest request = requestBuilder
 				// Does UserAgent blocking: https://github.com/Wynntils/athena-backend/pull/36
-				.header("User-Agent", "Wynntils Artemis\\3.2.9+MC-1.21.4 (client) FABRIC")
+				.header("User-Agent", "Wynntils Artemis\\3.3.0+MC-1.21.4 (client) FABRIC")
 				.header("Content-Type", "application/json")
 				.POST(HttpRequest.BodyPublishers.ofString(body.toString()))
 				.build();
@@ -101,7 +101,7 @@ public String homepageUrl()
 	@Override
 	public double rateLimitedReqPerSec()
 	{
-		// Wynntils has a very underperforming backend
+		// has a very underperforming backend
 		return 4;
 	}
 }

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

@@ -10,8 +10,6 @@
     "CapeFeatureRendererMixin",
     "PlayerListEntryMixin",
     "SkinOptionsScreenMixin",
-    "compat.cicada.CapeHandlerMixin",
-    "compat.cicada.ConversationManagerMixin",
     "compat.minecraftcapes.DownloadManagerMixin",
     "compat.skinshuffle.CapesCompatMixin"
   ],