Merge pull request #212 from litetex-oss/dev

Release

Author: litetex

.github/workflows/check-build.yml

@@ -40,7 +40,7 @@ jobs:
         java-version: ${{ matrix.java }}
 
     - name: Cache Gradle
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.gradle/caches
@@ -71,7 +71,7 @@ jobs:
         fi
 
     - name: Upload mod files
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: mod-files-java-${{ matrix.java }}
         path: |
@@ -100,7 +100,7 @@ jobs:
         java-version: ${{ matrix.java }}
 
     - name: Cache Gradle
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.gradle/caches
@@ -131,7 +131,7 @@ jobs:
         java-version: ${{ matrix.java }}
 
     - name: Cache Gradle
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/.gradle/caches
@@ -145,7 +145,7 @@ jobs:
 
     - name: Upload report
       if: always()
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: pmd-report
         if-no-files-found: ignore

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
         distribution: 'temurin'
 
     - name: Try restore Gradle Cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: |
           ~/.gradle/caches
@@ -133,7 +133,7 @@ jobs:
         java-version: 21
 
     - name: Try restore Gradle Cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: |
           ~/.gradle/caches

.github/workflows/test-deploy.yml

@@ -17,7 +17,7 @@ jobs:
         java-version: '21'
 
     - name: Try restore Gradle Cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: |
           ~/.gradle/caches
@@ -34,7 +34,7 @@ jobs:
         MODRINTH_CHANGELOG_TEXT: 'Available at https://github.com/litetex-oss/mcm-cape-provider/blob/dev/CHANGELOG.md<br/><i>Please note that this is a SNAPSHOT which might be unstable</i>'
 
     - name: Upload mod files
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: mod-files
         path: |

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.2.1
+* Fix MinecraftCapes Provider no longer working due to breaking API changes #206
+* Removed Wynntils #204
+
 # 4.2.0
 * Updated to 1.21.11
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.14.5'
+    id 'fabric-loom' version '1.14.6'
     id 'maven-publish'
     id 'signing'
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
@@ -9,7 +9,7 @@ plugins {
 }
 
 ext {
-    checkstyleVersion = '12.2.0'
+    checkstyleVersion = '12.3.0'
 
     pmdVersion = '7.19.0'
 }
@@ -93,8 +93,7 @@ dependencies {
     // Only needed during development
     modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
     modLocalRuntime "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-    // https://github.com/DJtheRedstoner/DevAuth/issues/24
-//    modLocalRuntime "me.djtheredstoner:DevAuth-fabric:1.2.1"
+    modLocalRuntime "net.litetex.mcm:dev-auth-neo:1.0.1"
 //    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.10-v2.16.0"
 }
 

gradle.properties

@@ -12,7 +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.139.4+1.21.11
+fabric_api_version=0.139.5+1.21.11
 modmenu_version=17.0.0-alpha.1
-skinshuffle_version=2.10.0+1.21.10
+skinshuffle_version=2.10.1+1.21.11-fabric
 minecraftcapes_version=fabric-1.21.11-1.0.0

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

@@ -1,12 +1,13 @@
 package net.litetex.capes.provider;
 
 import java.io.IOException;
+import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.Map;
 
 import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
 import com.mojang.authlib.GameProfile;
 
 import net.litetex.capes.handler.textures.AnimatedSpriteTextureResolver;
@@ -43,33 +44,53 @@ public ResolvedTextureInfo resolveTexture(
 		final GameProfile profile) throws IOException, InterruptedException
 	{
 		requestBuilder
-			.setHeader("User-Agent", "minecraftcapes-mod/" + SharedConstants.getCurrentVersion().name())
-			.setHeader("Accept", "application/json");
+			.setHeader("User-Agent", "minecraftcapes-mod/" + SharedConstants.getCurrentVersion().name());
 
+		record ResponseData(
+			Boolean animatedCape,
+			@SerializedName("animated_cape_url")
+			String animatedCapeUrl,
+			@SerializedName("cape_url")
+			String capeUrl
+		)
+		{
+		}
+		
+		final ResponseData responseData;
 		try(final HttpClient client = clientBuilder.build())
 		{
 			final HttpResponse<String> response =
-				client.send(requestBuilder.GET().build(), HttpResponse.BodyHandlers.ofString());
+				client.send(
+					requestBuilder.copy()
+						.setHeader("Accept", "application/json")
+						.GET()
+						.build(),
+					HttpResponse.BodyHandlers.ofString());
 
 			if(response.statusCode() / 100 != 2)
 			{
 				return null;
 			}
 
-			record ResponseData(
-				Boolean animatedCape,
-				Map<String, String> textures
-			)
-			{
-			}
-			
-			final ResponseData responseData = new Gson().fromJson(response.body(), ResponseData.class);
-			
-			return new ResolvedTextureInfo.Base64TextureInfo(
-				responseData.textures().get("cape"),
-				responseData.animatedCape() ? AnimatedSpriteTextureResolver.ID : null
-			);
+			responseData = new Gson().fromJson(response.body(), ResponseData.class);
 		}
+		if(responseData == null)
+		{
+			return null;
+		}
+		
+		final String textureUrl = Boolean.TRUE.equals(responseData.animatedCape())
+			? responseData.animatedCapeUrl()
+			: responseData.capeUrl();
+		if(textureUrl == null)
+		{
+			return null;
+		}
+		
+		return CapeProvider.resolveTextureDefault(
+			clientBuilder,
+			requestBuilder.copy().uri(URI.create(textureUrl)),
+			responseData.animatedCape() ? AnimatedSpriteTextureResolver.ID : null);
 	}
 
 	@Override

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

@@ -1,5 +1,4 @@
 net.litetex.capes.provider.MinecraftCapesCapeProvider
 net.litetex.capes.provider.OptiFineCapeProvider
-net.litetex.capes.provider.WynntilsProvider
 net.litetex.capes.provider.CosmeticaProvider
 net.litetex.capes.provider.LabyModProvider