Reflecting changes in Utils

master
Ondřej Hruška 10 years ago
parent 87d0c9d500
commit cafcf78cd2
  1. 2
      src/junk/AppInitOptions.java
  2. 8
      src/junk/BaseApp.java
  3. 2
      src/junk/SoundSystem.java
  4. 2
      src/mightypork/gamecore/backend/lwjgl/InitTaskRedirectSlickLog.java
  5. 4
      src/mightypork/gamecore/backend/lwjgl/LwjglGraphicsModule.java
  6. 1
      src/mightypork/gamecore/backend/lwjgl/SlickAudio.java
  7. 8
      src/mightypork/gamecore/backend/lwjgl/SlickAudioModule.java
  8. 2
      src/mightypork/gamecore/backend/lwjgl/SlickLogRedirector.java
  9. 18
      src/mightypork/gamecore/core/App.java
  10. 4
      src/mightypork/gamecore/core/InitTaskDisplay.java
  11. 3
      src/mightypork/gamecore/core/InitTaskIonizables.java
  12. 2
      src/mightypork/gamecore/core/InitTaskLog.java
  13. 1
      src/mightypork/gamecore/core/InitTaskLogHeader.java
  14. 1
      src/mightypork/gamecore/core/InitTaskWorkdir.java
  15. 3
      src/mightypork/gamecore/core/MainLoop.java
  16. 2
      src/mightypork/gamecore/core/WorkDir.java
  17. 40
      src/mightypork/gamecore/core/config/Config.java
  18. 12
      src/mightypork/gamecore/core/config/InitTaskConfig.java
  19. 2
      src/mightypork/gamecore/core/config/KeyStrokeProperty.java
  20. 2
      src/mightypork/gamecore/core/plugins/AppPlugin.java
  21. 4
      src/mightypork/gamecore/core/plugins/screenshot/ScreenshotPlugin.java
  22. 2
      src/mightypork/gamecore/core/plugins/screenshot/ScreenshotRequest.java
  23. 4
      src/mightypork/gamecore/core/plugins/screenshot/TaskTakeScreenshot.java
  24. 12
      src/mightypork/gamecore/gui/AlignX.java
  25. 12
      src/mightypork/gamecore/gui/AlignY.java
  26. 15
      src/mightypork/gamecore/gui/Hideable.java
  27. 2
      src/mightypork/gamecore/gui/components/Component.java
  28. 2
      src/mightypork/gamecore/gui/components/input/TextButton.java
  29. 4
      src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java
  30. 3
      src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java
  31. 2
      src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java
  32. 2
      src/mightypork/gamecore/gui/components/painters/QuadPainter.java
  33. 2
      src/mightypork/gamecore/gui/components/painters/TextPainter.java
  34. 2
      src/mightypork/gamecore/gui/events/ViewportChangeEvent.java
  35. 2
      src/mightypork/gamecore/gui/events/ViewportChangeListener.java
  36. 2
      src/mightypork/gamecore/gui/screens/Overlay.java
  37. 3
      src/mightypork/gamecore/gui/screens/Screen.java
  38. 4
      src/mightypork/gamecore/gui/screens/ScreenRegistry.java
  39. 3
      src/mightypork/gamecore/input/Edge.java
  40. 3
      src/mightypork/gamecore/render/FullscreenToggleRequest.java
  41. 31
      src/mightypork/gamecore/render/Grad.java
  42. 17
      src/mightypork/gamecore/render/GradH.java
  43. 17
      src/mightypork/gamecore/render/GradV.java
  44. 1
      src/mightypork/gamecore/render/GraphicsModule.java
  45. 2
      src/mightypork/gamecore/resources/ResourceLoader.java
  46. 5
      src/mightypork/gamecore/resources/audio/AudioModule.java
  47. 2
      src/mightypork/gamecore/resources/fonts/FontRenderer.java
  48. 4
      src/mightypork/gamecore/resources/fonts/impl/TextureBackedFont.java
  49. 11
      src/mightypork/rogue/RogueApp.java
  50. 1
      src/mightypork/rogue/RogueConfig.java
  51. 2
      src/mightypork/rogue/RogueKeys.java
  52. 2
      src/mightypork/rogue/RogueRoutes.java
  53. 4
      src/mightypork/rogue/screens/FpsOverlay.java
  54. 2
      src/mightypork/rogue/screens/LoadingOverlay.java
  55. 2
      src/mightypork/rogue/screens/game/HeartBar.java
  56. 2
      src/mightypork/rogue/screens/game/IngameNav.java
  57. 2
      src/mightypork/rogue/screens/game/InvSlot.java
  58. 4
      src/mightypork/rogue/screens/game/LayerAskSave.java
  59. 4
      src/mightypork/rogue/screens/game/LayerDeath.java
  60. 2
      src/mightypork/rogue/screens/game/LayerGameUi.java
  61. 4
      src/mightypork/rogue/screens/game/LayerInv.java
  62. 4
      src/mightypork/rogue/screens/game/LayerWin.java
  63. 2
      src/mightypork/rogue/screens/game/ScreenGame.java
  64. 4
      src/mightypork/rogue/screens/menu/ScreenMainMenu.java
  65. 6
      src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java
  66. 2
      src/mightypork/rogue/screens/select_world/WorldSlot.java
  67. 4
      src/mightypork/rogue/screens/story/ScreenStory.java
  68. 4
      src/mightypork/rogue/world/WorldRenderer.java
  69. 2
      src/mightypork/rogue/world/gui/WorldConsoleRenderer.java
  70. 2
      src/mightypork/rogue/world/gui/interaction/MIPKeyboard.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;

