Merge branch 'master' into upstream

README-OPSU.md

@@ -63,6 +63,7 @@ The following files and folders will be created by opsu! as needed:
   files within this directory to the replay directory and saves the scores in
   the scores database.  Replays can be imported from osu! as well as opsu!.
 * `Natives/`: The native libraries directory.
+* `Temp/`: The temporary files directory.  Deleted when opsu! exits.
 
 ## Building
 opsu! is distributed as both a [Maven](https://maven.apache.org/) and

README.md

@@ -1,5 +1,6 @@
 #opsu!dance
-[example video](https://www.youtube.com/watch?v=Jp3VWEiw4CI)  
+[example video](https://www.youtube.com/watch?v=GB7N9MhCvzg)  
+  
 fork of [opsu!](https://github.com/itdelatrisu/opsu) with cursordancing auto.  
 I make cursordancing video's -[example](https://www.youtube.com/watch?v=1oFH58X_lTY)-, but I have too many requests and this way I can give people the opportunity to just run it and see the result instead of waiting for me to make a video. Original bot is written in C# and videos are made on osu!, but I don't want to distribute that program, because I don't want to endorse cheating in any way. The sources found in this repo are very representative of the ones of my bot (most files are the exact same, except for C#/java changes).  
   

build.gradle

@@ -0,0 +1,109 @@
+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.12.1'
+
+mainClassName = 'itdelatrisu.opsu.Opsu'
+buildDir = new File(rootProject.projectDir, "build/")
+
+def useXDG = 'false'
+if (hasProperty('XDG')) {
+	useXDG = XDG
+}
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+sourceSets {
+	main {
+		java {
+			srcDir 'src'
+		}
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	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'
+	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.10.2'
+	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,
+				'Use-XDG': useXDG
+	}
+
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	baseName = "opsu"
+
+	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+	exclude '**/Thumbs.db'
+
+	outputs.upToDateWhen { false }
+}
+
+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

settings.gradle

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

src/itdelatrisu/opsu/GameData.java

@@ -26,7 +26,6 @@ import itdelatrisu.opsu.beatmap.Beatmap;
 import itdelatrisu.opsu.beatmap.HitObject;
 import itdelatrisu.opsu.downloads.Updater;
 import itdelatrisu.opsu.objects.curves.Curve;
-import itdelatrisu.opsu.objects.curves.Vec2f;
 import itdelatrisu.opsu.replay.Replay;
 import itdelatrisu.opsu.replay.ReplayFrame;
 import itdelatrisu.opsu.ui.Colors;
@@ -907,22 +906,21 @@ public class GameData {
 					float scale = (!hitResult.expand) ? 1f : 1f + (HITCIRCLE_ANIM_SCALE - 1f) * progress;
 					float alpha = 1f - progress;
 
-					// slider curve
+					if (!GameMod.HIDDEN.isActive()) {
-					if (hitResult.curve != null && !GameMod.HIDDEN.isActive()) {
+						// slider curve
-						float oldWhiteAlpha = Colors.WHITE_FADE.a;
+						if (hitResult.curve != null) {
-						float oldColorAlpha = hitResult.color.a;
+							float oldWhiteAlpha = Colors.WHITE_FADE.a;
-						Colors.WHITE_FADE.a = alpha;
+							float oldColorAlpha = hitResult.color.a;
-						hitResult.color.a = alpha;
+							Colors.WHITE_FADE.a = alpha;
-						if (!Options.isShrinkingSliders()) {
+							hitResult.color.a = alpha;
-							hitResult.curve.draw(hitResult.color);
+							if (!Options.isShrinkingSliders()) {
+								hitResult.curve.draw(hitResult.color);
+							}
+							Colors.WHITE_FADE.a = oldWhiteAlpha;
+							hitResult.color.a = oldColorAlpha;
 						}
-						Colors.WHITE_FADE.a = oldWhiteAlpha;
-						hitResult.color.a = oldColorAlpha;
-					}
 
-					// hit circles
+						// hit circles
-					if (!(hitResult.hitResultType == HitObjectType.CIRCLE && GameMod.HIDDEN.isActive())) {
-						// "hidden" mod: expanding animation for only circles not drawn
 						Image scaledHitCircle = GameImage.HITCIRCLE.getImage().getScaledCopy(scale);
 						Image scaledHitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage().getScaledCopy(scale);
 						scaledHitCircle.setAlpha(alpha);
@@ -932,7 +930,7 @@ public class GameData {
 					}
 				}
 
-				if (hitResult.result == HIT_SLIDER_INITIAL) {
+				if (hitResult.result == HIT_SLIDER_INITIAL && !GameMod.HIDDEN.isActive()) {
 					float progress = AnimationEquation.OUT_CUBIC.calc(
 						(float) Utils.clamp(trackPosition - hitResult.time, 0, HITCIRCLE_FADE_TIME) / HITCIRCLE_FADE_TIME);
 					float scale = (!hitResult.expand) ? 1f : 1f + (HITCIRCLE_ANIM_SCALE - 1f) * progress;

src/itdelatrisu/opsu/beatmap/TimingPoint.java

@@ -98,7 +98,7 @@ public class TimingPoint {
 	/**
 	 * Returns the slider multiplier. [INHERITED]
 	 */
-	public float getSliderMultiplier() { return velocity / -100f; }
+	public float getSliderMultiplier() { return Utils.clamp(-velocity, 10, 1000) / 100f; }
 
 	/**
 	 * Returns the meter.

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

@@ -111,7 +111,7 @@ public abstract class EqualDistanceMultiCurve extends Curve {
 			int cnt = 1;
 
 			if (cnt > ncurve) {
-				return; // TODO this prevents aspire map from crashing the game, but does it breaks stuff?
+				return;
 			}
 
 			Vec2f c2 = curve[cnt++];

src/itdelatrisu/opsu/states/Game.java

@@ -497,7 +497,15 @@ public class Game extends BasicGameState {
 
 			// letterbox effect (black bars on top/bottom)
 			if (beatmap.letterboxInBreaks && breakLength >= 4000) {
+				// let it fade in/out
+				float a = Color.black.a;
+				if (trackPosition - breakTime > breakLength / 2) {
+					Color.black.a = (Math.min(500f, breakTime + breakLength - trackPosition)) / 500f;
+				} else {
+					Color.black.a = Math.min(500, trackPosition - breakTime) / 500f;
+				}
 				g.setColor(Color.black);
+				Color.black.a = a;
 				g.fillRect(0, 0, width, height * 0.125f);
 				g.fillRect(0, height * 0.875f, width, height * 0.125f);
 			}
@@ -845,7 +853,7 @@ public class Game extends BasicGameState {
 		}
 
 		// update in-game scoreboard
-		if (previousScores != null && trackPosition > firstObjectTime) {
+		if (!Dancer.hideui && previousScores != null && trackPosition > firstObjectTime) {
 			// show scoreboard if selected, and always in break
 			if (scoreboardVisible || breakTime > 0) {
 				currentScoreboardAlpha += 1f / SCOREBOARD_FADE_IN_TIME * delta;
@@ -946,7 +954,7 @@ public class Game extends BasicGameState {
 		if (beatmap.breaks != null && breakIndex < beatmap.breaks.size()) {
 			int breakValue = beatmap.breaks.get(breakIndex);
 			if (breakTime > 0) {  // in a break period
-				if (trackPosition < breakValue)
+				if (trackPosition < breakValue && trackPosition < beatmap.objects[objectIndex].getTime() - approachTime)
 					return;
 				else {
 					// break is over
@@ -1134,7 +1142,9 @@ public class Game extends BasicGameState {
 			Utils.takeScreenShot();
 			break;
 		case Input.KEY_TAB:
-			scoreboardVisible = !scoreboardVisible;
+			if (!Dancer.hideui) {
+				scoreboardVisible = !scoreboardVisible;
+			}
 			break;
 		case Input.KEY_M:
 			if (Dancer.mirror) {