Merge pull request #48 from litetex-oss/1.21.6

1.21.6

Author: litetex

CHANGELOG.md

@@ -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

build.gradle

@@ -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 {

custom-cape-demo/animated.png

@@ -1,10 +1,10 @@
 # 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

gradle.properties

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

src/main/java/net/litetex/capes/config/CustomProviderConfig.java

@@ -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;