wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core

Browse Source
This commit is contained in:
James Seibel
2024-02-07 07:06:03 -06:00
parent 848b75ad7d 556550fea8
commit b255e0ac68
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/jar/JarUtils.java
+14 -2
View File
@@ -19,6 +19,9 @@
package com.seibel.distanthorizons.core.jar;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
import com.seibel.distanthorizons.coreapi.ModInfo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
@@ -48,11 +51,20 @@ public class JarUtils
try
{
jarFile = new File(JarUtils.class.getProtectionDomain().getCodeSource().getLocation().toURI()); // Always safe
}
}
catch (Exception e)
{
LOGGER.warn("Unable to get jarFile, Error: "+e.getMessage(), e);
try
{
LOGGER.warn("Unable to get the jar file, trying backup method... Error: "+e.getMessage(), e);
jarFile = SingletonInjector.INSTANCE.get(IModChecker.class).modLocation(ModInfo.ID);
}
catch (Exception f)
{
LOGGER.warn("Backup jar file getter failed. Error: "+f.getMessage(), f);
}
}
System.out.println(jarFile);
}
core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModChecker.java
+3
View File
@@ -21,6 +21,8 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor;
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
import java.io.File;
/**
* Checks if a mod is loaded
*
@@ -32,4 +34,5 @@ public interface IModChecker extends IBindable
/** Checks if a mod is loaded */
boolean isModLoaded(String modid);
File modLocation(String modid);
}