Merge pull request #53 from litetex-oss/dev

Release

Author: litetex

.config/pmd/ruleset.xml .config/pmd/java/ruleset.xml.config/pmd/ruleset.xml renamed to .config/pmd/java/ruleset.xml

@@ -1,3 +1,8 @@
+# 1.2.0
+* Updated to 1.21.6
+  * Reworked/Fixed preview rendering
+* Custom providers (loaded from the config-file) can now provide animated textures
+
 # 1.1.1
 * Optimized rendering in preview screen
 * Correctly declared fabric-api

CHANGELOG.md

@@ -36,6 +36,17 @@ This demo showcases how to apply the capes inside [``custom-cape-demo``](https:/
       "uriTemplate": "https://raw.githubusercontent.com/litetex-oss/mcm-cape-provider/refs/heads/dev/custom-cape-demo/uuid.png"
     }
     ```
+    <details><summary>Example for SkinMC</summary>
+
+    ```jsonc
+    {
+      "id": "skinmc",
+      "name": "SkinMC",
+      "uriTemplate": "https://skinmc.net/api/v1/skinmcCape/$id"
+    }
+    ```
+
+    </details>
 3. Restart the game and activate the provider
 
 For more details have a look at [CustomProvider](https://github.com/litetex-oss/mcm-cape-provider/tree/dev/src/main/java/net/litetex/capes/provider/CustomProvider.java) and [CustomProviderConfig](https://github.com/litetex-oss/mcm-cape-provider/tree/dev/src/main/java/net/litetex/capes/config/CustomProviderConfig.java)

README.md

@@ -9,9 +9,9 @@ plugins {
 }
 
 ext {
-    checkstyleVersion = '10.24.0'
+    checkstyleVersion = '10.25.0'
 
-    pmdVersion = '7.13.0'
+    pmdVersion = '7.14.0'
 
     // Derive version from yarn
     minecraft_version = project.yarn_mappings.split("\\+")[0]
@@ -85,14 +85,15 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     // Required when translations and icons should be loaded correctly
-    modImplementation "net.fabricmc.fabric-api:fabric-api:0.124.2+1.21.5"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:0.126.1+1.21.6"
 
     modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_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:0.126.1+1.21.6"
     modLocalRuntime "me.djtheredstoner:DevAuth-fabric:1.2.1"
-    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.5-v2.12.0"
+//    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.4-v2.11.0"
 }
 
 processResources {
@@ -117,7 +118,7 @@ checkstyle {
 
 pmd {
     consoleOutput = true
-    ruleSetFiles = files(".config/pmd/ruleset.xml")
+    ruleSetFiles = files(".config/pmd/java/ruleset.xml")
     toolVersion = pmdVersion
 }
 

build.gradle

@@ -1,15 +1,15 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
-yarn_mappings=1.21.5+build.1
+yarn_mappings=1.21.6-rc1+build.1
 loader_version=0.16.14
 # Mod Properties
-mod_version=1.1.2-SNAPSHOT
+mod_version=1.2.0-SNAPSHOT
 maven_group=net.litetex.mcm
 archives_base_name=cape-provider
 mod_name=Cape Provider
 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
-modmenu_version=13.0.3
+modmenu_version=14.0.0-rc.2

custom-cape-demo/animated.png

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

gradle.properties

@@ -8,6 +8,7 @@ public record CustomProviderConfig(
 	String id,
 	String name,
 	String uriTemplate,
+	boolean animated,
 	String changeCapeUrl,
 	String homepage,
 	List<String> antiFeatures

gradle/wrapper/gradle-wrapper.properties

@@ -64,7 +64,7 @@ public Thread newThread(@NotNull final Runnable r)
 	private final GameProfile profile;
 	private int lastFrame;
 	private int maxFrames;
-	private long lastFrameTime;
+	private long nextFrameTime;
 	private boolean hasCape;
 	private boolean hasElytraTexture = true;
 	private boolean hasAnimatedCape;
@@ -82,11 +82,11 @@ public Identifier getCape()
 		}
 
 		final long time = System.currentTimeMillis();
-		if(time > this.lastFrameTime + 100L)
+		if(time > this.nextFrameTime)
 		{
 			final int thisFrame = (this.lastFrame + 1) % this.maxFrames;
 			this.lastFrame = thisFrame;
-			this.lastFrameTime = time;
+			this.nextFrameTime = time + 100L;
 			return identifier(this.uuid() + "/" + thisFrame);
 		}
 		return identifier(this.uuid() + "/" + this.lastFrame);
@@ -152,6 +152,11 @@ public void connectFailed(final URI uri, final SocketAddress sa, final IOExcepti
 					.stream()
 					.collect(Collectors.toMap(e -> identifier(this.uuid() + "/" + e.getKey()), Map.Entry::getValue));
 
+				if(texturesToRegister.isEmpty())
+				{
+					throw new IllegalStateException("Received animated texture with no frames");
+				}
+				
 				// Assume that elytra texture is available
 				this.hasElytraTexture = true;
 
@@ -356,6 +361,11 @@ public boolean hasCape()
 		return this.hasCape;
 	}
 
+	public boolean hasAnimatedCape()
+	{
+		return this.hasAnimatedCape;
+	}
+	
 	public boolean hasElytraTexture()
 	{
 		return this.hasElytraTexture;