Update to mc1.21.9-rc1

NotRyken · NotRyken · commit f347e5fdc34a · 2025-09-27T20:10:25.000+08:00
diff --git a/common/build.gradle b/common/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("multiloader-common")
-    id("net.neoforged.moddev")
+    id("fabric-loom")
 }
 
 // Vanilla depends on ASM 9.3, MDG makes that a 'strict' version constraint,
@@ -21,6 +21,15 @@ dependencies {
     compileOnly "org.ow2.asm:asm-tree:${asm_version}"
     compileOnly "org.ow2.asm:asm-util:${asm_version}"
 
+    // Minecraft
+    minecraft("com.mojang:minecraft:${minecraft_version}")
+
+    // Mappings
+    mappings(loom.layered {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip")
+    })
+
     // Mixin and MixinExtras
     compileOnly("org.spongepowered:mixin:${mixin_version}")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
@@ -29,14 +38,18 @@ dependencies {
     api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}")
 }
 
-neoForge {
-    version = neoforge_version // Shut up
-    neoFormVersion = neoform_version
-    def at = file("src/main/resources/META-INF/accesstransformer.cfg")
-    if (at.exists()) accessTransformers.from(at.absolutePath)
-    parchment {
-        minecraftVersion = parchment_minecraft_version
-        mappingsVersion = parchment_version
+loom {
+    // Apply common AccessWidener if it exists
+    def aw = project(":common").file("src/main/resources/${mod_id}.accesswidener")
+    if (aw.exists()) accessWidenerPath.set(aw)
+    if (aw.exists()) {
+        validateAccessWidener { accessWidener = aw }
+        afterEvaluate {
+            validateAccessWidener.run()
+        }
+    }
+    mixin {
+        defaultRefmapName.set("${mod_id}.refmap.json")
     }
 }
 
diff --git a/common/src/main/java/dev/terminalmc/nocapes/NoCapes.java b/common/src/main/java/dev/terminalmc/nocapes/NoCapes.java
@@ -41,7 +41,7 @@ public class NoCapes {
             .append(Component.literal(MOD_NAME).withStyle(ChatFormatting.GOLD))
             .append(Component.literal("] ").withStyle(ChatFormatting.DARK_GRAY))
             .withStyle(ChatFormatting.GRAY);
-    
+
     public static final Map<ResourceLocation, String> RESOURCE_CAPE_CACHE = new HashMap<>();
 
     public static void init() {
@@ -63,7 +63,7 @@ public static void init() {
     public static void onConfigSaved(Config config) {
         // Cache update method
     }
-    
+
     public static boolean blockCape(ResourceLocation location) {
         if (options().hideEverything) return true;
         if (RESOURCE_CAPE_CACHE.containsKey(location)) {
@@ -83,17 +83,15 @@ public static boolean blockElytra(ResourceLocation location) {
         }
         return false;
     }
-    
+
     public static void checkInConfig(String capeId, String url) {
         if (!options().capes.containsKey(capeId)) {
             Minecraft.getInstance().gui.getChat().addMessage(PREFIX.copy().append(
                     localized("message", "unknownCape", Component.literal(
                                     capeId.substring(Math.max(0, capeId.length() - 5)))
                             .withStyle(ChatFormatting.WHITE))).withStyle(PREFIX.getStyle()
-                    .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
-                            localized("message", "clickToCopy")))
-                    .withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD,
-                            url))));
+                    .withHoverEvent(new HoverEvent.ShowText(localized("message", "clickToCopy")))
+                    .withClickEvent(new ClickEvent.CopyToClipboard(url))));
             options().capes.put(capeId, Config.ShowMode.BOTH);
             Config.save();
         }
diff --git a/common/src/main/java/dev/terminalmc/nocapes/mixin/MixinCapeLayer.java b/common/src/main/java/dev/terminalmc/nocapes/mixin/MixinCapeLayer.java
@@ -20,24 +20,27 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.terminalmc.nocapes.NoCapes;
 import net.minecraft.client.renderer.entity.layers.CapeLayer;
-import net.minecraft.client.resources.PlayerSkin;
-import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.Nullable;
+import net.minecraft.core.ClientAsset;
+import net.minecraft.world.entity.player.PlayerSkin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(CapeLayer.class)
 public abstract class MixinCapeLayer {
     @WrapOperation(
-            method = "render",
+            method = "submit(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/client/renderer/entity/state/AvatarRenderState;FF)V",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/resources/PlayerSkin;capeTexture()Lnet/minecraft/resources/ResourceLocation;"
+                    target = "Lnet/minecraft/world/entity/player/PlayerSkin;cape()Lnet/minecraft/core/ClientAsset$Texture;"
             )
     )
-    private static @Nullable ResourceLocation wrapCapeTexture(PlayerSkin instance, Operation<ResourceLocation> original) {
-        ResourceLocation texture = original.call(instance);
-        if (NoCapes.blockCape(texture)) return null;
+    private static ClientAsset.Texture wrapCape(
+            PlayerSkin instance,
+            Operation<ClientAsset.Texture> original
+    ) {
+        ClientAsset.Texture texture = original.call(instance);
+        if (texture != null && NoCapes.blockCape(texture.texturePath()))
+            return null;
         return texture;
     }
 }
diff --git a/common/src/main/java/dev/terminalmc/nocapes/mixin/MixinSkinManager.java b/common/src/main/java/dev/terminalmc/nocapes/mixin/MixinSkinManager.java
@@ -21,7 +21,7 @@
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import dev.terminalmc.nocapes.NoCapes;
 import net.minecraft.client.resources.SkinManager;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.ClientAsset;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -38,9 +38,9 @@ public class MixinSkinManager {
                     ordinal = 1
             )
     )
