Update to mc1.21.11

Author: NotRyken

common/src/main/java/dev/terminalmc/exportstats/ExportStats.java

@@ -19,7 +19,6 @@
 import dev.terminalmc.exportstats.mixin.accessor.*;
 import dev.terminalmc.exportstats.platform.Services;
 import dev.terminalmc.exportstats.util.ModLogger;
-import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.WidgetSprites;
 import net.minecraft.client.gui.components.tabs.Tab;
@@ -30,13 +29,15 @@
 import net.minecraft.client.gui.screens.achievement.StatsScreen.MobsStatisticsList;
 import net.minecraft.client.gui.screens.achievement.StatsScreen.MobsStatisticsList.MobRow;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.StatType;
 import net.minecraft.stats.StatsCounter;
+import net.minecraft.util.Util;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.FileOutputStream;
@@ -55,9 +56,9 @@ public class ExportStats {
     public static final String MOD_NAME = "ExportStats";
     public static final ModLogger LOG = new ModLogger(MOD_NAME);
     public static final WidgetSprites EXPORT_SPRITES = new WidgetSprites(
-            ResourceLocation.fromNamespaceAndPath(MOD_ID, "widget/export_button"),
-            ResourceLocation.fromNamespaceAndPath(MOD_ID, "widget/export_button_disabled"),
-            ResourceLocation.fromNamespaceAndPath(MOD_ID, "widget/export_button_highlighted")
+            Identifier.fromNamespaceAndPath(MOD_ID, "widget/export_button"),
+            Identifier.fromNamespaceAndPath(MOD_ID, "widget/export_button_disabled"),
+            Identifier.fromNamespaceAndPath(MOD_ID, "widget/export_button_highlighted")
     );
 
     public static final Path ROOT_PATH = Services.PLATFORM.getConfigDir().resolve(MOD_ID);
@@ -107,7 +108,7 @@ public static Path saveStats(StatsCounter counter, GeneralStatisticsList stats,
         StringBuilder builder = new StringBuilder();
 
         for (Entry row : stats.children()) {
-            Stat<ResourceLocation> stat =
+            Stat<@NotNull Identifier> stat =
                     ((GeneralStatisticsListEntryAccessor) row).exportstats$getStat();
             String key = "stat." + stat.getValue().toString().replace(':', '.');
             String name = Component.translatable(key).getString();
@@ -133,10 +134,10 @@ public static Path saveStats(StatsCounter counter, ItemStatisticsList stats, boo
             String name = item.getDefaultInstance().getHoverName().getString();
             builder.append("%s\n".formatted(name));
 
-            List<StatType<Block>> blockColumns =
+            List<StatType<@NotNull Block>> blockColumns =
                     ((ItemStatisticsListAccessor) stats).exportstats$getBlockColumns();
-            for (StatType<Block> blockColumn : blockColumns) {
-                Stat<Block> blockStat = item instanceof BlockItem blockItem
+            for (StatType<@NotNull Block> blockColumn : blockColumns) {
+                Stat<@NotNull Block> blockStat = item instanceof BlockItem blockItem
                         ? blockColumn.get(blockItem.getBlock())
                         : null;
 
@@ -150,10 +151,10 @@ public static Path saveStats(StatsCounter counter, ItemStatisticsList stats, boo
                 ));
             }
 
-            List<StatType<Item>> itemColumns =
+            List<StatType<@NotNull Item>> itemColumns =
                     ((ItemStatisticsListAccessor) stats).exportstats$getItemColumns();
-            for (StatType<Item> itemColumn : itemColumns) {
-                Stat<Item> itemStat = itemColumn.get(item);
+            for (StatType<@NotNull Item> itemColumn : itemColumns) {
+                Stat<@NotNull Item> itemStat = itemColumn.get(item);
 
                 Component component =
                         Component.literal(itemStat.format(counter.getValue(itemStat)));

common/src/main/java/dev/terminalmc/exportstats/mixin/accessor/GeneralStatisticsListEntryAccessor.java

@@ -17,14 +17,15 @@
 package dev.terminalmc.exportstats.mixin.accessor;
 
 import net.minecraft.client.gui.screens.achievement.StatsScreen.GeneralStatisticsList;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.stats.Stat;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(GeneralStatisticsList.Entry.class)
 public interface GeneralStatisticsListEntryAccessor {
 
     @Accessor("stat")
-    Stat<ResourceLocation> exportstats$getStat();
+    Stat<@NotNull Identifier> exportstats$getStat();
 }

gradle.properties

@@ -54,37 +54,37 @@ mod_curseforge_slug=exportstats
 # Subproject Build Compatibility
 #  -> Comment out or unset to disable publishing of a subproject.
 mod_loaders_fabric=fabric
-mc_versions_fabric=1.21.9,1.21.10
+mc_versions_fabric=1.21.11
 mod_loaders_neoforge=neoforge
-mc_versions_neoforge=1.21.10
+mc_versions_neoforge=1.21.11
 
 # Java
 java_version=21
 java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.10
-minecraft_versions_fabric=>1.21.8
-minecraft_versions_neoforge=[1.21.10,)
+minecraft_version=1.21.11
+minecraft_versions_fabric=>1.21.10
+minecraft_versions_neoforge=[1.21.11,)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
-parchment_minecraft_version=1.21.9
-parchment_version=2025.10.05
+parchment_minecraft_version=1.21.10
+parchment_version=2025.10.12
 
 # Fabric https://fabricmc.net/develop
 #  -> See also 'mixinextras_jij_fabric'
 fabric_loader_version=0.17.2
 fabric_loader_versions=>=0.17.0
-fabric_api_version=0.136.0+1.21.10
+fabric_api_version=0.139.4+1.21.11
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 #  -> See also 'mixinextras_jij_neoforge'
-neoforge_version=21.10.20-beta
-neoforge_versions=[21.10.0-beta,)
+neoforge_version=21.11.0-beta
+neoforge_versions=[21.11.0-beta,)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.10-20251010.172816
+neoform_version=1.21.11-20251209.172050
 
 # Dependency Property Identifiers
 #  -> These values point to other properties with full dependency specification.
@@ -142,11 +142,11 @@ mixinextras_jij_fabric=false
 mixinextras_jij_neoforge=false
 
 # Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
-loom_version=1.11.8
+loom_version=1.14.4
 # ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
-moddev_version=2.0.112
+moddev_version=2.0.123
 # Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
-mpp_version=1.0.0
+mpp_version=1.1.0
 # grgit-service https://github.com/ajoberstar/grgit/releases
 grgitservice_version=5.3.2
 # licenser https://maven.neoforged.net/#/releases/net/neoforged/licenser/net.neoforged.licenser.gradle.plugin

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 # Gradle https://gradle.org/releases
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME