Merge pull request #126 from LemonLake/lemmmyfixes

Added Gradle build system, removed JarSplice from build cycle.

.gitignore

@@ -21,6 +21,11 @@
 .idea/
 *.iml
 *.iws
+*.ipr
+
+# Gradle
+.gradle
+build/
 
 Thumbs.db
 /target

README.md

@@ -38,8 +38,17 @@ other game options can be accessed by clicking the "Other Options" button in
 the song menu.
 
 ## Building
-opsu! is distributed as a Maven project.
+opsu! is distributed as both a Maven and Gradle project.
 
+### Gradle
+Gradle builds are built to the `build` directory.
+* To run the project, execute the Gradle task `run`.
+* To create a single executable JAR file, execute the Gradle task
+  `build`. This will compile a jar to `build/libs/opsu-${version}.jar` with
+  the libraries, resources and natives packed inside the jar.
+  
+### Maven
+Maven builds are built to the `target` directory.
 * To run the project, execute the Maven goal `compile exec:exec`.
 * To create a single executable JAR file, execute the Maven goal
   `install -Djar`.  This will link the LWJGL native libraries using a

build.gradle

@@ -0,0 +1,99 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'application'
+
+import org.apache.tools.ant.filters.*
+
+group = 'itdelatrisu'
+version = '0.10.1'
+
+mainClassName = 'itdelatrisu.opsu.Opsu'
+buildDir = new File(rootProject.projectDir, "build/")
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+sourceSets {
+	main {
+		java {
+			srcDir 'src'
+		}
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	compile 'org.lwjgl.lwjgl:lwjgl:2.9.3'
+	compile 'org.slick2d:slick2d-core:1.0.1'
+	compile 'org.jcraft:jorbis:0.0.17'
+	compile 'net.lingala.zip4j:zip4j:1.3.2'
+	compile 'com.googlecode.soundlibs:jlayer:1.0.1-1'
+	compile 'com.googlecode.soundlibs:mp3spi:1.9.5-1'
+	compile 'com.googlecode.soundlibs:tritonus-share:0.3.7-2'
+	compile 'org.xerial:sqlite-jdbc:3.8.6'
+	compile 'org.json:json:20140107'
+	compile 'net.java.dev.jna:jna:4.1.0'
+	compile 'net.java.dev.jna:jna-platform:4.1.0'
+	compile 'org.apache.maven:maven-artifact:3.3.3'
+	compile 'org.apache.commons:commons-compress:1.9'
+	compile 'org.tukaani:xz:1.5'
+	compile 'com.github.jponge:lzma-java:1.3'
+
+
+}
+
+def nativePlatforms = ['windows', 'linux', 'osx']
+nativePlatforms.each { platform -> //noinspection GroovyAssignabilityCheck
+	task "${platform}Natives" {
+		def outputDir = "${buildDir}/natives/"
+		inputs.files(configurations.compile)
+		outputs.dir(outputDir)
+		doLast {
+			copy {
+				def artifacts = configurations.compile.resolvedConfiguration.resolvedArtifacts
+						.findAll { it.classifier == "natives-$platform" }
+				artifacts.each {
+					from zipTree(it.file)
+				}
+				into outputDir
+			}
+		}
+	}
+}
+
+processResources {
+	from 'res'
+	exclude '**/Thumbs.db'
+
+	filesMatching('version') {
+		expand(version: project.version, timestamp: new Date().format("yyyy-MM-dd HH:mm"))
+	}
+}
+
+task unpackNatives {
+	description "Copies native libraries to the build directory."
+	dependsOn nativePlatforms.collect { "${it}Natives" }.findAll { tasks[it] }
+}
+
+jar {
+	manifest {
+		attributes 'Implementation-Title': 'opsu!',
+				'Implementation-Version': version,
+				'Main-Class': mainClassName
+	}
+
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	baseName = "opsu"
+
+	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+	exclude '**/Thumbs.db'
+}
+
+run {
+	dependsOn 'unpackNatives'
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Aug 25 19:45:21 BST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip

gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -5,8 +5,10 @@
 	<artifactId>opsu</artifactId>
 	<version>0.10.1</version>
 	<properties>
+		<version>${project.version}</version>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+		<mainClassName>itdelatrisu.opsu.Opsu</mainClassName>
 	</properties>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
@@ -67,30 +69,9 @@
 							<skip>${jar}</skip>
 							<executable>java</executable>
 							<arguments>
-								<argument>-Djava.library.path=${project.build.directory}/natives</argument>
 								<argument>-cp</argument>
 								<classpath />
-								<argument>itdelatrisu.opsu.Opsu</argument>
+								<argument>${mainClassName}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-					<execution>
-						<id>jarsplice</id>
-						<phase>install</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>java</executable>
-							<workingDirectory>${basedir}/target</workingDirectory>
-							<arguments>
-								<argument>-jar</argument>
-								<argument>-Dinput=opsu-${project.version}.jar</argument>
-								<argument>-Dmain=itdelatrisu.opsu.Opsu</argument>
-								<argument>-Doutput=opsu-${project.version}-runnable.jar</argument>
-								<!-- uncomment the line below to use XDG base directories in Unix -->
-								<!--<argument>-Dparams=-DXDG=true</argument>-->
-								<argument>${basedir}/tools/JarSplicePlus.jar</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -98,7 +79,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.3</version>
+				<version>2.4.1</version>
 				<configuration>
 					<!--
 					<artifactSet>
@@ -124,6 +105,11 @@
 							</excludes>
 						</filter>
 					</filters>
+					<transformers>
+						<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+							<mainClass>${mainClassName}</mainClass>
+						</transformer>
+					</transformers>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 				</configuration>
 				<executions>

res/version

@@ -1,3 +1,3 @@
-version=${pom.version}
+version=${version}
-file=https://github.com/itdelatrisu/opsu/releases/download/${pom.version}/opsu-${pom.version}.jar
+file=https://github.com/itdelatrisu/opsu/releases/download/${version}/opsu-${version}.jar
 build.date=${timestamp}

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'opsu'

src/itdelatrisu/opsu/NativeLoader.java

@@ -0,0 +1,108 @@
+/*
+ * opsu! - an open-source osu! client
+ * Copyright (C) 2014, 2015 Jeffrey Han
+ *
+ * opsu! is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu! is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package itdelatrisu.opsu;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.CodeSource;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+/**
+ * Native loader, based on the JarSplice launcher.
+ *
+ * @author http://ninjacave.com
+ */
+public class NativeLoader {
+	/** Directory where natives are unpacked. */
+	public static final File NATIVE_DIR = new File("Natives/");
+
+	/**
+	 * Unpacks natives for the current operating system to the natives directory.
+	 * @throws IOException
+	 */
+	public void loadNatives() throws IOException {
+		if (!NATIVE_DIR.exists())
+			NATIVE_DIR.mkdir();
+
+		CodeSource src = NativeLoader.class.getProtectionDomain().getCodeSource();
+		if (src != null) {
+			URI jar = null;
+			try {
+				jar = src.getLocation().toURI();
+			} catch (URISyntaxException e) {
+				e.printStackTrace();
+				return;
+			}
+
+			JarFile jarFile = new JarFile(new File(jar), false);
+			Enumeration<JarEntry> entries = jarFile.entries();
+
+			while (entries.hasMoreElements()) {
+				JarEntry e = entries.nextElement();
+				if (e == null)
+					break;
+
+				File f = new File(NATIVE_DIR, e.getName());
+				if (isNativeFile(e.getName()) && !e.isDirectory() && e.getName().indexOf('/') == -1 && !f.exists()) {
+					InputStream in = jarFile.getInputStream(jarFile.getEntry(e.getName()));
+					OutputStream out = new FileOutputStream(f);
+
+					byte[] buffer = new byte[65536];
+					int bufferSize;
+					while ((bufferSize = in.read(buffer, 0, buffer.length)) != -1)
+						out.write(buffer, 0, bufferSize);
+
+					in.close();
+					out.close();
+				}
+			}
+
+			jarFile.close();
+		}
+	}
+
+	/**
+	 * Returns whether the given file name is a native file for the current operating system.
+	 * @param entryName the file name
+	 * @return true if the file is a native that should be loaded, false otherwise
+	 */
+	private boolean isNativeFile(String entryName) {
+		String osName = System.getProperty("os.name");
+		String name = entryName.toLowerCase();
+
+		if (osName.startsWith("Win")) {
+			if (name.endsWith(".dll"))
+				return true;
+		} else if (osName.startsWith("Linux")) {
+			if (name.endsWith(".so"))
+				return true;
+		} else if (((osName.startsWith("Mac")) || (osName.startsWith("Darwin"))) && ((name.endsWith(".jnilib")) || (name.endsWith(".dylib")))) {
+			return true;
+		}
+
+		return false;
+	}
+}

src/itdelatrisu/opsu/Opsu.java

@@ -22,26 +22,8 @@ import itdelatrisu.opsu.audio.MusicController;
 import itdelatrisu.opsu.db.DBController;
 import itdelatrisu.opsu.downloads.DownloadList;
 import itdelatrisu.opsu.downloads.Updater;
-import itdelatrisu.opsu.states.ButtonMenu;
+import itdelatrisu.opsu.states.*;
-import itdelatrisu.opsu.states.DownloadsMenu;
-import itdelatrisu.opsu.states.Game;
-import itdelatrisu.opsu.states.GamePauseMenu;
-import itdelatrisu.opsu.states.GameRanking;
-import itdelatrisu.opsu.states.MainMenu;
-import itdelatrisu.opsu.states.OptionsMenu;
-import itdelatrisu.opsu.states.SongMenu;
-import itdelatrisu.opsu.states.Splash;
 import itdelatrisu.opsu.ui.UI;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.UnknownHostException;
-
 import org.newdawn.slick.Color;
 import org.newdawn.slick.GameContainer;
 import org.newdawn.slick.SlickException;
@@ -53,6 +35,12 @@ import org.newdawn.slick.util.FileSystemLocation;
 import org.newdawn.slick.util.Log;
 import org.newdawn.slick.util.ResourceLoader;
 
+import java.io.*;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+
 /**
  * Main class.
  * <p>
@@ -131,10 +119,30 @@ public class Opsu extends StateBasedGame {
 			System.exit(1);
 		}
 
-		// set path for lwjgl natives - NOT NEEDED if using JarSplice
+		File nativeDir;
-		File nativeDir = new File("./target/natives/");
+		if ((nativeDir = new File("./target/natives/")).isDirectory() ||
-		if (nativeDir.isDirectory())
+				(nativeDir = new File("./build/natives/")).isDirectory())
+			;
+		else {
+			nativeDir = NativeLoader.NATIVE_DIR;
+			try {
+				new NativeLoader().loadNatives();
+			} catch (IOException e) {
+				Log.error("Error loading natives.", e);
+			}
+		}
 		System.setProperty("org.lwjgl.librarypath", nativeDir.getAbsolutePath());
+		System.setProperty("java.library.path", nativeDir.getAbsolutePath());
+		try {
+			// Workaround for "java.library.path" property being read-only.
+			// http://stackoverflow.com/a/24988095
+			Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
+			fieldSysPath.setAccessible(true);
+			fieldSysPath.set(null, null);
+		} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+			Log.warn("Failed to set 'sys_paths' field.", e);
+		}
+
 
 		// set the resource paths
 		ResourceLoader.addResourceLocation(new FileSystemLocation(new File("./res/")));

src/itdelatrisu/opsu/Utils.java

@@ -585,4 +585,11 @@ public class Utils {
 	public static boolean parseBoolean(String s) {
 		return (Integer.parseInt(s) == 1);
 	}
+
+	/**
+	 * Linear interpolation of a and b at t.
+	 */
+	public static float lerp(float a, float b, float t) {
+		return a * (1 - t) + b * t;
+	}
 }

src/itdelatrisu/opsu/objects/curves/CircumscribedCircle.java

@@ -19,6 +19,7 @@
 package itdelatrisu.opsu.objects.curves;
 
 import itdelatrisu.opsu.ErrorHandler;
+import itdelatrisu.opsu.Utils;
 import itdelatrisu.opsu.beatmap.HitObject;
 
 import org.newdawn.slick.Color;
@@ -161,7 +162,7 @@ public class CircumscribedCircle extends Curve {
 
 	@Override
 	public float[] pointAt(float t) {
-		float ang = lerp(startAng, endAng, t);
+		float ang = Utils.lerp(startAng, endAng, t);
 		return new float[] {
 			(float) (Math.cos(ang) * radius + circleCenter.x),
 			(float) (Math.sin(ang) * radius + circleCenter.y)

src/itdelatrisu/opsu/objects/curves/Curve.java

@@ -150,14 +150,6 @@ public abstract class Curve {
 	 * @param i the control point index
 	 */
 	public float getY(int i) { return (i == 0) ? y : sliderY[i - 1]; }
-
-	/**
-	 * Linear interpolation of a and b at t.
-	 */
-	protected float lerp(float a, float b, float t) {
-		return a * (1 - t) + b * t;
-	}
-
 	/**
 	 * Discards the slider cache (only used for mmsliders).
 	 */

src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java

@@ -18,6 +18,7 @@
 
 package itdelatrisu.opsu.objects.curves;
 
+import itdelatrisu.opsu.Utils;
 import itdelatrisu.opsu.beatmap.HitObject;
 
 import java.util.Iterator;
@@ -94,7 +95,7 @@ public abstract class EqualDistanceMultiCurve extends Curve {
 			// interpolate the point between the two closest distances
 			if (distanceAt - lastDistanceAt > 1) {
 				float t = (prefDistance - lastDistanceAt) / (distanceAt - lastDistanceAt);
-				curve[i] = new Vec2f(lerp(lastCurve.x, thisCurve.x, t), lerp(lastCurve.y, thisCurve.y, t));
+				curve[i] = new Vec2f(Utils.lerp(lastCurve.x, thisCurve.x, t), Utils.lerp(lastCurve.y, thisCurve.y, t));
 			} else
 				curve[i] = thisCurve;
 		}
@@ -128,8 +129,8 @@ public abstract class EqualDistanceMultiCurve extends Curve {
 			Vec2f poi2 = curve[index + 1];
 			float t2 = indexF - index;
 			return new float[] {
-				lerp(poi.x, poi2.x, t2),
+				Utils.lerp(poi.x, poi2.x, t2),
-				lerp(poi.y, poi2.y, t2)
+				Utils.lerp(poi.y, poi2.y, t2)
 			};
 		}
 	}

src/org/newdawn/slick/Input.java

@@ -1078,7 +1078,7 @@ public class Input {
 				throw new SlickException("Unable to create controller - no jinput found - add jinput.jar to your classpath");
 			}
 			throw new SlickException("Unable to create controllers");
-		} catch (NoClassDefFoundError e) {
+		} catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
 			// forget it, no jinput availble
 		}
     }