reorganization; added v5 release binaries

src/mightypork/gamecore/core/Config.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore;
+package mightypork.gamecore.core;
 
 
 import java.io.File;

src/mightypork/gamecore/core/WorkDir.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore;
+package mightypork.gamecore.core;
 
 
 import java.io.File;

src/mightypork/gamecore/core/events/MainLoopRequest.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.core.events;
 
 
-import mightypork.gamecore.core.MainLoop;
+import mightypork.gamecore.core.modules.MainLoop;
 import mightypork.gamecore.eventbus.BusEvent;
 import mightypork.gamecore.eventbus.event_flags.SingleReceiverEvent;
 

src/mightypork/gamecore/core/events/ShudownRequest.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.core.events;
 
 
-import mightypork.gamecore.core.MainLoop;
+import mightypork.gamecore.core.modules.MainLoop;
 import mightypork.gamecore.eventbus.BusEvent;
 import mightypork.gamecore.eventbus.event_flags.NonConsumableEvent;
 import mightypork.gamecore.eventbus.event_flags.SingleReceiverEvent;

src/mightypork/gamecore/core/modules/AppAccess.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.core;
+package mightypork.gamecore.core.modules;
 
 
 import mightypork.gamecore.eventbus.BusAccess;

src/mightypork/gamecore/core/modules/AppAccessAdapter.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.core;
+package mightypork.gamecore.core.modules;
 
 
 import mightypork.gamecore.eventbus.EventBus;

src/mightypork/gamecore/core/modules/AppModule.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.core;
+package mightypork.gamecore.core.modules;
 
 
 import mightypork.gamecore.eventbus.clients.RootBusNode;

src/mightypork/gamecore/core/modules/AppSubModule.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.core;
+package mightypork.gamecore.core.modules;
 
 
 import mightypork.gamecore.eventbus.clients.BusNode;

src/mightypork/gamecore/core/modules/BaseApp.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.core;
+package mightypork.gamecore.core.modules;
 
 
 import java.io.File;
@@ -10,11 +10,11 @@ import java.util.logging.Level;
 
 import javax.swing.JOptionPane;
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.Config.ConfigSetup;
-import mightypork.gamecore.Config.KeySetup;
-import mightypork.gamecore.WorkDir;
-import mightypork.gamecore.WorkDir.RouteSetup;
+import mightypork.gamecore.core.Config;
+import mightypork.gamecore.core.WorkDir;
+import mightypork.gamecore.core.Config.ConfigSetup;
+import mightypork.gamecore.core.Config.KeySetup;
+import mightypork.gamecore.core.WorkDir.RouteSetup;
 import mightypork.gamecore.eventbus.EventBus;
 import mightypork.gamecore.eventbus.events.DestroyEvent;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
@@ -235,7 +235,7 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 		
 		// connect slickutil to the logger
 		org.newdawn.slick.util.Log.setLogSystem(new SlickLogRedirector(log));
-		logSystemInfo();
+		writeLogHeader();
 		
 		
 		Log.i("=== Starting initialization sequence ===");
@@ -316,7 +316,13 @@ public abstract class BaseApp implements AppAccess, UncaughtExceptionHandler {
 	}
 	
 	
