update to forge 1.17

Author: Nearata

build.gradle

@@ -4,19 +4,20 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', 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.16.5'
+version = '1.0-1.17'
 group = 'com.github.nearata.optifinecapes' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'OptifineCapes'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
+// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
+java.toolchain.languageVersion = JavaLanguageVersion.of(16)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
@@ -25,7 +26,7 @@ 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: 'official', version: '1.16.5'
+    mappings channel: 'official', version: '1.17.1'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -111,7 +112,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.16.5-36.1.32'
+    minecraft 'net.minecraftforge:forge:1.17.1-37.0.12'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"
@@ -141,7 +142,7 @@ jar {
             "Specification-Vendor": "Nearata",
             "Specification-Version": "1", // We are version 1 of ourselves
             "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
+            "Implementation-Version": project.jar.archiveVersion,
             "Implementation-Vendor" :"Nearata",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210702220150+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -6,15 +6,15 @@
 import java.util.List;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.mojang.blaze3d.platform.NativeImage;
 
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
-import net.minecraft.client.network.play.NetworkPlayerInfo;
+import net.minecraft.client.multiplayer.PlayerInfo;
+import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.NativeImage;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
@@ -35,15 +35,15 @@ public OptifineCapes()
     @SubscribeEvent
     public final void renderPlayer(final RenderPlayerEvent.Pre event)
     {
-        final PlayerEntity player = event.getPlayer();
-        final AbstractClientPlayerEntity acp = (AbstractClientPlayerEntity) player;
+        final Player player = event.getPlayer();
+        final AbstractClientPlayer acp = (AbstractClientPlayer) player;
         final String name = player.getName().getString();
 
         if (acp.isCapeLoaded() && acp.getCloakTextureLocation() == null && !players.contains(name))
         {
             this.players.add(name);
 
-            final NetworkPlayerInfo playerInfo = acp.getPlayerInfo();
+            final PlayerInfo playerInfo = acp.getPlayerInfo();
 
             Util.backgroundExecutor().execute(() -> {
                 try
@@ -53,8 +53,6 @@ public final void renderPlayer(final RenderPlayerEvent.Pre event)
                     final DynamicTexture dynamicTexture = new DynamicTexture(this.parseCape(nativeImage));
                     final ResourceLocation resourceLocation = mc.getTextureManager().register("optifinecapes/", dynamicTexture);
 
-                    mc.getTextureManager().loadTexture(resourceLocation, dynamicTexture);
-
                     playerInfo.textureLocations.put(Type.CAPE, resourceLocation);
                     playerInfo.textureLocations.put(Type.ELYTRA, resourceLocation);
                 }

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

@@ -1,3 +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
-public net.minecraft.client.renderer.texture.TextureManager func_230183_b_(Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Lnet/minecraft/client/renderer/texture/Texture; # loadTexture
+public net.minecraft.client.player.AbstractClientPlayer m_108558_()Lnet/minecraft/client/multiplayer/PlayerInfo; # getPlayerInfo
+public net.minecraft.client.multiplayer.PlayerInfo f_105299_ # textureLocations

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml" #mandatory
-loaderVersion="[36,)" #mandatory
+loaderVersion="[37,)" #mandatory
 license="MIT"
 issueTrackerURL="https://github.com/Nearata/OptifineCapes/issues" #optional
 [[mods]] #mandatory
@@ -13,6 +13,6 @@ description="For those who are only interested in the optifine capes."
     modId="minecraft"
     mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[1.16.5,1.17)"
+    versionRange="[1.17.1,1.18)"
     ordering="NONE"
     side="CLIENT"