-    private CompletableFuture<ResourceLocation> wrapLoadCape(
-            SkinManager.TextureCache instance, MinecraftProfileTexture texture, 
-            Operation<CompletableFuture<ResourceLocation>> original) {
+    private CompletableFuture<ClientAsset.Texture> wrapLoadCape(
+            SkinManager.TextureCache instance, MinecraftProfileTexture texture,
+            Operation<CompletableFuture<ClientAsset.Texture>> original) {
         return noCapes$wrapLoadTexture(instance, texture, original);
     }
 
@@ -52,23 +52,23 @@ private CompletableFuture<ResourceLocation> wrapLoadCape(
                     ordinal = 2
             )
     )
-    private CompletableFuture<ResourceLocation> wrapLoadElytra(
+    private CompletableFuture<ClientAsset.Texture> wrapLoadElytra(
             SkinManager.TextureCache instance, MinecraftProfileTexture texture,
-            Operation<CompletableFuture<ResourceLocation>> original) {
+            Operation<CompletableFuture<ClientAsset.Texture>> original) {
         return noCapes$wrapLoadTexture(instance, texture, original);
     }
-    
+
     @Unique
-    private CompletableFuture<ResourceLocation> noCapes$wrapLoadTexture(
+    private CompletableFuture<ClientAsset.Texture> noCapes$wrapLoadTexture(
             SkinManager.TextureCache instance, MinecraftProfileTexture texture,
-            Operation<CompletableFuture<ResourceLocation>> original) {
-        return original.call(instance, texture).thenApply((location) -> {
+            Operation<CompletableFuture<ClientAsset.Texture>> original) {
+        return original.call(instance, texture).thenApply((asset) -> {
             String hash = texture.getHash();
-            if (!NoCapes.RESOURCE_CAPE_CACHE.containsKey(location)) {
-                NoCapes.RESOURCE_CAPE_CACHE.put(location, hash);
+            if (!NoCapes.RESOURCE_CAPE_CACHE.containsKey(asset.texturePath())) {
+                NoCapes.RESOURCE_CAPE_CACHE.put(asset.texturePath(), hash);
                 NoCapes.checkInConfig(hash, "https://textures.minecraft.net/texture/" + hash);
             }
-            return location;
+            return asset;
         });
     }
 }
diff --git a/common/src/main/java/dev/terminalmc/nocapes/mixin/MixinWingsLayer.java b/common/src/main/java/dev/terminalmc/nocapes/mixin/MixinWingsLayer.java
@@ -20,9 +20,8 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.terminalmc.nocapes.NoCapes;
 import net.minecraft.client.renderer.entity.layers.WingsLayer;
-import net.minecraft.client.resources.PlayerSkin;
-import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.Nullable;
+import net.minecraft.core.ClientAsset;
+import net.minecraft.world.entity.player.PlayerSkin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
@@ -32,12 +31,16 @@ public class MixinWingsLayer {
             method = "getPlayerElytraTexture",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/resources/PlayerSkin;capeTexture()Lnet/minecraft/resources/ResourceLocation;"
+                    target = "Lnet/minecraft/world/entity/player/PlayerSkin;cape()Lnet/minecraft/core/ClientAsset$Texture;"
             )
     )
-    private static @Nullable ResourceLocation wrapCapeTexture(PlayerSkin instance, Operation<ResourceLocation> original) {
-        ResourceLocation texture = original.call(instance);
-        if (NoCapes.blockElytra(texture)) return null;
+    private static ClientAsset.Texture wrapCapeTexture(
+            PlayerSkin instance,
+            Operation<ClientAsset.Texture> original
+    ) {
+        ClientAsset.Texture texture = original.call(instance);
+        if (texture != null && NoCapes.blockElytra(texture.texturePath()))
+            return null;
         return texture;
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -27,18 +27,18 @@ java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.3
-minecraft_versions_fabric=>1.21.1 <1.22
-minecraft_versions_neoforge=(1.21.1, 1.22)
+minecraft_version=1.21.9-rc1
+minecraft_versions_fabric=>1.21.8
+minecraft_versions_neoforge=[1.21.9,)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
-parchment_minecraft_version=1.21
-parchment_version=2024.11.10
+parchment_minecraft_version=1.21.8
+parchment_version=2025.09.14
 
 # Fabric https://fabricmc.net/develop
 fabric_loader_version=0.16.9
 fabric_loader_versions=>=0.15.0
-fabric_api_version=0.110.0+1.21.3
+fabric_api_version=0.133.13+1.21.9
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
@@ -67,12 +67,12 @@ curseforge_slug=nocapes
 release_type=STABLE
 # Fabric
 release_mod_loaders_fabric=fabric
-release_game_versions_fabric=1.21.2,1.21.3,1.21.4,1.21.5
+release_game_versions_fabric=1.21.9
 release_required_dep_ids_fabric_mr=P7dR8mSH,mOgUt4GM,9s6osm5g
 release_required_dep_ids_fabric_cf=fabric-api,modmenu,cloth-config
 # NeoForge
 release_mod_loaders_neoforge=neoforge
-release_game_versions_neoforge=1.21.2,1.21.3,1.21.4,1.21.5
+release_game_versions_neoforge=1.21.9
 release_required_dep_ids_neoforge_mr=9s6osm5g
 release_required_dep_ids_neoforge_cf=cloth-config
 
@@ -85,7 +85,7 @@ asm_version=9.7
 
 # Plugins
 # Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
-loom_version=1.9.2
+loom_version=1.11.8
 # ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
 moddev_version=1.0.23
 # Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
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-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
                 }
             }
             filter {
-                includeGroup("net.fabricmc")
+                includeGroupAndSubgroups("net.fabricmc")
                 includeGroup("fabric-loom")
             }
         }
@@ -38,4 +38,4 @@ plugins {
 rootProject.name = "NoCapes"
 include("common")
 include("fabric")
-include("neoforge")
+//include("neoforge")

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ pluginManagement {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`filter {`
`13`		`- includeGroup("net.fabricmc")`
	`13`	`+ includeGroupAndSubgroups("net.fabricmc")`
`14`	`14`	`includeGroup("fabric-loom")`
`15`	`15`	`}`
`16`	`16`	`}`
`@@ -38,4 +38,4 @@ plugins {`
`38`	`38`	`rootProject.name = "NoCapes"`
`39`	`39`	`include("common")`
`40`	`40`	`include("fabric")`
`41`		`-include("neoforge")`
	`41`	`+//include("neoforge")`