diff --git a/android/src/zero1hd/rhythmbullet/AndroidLauncher.java b/android/src/zero1hd/rhythmbullet/AndroidLauncher.java index 161ec2b..8e9b6d9 100755 --- a/android/src/zero1hd/rhythmbullet/AndroidLauncher.java +++ b/android/src/zero1hd/rhythmbullet/AndroidLauncher.java @@ -1,16 +1,14 @@ package zero1hd.rhythmbullet; import android.os.Bundle; -import zero1hd.rhythmbullet.RhythmBullet; import com.badlogic.gdx.backends.android.AndroidApplication; -import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; public class AndroidLauncher extends AndroidApplication { @Override protected void onCreate (Bundle savedInstanceState) { super.onCreate(savedInstanceState); - AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); - initialize(new RhythmBullet(), config); +// AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); +// initialize(new RhythmBullet(), config); } } diff --git a/build.gradle b/build.gradle index 8253c09..7f08192 100755 --- a/build.gradle +++ b/build.gradle @@ -72,8 +72,6 @@ project(":core") { compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" - compile group: 'com.badlogicgames.jlayer', name: 'jlayer', version: '1.0.1-gdx' - compile group: 'com.googlecode.soundlibs', name: 'mp3spi', version: '1.9.5-1' compile "org.apache.commons:commons-math3:3.2" compile "com.github.rwl:jtransforms:2.4.0" diff --git a/core/src/zero1hd/rhythmbullet/audio/AudioDataPackage.java b/core/src/zero1hd/rhythmbullet/audio/AudioDataPackage.java index eb99285..fa58d36 100755 --- a/core/src/zero1hd/rhythmbullet/audio/AudioDataPackage.java +++ b/core/src/zero1hd/rhythmbullet/audio/AudioDataPackage.java @@ -4,6 +4,8 @@ import java.security.InvalidParameterException; import com.badlogic.gdx.utils.FloatArray; +import zero1hd.rhythmbullet.util.MusicManager; + public class AudioDataPackage { private FloatArray bassPeaks; private FloatArray mPeaks; diff --git a/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java b/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java index 1fdb9a2..46c28da 100755 --- a/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java +++ b/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java @@ -5,7 +5,7 @@ import java.util.concurrent.Executors; import com.badlogic.gdx.utils.Disposable; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class AudioAnalyzer implements Disposable { private ExecutorService exec; diff --git a/core/src/zero1hd/rhythmbullet/audio/analyzer/PeakDetectionRunnable.java b/core/src/zero1hd/rhythmbullet/audio/analyzer/PeakDetectionRunnable.java index cf2e7f0..4365254 100755 --- a/core/src/zero1hd/rhythmbullet/audio/analyzer/PeakDetectionRunnable.java +++ b/core/src/zero1hd/rhythmbullet/audio/analyzer/PeakDetectionRunnable.java @@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.FloatArray; import zero1hd.rhythmbullet.audio.AudioDataPackage; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class PeakDetectionRunnable implements Runnable { boolean work = true, done; diff --git a/core/src/zero1hd/rhythmbullet/audio/analyzer/PruneFluxRunnable.java b/core/src/zero1hd/rhythmbullet/audio/analyzer/PruneFluxRunnable.java index b06ade9..fee44f6 100755 --- a/core/src/zero1hd/rhythmbullet/audio/analyzer/PruneFluxRunnable.java +++ b/core/src/zero1hd/rhythmbullet/audio/analyzer/PruneFluxRunnable.java @@ -3,7 +3,7 @@ package zero1hd.rhythmbullet.audio.analyzer; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.FloatArray; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class PruneFluxRunnable implements Runnable { boolean work = true; diff --git a/core/src/zero1hd/rhythmbullet/audio/analyzer/SpectralFluxAnalysisRunnable.java b/core/src/zero1hd/rhythmbullet/audio/analyzer/SpectralFluxAnalysisRunnable.java index 9103347..aa6e30d 100755 --- a/core/src/zero1hd/rhythmbullet/audio/analyzer/SpectralFluxAnalysisRunnable.java +++ b/core/src/zero1hd/rhythmbullet/audio/analyzer/SpectralFluxAnalysisRunnable.java @@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.FloatArray; import edu.emory.mathcs.jtransforms.fft.FloatFFT_1D; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class SpectralFluxAnalysisRunnable implements Runnable { boolean work = true; diff --git a/core/src/zero1hd/rhythmbullet/audio/analyzer/ThresholdCalcRunnable.java b/core/src/zero1hd/rhythmbullet/audio/analyzer/ThresholdCalcRunnable.java index 613f4c8..222094e 100755 --- a/core/src/zero1hd/rhythmbullet/audio/analyzer/ThresholdCalcRunnable.java +++ b/core/src/zero1hd/rhythmbullet/audio/analyzer/ThresholdCalcRunnable.java @@ -3,7 +3,7 @@ package zero1hd.rhythmbullet.audio.analyzer; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.FloatArray; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class ThresholdCalcRunnable implements Runnable { boolean work = true; diff --git a/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java b/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java index 38572c0..339b617 100755 --- a/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java +++ b/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java @@ -11,7 +11,7 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class BasicVisualizer extends VisualizerCore { private Pixmap pixmap; diff --git a/core/src/zero1hd/rhythmbullet/audio/visualizer/VisualizerCore.java b/core/src/zero1hd/rhythmbullet/audio/visualizer/VisualizerCore.java index 90d3124..de26aca 100755 --- a/core/src/zero1hd/rhythmbullet/audio/visualizer/VisualizerCore.java +++ b/core/src/zero1hd/rhythmbullet/audio/visualizer/VisualizerCore.java @@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.utils.Disposable; import edu.emory.mathcs.jtransforms.fft.FloatFFT_1D; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class VisualizerCore implements Disposable { protected MusicManager mm; @@ -33,6 +33,7 @@ public class VisualizerCore implements Disposable { updateTimer += delta; if (updateTimer >= updateRate) { mm.playbackIndexUpdate(); + System.out.println(mm.getPlaybackIndexPosition() + "vs" + mm.getReadIndex()); while (mm.getPlaybackIndexPosition() > mm.getReadIndex()) { mm.skipReadWindow(); } diff --git a/core/src/zero1hd/rhythmbullet/audio/MusicManager.java b/core/src/zero1hd/rhythmbullet/util/MusicManager.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/audio/MusicManager.java rename to core/src/zero1hd/rhythmbullet/util/MusicManager.java index b131e5f..a00bd3a 100755 --- a/core/src/zero1hd/rhythmbullet/audio/MusicManager.java +++ b/core/src/zero1hd/rhythmbullet/util/MusicManager.java @@ -1,5 +1,5 @@ -package zero1hd.rhythmbullet.audio; +package zero1hd.rhythmbullet.util; import com.badlogic.gdx.audio.Music.OnCompletionListener; import com.badlogic.gdx.files.FileHandle; diff --git a/core/src/zero1hd/rhythmbullet/util/RoundingResolutionHandler.java b/core/src/zero1hd/rhythmbullet/util/RoundingResolutionHandler.java index d5c7847..a22e284 100755 --- a/core/src/zero1hd/rhythmbullet/util/RoundingResolutionHandler.java +++ b/core/src/zero1hd/rhythmbullet/util/RoundingResolutionHandler.java @@ -8,7 +8,7 @@ import com.badlogic.gdx.files.FileHandle; public class RoundingResolutionHandler implements FileHandleResolver { private final Resolution[] descriptors; private final FileHandleResolver resolver; - + private boolean silent = true; private int width, height; public RoundingResolutionHandler(FileHandleResolver fileResolver, Resolution... descriptors) { if (descriptors.length == 0) throw new IllegalArgumentException("At least one Resolution needs to be supplied."); @@ -65,9 +65,11 @@ public class RoundingResolutionHandler implements FileHandleResolver { @Override public FileHandle resolve(String fileName) { - Gdx.app.debug("RResolution Handler", "Finding best match for resolution: " + width + "x" + height + " for file: " + fileName); Resolution bestRes = chooseRounded(descriptors); - Gdx.app.debug("RResolution Handler", "Selected folder: " + bestRes.folder); + if (!silent) { + Gdx.app.debug("RResolution Handler", "Finding best match for resolution: " + width + "x" + height + " for file: " + fileName); + Gdx.app.debug("RResolution Handler", "Selected folder: " + bestRes.folder); + } FileHandle resSpecificFile = resolver.resolve(bestRes.folder + "/" + fileName); if (!resSpecificFile.exists()) resSpecificFile = resolver.resolve(fileName); return resSpecificFile; diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java b/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java index a01f2c1..e26ab62 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java @@ -3,8 +3,6 @@ package zero1hd.rhythmbullet.desktop; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import zero1hd.rhythmbullet.RhythmBullet; - public class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); diff --git a/core/src/zero1hd/rhythmbullet/RhythmBullet.java b/desktop/src/zero1hd/rhythmbullet/desktop/RhythmBullet.java similarity index 99% rename from core/src/zero1hd/rhythmbullet/RhythmBullet.java rename to desktop/src/zero1hd/rhythmbullet/desktop/RhythmBullet.java index 2ffa1b6..2110dc1 100755 --- a/core/src/zero1hd/rhythmbullet/RhythmBullet.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/RhythmBullet.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet; +package zero1hd.rhythmbullet.desktop; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,7 +34,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldStyle; import com.badlogic.gdx.scenes.scene2d.ui.Window.WindowStyle; -import zero1hd.rhythmbullet.screens.LoadingScreen; +import zero1hd.rhythmbullet.desktop.screens.LoadingScreen; import zero1hd.rhythmbullet.util.GenericFileTypeHandler; import zero1hd.rhythmbullet.util.RoundingResolutionHandler; import zero1hd.rhythmbullet.util.TransitionAdapter; diff --git a/core/src/zero1hd/rhythmbullet/audio/Mp3Manager.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/Mp3Manager.java similarity index 79% rename from core/src/zero1hd/rhythmbullet/audio/Mp3Manager.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/Mp3Manager.java index cc61ab2..e786a2e 100755 --- a/core/src/zero1hd/rhythmbullet/audio/Mp3Manager.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/Mp3Manager.java @@ -1,14 +1,15 @@ -package zero1hd.rhythmbullet.audio; +package zero1hd.rhythmbullet.desktop.audio; import java.io.IOException; import java.util.Map; +import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.UnsupportedAudioFileException; -import org.tritonus.share.sampled.TAudioFormat; +import org.tritonus.share.sampled.file.TAudioFileFormat; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.audio.Music; @@ -17,6 +18,7 @@ import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.math.MathUtils; import zero1hd.rhythmbullet.audio.wavedecoder.AudioSampleReader; +import zero1hd.rhythmbullet.util.MusicManager; public class Mp3Manager implements MusicManager { @@ -24,30 +26,41 @@ public class Mp3Manager implements MusicManager { private Music music; private int playbackIndex, readIndex; private FileHandle fileHandle; - AudioInputStream in; + private AudioInputStream in; private AudioInputStream ais; private AudioFormat af; private AudioSampleReader d; private Map properties; - public Mp3Manager(FileHandle file) { this.fileHandle = file; + try { in = AudioSystem.getAudioInputStream(file.file()); AudioFormat baseFormat = in.getFormat(); - properties = ((TAudioFormat)baseFormat).properties(); - af = new AudioFormat( + af = new AudioFormat( AudioFormat.Encoding.PCM_SIGNED, baseFormat.getSampleRate(), 16, baseFormat.getChannels(), baseFormat.getChannels()*2, baseFormat.getSampleRate(), false); - ais = AudioSystem.getAudioInputStream(baseFormat, in); + ais = AudioSystem.getAudioInputStream(af, in); d = new AudioSampleReader(ais); music = Gdx.audio.newMusic(file); + } catch (IOException | UnsupportedAudioFileException e) { + e.printStackTrace(); + } + + try { + // TAudioFileFormat properties + AudioFileFormat baseFileFormat = AudioSystem.getAudioFileFormat(file.file()); + if (baseFileFormat instanceof TAudioFileFormat) { + properties = ((TAudioFileFormat)baseFileFormat).properties(); + } } catch (UnsupportedAudioFileException | IOException e) { e.printStackTrace(); } + + Gdx.app.debug("Property Count", String.valueOf(properties.size())); } @Override @@ -63,14 +76,19 @@ public class Mp3Manager implements MusicManager { @Override public void playbackIndexUpdate() { - playbackIndex = (int) ((getDuration()*getSampleRate())/getReadWindowSize()); + playbackIndex = (int) ((getPositionInSeconds()*getSampleRate())/getReadWindowSize()); } @Override public int getPlaybackIndexPosition() { return playbackIndex; } - + + @Override + public int getReadIndex() { + return readIndex; + } + @Override public int getReadWindowSize() { return readWindowSize; @@ -184,15 +202,9 @@ public class Mp3Manager implements MusicManager { seek(MathUtils.round(((Integer) properties.get("audio.length.bytes")).intValue() * (getPositionInSeconds()/getDuration()))); } - @Override - public int getReadIndex() { - return readIndex; - } - public void skip(long bytes) { long totalSkipped = 0; long skipped = 0; - while (totalSkipped < bytes) { try { skipped = ais.skip(bytes-totalSkipped); diff --git a/core/src/zero1hd/rhythmbullet/audio/MusicInfoController.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicInfoController.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/audio/MusicInfoController.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicInfoController.java index 258ebf4..8967895 100755 --- a/core/src/zero1hd/rhythmbullet/audio/MusicInfoController.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicInfoController.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.audio; +package zero1hd.rhythmbullet.desktop.audio; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -8,6 +8,8 @@ import com.badlogic.gdx.Preferences; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Disposable; +import zero1hd.rhythmbullet.audio.MusicInfo; + public class MusicInfoController implements Disposable { private MusicList musicList; private ExecutorService exec; diff --git a/core/src/zero1hd/rhythmbullet/audio/MusicList.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicList.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/audio/MusicList.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicList.java index 933ae66..86a58af 100755 --- a/core/src/zero1hd/rhythmbullet/audio/MusicList.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicList.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.audio; +package zero1hd.rhythmbullet.desktop.audio; import java.util.Observable; import java.util.concurrent.ExecutorService; @@ -10,6 +10,7 @@ import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Sort; import zero1hd.rhythmbullet.util.FileHandleAlphabeticalComparator; +import zero1hd.rhythmbullet.util.MusicManager; public class MusicList extends Observable { private Array musicList; diff --git a/core/src/zero1hd/rhythmbullet/audio/MusicListController.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java similarity index 93% rename from core/src/zero1hd/rhythmbullet/audio/MusicListController.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java index c1150f8..456778b 100755 --- a/core/src/zero1hd/rhythmbullet/audio/MusicListController.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.audio; +package zero1hd.rhythmbullet.desktop.audio; import java.util.Observable; import java.util.Observer; @@ -9,6 +9,8 @@ import com.badlogic.gdx.Preferences; import com.badlogic.gdx.audio.Music; import com.badlogic.gdx.audio.Music.OnCompletionListener; +import zero1hd.rhythmbullet.util.MusicManager; + public class MusicListController extends Observable implements OnCompletionListener, Observer { private MusicList musicList; private MusicManager mm; diff --git a/core/src/zero1hd/rhythmbullet/audio/WAVManager.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/WAVManager.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/audio/WAVManager.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/WAVManager.java index 5485948..b4d1799 100755 --- a/core/src/zero1hd/rhythmbullet/audio/WAVManager.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/WAVManager.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.audio; +package zero1hd.rhythmbullet.desktop.audio; import java.io.IOException; @@ -14,6 +14,7 @@ import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.math.MathUtils; import zero1hd.rhythmbullet.audio.wavedecoder.AudioSampleReader; +import zero1hd.rhythmbullet.util.MusicManager; public class WAVManager implements MusicManager { private int readWindowSize = 1024; diff --git a/core/src/zero1hd/rhythmbullet/audio/map/EntitySpawnInfo.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/EntitySpawnInfo.java similarity index 65% rename from core/src/zero1hd/rhythmbullet/audio/map/EntitySpawnInfo.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/map/EntitySpawnInfo.java index 5f09b77..2eb6253 100755 --- a/core/src/zero1hd/rhythmbullet/audio/map/EntitySpawnInfo.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/EntitySpawnInfo.java @@ -1,11 +1,11 @@ -package zero1hd.rhythmbullet.audio.map; +package zero1hd.rhythmbullet.desktop.audio.map; import java.util.HashMap; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.EntityFrame; -import zero1hd.rhythmbullet.entity.coordinator.Coordinator; -import zero1hd.rhythmbullet.entity.coordinator.CoordinatorFrame; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.EntityFrame; +import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator; +import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorFrame; public class EntitySpawnInfo { private EntityFrame entityToSpawn; diff --git a/core/src/zero1hd/rhythmbullet/audio/map/GamePlayMap.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/GamePlayMap.java similarity index 83% rename from core/src/zero1hd/rhythmbullet/audio/map/GamePlayMap.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/map/GamePlayMap.java index d6a3251..ec1a26e 100755 --- a/core/src/zero1hd/rhythmbullet/audio/map/GamePlayMap.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/GamePlayMap.java @@ -1,10 +1,10 @@ -package zero1hd.rhythmbullet.audio.map; +package zero1hd.rhythmbullet.desktop.audio.map; -import zero1hd.rhythmbullet.audio.MusicManager; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.EntityFrame; -import zero1hd.rhythmbullet.entity.coordinator.Coordinator; -import zero1hd.rhythmbullet.entity.coordinator.CoordinatorFrame; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.EntityFrame; +import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator; +import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorFrame; +import zero1hd.rhythmbullet.util.MusicManager; public class GamePlayMap { private MusicManager musicData; diff --git a/core/src/zero1hd/rhythmbullet/audio/map/MapWindowData.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/MapWindowData.java similarity index 83% rename from core/src/zero1hd/rhythmbullet/audio/map/MapWindowData.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/map/MapWindowData.java index 708792e..a3c82ce 100755 --- a/core/src/zero1hd/rhythmbullet/audio/map/MapWindowData.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/MapWindowData.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.audio.map; +package zero1hd.rhythmbullet.desktop.audio.map; import com.badlogic.gdx.utils.Array; diff --git a/core/src/zero1hd/rhythmbullet/audio/map/RhythmMapAlgorithm.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/RhythmMapAlgorithm.java similarity index 91% rename from core/src/zero1hd/rhythmbullet/audio/map/RhythmMapAlgorithm.java rename to desktop/src/zero1hd/rhythmbullet/desktop/audio/map/RhythmMapAlgorithm.java index 7fe9ebe..899f483 100755 --- a/core/src/zero1hd/rhythmbullet/audio/map/RhythmMapAlgorithm.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/map/RhythmMapAlgorithm.java @@ -1,14 +1,14 @@ -package zero1hd.rhythmbullet.audio.map; +package zero1hd.rhythmbullet.desktop.audio.map; import org.apache.commons.math3.random.MersenneTwister; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.FloatArray; -import zero1hd.rhythmbullet.RhythmBullet; import zero1hd.rhythmbullet.audio.AudioDataPackage; -import zero1hd.rhythmbullet.entity.EntityManager; -import zero1hd.rhythmbullet.entity.coordinator.CoordinatorManager; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.entity.EntityManager; +import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorManager; import zero1hd.rhythmbullet.util.MiniEvents; import zero1hd.rhythmbullet.util.MiniSender; diff --git a/core/src/zero1hd/rhythmbullet/entity/CollisionDetector.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/CollisionDetector.java similarity index 93% rename from core/src/zero1hd/rhythmbullet/entity/CollisionDetector.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/CollisionDetector.java index 1f70491..d05f57c 100755 --- a/core/src/zero1hd/rhythmbullet/entity/CollisionDetector.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/CollisionDetector.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity; +package zero1hd.rhythmbullet.desktop.entity; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; @@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.g2d.ParticleEffectPool; import com.badlogic.gdx.graphics.g2d.ParticleEffectPool.PooledEffect; import com.badlogic.gdx.utils.Array; -import zero1hd.rhythmbullet.RhythmBullet; +import zero1hd.rhythmbullet.desktop.RhythmBullet; public class CollisionDetector { Array enemies; diff --git a/core/src/zero1hd/rhythmbullet/entity/Entity.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/Entity.java similarity index 96% rename from core/src/zero1hd/rhythmbullet/entity/Entity.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/Entity.java index a8a0ab6..89aa65c 100755 --- a/core/src/zero1hd/rhythmbullet/entity/Entity.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/Entity.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity; +package zero1hd.rhythmbullet.desktop.entity; import java.util.HashMap; @@ -13,8 +13,8 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.Pool.Poolable; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.entity.coordinator.Coordinator; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator; public class Entity extends Actor implements Poolable { private Coordinator coordinator; diff --git a/core/src/zero1hd/rhythmbullet/entity/EntityFrame.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityFrame.java similarity index 91% rename from core/src/zero1hd/rhythmbullet/entity/EntityFrame.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityFrame.java index ec1f57d..1892480 100755 --- a/core/src/zero1hd/rhythmbullet/entity/EntityFrame.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityFrame.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity; +package zero1hd.rhythmbullet.desktop.entity; import com.badlogic.gdx.utils.Pool; diff --git a/core/src/zero1hd/rhythmbullet/entity/EntityManager.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityManager.java similarity index 75% rename from core/src/zero1hd/rhythmbullet/entity/EntityManager.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityManager.java index 288ee47..882b8c8 100755 --- a/core/src/zero1hd/rhythmbullet/entity/EntityManager.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/EntityManager.java @@ -1,15 +1,15 @@ -package zero1hd.rhythmbullet.entity; +package zero1hd.rhythmbullet.desktop.entity; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.utils.Array; -import zero1hd.rhythmbullet.entity.ally.Laser; -import zero1hd.rhythmbullet.entity.enemies.Flake; -import zero1hd.rhythmbullet.entity.enemies.Pellet; -import zero1hd.rhythmbullet.entity.enemies.Shard; -import zero1hd.rhythmbullet.entity.enemies.VoidCircle; +import zero1hd.rhythmbullet.desktop.entity.ally.Laser; +import zero1hd.rhythmbullet.desktop.entity.enemies.Flake; +import zero1hd.rhythmbullet.desktop.entity.enemies.Pellet; +import zero1hd.rhythmbullet.desktop.entity.enemies.Shard; +import zero1hd.rhythmbullet.desktop.entity.enemies.VoidCircle; public class EntityManager { private AssetManager assets; diff --git a/core/src/zero1hd/rhythmbullet/entity/ally/Laser.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/Laser.java similarity index 85% rename from core/src/zero1hd/rhythmbullet/entity/ally/Laser.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/Laser.java index aee2962..f3ad336 100755 --- a/core/src/zero1hd/rhythmbullet/entity/ally/Laser.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/Laser.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.ally; +package zero1hd.rhythmbullet.desktop.entity.ally; import java.util.HashMap; @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Sprite; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.entity.Entity; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.entity.Entity; public class Laser extends Entity { Sound sfx; diff --git a/core/src/zero1hd/rhythmbullet/entity/ally/PolyjetEntity.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/PolyjetEntity.java similarity index 91% rename from core/src/zero1hd/rhythmbullet/entity/ally/PolyjetEntity.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/PolyjetEntity.java index 19606b1..a169b2e 100755 --- a/core/src/zero1hd/rhythmbullet/entity/ally/PolyjetEntity.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/ally/PolyjetEntity.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.ally; +package zero1hd.rhythmbullet.desktop.entity.ally; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.graphics.Texture; @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.ParticleEffect; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.scenes.scene2d.actions.Actions; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.entity.Entity; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.entity.Entity; public class PolyjetEntity extends Entity { public float health; diff --git a/core/src/zero1hd/rhythmbullet/entity/coordinator/Coordinator.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/Coordinator.java similarity index 77% rename from core/src/zero1hd/rhythmbullet/entity/coordinator/Coordinator.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/Coordinator.java index f048447..91c0996 100755 --- a/core/src/zero1hd/rhythmbullet/entity/coordinator/Coordinator.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/Coordinator.java @@ -1,9 +1,9 @@ -package zero1hd.rhythmbullet.entity.coordinator; +package zero1hd.rhythmbullet.desktop.entity.coordinator; import com.badlogic.gdx.utils.Pool.Poolable; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.EntityManager; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.EntityManager; public class Coordinator implements Poolable { private CoordinatorFrame cf; diff --git a/core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorFrame.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorFrame.java similarity index 85% rename from core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorFrame.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorFrame.java index e1e8531..b3a6ed4 100755 --- a/core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorFrame.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorFrame.java @@ -1,8 +1,8 @@ -package zero1hd.rhythmbullet.entity.coordinator; +package zero1hd.rhythmbullet.desktop.entity.coordinator; import com.badlogic.gdx.utils.Pool; -import zero1hd.rhythmbullet.entity.EntityManager; +import zero1hd.rhythmbullet.desktop.entity.EntityManager; public class CoordinatorFrame { private Pool pool; diff --git a/core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorManager.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorManager.java similarity index 75% rename from core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorManager.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorManager.java index 384b2a2..3cdc70f 100755 --- a/core/src/zero1hd/rhythmbullet/entity/coordinator/CoordinatorManager.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/CoordinatorManager.java @@ -1,6 +1,6 @@ -package zero1hd.rhythmbullet.entity.coordinator; +package zero1hd.rhythmbullet.desktop.entity.coordinator; -import zero1hd.rhythmbullet.entity.EntityManager; +import zero1hd.rhythmbullet.desktop.entity.EntityManager; public class CoordinatorManager { private EntityManager em; diff --git a/core/src/zero1hd/rhythmbullet/entity/coordinator/SlowLeftCoordinator.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowLeftCoordinator.java similarity index 71% rename from core/src/zero1hd/rhythmbullet/entity/coordinator/SlowLeftCoordinator.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowLeftCoordinator.java index 26ffd52..e5ed746 100755 --- a/core/src/zero1hd/rhythmbullet/entity/coordinator/SlowLeftCoordinator.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowLeftCoordinator.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.coordinator; +package zero1hd.rhythmbullet.desktop.entity.coordinator; public class SlowLeftCoordinator extends Coordinator { @Override diff --git a/core/src/zero1hd/rhythmbullet/entity/coordinator/SlowRightCoordinator.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowRightCoordinator.java similarity index 71% rename from core/src/zero1hd/rhythmbullet/entity/coordinator/SlowRightCoordinator.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowRightCoordinator.java index 7b7da40..9984348 100755 --- a/core/src/zero1hd/rhythmbullet/entity/coordinator/SlowRightCoordinator.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/coordinator/SlowRightCoordinator.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.coordinator; +package zero1hd.rhythmbullet.desktop.entity.coordinator; public class SlowRightCoordinator extends Coordinator { @Override diff --git a/core/src/zero1hd/rhythmbullet/entity/enemies/Flake.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Flake.java similarity index 90% rename from core/src/zero1hd/rhythmbullet/entity/enemies/Flake.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Flake.java index d04a46b..145708e 100755 --- a/core/src/zero1hd/rhythmbullet/entity/enemies/Flake.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Flake.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.enemies; +package zero1hd.rhythmbullet.desktop.entity.enemies; import java.util.HashMap; @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.math.Rectangle; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.ally.Laser; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.ally.Laser; public class Flake extends Entity { private float timer; diff --git a/core/src/zero1hd/rhythmbullet/entity/enemies/Pellet.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Pellet.java similarity index 90% rename from core/src/zero1hd/rhythmbullet/entity/enemies/Pellet.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Pellet.java index 3fa43af..380a329 100755 --- a/core/src/zero1hd/rhythmbullet/entity/enemies/Pellet.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Pellet.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.enemies; +package zero1hd.rhythmbullet.desktop.entity.enemies; import java.util.HashMap; @@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.utils.Pool.Poolable; -import zero1hd.rhythmbullet.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.Entity; public class Pellet extends Entity implements Poolable { diff --git a/core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Shard.java similarity index 90% rename from core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Shard.java index 0f1204a..d66361e 100755 --- a/core/src/zero1hd/rhythmbullet/entity/enemies/Shard.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/Shard.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.enemies; +package zero1hd.rhythmbullet.desktop.entity.enemies; import java.util.HashMap; @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.math.Rectangle; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.ally.Laser; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.ally.Laser; public class Shard extends Entity { private int hp; diff --git a/core/src/zero1hd/rhythmbullet/entity/enemies/VoidCircle.java b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/VoidCircle.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/entity/enemies/VoidCircle.java rename to desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/VoidCircle.java index 0a50eea..03981de 100755 --- a/core/src/zero1hd/rhythmbullet/entity/enemies/VoidCircle.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/entity/enemies/VoidCircle.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.entity.enemies; +package zero1hd.rhythmbullet.desktop.entity.enemies; import java.util.HashMap; @@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Sprite; -import zero1hd.rhythmbullet.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.Entity; public class VoidCircle extends Entity { private float timer; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraph.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraph.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraph.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraph.java index 4156526..dbbb158 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraph.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraph.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; @@ -9,7 +9,7 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.FloatArray; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class AudioGraph extends Actor { private MusicManager audioData; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraphRelation.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraphRelation.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraphRelation.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraphRelation.java index 82eeaf6..5aced90 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/AudioGraphRelation.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/AudioGraphRelation.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; @@ -9,7 +9,7 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.FloatArray; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class AudioGraphRelation extends Actor { private MusicManager audioData; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ControlOptions.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ControlOptions.java similarity index 98% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/ControlOptions.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ControlOptions.java index 52e566f..e4678ba 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ControlOptions.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ControlOptions.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Actor; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/GraphicsOptions.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/GraphicsOptions.java index 6e41b3e..3a68c30 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/GraphicsOptions.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; @@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.utils.Align; -import zero1hd.rhythmbullet.screens.MainMenu; +import zero1hd.rhythmbullet.desktop.screens.MainMenu; public class GraphicsOptions extends Table { private Label resolutions, shaders; @@ -28,7 +28,7 @@ public class GraphicsOptions extends Table { _1366x768; - public GraphicsOptions(MainMenu mainMenu, Skin skin, Preferences prefs) { + public GraphicsOptions(final MainMenu mainMenu, Skin skin, final Preferences prefs) { align(Align.center); defaults().space(10f); this.prefs = prefs; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/HealthBar.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/HealthBar.java similarity index 88% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/HealthBar.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/HealthBar.java index c7df9ce..4327d7d 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/HealthBar.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/HealthBar.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.actions.Actions; @@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup; -import zero1hd.rhythmbullet.entity.ally.PolyjetEntity; +import zero1hd.rhythmbullet.desktop.entity.ally.PolyjetEntity; public class HealthBar extends WidgetGroup { Image empty; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/KeyBindButton.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/KeyBindButton.java similarity index 96% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/KeyBindButton.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/KeyBindButton.java index aa21e3f..f9cf515 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/KeyBindButton.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/KeyBindButton.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicControls.java similarity index 90% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicControls.java index 5756675..21084d6 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicControls.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.ui.CheckBox; @@ -7,13 +7,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.ImageButton; import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import zero1hd.rhythmbullet.audio.MusicListController; +import zero1hd.rhythmbullet.desktop.audio.MusicListController; public class MusicControls extends HorizontalGroup { private ImageButton reverse, forward; private CheckBox shuffle, play; private float disableTimer; - public MusicControls(Skin skin, MusicListController sc) { + public MusicControls(Skin skin, final MusicListController sc) { reverse = new ImageButton(skin, "rewind-button"); reverse.addListener(new ChangeListener() { @Override diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java similarity index 96% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java index 1021aae..7218e69 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; @@ -12,7 +12,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Disposable; import zero1hd.rhythmbullet.audio.MusicInfo; -import zero1hd.rhythmbullet.graphics.ui.pages.MusicSelectionPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MusicSelectionPage; public class MusicSelectable extends WidgetGroup implements Disposable { private Table table; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ResolutionButton.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ResolutionButton.java similarity index 91% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/ResolutionButton.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ResolutionButton.java index a2ca5e6..a954574 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ResolutionButton.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ResolutionButton.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import java.awt.Dimension; import java.awt.Toolkit; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java similarity index 95% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java index cc987a5..3069713 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.Batch; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ShortenedTextLabel.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/ShortenedTextLabel.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java index f851792..0772ae9 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ShortenedTextLabel.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/TitleBarVisualizer.java similarity index 95% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/TitleBarVisualizer.java index 8a66b66..9fb69af 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/TitleBarVisualizer.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.assets.AssetManager; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/Visualizer.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/Visualizer.java similarity index 95% rename from core/src/zero1hd/rhythmbullet/graphics/ui/components/Visualizer.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/Visualizer.java index 305fc33..35ea444 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/Visualizer.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/Visualizer.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.components; +package zero1hd.rhythmbullet.desktop.graphics.ui.components; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; @@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.scenes.scene2d.ui.Widget; import com.badlogic.gdx.utils.Disposable; -import zero1hd.rhythmbullet.audio.MusicManager; import zero1hd.rhythmbullet.audio.visualizer.BasicVisualizer; +import zero1hd.rhythmbullet.util.MusicManager; public class Visualizer extends Widget implements Disposable { private BasicVisualizer vis; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/AnalysisPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/AnalysisPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java index 374bc19..50e00b1 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/AnalysisPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.graphics.g2d.TextureAtlas; @@ -10,8 +10,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import zero1hd.rhythmbullet.audio.MusicManager; import zero1hd.rhythmbullet.audio.analyzer.AudioAnalyzer; +import zero1hd.rhythmbullet.util.MusicManager; public class AnalysisPage extends Page { private boolean confirmed; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/CreditsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/CreditsPage.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/CreditsPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/CreditsPage.java index b087ef8..eab19b2 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/CreditsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/CreditsPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Skin; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/KeybindOptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java similarity index 84% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/KeybindOptionsPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java index f751c03..5f7069e 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/KeybindOptionsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.graphics.g2d.TextureAtlas; @@ -9,13 +9,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import zero1hd.rhythmbullet.controls.KeyMap; -import zero1hd.rhythmbullet.graphics.ui.components.ControlOptions; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.ControlOptions; public class KeybindOptionsPage extends Page { private ControlOptions controlTable; private KeyMap keyMap; private TextButton backButton; - public KeybindOptionsPage(Skin skin, AssetManager assets, Vector3 cameraPosition) { + public KeybindOptionsPage(Skin skin, AssetManager assets, final Vector3 cameraPosition) { setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); keyMap = new KeyMap(assets); controlTable = new ControlOptions(skin, keyMap); diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java similarity index 84% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java index 0c94f29..4988f78 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import java.util.Observable; import java.util.Observer; @@ -14,13 +14,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.utils.Align; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.audio.MusicManager; -import zero1hd.rhythmbullet.audio.MusicListController; -import zero1hd.rhythmbullet.graphics.ui.components.MusicControls; -import zero1hd.rhythmbullet.graphics.ui.components.ScrollText; -import zero1hd.rhythmbullet.graphics.ui.components.TitleBarVisualizer; -import zero1hd.rhythmbullet.screens.MainMenu; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.audio.MusicListController; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.MusicControls; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.ScrollText; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.TitleBarVisualizer; +import zero1hd.rhythmbullet.desktop.screens.MainMenu; +import zero1hd.rhythmbullet.util.MusicManager; public class MainPage extends Page implements Observer { private Label versionLabel; @@ -36,7 +36,7 @@ public class MainPage extends Page implements Observer { private MainMenu mMenu; private ScrollText scrollText; - public MainPage(RhythmBullet core, Vector3 targetPosition, MusicListController mlc, MainMenu mainMenu) { + public MainPage(RhythmBullet core, final Vector3 targetPosition, MusicListController mlc, final MainMenu mainMenu) { this.mlc = mlc; setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("red-linear")); this.mMenu = mainMenu; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java similarity index 93% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java index e93dcdb..039325f 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import java.util.Observable; import java.util.Observer; @@ -25,12 +25,12 @@ import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.badlogic.gdx.utils.Array; -import zero1hd.rhythmbullet.audio.MusicManager; import zero1hd.rhythmbullet.audio.MusicInfo; -import zero1hd.rhythmbullet.audio.MusicInfoController; -import zero1hd.rhythmbullet.audio.MusicListController; -import zero1hd.rhythmbullet.graphics.ui.components.MusicSelectable; -import zero1hd.rhythmbullet.graphics.ui.components.ScrollText; +import zero1hd.rhythmbullet.desktop.audio.MusicInfoController; +import zero1hd.rhythmbullet.desktop.audio.MusicListController; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.MusicSelectable; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.ScrollText; +import zero1hd.rhythmbullet.util.MusicManager; public class MusicSelectionPage extends Page implements Observer { Preferences musicFileAnnotation; @@ -65,7 +65,7 @@ public class MusicSelectionPage extends Page implements Observer { private int uiSongInfoCount; private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer; - public MusicSelectionPage(Skin skin, MusicListController musicListController, AssetManager assetManager, Vector3 cameraTarget, AnalysisPage ap) { + public MusicSelectionPage(Skin skin, MusicListController musicListController, AssetManager assetManager, final Vector3 cameraTarget, final AnalysisPage ap) { setTextureBackground(assetManager.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); this.assets = assetManager; this.skin = skin; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicStatusPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicStatusPage.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicStatusPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicStatusPage.java index b67eb1e..4df048f 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicStatusPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicStatusPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.Actor; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/OptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java similarity index 90% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/OptionsPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java index f923d00..28e3b8d 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/OptionsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.TextureAtlas; @@ -14,8 +14,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.audio.MusicListController; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.audio.MusicListController; public class OptionsPage extends Page { Table optionsTable; @@ -24,7 +24,7 @@ public class OptionsPage extends Page { private TextField directoryField; private float musicSearchTimer; - public OptionsPage(RhythmBullet core, Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, MusicListController sc) { + public OptionsPage(final RhythmBullet core, final Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, final MusicListController sc) { super("General", core.getDefaultSkin()); setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); //Back button @@ -84,7 +84,7 @@ public class OptionsPage extends Page { Label musicDirectoryLabel = new Label("Music Directory: ", core.getDefaultSkin()); optionsTable.add(musicDirectoryLabel); - Label songCount = new Label("Songs: " + sc.getMusicList().getTotal(), core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default")); + final Label songCount = new Label("Songs: " + sc.getMusicList().getTotal(), core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default")); directoryField = new TextField(null, core.getDefaultSkin() ) { @Override public void act(float delta) { diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/Page.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/Page.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/Page.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/Page.java index fb436a5..9adf101 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/Page.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/Page.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.Batch; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/StatPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/StatPage.java similarity index 93% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/StatPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/StatPage.java index 63446e6..8fafa91 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/StatPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/StatPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Skin; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/VideoOptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java similarity index 81% rename from core/src/zero1hd/rhythmbullet/graphics/ui/pages/VideoOptionsPage.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java index 0427ad8..bc96402 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/VideoOptionsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.pages; +package zero1hd.rhythmbullet.desktop.graphics.ui.pages; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.assets.AssetManager; @@ -10,15 +10,15 @@ import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import zero1hd.rhythmbullet.graphics.ui.components.GraphicsOptions; -import zero1hd.rhythmbullet.screens.MainMenu; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.GraphicsOptions; +import zero1hd.rhythmbullet.desktop.screens.MainMenu; public class VideoOptionsPage extends Page { private ScrollPane scrollPane; private GraphicsOptions graphicsTable; private TextButton backButton; - public VideoOptionsPage(Skin skin, Preferences prefs, MainMenu menu, AssetManager assets) { + public VideoOptionsPage(Skin skin, Preferences prefs, final MainMenu menu, AssetManager assets) { setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); graphicsTable = new GraphicsOptions(menu, skin, prefs); scrollPane = new ScrollPane(graphicsTable, skin); diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/BeatViewer.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/BeatViewer.java similarity index 97% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/BeatViewer.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/BeatViewer.java index 9b5c3bc..bb9842c 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/BeatViewer.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/BeatViewer.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap.Format; @@ -10,7 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup; import com.badlogic.gdx.scenes.scene2d.ui.Window; import zero1hd.rhythmbullet.audio.AudioDataPackage; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class BeatViewer extends Window { Pixmap lights; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/DifficultyWindow.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/DifficultyWindow.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/DifficultyWindow.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/DifficultyWindow.java index 2aea744..cf910b8 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/DifficultyWindow.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/DifficultyWindow.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.ui.Label; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/FPSWindow.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/FPSWindow.java similarity index 87% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/FPSWindow.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/FPSWindow.java index 6fe0d13..a6b72e8 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/FPSWindow.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/FPSWindow.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.ui.Label; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/LoadingWindow.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/LoadingWindow.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/LoadingWindow.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/LoadingWindow.java index 83665a9..674153d 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/LoadingWindow.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/LoadingWindow.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.audio.Sound; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/NoticeWindow.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/NoticeWindow.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/NoticeWindow.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/NoticeWindow.java index cdf9866..cb3f443 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/NoticeWindow.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/NoticeWindow.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.audio.Sound; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/PauseMenu.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/PauseMenu.java similarity index 89% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/PauseMenu.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/PauseMenu.java index 757e9d0..c7764f8 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/PauseMenu.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/PauseMenu.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Skin; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/Spawnables.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/Spawnables.java similarity index 87% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/Spawnables.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/Spawnables.java index f08137e..7077935 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/Spawnables.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/Spawnables.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; import com.badlogic.gdx.scenes.scene2d.ui.Skin; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/SpawnerWindow.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/SpawnerWindow.java similarity index 80% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/SpawnerWindow.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/SpawnerWindow.java index 12d5f92..344de2c 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/SpawnerWindow.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/SpawnerWindow.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; @@ -11,17 +11,17 @@ import com.badlogic.gdx.scenes.scene2d.ui.Slider; import com.badlogic.gdx.scenes.scene2d.ui.Window; import com.badlogic.gdx.utils.Array; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.EntityFrame; -import zero1hd.rhythmbullet.entity.EntityManager; -import zero1hd.rhythmbullet.entity.ally.Laser; -import zero1hd.rhythmbullet.entity.coordinator.Coordinator; -import zero1hd.rhythmbullet.entity.coordinator.CoordinatorFrame; -import zero1hd.rhythmbullet.entity.coordinator.CoordinatorManager; -import zero1hd.rhythmbullet.entity.enemies.Flake; -import zero1hd.rhythmbullet.entity.enemies.Pellet; -import zero1hd.rhythmbullet.entity.enemies.Shard; -import zero1hd.rhythmbullet.entity.enemies.VoidCircle; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.EntityFrame; +import zero1hd.rhythmbullet.desktop.entity.EntityManager; +import zero1hd.rhythmbullet.desktop.entity.ally.Laser; +import zero1hd.rhythmbullet.desktop.entity.coordinator.Coordinator; +import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorFrame; +import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorManager; +import zero1hd.rhythmbullet.desktop.entity.enemies.Flake; +import zero1hd.rhythmbullet.desktop.entity.enemies.Pellet; +import zero1hd.rhythmbullet.desktop.entity.enemies.Shard; +import zero1hd.rhythmbullet.desktop.entity.enemies.VoidCircle; public class SpawnerWindow extends Window { private Stage stage; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/VolumeWindow.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/VolumeWindow.java similarity index 93% rename from core/src/zero1hd/rhythmbullet/graphics/ui/windows/VolumeWindow.java rename to desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/VolumeWindow.java index a42cbd1..0929351 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/windows/VolumeWindow.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/windows/VolumeWindow.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.graphics.ui.windows; +package zero1hd.rhythmbullet.desktop.graphics.ui.windows; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.math.MathUtils; @@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Slider; import com.badlogic.gdx.scenes.scene2d.ui.Window; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import zero1hd.rhythmbullet.audio.MusicManager; +import zero1hd.rhythmbullet.util.MusicManager; public class VolumeWindow extends Window { diff --git a/core/src/zero1hd/rhythmbullet/screens/EndScreen.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/EndScreen.java similarity index 68% rename from core/src/zero1hd/rhythmbullet/screens/EndScreen.java rename to desktop/src/zero1hd/rhythmbullet/desktop/screens/EndScreen.java index a397c93..5e8e43e 100755 --- a/core/src/zero1hd/rhythmbullet/screens/EndScreen.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/EndScreen.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.screens; +package zero1hd.rhythmbullet.desktop.screens; import com.badlogic.gdx.ScreenAdapter; diff --git a/core/src/zero1hd/rhythmbullet/screens/GameScreen.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/GameScreen.java similarity index 93% rename from core/src/zero1hd/rhythmbullet/screens/GameScreen.java rename to desktop/src/zero1hd/rhythmbullet/desktop/screens/GameScreen.java index e883a94..492872c 100755 --- a/core/src/zero1hd/rhythmbullet/screens/GameScreen.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/GameScreen.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.screens; +package zero1hd.rhythmbullet.desktop.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputMultiplexer; @@ -16,11 +16,11 @@ import com.badlogic.gdx.scenes.scene2d.ui.ImageButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.utils.viewport.ScreenViewport; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.audio.MusicManager; -import zero1hd.rhythmbullet.audio.map.GamePlayMap; -import zero1hd.rhythmbullet.stages.GameHUD; -import zero1hd.rhythmbullet.stages.GamePlayArea; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.audio.map.GamePlayMap; +import zero1hd.rhythmbullet.desktop.stages.GameHUD; +import zero1hd.rhythmbullet.desktop.stages.GamePlayArea; +import zero1hd.rhythmbullet.util.MusicManager; public class GameScreen extends ScreenAdapter { diff --git a/core/src/zero1hd/rhythmbullet/screens/LoadingScreen.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/LoadingScreen.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/screens/LoadingScreen.java rename to desktop/src/zero1hd/rhythmbullet/desktop/screens/LoadingScreen.java index 11e7161..a21ca1e 100755 --- a/core/src/zero1hd/rhythmbullet/screens/LoadingScreen.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/LoadingScreen.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.screens; +package zero1hd.rhythmbullet.desktop.screens; import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.Gdx; @@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions; import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.utils.viewport.ScreenViewport; -import zero1hd.rhythmbullet.RhythmBullet; +import zero1hd.rhythmbullet.desktop.RhythmBullet; public class LoadingScreen extends ScreenAdapter implements ApplicationListener { private Stage stage; diff --git a/core/src/zero1hd/rhythmbullet/screens/MainMenu.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java similarity index 94% rename from core/src/zero1hd/rhythmbullet/screens/MainMenu.java rename to desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java index 7528be3..5913622 100755 --- a/core/src/zero1hd/rhythmbullet/screens/MainMenu.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.screens; +package zero1hd.rhythmbullet.desktop.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; @@ -18,16 +18,16 @@ import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.ScreenViewport; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.audio.MusicList; -import zero1hd.rhythmbullet.audio.MusicListController; -import zero1hd.rhythmbullet.graphics.ui.pages.AnalysisPage; -import zero1hd.rhythmbullet.graphics.ui.pages.CreditsPage; -import zero1hd.rhythmbullet.graphics.ui.pages.KeybindOptionsPage; -import zero1hd.rhythmbullet.graphics.ui.pages.MainPage; -import zero1hd.rhythmbullet.graphics.ui.pages.MusicSelectionPage; -import zero1hd.rhythmbullet.graphics.ui.pages.OptionsPage; -import zero1hd.rhythmbullet.graphics.ui.pages.VideoOptionsPage; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.audio.MusicList; +import zero1hd.rhythmbullet.desktop.audio.MusicListController; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.AnalysisPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.CreditsPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.KeybindOptionsPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MainPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MusicSelectionPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.OptionsPage; +import zero1hd.rhythmbullet.desktop.graphics.ui.pages.VideoOptionsPage; import zero1hd.rhythmbullet.util.TransitionAdapter; public class MainMenu extends ScreenAdapter implements TransitionAdapter { diff --git a/core/src/zero1hd/rhythmbullet/stages/GameHUD.java b/desktop/src/zero1hd/rhythmbullet/desktop/stages/GameHUD.java similarity index 92% rename from core/src/zero1hd/rhythmbullet/stages/GameHUD.java rename to desktop/src/zero1hd/rhythmbullet/desktop/stages/GameHUD.java index 0527417..7c88886 100755 --- a/core/src/zero1hd/rhythmbullet/stages/GameHUD.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/stages/GameHUD.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.stages; +package zero1hd.rhythmbullet.desktop.stages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; @@ -17,11 +17,11 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.audio.MusicManager; -import zero1hd.rhythmbullet.graphics.ui.components.HealthBar; -import zero1hd.rhythmbullet.graphics.ui.windows.FPSWindow; -import zero1hd.rhythmbullet.graphics.ui.windows.PauseMenu; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.graphics.ui.components.HealthBar; +import zero1hd.rhythmbullet.desktop.graphics.ui.windows.FPSWindow; +import zero1hd.rhythmbullet.desktop.graphics.ui.windows.PauseMenu; +import zero1hd.rhythmbullet.util.MusicManager; import zero1hd.rhythmbullet.util.ScoreManager; public class GameHUD extends Stage { diff --git a/core/src/zero1hd/rhythmbullet/stages/GamePlayArea.java b/desktop/src/zero1hd/rhythmbullet/desktop/stages/GamePlayArea.java similarity index 81% rename from core/src/zero1hd/rhythmbullet/stages/GamePlayArea.java rename to desktop/src/zero1hd/rhythmbullet/desktop/stages/GamePlayArea.java index 3a66881..c55a493 100755 --- a/core/src/zero1hd/rhythmbullet/stages/GamePlayArea.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/stages/GamePlayArea.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.stages; +package zero1hd.rhythmbullet.desktop.stages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; @@ -6,17 +6,17 @@ import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.utils.viewport.FitViewport; -import zero1hd.rhythmbullet.RhythmBullet; -import zero1hd.rhythmbullet.audio.map.EntitySpawnInfo; -import zero1hd.rhythmbullet.audio.map.GamePlayMap; -import zero1hd.rhythmbullet.audio.map.MapWindowData; import zero1hd.rhythmbullet.controls.KeyMap; -import zero1hd.rhythmbullet.entity.CollisionDetector; -import zero1hd.rhythmbullet.entity.Entity; -import zero1hd.rhythmbullet.entity.EntityManager; -import zero1hd.rhythmbullet.entity.ally.Laser; -import zero1hd.rhythmbullet.entity.ally.PolyjetEntity; -import zero1hd.rhythmbullet.entity.coordinator.CoordinatorManager; +import zero1hd.rhythmbullet.desktop.RhythmBullet; +import zero1hd.rhythmbullet.desktop.audio.map.EntitySpawnInfo; +import zero1hd.rhythmbullet.desktop.audio.map.GamePlayMap; +import zero1hd.rhythmbullet.desktop.audio.map.MapWindowData; +import zero1hd.rhythmbullet.desktop.entity.CollisionDetector; +import zero1hd.rhythmbullet.desktop.entity.Entity; +import zero1hd.rhythmbullet.desktop.entity.EntityManager; +import zero1hd.rhythmbullet.desktop.entity.ally.Laser; +import zero1hd.rhythmbullet.desktop.entity.ally.PolyjetEntity; +import zero1hd.rhythmbullet.desktop.entity.coordinator.CoordinatorManager; import zero1hd.rhythmbullet.util.ScoreManager;