Fixed class dump for missing dependencies

SpartanB312 · Jul 8, 2024 · 2e86ccb · 2e86ccb
1 parent 50c1850
commit 2e86ccb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/config/Configs.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/config/Configs.kt
@@ -20,7 +20,7 @@ object Configs {
         val mixinPackages by setting("MixinPackage", listOf("net/spartanb312/client/mixins/"))
         val generateRemap by setting("DumpMappings", true)
         val remapOutput by setting("MappingsOutput", "mappings.json")
-        val parallel by setting("ParallelProcessing", false)
+        val useComputeMax by setting("UseComputeMax", false)
         val customDictionary by setting("CustomDictionary", listOf())
         val dictionaryStartIndex by setting("DictionaryStartIndex", 0)
         val corruptOutput by setting("CorruptOutput", false)

diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/resource/ResourceCache.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/resource/ResourceCache.kt
@@ -90,14 +90,16 @@ class ResourceCache(private val input: String, private val libs: List<String>) {
         Logger.info("Writing classes...")
         for (classNode in classes.values) {
             if (classNode.name == "module-info" || classNode.name.shouldRemove) continue
+            val classInfo = hierarchy.getClassInfo(classNode)
+            val useComputeMax = Configs.Settings.useComputeMax || classInfo.missingDependencies || classNode.isExcluded
             val byteArray = try {
-                ClassDumper(this@ResourceCache, hierarchy, false).apply {
+                ClassDumper(this@ResourceCache, hierarchy, useComputeMax).apply {
                     classNode.accept(this)
                 }.toByteArray()
             } catch (ignore: Exception) {
-                Logger.error("Failed to dump class ${classNode.name}. Force use COMPUTE_MAXS")
+                Logger.error("Failed to dump class ${classNode.name}. Trying ${if (useComputeMax) "COMPUTE_FRAMES" else "COMPUTE_MAXS"}")
                 try {
-                    ClassDumper(this@ResourceCache, hierarchy, true).apply {
+                    ClassDumper(this@ResourceCache, hierarchy, !useComputeMax).apply {
                         classNode.accept(this)
                     }.toByteArray()
                 } catch (exception: Exception) {

diff --git a/...in/kotlin/net/spartanb312/grunt/process/transformers/redirect/InvokeDynamicTransformer.kt b/...in/kotlin/net/spartanb312/grunt/process/transformers/redirect/InvokeDynamicTransformer.kt
@@ -29,7 +29,7 @@ import kotlin.random.Random
 object InvokeDynamicTransformer : Transformer("InvokeDynamic", Category.Redirect) {
 
     private val rate by setting("ReplacePercentage", 10)
-    private val massiveRandom by setting("MassiveRandomBlank", true)
+    private val massiveRandom by setting("MassiveRandomBlank", false)
     private val exclusion by setting("Exclusion", listOf())
 
     override fun ResourceCache.transform() {