-	private void logSystemInfo()
+	protected void writeLogHeader()
+	{
+		logSystemInfo();
+	}
+
+
+	protected void logSystemInfo()
 	{
 		String txt = "";
 		

src/mightypork/gamecore/core/modules/MainLoop.java

@@ -1,4 +1,4 @@
-package mightypork.gamecore.core;
+package mightypork.gamecore.core.modules;
 
 
 import java.util.Queue;

src/mightypork/gamecore/gui/components/LayoutComponent.java

@@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components;
 import java.util.Collection;
 import java.util.LinkedList;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppSubModule;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppSubModule;
 import mightypork.gamecore.eventbus.EventBus;
 import mightypork.gamecore.eventbus.clients.ClientHub;
 import mightypork.gamecore.input.InputSystem;

src/mightypork/gamecore/gui/components/layout/ColumnLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 

src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
 import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;

src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;

src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.AlignY;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;

src/mightypork/gamecore/gui/components/layout/GridLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.gui.components.LayoutComponent;
 import mightypork.gamecore.util.math.constraints.rect.builders.TiledRect;

src/mightypork/gamecore/gui/components/layout/RowLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.components.Component;
 import mightypork.gamecore.util.math.constraints.rect.proxy.RectBound;
 

src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.gui.components.layout.linear;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.DynamicWidthComponent;
 import mightypork.gamecore.gui.components.LayoutComponent;

src/mightypork/gamecore/gui/screens/LayeredScreen.java

@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.eventbus.clients.DelegatingClient;
 
 

src/mightypork/gamecore/gui/screens/Overlay.java

@@ -4,8 +4,8 @@ package mightypork.gamecore.gui.screens;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppSubModule;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppSubModule;
 import mightypork.gamecore.eventbus.events.Updateable;
 import mightypork.gamecore.gui.Enableable;
 import mightypork.gamecore.gui.Hideable;

src/mightypork/gamecore/gui/screens/Screen.java

@@ -1,8 +1,8 @@
 package mightypork.gamecore.gui.screens;
 
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppSubModule;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppSubModule;
 import mightypork.gamecore.gui.events.LayoutChangeEvent;
 import mightypork.gamecore.gui.events.LayoutChangeListener;
 import mightypork.gamecore.input.KeyBinder;

src/mightypork/gamecore/gui/screens/ScreenRegistry.java

@@ -6,8 +6,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeSet;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppModule;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppModule;
 import mightypork.gamecore.gui.events.LayoutChangeEvent;
 import mightypork.gamecore.gui.events.ScreenRequestListener;
 import mightypork.gamecore.logging.Log;

src/mightypork/gamecore/gui/screens/impl/CrossfadeOverlay.java

@@ -1,8 +1,8 @@
 package mightypork.gamecore.gui.screens.impl;
 
 
-import mightypork.gamecore.core.AppAccess;
 import mightypork.gamecore.core.events.ShudownRequest;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.components.painters.QuadPainter;
 import mightypork.gamecore.gui.events.ScreenRequest;
 import mightypork.gamecore.gui.screens.Overlay;

src/mightypork/gamecore/input/InputSystem.java

@@ -1,8 +1,8 @@
 package mightypork.gamecore.input;
 
 
-import mightypork.gamecore.core.AppAccess;
 import mightypork.gamecore.core.events.UserQuitRequest;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.eventbus.clients.RootBusNode;
 import mightypork.gamecore.eventbus.events.Updateable;
 import mightypork.gamecore.input.KeyStroke.Edge;

src/mightypork/gamecore/render/DisplaySystem.java

@@ -5,8 +5,8 @@ import static org.lwjgl.opengl.GL11.*;
 
 import java.nio.ByteBuffer;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppModule;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppModule;
 import mightypork.gamecore.logging.Log;
 import mightypork.gamecore.render.events.DisplayReadyEvent;
 import mightypork.gamecore.render.events.ViewportChangeEvent;

src/mightypork/gamecore/render/TaskTakeScreenshot.java

@@ -4,7 +4,7 @@ package mightypork.gamecore.render;
 import java.io.File;
 import java.io.IOException;
 
-import mightypork.gamecore.WorkDir;
+import mightypork.gamecore.core.WorkDir;
 import mightypork.gamecore.logging.Log;
 import mightypork.gamecore.util.Utils;
 

src/mightypork/gamecore/resources/Res.java

@@ -1,7 +1,7 @@
 package mightypork.gamecore.resources;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.resources.audio.SoundRegistry;
 import mightypork.gamecore.resources.audio.players.EffectPlayer;
 import mightypork.gamecore.resources.audio.players.LoopPlayer;

src/mightypork/gamecore/resources/audio/SoundRegistry.java

@@ -4,8 +4,8 @@ package mightypork.gamecore.resources.audio;
 import java.util.HashMap;
 import java.util.Map;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppAccessAdapter;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppAccessAdapter;
 import mightypork.gamecore.resources.audio.players.EffectPlayer;
 import mightypork.gamecore.resources.audio.players.LoopPlayer;
 

src/mightypork/gamecore/resources/audio/SoundSystem.java

@@ -5,7 +5,7 @@ import java.nio.FloatBuffer;
 import java.util.HashSet;
 import java.util.Set;
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.eventbus.clients.RootBusNode;
 import mightypork.gamecore.eventbus.events.Updateable;
 import mightypork.gamecore.logging.Log;

src/mightypork/gamecore/resources/fonts/FontRegistry.java

@@ -3,8 +3,8 @@ package mightypork.gamecore.resources.fonts;
 
 import java.util.HashMap;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppAccessAdapter;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppAccessAdapter;
 import mightypork.gamecore.resources.ResourceLoadRequest;
 import mightypork.gamecore.resources.fonts.impl.LazyFont;
 

src/mightypork/gamecore/resources/textures/TextureRegistry.java

@@ -4,8 +4,8 @@ package mightypork.gamecore.resources.textures;
 import java.util.HashMap;
 import java.util.Map;
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppAccessAdapter;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppAccessAdapter;
 import mightypork.gamecore.resources.ResourceLoadRequest;
 import mightypork.gamecore.util.error.KeyAlreadyExistsException;
 import mightypork.gamecore.util.math.constraints.rect.Rect;

src/mightypork/rogue/Launcher.java

@@ -4,7 +4,7 @@ package mightypork.rogue;
 import java.io.File;
 import java.util.logging.Level;
 
-import mightypork.gamecore.core.BaseApp;
+import mightypork.gamecore.core.modules.BaseApp;
 import mightypork.gamecore.util.files.OsUtils;
 
 

src/mightypork/rogue/RogueApp.java

@@ -3,15 +3,16 @@ package mightypork.rogue;
 
 import java.io.File;
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.core.BaseApp;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.core.events.MainLoopRequest;
 import mightypork.gamecore.core.events.ShudownRequest;
 import mightypork.gamecore.core.events.UserQuitRequest;
+import mightypork.gamecore.core.modules.BaseApp;
 import mightypork.gamecore.eventbus.BusEvent;
 import mightypork.gamecore.gui.screens.ScreenRegistry;
 import mightypork.gamecore.input.InputSystem;
 import mightypork.gamecore.input.KeyStroke.Edge;
+import mightypork.gamecore.logging.Log;
 import mightypork.gamecore.render.DisplaySystem;
 import mightypork.gamecore.render.events.FullscreenToggleRequest;
 import mightypork.gamecore.render.events.ScreenshotRequest;
@@ -163,4 +164,11 @@ public final class RogueApp extends BaseApp implements ViewportChangeListener, S
 		// screenshot sound
 		Res.getSoundEffect("gui.shutter").play(0.8);
 	}
