diff --git a/src/mightypork/gamecore/resources/sounds/DeferredAudio.java b/src/mightypork/gamecore/audio/DeferredAudio.java similarity index 99% rename from src/mightypork/gamecore/resources/sounds/DeferredAudio.java rename to src/mightypork/gamecore/audio/DeferredAudio.java index b97224d..d605b06 100644 --- a/src/mightypork/gamecore/resources/sounds/DeferredAudio.java +++ b/src/mightypork/gamecore/audio/DeferredAudio.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.sounds; +package mightypork.gamecore.audio; import java.io.IOException; diff --git a/src/mightypork/gamecore/resources/sounds/JointVolume.java b/src/mightypork/gamecore/audio/JointVolume.java similarity index 94% rename from src/mightypork/gamecore/resources/sounds/JointVolume.java rename to src/mightypork/gamecore/audio/JointVolume.java index 1ad34be..df8a344 100644 --- a/src/mightypork/gamecore/resources/sounds/JointVolume.java +++ b/src/mightypork/gamecore/audio/JointVolume.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.sounds; +package mightypork.gamecore.audio; import mightypork.utils.math.Calc; diff --git a/src/mightypork/gamecore/resources/sounds/NullAudio.java b/src/mightypork/gamecore/audio/NullAudio.java similarity index 89% rename from src/mightypork/gamecore/resources/sounds/NullAudio.java rename to src/mightypork/gamecore/audio/NullAudio.java index c39a6f4..c21fa77 100644 --- a/src/mightypork/gamecore/resources/sounds/NullAudio.java +++ b/src/mightypork/gamecore/audio/NullAudio.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.sounds; +package mightypork.gamecore.audio; import mightypork.gamecore.loading.NullResource; diff --git a/src/mightypork/gamecore/resources/sounds/SoundBank.java b/src/mightypork/gamecore/audio/SoundBank.java similarity index 89% rename from src/mightypork/gamecore/resources/sounds/SoundBank.java rename to src/mightypork/gamecore/audio/SoundBank.java index ada3998..dab2807 100644 --- a/src/mightypork/gamecore/resources/sounds/SoundBank.java +++ b/src/mightypork/gamecore/audio/SoundBank.java @@ -1,13 +1,13 @@ -package mightypork.gamecore.resources.sounds; +package mightypork.gamecore.audio; import java.util.HashMap; import java.util.Map; -import mightypork.gamecore.AppAccess; -import mightypork.gamecore.AppAdapter; -import mightypork.gamecore.resources.sounds.players.EffectPlayer; -import mightypork.gamecore.resources.sounds.players.LoopPlayer; +import mightypork.gamecore.audio.players.EffectPlayer; +import mightypork.gamecore.audio.players.LoopPlayer; +import mightypork.gamecore.control.AppAccess; +import mightypork.gamecore.control.AppAdapter; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/resources/sounds/SoundSystem.java b/src/mightypork/gamecore/audio/SoundSystem.java similarity index 95% rename from src/mightypork/gamecore/resources/sounds/SoundSystem.java rename to src/mightypork/gamecore/audio/SoundSystem.java index 9a4882a..5d7f626 100644 --- a/src/mightypork/gamecore/resources/sounds/SoundSystem.java +++ b/src/mightypork/gamecore/audio/SoundSystem.java @@ -1,16 +1,16 @@ -package mightypork.gamecore.resources.sounds; +package mightypork.gamecore.audio; import java.nio.FloatBuffer; import java.util.HashSet; import java.util.Set; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.audio.players.EffectPlayer; +import mightypork.gamecore.audio.players.LoopPlayer; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.Subsystem; import mightypork.gamecore.control.bus.events.ResourceLoadRequest; import mightypork.gamecore.control.interf.Updateable; -import mightypork.gamecore.resources.sounds.players.EffectPlayer; -import mightypork.gamecore.resources.sounds.players.LoopPlayer; import mightypork.utils.math.Calc.Buffers; import mightypork.utils.math.coord.Coord; import mightypork.utils.objects.Mutable; diff --git a/src/mightypork/gamecore/resources/sounds/players/BaseAudioPlayer.java b/src/mightypork/gamecore/audio/players/BaseAudioPlayer.java similarity index 92% rename from src/mightypork/gamecore/resources/sounds/players/BaseAudioPlayer.java rename to src/mightypork/gamecore/audio/players/BaseAudioPlayer.java index d681305..25af30c 100644 --- a/src/mightypork/gamecore/resources/sounds/players/BaseAudioPlayer.java +++ b/src/mightypork/gamecore/audio/players/BaseAudioPlayer.java @@ -1,8 +1,8 @@ -package mightypork.gamecore.resources.sounds.players; +package mightypork.gamecore.audio.players; +import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.control.interf.Destroyable; -import mightypork.gamecore.resources.sounds.DeferredAudio; import mightypork.utils.objects.Mutable; diff --git a/src/mightypork/gamecore/resources/sounds/players/EffectPlayer.java b/src/mightypork/gamecore/audio/players/EffectPlayer.java similarity index 86% rename from src/mightypork/gamecore/resources/sounds/players/EffectPlayer.java rename to src/mightypork/gamecore/audio/players/EffectPlayer.java index 09599fb..976d24b 100644 --- a/src/mightypork/gamecore/resources/sounds/players/EffectPlayer.java +++ b/src/mightypork/gamecore/audio/players/EffectPlayer.java @@ -1,7 +1,7 @@ -package mightypork.gamecore.resources.sounds.players; +package mightypork.gamecore.audio.players; -import mightypork.gamecore.resources.sounds.DeferredAudio; +import mightypork.gamecore.audio.DeferredAudio; import mightypork.utils.math.coord.Coord; import mightypork.utils.objects.Mutable; diff --git a/src/mightypork/gamecore/resources/sounds/players/LoopPlayer.java b/src/mightypork/gamecore/audio/players/LoopPlayer.java similarity index 95% rename from src/mightypork/gamecore/resources/sounds/players/LoopPlayer.java rename to src/mightypork/gamecore/audio/players/LoopPlayer.java index dd6d23a..9144f98 100644 --- a/src/mightypork/gamecore/resources/sounds/players/LoopPlayer.java +++ b/src/mightypork/gamecore/audio/players/LoopPlayer.java @@ -1,9 +1,9 @@ -package mightypork.gamecore.resources.sounds.players; +package mightypork.gamecore.audio.players; +import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.control.interf.Updateable; import mightypork.gamecore.control.timing.Pauseable; -import mightypork.gamecore.resources.sounds.DeferredAudio; import mightypork.utils.math.animation.AnimDouble; import mightypork.utils.objects.Mutable; diff --git a/src/mightypork/gamecore/AppAccess.java b/src/mightypork/gamecore/control/AppAccess.java similarity index 85% rename from src/mightypork/gamecore/AppAccess.java rename to src/mightypork/gamecore/control/AppAccess.java index 210378b..ae66463 100644 --- a/src/mightypork/gamecore/AppAccess.java +++ b/src/mightypork/gamecore/control/AppAccess.java @@ -1,9 +1,9 @@ -package mightypork.gamecore; +package mightypork.gamecore.control; +import mightypork.gamecore.audio.SoundSystem; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; -import mightypork.gamecore.resources.sounds.SoundSystem; /** diff --git a/src/mightypork/gamecore/AppAdapter.java b/src/mightypork/gamecore/control/AppAdapter.java similarity index 90% rename from src/mightypork/gamecore/AppAdapter.java rename to src/mightypork/gamecore/control/AppAdapter.java index 191dd0f..56afe3e 100644 --- a/src/mightypork/gamecore/AppAdapter.java +++ b/src/mightypork/gamecore/control/AppAdapter.java @@ -1,10 +1,10 @@ -package mightypork.gamecore; +package mightypork.gamecore.control; +import mightypork.gamecore.audio.SoundSystem; import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; -import mightypork.gamecore.resources.sounds.SoundSystem; /** diff --git a/src/mightypork/gamecore/BusAccess.java b/src/mightypork/gamecore/control/BusAccess.java similarity index 80% rename from src/mightypork/gamecore/BusAccess.java rename to src/mightypork/gamecore/control/BusAccess.java index 7f22310..1202b08 100644 --- a/src/mightypork/gamecore/BusAccess.java +++ b/src/mightypork/gamecore/control/BusAccess.java @@ -1,4 +1,4 @@ -package mightypork.gamecore; +package mightypork.gamecore.control; import mightypork.gamecore.control.bus.EventBus; diff --git a/src/mightypork/gamecore/control/ChildClient.java b/src/mightypork/gamecore/control/ChildClient.java index 2b5df8e..e6da963 100644 --- a/src/mightypork/gamecore/control/ChildClient.java +++ b/src/mightypork/gamecore/control/ChildClient.java @@ -5,7 +5,6 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import mightypork.gamecore.BusAccess; import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.control.bus.clients.DelegatingClient; import mightypork.gamecore.control.bus.clients.ToggleableClient; diff --git a/src/mightypork/gamecore/GameLoop.java b/src/mightypork/gamecore/control/GameLoop.java similarity index 93% rename from src/mightypork/gamecore/GameLoop.java rename to src/mightypork/gamecore/control/GameLoop.java index 3c39026..9990d6d 100644 --- a/src/mightypork/gamecore/GameLoop.java +++ b/src/mightypork/gamecore/control/GameLoop.java @@ -1,10 +1,9 @@ -package mightypork.gamecore; +package mightypork.gamecore.control; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import mightypork.gamecore.control.Subsystem; import mightypork.gamecore.control.bus.events.MainLoopTaskRequest; import mightypork.gamecore.control.bus.events.UpdateEvent; import mightypork.gamecore.control.timing.TimerDelta; diff --git a/src/mightypork/gamecore/control/Subsystem.java b/src/mightypork/gamecore/control/Subsystem.java index 0c5b1a5..5030d7f 100644 --- a/src/mightypork/gamecore/control/Subsystem.java +++ b/src/mightypork/gamecore/control/Subsystem.java @@ -1,10 +1,9 @@ package mightypork.gamecore.control; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.audio.SoundSystem; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; -import mightypork.gamecore.resources.sounds.SoundSystem; /** diff --git a/src/mightypork/gamecore/gui/renderers/ColumnHolder.java b/src/mightypork/gamecore/gui/renderers/ColumnHolder.java index e956998..684b8fc 100644 --- a/src/mightypork/gamecore/gui/renderers/ColumnHolder.java +++ b/src/mightypork/gamecore/gui/renderers/ColumnHolder.java @@ -2,7 +2,7 @@ package mightypork.gamecore.gui.renderers; import static mightypork.utils.math.constraints.ConstraintFactory.*; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.utils.math.constraints.RectConstraint; diff --git a/src/mightypork/gamecore/gui/renderers/ElementHolder.java b/src/mightypork/gamecore/gui/renderers/ElementHolder.java index 02b876d..0a3705a 100644 --- a/src/mightypork/gamecore/gui/renderers/ElementHolder.java +++ b/src/mightypork/gamecore/gui/renderers/ElementHolder.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.renderers; import java.util.LinkedList; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.ChildClient; import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.render.Renderable; diff --git a/src/mightypork/gamecore/gui/renderers/ImageRenderer.java b/src/mightypork/gamecore/gui/renderers/ImageRenderer.java index 98863db..6c23419 100644 --- a/src/mightypork/gamecore/gui/renderers/ImageRenderer.java +++ b/src/mightypork/gamecore/gui/renderers/ImageRenderer.java @@ -2,7 +2,7 @@ package mightypork.gamecore.gui.renderers; import mightypork.gamecore.render.Render; -import mightypork.gamecore.resources.textures.TxQuad; +import mightypork.gamecore.render.textures.TxQuad; public class ImageRenderer extends PluggableRenderer { diff --git a/src/mightypork/gamecore/gui/renderers/RowHolder.java b/src/mightypork/gamecore/gui/renderers/RowHolder.java index c9560ce..ab478ac 100644 --- a/src/mightypork/gamecore/gui/renderers/RowHolder.java +++ b/src/mightypork/gamecore/gui/renderers/RowHolder.java @@ -2,7 +2,7 @@ package mightypork.gamecore.gui.renderers; import static mightypork.utils.math.constraints.ConstraintFactory.*; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.utils.math.constraints.RectConstraint; diff --git a/src/mightypork/gamecore/gui/renderers/TextRenderer.java b/src/mightypork/gamecore/gui/renderers/TextRenderer.java index 3d7ef2f..bb0151f 100644 --- a/src/mightypork/gamecore/gui/renderers/TextRenderer.java +++ b/src/mightypork/gamecore/gui/renderers/TextRenderer.java @@ -1,8 +1,8 @@ package mightypork.gamecore.gui.renderers; -import mightypork.gamecore.resources.fonts.FontRenderer; -import mightypork.gamecore.resources.fonts.GLFont; +import mightypork.gamecore.render.fonts.FontRenderer; +import mightypork.gamecore.render.fonts.GLFont; import mightypork.utils.math.color.RGB; import mightypork.utils.math.coord.Coord; diff --git a/src/mightypork/gamecore/gui/screens/LayeredScreen.java b/src/mightypork/gamecore/gui/screens/LayeredScreen.java index 430a196..040d7f9 100644 --- a/src/mightypork/gamecore/gui/screens/LayeredScreen.java +++ b/src/mightypork/gamecore/gui/screens/LayeredScreen.java @@ -4,7 +4,7 @@ package mightypork.gamecore.gui.screens; import java.util.Collection; import java.util.LinkedList; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; public abstract class LayeredScreen extends Screen { diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index 9251ae8..8031810 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/src/mightypork/gamecore/gui/screens/Screen.java @@ -2,7 +2,7 @@ package mightypork.gamecore.gui.screens; import static org.lwjgl.opengl.GL11.*; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.Subsystem; import mightypork.gamecore.control.bus.events.ScreenChangeEvent; import mightypork.gamecore.control.interf.Destroyable; diff --git a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java index c6aa4ed..565c7d7 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java +++ b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.screens; import java.util.HashMap; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.Subsystem; import mightypork.gamecore.control.bus.events.ScreenRequestEvent; import mightypork.gamecore.render.Renderable; diff --git a/src/mightypork/gamecore/input/InputSystem.java b/src/mightypork/gamecore/input/InputSystem.java index affe4fc..53251c0 100644 --- a/src/mightypork/gamecore/input/InputSystem.java +++ b/src/mightypork/gamecore/input/InputSystem.java @@ -1,7 +1,7 @@ package mightypork.gamecore.input; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.Subsystem; import mightypork.gamecore.control.bus.events.KeyboardEvent; import mightypork.gamecore.control.bus.events.MouseButtonEvent; diff --git a/src/mightypork/gamecore/loading/AsyncResourceLoader.java b/src/mightypork/gamecore/loading/AsyncResourceLoader.java index e0269b8..4cb353c 100644 --- a/src/mightypork/gamecore/loading/AsyncResourceLoader.java +++ b/src/mightypork/gamecore/loading/AsyncResourceLoader.java @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; -import mightypork.gamecore.BusAccess; +import mightypork.gamecore.control.BusAccess; import mightypork.gamecore.control.bus.events.MainLoopTaskRequest; import mightypork.gamecore.control.bus.events.ResourceLoadRequest; import mightypork.gamecore.control.interf.Destroyable; diff --git a/src/mightypork/gamecore/render/DisplaySystem.java b/src/mightypork/gamecore/render/DisplaySystem.java index bf2cbf5..cf57366 100644 --- a/src/mightypork/gamecore/render/DisplaySystem.java +++ b/src/mightypork/gamecore/render/DisplaySystem.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; import javax.imageio.ImageIO; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.Subsystem; import mightypork.gamecore.control.bus.events.ScreenChangeEvent; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/render/Render.java b/src/mightypork/gamecore/render/Render.java index ee223de..7124ed6 100644 --- a/src/mightypork/gamecore/render/Render.java +++ b/src/mightypork/gamecore/render/Render.java @@ -5,7 +5,7 @@ import static org.lwjgl.opengl.GL11.*; import java.io.IOException; -import mightypork.gamecore.resources.textures.TxQuad; +import mightypork.gamecore.render.textures.TxQuad; import mightypork.utils.files.FileUtils; import mightypork.utils.logging.Log; import mightypork.utils.math.color.RGB; diff --git a/src/mightypork/gamecore/resources/fonts/DeferredFont.java b/src/mightypork/gamecore/render/fonts/DeferredFont.java similarity index 98% rename from src/mightypork/gamecore/resources/fonts/DeferredFont.java rename to src/mightypork/gamecore/render/fonts/DeferredFont.java index 9e41c3c..040c7a1 100644 --- a/src/mightypork/gamecore/resources/fonts/DeferredFont.java +++ b/src/mightypork/gamecore/render/fonts/DeferredFont.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import java.awt.Font; diff --git a/src/mightypork/gamecore/resources/fonts/DeferredFontNative.java b/src/mightypork/gamecore/render/fonts/DeferredFontNative.java similarity index 97% rename from src/mightypork/gamecore/resources/fonts/DeferredFontNative.java rename to src/mightypork/gamecore/render/fonts/DeferredFontNative.java index 52fb3b2..305d4ea 100644 --- a/src/mightypork/gamecore/resources/fonts/DeferredFontNative.java +++ b/src/mightypork/gamecore/render/fonts/DeferredFontNative.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import java.awt.Font; diff --git a/src/mightypork/gamecore/resources/fonts/FontBank.java b/src/mightypork/gamecore/render/fonts/FontBank.java similarity index 89% rename from src/mightypork/gamecore/resources/fonts/FontBank.java rename to src/mightypork/gamecore/render/fonts/FontBank.java index 5d12e28..4d5abae 100644 --- a/src/mightypork/gamecore/resources/fonts/FontBank.java +++ b/src/mightypork/gamecore/render/fonts/FontBank.java @@ -1,10 +1,10 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import java.util.HashMap; -import mightypork.gamecore.AppAccess; -import mightypork.gamecore.AppAdapter; +import mightypork.gamecore.control.AppAccess; +import mightypork.gamecore.control.AppAdapter; import mightypork.gamecore.control.bus.events.ResourceLoadRequest; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/resources/fonts/FontRenderer.java b/src/mightypork/gamecore/render/fonts/FontRenderer.java similarity index 95% rename from src/mightypork/gamecore/resources/fonts/FontRenderer.java rename to src/mightypork/gamecore/render/fonts/FontRenderer.java index e2415a3..04cafb4 100644 --- a/src/mightypork/gamecore/resources/fonts/FontRenderer.java +++ b/src/mightypork/gamecore/render/fonts/FontRenderer.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import mightypork.gamecore.render.Render; diff --git a/src/mightypork/gamecore/resources/fonts/GLFont.java b/src/mightypork/gamecore/render/fonts/GLFont.java similarity index 92% rename from src/mightypork/gamecore/resources/fonts/GLFont.java rename to src/mightypork/gamecore/render/fonts/GLFont.java index 779ee63..afbe46a 100644 --- a/src/mightypork/gamecore/resources/fonts/GLFont.java +++ b/src/mightypork/gamecore/render/fonts/GLFont.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import mightypork.utils.math.color.RGB; diff --git a/src/mightypork/gamecore/resources/fonts/Glyphs.java b/src/mightypork/gamecore/render/fonts/Glyphs.java similarity index 95% rename from src/mightypork/gamecore/resources/fonts/Glyphs.java rename to src/mightypork/gamecore/render/fonts/Glyphs.java index 7f1da30..ae920de 100644 --- a/src/mightypork/gamecore/resources/fonts/Glyphs.java +++ b/src/mightypork/gamecore/render/fonts/Glyphs.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; /** diff --git a/src/mightypork/gamecore/resources/fonts/NullFont.java b/src/mightypork/gamecore/render/fonts/NullFont.java similarity index 91% rename from src/mightypork/gamecore/resources/fonts/NullFont.java rename to src/mightypork/gamecore/render/fonts/NullFont.java index 2599caa..e40298f 100644 --- a/src/mightypork/gamecore/resources/fonts/NullFont.java +++ b/src/mightypork/gamecore/render/fonts/NullFont.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import mightypork.utils.math.color.RGB; diff --git a/src/mightypork/gamecore/resources/fonts/SlickFont.java b/src/mightypork/gamecore/render/fonts/SlickFont.java similarity index 97% rename from src/mightypork/gamecore/resources/fonts/SlickFont.java rename to src/mightypork/gamecore/render/fonts/SlickFont.java index 5acb81e..d77ef4a 100644 --- a/src/mightypork/gamecore/resources/fonts/SlickFont.java +++ b/src/mightypork/gamecore/render/fonts/SlickFont.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.fonts; +package mightypork.gamecore.render.fonts; import static org.lwjgl.opengl.GL11.*; diff --git a/src/mightypork/gamecore/resources/textures/DeferredTexture.java b/src/mightypork/gamecore/render/textures/DeferredTexture.java similarity index 98% rename from src/mightypork/gamecore/resources/textures/DeferredTexture.java rename to src/mightypork/gamecore/render/textures/DeferredTexture.java index aa456d2..61f9974 100644 --- a/src/mightypork/gamecore/resources/textures/DeferredTexture.java +++ b/src/mightypork/gamecore/render/textures/DeferredTexture.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.textures; +package mightypork.gamecore.render.textures; import mightypork.gamecore.loading.BaseDeferredResource; diff --git a/src/mightypork/gamecore/resources/textures/FilteredTexture.java b/src/mightypork/gamecore/render/textures/FilteredTexture.java similarity index 94% rename from src/mightypork/gamecore/resources/textures/FilteredTexture.java rename to src/mightypork/gamecore/render/textures/FilteredTexture.java index f6dcae5..7719207 100644 --- a/src/mightypork/gamecore/resources/textures/FilteredTexture.java +++ b/src/mightypork/gamecore/render/textures/FilteredTexture.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.textures; +package mightypork.gamecore.render.textures; import org.lwjgl.opengl.GL11; diff --git a/src/mightypork/gamecore/resources/textures/TextureBank.java b/src/mightypork/gamecore/render/textures/TextureBank.java similarity index 91% rename from src/mightypork/gamecore/resources/textures/TextureBank.java rename to src/mightypork/gamecore/render/textures/TextureBank.java index 60270b0..d48f6c3 100644 --- a/src/mightypork/gamecore/resources/textures/TextureBank.java +++ b/src/mightypork/gamecore/render/textures/TextureBank.java @@ -1,13 +1,13 @@ -package mightypork.gamecore.resources.textures; +package mightypork.gamecore.render.textures; import java.util.HashMap; -import mightypork.gamecore.AppAccess; -import mightypork.gamecore.AppAdapter; +import mightypork.gamecore.control.AppAccess; +import mightypork.gamecore.control.AppAdapter; import mightypork.gamecore.control.bus.events.ResourceLoadRequest; -import mightypork.gamecore.resources.textures.FilteredTexture.Filter; -import mightypork.gamecore.resources.textures.FilteredTexture.Wrap; +import mightypork.gamecore.render.textures.FilteredTexture.Filter; +import mightypork.gamecore.render.textures.FilteredTexture.Wrap; import mightypork.utils.math.coord.Rect; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/gamecore/resources/textures/TxQuad.java b/src/mightypork/gamecore/render/textures/TxQuad.java similarity index 97% rename from src/mightypork/gamecore/resources/textures/TxQuad.java rename to src/mightypork/gamecore/render/textures/TxQuad.java index 4bbcf4e..8f33540 100644 --- a/src/mightypork/gamecore/resources/textures/TxQuad.java +++ b/src/mightypork/gamecore/render/textures/TxQuad.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.resources.textures; +package mightypork.gamecore.render.textures; import mightypork.utils.math.coord.Rect; diff --git a/src/mightypork/rogue/App.java b/src/mightypork/rogue/App.java index 88cf1e6..2b143e7 100644 --- a/src/mightypork/rogue/App.java +++ b/src/mightypork/rogue/App.java @@ -9,9 +9,10 @@ import java.util.logging.Level; import javax.swing.JOptionPane; -import mightypork.gamecore.AppAccess; -import mightypork.gamecore.GameLoop; import mightypork.gamecore.SlickLogRedirector; +import mightypork.gamecore.audio.SoundSystem; +import mightypork.gamecore.control.AppAccess; +import mightypork.gamecore.control.GameLoop; import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.control.bus.events.*; import mightypork.gamecore.control.interf.Destroyable; @@ -21,7 +22,6 @@ import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.gamecore.render.DisplaySystem; -import mightypork.gamecore.resources.sounds.SoundSystem; import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest.RequestType; import mightypork.rogue.screens.test_bouncyboxes.ScreenTestBouncy; diff --git a/src/mightypork/rogue/MainLoop.java b/src/mightypork/rogue/MainLoop.java index e493e37..3654eae 100644 --- a/src/mightypork/rogue/MainLoop.java +++ b/src/mightypork/rogue/MainLoop.java @@ -1,7 +1,7 @@ package mightypork.rogue; -import mightypork.gamecore.GameLoop; +import mightypork.gamecore.control.GameLoop; import mightypork.gamecore.input.Action; import mightypork.gamecore.render.Renderable; import mightypork.rogue.events.ActionRequest; diff --git a/src/mightypork/rogue/Res.java b/src/mightypork/rogue/Res.java index 02cd3c7..d85053b 100644 --- a/src/mightypork/rogue/Res.java +++ b/src/mightypork/rogue/Res.java @@ -1,19 +1,19 @@ package mightypork.rogue; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.audio.SoundBank; +import mightypork.gamecore.audio.players.EffectPlayer; +import mightypork.gamecore.audio.players.LoopPlayer; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.loading.AsyncResourceLoader; -import mightypork.gamecore.resources.fonts.DeferredFont; -import mightypork.gamecore.resources.fonts.DeferredFont.FontStyle; -import mightypork.gamecore.resources.fonts.FontBank; -import mightypork.gamecore.resources.fonts.GLFont; -import mightypork.gamecore.resources.sounds.SoundBank; -import mightypork.gamecore.resources.sounds.players.EffectPlayer; -import mightypork.gamecore.resources.sounds.players.LoopPlayer; -import mightypork.gamecore.resources.textures.FilteredTexture.Filter; -import mightypork.gamecore.resources.textures.FilteredTexture.Wrap; -import mightypork.gamecore.resources.textures.TextureBank; -import mightypork.gamecore.resources.textures.TxQuad; +import mightypork.gamecore.render.fonts.DeferredFont; +import mightypork.gamecore.render.fonts.FontBank; +import mightypork.gamecore.render.fonts.GLFont; +import mightypork.gamecore.render.fonts.DeferredFont.FontStyle; +import mightypork.gamecore.render.textures.TextureBank; +import mightypork.gamecore.render.textures.TxQuad; +import mightypork.gamecore.render.textures.FilteredTexture.Filter; +import mightypork.gamecore.render.textures.FilteredTexture.Wrap; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java b/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java index f6159ed..82f0d51 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java @@ -1,7 +1,7 @@ package mightypork.rogue.screens.test_bouncyboxes; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.bus.events.ScreenRequestEvent; import mightypork.gamecore.gui.screens.LayeredScreen; import mightypork.gamecore.input.KeyStroke; diff --git a/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java b/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java index 6703dd9..eab4e59 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java +++ b/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java @@ -1,7 +1,7 @@ package mightypork.rogue.screens.test_cat_sound; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.bus.events.ScreenRequestEvent; import mightypork.gamecore.gui.screens.LayeredScreen; import mightypork.gamecore.input.KeyStroke; diff --git a/src/mightypork/rogue/screens/test_font/ScreenTestFont.java b/src/mightypork/rogue/screens/test_font/ScreenTestFont.java index 85de253..7c96349 100644 --- a/src/mightypork/rogue/screens/test_font/ScreenTestFont.java +++ b/src/mightypork/rogue/screens/test_font/ScreenTestFont.java @@ -1,9 +1,9 @@ package mightypork.rogue.screens.test_font; -import mightypork.gamecore.AppAccess; +import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.screens.Screen; -import mightypork.gamecore.resources.fonts.FontRenderer; +import mightypork.gamecore.render.fonts.FontRenderer; import mightypork.rogue.Res; import mightypork.utils.math.color.RGB; import mightypork.utils.math.coord.Coord;