Remove jinput dependency since controllers aren't used.

jinput natives are no longer loaded or packaged in the jar.

Excluded the lwjgl dependency within the slick2d package since it depends on an older version (2.9.1) of lwjgl.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-08-28 11:07:03 -05:00
parent 0b33fed2d4
commit f773a8ecf8
3 changed files with 25 additions and 4 deletions

View File

@ -30,8 +30,12 @@ repositories {
}
dependencies {
compile 'org.lwjgl.lwjgl:lwjgl:2.9.3'
compile 'org.slick2d:slick2d-core:1.0.1'
compile('org.lwjgl.lwjgl:lwjgl:2.9.3') {
exclude group: 'net.java.jinput', module: 'jinput'
}
compile('org.slick2d:slick2d-core:1.0.1') {
exclude group: 'org.lwjgl.lwjgl', module: 'lwjgl'
}
compile 'org.jcraft:jorbis:0.0.17'
compile 'net.lingala.zip4j:zip4j:1.3.2'
compile 'com.googlecode.soundlibs:jlayer:1.0.1-1'

12
pom.xml
View File

@ -126,11 +126,23 @@
<groupId>org.lwjgl.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
<version>2.9.3</version>
<exclusions>
<exclusion>
<groupId>net.java.jinput</groupId>
<artifactId>jinput</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slick2d</groupId>
<artifactId>slick2d-core</artifactId>
<version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>org.lwjgl.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jcraft</groupId>

View File

@ -30,6 +30,7 @@ import java.net.UnknownHostException;
import org.newdawn.slick.Color;
import org.newdawn.slick.GameContainer;
import org.newdawn.slick.Input;
import org.newdawn.slick.SlickException;
import org.newdawn.slick.state.StateBasedGame;
import org.newdawn.slick.state.transition.FadeInTransition;
@ -133,8 +134,9 @@ public class Opsu extends StateBasedGame {
}
File nativeDir;
if ((nativeDir = new File("./target/natives/")).isDirectory() ||
(nativeDir = new File("./build/natives/")).isDirectory())
if (!Utils.isJarRunning() && (
(nativeDir = new File("./target/natives/")).isDirectory() ||
(nativeDir = new File("./build/natives/")).isDirectory()))
;
else {
nativeDir = NativeLoader.NATIVE_DIR;
@ -184,6 +186,9 @@ public class Opsu extends StateBasedGame {
}.start();
}
// disable jinput
Input.disableControllers();
// start the game
try {
// loop until force exit