From c7c866fde5703b6c67c4dbefcb5afc1938c10575 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 9 Apr 2025 19:22:13 -0400
Subject: [PATCH] Update Spark integration

---
 .../embeddedt/modernfix/spark/SparkLaunchProfiler.java   | 9 +++++++--
 gradle.properties                                        | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
index 67d30bcc..874819d2 100644
--- a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
+++ b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
@@ -41,14 +41,14 @@ public class SparkLaunchProfiler {
     public static void start(String key) {
         if (!ongoingSamplers.containsKey(key)) {
             Sampler sampler;
-            SamplerSettings settings = new SamplerSettings(4000, ThreadDumper.ALL, ThreadGrouper.BY_NAME.get(), -1, false);
+            SamplerSettings settings = new SamplerSettings(4000, ThreadDumper.ALL, ThreadGrouper.BY_NAME.get(), -1, false, true);
             try {
                 if(USE_JAVA_SAMPLER_FOR_LAUNCH) {
                     throw new UnsupportedOperationException();
                 }
                 sampler = new AsyncSampler(platform, settings, new SampleCollector.Execution(4000));
             } catch (UnsupportedOperationException e) {
-                sampler = new JavaSampler(platform, settings, true, true);
+                sampler = new JavaSampler(platform, settings);
             }
             ongoingSamplers.put(key, sampler);
             ModernFixMixinPlugin.instance.logger.warn("Profiler has started for stage [{}]...", key);
@@ -173,6 +173,11 @@ public class SparkLaunchProfiler {
             ModernFixMixinPlugin.instance.logger.warn(s);
         }
 
+        @Override
+        public void log(Level level, String s, Throwable t) {
+            ModernFixMixinPlugin.instance.logger.warn(s, t);
+        }
+
         @Override
         public PlatformInfo getPlatformInfo() {
             return platformInfo;
diff --git a/gradle.properties b/gradle.properties
index dfb3bbd1..3dca3f94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ continuity_version=3.0.0-beta.4+1.20.2
 modmenu_version=7.0.0-beta.2
 diagonal_fences_version=4558828
 
-spark_version=5759671
+spark_version=6225208
 
 use_fabric_api_at_runtime=true