better resolving

BoBkiNN · Jun 1, 2024 · d4174bf · d4174bf
1 parent 58aa986
commit d4174bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=xyz.bobkinn
-mod_version=1.0.0
+mod_version=1.0.1
 mod_id = ignite_fixer
 
 mc_version = 1.20.6-R0.1-SNAPSHOT

diff --git a/src/main/java/xyz/bobkinn/ignite_fixer/mixin/ReobfServerMixin.java b/src/main/java/xyz/bobkinn/ignite_fixer/mixin/ReobfServerMixin.java
@@ -12,20 +12,17 @@
 @Mixin(targets = "io.papermc.paper.pluginremap.ReobfServer")
 public class ReobfServerMixin {
 
-    @Unique
-    private static @NotNull Path ignite_fixer$fixPath(String file){
-        return Path.of(file).toAbsolutePath();
-    }
-
     @Unique
     private static @NotNull Path ignite_fixer$findPath(){
         var pJar = System.getProperty("ignite.paper.jar");
         var jar = System.getProperty("ignite.jar");
-        if (pJar != null){
-            return ignite_fixer$fixPath(pJar);
-        }
-        if (jar != null){
-            return ignite_fixer$fixPath(jar);
+        for (var name : new String[]{pJar, jar, "server.jar", "paper.jar"}){
+            if (name != null){
+                var f = Path.of(name).toAbsolutePath();
+                if (f.toFile().isFile()){
+                    return f;
+                }
+            }
         }
         throw new IllegalArgumentException("Failed to find server jar file");
     }