Merge pull request #14 from ItsEmpa/fix/better-party-finder

Fix: Better Party Finder & Devenv

Author: SubAt0m1c

build.gradle.kts

@@ -67,44 +67,16 @@ tasks.named("compileKotlin") {
     dependsOn("downloadOdin")
 }
 
+val devenvMod: Configuration by configurations.creating {
+    isTransitive = false
+    isVisible = false
+}
+
 // Toolchains:
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(8))
 }
 
-// Minecraft configuration:
-loom {
-    log4jConfigs.from(file("log4j2.xml"))
-    launchConfigs {
-        "client" {
-            property("mixin.debug", "true")
-            arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
-        }
-    }
-    runConfigs {
-        "client" {
-            if (SystemUtils.IS_OS_MAC_OSX) {
-                // This argument causes a crash on macOS
-                vmArgs.remove("-XstartOnFirstThread")
-            }
-        }
-        remove(getByName("server"))
-    }
-    forge {
-        pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
-        // If you don't want mixins, remove this lines
-        mixinConfig("mixins.$modid.json")
-	    if (transformerFile.exists()) {
-			println("Installing access transformer")
-		    accessTransformer(transformerFile)
-	    }
-    }
-    // If you don't want mixins, remove these lines
-    mixin {
-        defaultRefmapName.set("mixins.$modid.refmap.json")
-    }
-}
-
 tasks.compileJava {
     dependsOn(tasks.processResources)
 }
@@ -135,6 +107,7 @@ dependencies {
     forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     implementation(files("build/resources/Odin/${requiredOdin}"))
+    devenvMod(files("build/resources/Odin/${requiredOdin}"))
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
 
     shadowImpl("org.apache.logging.log4j:log4j-core:2.20.0")
@@ -160,6 +133,41 @@ dependencies {
 
 }
 
+
+// Minecraft configuration:
+loom {
+    log4jConfigs.from(file("log4j2.xml"))
+    launchConfigs {
+        "client" {
+            property("mixin.debug", "true")
+            arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
+            arg("--mods", devenvMod.resolve().joinToString(",") { it.relativeTo(file("run")).path })
+        }
+    }
+    runConfigs {
+        "client" {
+            if (SystemUtils.IS_OS_MAC_OSX) {
+                // This argument causes a crash on macOS
+                vmArgs.remove("-XstartOnFirstThread")
+            }
+        }
+        remove(getByName("server"))
+    }
+    forge {
+        pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
+        // If you don't want mixins, remove this lines
+        mixinConfig("mixins.$modid.json")
+        if (transformerFile.exists()) {
+            println("Installing access transformer")
+            accessTransformer(transformerFile)
+        }
+    }
+    // If you don't want mixins, remove these lines
+    mixin {
+        defaultRefmapName.set("mixins.$modid.refmap.json")
+    }
+}
+
 // Tasks:
 tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/dungeons/BetterPartyFinder.kt

@@ -211,7 +211,7 @@ object BetterPartyFinder : Module(
     ) { kickedList.clear() }.withDependency { kickCache }
 
     private val pfRegex =
-        Regex("^Party Finder > (?:\\[.{1,7}])? ?(.{1,16}) joined the dungeon group! \\(?:.*\\)$") //https://regex101.com/r/XYnAVm/1
+        Regex("^Party Finder > (?:\\[.{1,7}])? ?(.{1,16}) joined the dungeon group! \\(.*\\)$") //https://regex101.com/r/XYnAVm/2
     private val kickRegex = Regex("^(?:\\[.{1,7}])? ?(.{1,16}) has been removed from the party\\.$")
 
     private val kickedList = mutableListOf<String>()