From 6d284cdd80a8bb1a4b57679e9c1a001527d9fc3f Mon Sep 17 00:00:00 2001 From: Jeffrey Han Date: Fri, 28 Aug 2015 21:29:21 -0500 Subject: [PATCH] Organize imports. Some of these got re-ordered when I updated Eclipse -- resetting to the original sort order. Signed-off-by: Jeffrey Han --- src/itdelatrisu/opsu/Opsu.java | 30 +++++++-------- src/itdelatrisu/opsu/Options.java | 14 +++---- src/itdelatrisu/opsu/Utils.java | 18 ++++----- src/itdelatrisu/opsu/replay/Replay.java | 4 +- src/itdelatrisu/opsu/states/Game.java | 50 ++++++++++++------------- src/itdelatrisu/opsu/ui/Cursor.java | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/itdelatrisu/opsu/Opsu.java b/src/itdelatrisu/opsu/Opsu.java index ec76eccc..05ad06d3 100644 --- a/src/itdelatrisu/opsu/Opsu.java +++ b/src/itdelatrisu/opsu/Opsu.java @@ -18,6 +18,21 @@ package itdelatrisu.opsu; +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.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; @@ -40,21 +55,6 @@ import org.newdawn.slick.util.FileSystemLocation; import org.newdawn.slick.util.Log; import org.newdawn.slick.util.ResourceLoader; -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.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; - /** * Main class. *

diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index 25dddfa2..118a36f4 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -18,6 +18,13 @@ package itdelatrisu.opsu; +import itdelatrisu.opsu.audio.MusicController; +import itdelatrisu.opsu.beatmap.Beatmap; +import itdelatrisu.opsu.skins.Skin; +import itdelatrisu.opsu.skins.SkinLoader; +import itdelatrisu.opsu.ui.Fonts; +import itdelatrisu.opsu.ui.UI; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -44,13 +51,6 @@ import org.newdawn.slick.util.FileSystemLocation; import org.newdawn.slick.util.Log; import org.newdawn.slick.util.ResourceLoader; -import itdelatrisu.opsu.audio.MusicController; -import itdelatrisu.opsu.beatmap.Beatmap; -import itdelatrisu.opsu.skins.Skin; -import itdelatrisu.opsu.skins.SkinLoader; -import itdelatrisu.opsu.ui.Fonts; -import itdelatrisu.opsu.ui.UI; - /** * Handles all user options. */ diff --git a/src/itdelatrisu/opsu/Utils.java b/src/itdelatrisu/opsu/Utils.java index f1b1e613..f1f2fdfd 100644 --- a/src/itdelatrisu/opsu/Utils.java +++ b/src/itdelatrisu/opsu/Utils.java @@ -18,6 +18,15 @@ package itdelatrisu.opsu; +import itdelatrisu.opsu.audio.SoundController; +import itdelatrisu.opsu.audio.SoundEffect; +import itdelatrisu.opsu.beatmap.HitObject; +import itdelatrisu.opsu.downloads.Download; +import itdelatrisu.opsu.downloads.DownloadNode; +import itdelatrisu.opsu.replay.PlaybackSpeed; +import itdelatrisu.opsu.ui.Fonts; +import itdelatrisu.opsu.ui.UI; + import java.awt.image.BufferedImage; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -58,15 +67,6 @@ import org.newdawn.slick.util.Log; import com.sun.jna.platform.FileUtils; -import itdelatrisu.opsu.audio.SoundController; -import itdelatrisu.opsu.audio.SoundEffect; -import itdelatrisu.opsu.beatmap.HitObject; -import itdelatrisu.opsu.downloads.Download; -import itdelatrisu.opsu.downloads.DownloadNode; -import itdelatrisu.opsu.replay.PlaybackSpeed; -import itdelatrisu.opsu.ui.Fonts; -import itdelatrisu.opsu.ui.UI; - /** * Contains miscellaneous utilities. */ diff --git a/src/itdelatrisu/opsu/replay/Replay.java b/src/itdelatrisu/opsu/replay/Replay.java index 505ba128..6f2d9fb4 100644 --- a/src/itdelatrisu/opsu/replay/Replay.java +++ b/src/itdelatrisu/opsu/replay/Replay.java @@ -41,11 +41,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import lzma.streams.LzmaOutputStream; - import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; import org.newdawn.slick.util.Log; +import lzma.streams.LzmaOutputStream; + /** * Captures osu! replay data. * https://osu.ppy.sh/wiki/Osr_%28file_format%29 diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index ac13f881..eb3b02d3 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -18,25 +18,6 @@ package itdelatrisu.opsu.states; -import java.io.File; -import java.util.LinkedList; -import java.util.Stack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.Display; -import org.newdawn.slick.Animation; -import org.newdawn.slick.Color; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; -import org.newdawn.slick.Image; -import org.newdawn.slick.Input; -import org.newdawn.slick.SlickException; -import org.newdawn.slick.state.BasicGameState; -import org.newdawn.slick.state.StateBasedGame; -import org.newdawn.slick.state.transition.EmptyTransition; -import org.newdawn.slick.state.transition.FadeInTransition; -import org.newdawn.slick.state.transition.FadeOutTransition; - import itdelatrisu.opsu.ErrorHandler; import itdelatrisu.opsu.GameData; import itdelatrisu.opsu.GameImage; @@ -71,6 +52,25 @@ import itdelatrisu.opsu.ui.MenuButton; import itdelatrisu.opsu.ui.UI; import itdelatrisu.opsu.ui.animations.AnimationEquation; +import java.io.File; +import java.util.LinkedList; +import java.util.Stack; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.Display; +import org.newdawn.slick.Animation; +import org.newdawn.slick.Color; +import org.newdawn.slick.GameContainer; +import org.newdawn.slick.Graphics; +import org.newdawn.slick.Image; +import org.newdawn.slick.Input; +import org.newdawn.slick.SlickException; +import org.newdawn.slick.state.BasicGameState; +import org.newdawn.slick.state.StateBasedGame; +import org.newdawn.slick.state.transition.EmptyTransition; +import org.newdawn.slick.state.transition.FadeInTransition; +import org.newdawn.slick.state.transition.FadeOutTransition; + /** * "Game" state. */ @@ -1485,12 +1485,6 @@ public class Game extends BasicGameState { int diameter = (int) (104 - (circleSize * 8)); HitObject.setStackOffset(diameter * STACK_OFFSET_MODIFIER); - // approachRate (hit object approach time) - if (approachRate < 5) - approachTime = (int) (1800 - (approachRate * 120)); - else - approachTime = (int) (1200 - ((approachRate - 5) * 150)); - // initialize objects Circle.init(container, circleSize); Slider.init(container, circleSize, beatmap); @@ -1498,6 +1492,12 @@ public class Game extends BasicGameState { Curve.init(container.getWidth(), container.getHeight(), circleSize, (Options.isBeatmapSkinIgnored()) ? Options.getSkin().getSliderBorderColor() : beatmap.getSliderBorderColor()); + // approachRate (hit object approach time) + if (approachRate < 5) + approachTime = (int) (1800 - (approachRate * 120)); + else + approachTime = (int) (1200 - ((approachRate - 5) * 150)); + // overallDifficulty (hit result time offsets) hitResultOffset = new int[GameData.HIT_MAX]; hitResultOffset[GameData.HIT_300] = (int) (78 - (overallDifficulty * 6)); diff --git a/src/itdelatrisu/opsu/ui/Cursor.java b/src/itdelatrisu/opsu/ui/Cursor.java index 69a13cd0..c7b46ffb 100644 --- a/src/itdelatrisu/opsu/ui/Cursor.java +++ b/src/itdelatrisu/opsu/ui/Cursor.java @@ -24,12 +24,12 @@ import itdelatrisu.opsu.Opsu; import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Utils; import itdelatrisu.opsu.skins.Skin; +import itdelatrisu.opsu.ui.animations.AnimationEquation; import java.nio.IntBuffer; import java.util.Iterator; import java.util.LinkedList; -import itdelatrisu.opsu.ui.animations.AnimationEquation; import org.lwjgl.BufferUtils; import org.lwjgl.LWJGLException; import org.newdawn.slick.GameContainer;