@ -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;

@ -1,4 +1,6 @@
package junk;
//package mightypork.gamecore.resources.audio;
//
//

@ -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;

@ -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;

@ -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;

@ -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

@ -1,4 +1,4 @@
package mightypork.gamecore.util;
package mightypork.gamecore.backend.lwjgl;
import java.util.logging.Level;

@ -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<InitTask> initializers = new ArrayList<>();
// visible to Config init task.
final Map<String, Config> 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);
}
}

@ -87,8 +87,8 @@ public class InitTaskDisplay extends InitTask {
gfx.createDisplay();
}
@Override
public String getName()
{

@ -62,7 +62,8 @@ public class InitTaskIonizables extends InitTask {
});
}
@Override
public String getName()
{

@ -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;

@ -3,7 +3,6 @@ package mightypork.gamecore.core;
import java.io.IOException;
import mightypork.gamecore.WorkDir;
import mightypork.utils.logging.Log;

@ -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;

@ -28,7 +28,8 @@ public class MainLoop extends BusNode implements Destroyable {
private final Deque<Runnable> tasks = new ConcurrentLinkedDeque<>();
private TimerDelta timer;
private Renderable rootRenderable;
private volatile boolean running = true;
private volatile boolean running = true;
/**
* Set primary renderable

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

@ -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<String, Config> configs = new HashMap<>();
private Map<String, KeyStrokeProperty> 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
*

@ -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()
{

@ -1,4 +1,4 @@
package mightypork.gamecore.config;
package mightypork.gamecore.core.config;
import mightypork.gamecore.input.KeyStroke;

@ -1,4 +1,4 @@
package mightypork.gamecore.plugins;
package mightypork.gamecore.core.plugins;
import mightypork.gamecore.core.App;

@ -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;

@ -1,4 +1,4 @@
package mightypork.gamecore.plugins.screenshot;
package mightypork.gamecore.core.plugins.screenshot;
import mightypork.utils.eventbus.BusEvent;

@ -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;

@ -1,12 +0,0 @@
package mightypork.gamecore.gui;
/**
* Horizontal align sides
*
* @author Ondřej Hruška (MightyPork)
*/
public enum AlignX
{
LEFT, CENTER, RIGHT;
}

@ -1,12 +0,0 @@
package mightypork.gamecore.gui;
/**
* Vertical align sides
*
* @author Ondřej Hruška (MightyPork)
*/
public enum AlignY
{
TOP, CENTER, BOTTOM;
}

@ -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();
}

@ -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;

@ -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;

@ -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.<br>
* 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.
*/

@ -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.<br>
* 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.
*/

@ -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;

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

@ -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;

@ -1,4 +1,4 @@
package mightypork.gamecore.render.events;
package mightypork.gamecore.gui.events;
import mightypork.utils.eventbus.BusEvent;

@ -1,4 +1,4 @@
package mightypork.gamecore.render.events;
package mightypork.gamecore.gui.events;
/**

@ -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;

@ -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

@ -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;

@ -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;
}
}

@ -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;

@ -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;
}
}

@ -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);
}
}

@ -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);
}
}

@ -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;

@ -1,8 +1,6 @@
package mightypork.gamecore.resources;
/**
* {@link ResourceLoadRequest} listener
*

@ -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;

@ -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;

@ -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:

@ -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;

@ -1,7 +1,6 @@
package mightypork.rogue;
import mightypork.gamecore.config.ConfigSetup;
import mightypork.utils.config.propmgr.PropertyManager;

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

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

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

Loading…
Cancel
Save