Merge pull request #249 from litetex-oss/dev

litetex · web-flow · commit 32f65a57d632 · 2026-02-22T15:47:56.000+01:00
Release
diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
@@ -144,7 +144,6 @@
 	<rule ref="category/java/errorprone.xml/CollectionTypeMismatch"/>
 	<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
 	<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
-	<rule ref="category/java/errorprone.xml/DontImportSun"/>
 	<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
 	<rule ref="category/java/errorprone.xml/EqualsNull"/>
 	<rule ref="category/java/errorprone.xml/IdempotentOperations"/>
@@ -162,6 +161,7 @@
 	<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
 	<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
 	<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
+	<rule ref="category/java/errorprone.xml/UnsupportedJdkApiUsage"/>
 	<rule ref="category/java/errorprone.xml/UselessPureMethodCall"/>
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 5.1.0
+* New built-in Cape Provider
+  * [Sneaky Capes](https://modrinth.com/mod/sneaky_capes) #241
+* Updated dependencies / Improved mod compatibility
+
 # 5.0.0
 * Added possibility to add a simple/static local provider
   * Require no network connection
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.14.8'
+    id 'fabric-loom' version '1.15.4'
     id 'maven-publish'
     id 'signing'
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
@@ -9,9 +9,9 @@ plugins {
 }
 
 ext {
-    checkstyleVersion = '12.3.0'
+    checkstyleVersion = '13.2.0'
 
-    pmdVersion = '7.19.0'
+    pmdVersion = '7.21.0'
 }
 
 version = project.mod_version
@@ -45,17 +45,6 @@ repositories {
             includeGroup 'com.terraformersmc'
         }
     }
-    exclusiveContent {
-        forRepository {
-            maven {
-                name = "DevAuth"
-                url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1"
-            }
-        }
-        filter {
-            includeGroup 'me.djtheredstoner'
-        }
-    }
     // https://support.modrinth.com/en/articles/8801191-modrinth-maven
     exclusiveContent {
         forRepository {
diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@
 org.gradle.jvmargs=-Xmx2G
 minecraft_version=1.21.11
 # Fabric Properties
-loader_version=0.18.3
+loader_version=0.18.4
 # Mod Properties
-mod_version=5.0.1-SNAPSHOT
+mod_version=5.1.0-SNAPSHOT
 maven_group=net.litetex.mcm
 archivesBaseName=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
-fabric_api_version=0.140.2+1.21.11
-modmenu_version=17.0.0-beta.1
-skinshuffle_version=2.10.1+1.21.11-fabric
+fabric_api_version=0.141.3+1.21.11
+modmenu_version=17.0.0-beta.2
+skinshuffle_version=2.10.2+1.21.11-fabric
 minecraftcapes_version=fabric-1.21.11-1.0.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/litetex/capes/fabric/FabricCapes.java b/src/main/java/net/litetex/capes/fabric/FabricCapes.java
@@ -116,7 +116,7 @@ private void saveConfig(final Path configFile, final Config config)
 	
 	static class InstantConverter implements JsonSerializer<Instant>, JsonDeserializer<Instant>
 	{
-		public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_INSTANT;
+		static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_INSTANT;
 		
 		@Override
 		public JsonElement serialize(final Instant src, final Type typeOfSrc, final JsonSerializationContext context)
diff --git a/src/main/java/net/litetex/capes/handler/PlayerCapeHandler.java b/src/main/java/net/litetex/capes/handler/PlayerCapeHandler.java
@@ -256,7 +256,7 @@ record TextureToRegister(
 		int delayMs
 	)
 	{
-		public TextureToRegister(final Identifier identifier, final NativeImage image)
+		TextureToRegister(final Identifier identifier, final NativeImage image)
 		{
 			this(identifier, image, 100);
 		}
diff --git a/src/main/java/net/litetex/capes/handler/RealPlayerValidator.java b/src/main/java/net/litetex/capes/handler/RealPlayerValidator.java
@@ -87,7 +87,7 @@ enum ValidityState
 			this.valid = valid;
 		}
 		
-		public boolean isValid()
+		boolean isValid()
 		{
 			return this.valid;
 		}
diff --git a/src/main/java/net/litetex/capes/menu/MainMenuScreen.java b/src/main/java/net/litetex/capes/menu/MainMenuScreen.java
@@ -140,7 +140,7 @@ static class HeaderHeightOptionListWidget extends OptionsList
 	{
 		private final int headerHeight;
 		
-		public HeaderHeightOptionListWidget(
+		HeaderHeightOptionListWidget(
 			final Minecraft client,
 			final int width,
 			final OptionsSubScreen optionsScreen,
diff --git a/src/main/java/net/litetex/capes/menu/preview/PreviewMenuScreen.java b/src/main/java/net/litetex/capes/menu/preview/PreviewMenuScreen.java
@@ -131,7 +131,7 @@ static class ViewModel
 		
 		private PlayerDisplayGuiPayload payload;
 		
-		public ViewModel()
+		ViewModel()
 		{
 			this.gameProfile = Minecraft.getInstance().getGameProfile();
 			this.skin = DefaultPlayerSkin.get(this.gameProfile);
@@ -210,19 +210,19 @@ private Supplier<ClientAsset.Texture> determineCapeTextureSupplier(final PlayerC
 				: () -> null;
 		}
 		
-		public void providerChanged()
+		void providerChanged()
 		{
 			this.refreshActiveCapeProviders();
 			this.updateCapeAndElytraTexture();
 		}
 		
-		public void toggleShowBody()
+		void toggleShowBody()
 		{
 			this.showBody = !this.showBody;
 			this.rebuildPayload();
 		}
 		
-		public void toggleShowElytra()
+		void toggleShowElytra()
 		{
 			this.showElytra = !this.showElytra;
 			this.rebuildPayload();
@@ -238,7 +238,7 @@ private void rebuildPayload()
 			);
 		}
 		
-		public PlayerDisplayGuiPayload getPayload()
+		PlayerDisplayGuiPayload getPayload()
 		{
 			return this.payload;
 		}
@@ -253,12 +253,12 @@ static class PlayerLimbAnimator
 		
 		private float limbAngle;
 		
-		public PlayerLimbAnimator(final int fps)
+		PlayerLimbAnimator(final int fps)
 		{
 			this.msBetweenUpdates = 1000 / fps;
 		}
 		
-		public void animate(final PlayerModel player, final float tickDelta)
+		void animate(final PlayerModel player, final float tickDelta)
 		{
 			if(player == null)
 			{
diff --git a/src/main/java/net/litetex/capes/menu/provider/ProviderListWidget.java b/src/main/java/net/litetex/capes/menu/provider/ProviderListWidget.java
@@ -202,7 +202,7 @@ static class ProviderListEntry extends ObjectSelectionList.Entry<ProviderListEnt
 		private final UpDownIconWidget icoMoveUp;
 		private final UpDownIconWidget icoMoveDown;
 		
-		public ProviderListEntry(
+		ProviderListEntry(
 			final CapeProvider capeProvider,
 			final boolean activated,
 			final Screen parentScreen,
@@ -309,22 +309,22 @@ public ProviderListEntry(
 				() -> onPositionChange.accept(this, false));
 		}
 		
-		public CapeProvider capeProvider()
+		CapeProvider capeProvider()
 		{
 			return this.capeProvider;
 		}
 		
-		public boolean isActive()
+		boolean isActive()
 		{
 			return this.chbxActive.isTicked();
 		}
 		
-		public void upVisible(final boolean visible)
+		void upVisible(final boolean visible)
 		{
 			this.icoMoveUp.visible = visible;
 		}
 		
-		public void downVisible(final boolean visible)
+		void downVisible(final boolean visible)
 		{
 			this.icoMoveDown.visible = visible;
 		}
@@ -474,7 +474,7 @@ static class UpDownIconWidget extends AbstractWidget
 		private final Runnable onClick;
 		
 		@SuppressWarnings("PMD.ExcessiveParameterList")
-		public UpDownIconWidget(
+		UpDownIconWidget(
 			final int width,
 			final int height,
 			final Identifier texture,
@@ -510,7 +510,7 @@ public void onClick(final MouseButtonEvent click, final boolean bl)
 			this.click();
 		}
 		
-		public void click()
+		void click()
 		{
 			this.onClick.run();
 		}
@@ -541,7 +541,7 @@ protected void updateWidgetNarration(final NarrationElementOutput builder)
 	
 	static class ClickableTextWidget extends StringWidget
 	{
-		public ClickableTextWidget(final Component message, final Font textRenderer)
+		ClickableTextWidget(final Component message, final Font textRenderer)
 		{
 			super(message, textRenderer);
 		}
diff --git a/src/main/java/net/litetex/capes/mixins/CapeFeatureRendererMixin.java b/src/main/java/net/litetex/capes/mixins/CapeFeatureRendererMixin.java
@@ -13,9 +13,12 @@
 @Mixin(CapeLayer.class)
 public abstract class CapeFeatureRendererMixin
 {
-	@Redirect(method = "submit*", at = @At(value = "INVOKE",
-		target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;entitySolid("
-			+ "Lnet/minecraft/resources/Identifier;)Lnet/minecraft/client/renderer/rendertype/RenderType;"))
+	@Redirect(
+		method = "submit*",
+		at = @At(
+			value = "INVOKE",
+			target = "Lnet/minecraft/client/renderer/rendertype/RenderTypes;entitySolid("
+				+ "Lnet/minecraft/resources/Identifier;)Lnet/minecraft/client/renderer/rendertype/RenderType;"))
 	private RenderType fixCapeTransparency(final Identifier texture)
 	{
 		return RenderTypes.armorCutoutNoCull(texture);
diff --git a/src/main/java/net/litetex/capes/provider/SneakyCapesCapeProvider.java b/src/main/java/net/litetex/capes/provider/SneakyCapesCapeProvider.java
diff --git a/src/main/java/net/litetex/capes/util/json/JSONSerializer.java b/src/main/java/net/litetex/capes/util/json/JSONSerializer.java
diff --git a/src/main/resources/META-INF/services/net.litetex.capes.provider.CapeProvider b/src/main/resources/META-INF/services/net.litetex.capes.provider.CapeProvider
diff --git a/src/main/resources/cape-provider.accesswidener b/src/main/resources/cape-provider.accesswidener

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ private void saveConfig(final Path configFile, final Config config)`
`116`	`116`
`117`	`117`	`static class InstantConverter implements JsonSerializer<Instant>, JsonDeserializer<Instant>`
`118`	`118`	`{`
`119`		`- public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_INSTANT;`
	`119`	`+ static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_INSTANT;`
`120`	`120`
`121`	`121`	`@Override`
`122`	`122`	`public JsonElement serialize(final Instant src, final Type typeOfSrc, final JsonSerializationContext context)`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ record TextureToRegister(`
`256`	`256`	`int delayMs`
`257`	`257`	`)`
`258`	`258`	`{`
`259`		`- public TextureToRegister(final Identifier identifier, final NativeImage image)`
	`259`	`+ TextureToRegister(final Identifier identifier, final NativeImage image)`
`260`	`260`	`{`
`261`	`261`	`this(identifier, image, 100);`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ enum ValidityState`
`87`	`87`	`this.valid = valid;`
`88`	`88`	`}`
`89`	`89`
`90`		`- public boolean isValid()`
	`90`	`+ boolean isValid()`
`91`	`91`	`{`
`92`	`92`	`return this.valid;`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ static class HeaderHeightOptionListWidget extends OptionsList`
`140`	`140`	`{`
`141`	`141`	`private final int headerHeight;`
`142`	`142`
`143`		`- public HeaderHeightOptionListWidget(`
	`143`	`+ HeaderHeightOptionListWidget(`
`144`	`144`	`final Minecraft client,`
`145`	`145`	`final int width,`
`146`	`146`	`final OptionsSubScreen optionsScreen,`