support all 1.15 versions

* update to forgegradle 5.x
* update to gradle 7
* use accesstransformer instead of reflections
* use official mappings
* cleanup code

Author: Nearata

.gitignore

@@ -23,3 +23,5 @@ run
 
 # Files from Forge MDK
 forge*changelog.txt
+
+/logs/

build.gradle

@@ -5,19 +5,19 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.0-1.15.2'
+version = '1.0-1.15.x'
 group = 'com.github.nearata.optifinecapes' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'OptifineCapes'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 //Print out JVM information so that we know what version is running. Extreamly useful for people to know when helping you.
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
@@ -27,10 +27,10 @@ minecraft {
     // stable_#            Stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: '20201112-1.15.1'
+    mappings channel: 'official', version: '1.15.2'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
@@ -91,7 +91,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.15.2-31.2.46'
+    minecraft 'net.minecraftforge:forge:1.15.2-31.2.55'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+zipStorePath=wrapper/dists

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'OptifineCapes-1.15.x'

src/main/java/com/github/nearata/optifinecapes/CapeManager.java

@@ -1,50 +1,100 @@
 package com.github.nearata.optifinecapes;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.NativeImage;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Util;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.TickEvent.ClientTickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod("optifinecapes")
-public class OptifineCapes
+public final class OptifineCapes
 {
-    public static final Logger logger = LogManager.getLogger();
     private final Minecraft mc = Minecraft.getInstance();
-    private static List<String> players = new ArrayList<String>();
+    private List<String> players = new ArrayList<>();
 
     public OptifineCapes()
     {
         MinecraftForge.EVENT_BUS.register(this);
     }
 
     @SubscribeEvent
-    public final void renderPlayer(RenderPlayerEvent.Pre event)
+    public void renderPlayer(RenderPlayerEvent.Pre event)
     {
         final AbstractClientPlayerEntity acp = (AbstractClientPlayerEntity) event.getPlayer();
-        final String username = acp.getDisplayName().getString();
+        final String username = acp.getName().getString();
 
-        if (acp.hasPlayerInfo() && acp.getLocationCape() == null && !players.contains(username))
+        if (acp.isCapeLoaded() && acp.getCloakTextureLocation() == null && !players.contains(username))
         {
-            players.add(username);
-            CapeManager.loadCape(acp);
+            this.players.add(username);
+            Map<Type, ResourceLocation> textureLocations = acp.getPlayerInfo().textureLocations;
+
+            Util.backgroundExecutor().execute(() -> {
+                try
+                {
+                    final URL url = new URL(String.format("http://s.optifine.net/capes/%s.png", username));
+                    final NativeImage nativeImage = NativeImage.read(url.openStream());
+                    final DynamicTexture dynamictexture = new DynamicTexture(this.parseCape(nativeImage));
+                    final ResourceLocation resourcelocation = mc.getTextureManager().register("optifinecapes/", dynamictexture);
+
+                    textureLocations.put(Type.CAPE, resourcelocation);
+                    textureLocations.put(Type.ELYTRA, resourcelocation);
+                }
+                catch (IOException e)
+                {
+                    // no cape
+                }
+            });
         }
     }
-    
+
     @SubscribeEvent
-    public final void clientTick(TickEvent.ClientTickEvent event)
+    public void clientTick(ClientTickEvent event)
     {
-        if (mc.world == null && !players.isEmpty())
+        if (mc.player == null && !this.players.isEmpty())
         {
-            players.clear();
+            this.players.clear();
         }
     }
+
+    private NativeImage parseCape(NativeImage nativeImageIn)
+    {
+        int imageWidth = 64;
+        int imageHeight = 32;
+        int imageSrcWidth = nativeImageIn.getWidth();
+        int imageSrcHeight = nativeImageIn.getHeight();
+
+        while (imageWidth < imageSrcWidth || imageHeight < imageSrcHeight)
+        {
+            imageWidth *= 2;
+            imageHeight *= 2;
+        }
+
+        NativeImage nativeImage = new NativeImage(imageWidth, imageHeight, true);
+
+        for (int x = 0; x < imageSrcWidth; x++)
+        {
+            for (int y = 0; y < imageSrcHeight; y++)
+            {
+                nativeImage.setPixelRGBA(x, y, nativeImageIn.getPixelRGBA(x, y));
+            }
+        }
+
+        nativeImageIn.close();
+
+        return nativeImage;
+    }
 }

src/main/java/com/github/nearata/optifinecapes/OptifineCapes.java

@@ -0,0 +1,2 @@
+public net.minecraft.client.entity.player.AbstractClientPlayerEntity func_175155_b()Lnet/minecraft/client/network/play/NetworkPlayerInfo; # getPlayerInfo
+public net.minecraft.client.network.play.NetworkPlayerInfo field_187107_a # textureLocations

src/main/resources/META-INF/accesstransformer.cfg

@@ -1,21 +1,17 @@
 modLoader="javafml"
-loaderVersion="[31,)"
+loaderVersion="[29,)"
+license="MIT"
 issueTrackerURL="https://github.com/Nearata/OptifineCapes/issues"
-logoFile="logo.png"
-
 [[mods]]
     modId="optifinecapes"
     version="${file.jarVersion}"
     displayName="Optifine Capes"
-    displayURL="https://github.com/Nearata/OptifineCapes"
     authors="Nearata"
-    description='''
-    For those who are only interested in the optifine capes.
-    '''
-
-[[dependencies.optifinecapes]] #optional
-    modId="forge"
+    description="For those who are only interested in the optifine capes."
+    logoFile="logo.png"
+[[dependencies.optifinecapes]]
+    modId="minecraft"
     mandatory=true
-    versionRange="[31,)"
+    versionRange="[1.15,1.16)"
     ordering="NONE"
-    side="CLIENT"
+    side="CLIENT"