add skyclient repo

Author: Wyvest

src/main/kotlin/cc/woverflow/crashpatch/CrashPatch.kt

@@ -5,25 +5,28 @@ import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
+import org.apache.logging.log4j.LogManager
 import java.io.File
 
 @Mod(modid = CrashPatch.MODID, version = CrashPatch.VERSION, name = CrashPatch.NAME, modLanguageAdapter = "gg.essential.api.utils.KotlinAdapter")
 object CrashPatch {
-    lateinit var jarFile: File
     lateinit var modDir: File
     const val MODID = "crashpatch"
     const val NAME = "CrashPatch"
     const val VERSION = "@VERSION@"
+    var useOldRepo = false
+    private set
 
     @Mod.EventHandler
     fun onPreInit(e: FMLPreInitializationEvent) {
         modDir = File(File(Minecraft.getMinecraft().mcDataDir, "W-OVERFLOW"), NAME)
         if (!modDir.exists()) modDir.mkdirs()
-        Updater.addToUpdater(e.sourceFile)
+        Updater.addToUpdater(e.sourceFile, NAME, MODID, VERSION, "W-OVERFLOW/$MODID")
     }
 
     @Mod.EventHandler
     fun onPostInitialization(event: FMLPostInitializationEvent) {
-
+        useOldRepo = File(modDir, "useoldrepo").exists()
     }
-}
+}
+val logger = LogManager.getLogger()

src/main/kotlin/cc/woverflow/crashpatch/crashes/CrashHelper.kt

@@ -1,10 +1,12 @@
 package cc.woverflow.crashpatch.crashes
 
-import com.google.gson.JsonArray
-import gg.essential.api.utils.WebUtil
+import cc.woverflow.crashpatch.CrashPatch
+import cc.woverflow.crashpatch.logger
 import cc.woverflow.crashpatch.utils.asJsonObject
 import cc.woverflow.crashpatch.utils.get
 import cc.woverflow.crashpatch.utils.keys
+import com.google.gson.JsonArray
+import gg.essential.api.utils.WebUtil
 import java.util.regex.Pattern
 
 object CrashHelper {
@@ -14,7 +16,7 @@ object CrashHelper {
     @JvmStatic
     fun scanReport(report: String): CrashScan? {
         try {
-            val responses = getResponses(report)
+            val responses = if (!CrashPatch.useOldRepo) getResponses(report) else getOldResponses(report)
 
             if (responses.isEmpty()) return null
             return CrashScan(responses)
@@ -25,6 +27,45 @@ object CrashHelper {
     }
 
     private fun getResponses(report: String): Map<String, ArrayList<String>> {
+        val issues = WebUtil.fetchString("https://raw.githubusercontent.com/SkyblockClient/CrashData/main/crashes.json")?.asJsonObject() ?: return emptyMap()
+        val responses = linkedMapOf<String, ArrayList<String>>()
+
+        val fixTypes = issues["fixtypes"].asJsonArray
+        for (type in fixTypes) {
+            responses[type.asJsonObject["name"].asString] = arrayListOf()
+        }
+
+        val fixes = issues["fixes"].asJsonArray
+
+        for (solution in fixes) {
+            val solutionJson = solution.asJsonObject
+            val causes = solutionJson["causes"].asJsonArray
+            var trigger = false
+            for (cause in causes) {
+                val causeJson = cause.asJsonObject
+                when (causeJson["method"].asString) {
+                    "contains" -> {
+                        if (report.contains(causeJson["value"].asString)) {
+                            trigger = true
+                        }
+                    }
+                    "regex" -> {
+                        if (Pattern.compile(causeJson["value"].asString, Pattern.CASE_INSENSITIVE).matcher(report).find()) {
+                            trigger = true
+                        }
+                    }
+                }
+            }
+            if (trigger) {
+                responses[ArrayList(responses.keys)[if (solutionJson.has("fixtype")) solutionJson["fixtype"].asInt else 0]]?.add(solutionJson["fix"].asString)
+            }
+        }
+        return responses
+    }
+
+
+    private fun getOldResponses(report: String): Map<String, ArrayList<String>> {
+        logger.warn("Using the isXander MinecraftIssues repo is not supported! Use at your own risk.")
         val issues = WebUtil.fetchString("https://raw.githubusercontent.com/isXander/MinecraftIssues/main/issues.json")?.asJsonObject() ?: return linkedMapOf()
         val responses = linkedMapOf<String, ArrayList<String>>()
 

src/main/kotlin/cc/woverflow/crashpatch/crashes/ModIdentifier.kt

@@ -1,25 +1,24 @@
 package cc.woverflow.crashpatch.crashes
 
+import cc.woverflow.crashpatch.logger
 import net.minecraft.launchwrapper.Launch
 import net.minecraft.launchwrapper.LaunchClassLoader
 import net.minecraftforge.fml.common.Loader
 import net.minecraftforge.fml.common.ModContainer
-import org.apache.logging.log4j.LogManager
 import java.io.File
 import java.io.IOException
 import java.net.URISyntaxException
 import java.net.URL
 
 object ModIdentifier {
-    private val log = LogManager.getLogger()
 
     fun identifyFromStacktrace(e: Throwable?): ModContainer? {
         val modMap = makeModMap()
 
         // Get the set of classes
         val classes = LinkedHashSet<String>()
         e?.stackTrace?.forEachIndexed { index, stackTraceElement ->
-            if (index < 4) {
+            if (index < 4) { // everything after the first 3 lines are basically useless and only leads to false detections
                 classes.add(stackTraceElement.className)
             }
         }
@@ -40,9 +39,9 @@ object ModIdentifier {
         // Get the URL of the class
         val untrasformedName = untransformName(Launch.classLoader, className)
         var url = Launch.classLoader.getResource(untrasformedName.replace('.', '/') + ".class")
-        log.debug("$className = $untrasformedName = $url")
+        logger.debug("$className = $untrasformedName = $url")
         if (url == null) {
-            log.warn("Failed to identify $className (untransformed name: $untrasformedName)")
+            logger.warn("Failed to identify $className (untransformed name: $untrasformedName)")
             return emptySet()
         }