Merge branch 'master' into skylab_manager

darkbot-reloaded · Mar 9, 2024 · 172a78e · 172a78e
2 parents 02fb0da + ee3bff3
commit 172a78e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -86,7 +86,6 @@ tasks.jar {
 }
 
 tasks.register<proguard.gradle.ProGuardTask>("proguard") {
-    allowaccessmodification()
     dontoptimize()
     dontobfuscate()
     dontnote()
@@ -96,15 +95,13 @@ tasks.register<proguard.gradle.ProGuardTask>("proguard") {
     keep("class com.github.manolo8.** { *; }")
     keep("class eu.darkbot.** { *; }")
     keep("class com.formdev.** { *; }")
+    keep("class com.github.weisj.jsvg.** { *; }")
 
     injars(tasks["shadowJar"].outputs.files.singleFile)
     outjars("build/DarkBot.jar")
 
-    if (JavaVersion.current().isJava9Compatible) {
-        libraryjars("${System.getProperty("java.home")}/jmods")
-    } else {
-        libraryjars("${System.getProperty("java.home")}/lib/rt.jar")
-    }
+    libraryjars("${System.getProperty("java.home")}/jmods")
+    libraryjars(configurations.compileClasspath.get().files)
 
     dependsOn(tasks.build)
 }

diff --git a/src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java b/src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java
@@ -106,7 +106,7 @@ private StarManager() {
                 .addGG(77, "GG Cold Wave Easy", "GG Cold E").accessBy(73, "1-4", "2-4", "3-4")
                 .addGG(78, "GG Cold Wave Hard", "GG Cold H").accessBy(73, "1-4", "2-4", "3-4")
                 .addGG(203, "GG Hades", "Hades").accessBy(74, HOME_MAPS).exitBy(1)
-                .addGG(223, "Devolarium Attack", "DA") // (No access), missing type ID (HOME_MAPS)
+                .addGG(223, "Devolarium Attack", "DA").accessOnlyBy(34, HOME_MAPS)
                 .addGG(225, "GG PET Attack Easy", "GG PET E") // (No access)
                 .addGG(226, "GG PET Attack Hard", "GG PET H") // (No access)
                 .addGG(228, "Permafrost Fissure", "GG PF")   // (No access), missing type ID (HOME_MAPS)