Merge pull request #83 from litetex-oss/dev

Release

Author: litetex

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.1.0
+* Fixed mod configuration button not being displayed correctly in Skin Customization Screen when resizing #79
+* Fully utilize fabric-api. fabric-api is now required #78
+* Now targeting 1.21.7
+
 # 2.0.1
 * Use built-in warning icon instead of bringing a custom one #66
 * Also publish to CurseForge #62

build.gradle

@@ -9,9 +9,9 @@ plugins {
 }
 
 ext {
-    checkstyleVersion = '10.25.1'
+    checkstyleVersion = '10.26.1'
 
-    pmdVersion = '7.14.0'
+    pmdVersion = '7.15.0'
 
     // Derive version from yarn
     minecraft_version = project.yarn_mappings.split("\\+")[0]
@@ -85,15 +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.127.1+1.21.6"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:0.128.2+1.21.7"
 
     modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
 
     // Only needed during development
     modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
-    modLocalRuntime "net.fabricmc.fabric-api:fabric-api:0.127.1+1.21.6"
+    modLocalRuntime "net.fabricmc.fabric-api:fabric-api:0.128.2+1.21.7"
     modLocalRuntime "me.djtheredstoner:DevAuth-fabric:1.2.1"
-//    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.4-v2.11.0"
+    modLocalRuntime "maven.modrinth:no-chat-reports:Fabric-1.21.7-v2.14.0"
 }
 
 processResources {
@@ -201,7 +201,7 @@ modrinth {
     syncBodyFrom = rootProject.file("README.md").text
     changelog = System.getenv("MODRINTH_CHANGELOG_TEXT")
     dependencies {
-        optional.project 'fabric-api'
+        required.project 'fabric-api'
         optional.project 'modmenu'
         incompatible.project 'capes'
     }

gradle.properties

@@ -1,10 +1,10 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
-yarn_mappings=1.21.6+build.1
+yarn_mappings=1.21.7+build.6
 loader_version=0.16.14
 # Mod Properties
-mod_version=2.0.2-SNAPSHOT
+mod_version=2.1.0-SNAPSHOT
 maven_group=net.litetex.mcm
 archives_base_name=cape-provider
 mod_name=Cape Provider

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/net/litetex/capes/CapesMixinPlugin.java

@@ -12,9 +12,11 @@
 import com.google.gson.GsonBuilder;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.SpecialGuiElementRegistry;
 import net.fabricmc.loader.api.FabricLoader;
 import net.litetex.capes.Capes;
 import net.litetex.capes.config.Config;
+import net.litetex.capes.menu.preview.render.PlayerDisplayGuiElementRenderer;
 import net.litetex.capes.provider.CapeProviders;
 
 
@@ -27,7 +29,7 @@ public class FabricCapes implements ClientModInitializer
 	@Override
 	public void onInitializeClient()
 	{
-		FabricCapesCompatibilityInit.init();
+		SpecialGuiElementRegistry.register(ctx -> new PlayerDisplayGuiElementRenderer(ctx.vertexConsumers()));
 
 		final Config config = this.loadConfig();
 		Capes.setInstance(new Capes(

src/main/java/net/litetex/capes/fabric/FabricCapes.java

@@ -260,11 +260,15 @@ private Optional<IdentifierProvider> registerTexturesAndGetProvider(
 		final TextureManager textureManager = MinecraftClient.getInstance().getTextureManager();
 		// Do texturing work NOT on Render thread
 		CompletableFuture.runAsync(
-			() -> texturesToRegister.forEach((id, texture) ->
-				textureManager.registerTexture(
-					id,
-					new NativeImageBackedTexture(id::toString, texture))),
-			MinecraftClient.getInstance());
+				() -> texturesToRegister.forEach((id, texture) ->
+					textureManager.registerTexture(
+						id,
+						new NativeImageBackedTexture(id::toString, texture))),
+				MinecraftClient.getInstance())
+			.exceptionally(ex -> {
+				LOG.warn("Failed to register textures", ex);
+				return null;
+			});
 
 		return Optional.of(texturesToRegister.size() == 1
 			? new DefaultIdentifierProvider(texturesToRegister.keySet().iterator().next())

src/main/java/net/litetex/capes/fabric/FabricCapesCompatibilityInit.java

@@ -20,6 +20,7 @@
 import net.litetex.capes.Capes;
 import net.litetex.capes.provider.CapeProvider;
 import net.litetex.capes.util.GameProfileUtil;
+import net.minecraft.util.logging.UncaughtExceptionHandler;
 
 
 @SuppressWarnings({"checkstyle:MagicNumber", "PMD.GodClass"})
@@ -51,6 +52,7 @@ public Thread newThread(@NotNull final Runnable r)
 					final Thread thread = new Thread(r);
 					thread.setName("Cape-" + COUNTER.getAndIncrement());
 					thread.setDaemon(true);
+					thread.setUncaughtExceptionHandler(new UncaughtExceptionHandler(LOG));
 					return thread;
 				}
 			});
@@ -91,8 +93,16 @@ public void onLoadTexture(
 		{
 			LOG.debug("onLoadTexture: {}/{} validate={}", profile.getName(), profile.getId(), validateProfile);
 		}
-		this.loadExecutors.submit(() ->
-			this.onLoadTextureInternalAsync(profile, validateProfile, capeProviders, onAfterLoaded));
+		this.loadExecutors.submit(() -> {
+			try
+			{
+				this.onLoadTextureInternalAsync(profile, validateProfile, capeProviders, onAfterLoaded);
+			}
+			catch(final Exception ex)
+			{
+				LOG.warn("Failed to async load texture for {}/{}", profile.getName(), profile.getId(), ex);
+			}
+		});
 	}
 
 	private void onLoadTextureInternalAsync(