Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup the prestartupinitializer

Browse Source
This commit is contained in:
yugecin 2017-01-08 11:23:23 +01:00
parent 31a25b297f
commit d5796e5a1e
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/yugecin/opsudance/PreStartupInitializer.java
View File

@ -20,7 +20,6 @@ package yugecin.opsudance;
import com.google.inject.Inject; import com.google.inject.Inject;
import itdelatrisu.opsu.NativeLoader; import itdelatrisu.opsu.NativeLoader;
import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.Utils;
import org.newdawn.slick.util.FileSystemLocation; import org.newdawn.slick.util.FileSystemLocation;
import org.newdawn.slick.util.Log; import org.newdawn.slick.util.Log;
import org.newdawn.slick.util.ResourceLoader; import org.newdawn.slick.util.ResourceLoader;
@ -33,22 +32,16 @@ public class PreStartupInitializer {
@Inject @Inject
public PreStartupInitializer() { public PreStartupInitializer() {
// load natives loadNatives();
File nativeDir; setResourcePath();
if (!Utils.isJarRunning() && (
(nativeDir = new File("./target/natives/")).isDirectory() ||
(nativeDir = new File("./build/natives/")).isDirectory()))
;
else {
nativeDir = Options.NATIVE_DIR;
try {
new NativeLoader(nativeDir).loadNatives();
} catch (IOException e) {
Log.error("Error loading natives.", e);
}
} }
private void loadNatives() {
File nativeDir = loadNativesUsingOptionsPath();
System.setProperty("org.lwjgl.librarypath", nativeDir.getAbsolutePath()); System.setProperty("org.lwjgl.librarypath", nativeDir.getAbsolutePath());
System.setProperty("java.library.path", nativeDir.getAbsolutePath()); System.setProperty("java.library.path", nativeDir.getAbsolutePath());
try { try {
// Workaround for "java.library.path" property being read-only. // Workaround for "java.library.path" property being read-only.
// http://stackoverflow.com/a/24988095 // http://stackoverflow.com/a/24988095
@ -58,10 +51,20 @@ public class PreStartupInitializer {
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) { } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
Log.warn("Failed to set 'sys_paths' field.", e); Log.warn("Failed to set 'sys_paths' field.", e);
} }
}
// set the resource paths private File loadNativesUsingOptionsPath() {
File nativeDir = Options.NATIVE_DIR;
try {
new NativeLoader(nativeDir).loadNatives();
} catch (IOException e) {
Log.error("Error loading natives.", e);
}
return nativeDir;
}
private void setResourcePath() {
ResourceLoader.addResourceLocation(new FileSystemLocation(new File("./res/"))); ResourceLoader.addResourceLocation(new FileSystemLocation(new File("./res/")));
} }
} }