diff --git a/release/v5/rogue.exe b/release/v5/rogue.exe new file mode 100755 index 0000000..f2aa190 Binary files /dev/null and b/release/v5/rogue.exe differ diff --git a/release/v5/rogue.jar b/release/v5/rogue.jar new file mode 100755 index 0000000..8f966b4 Binary files /dev/null and b/release/v5/rogue.jar differ diff --git a/release/v5/rogue.sh b/release/v5/rogue.sh new file mode 100755 index 0000000..bf64013 Binary files /dev/null and b/release/v5/rogue.sh differ diff --git a/src/mightypork/gamecore/Config.java b/src/mightypork/gamecore/core/Config.java similarity index 99% rename from src/mightypork/gamecore/Config.java rename to src/mightypork/gamecore/core/Config.java index 1ab0a8c..dd085fe 100644 --- a/src/mightypork/gamecore/Config.java +++ b/src/mightypork/gamecore/core/Config.java @@ -1,4 +1,4 @@ -package mightypork.gamecore; +package mightypork.gamecore.core; import java.io.File; diff --git a/src/mightypork/gamecore/WorkDir.java b/src/mightypork/gamecore/core/WorkDir.java similarity index 98% rename from src/mightypork/gamecore/WorkDir.java rename to src/mightypork/gamecore/core/WorkDir.java index 50b9bdf..bd015cf 100644 --- a/src/mightypork/gamecore/WorkDir.java +++ b/src/mightypork/gamecore/core/WorkDir.java @@ -1,4 +1,4 @@ -package mightypork.gamecore; +package mightypork.gamecore.core; import java.io.File; diff --git a/src/mightypork/gamecore/core/events/MainLoopRequest.java b/src/mightypork/gamecore/core/events/MainLoopRequest.java index c6a9bae..64c3338 100644 --- a/src/mightypork/gamecore/core/events/MainLoopRequest.java +++ b/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; diff --git a/src/mightypork/gamecore/core/events/ShudownRequest.java b/src/mightypork/gamecore/core/events/ShudownRequest.java index 765313d..e7e19ff 100644 --- a/src/mightypork/gamecore/core/events/ShudownRequest.java +++ b/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; diff --git a/src/mightypork/gamecore/core/AppAccess.java b/src/mightypork/gamecore/core/modules/AppAccess.java similarity index 93% rename from src/mightypork/gamecore/core/AppAccess.java rename to src/mightypork/gamecore/core/modules/AppAccess.java index 1e354da..05faf43 100644 --- a/src/mightypork/gamecore/core/AppAccess.java +++ b/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; diff --git a/src/mightypork/gamecore/core/AppAccessAdapter.java b/src/mightypork/gamecore/core/modules/AppAccessAdapter.java similarity index 95% rename from src/mightypork/gamecore/core/AppAccessAdapter.java rename to src/mightypork/gamecore/core/modules/AppAccessAdapter.java index 6bb6ca0..faceb51 100644 --- a/src/mightypork/gamecore/core/AppAccessAdapter.java +++ b/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; diff --git a/src/mightypork/gamecore/core/AppModule.java b/src/mightypork/gamecore/core/modules/AppModule.java similarity index 95% rename from src/mightypork/gamecore/core/AppModule.java rename to src/mightypork/gamecore/core/modules/AppModule.java index 35e73bc..35cf15d 100644 --- a/src/mightypork/gamecore/core/AppModule.java +++ b/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; diff --git a/src/mightypork/gamecore/core/AppSubModule.java b/src/mightypork/gamecore/core/modules/AppSubModule.java similarity index 96% rename from src/mightypork/gamecore/core/AppSubModule.java rename to src/mightypork/gamecore/core/modules/AppSubModule.java index 8080966..5e91002 100644 --- a/src/mightypork/gamecore/core/AppSubModule.java +++ b/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; diff --git a/src/mightypork/gamecore/core/BaseApp.java b/src/mightypork/gamecore/core/modules/BaseApp.java similarity index 96% rename from src/mightypork/gamecore/core/BaseApp.java rename to src/mightypork/gamecore/core/modules/BaseApp.java index 4231d8f..464ee39 100644 --- a/src/mightypork/gamecore/core/BaseApp.java +++ b/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 = ""; diff --git a/src/mightypork/gamecore/core/MainLoop.java b/src/mightypork/gamecore/core/modules/MainLoop.java similarity index 98% rename from src/mightypork/gamecore/core/MainLoop.java rename to src/mightypork/gamecore/core/modules/MainLoop.java index 5c0abb5..fee41d4 100644 --- a/src/mightypork/gamecore/core/MainLoop.java +++ b/src/mightypork/gamecore/core/modules/MainLoop.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.core; +package mightypork.gamecore.core.modules; import java.util.Queue; diff --git a/src/mightypork/gamecore/gui/components/LayoutComponent.java b/src/mightypork/gamecore/gui/components/LayoutComponent.java index 47da70b..83acf49 100644 --- a/src/mightypork/gamecore/gui/components/LayoutComponent.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java b/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java index efcd1bc..8a6e5ab 100644 --- a/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java index 6183156..d00dbde 100644 --- a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java b/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java index e58714d..78cb207 100644 --- a/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java b/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java index e8f5d33..31f1cfe 100644 --- a/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/GridLayout.java b/src/mightypork/gamecore/gui/components/layout/GridLayout.java index 1389ee0..8eaed63 100644 --- a/src/mightypork/gamecore/gui/components/layout/GridLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/RowLayout.java b/src/mightypork/gamecore/gui/components/layout/RowLayout.java index 712f960..39b4d90 100644 --- a/src/mightypork/gamecore/gui/components/layout/RowLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java b/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java index 1d86803..6f55c08 100644 --- a/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/screens/LayeredScreen.java b/src/mightypork/gamecore/gui/screens/LayeredScreen.java index ef5acec..eeea5ff 100644 --- a/src/mightypork/gamecore/gui/screens/LayeredScreen.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/screens/Overlay.java b/src/mightypork/gamecore/gui/screens/Overlay.java index c746579..3d0f454 100644 --- a/src/mightypork/gamecore/gui/screens/Overlay.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index ae13816..c782f96 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java index 7fe605d..8c072a5 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java +++ b/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; diff --git a/src/mightypork/gamecore/gui/screens/impl/CrossfadeOverlay.java b/src/mightypork/gamecore/gui/screens/impl/CrossfadeOverlay.java index cebe0bc..0f881e5 100644 --- a/src/mightypork/gamecore/gui/screens/impl/CrossfadeOverlay.java +++ b/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; diff --git a/src/mightypork/gamecore/input/InputSystem.java b/src/mightypork/gamecore/input/InputSystem.java index 9c97f9e..1dbf690 100644 --- a/src/mightypork/gamecore/input/InputSystem.java +++ b/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; diff --git a/src/mightypork/gamecore/render/DisplaySystem.java b/src/mightypork/gamecore/render/DisplaySystem.java index 9a385ad..f6b0034 100644 --- a/src/mightypork/gamecore/render/DisplaySystem.java +++ b/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; diff --git a/src/mightypork/gamecore/render/TaskTakeScreenshot.java b/src/mightypork/gamecore/render/TaskTakeScreenshot.java index b709be9..4df222c 100644 --- a/src/mightypork/gamecore/render/TaskTakeScreenshot.java +++ b/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; diff --git a/src/mightypork/gamecore/resources/Res.java b/src/mightypork/gamecore/resources/Res.java index 9cd4b32..f9593b6 100644 --- a/src/mightypork/gamecore/resources/Res.java +++ b/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; diff --git a/src/mightypork/gamecore/resources/audio/SoundRegistry.java b/src/mightypork/gamecore/resources/audio/SoundRegistry.java index 7cef233..a7b3234 100644 --- a/src/mightypork/gamecore/resources/audio/SoundRegistry.java +++ b/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; diff --git a/src/mightypork/gamecore/resources/audio/SoundSystem.java b/src/mightypork/gamecore/resources/audio/SoundSystem.java index 0777be6..f49715f 100644 --- a/src/mightypork/gamecore/resources/audio/SoundSystem.java +++ b/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; diff --git a/src/mightypork/gamecore/resources/fonts/FontRegistry.java b/src/mightypork/gamecore/resources/fonts/FontRegistry.java index 099c4e4..5088439 100644 --- a/src/mightypork/gamecore/resources/fonts/FontRegistry.java +++ b/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; diff --git a/src/mightypork/gamecore/resources/textures/TextureRegistry.java b/src/mightypork/gamecore/resources/textures/TextureRegistry.java index c1872e7..08cb708 100644 --- a/src/mightypork/gamecore/resources/textures/TextureRegistry.java +++ b/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; diff --git a/src/mightypork/rogue/Launcher.java b/src/mightypork/rogue/Launcher.java index 6b0917a..9a3ca3b 100644 --- a/src/mightypork/rogue/Launcher.java +++ b/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; diff --git a/src/mightypork/rogue/RogueApp.java b/src/mightypork/rogue/RogueApp.java index b1d7eaa..aaac1ec 100644 --- a/src/mightypork/rogue/RogueApp.java +++ b/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(); + } } diff --git a/src/mightypork/rogue/RogueConfig.java b/src/mightypork/rogue/RogueConfig.java index 8351054..86e4f08 100644 --- a/src/mightypork/rogue/RogueConfig.java +++ b/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; diff --git a/src/mightypork/rogue/RogueKeys.java b/src/mightypork/rogue/RogueKeys.java index 023244b..3653007 100644 --- a/src/mightypork/rogue/RogueKeys.java +++ b/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 { diff --git a/src/mightypork/rogue/RogueRoutes.java b/src/mightypork/rogue/RogueRoutes.java index 2240e23..58cf09d 100644 --- a/src/mightypork/rogue/RogueRoutes.java +++ b/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 { diff --git a/src/mightypork/rogue/RogueStateManager.java b/src/mightypork/rogue/RogueStateManager.java index 74deede..25cdcc0 100644 --- a/src/mightypork/rogue/RogueStateManager.java +++ b/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; diff --git a/src/mightypork/rogue/screens/FpsOverlay.java b/src/mightypork/rogue/screens/FpsOverlay.java index 6526523..b338a48 100644 --- a/src/mightypork/rogue/screens/FpsOverlay.java +++ b/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; diff --git a/src/mightypork/rogue/screens/LoadingOverlay.java b/src/mightypork/rogue/screens/LoadingOverlay.java index 8e73c8c..25f43b7 100644 --- a/src/mightypork/rogue/screens/LoadingOverlay.java +++ b/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; diff --git a/src/mightypork/rogue/screens/RogueScreen.java b/src/mightypork/rogue/screens/RogueScreen.java index c7eb221..edb77d2 100644 --- a/src/mightypork/rogue/screens/RogueScreen.java +++ b/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; diff --git a/src/mightypork/rogue/screens/game/IngameNav.java b/src/mightypork/rogue/screens/game/IngameNav.java index d99ba89..2619064 100644 --- a/src/mightypork/rogue/screens/game/IngameNav.java +++ b/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; diff --git a/src/mightypork/rogue/screens/game/LayerAskSave.java b/src/mightypork/rogue/screens/game/LayerAskSave.java index c2a8f46..3a9c693 100644 --- a/src/mightypork/rogue/screens/game/LayerAskSave.java +++ b/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; diff --git a/src/mightypork/rogue/screens/game/LayerDeath.java b/src/mightypork/rogue/screens/game/LayerDeath.java index 94af2c0..c4cad34 100644 --- a/src/mightypork/rogue/screens/game/LayerDeath.java +++ b/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; diff --git a/src/mightypork/rogue/screens/game/LayerInv.java b/src/mightypork/rogue/screens/game/LayerInv.java index 9465513..5b241cb 100644 --- a/src/mightypork/rogue/screens/game/LayerInv.java +++ b/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; diff --git a/src/mightypork/rogue/screens/game/LayerWin.java b/src/mightypork/rogue/screens/game/LayerWin.java index e22a8df..0720fef 100644 --- a/src/mightypork/rogue/screens/game/LayerWin.java +++ b/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; diff --git a/src/mightypork/rogue/screens/game/ScreenGame.java b/src/mightypork/rogue/screens/game/ScreenGame.java index dc2c8ac..7f94139 100644 --- a/src/mightypork/rogue/screens/game/ScreenGame.java +++ b/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; diff --git a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java index 9638ccb..5f709dd 100644 --- a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java +++ b/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; diff --git a/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java b/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java index 689192d..182c8c7 100644 --- a/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java +++ b/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; diff --git a/src/mightypork/rogue/screens/select_world/WorldSlot.java b/src/mightypork/rogue/screens/select_world/WorldSlot.java index cbc3898..a4ef9b8 100644 --- a/src/mightypork/rogue/screens/select_world/WorldSlot.java +++ b/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; diff --git a/src/mightypork/rogue/screens/story/ScreenStory.java b/src/mightypork/rogue/screens/story/ScreenStory.java index 61e3114..cd47536 100644 --- a/src/mightypork/rogue/screens/story/ScreenStory.java +++ b/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; diff --git a/src/mightypork/rogue/world/gui/interaction/MIPKeyboard.java b/src/mightypork/rogue/world/gui/interaction/MIPKeyboard.java index 2d7a257..572daca 100644 --- a/src/mightypork/rogue/world/gui/interaction/MIPKeyboard.java +++ b/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;