+	
+	@Override
+	protected void writeLogHeader()
+	{
+		Log.i("## Starting Rogue v."+Const.VERSION+" ##");
+		super.writeLogHeader();
+	}
 }

src/mightypork/rogue/RogueConfig.java

@@ -1,7 +1,7 @@
 package mightypork.rogue;
 
 
-import mightypork.gamecore.Config.ConfigSetup;
+import mightypork.gamecore.core.Config.ConfigSetup;
 import mightypork.gamecore.util.files.config.PropertyManager;
 
 

src/mightypork/rogue/RogueKeys.java

@@ -1,8 +1,8 @@
 package mightypork.rogue;
 
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.Config.KeyOpts;
+import mightypork.gamecore.core.Config;
+import mightypork.gamecore.core.Config.KeyOpts;
 
 
 public class RogueKeys implements Config.KeySetup {

src/mightypork/rogue/RogueRoutes.java

@@ -1,8 +1,8 @@
 package mightypork.rogue;
 
 
-import mightypork.gamecore.WorkDir.RouteOpts;
-import mightypork.gamecore.WorkDir.RouteSetup;
+import mightypork.gamecore.core.WorkDir.RouteOpts;
+import mightypork.gamecore.core.WorkDir.RouteSetup;
 
 
 public class RogueRoutes implements RouteSetup {

src/mightypork/rogue/RogueStateManager.java

@@ -1,8 +1,8 @@
 package mightypork.rogue;
 
 
-import mightypork.gamecore.core.AppAccess;
-import mightypork.gamecore.core.AppModule;
+import mightypork.gamecore.core.modules.AppAccess;
+import mightypork.gamecore.core.modules.AppModule;
 import mightypork.gamecore.gui.screens.impl.CrossfadeRequest;
 import mightypork.gamecore.logging.Log;
 

src/mightypork/rogue/screens/FpsOverlay.java

@@ -1,8 +1,8 @@
 package mightypork.rogue.screens;
 
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.Config;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.painters.TextPainter;

src/mightypork/rogue/screens/LoadingOverlay.java

@@ -1,7 +1,7 @@
 package mightypork.rogue.screens;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.painters.QuadPainter;
 import mightypork.gamecore.gui.components.painters.TextPainter;

src/mightypork/rogue/screens/RogueScreen.java

@@ -1,9 +1,9 @@
 package mightypork.rogue.screens;
 
 
-import mightypork.gamecore.core.AppAccess;
 import mightypork.gamecore.core.events.UserQuitRequest;
 import mightypork.gamecore.core.events.UserQuitRequestListener;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.screens.LayeredScreen;
 import mightypork.gamecore.util.annot.DefaultImpl;
 import mightypork.rogue.RogueStateManager.RogueState;

src/mightypork/rogue/screens/game/IngameNav.java

@@ -1,7 +1,7 @@
 package mightypork.rogue.screens.game;
 
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.LayoutComponent;
 import mightypork.gamecore.gui.components.layout.FlowColumnLayout;

src/mightypork/rogue/screens/game/LayerAskSave.java

@@ -3,7 +3,7 @@ package mightypork.rogue.screens.game;
 
 import java.io.IOException;
 
-import mightypork.gamecore.Config;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.input.TextButton;

src/mightypork/rogue/screens/game/LayerDeath.java

@@ -3,7 +3,7 @@ package mightypork.rogue.screens.game;
 
 import java.io.IOException;
 
-import mightypork.gamecore.Config;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.input.TextButton;

src/mightypork/rogue/screens/game/LayerInv.java

@@ -1,7 +1,7 @@
 package mightypork.rogue.screens.game;
 
 
-import mightypork.gamecore.Config;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.layout.ConstraintLayout;
 import mightypork.gamecore.gui.components.layout.FlowColumnLayout;

src/mightypork/rogue/screens/game/LayerWin.java

@@ -3,7 +3,7 @@ package mightypork.rogue.screens.game;
 
 import java.io.File;
 
-import mightypork.gamecore.Config;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.input.TextButton;

src/mightypork/rogue/screens/game/ScreenGame.java

@@ -3,9 +3,9 @@ package mightypork.rogue.screens.game;
 
 import java.io.File;
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.core.events.UserQuitRequest;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.ActionGroup;
 import mightypork.gamecore.input.KeyStroke.Edge;

src/mightypork/rogue/screens/menu/ScreenMainMenu.java

@@ -1,9 +1,9 @@
 package mightypork.rogue.screens.menu;
 
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.core.events.UserQuitRequest;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.input.TextButton;

src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java

@@ -1,9 +1,9 @@
 package mightypork.rogue.screens.select_world;
 
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.WorkDir;
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.Config;
+import mightypork.gamecore.core.WorkDir;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.layout.RowLayout;
 import mightypork.gamecore.gui.components.painters.QuadPainter;

src/mightypork/rogue/screens/select_world/WorldSlot.java

@@ -4,7 +4,7 @@ package mightypork.rogue.screens.select_world;
 import java.io.File;
 import java.io.IOException;
 
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.input.TextButton;

src/mightypork/rogue/screens/story/ScreenStory.java

@@ -1,8 +1,8 @@
 package mightypork.rogue.screens.story;
 
 
-import mightypork.gamecore.Config;
-import mightypork.gamecore.core.AppAccess;
+import mightypork.gamecore.core.Config;
+import mightypork.gamecore.core.modules.AppAccess;
 import mightypork.gamecore.gui.Action;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.layout.RowLayout;

src/mightypork/rogue/world/gui/interaction/MIPKeyboard.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import mightypork.gamecore.Config;
+import mightypork.gamecore.core.Config;
 import mightypork.gamecore.eventbus.clients.DelegatingClient;
 import mightypork.gamecore.eventbus.events.Updateable;
 import mightypork.gamecore.input.InputSystem;