package arrangement

src/mightypork/gamecore/audio/DeferredAudio.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.resources.sounds;
+package mightypork.gamecore.audio;
 
 
 import java.io.IOException;

src/mightypork/gamecore/audio/JointVolume.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.resources.sounds;
+package mightypork.gamecore.audio;
 
 
 import mightypork.utils.math.Calc;

src/mightypork/gamecore/audio/NullAudio.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.resources.sounds;
+package mightypork.gamecore.audio;
 
 
 import mightypork.gamecore.loading.NullResource;

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;
 
 

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;

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;
 
 

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;
 

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;
 

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;
 
 
 /**

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;
 
 
 /**

src/mightypork/gamecore/control/BusAccess.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore;
+package mightypork.gamecore.control;
 
 
 import mightypork.gamecore.control.bus.EventBus;

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;

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;

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;
 
 
 /**

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;
 
 

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;

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 {

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;
 
 

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;
 

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 {

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

src/mightypork/gamecore/render/fonts/Glyphs.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.resources.fonts;
+package mightypork.gamecore.render.fonts;
 
 
 /**

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;

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.*;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;