From d4174bf37f7f63be73eac4c40a9f26a6d74e0cf6 Mon Sep 17 00:00:00 2001
From: BoBkiNN <bobkin.yangirov@gmail.com>
Date: Sat, 1 Jun 2024 22:24:28 +0500
Subject: [PATCH] better resolving

---
 .idea/gradle.xml                                |  1 +
 .idea/material_theme_project_new.xml            |  5 ++++-
 gradle.properties                               |  2 +-
 .../ignite_fixer/mixin/ReobfServerMixin.java    | 17 +++++++----------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 14746e7..2a65317 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
index a89241c..b4bfa86 100644
--- a/.idea/material_theme_project_new.xml
+++ b/.idea/material_theme_project_new.xml
@@ -3,7 +3,10 @@
   <component name="MaterialThemeProjectNewConfig">
     <option name="metadata">
       <MTProjectMetadataState>
-        <option name="userId" value="7556eb:18fd3c60cc3:-7d14" />
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="c479651:18210715c7e:-8000" />
+        <option name="version" value="8.7.1" />
       </MTProjectMetadataState>
     </option>
   </component>
diff --git a/gradle.properties b/gradle.properties
index 9c86ca7..179d6ae 100644
--- 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
index 6bbca91..618b52e 100644
--- 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");
     }