Update to Minecraft 1.21.10

Author: lucko

spark-fabric/build.gradle

@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.21.9'
-    mappings 'net.fabricmc:yarn:1.21.9+build.1:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.17.2'
+    minecraft 'com.mojang:minecraft:1.21.10'
+    mappings 'net.fabricmc:yarn:1.21.10+build.2:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.17.3'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,7 +40,7 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.133.14+1.21.9'))
+        modImplementation(fabricApi.module(it, '0.135.0+1.21.10'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.5.0'))

spark-forge/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.gradleup.shadow' version '8.3.8'
-    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
 }
 
 tasks.withType(JavaCompile) {
@@ -9,7 +9,7 @@ tasks.withType(JavaCompile) {
 }
 
 minecraft {
-    mappings channel: 'official', version: '1.21.9'
+    mappings channel: 'official', version: '1.21.10'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     reobf = false
 }
@@ -20,8 +20,8 @@ configurations {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.21.9-59.0.1'
-    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10'
+    minecraft 'net.minecraftforge:forge:1.21.10-60.0.3'
+    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.12'
     shade project(':spark-common')
 }
 

spark-neoforge/build.gradle

@@ -15,7 +15,7 @@ java {
 }
 
 neoForge {
-    version = "21.9.2-beta"
+    version = "21.10.10-beta"
     validateAccessTransformers = true
 
     runs {

spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeClassSourceLookup.java

@@ -20,14 +20,13 @@
 
 package me.lucko.spark.neoforge;
 
-import cpw.mods.modlauncher.TransformingClassLoader;
 import me.lucko.spark.common.sampler.source.ClassSourceLookup;
 
 public class NeoForgeClassSourceLookup implements ClassSourceLookup {
 
     @Override
     public String identify(Class<?> clazz) {
-        if (clazz.getClassLoader() instanceof TransformingClassLoader) {
+        if (clazz.getClassLoader().getClass().getName().equals("cpw.mods.modlauncher.TransformingClassLoader")) {
             String name = clazz.getModule().getName();
             return name.equals("forge") || name.equals("minecraft") ? null : name;
         }