Merge pull request #4 from litetex-oss/dev

Release

Author: litetex

CHANGELOG.md

@@ -1,5 +1,7 @@
-# 1.0.0
+# 1.0.1
+* Improved compatibility information
 
+# 1.0.0
 Improvements and changes in comparison to Capes mod:
 * Improved provider configuration screen
   * Can now be ordered

LICENSE

@@ -12,7 +12,7 @@
 
 Provides you with capes!
 
-You can choose from various providers.
+You can choose from various providers or add your own.
 
 Improved/Reworked version of the ["Capes" mod](https://github.com/CaelTheColher/Capes):
 * Improved and easier cape provider integration

LICENSE.LGPL-2.1-or-later

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.10.2'
+    id 'fabric-loom' version '1.10.4'
     id 'maven-publish'
     id 'checkstyle'
     id 'org.sonarqube' version '6.0.1.5171'
@@ -21,7 +21,7 @@ base {
 
 loom {
     accessWidenerPath = file("src/main/resources/cape-provider.accesswidener")
-    log4jConfigs.from(file("log4j2-dev.xml"))
+    log4jConfigs.from(file("src/dev/log4j2.xml"))
 }
 
 // https://github.com/gradle/gradle/issues/27035
@@ -128,4 +128,7 @@ modrinth {
     uploadFile = remapJar
     syncBodyFrom = rootProject.file("README.md").text
     changelog = System.getenv("MODRINTH_CHANGELOG_TEXT")
+    dependencies {
+        optional.project 'modmenu'
+    }
 }

README.md

@@ -38,11 +38,11 @@
 
 
 @SuppressWarnings("checkstyle:MagicNumber")
-public class PlayerHandler
+public class PlayerCapeHandler
 {
-	private static final Logger LOG = LoggerFactory.getLogger(PlayerHandler.class);
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerCapeHandler.class);
 
-	private static final Map<UUID, PlayerHandler> INSTANCES = Collections.synchronizedMap(new HashMap<>());
+	private static final Map<UUID, PlayerCapeHandler> INSTANCES = Collections.synchronizedMap(new HashMap<>());
 
 	private static final ExecutorService EXECUTORS = Executors.newFixedThreadPool(
 		2,
@@ -68,7 +68,7 @@ public Thread newThread(@NotNull final Runnable r)
 	private boolean hasElytraTexture = true;
 	private boolean hasAnimatedCape;
 
-	public PlayerHandler(final GameProfile profile)
+	public PlayerCapeHandler(final GameProfile profile)
 	{
 		this.profile = profile;
 	}
@@ -225,15 +225,15 @@ private Map<Integer, NativeImage> toAnimatedCapeTextureFrames(final NativeImage
 		return frames;
 	}
 
-	public static PlayerHandler getProfile(final GameProfile profile)
+	public static PlayerCapeHandler getProfile(final GameProfile profile)
 	{
 		return INSTANCES.get(profile.getId());
 	}
 
 	// Only use this when required to keep RAM consumption low!
-	public static PlayerHandler getOrCreateProfile(final GameProfile profile)
+	public static PlayerCapeHandler getOrCreateProfile(final GameProfile profile)
 	{
-		return INSTANCES.computeIfAbsent(profile.getId(), ignored -> new PlayerHandler(profile));
+		return INSTANCES.computeIfAbsent(profile.getId(), ignored -> new PlayerCapeHandler(profile));
 	}
 
 	public static void onLoadTexture(final GameProfile profile)
@@ -282,11 +282,11 @@ public static void onLoadTexture(
 				}
 			}
 
-			final PlayerHandler playerHandler = getOrCreateProfile(profile);
-			playerHandler.resetCape();
+			final PlayerCapeHandler handler = getOrCreateProfile(profile);
+			handler.resetCape();
 
 			final Optional<CapeProvider> optFoundCapeProvider = capeProviders.stream()
-				.filter(playerHandler::trySetCape)
+				.filter(handler::trySetCape)
 				.findFirst();
 
 			if(LOG.isDebugEnabled())

build.gradle

@@ -5,7 +5,7 @@
 import com.mojang.authlib.GameProfile;
 
 import net.litetex.capes.Capes;
-import net.litetex.capes.handler.PlayerHandler;
+import net.litetex.capes.handler.PlayerCapeHandler;
 import net.litetex.capes.provider.CapeProvider;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.DefaultSkinHelper;
@@ -62,19 +62,19 @@ public void loadCapeTextureIfRequired()
 		if(!this.capeLoading)
 		{
 			this.capeLoading = true;
-			PlayerHandler.onLoadTexture(this.gameProfile, false, this.capeProviders, () -> this.capeLoaded = true);
+			PlayerCapeHandler.onLoadTexture(this.gameProfile, false, this.capeProviders, () -> this.capeLoaded = true);
 		}
 	}
 
 	public Identifier getCapeTexture()
 	{
-		final PlayerHandler handler = PlayerHandler.getProfile(this.gameProfile);
+		final PlayerCapeHandler handler = PlayerCapeHandler.getProfile(this.gameProfile);
 		return handler != null && handler.hasCape() ? handler.getCape() : this.skin.capeTexture();
 	}
 
 	public Identifier getElytraTexture()
 	{
-		final PlayerHandler handler = PlayerHandler.getProfile(this.gameProfile);
+		final PlayerCapeHandler handler = PlayerCapeHandler.getProfile(this.gameProfile);
 		final Identifier capeTexture = this.getCapeTexture();
 		return handler == null
 			|| (handler.hasElytraTexture()

log4j2-dev.xml src/dev/log4j2.xmllog4j2-dev.xml renamed to src/dev/log4j2.xml

@@ -18,7 +18,7 @@
 import com.mojang.authlib.GameProfile;
 
 import net.litetex.capes.Capes;
-import net.litetex.capes.handler.PlayerHandler;
+import net.litetex.capes.handler.PlayerCapeHandler;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.util.SkinTextures;
 import net.minecraft.util.Identifier;
@@ -42,14 +42,14 @@ private static void loadTextures(
 		if(lastLoadTime == null || lastLoadTime.isBefore(now.minus(Capes.instance().loadThrottleSuppressDuration())))
 		{
 			LOAD_THROTTLE.put(id, now);
-			PlayerHandler.onLoadTexture(profile);
+			PlayerCapeHandler.onLoadTexture(profile);
 		}
 	}
 
 	@Inject(method = "getSkinTextures", at = @At("TAIL"), cancellable = true)
 	private void getCapeTexture(final CallbackInfoReturnable<SkinTextures> cir)
 	{
-		final PlayerHandler handler = PlayerHandler.getProfile(this.profile);
+		final PlayerCapeHandler handler = PlayerCapeHandler.getProfile(this.profile);
 		if(handler != null && handler.hasCape())
 		{
 			final SkinTextures oldTextures = cir.getReturnValue();

…litetex/capes/handler/PlayerHandler.java …tex/capes/handler/PlayerCapeHandler.javasrc/main/java/net/litetex/capes/handler/PlayerHandler.java renamed to src/main/java/net/litetex/capes/handler/PlayerCapeHandler.java src/main/java/net/litetex/capes/handler/PlayerHandler.java renamed to src/main/java/net/litetex/capes/handler/PlayerCapeHandler.java

@@ -40,6 +40,14 @@
     "minecraft": "~${minecraft_version}",
     "modmenu": "~${modmenu_version}"
   },
+  "breaks": {
+    "capes": "*"
+  },
+  "conflicts": {
+    "minecraftcapes": "*",
+    "wynntils": "*",
+    "capemod": "*"
+  },
   "custom": {
     "modmenu": {
       "links": {