diff --git a/src/junk/AppInitOptions.java b/src/junk/AppInitOptions.java index 0069b38..25a6412 100644 --- a/src/junk/AppInitOptions.java +++ b/src/junk/AppInitOptions.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.logging.Level; import mightypork.gamecore.backend.Backend; -import mightypork.gamecore.config.ConfigSetup; -import mightypork.gamecore.config.KeySetup; import mightypork.gamecore.resources.AsyncResourceLoader; import mightypork.gamecore.resources.ResourceLoader; import mightypork.gamecore.resources.ResourceSetup; diff --git a/src/junk/BaseApp.java b/src/junk/BaseApp.java index c03bae5..1eb055f 100644 --- a/src/junk/BaseApp.java +++ b/src/junk/BaseApp.java @@ -3,20 +3,16 @@ package junk; import java.lang.Thread.UncaughtExceptionHandler; -import mightypork.gamecore.WorkDir; -import mightypork.gamecore.WorkDir.RouteSetup; import mightypork.gamecore.backend.Backend; -import mightypork.gamecore.config.Config; -import mightypork.gamecore.config.ConfigSetup; -import mightypork.gamecore.config.KeySetup; import mightypork.gamecore.core.App; import mightypork.gamecore.core.MainLoop; +import mightypork.gamecore.core.WorkDir; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.screens.ScreenRegistry; import mightypork.gamecore.gui.screens.impl.CrossfadeOverlay; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.resources.Res; import mightypork.gamecore.resources.ResourceSetup; -import mightypork.gamecore.resources.audio.SoundSystem; import mightypork.utils.logging.Log; diff --git a/src/junk/SoundSystem.java b/src/junk/SoundSystem.java index 89d34ae..da75ea4 100644 --- a/src/junk/SoundSystem.java +++ b/src/junk/SoundSystem.java @@ -1,4 +1,6 @@ package junk; + + //package mightypork.gamecore.resources.audio; // // diff --git a/src/mightypork/gamecore/backend/lwjgl/InitTaskRedirectSlickLog.java b/src/mightypork/gamecore/backend/lwjgl/InitTaskRedirectSlickLog.java index 3460791..e9a8f00 100644 --- a/src/mightypork/gamecore/backend/lwjgl/InitTaskRedirectSlickLog.java +++ b/src/mightypork/gamecore/backend/lwjgl/InitTaskRedirectSlickLog.java @@ -1,9 +1,7 @@ package mightypork.gamecore.backend.lwjgl; -import mightypork.gamecore.core.App; import mightypork.gamecore.core.InitTask; -import mightypork.gamecore.util.SlickLogRedirector; import mightypork.utils.logging.writers.LogWriter; diff --git a/src/mightypork/gamecore/backend/lwjgl/LwjglGraphicsModule.java b/src/mightypork/gamecore/backend/lwjgl/LwjglGraphicsModule.java index 2726ede..6a01cd4 100644 --- a/src/mightypork/gamecore/backend/lwjgl/LwjglGraphicsModule.java +++ b/src/mightypork/gamecore/backend/lwjgl/LwjglGraphicsModule.java @@ -7,14 +7,14 @@ import java.nio.ByteBuffer; import java.util.Stack; import mightypork.gamecore.core.App; -import mightypork.gamecore.render.Grad; +import mightypork.gamecore.gui.events.ViewportChangeEvent; import mightypork.gamecore.render.GraphicsModule; import mightypork.gamecore.render.Screenshot; -import mightypork.gamecore.render.events.ViewportChangeEvent; import mightypork.gamecore.resources.textures.DeferredTexture; import mightypork.gamecore.resources.textures.TxQuad; import mightypork.utils.logging.Log; import mightypork.utils.math.color.Color; +import mightypork.utils.math.color.Grad; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.rect.Rect; import mightypork.utils.math.constraints.rect.caching.RectDigest; diff --git a/src/mightypork/gamecore/backend/lwjgl/SlickAudio.java b/src/mightypork/gamecore/backend/lwjgl/SlickAudio.java index dc50084..4677c7e 100644 --- a/src/mightypork/gamecore/backend/lwjgl/SlickAudio.java +++ b/src/mightypork/gamecore/backend/lwjgl/SlickAudio.java @@ -6,6 +6,7 @@ import java.io.InputStream; import mightypork.gamecore.resources.audio.DeferredAudio; import mightypork.utils.files.FileUtil; + import org.lwjgl.openal.AL10; import org.newdawn.slick.openal.Audio; import org.newdawn.slick.openal.SoundStore; diff --git a/src/mightypork/gamecore/backend/lwjgl/SlickAudioModule.java b/src/mightypork/gamecore/backend/lwjgl/SlickAudioModule.java index 5cda940..c5148f2 100644 --- a/src/mightypork/gamecore/backend/lwjgl/SlickAudioModule.java +++ b/src/mightypork/gamecore/backend/lwjgl/SlickAudioModule.java @@ -3,10 +3,6 @@ package mightypork.gamecore.backend.lwjgl; import java.nio.FloatBuffer; -import org.lwjgl.openal.AL; -import org.lwjgl.openal.AL10; -import org.newdawn.slick.openal.SoundStore; - import mightypork.gamecore.resources.audio.AudioModule; import mightypork.gamecore.resources.audio.DeferredAudio; import mightypork.gamecore.util.BufferHelper; @@ -14,6 +10,10 @@ import mightypork.utils.logging.Log; import mightypork.utils.math.constraints.vect.Vect; import mightypork.utils.math.constraints.vect.var.VectVar; +import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; +import org.newdawn.slick.openal.SoundStore; + /** * SlickUtil-based audio module diff --git a/src/mightypork/gamecore/util/SlickLogRedirector.java b/src/mightypork/gamecore/backend/lwjgl/SlickLogRedirector.java similarity index 96% rename from src/mightypork/gamecore/util/SlickLogRedirector.java rename to src/mightypork/gamecore/backend/lwjgl/SlickLogRedirector.java index fe33d49..43d0757 100644 --- a/src/mightypork/gamecore/util/SlickLogRedirector.java +++ b/src/mightypork/gamecore/backend/lwjgl/SlickLogRedirector.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.util; +package mightypork.gamecore.backend.lwjgl; import java.util.logging.Level; diff --git a/src/mightypork/gamecore/core/App.java b/src/mightypork/gamecore/core/App.java index 0edb66c..afed20d 100644 --- a/src/mightypork/gamecore/core/App.java +++ b/src/mightypork/gamecore/core/App.java @@ -3,17 +3,14 @@ package mightypork.gamecore.core; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import mightypork.gamecore.backend.Backend; -import mightypork.gamecore.config.Config; -import mightypork.gamecore.plugins.AppPlugin; +import mightypork.gamecore.core.config.Config; +import mightypork.gamecore.core.plugins.AppPlugin; import mightypork.gamecore.render.GraphicsModule; import mightypork.gamecore.resources.audio.AudioModule; -import mightypork.utils.MapSort; -import mightypork.utils.Support; import mightypork.utils.annotations.Stub; import mightypork.utils.eventbus.EventBus; import mightypork.utils.eventbus.clients.BusNode; @@ -38,9 +35,6 @@ public class App extends BusNode { protected final DelegatingList plugins = new DelegatingList(); protected final List initializers = new ArrayList<>(); - // visible to Config init task. - final Map configs = new HashMap<>(); - /** * Create an app with given backend. @@ -90,7 +84,7 @@ public class App extends BusNode { * * @param initializer */ - public void addInitializer(InitTask initializer) + public void addInitTask(InitTask initializer) { if (started) { throw new IllegalStateException("App already started, cannot add initializers."); @@ -253,10 +247,6 @@ public class App extends BusNode { */ public static Config cfg(String alias) { - Config c = instance.configs.get(alias); - if (c == null) { - throw new IllegalArgumentException("There is no config with alias \"" + alias + "\""); - } - return c; + return Config.forAlias(alias); } } diff --git a/src/mightypork/gamecore/core/InitTaskDisplay.java b/src/mightypork/gamecore/core/InitTaskDisplay.java index 69059d4..b9b8fbc 100644 --- a/src/mightypork/gamecore/core/InitTaskDisplay.java +++ b/src/mightypork/gamecore/core/InitTaskDisplay.java @@ -87,8 +87,8 @@ public class InitTaskDisplay extends InitTask { gfx.createDisplay(); } - - + + @Override public String getName() { diff --git a/src/mightypork/gamecore/core/InitTaskIonizables.java b/src/mightypork/gamecore/core/InitTaskIonizables.java index 8ff453e..38ba10a 100644 --- a/src/mightypork/gamecore/core/InitTaskIonizables.java +++ b/src/mightypork/gamecore/core/InitTaskIonizables.java @@ -62,7 +62,8 @@ public class InitTaskIonizables extends InitTask { }); } - + + @Override public String getName() { diff --git a/src/mightypork/gamecore/core/InitTaskLog.java b/src/mightypork/gamecore/core/InitTaskLog.java index 03040d0..903ba63 100644 --- a/src/mightypork/gamecore/core/InitTaskLog.java +++ b/src/mightypork/gamecore/core/InitTaskLog.java @@ -4,8 +4,6 @@ package mightypork.gamecore.core; import java.io.File; import java.util.logging.Level; -import mightypork.gamecore.WorkDir; -import mightypork.utils.files.FileUtil; import mightypork.utils.logging.Log; import mightypork.utils.logging.writers.LogWriter; import mightypork.utils.string.StringUtil; diff --git a/src/mightypork/gamecore/core/InitTaskLogHeader.java b/src/mightypork/gamecore/core/InitTaskLogHeader.java index a422587..4b9161d 100644 --- a/src/mightypork/gamecore/core/InitTaskLogHeader.java +++ b/src/mightypork/gamecore/core/InitTaskLogHeader.java @@ -3,7 +3,6 @@ package mightypork.gamecore.core; import java.io.IOException; -import mightypork.gamecore.WorkDir; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/core/InitTaskWorkdir.java b/src/mightypork/gamecore/core/InitTaskWorkdir.java index 41fcb6b..8fdde07 100644 --- a/src/mightypork/gamecore/core/InitTaskWorkdir.java +++ b/src/mightypork/gamecore/core/InitTaskWorkdir.java @@ -8,7 +8,6 @@ import java.util.Map.Entry; import javax.swing.JOptionPane; -import mightypork.gamecore.WorkDir; import mightypork.utils.annotations.Stub; import mightypork.utils.files.InstanceLock; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/core/MainLoop.java b/src/mightypork/gamecore/core/MainLoop.java index b767138..7653ceb 100644 --- a/src/mightypork/gamecore/core/MainLoop.java +++ b/src/mightypork/gamecore/core/MainLoop.java @@ -28,7 +28,8 @@ public class MainLoop extends BusNode implements Destroyable { private final Deque tasks = new ConcurrentLinkedDeque<>(); private TimerDelta timer; private Renderable rootRenderable; - private volatile boolean running = true; + private volatile boolean running = true; + /** * Set primary renderable diff --git a/src/mightypork/gamecore/WorkDir.java b/src/mightypork/gamecore/core/WorkDir.java similarity index 97% rename from src/mightypork/gamecore/WorkDir.java rename to src/mightypork/gamecore/core/WorkDir.java index 43ad3ef..12bdf51 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/config/Config.java b/src/mightypork/gamecore/core/config/Config.java similarity index 85% rename from src/mightypork/gamecore/config/Config.java rename to src/mightypork/gamecore/core/config/Config.java index 7c06314..05a1d91 100644 --- a/src/mightypork/gamecore/config/Config.java +++ b/src/mightypork/gamecore/core/config/Config.java @@ -1,10 +1,10 @@ -package mightypork.gamecore.config; +package mightypork.gamecore.core.config; import java.util.HashMap; import java.util.Map; -import mightypork.gamecore.WorkDir; +import mightypork.gamecore.core.WorkDir; import mightypork.gamecore.input.KeyStroke; import mightypork.utils.config.propmgr.Property; import mightypork.utils.config.propmgr.PropertyManager; @@ -20,11 +20,47 @@ import mightypork.utils.logging.Log; */ public class Config { + protected static Map configs = new HashMap<>(); + private Map strokes = new HashMap<>(); private PropertyManager propertyManager; + /** + * Get a config from the static map, by given alias + * + * @param alias alias + * @return the config + */ + public static Config forAlias(String alias) + { + Config c = configs.get(alias); + + if (c == null) { + throw new IllegalArgumentException("There is no config with alias \"" + alias + "\""); + } + + return c; + } + + + /** + * Register a config by alias. + * + * @param alias config alias + * @param config the config + */ + public static void register(String alias, Config config) + { + if (configs.get(alias) != null) { + throw new IllegalArgumentException("The alias \"" + alias + "\" is already used."); + } + + configs.put(alias, config); + } + + /** * Initialize property manager for a file * diff --git a/src/mightypork/gamecore/core/InitTaskConfig.java b/src/mightypork/gamecore/core/config/InitTaskConfig.java similarity index 80% rename from src/mightypork/gamecore/core/InitTaskConfig.java rename to src/mightypork/gamecore/core/config/InitTaskConfig.java index 30e3d82..87bf139 100644 --- a/src/mightypork/gamecore/core/InitTaskConfig.java +++ b/src/mightypork/gamecore/core/config/InitTaskConfig.java @@ -1,7 +1,7 @@ -package mightypork.gamecore.core; +package mightypork.gamecore.core.config; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.InitTask; import mightypork.utils.annotations.Stub; import mightypork.utils.exceptions.IllegalValueException; @@ -23,11 +23,7 @@ public abstract class InitTaskConfig extends InitTask { */ protected void addConfig(String alias, Config config) { - if (app.configs.containsKey(alias)) { - throw new IllegalValueException("The alias is already used."); - } - - app.configs.put(alias, config); + Config.register(alias, config); } @@ -49,7 +45,7 @@ public abstract class InitTaskConfig extends InitTask { } - // locked uninitialized to encourage the use of the build* methods. + // locked to encourage the use of the build* methods. @Override public final void init() { diff --git a/src/mightypork/gamecore/config/KeyStrokeProperty.java b/src/mightypork/gamecore/core/config/KeyStrokeProperty.java similarity index 96% rename from src/mightypork/gamecore/config/KeyStrokeProperty.java rename to src/mightypork/gamecore/core/config/KeyStrokeProperty.java index 25a6a37..f4bc3d5 100644 --- a/src/mightypork/gamecore/config/KeyStrokeProperty.java +++ b/src/mightypork/gamecore/core/config/KeyStrokeProperty.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.config; +package mightypork.gamecore.core.config; import mightypork.gamecore.input.KeyStroke; diff --git a/src/mightypork/gamecore/plugins/AppPlugin.java b/src/mightypork/gamecore/core/plugins/AppPlugin.java similarity index 93% rename from src/mightypork/gamecore/plugins/AppPlugin.java rename to src/mightypork/gamecore/core/plugins/AppPlugin.java index 7f2bec6..ceb008e 100644 --- a/src/mightypork/gamecore/plugins/AppPlugin.java +++ b/src/mightypork/gamecore/core/plugins/AppPlugin.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.plugins; +package mightypork.gamecore.core.plugins; import mightypork.gamecore.core.App; diff --git a/src/mightypork/gamecore/plugins/screenshot/ScreenshotPlugin.java b/src/mightypork/gamecore/core/plugins/screenshot/ScreenshotPlugin.java similarity index 86% rename from src/mightypork/gamecore/plugins/screenshot/ScreenshotPlugin.java rename to src/mightypork/gamecore/core/plugins/screenshot/ScreenshotPlugin.java index 42da94a..bace456 100644 --- a/src/mightypork/gamecore/plugins/screenshot/ScreenshotPlugin.java +++ b/src/mightypork/gamecore/core/plugins/screenshot/ScreenshotPlugin.java @@ -1,9 +1,9 @@ -package mightypork.gamecore.plugins.screenshot; +package mightypork.gamecore.core.plugins.screenshot; import mightypork.gamecore.core.App; import mightypork.gamecore.core.events.MainLoopRequest; -import mightypork.gamecore.plugins.AppPlugin; +import mightypork.gamecore.core.plugins.AppPlugin; import mightypork.utils.Support; diff --git a/src/mightypork/gamecore/plugins/screenshot/ScreenshotRequest.java b/src/mightypork/gamecore/core/plugins/screenshot/ScreenshotRequest.java similarity index 87% rename from src/mightypork/gamecore/plugins/screenshot/ScreenshotRequest.java rename to src/mightypork/gamecore/core/plugins/screenshot/ScreenshotRequest.java index 8742979..be37967 100644 --- a/src/mightypork/gamecore/plugins/screenshot/ScreenshotRequest.java +++ b/src/mightypork/gamecore/core/plugins/screenshot/ScreenshotRequest.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.plugins.screenshot; +package mightypork.gamecore.core.plugins.screenshot; import mightypork.utils.eventbus.BusEvent; diff --git a/src/mightypork/gamecore/plugins/screenshot/TaskTakeScreenshot.java b/src/mightypork/gamecore/core/plugins/screenshot/TaskTakeScreenshot.java similarity index 95% rename from src/mightypork/gamecore/plugins/screenshot/TaskTakeScreenshot.java rename to src/mightypork/gamecore/core/plugins/screenshot/TaskTakeScreenshot.java index 61b2e4d..dd52551 100644 --- a/src/mightypork/gamecore/plugins/screenshot/TaskTakeScreenshot.java +++ b/src/mightypork/gamecore/core/plugins/screenshot/TaskTakeScreenshot.java @@ -1,11 +1,11 @@ -package mightypork.gamecore.plugins.screenshot; +package mightypork.gamecore.core.plugins.screenshot; import java.io.File; import java.io.IOException; -import mightypork.gamecore.WorkDir; import mightypork.gamecore.core.App; +import mightypork.gamecore.core.WorkDir; import mightypork.gamecore.render.Screenshot; import mightypork.utils.Support; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/gui/AlignX.java b/src/mightypork/gamecore/gui/AlignX.java deleted file mode 100644 index 3a55ca2..0000000 --- a/src/mightypork/gamecore/gui/AlignX.java +++ /dev/null @@ -1,12 +0,0 @@ -package mightypork.gamecore.gui; - - -/** - * Horizontal align sides - * - * @author Ondřej Hruška (MightyPork) - */ -public enum AlignX -{ - LEFT, CENTER, RIGHT; -} diff --git a/src/mightypork/gamecore/gui/AlignY.java b/src/mightypork/gamecore/gui/AlignY.java deleted file mode 100644 index b32a314..0000000 --- a/src/mightypork/gamecore/gui/AlignY.java +++ /dev/null @@ -1,12 +0,0 @@ -package mightypork.gamecore.gui; - - -/** - * Vertical align sides - * - * @author Ondřej Hruška (MightyPork) - */ -public enum AlignY -{ - TOP, CENTER, BOTTOM; -} diff --git a/src/mightypork/gamecore/gui/Hideable.java b/src/mightypork/gamecore/gui/Hideable.java deleted file mode 100644 index 00fe106..0000000 --- a/src/mightypork/gamecore/gui/Hideable.java +++ /dev/null @@ -1,15 +0,0 @@ -package mightypork.gamecore.gui; - - -/** - * Element that can be hidden or visible - * - * @author Ondřej Hruška (MightyPork) - */ -public interface Hideable { - - void setVisible(boolean yes); - - - boolean isVisible(); -} diff --git a/src/mightypork/gamecore/gui/components/Component.java b/src/mightypork/gamecore/gui/components/Component.java index 53820c8..2375efc 100644 --- a/src/mightypork/gamecore/gui/components/Component.java +++ b/src/mightypork/gamecore/gui/components/Component.java @@ -1,8 +1,8 @@ package mightypork.gamecore.gui.components; -import mightypork.gamecore.gui.Hideable; import mightypork.utils.interfaces.Enableable; +import mightypork.utils.interfaces.Hideable; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/gamecore/gui/components/input/TextButton.java b/src/mightypork/gamecore/gui/components/input/TextButton.java index e0dbb4b..e991055 100644 --- a/src/mightypork/gamecore/gui/components/input/TextButton.java +++ b/src/mightypork/gamecore/gui/components/input/TextButton.java @@ -1,11 +1,11 @@ package mightypork.gamecore.gui.components.input; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.DynamicWidthComponent; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.resources.fonts.IFont; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.Color; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.vect.Vect; diff --git a/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java b/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java index c93cb2a..2162170 100644 --- a/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java @@ -1,9 +1,9 @@ package mightypork.gamecore.gui.components.layout; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; +import mightypork.utils.math.AlignX; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; import mightypork.utils.math.constraints.rect.RectBound; @@ -22,7 +22,6 @@ public class FlowColumnLayout extends LayoutComponent { /** - * @param app app access * @param context context * @param elementWidth width of all elements * @param align component align. Legal values are LEFT and RIGHT. @@ -42,7 +41,6 @@ public class FlowColumnLayout extends LayoutComponent { * make a new holder.
* Context must be assigned before rendering. * - * @param app app access * @param elementWidth width of all elements * @param align component align. Legal values are LEFT and RIGHT. */ diff --git a/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java b/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java index f06b5da..580ca69 100644 --- a/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java @@ -1,9 +1,9 @@ package mightypork.gamecore.gui.components.layout; -import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; +import mightypork.utils.math.AlignY; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; import mightypork.utils.math.constraints.rect.RectBound; @@ -41,7 +41,6 @@ public class FlowRowLayout extends LayoutComponent { * make a new holder.
* Context must be assigned before rendering. * - * @param app app access * @param elementHeight height of all elements * @param align component align. Legal values are TOP and BOTTOM. */ diff --git a/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java b/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java index 7b32884..d97adb6 100644 --- a/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java @@ -1,10 +1,10 @@ package mightypork.gamecore.gui.components.layout.linear; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.DynamicWidthComponent; import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.LinearComponent; +import mightypork.utils.math.AlignX; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.num.batch.NumSum; import mightypork.utils.math.constraints.rect.RectBound; diff --git a/src/mightypork/gamecore/gui/components/painters/QuadPainter.java b/src/mightypork/gamecore/gui/components/painters/QuadPainter.java index 9ee1ace..57b9d13 100644 --- a/src/mightypork/gamecore/gui/components/painters/QuadPainter.java +++ b/src/mightypork/gamecore/gui/components/painters/QuadPainter.java @@ -3,9 +3,9 @@ package mightypork.gamecore.gui.components.painters; import mightypork.gamecore.core.App; import mightypork.gamecore.gui.components.BaseComponent; -import mightypork.gamecore.render.Grad; import mightypork.utils.annotations.FactoryMethod; import mightypork.utils.math.color.Color; +import mightypork.utils.math.color.Grad; /** diff --git a/src/mightypork/gamecore/gui/components/painters/TextPainter.java b/src/mightypork/gamecore/gui/components/painters/TextPainter.java index e9bd51f..645f322 100644 --- a/src/mightypork/gamecore/gui/components/painters/TextPainter.java +++ b/src/mightypork/gamecore/gui/components/painters/TextPainter.java @@ -2,11 +2,11 @@ package mightypork.gamecore.gui.components.painters; import mightypork.gamecore.core.App; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.BaseComponent; import mightypork.gamecore.gui.components.DynamicWidthComponent; import mightypork.gamecore.resources.fonts.FontRenderer; import mightypork.gamecore.resources.fonts.IFont; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.Color; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/gamecore/render/events/ViewportChangeEvent.java b/src/mightypork/gamecore/gui/events/ViewportChangeEvent.java similarity index 94% rename from src/mightypork/gamecore/render/events/ViewportChangeEvent.java rename to src/mightypork/gamecore/gui/events/ViewportChangeEvent.java index 8851451..b013926 100644 --- a/src/mightypork/gamecore/render/events/ViewportChangeEvent.java +++ b/src/mightypork/gamecore/gui/events/ViewportChangeEvent.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.render.events; +package mightypork.gamecore.gui.events; import mightypork.utils.eventbus.BusEvent; diff --git a/src/mightypork/gamecore/render/events/ViewportChangeListener.java b/src/mightypork/gamecore/gui/events/ViewportChangeListener.java similarity index 84% rename from src/mightypork/gamecore/render/events/ViewportChangeListener.java rename to src/mightypork/gamecore/gui/events/ViewportChangeListener.java index 393a7ed..078c177 100644 --- a/src/mightypork/gamecore/render/events/ViewportChangeListener.java +++ b/src/mightypork/gamecore/gui/events/ViewportChangeListener.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.render.events; +package mightypork.gamecore.gui.events; /** diff --git a/src/mightypork/gamecore/gui/screens/Overlay.java b/src/mightypork/gamecore/gui/screens/Overlay.java index a2b9a1a..95dca29 100644 --- a/src/mightypork/gamecore/gui/screens/Overlay.java +++ b/src/mightypork/gamecore/gui/screens/Overlay.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Collection; import mightypork.gamecore.core.App; -import mightypork.gamecore.gui.Hideable; import mightypork.gamecore.gui.components.layout.ConstraintLayout; import mightypork.gamecore.gui.events.LayoutChangeListener; import mightypork.gamecore.input.Edge; @@ -17,6 +16,7 @@ import mightypork.gamecore.render.Renderable; import mightypork.utils.annotations.Stub; import mightypork.utils.eventbus.clients.BusNode; import mightypork.utils.interfaces.Enableable; +import mightypork.utils.interfaces.Hideable; import mightypork.utils.interfaces.Updateable; import mightypork.utils.math.color.Color; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index 9764874..1672dbe 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/src/mightypork/gamecore/gui/screens/Screen.java @@ -28,9 +28,6 @@ public abstract class Screen extends BusNode implements Renderable, RectBound, K private volatile boolean needSetupViewport = false; - /** - * @param app app access - */ public Screen() { // disable events initially diff --git a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java index 6c3a217..5ce069a 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java +++ b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java @@ -9,9 +9,9 @@ import java.util.TreeSet; import mightypork.gamecore.core.App; import mightypork.gamecore.gui.events.LayoutChangeEvent; import mightypork.gamecore.gui.events.ScreenRequestListener; +import mightypork.gamecore.gui.events.ViewportChangeEvent; +import mightypork.gamecore.gui.events.ViewportChangeListener; import mightypork.gamecore.render.Renderable; -import mightypork.gamecore.render.events.ViewportChangeEvent; -import mightypork.gamecore.render.events.ViewportChangeListener; import mightypork.utils.eventbus.clients.BusNode; import mightypork.utils.logging.Log; diff --git a/src/mightypork/gamecore/input/Edge.java b/src/mightypork/gamecore/input/Edge.java index 7200eb8..ae96ebb 100644 --- a/src/mightypork/gamecore/input/Edge.java +++ b/src/mightypork/gamecore/input/Edge.java @@ -1,5 +1,6 @@ package mightypork.gamecore.input; + /** * Type of keystroke (falling / rising edge) */ @@ -9,4 +10,4 @@ public enum Edge FALLING, /** Activated by rising edge (release) */ RISING; -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/render/events/FullscreenToggleRequest.java b/src/mightypork/gamecore/render/FullscreenToggleRequest.java similarity index 76% rename from src/mightypork/gamecore/render/events/FullscreenToggleRequest.java rename to src/mightypork/gamecore/render/FullscreenToggleRequest.java index 4cd7c9e..65c034a 100644 --- a/src/mightypork/gamecore/render/events/FullscreenToggleRequest.java +++ b/src/mightypork/gamecore/render/FullscreenToggleRequest.java @@ -1,7 +1,6 @@ -package mightypork.gamecore.render.events; +package mightypork.gamecore.render; -import mightypork.gamecore.render.GraphicsModule; import mightypork.utils.eventbus.BusEvent; import mightypork.utils.eventbus.events.flags.SingleReceiverEvent; diff --git a/src/mightypork/gamecore/render/Grad.java b/src/mightypork/gamecore/render/Grad.java deleted file mode 100644 index 701eea5..0000000 --- a/src/mightypork/gamecore/render/Grad.java +++ /dev/null @@ -1,31 +0,0 @@ -package mightypork.gamecore.render; - - -import mightypork.utils.math.color.Color; - - -/** - * Linear gradient (each corner can have different color) - * - * @author MightyPork - */ -public class Grad { - - public final Color leftTop, rightTop, rightBottom, leftBottom; - - - /** - * Create a gradient - * - * @param leftTop left top color - * @param rightTop right top color - * @param rightBottom right bottom color - * @param leftBottom left bottom color - */ - public Grad(Color leftTop, Color rightTop, Color rightBottom, Color leftBottom) { - this.leftTop = leftTop; - this.rightTop = rightTop; - this.rightBottom = rightBottom; - this.leftBottom = leftBottom; - } -} diff --git a/src/mightypork/gamecore/render/GradH.java b/src/mightypork/gamecore/render/GradH.java deleted file mode 100644 index 3938582..0000000 --- a/src/mightypork/gamecore/render/GradH.java +++ /dev/null @@ -1,17 +0,0 @@ -package mightypork.gamecore.render; - - -import mightypork.utils.math.color.Color; - - -/** - * Linear horizontal gradient - * - * @author MightyPork - */ -public class GradH extends Grad { - - public GradH(Color left, Color right) { - super(left, right, right, left); - } -} diff --git a/src/mightypork/gamecore/render/GradV.java b/src/mightypork/gamecore/render/GradV.java deleted file mode 100644 index 40db53f..0000000 --- a/src/mightypork/gamecore/render/GradV.java +++ /dev/null @@ -1,17 +0,0 @@ -package mightypork.gamecore.render; - - -import mightypork.utils.math.color.Color; - - -/** - * Linear vertical gradient - * - * @author MightyPork - */ -public class GradV extends Grad { - - public GradV(Color top, Color bottom) { - super(top, top, bottom, bottom); - } -} diff --git a/src/mightypork/gamecore/render/GraphicsModule.java b/src/mightypork/gamecore/render/GraphicsModule.java index 1dbf8a5..0dec204 100644 --- a/src/mightypork/gamecore/render/GraphicsModule.java +++ b/src/mightypork/gamecore/render/GraphicsModule.java @@ -5,6 +5,7 @@ import mightypork.gamecore.backend.BackendModule; import mightypork.gamecore.resources.textures.DeferredTexture; import mightypork.gamecore.resources.textures.TxQuad; import mightypork.utils.math.color.Color; +import mightypork.utils.math.color.Grad; import mightypork.utils.math.constraints.rect.Rect; import mightypork.utils.math.constraints.vect.Vect; import mightypork.utils.math.constraints.vect.VectConst; diff --git a/src/mightypork/gamecore/resources/ResourceLoader.java b/src/mightypork/gamecore/resources/ResourceLoader.java index ff68f12..3da9475 100644 --- a/src/mightypork/gamecore/resources/ResourceLoader.java +++ b/src/mightypork/gamecore/resources/ResourceLoader.java @@ -1,8 +1,6 @@ package mightypork.gamecore.resources; - - /** * {@link ResourceLoadRequest} listener * diff --git a/src/mightypork/gamecore/resources/audio/AudioModule.java b/src/mightypork/gamecore/resources/audio/AudioModule.java index b8cb88c..c3420d8 100644 --- a/src/mightypork/gamecore/resources/audio/AudioModule.java +++ b/src/mightypork/gamecore/resources/audio/AudioModule.java @@ -4,17 +4,12 @@ package mightypork.gamecore.resources.audio; import java.util.ArrayList; import java.util.List; -import org.lwjgl.openal.AL; -import org.newdawn.slick.openal.SoundStore; - import mightypork.gamecore.backend.BackendModule; -import mightypork.gamecore.backend.lwjgl.SlickAudio; import mightypork.gamecore.core.App; import mightypork.gamecore.resources.ResourceLoadRequest; import mightypork.gamecore.resources.audio.players.EffectPlayer; import mightypork.gamecore.resources.audio.players.LoopPlayer; import mightypork.utils.interfaces.Updateable; -import mightypork.utils.logging.Log; import mightypork.utils.math.constraints.vect.Vect; diff --git a/src/mightypork/gamecore/resources/fonts/FontRenderer.java b/src/mightypork/gamecore/resources/fonts/FontRenderer.java index 29149ee..773f956 100644 --- a/src/mightypork/gamecore/resources/fonts/FontRenderer.java +++ b/src/mightypork/gamecore/resources/fonts/FontRenderer.java @@ -2,7 +2,7 @@ package mightypork.gamecore.resources.fonts; import mightypork.gamecore.core.App; -import mightypork.gamecore.gui.AlignX; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.Color; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/gamecore/resources/fonts/impl/TextureBackedFont.java b/src/mightypork/gamecore/resources/fonts/impl/TextureBackedFont.java index 0893d8c..82821fa 100644 --- a/src/mightypork/gamecore/resources/fonts/impl/TextureBackedFont.java +++ b/src/mightypork/gamecore/resources/fonts/impl/TextureBackedFont.java @@ -314,7 +314,7 @@ public class TextureBackedFont implements IFont { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - + final int filtering; switch (filter) { case NEAREST: @@ -398,7 +398,7 @@ public class TextureBackedFont implements IFont { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - + final int filtering; switch (filter) { case NEAREST: diff --git a/src/mightypork/rogue/RogueApp.java b/src/mightypork/rogue/RogueApp.java index 0ffb5a2..9501205 100644 --- a/src/mightypork/rogue/RogueApp.java +++ b/src/mightypork/rogue/RogueApp.java @@ -4,19 +4,18 @@ package mightypork.rogue; import junk.AppInitOptions; import junk.BaseApp; import mightypork.gamecore.backend.lwjgl.LwjglBackend; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.core.events.MainLoopRequest; import mightypork.gamecore.core.events.ShudownRequest; import mightypork.gamecore.core.events.UserQuitRequest; +import mightypork.gamecore.core.plugins.screenshot.ScreenshotRequest; +import mightypork.gamecore.gui.events.ViewportChangeEvent; +import mightypork.gamecore.gui.events.ViewportChangeListener; import mightypork.gamecore.gui.screens.ScreenRegistry; import mightypork.gamecore.input.Edge; import mightypork.gamecore.input.InputSystem; +import mightypork.gamecore.render.FullscreenToggleRequest; import mightypork.gamecore.render.GraphicsModule; -import mightypork.gamecore.render.events.FullscreenToggleRequest; -import mightypork.gamecore.render.events.ScreenshotRequest; -import mightypork.gamecore.render.events.ScreenshotRequestListener; -import mightypork.gamecore.render.events.ViewportChangeEvent; -import mightypork.gamecore.render.events.ViewportChangeListener; import mightypork.gamecore.resources.Res; import mightypork.rogue.RogueStateManager.RogueState; import mightypork.rogue.events.RogueStateRequest; diff --git a/src/mightypork/rogue/RogueConfig.java b/src/mightypork/rogue/RogueConfig.java index 6c78b82..805f5b0 100644 --- a/src/mightypork/rogue/RogueConfig.java +++ b/src/mightypork/rogue/RogueConfig.java @@ -1,7 +1,6 @@ package mightypork.rogue; -import mightypork.gamecore.config.ConfigSetup; import mightypork.utils.config.propmgr.PropertyManager; diff --git a/src/mightypork/rogue/RogueKeys.java b/src/mightypork/rogue/RogueKeys.java index 99d2e1d..66911f2 100644 --- a/src/mightypork/rogue/RogueKeys.java +++ b/src/mightypork/rogue/RogueKeys.java @@ -1,8 +1,6 @@ package mightypork.rogue; -import mightypork.gamecore.config.KeyOpts; -import mightypork.gamecore.config.KeySetup; public class RogueKeys implements KeySetup { diff --git a/src/mightypork/rogue/RogueRoutes.java b/src/mightypork/rogue/RogueRoutes.java index 2240e23..ac679db 100644 --- a/src/mightypork/rogue/RogueRoutes.java +++ b/src/mightypork/rogue/RogueRoutes.java @@ -1,8 +1,6 @@ package mightypork.rogue; -import mightypork.gamecore.WorkDir.RouteOpts; -import mightypork.gamecore.WorkDir.RouteSetup; public class RogueRoutes implements RouteSetup { diff --git a/src/mightypork/rogue/screens/FpsOverlay.java b/src/mightypork/rogue/screens/FpsOverlay.java index 5d4af6c..e00a98d 100644 --- a/src/mightypork/rogue/screens/FpsOverlay.java +++ b/src/mightypork/rogue/screens/FpsOverlay.java @@ -1,15 +1,15 @@ package mightypork.rogue.screens; -import mightypork.gamecore.config.Config; import mightypork.gamecore.core.App; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.gui.screens.Overlay; import mightypork.gamecore.input.Edge; import mightypork.gamecore.resources.Res; import mightypork.gamecore.resources.fonts.IFont; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.RectBound; diff --git a/src/mightypork/rogue/screens/LoadingOverlay.java b/src/mightypork/rogue/screens/LoadingOverlay.java index 176af1f..0d2df5d 100644 --- a/src/mightypork/rogue/screens/LoadingOverlay.java +++ b/src/mightypork/rogue/screens/LoadingOverlay.java @@ -1,12 +1,12 @@ package mightypork.rogue.screens; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.painters.QuadPainter; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.gui.screens.Overlay; import mightypork.gamecore.resources.Res; import mightypork.utils.Support; +import mightypork.utils.math.AlignX; import mightypork.utils.math.animation.Easing; import mightypork.utils.math.animation.NumAnimated; import mightypork.utils.math.color.pal.PAL16; diff --git a/src/mightypork/rogue/screens/game/HeartBar.java b/src/mightypork/rogue/screens/game/HeartBar.java index ab71eca..abe79a6 100644 --- a/src/mightypork/rogue/screens/game/HeartBar.java +++ b/src/mightypork/rogue/screens/game/HeartBar.java @@ -2,9 +2,9 @@ package mightypork.rogue.screens.game; import mightypork.gamecore.core.App; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.BaseComponent; import mightypork.gamecore.resources.textures.TxQuad; +import mightypork.utils.math.AlignX; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.num.var.NumVar; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/rogue/screens/game/IngameNav.java b/src/mightypork/rogue/screens/game/IngameNav.java index f622627..34ecaa7 100644 --- a/src/mightypork/rogue/screens/game/IngameNav.java +++ b/src/mightypork/rogue/screens/game/IngameNav.java @@ -2,11 +2,11 @@ package mightypork.rogue.screens.game; import mightypork.gamecore.core.App; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.layout.FlowColumnLayout; import mightypork.gamecore.resources.Res; import mightypork.gamecore.resources.textures.TxQuad; +import mightypork.utils.math.AlignX; import mightypork.utils.math.constraints.rect.Rect; import mightypork.utils.math.constraints.rect.RectBound; diff --git a/src/mightypork/rogue/screens/game/InvSlot.java b/src/mightypork/rogue/screens/game/InvSlot.java index c6bd29d..d18d117 100644 --- a/src/mightypork/rogue/screens/game/InvSlot.java +++ b/src/mightypork/rogue/screens/game/InvSlot.java @@ -3,7 +3,6 @@ package mightypork.rogue.screens.game; import mightypork.gamecore.core.App; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.input.ClickableComponent; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.resources.Res; @@ -13,6 +12,7 @@ import mightypork.rogue.world.WorldProvider; import mightypork.rogue.world.item.Item; import mightypork.rogue.world.item.ItemType; import mightypork.utils.Support; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.Color; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/rogue/screens/game/LayerAskSave.java b/src/mightypork/rogue/screens/game/LayerAskSave.java index bba80d5..e16e6c3 100644 --- a/src/mightypork/rogue/screens/game/LayerAskSave.java +++ b/src/mightypork/rogue/screens/game/LayerAskSave.java @@ -3,9 +3,8 @@ package mightypork.rogue.screens.game; import java.io.IOException; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.layout.RowLayout; import mightypork.gamecore.gui.components.layout.linear.LinearLayout; @@ -18,6 +17,7 @@ import mightypork.gamecore.resources.fonts.IFont; import mightypork.rogue.screens.game.ScreenGame.GScrState; import mightypork.rogue.world.WorldProvider; import mightypork.utils.logging.Log; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/rogue/screens/game/LayerDeath.java b/src/mightypork/rogue/screens/game/LayerDeath.java index ee2f008..6c236a9 100644 --- a/src/mightypork/rogue/screens/game/LayerDeath.java +++ b/src/mightypork/rogue/screens/game/LayerDeath.java @@ -3,9 +3,8 @@ package mightypork.rogue.screens.game; import java.io.IOException; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.layout.RowLayout; import mightypork.gamecore.gui.components.layout.linear.LinearGap; @@ -22,6 +21,7 @@ import mightypork.rogue.events.RogueStateRequest; import mightypork.rogue.screens.game.ScreenGame.GScrState; import mightypork.rogue.world.WorldProvider; import mightypork.utils.logging.Log; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/rogue/screens/game/LayerGameUi.java b/src/mightypork/rogue/screens/game/LayerGameUi.java index 70adca3..55b7e7a 100644 --- a/src/mightypork/rogue/screens/game/LayerGameUi.java +++ b/src/mightypork/rogue/screens/game/LayerGameUi.java @@ -1,7 +1,6 @@ package mightypork.rogue.screens.game; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.resources.Res; @@ -9,6 +8,7 @@ import mightypork.rogue.world.World; import mightypork.rogue.world.WorldProvider; import mightypork.rogue.world.gui.Minimap; import mightypork.rogue.world.gui.WorldConsoleRenderer; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/rogue/screens/game/LayerInv.java b/src/mightypork/rogue/screens/game/LayerInv.java index 32cb20f..47f73aa 100644 --- a/src/mightypork/rogue/screens/game/LayerInv.java +++ b/src/mightypork/rogue/screens/game/LayerInv.java @@ -1,8 +1,7 @@ package mightypork.rogue.screens.game; -import mightypork.gamecore.config.Config; -import mightypork.gamecore.gui.AlignX; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.components.layout.ConstraintLayout; import mightypork.gamecore.gui.components.layout.FlowColumnLayout; import mightypork.gamecore.gui.components.layout.GridLayout; @@ -18,6 +17,7 @@ import mightypork.rogue.world.World; import mightypork.rogue.world.WorldProvider; import mightypork.rogue.world.item.Item; import mightypork.rogue.world.item.ItemType; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/rogue/screens/game/LayerWin.java b/src/mightypork/rogue/screens/game/LayerWin.java index c15b706..1393536 100644 --- a/src/mightypork/rogue/screens/game/LayerWin.java +++ b/src/mightypork/rogue/screens/game/LayerWin.java @@ -3,9 +3,8 @@ package mightypork.rogue.screens.game; import java.io.File; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.layout.RowLayout; import mightypork.gamecore.gui.components.layout.linear.LinearLayout; @@ -19,6 +18,7 @@ import mightypork.gamecore.resources.fonts.IFont; import mightypork.rogue.RogueStateManager.RogueState; import mightypork.rogue.events.RogueStateRequest; import mightypork.rogue.world.WorldProvider; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/rogue/screens/game/ScreenGame.java b/src/mightypork/rogue/screens/game/ScreenGame.java index 8ae1e54..74c2b66 100644 --- a/src/mightypork/rogue/screens/game/ScreenGame.java +++ b/src/mightypork/rogue/screens/game/ScreenGame.java @@ -3,7 +3,7 @@ package mightypork.rogue.screens.game; import java.io.File; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.core.events.UserQuitRequest; import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.ActionGroup; diff --git a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java index 62ef944..d496d51 100644 --- a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java +++ b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java @@ -1,10 +1,9 @@ package mightypork.rogue.screens.menu; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.core.events.UserQuitRequest; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.layout.RowLayout; import mightypork.gamecore.gui.components.layout.linear.LinearLayout; @@ -18,6 +17,7 @@ import mightypork.gamecore.resources.fonts.IFont; import mightypork.rogue.RogueStateManager.RogueState; import mightypork.rogue.events.RogueStateRequest; import mightypork.rogue.screens.RogueScreen; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.Color; import mightypork.utils.math.color.pal.PAL16; import mightypork.utils.math.constraints.num.Num; diff --git a/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java b/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java index 1f94269..6da2deb 100644 --- a/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java +++ b/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java @@ -1,9 +1,8 @@ package mightypork.rogue.screens.select_world; -import mightypork.gamecore.WorkDir; -import mightypork.gamecore.config.Config; -import mightypork.gamecore.gui.AlignX; +import mightypork.gamecore.core.WorkDir; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.components.layout.RowLayout; import mightypork.gamecore.gui.components.painters.QuadPainter; import mightypork.gamecore.gui.components.painters.TextPainter; @@ -15,6 +14,7 @@ import mightypork.rogue.RogueStateManager.RogueState; import mightypork.rogue.events.RogueStateRequest; import mightypork.rogue.screens.RogueScreen; import mightypork.utils.logging.Log; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.Color; import mightypork.utils.math.color.pal.PAL16; import mightypork.utils.math.color.pal.RGB; diff --git a/src/mightypork/rogue/screens/select_world/WorldSlot.java b/src/mightypork/rogue/screens/select_world/WorldSlot.java index 030e902..9618a17 100644 --- a/src/mightypork/rogue/screens/select_world/WorldSlot.java +++ b/src/mightypork/rogue/screens/select_world/WorldSlot.java @@ -4,7 +4,6 @@ package mightypork.rogue.screens.select_world; import java.io.File; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.layout.ConstraintLayout; import mightypork.gamecore.gui.components.layout.GridLayout; @@ -18,6 +17,7 @@ import mightypork.rogue.world.WorldProvider; import mightypork.utils.ion.Ion; import mightypork.utils.ion.IonDataBundle; import mightypork.utils.logging.Log; +import mightypork.utils.math.AlignX; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/rogue/screens/story/ScreenStory.java b/src/mightypork/rogue/screens/story/ScreenStory.java index a7ba133..74c7098 100644 --- a/src/mightypork/rogue/screens/story/ScreenStory.java +++ b/src/mightypork/rogue/screens/story/ScreenStory.java @@ -1,9 +1,8 @@ package mightypork.rogue.screens.story; -import mightypork.gamecore.config.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.layout.RowLayout; import mightypork.gamecore.gui.components.layout.linear.LinearLayout; import mightypork.gamecore.gui.components.painters.ImagePainter; @@ -20,6 +19,7 @@ import mightypork.gamecore.resources.Res; import mightypork.rogue.RogueStateManager.RogueState; import mightypork.rogue.events.RogueStateRequest; import mightypork.rogue.screens.RogueScreen; +import mightypork.utils.math.AlignX; import mightypork.utils.math.animation.Easing; import mightypork.utils.math.animation.NumAnimated; import mightypork.utils.math.color.Color; diff --git a/src/mightypork/rogue/world/WorldRenderer.java b/src/mightypork/rogue/world/WorldRenderer.java index bc00b70..8345d2b 100644 --- a/src/mightypork/rogue/world/WorldRenderer.java +++ b/src/mightypork/rogue/world/WorldRenderer.java @@ -2,13 +2,13 @@ package mightypork.rogue.world; import mightypork.gamecore.core.App; -import mightypork.gamecore.render.GradH; -import mightypork.gamecore.render.GradV; import mightypork.gamecore.render.GraphicsModule; import mightypork.rogue.world.entity.Entity; import mightypork.rogue.world.level.Level; import mightypork.rogue.world.level.render.TileRenderContext; import mightypork.utils.math.algo.Coord; +import mightypork.utils.math.color.GradH; +import mightypork.utils.math.color.GradV; import mightypork.utils.math.color.pal.RGB; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/rogue/world/gui/WorldConsoleRenderer.java b/src/mightypork/rogue/world/gui/WorldConsoleRenderer.java index a4e901c..b1eba50 100644 --- a/src/mightypork/rogue/world/gui/WorldConsoleRenderer.java +++ b/src/mightypork/rogue/world/gui/WorldConsoleRenderer.java @@ -4,13 +4,13 @@ package mightypork.rogue.world.gui; import java.util.Collection; import java.util.ConcurrentModificationException; -import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.BaseComponent; import mightypork.gamecore.resources.Res; import mightypork.gamecore.resources.fonts.FontRenderer; import mightypork.rogue.world.WorldConsole; import mightypork.rogue.world.WorldProvider; import mightypork.utils.logging.Log; +import mightypork.utils.math.AlignX; import mightypork.utils.math.Calc; import mightypork.utils.math.animation.Easing; import mightypork.utils.math.color.Color; diff --git a/src/mightypork/rogue/world/gui/interaction/MIPKeyboard.java b/src/mightypork/rogue/world/gui/interaction/MIPKeyboard.java index 8362b2a..8936d3d 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.Config; +import mightypork.gamecore.core.config.Config; import mightypork.gamecore.input.Edge; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.input.KeyBindingPool;