From 289145a9aa3b042509e9691da26d74494af252d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Wed, 23 Apr 2014 21:08:15 +0200 Subject: [PATCH] cleanup, util packages reorganized, removed some sysouts --- .../gamecore/audio/DeferredAudio.java | 2 +- .../gamecore/audio/SoundSystem.java | 6 +-- .../gamecore/audio/players/EffectPlayer.java | 2 +- .../gamecore/audio/players/LoopPlayer.java | 6 +-- src/mightypork/gamecore/control/GameLoop.java | 2 +- .../control/events/core/DestroyEvent.java | 4 +- .../control/events/core/UpdateEvent.java | 11 ++-- .../control/events/gui/LayoutChangeEvent.java | 7 +-- .../events/gui/LayoutChangeListener.java | 3 +- .../events/gui/ViewportChangeEvent.java | 7 +-- .../events/gui/ViewportChangeListener.java | 3 +- .../control/events/input/KeyEvent.java | 4 +- .../control/events/input/KeyListener.java | 3 +- .../events/input/MouseButtonEvent.java | 9 ++-- .../events/input/MouseButtonListener.java | 3 +- .../events/input/MouseMotionEvent.java | 9 ++-- .../events/input/MouseMotionListener.java | 3 +- .../events/requests/MainLoopRequest.java | 5 +- .../requests/MainLoopRequestListener.java | 3 +- .../events/requests/ResourceLoadRequest.java | 5 +- .../requests/ResourceLoadRequestListener.java | 4 +- .../events/requests/ScreenRequestEvent.java | 5 +- .../requests/ScreenRequestListener.java | 3 +- .../gamecore/gui/components/Component.java | 4 +- .../gui/components/LayoutComponent.java | 2 +- .../gui/components/PluggableRenderable.java | 6 +-- .../gui/components/VisualComponent.java | 8 +-- .../gui/components/layout/ColumnHolder.java | 4 +- .../components/layout/ConstraintLayout.java | 2 +- .../gui/components/layout/GridLayout.java | 4 +- .../layout/HorizontalFixedFlowLayout.java | 6 +-- .../gui/components/layout/RowHolder.java | 4 +- .../layout/VerticalFixedFlowLayout.java | 6 +-- .../gui/components/painters/TextPainter.java | 4 +- .../gamecore/gui/screens/BaseScreen.java | 2 +- .../gamecore/gui/screens/LayeredScreen.java | 9 ++-- .../gamecore/gui/screens/Overlay.java | 8 +-- .../gamecore/gui/screens/Screen.java | 2 +- .../gamecore/input/InputSystem.java | 10 ++-- .../gamecore/render/DisplaySystem.java | 8 +-- src/mightypork/gamecore/render/Render.java | 9 ++-- .../gamecore/render/fonts/FontRenderer.java | 4 +- .../gamecore/render/fonts/GLFont.java | 2 +- .../render/fonts/impl/CachedFont.java | 4 +- .../render/fonts/impl/DeferredFont.java | 2 +- .../render/textures/DeferredTexture.java | 2 +- .../gamecore/render/textures/GLTexture.java | 2 +- .../gamecore/render/textures/QuadGrid.java | 2 +- .../gamecore/render/textures/TextureBank.java | 2 +- .../gamecore/render/textures/TxQuad.java | 4 +- src/mightypork/rogue/App.java | 2 +- src/mightypork/rogue/Config.java | 2 +- .../rogue/events/ActionRequest.java | 2 +- .../rogue/screens/CrossfadeOverlay.java | 4 +- src/mightypork/rogue/screens/FpsOverlay.java | 6 +-- .../rogue/screens/gamescreen/HudLayer.java | 4 +- .../rogue/screens/gamescreen/ScreenGame.java | 7 +-- .../rogue/screens/gamescreen/WorldLayer.java | 10 ++-- .../screens/gamescreen/gui/HeartBar.java | 6 +-- .../screens/gamescreen/gui/NavItemSlot.java | 12 ++--- .../screens/gamescreen/world/MIPKeyWalk.java | 2 +- .../gamescreen/world/MIPMouseWalk.java | 12 ++--- .../world/MapInteractionPlugin.java | 2 +- .../screens/gamescreen/world/MapView.java | 15 +++--- .../rogue/screens/main_menu/MenuButton.java | 6 +-- .../rogue/screens/main_menu/MenuLayer.java | 4 +- .../screens/test_bouncyboxes/BouncyBox.java | 10 ++-- .../test_bouncyboxes/LayerBouncyBoxes.java | 4 +- .../test_cat_sound/LayerFlyingCat.java | 8 +-- .../test_render/LayerTestGradient.java | 2 +- src/mightypork/rogue/world/PathStep.java | 6 +-- src/mightypork/rogue/world/PlayerControl.java | 3 +- src/mightypork/rogue/world/PlayerInfo.java | 4 +- src/mightypork/rogue/world/World.java | 10 ++-- src/mightypork/rogue/world/WorldPos.java | 10 ++-- src/mightypork/rogue/world/WorldRenderer.java | 53 +++++++++---------- src/mightypork/rogue/world/entity/Entity.java | 12 ++--- .../entity/renderers/PlayerRenderer.java | 2 +- src/mightypork/rogue/world/item/Item.java | 8 +-- .../rogue/world/item/ItemModel.java | 2 +- src/mightypork/rogue/world/level/Level.java | 14 ++--- .../level/render/EntityRenderContext.java | 2 +- .../world/level/render/MapRenderContext.java | 13 ++--- .../world/level/render/TileRenderContext.java | 4 +- .../rogue/world/tile/DroppedItemRenderer.java | 8 +-- src/mightypork/rogue/world/tile/Tile.java | 8 +-- .../tile/renderers/BasicTileRenderer.java | 2 +- .../util/control/eventbus/BusEvent.java | 11 ++-- .../util/control/eventbus/EventBus.java | 9 ++-- .../util/control/eventbus/EventChannel.java | 1 - .../flags => event_flags}/DelayedEvent.java | 2 +- .../flags => event_flags}/ImmediateEvent.java | 2 +- .../NonConsumableEvent.java | 3 +- .../SingleReceiverEvent.java | 2 +- .../flags => event_flags}/UnloggedEvent.java | 2 +- .../{ => files}/config/PropertyManager.java | 6 +-- .../util/{ => files}/config/SimpleConfig.java | 2 +- .../{ => files}/config/SortedProperties.java | 2 +- src/mightypork/util/{ => files}/ion/Ion.java | 4 +- .../util/{ => files}/ion/IonBinary.java | 2 +- .../util/{ => files}/ion/IonBundle.java | 2 +- .../util/{ => files}/ion/IonBundled.java | 2 +- .../util/{ => files}/ion/IonInput.java | 2 +- .../util/{ => files}/ion/IonMapWrapper.java | 2 +- .../util/{ => files}/ion/IonOutput.java | 2 +- .../{ => files}/ion/IonSequenceWrapper.java | 2 +- src/mightypork/util/math/Calc.java | 2 +- src/mightypork/util/math/Polar.java | 2 +- src/mightypork/util/math/color/Color.java | 2 +- .../util/math/color/ColorAlphaAdjuster.java | 2 +- src/mightypork/util/math/color/ColorHsb.java | 2 +- src/mightypork/util/math/color/ColorRgb.java | 2 +- .../constraints/ConstraintCache.java | 2 +- .../{ => math}/constraints/DigestCache.java | 2 +- .../{ => math}/constraints/Digestable.java | 2 +- .../util/{ => math}/constraints/Pollable.java | 2 +- .../util/{ => math}/constraints/Poller.java | 2 +- .../util/{ => math}/constraints/num/Num.java | 18 +++---- .../{ => math}/constraints/num/NumConst.java | 4 +- .../num/caching/AbstractNumCache.java | 10 ++-- .../constraints/num/caching/NumCache.java | 4 +- .../constraints/num/caching/NumDigest.java | 4 +- .../constraints/num/mutable/NumAnimated.java | 6 +-- .../num/mutable/NumAnimatedDeg.java | 2 +- .../num/mutable/NumAnimatedRad.java | 2 +- .../constraints/num/mutable/NumMutable.java | 4 +- .../constraints/num/mutable/NumVar.java | 4 +- .../constraints/num/proxy/NumAdapter.java | 4 +- .../constraints/num/proxy/NumBound.java | 4 +- .../num/proxy/NumBoundAdapter.java | 4 +- .../constraints/num/proxy/NumProxy.java | 4 +- .../num/proxy/PluggableNumBound.java | 2 +- .../{ => math}/constraints/rect/Rect.java | 28 +++++----- .../constraints/rect/RectConst.java | 10 ++-- .../constraints/rect/builders/TiledRect.java | 10 ++-- .../rect/caching/AbstractRectCache.java | 10 ++-- .../constraints/rect/caching/RectCache.java | 4 +- .../constraints/rect/caching/RectDigest.java | 4 +- .../constraints/rect/mutable/RectMutable.java | 18 ++++--- .../constraints/rect/mutable/RectVar.java | 10 ++-- .../rect/proxy/PluggableRectBound.java | 2 +- .../constraints/rect/proxy/RectAdapter.java | 8 +-- .../constraints/rect/proxy/RectBound.java | 4 +- .../rect/proxy/RectBoundAdapter.java | 4 +- .../constraints/rect/proxy/RectProxy.java | 4 +- .../rect/proxy/RectVectAdapter.java | 6 +-- .../{ => math}/constraints/vect/Vect.java | 24 ++++----- .../constraints/vect/VectConst.java | 10 ++-- .../constraints/vect/VectProxy.java | 4 +- .../vect/caching/AbstractVectCache.java | 10 ++-- .../constraints/vect/caching/VectCache.java | 4 +- .../constraints/vect/caching/VectDigest.java | 4 +- .../vect/mutable/VectAnimated.java | 10 ++-- .../constraints/vect/mutable/VectMutable.java | 4 +- .../constraints/vect/mutable/VectVar.java | 2 +- .../vect/proxy/PluggableVectBound.java | 2 +- .../constraints/vect/proxy/VectAdapter.java | 4 +- .../constraints/vect/proxy/VectBound.java | 4 +- .../vect/proxy/VectBoundAdapter.java | 4 +- .../vect/proxy/VectNumAdapter.java | 8 +-- src/mightypork/util/objects/Convert.java | 4 +- .../util/{control => }/timing/Animator.java | 6 +-- .../{control => }/timing/AnimatorBounce.java | 4 +- .../{control => }/timing/AnimatorRewind.java | 4 +- .../util/{control => }/timing/FpsMeter.java | 2 +- .../util/{control => }/timing/Pauseable.java | 2 +- .../util/{control => }/timing/TimedTask.java | 4 +- .../util/{control => }/timing/TimerDelta.java | 2 +- .../util/{control => }/timing/TimerFps.java | 2 +- .../util/{control => }/timing/Updateable.java | 2 +- 170 files changed, 472 insertions(+), 446 deletions(-) rename src/mightypork/util/control/eventbus/{events/flags => event_flags}/DelayedEvent.java (85%) rename src/mightypork/util/control/eventbus/{events/flags => event_flags}/ImmediateEvent.java (80%) rename src/mightypork/util/control/eventbus/{events/flags => event_flags}/NonConsumableEvent.java (87%) rename src/mightypork/util/control/eventbus/{events/flags => event_flags}/SingleReceiverEvent.java (81%) rename src/mightypork/util/control/eventbus/{events/flags => event_flags}/UnloggedEvent.java (85%) rename src/mightypork/util/{ => files}/config/PropertyManager.java (98%) rename src/mightypork/util/{ => files}/config/SimpleConfig.java (99%) rename src/mightypork/util/{ => files}/config/SortedProperties.java (99%) rename src/mightypork/util/{ => files}/ion/Ion.java (98%) rename src/mightypork/util/{ => files}/ion/IonBinary.java (94%) rename src/mightypork/util/{ => files}/ion/IonBundle.java (99%) rename src/mightypork/util/{ => files}/ion/IonBundled.java (86%) rename src/mightypork/util/{ => files}/ion/IonInput.java (99%) rename src/mightypork/util/{ => files}/ion/IonMapWrapper.java (94%) rename src/mightypork/util/{ => files}/ion/IonOutput.java (99%) rename src/mightypork/util/{ => files}/ion/IonSequenceWrapper.java (95%) rename src/mightypork/util/{ => math}/constraints/ConstraintCache.java (94%) rename src/mightypork/util/{ => math}/constraints/DigestCache.java (95%) rename src/mightypork/util/{ => math}/constraints/Digestable.java (97%) rename src/mightypork/util/{ => math}/constraints/Pollable.java (78%) rename src/mightypork/util/{ => math}/constraints/Poller.java (93%) rename src/mightypork/util/{ => math}/constraints/num/Num.java (94%) rename src/mightypork/util/{ => math}/constraints/num/NumConst.java (96%) rename src/mightypork/util/{ => math}/constraints/num/caching/AbstractNumCache.java (81%) rename src/mightypork/util/{ => math}/constraints/num/caching/NumCache.java (79%) rename src/mightypork/util/{ => math}/constraints/num/caching/NumDigest.java (67%) rename src/mightypork/util/{ => math}/constraints/num/mutable/NumAnimated.java (97%) rename src/mightypork/util/{ => math}/constraints/num/mutable/NumAnimatedDeg.java (94%) rename src/mightypork/util/{ => math}/constraints/num/mutable/NumAnimatedRad.java (94%) rename src/mightypork/util/{ => math}/constraints/num/mutable/NumMutable.java (80%) rename src/mightypork/util/{ => math}/constraints/num/mutable/NumVar.java (79%) rename src/mightypork/util/{ => math}/constraints/num/proxy/NumAdapter.java (62%) rename src/mightypork/util/{ => math}/constraints/num/proxy/NumBound.java (58%) rename src/mightypork/util/{ => math}/constraints/num/proxy/NumBoundAdapter.java (79%) rename src/mightypork/util/{ => math}/constraints/num/proxy/NumProxy.java (67%) rename src/mightypork/util/{ => math}/constraints/num/proxy/PluggableNumBound.java (79%) rename src/mightypork/util/{ => math}/constraints/rect/Rect.java (95%) rename src/mightypork/util/{ => math}/constraints/rect/RectConst.java (96%) rename src/mightypork/util/{ => math}/constraints/rect/builders/TiledRect.java (90%) rename src/mightypork/util/{ => math}/constraints/rect/caching/AbstractRectCache.java (79%) rename src/mightypork/util/{ => math}/constraints/rect/caching/RectCache.java (79%) rename src/mightypork/util/{ => math}/constraints/rect/caching/RectDigest.java (87%) rename src/mightypork/util/{ => math}/constraints/rect/mutable/RectMutable.java (82%) rename src/mightypork/util/{ => math}/constraints/rect/mutable/RectVar.java (74%) rename src/mightypork/util/{ => math}/constraints/rect/proxy/PluggableRectBound.java (79%) rename src/mightypork/util/{ => math}/constraints/rect/proxy/RectAdapter.java (79%) rename src/mightypork/util/{ => math}/constraints/rect/proxy/RectBound.java (59%) rename src/mightypork/util/{ => math}/constraints/rect/proxy/RectBoundAdapter.java (81%) rename src/mightypork/util/{ => math}/constraints/rect/proxy/RectProxy.java (67%) rename src/mightypork/util/{ => math}/constraints/rect/proxy/RectVectAdapter.java (71%) rename src/mightypork/util/{ => math}/constraints/vect/Vect.java (96%) rename src/mightypork/util/{ => math}/constraints/vect/VectConst.java (95%) rename src/mightypork/util/{ => math}/constraints/vect/VectProxy.java (65%) rename src/mightypork/util/{ => math}/constraints/vect/caching/AbstractVectCache.java (79%) rename src/mightypork/util/{ => math}/constraints/vect/caching/VectCache.java (80%) rename src/mightypork/util/{ => math}/constraints/vect/caching/VectDigest.java (74%) rename src/mightypork/util/{ => math}/constraints/vect/mutable/VectAnimated.java (94%) rename src/mightypork/util/{ => math}/constraints/vect/mutable/VectMutable.java (90%) rename src/mightypork/util/{ => math}/constraints/vect/mutable/VectVar.java (94%) rename src/mightypork/util/{ => math}/constraints/vect/proxy/PluggableVectBound.java (79%) rename src/mightypork/util/{ => math}/constraints/vect/proxy/VectAdapter.java (81%) rename src/mightypork/util/{ => math}/constraints/vect/proxy/VectBound.java (65%) rename src/mightypork/util/{ => math}/constraints/vect/proxy/VectBoundAdapter.java (79%) rename src/mightypork/util/{ => math}/constraints/vect/proxy/VectNumAdapter.java (76%) rename src/mightypork/util/{control => }/timing/Animator.java (89%) rename src/mightypork/util/{control => }/timing/AnimatorBounce.java (88%) rename src/mightypork/util/{control => }/timing/AnimatorRewind.java (87%) rename src/mightypork/util/{control => }/timing/FpsMeter.java (94%) rename src/mightypork/util/{control => }/timing/Pauseable.java (87%) rename src/mightypork/util/{control => }/timing/TimedTask.java (85%) rename src/mightypork/util/{control => }/timing/TimerDelta.java (94%) rename src/mightypork/util/{control => }/timing/TimerFps.java (97%) rename src/mightypork/util/{control => }/timing/Updateable.java (85%) diff --git a/src/mightypork/gamecore/audio/DeferredAudio.java b/src/mightypork/gamecore/audio/DeferredAudio.java index fabe0d5..8183fec 100644 --- a/src/mightypork/gamecore/audio/DeferredAudio.java +++ b/src/mightypork/gamecore/audio/DeferredAudio.java @@ -4,9 +4,9 @@ package mightypork.gamecore.audio; import java.io.IOException; import mightypork.gamecore.loading.DeferredResource; -import mightypork.util.constraints.vect.Vect; import mightypork.util.files.FileUtils; import mightypork.util.logging.LogAlias; +import mightypork.util.math.constraints.vect.Vect; import org.newdawn.slick.openal.Audio; import org.newdawn.slick.openal.SoundStore; diff --git a/src/mightypork/gamecore/audio/SoundSystem.java b/src/mightypork/gamecore/audio/SoundSystem.java index f9d0318..7fb00cf 100644 --- a/src/mightypork/gamecore/audio/SoundSystem.java +++ b/src/mightypork/gamecore/audio/SoundSystem.java @@ -9,11 +9,11 @@ import mightypork.gamecore.audio.players.EffectPlayer; import mightypork.gamecore.audio.players.LoopPlayer; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.events.requests.ResourceLoadRequest; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.mutable.VectVar; import mightypork.util.control.eventbus.clients.RootBusNode; -import mightypork.util.control.timing.Updateable; import mightypork.util.math.Calc.Buffers; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.timing.Updateable; import org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; diff --git a/src/mightypork/gamecore/audio/players/EffectPlayer.java b/src/mightypork/gamecore/audio/players/EffectPlayer.java index 95070bb..17f24c5 100644 --- a/src/mightypork/gamecore/audio/players/EffectPlayer.java +++ b/src/mightypork/gamecore/audio/players/EffectPlayer.java @@ -3,7 +3,7 @@ package mightypork.gamecore.audio.players; import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.Volume; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/audio/players/LoopPlayer.java b/src/mightypork/gamecore/audio/players/LoopPlayer.java index b78a3ec..7d404ef 100644 --- a/src/mightypork/gamecore/audio/players/LoopPlayer.java +++ b/src/mightypork/gamecore/audio/players/LoopPlayer.java @@ -3,9 +3,9 @@ package mightypork.gamecore.audio.players; import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.Volume; -import mightypork.util.constraints.num.mutable.NumAnimated; -import mightypork.util.control.timing.Pauseable; -import mightypork.util.control.timing.Updateable; +import mightypork.util.math.constraints.num.mutable.NumAnimated; +import mightypork.util.timing.Pauseable; +import mightypork.util.timing.Updateable; import org.lwjgl.openal.AL10; diff --git a/src/mightypork/gamecore/control/GameLoop.java b/src/mightypork/gamecore/control/GameLoop.java index 3cc42c3..cd7d702 100644 --- a/src/mightypork/gamecore/control/GameLoop.java +++ b/src/mightypork/gamecore/control/GameLoop.java @@ -9,7 +9,7 @@ import mightypork.gamecore.control.events.requests.MainLoopRequestListener; import mightypork.gamecore.gui.screens.ScreenRegistry; import mightypork.gamecore.render.Renderable; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.control.timing.TimerDelta; +import mightypork.util.timing.TimerDelta; /** diff --git a/src/mightypork/gamecore/control/events/core/DestroyEvent.java b/src/mightypork/gamecore/control/events/core/DestroyEvent.java index ae6afa1..cb9e1e1 100644 --- a/src/mightypork/gamecore/control/events/core/DestroyEvent.java +++ b/src/mightypork/gamecore/control/events/core/DestroyEvent.java @@ -3,8 +3,8 @@ package mightypork.gamecore.control.events.core; import mightypork.util.control.Destroyable; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.ImmediateEvent; -import mightypork.util.control.eventbus.events.flags.NonConsumableEvent; +import mightypork.util.control.eventbus.event_flags.ImmediateEvent; +import mightypork.util.control.eventbus.event_flags.NonConsumableEvent; /** diff --git a/src/mightypork/gamecore/control/events/core/UpdateEvent.java b/src/mightypork/gamecore/control/events/core/UpdateEvent.java index 1cf5b11..56a0ffe 100644 --- a/src/mightypork/gamecore/control/events/core/UpdateEvent.java +++ b/src/mightypork/gamecore/control/events/core/UpdateEvent.java @@ -2,10 +2,10 @@ package mightypork.gamecore.control.events.core; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.ImmediateEvent; -import mightypork.util.control.eventbus.events.flags.NonConsumableEvent; -import mightypork.util.control.eventbus.events.flags.UnloggedEvent; -import mightypork.util.control.timing.Updateable; +import mightypork.util.control.eventbus.event_flags.ImmediateEvent; +import mightypork.util.control.eventbus.event_flags.NonConsumableEvent; +import mightypork.util.control.eventbus.event_flags.UnloggedEvent; +import mightypork.util.timing.Updateable; /** @@ -24,7 +24,8 @@ public class UpdateEvent extends BusEvent { /** * @param deltaTime time since last update (sec) */ - public UpdateEvent(double deltaTime) { + public UpdateEvent(double deltaTime) + { this.deltaTime = deltaTime; } diff --git a/src/mightypork/gamecore/control/events/gui/LayoutChangeEvent.java b/src/mightypork/gamecore/control/events/gui/LayoutChangeEvent.java index 62195e0..999004e 100644 --- a/src/mightypork/gamecore/control/events/gui/LayoutChangeEvent.java +++ b/src/mightypork/gamecore/control/events/gui/LayoutChangeEvent.java @@ -2,8 +2,8 @@ package mightypork.gamecore.control.events.gui; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.ImmediateEvent; -import mightypork.util.control.eventbus.events.flags.NonConsumableEvent; +import mightypork.util.control.eventbus.event_flags.ImmediateEvent; +import mightypork.util.control.eventbus.event_flags.NonConsumableEvent; /** @@ -16,7 +16,8 @@ import mightypork.util.control.eventbus.events.flags.NonConsumableEvent; @NonConsumableEvent public class LayoutChangeEvent extends BusEvent { - public LayoutChangeEvent() { + public LayoutChangeEvent() + { } diff --git a/src/mightypork/gamecore/control/events/gui/LayoutChangeListener.java b/src/mightypork/gamecore/control/events/gui/LayoutChangeListener.java index 9dd1cd9..b4bc3be 100644 --- a/src/mightypork/gamecore/control/events/gui/LayoutChangeListener.java +++ b/src/mightypork/gamecore/control/events/gui/LayoutChangeListener.java @@ -1,6 +1,7 @@ package mightypork.gamecore.control.events.gui; + public interface LayoutChangeListener { public void onLayoutChanged(); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/gui/ViewportChangeEvent.java b/src/mightypork/gamecore/control/events/gui/ViewportChangeEvent.java index 1d81929..4d5ab77 100644 --- a/src/mightypork/gamecore/control/events/gui/ViewportChangeEvent.java +++ b/src/mightypork/gamecore/control/events/gui/ViewportChangeEvent.java @@ -1,9 +1,9 @@ package mightypork.gamecore.control.events.gui; -import mightypork.util.constraints.vect.Vect; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.NonConsumableEvent; +import mightypork.util.control.eventbus.event_flags.NonConsumableEvent; +import mightypork.util.math.constraints.vect.Vect; /** @@ -24,7 +24,8 @@ public class ViewportChangeEvent extends BusEvent { * @param fullscreen is now fullscreen * @param size new screen size */ - public ViewportChangeEvent(boolean fsChanged, boolean fullscreen, Vect size) { + public ViewportChangeEvent(boolean fsChanged, boolean fullscreen, Vect size) + { this.fullscreen = fullscreen; this.screenSize = size; this.fsChanged = fsChanged; diff --git a/src/mightypork/gamecore/control/events/gui/ViewportChangeListener.java b/src/mightypork/gamecore/control/events/gui/ViewportChangeListener.java index 131001b..4bf8cfa 100644 --- a/src/mightypork/gamecore/control/events/gui/ViewportChangeListener.java +++ b/src/mightypork/gamecore/control/events/gui/ViewportChangeListener.java @@ -1,5 +1,6 @@ package mightypork.gamecore.control.events.gui; + /** * {@link ViewportChangeEvent} listener * @@ -13,4 +14,4 @@ public interface ViewportChangeListener { * @param event */ void onViewportChanged(ViewportChangeEvent event); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/input/KeyEvent.java b/src/mightypork/gamecore/control/events/input/KeyEvent.java index 84a24a8..c5a8a2e 100644 --- a/src/mightypork/gamecore/control/events/input/KeyEvent.java +++ b/src/mightypork/gamecore/control/events/input/KeyEvent.java @@ -23,7 +23,8 @@ public class KeyEvent extends BusEvent { * @param c typed char (can be zero char) * @param down true = pressed, false = released. */ - public KeyEvent(int key, char c, boolean down) { + public KeyEvent(int key, char c, boolean down) + { this.key = key; this.c = c; this.down = down; @@ -72,6 +73,7 @@ public class KeyEvent extends BusEvent { keh.receive(this); } + @Override public String toString() { diff --git a/src/mightypork/gamecore/control/events/input/KeyListener.java b/src/mightypork/gamecore/control/events/input/KeyListener.java index cfee519..3ee2f9d 100644 --- a/src/mightypork/gamecore/control/events/input/KeyListener.java +++ b/src/mightypork/gamecore/control/events/input/KeyListener.java @@ -1,5 +1,6 @@ package mightypork.gamecore.control.events.input; + /** * {@link KeyEvent} listener * @@ -13,4 +14,4 @@ public interface KeyListener { * @param event event */ void receive(KeyEvent event); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/input/MouseButtonEvent.java b/src/mightypork/gamecore/control/events/input/MouseButtonEvent.java index d17b4b0..9694aaf 100644 --- a/src/mightypork/gamecore/control/events/input/MouseButtonEvent.java +++ b/src/mightypork/gamecore/control/events/input/MouseButtonEvent.java @@ -1,10 +1,10 @@ package mightypork.gamecore.control.events.input; -import mightypork.util.constraints.rect.proxy.RectBound; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; import mightypork.util.control.eventbus.BusEvent; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; /** @@ -32,7 +32,8 @@ public class MouseButtonEvent extends BusEvent { * @param down button pressed * @param wheeld wheel change */ - public MouseButtonEvent(Vect pos, int button, boolean down, int wheeld) { + public MouseButtonEvent(Vect pos, int button, boolean down, int wheeld) + { this.button = button; this.down = down; this.pos = pos.freeze(); diff --git a/src/mightypork/gamecore/control/events/input/MouseButtonListener.java b/src/mightypork/gamecore/control/events/input/MouseButtonListener.java index eee8e58..834c618 100644 --- a/src/mightypork/gamecore/control/events/input/MouseButtonListener.java +++ b/src/mightypork/gamecore/control/events/input/MouseButtonListener.java @@ -1,5 +1,6 @@ package mightypork.gamecore.control.events.input; + /** * {@link MouseButtonEvent} listener * @@ -13,4 +14,4 @@ public interface MouseButtonListener { * @param event event */ void receive(MouseButtonEvent event); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/input/MouseMotionEvent.java b/src/mightypork/gamecore/control/events/input/MouseMotionEvent.java index a744e63..5114b9c 100644 --- a/src/mightypork/gamecore/control/events/input/MouseMotionEvent.java +++ b/src/mightypork/gamecore/control/events/input/MouseMotionEvent.java @@ -1,10 +1,10 @@ package mightypork.gamecore.control.events.input; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.UnloggedEvent; +import mightypork.util.control.eventbus.event_flags.UnloggedEvent; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; /** @@ -23,7 +23,8 @@ public class MouseMotionEvent extends BusEvent { * @param pos end pos * @param move move vector */ - public MouseMotionEvent(Vect pos, Vect move) { + public MouseMotionEvent(Vect pos, Vect move) + { this.move = move.freeze(); this.pos = pos.freeze(); } diff --git a/src/mightypork/gamecore/control/events/input/MouseMotionListener.java b/src/mightypork/gamecore/control/events/input/MouseMotionListener.java index 01abc67..599963a 100644 --- a/src/mightypork/gamecore/control/events/input/MouseMotionListener.java +++ b/src/mightypork/gamecore/control/events/input/MouseMotionListener.java @@ -1,5 +1,6 @@ package mightypork.gamecore.control.events.input; + /** * {@link MouseMotionEvent} listener * @@ -13,4 +14,4 @@ public interface MouseMotionListener { * @param event event */ void receive(MouseMotionEvent event); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/requests/MainLoopRequest.java b/src/mightypork/gamecore/control/events/requests/MainLoopRequest.java index 7de48ce..760b9b3 100644 --- a/src/mightypork/gamecore/control/events/requests/MainLoopRequest.java +++ b/src/mightypork/gamecore/control/events/requests/MainLoopRequest.java @@ -2,7 +2,7 @@ package mightypork.gamecore.control.events.requests; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; +import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent; /** @@ -19,7 +19,8 @@ public class MainLoopRequest extends BusEvent { /** * @param task task to run on main thread in rendering context */ - public MainLoopRequest(Runnable task) { + public MainLoopRequest(Runnable task) + { this.task = task; } diff --git a/src/mightypork/gamecore/control/events/requests/MainLoopRequestListener.java b/src/mightypork/gamecore/control/events/requests/MainLoopRequestListener.java index 913a167..fa9d66a 100644 --- a/src/mightypork/gamecore/control/events/requests/MainLoopRequestListener.java +++ b/src/mightypork/gamecore/control/events/requests/MainLoopRequestListener.java @@ -1,5 +1,6 @@ package mightypork.gamecore.control.events.requests; + /** * {@link MainLoopRequest} listener * @@ -13,4 +14,4 @@ public interface MainLoopRequestListener { * @param request */ void queueTask(Runnable request); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/requests/ResourceLoadRequest.java b/src/mightypork/gamecore/control/events/requests/ResourceLoadRequest.java index 011a73c..efd17d3 100644 --- a/src/mightypork/gamecore/control/events/requests/ResourceLoadRequest.java +++ b/src/mightypork/gamecore/control/events/requests/ResourceLoadRequest.java @@ -3,7 +3,7 @@ package mightypork.gamecore.control.events.requests; import mightypork.gamecore.loading.Deferred; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; +import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent; /** @@ -20,7 +20,8 @@ public class ResourceLoadRequest extends BusEvent { /** * @param resource resource to load */ - public ResourceLoadRequest(Deferred resource) { + public ResourceLoadRequest(Deferred resource) + { this.resource = resource; } diff --git a/src/mightypork/gamecore/control/events/requests/ResourceLoadRequestListener.java b/src/mightypork/gamecore/control/events/requests/ResourceLoadRequestListener.java index db550a0..f26caf9 100644 --- a/src/mightypork/gamecore/control/events/requests/ResourceLoadRequestListener.java +++ b/src/mightypork/gamecore/control/events/requests/ResourceLoadRequestListener.java @@ -1,7 +1,9 @@ package mightypork.gamecore.control.events.requests; + import mightypork.gamecore.loading.Deferred; + /** * {@link ResourceLoadRequest} listener * @@ -15,4 +17,4 @@ public interface ResourceLoadRequestListener { * @param resource */ void loadResource(Deferred resource); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/control/events/requests/ScreenRequestEvent.java b/src/mightypork/gamecore/control/events/requests/ScreenRequestEvent.java index a2504b3..bf93c89 100644 --- a/src/mightypork/gamecore/control/events/requests/ScreenRequestEvent.java +++ b/src/mightypork/gamecore/control/events/requests/ScreenRequestEvent.java @@ -2,7 +2,7 @@ package mightypork.gamecore.control.events.requests; import mightypork.util.control.eventbus.BusEvent; -import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; +import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent; /** @@ -19,7 +19,8 @@ public class ScreenRequestEvent extends BusEvent { /** * @param screenKey screen name */ - public ScreenRequestEvent(String screenKey) { + public ScreenRequestEvent(String screenKey) + { scrName = screenKey; } diff --git a/src/mightypork/gamecore/control/events/requests/ScreenRequestListener.java b/src/mightypork/gamecore/control/events/requests/ScreenRequestListener.java index 1f3655d..ef9648b 100644 --- a/src/mightypork/gamecore/control/events/requests/ScreenRequestListener.java +++ b/src/mightypork/gamecore/control/events/requests/ScreenRequestListener.java @@ -1,5 +1,6 @@ package mightypork.gamecore.control.events.requests; + /** * {@link ScreenRequestEvent} listener * @@ -11,4 +12,4 @@ public interface ScreenRequestListener { * @param key screen to show */ void showScreen(String key); -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/gui/components/Component.java b/src/mightypork/gamecore/gui/components/Component.java index 80e21f6..3e1629f 100644 --- a/src/mightypork/gamecore/gui/components/Component.java +++ b/src/mightypork/gamecore/gui/components/Component.java @@ -2,8 +2,8 @@ package mightypork.gamecore.gui.components; import mightypork.gamecore.gui.Hideable; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/LayoutComponent.java b/src/mightypork/gamecore/gui/components/LayoutComponent.java index 2254b38..990a664 100644 --- a/src/mightypork/gamecore/gui/components/LayoutComponent.java +++ b/src/mightypork/gamecore/gui/components/LayoutComponent.java @@ -9,10 +9,10 @@ import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppSubModule; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; -import mightypork.util.constraints.rect.proxy.RectBound; import mightypork.util.control.Enableable; import mightypork.util.control.eventbus.EventBus; import mightypork.util.control.eventbus.clients.ClientHub; +import mightypork.util.math.constraints.rect.proxy.RectBound; public abstract class LayoutComponent extends VisualComponent implements Enableable, ClientHub, AppAccess { diff --git a/src/mightypork/gamecore/gui/components/PluggableRenderable.java b/src/mightypork/gamecore/gui/components/PluggableRenderable.java index 6403c55..042042d 100644 --- a/src/mightypork/gamecore/gui/components/PluggableRenderable.java +++ b/src/mightypork/gamecore/gui/components/PluggableRenderable.java @@ -2,9 +2,9 @@ package mightypork.gamecore.gui.components; import mightypork.gamecore.render.Renderable; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.PluggableRectBound; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.PluggableRectBound; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/VisualComponent.java b/src/mightypork/gamecore/gui/components/VisualComponent.java index c4b5d1e..62cfd5e 100644 --- a/src/mightypork/gamecore/gui/components/VisualComponent.java +++ b/src/mightypork/gamecore/gui/components/VisualComponent.java @@ -6,10 +6,10 @@ import mightypork.gamecore.control.events.gui.LayoutChangeListener; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.Renderable; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.caching.AbstractRectCache; -import mightypork.util.constraints.rect.proxy.RectBound; -import mightypork.util.constraints.rect.proxy.RectBoundAdapter; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.caching.AbstractRectCache; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; /** diff --git a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java index e4a8f0c..ea0bebc 100644 --- a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java @@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.constraints.rect.builders.TiledRect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.builders.TiledRect; +import mightypork.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 da4744f..5059f5b 100644 --- a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java @@ -4,7 +4,7 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/GridLayout.java b/src/mightypork/gamecore/gui/components/layout/GridLayout.java index 517d004..f154be4 100644 --- a/src/mightypork/gamecore/gui/components/layout/GridLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/GridLayout.java @@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.constraints.rect.builders.TiledRect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.builders.TiledRect; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java b/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java index 1e5513d..a170800 100644 --- a/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java @@ -5,9 +5,9 @@ import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/RowHolder.java b/src/mightypork/gamecore/gui/components/layout/RowHolder.java index d2289a1..c4d60fa 100644 --- a/src/mightypork/gamecore/gui/components/layout/RowHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/RowHolder.java @@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.constraints.rect.builders.TiledRect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.builders.TiledRect; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java b/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java index 57f3522..e895a92 100644 --- a/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java @@ -5,9 +5,9 @@ import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/painters/TextPainter.java b/src/mightypork/gamecore/gui/components/painters/TextPainter.java index 7d0ba6f..1b4098f 100644 --- a/src/mightypork/gamecore/gui/components/painters/TextPainter.java +++ b/src/mightypork/gamecore/gui/components/painters/TextPainter.java @@ -5,9 +5,9 @@ import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.render.fonts.FontRenderer; import mightypork.gamecore.render.fonts.GLFont; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.vect.Vect; import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; import mightypork.util.string.StringProvider; import mightypork.util.string.StringProvider.StringWrapper; diff --git a/src/mightypork/gamecore/gui/screens/BaseScreen.java b/src/mightypork/gamecore/gui/screens/BaseScreen.java index b613546..6992b32 100644 --- a/src/mightypork/gamecore/gui/screens/BaseScreen.java +++ b/src/mightypork/gamecore/gui/screens/BaseScreen.java @@ -10,7 +10,7 @@ import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.render.Render; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/gamecore/gui/screens/LayeredScreen.java b/src/mightypork/gamecore/gui/screens/LayeredScreen.java index 7474283..fb787e4 100644 --- a/src/mightypork/gamecore/gui/screens/LayeredScreen.java +++ b/src/mightypork/gamecore/gui/screens/LayeredScreen.java @@ -7,7 +7,6 @@ import java.util.TreeSet; import mightypork.gamecore.control.AppAccess; import mightypork.util.control.eventbus.clients.DelegatingClient; -import mightypork.util.control.eventbus.clients.RootBusNode; /** @@ -18,14 +17,15 @@ import mightypork.util.control.eventbus.clients.RootBusNode; public abstract class LayeredScreen extends BaseScreen { private class LayersClient implements DelegatingClient { - + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Collection getChildClients() { return layersByEventPriority; } - + + @Override public boolean doesDelegate() { @@ -60,7 +60,8 @@ public abstract class LayeredScreen extends BaseScreen { /** * @param app app access */ - public LayeredScreen(AppAccess app) { + public LayeredScreen(AppAccess app) + { super(app); addChildClient(layersClient); } diff --git a/src/mightypork/gamecore/gui/screens/Overlay.java b/src/mightypork/gamecore/gui/screens/Overlay.java index c629c28..8a58e5d 100644 --- a/src/mightypork/gamecore/gui/screens/Overlay.java +++ b/src/mightypork/gamecore/gui/screens/Overlay.java @@ -14,8 +14,8 @@ import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.render.Renderable; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.control.timing.Updateable; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.timing.Updateable; /** @@ -42,7 +42,8 @@ public abstract class Overlay extends AppSubModule implements Comparable updated = new LinkedHashSet<>(); - public Overlay(AppAccess app) { + public Overlay(AppAccess app) + { super(app); this.mouse = getInput().getMousePos(); @@ -123,6 +124,7 @@ public abstract class Overlay extends AppSubModule implements Comparable plugins = new HashSet<>(); - public MapView(World world) { + public MapView(World world) + { this.world = world; this.worldRenderer = new WorldRenderer(world, this, 8, 6, 72); pc = world.getPlayerControl(); @@ -65,7 +66,7 @@ public class MapView extends InputComponent implements KeyListener, MouseButtonL @Override public void onStepFinished(Entity entity, World world, Level level) { - for (MapInteractionPlugin p : plugins) { + for (final MapInteractionPlugin p : plugins) { p.onStepEnd(this, pc); } } @@ -74,7 +75,7 @@ public class MapView extends InputComponent implements KeyListener, MouseButtonL @Override public void onPathFinished(Entity entity, World world, Level level) { - for (MapInteractionPlugin p : plugins) { + for (final MapInteractionPlugin p : plugins) { p.onStepEnd(this, pc); } } @@ -83,7 +84,7 @@ public class MapView extends InputComponent implements KeyListener, MouseButtonL @Override public void onPathInterrupted(Entity entity, World world, Level level) { - for (MapInteractionPlugin p : plugins) { + for (final MapInteractionPlugin p : plugins) { p.onStepEnd(this, pc); } } @@ -96,7 +97,7 @@ public class MapView extends InputComponent implements KeyListener, MouseButtonL if (!event.isUp()) return; // only btn-release evt - for (MapInteractionPlugin p : plugins) { + for (final MapInteractionPlugin p : plugins) { p.onClick(this, pc, event.getPos()); } @@ -109,7 +110,7 @@ public class MapView extends InputComponent implements KeyListener, MouseButtonL { if (!event.isDown()) return; - for (MapInteractionPlugin p : plugins) { + for (final MapInteractionPlugin p : plugins) { p.onKey(this, pc, event.getKey()); } diff --git a/src/mightypork/rogue/screens/main_menu/MenuButton.java b/src/mightypork/rogue/screens/main_menu/MenuButton.java index fcd965a..1f287fb 100644 --- a/src/mightypork/rogue/screens/main_menu/MenuButton.java +++ b/src/mightypork/rogue/screens/main_menu/MenuButton.java @@ -6,10 +6,10 @@ import mightypork.gamecore.gui.components.ClickableComponent; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.render.fonts.GLFont; import mightypork.rogue.Res; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.mutable.VectVar; import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; class MenuButton extends ClickableComponent { diff --git a/src/mightypork/rogue/screens/main_menu/MenuLayer.java b/src/mightypork/rogue/screens/main_menu/MenuLayer.java index 3f23196..5ff08d4 100644 --- a/src/mightypork/rogue/screens/main_menu/MenuLayer.java +++ b/src/mightypork/rogue/screens/main_menu/MenuLayer.java @@ -9,11 +9,11 @@ import mightypork.gamecore.gui.screens.BaseScreen; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.rogue.Res; import mightypork.rogue.screens.CrossfadeRequest; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.rect.Rect; import mightypork.util.control.Action; import mightypork.util.math.color.COMMODORE; import mightypork.util.math.color.PAL16; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.rect.Rect; class MenuLayer extends ScreenLayer { diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java index b265d68..2251c72 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java @@ -5,13 +5,13 @@ import java.util.Random; import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.render.Render; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.mutable.NumAnimated; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.caching.RectCache; -import mightypork.util.control.timing.Updateable; import mightypork.util.math.Easing; import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.mutable.NumAnimated; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.caching.RectCache; +import mightypork.util.timing.Updateable; public class BouncyBox extends VisualComponent implements Updateable { diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java b/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java index 4185fd9..a1e80cf 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java @@ -12,9 +12,9 @@ import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.rogue.Res; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.vect.Vect; import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.vect.Vect; public class LayerBouncyBoxes extends ScreenLayer { diff --git a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java index 58eeba4..f5cad55 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java +++ b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java @@ -14,12 +14,12 @@ import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.rogue.Res; -import mightypork.util.constraints.num.mutable.NumAnimated; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.mutable.VectAnimated; import mightypork.util.math.Easing; import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.num.mutable.NumAnimated; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectAnimated; public class LayerFlyingCat extends ScreenLayer implements MouseButtonListener { diff --git a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java index 38feb1e..028b3e6 100644 --- a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java +++ b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java @@ -4,8 +4,8 @@ package mightypork.rogue.screens.test_render; import mightypork.gamecore.gui.screens.BaseScreen; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.render.Render; -import mightypork.util.constraints.rect.proxy.RectBound; import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.rect.proxy.RectBound; public class LayerTestGradient extends ScreenLayer { diff --git a/src/mightypork/rogue/world/PathStep.java b/src/mightypork/rogue/world/PathStep.java index 4a5ce14..2018136 100644 --- a/src/mightypork/rogue/world/PathStep.java +++ b/src/mightypork/rogue/world/PathStep.java @@ -3,9 +3,9 @@ package mightypork.rogue.world; import java.io.IOException; -import mightypork.util.ion.IonBinary; -import mightypork.util.ion.IonInput; -import mightypork.util.ion.IonOutput; +import mightypork.util.files.ion.IonBinary; +import mightypork.util.files.ion.IonInput; +import mightypork.util.files.ion.IonOutput; public class PathStep implements IonBinary { diff --git a/src/mightypork/rogue/world/PlayerControl.java b/src/mightypork/rogue/world/PlayerControl.java index 4fa0784..e6a5091 100644 --- a/src/mightypork/rogue/world/PlayerControl.java +++ b/src/mightypork/rogue/world/PlayerControl.java @@ -10,7 +10,8 @@ public class PlayerControl { private final World world; - public PlayerControl(World w) { + public PlayerControl(World w) + { this.world = w; } diff --git a/src/mightypork/rogue/world/PlayerInfo.java b/src/mightypork/rogue/world/PlayerInfo.java index f7a2337..bd02c5f 100644 --- a/src/mightypork/rogue/world/PlayerInfo.java +++ b/src/mightypork/rogue/world/PlayerInfo.java @@ -3,8 +3,8 @@ package mightypork.rogue.world; import java.io.IOException; -import mightypork.util.ion.IonBundle; -import mightypork.util.ion.IonBundled; +import mightypork.util.files.ion.IonBundle; +import mightypork.util.files.ion.IonBundled; public class PlayerInfo implements IonBundled { diff --git a/src/mightypork/rogue/world/World.java b/src/mightypork/rogue/world/World.java index 054a911..98f6392 100644 --- a/src/mightypork/rogue/world/World.java +++ b/src/mightypork/rogue/world/World.java @@ -7,9 +7,9 @@ import java.util.ArrayList; import mightypork.rogue.world.entity.Entities; import mightypork.rogue.world.entity.Entity; import mightypork.rogue.world.level.Level; -import mightypork.util.control.timing.Updateable; -import mightypork.util.ion.IonBundle; -import mightypork.util.ion.IonBundled; +import mightypork.util.files.ion.IonBundle; +import mightypork.util.files.ion.IonBundled; +import mightypork.util.timing.Updateable; /** @@ -114,8 +114,8 @@ public class World implements IonBundled, Updateable { { return control; } - - + + public Entity getPlayerEntity() { return playerEntity; diff --git a/src/mightypork/rogue/world/WorldPos.java b/src/mightypork/rogue/world/WorldPos.java index d6703ff..44a38df 100644 --- a/src/mightypork/rogue/world/WorldPos.java +++ b/src/mightypork/rogue/world/WorldPos.java @@ -3,12 +3,12 @@ package mightypork.rogue.world; import java.io.IOException; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.mutable.VectAnimated; -import mightypork.util.control.timing.Updateable; -import mightypork.util.ion.IonBundle; -import mightypork.util.ion.IonBundled; +import mightypork.util.files.ion.IonBundle; +import mightypork.util.files.ion.IonBundled; import mightypork.util.math.Easing; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectAnimated; +import mightypork.util.timing.Updateable; /** diff --git a/src/mightypork/rogue/world/WorldRenderer.java b/src/mightypork/rogue/world/WorldRenderer.java index 9237fd2..94ac1f6 100644 --- a/src/mightypork/rogue/world/WorldRenderer.java +++ b/src/mightypork/rogue/world/WorldRenderer.java @@ -6,17 +6,15 @@ import mightypork.rogue.Res; import mightypork.rogue.world.entity.Entity; import mightypork.rogue.world.level.Level; import mightypork.rogue.world.level.render.TileRenderContext; -import mightypork.util.constraints.Pollable; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.caching.NumCache; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.RectConst; -import mightypork.util.constraints.rect.caching.RectCache; -import mightypork.util.constraints.rect.proxy.RectProxy; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; -import mightypork.util.constraints.vect.caching.VectCache; import mightypork.util.math.color.RGB; +import mightypork.util.math.constraints.Pollable; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.caching.NumCache; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.caching.RectCache; +import mightypork.util.math.constraints.rect.proxy.RectProxy; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.caching.VectCache; /** @@ -46,7 +44,8 @@ public class WorldRenderer extends RectProxy implements Pollable { private TileRenderContext trc; - public WorldRenderer(World world, Rect viewport, int xTiles, int yTiles, int minTileSize) { + public WorldRenderer(World world, Rect viewport, int xTiles, int yTiles, int minTileSize) + { super(viewport); this.world = world; @@ -71,7 +70,7 @@ public class WorldRenderer extends RectProxy implements Pollable { private void rebuildTiles() { - Level level = world.getCurrentLevel(); + final Level level = world.getCurrentLevel(); if (activeLevel == level) return; activeLevel = level; @@ -84,18 +83,18 @@ public class WorldRenderer extends RectProxy implements Pollable { private Vect getOffset() { - WorldPos pos = player.getPosition(); + final WorldPos pos = player.getPosition(); final double playerX = pos.getVisualX(); final double playerY = pos.getVisualY(); - double ts = tileSize.value(); + final double ts = tileSize.value(); return Vect.make((-ts * playerX), (-ts * playerY)); } public void render() - { + { Render.pushMatrix(); Render.setColor(RGB.WHITE); Render.translate(getOffset()); @@ -106,10 +105,13 @@ public class WorldRenderer extends RectProxy implements Pollable { final double h = height().value(); final double ts = tileSize.value(); - final int x1 = (int) Math.floor(pos.x - (w / (ts*2))); - final int y1 = (int) Math.floor(pos.y - (h / (ts*2))); - final int x2 = (int) Math.ceil(pos.x + (w / (ts*2))); - final int y2 = (int) Math.ceil(pos.y + (h / (ts*2)))+1; + final int xtilesh = (int) (w / (ts * 2)) + 1; + final int ytilesh = (int) (h / (ts * 2)) + 1; + + final int x1 = pos.x - xtilesh; + final int y1 = pos.y - ytilesh; + final int x2 = pos.x + xtilesh; + final int y2 = pos.y + ytilesh; // === TILES === @@ -118,16 +120,11 @@ public class WorldRenderer extends RectProxy implements Pollable { Render.enterBatchTexturedQuadMode(Res.getTexture("tiles16")); } - Render.setColor(RGB.WHITE); - - int c = 0; for (trc.y = y1; trc.y <= y2; trc.y++) { for (trc.x = x1; trc.x <= x2; trc.x++) { trc.renderTile(); - c++; } } - System.out.println(c); if (USE_BATCH_RENDERING) { Render.leaveBatchTexturedQuadMode(); @@ -146,8 +143,8 @@ public class WorldRenderer extends RectProxy implements Pollable { for (final Entity e : activeLevel.getEntities()) { // avoid entities out of view rect - int x = (int) Math.round(e.getPosition().getVisualX()); - int y = (int) Math.round(e.getPosition().getVisualY()); + final int x = (int) Math.round(e.getPosition().getVisualX()); + final int y = (int) Math.round(e.getPosition().getVisualY()); if (x < x1 - ts || x > x2 + ts) continue; if (y < y1 - ts || y > y2 + ts) continue; @@ -169,8 +166,8 @@ public class WorldRenderer extends RectProxy implements Pollable { public WorldPos getClickedTile(Vect clickPos) { - Vect v = clickPos.sub(mapRect.origin().add(getOffset())); - int ts = (int) tileSize.value(); + final Vect v = clickPos.sub(mapRect.origin().add(getOffset())); + final int ts = (int) tileSize.value(); return new WorldPos(v.xi() / ts, v.yi() / ts); } diff --git a/src/mightypork/rogue/world/entity/Entity.java b/src/mightypork/rogue/world/entity/Entity.java index 49498fa..218b1a6 100644 --- a/src/mightypork/rogue/world/entity/Entity.java +++ b/src/mightypork/rogue/world/entity/Entity.java @@ -14,11 +14,11 @@ import mightypork.rogue.world.entity.models.EntityModel; import mightypork.rogue.world.entity.models.EntityMoveListener; import mightypork.rogue.world.level.Level; import mightypork.rogue.world.level.render.MapRenderContext; -import mightypork.util.ion.IonBinary; -import mightypork.util.ion.IonBundle; -import mightypork.util.ion.IonBundled; -import mightypork.util.ion.IonInput; -import mightypork.util.ion.IonOutput; +import mightypork.util.files.ion.IonBinary; +import mightypork.util.files.ion.IonBundle; +import mightypork.util.files.ion.IonBundled; +import mightypork.util.files.ion.IonInput; +import mightypork.util.files.ion.IonOutput; /** @@ -188,7 +188,7 @@ public final class Entity implements IonBinary, IonBundled, EntityMoveListener { walking = true; - PathStep step = path.poll(); + final PathStep step = path.poll(); final int projX = position.x + step.x, projY = position.y + step.y; diff --git a/src/mightypork/rogue/world/entity/renderers/PlayerRenderer.java b/src/mightypork/rogue/world/entity/renderers/PlayerRenderer.java index 91c40a4..979ebf8 100644 --- a/src/mightypork/rogue/world/entity/renderers/PlayerRenderer.java +++ b/src/mightypork/rogue/world/entity/renderers/PlayerRenderer.java @@ -8,8 +8,8 @@ import mightypork.rogue.Res; import mightypork.rogue.world.WorldPos; import mightypork.rogue.world.entity.Entity; import mightypork.rogue.world.level.render.MapRenderContext; -import mightypork.util.constraints.rect.Rect; import mightypork.util.math.Calc; +import mightypork.util.math.constraints.rect.Rect; public class PlayerRenderer extends EntityRenderer { diff --git a/src/mightypork/rogue/world/item/Item.java b/src/mightypork/rogue/world/item/Item.java index 952ca4b..1bd8bce 100644 --- a/src/mightypork/rogue/world/item/Item.java +++ b/src/mightypork/rogue/world/item/Item.java @@ -3,10 +3,10 @@ package mightypork.rogue.world.item; import java.io.IOException; -import mightypork.util.constraints.rect.proxy.RectBound; -import mightypork.util.ion.IonBinary; -import mightypork.util.ion.IonInput; -import mightypork.util.ion.IonOutput; +import mightypork.util.files.ion.IonBinary; +import mightypork.util.files.ion.IonInput; +import mightypork.util.files.ion.IonOutput; +import mightypork.util.math.constraints.rect.proxy.RectBound; public class Item implements IonBinary { diff --git a/src/mightypork/rogue/world/item/ItemModel.java b/src/mightypork/rogue/world/item/ItemModel.java index c9f445a..66356e9 100644 --- a/src/mightypork/rogue/world/item/ItemModel.java +++ b/src/mightypork/rogue/world/item/ItemModel.java @@ -2,7 +2,7 @@ package mightypork.rogue.world.item; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.proxy.RectBound; public abstract class ItemModel { diff --git a/src/mightypork/rogue/world/level/Level.java b/src/mightypork/rogue/world/level/Level.java index e1c30c1..1687d08 100644 --- a/src/mightypork/rogue/world/level/Level.java +++ b/src/mightypork/rogue/world/level/Level.java @@ -13,10 +13,10 @@ import mightypork.rogue.world.entity.Entity; import mightypork.rogue.world.tile.Tile; import mightypork.rogue.world.tile.Tiles; import mightypork.rogue.world.tile.models.TileModel; -import mightypork.util.ion.IonBinary; -import mightypork.util.ion.IonBundle; -import mightypork.util.ion.IonInput; -import mightypork.util.ion.IonOutput; +import mightypork.util.files.ion.IonBinary; +import mightypork.util.files.ion.IonBundle; +import mightypork.util.files.ion.IonInput; +import mightypork.util.files.ion.IonOutput; import mightypork.util.math.noise.NoiseGen; @@ -43,11 +43,13 @@ public class Level implements MapAccess, IonBinary { private transient NoiseGen noiseGen; - public Level() { + public Level() + { } - public Level(int width, int height) { + public Level(int width, int height) + { this.width = width; this.height = height; buildArray(); diff --git a/src/mightypork/rogue/world/level/render/EntityRenderContext.java b/src/mightypork/rogue/world/level/render/EntityRenderContext.java index bdc48e8..8101220 100644 --- a/src/mightypork/rogue/world/level/render/EntityRenderContext.java +++ b/src/mightypork/rogue/world/level/render/EntityRenderContext.java @@ -2,7 +2,7 @@ package mightypork.rogue.world.level.render; import mightypork.rogue.world.level.MapAccess; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; public class EntityRenderContext extends MapRenderContext { diff --git a/src/mightypork/rogue/world/level/render/MapRenderContext.java b/src/mightypork/rogue/world/level/render/MapRenderContext.java index 5366aa2..42dfaee 100644 --- a/src/mightypork/rogue/world/level/render/MapRenderContext.java +++ b/src/mightypork/rogue/world/level/render/MapRenderContext.java @@ -2,8 +2,8 @@ package mightypork.rogue.world.level.render; import mightypork.rogue.world.level.MapAccess; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.builders.TiledRect; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.builders.TiledRect; public abstract class MapRenderContext { @@ -13,14 +13,15 @@ public abstract class MapRenderContext { private final Rect mapRect; - public MapRenderContext(MapAccess map, Rect drawArea) { - this.map = map; + public MapRenderContext(MapAccess map, Rect drawArea) + { + this.map = map; this.tiler = drawArea.tiles(map.getWidth(), map.getHeight()); this.mapRect = drawArea; } - - + + public Rect getRectForTile(int x, int y) { return tiler.tile(x, y); diff --git a/src/mightypork/rogue/world/level/render/TileRenderContext.java b/src/mightypork/rogue/world/level/render/TileRenderContext.java index 8f9aa42..99c68d8 100644 --- a/src/mightypork/rogue/world/level/render/TileRenderContext.java +++ b/src/mightypork/rogue/world/level/render/TileRenderContext.java @@ -3,8 +3,8 @@ package mightypork.rogue.world.level.render; import mightypork.rogue.world.level.MapAccess; import mightypork.rogue.world.tile.Tile; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.math.noise.NoiseGen; diff --git a/src/mightypork/rogue/world/tile/DroppedItemRenderer.java b/src/mightypork/rogue/world/tile/DroppedItemRenderer.java index 95a2e36..33464f9 100644 --- a/src/mightypork/rogue/world/tile/DroppedItemRenderer.java +++ b/src/mightypork/rogue/world/tile/DroppedItemRenderer.java @@ -3,11 +3,11 @@ package mightypork.rogue.world.tile; import mightypork.rogue.world.item.Item; import mightypork.rogue.world.level.render.TileRenderContext; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.RectBoundAdapter; -import mightypork.util.control.timing.Animator; -import mightypork.util.control.timing.AnimatorBounce; import mightypork.util.math.Easing; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; +import mightypork.util.timing.Animator; +import mightypork.util.timing.AnimatorBounce; public class DroppedItemRenderer { diff --git a/src/mightypork/rogue/world/tile/Tile.java b/src/mightypork/rogue/world/tile/Tile.java index 169b6bb..a6a180f 100644 --- a/src/mightypork/rogue/world/tile/Tile.java +++ b/src/mightypork/rogue/world/tile/Tile.java @@ -9,10 +9,10 @@ import mightypork.rogue.world.level.Level; import mightypork.rogue.world.level.render.TileRenderContext; import mightypork.rogue.world.tile.models.TileModel; import mightypork.rogue.world.tile.renderers.TileRenderer; -import mightypork.util.ion.IonBinary; -import mightypork.util.ion.IonBundle; -import mightypork.util.ion.IonInput; -import mightypork.util.ion.IonOutput; +import mightypork.util.files.ion.IonBinary; +import mightypork.util.files.ion.IonBundle; +import mightypork.util.files.ion.IonInput; +import mightypork.util.files.ion.IonOutput; /** diff --git a/src/mightypork/rogue/world/tile/renderers/BasicTileRenderer.java b/src/mightypork/rogue/world/tile/renderers/BasicTileRenderer.java index bc0e9d1..25d008a 100644 --- a/src/mightypork/rogue/world/tile/renderers/BasicTileRenderer.java +++ b/src/mightypork/rogue/world/tile/renderers/BasicTileRenderer.java @@ -7,7 +7,7 @@ import mightypork.gamecore.render.textures.TxSheet; import mightypork.rogue.Res; import mightypork.rogue.world.level.render.TileRenderContext; import mightypork.rogue.world.tile.Tile; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; public class BasicTileRenderer extends TileRenderer { diff --git a/src/mightypork/util/control/eventbus/BusEvent.java b/src/mightypork/util/control/eventbus/BusEvent.java index 5ff884c..da8a144 100644 --- a/src/mightypork/util/control/eventbus/BusEvent.java +++ b/src/mightypork/util/control/eventbus/BusEvent.java @@ -1,11 +1,11 @@ package mightypork.util.control.eventbus; -import mightypork.util.control.eventbus.events.flags.DelayedEvent; -import mightypork.util.control.eventbus.events.flags.ImmediateEvent; -import mightypork.util.control.eventbus.events.flags.NonConsumableEvent; -import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; -import mightypork.util.control.eventbus.events.flags.UnloggedEvent; +import mightypork.util.control.eventbus.event_flags.DelayedEvent; +import mightypork.util.control.eventbus.event_flags.ImmediateEvent; +import mightypork.util.control.eventbus.event_flags.NonConsumableEvent; +import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent; +import mightypork.util.control.eventbus.event_flags.UnloggedEvent; /** @@ -52,7 +52,6 @@ public abstract class BusEvent { */ public final void consume() { - System.out.println("consume "+getClass()); if (consumed) throw new IllegalStateException("Already consumed."); if (getClass().isAnnotationPresent(NonConsumableEvent.class)) { diff --git a/src/mightypork/util/control/eventbus/EventBus.java b/src/mightypork/util/control/eventbus/EventBus.java index 97a61b3..c6ce22a 100644 --- a/src/mightypork/util/control/eventbus/EventBus.java +++ b/src/mightypork/util/control/eventbus/EventBus.java @@ -10,10 +10,9 @@ import java.util.concurrent.TimeUnit; import mightypork.util.control.Destroyable; import mightypork.util.control.eventbus.clients.DelegatingClient; -import mightypork.util.control.eventbus.events.flags.DelayedEvent; -import mightypork.util.control.eventbus.events.flags.ImmediateEvent; -import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; -import mightypork.util.control.eventbus.events.flags.UnloggedEvent; +import mightypork.util.control.eventbus.event_flags.DelayedEvent; +import mightypork.util.control.eventbus.event_flags.ImmediateEvent; +import mightypork.util.control.eventbus.event_flags.UnloggedEvent; import mightypork.util.logging.Log; @@ -107,7 +106,7 @@ final public class EventBus implements Destroyable { // BEHOLD, MAGIC! final Type evtc = event.getClass().getGenericSuperclass(); - + if (evtc instanceof ParameterizedType) { if (((ParameterizedType) evtc).getRawType() == BusEvent.class) { final Type[] types = ((ParameterizedType) evtc).getActualTypeArguments(); diff --git a/src/mightypork/util/control/eventbus/EventChannel.java b/src/mightypork/util/control/eventbus/EventChannel.java index 93589b0..76f09c1 100644 --- a/src/mightypork/util/control/eventbus/EventChannel.java +++ b/src/mightypork/util/control/eventbus/EventChannel.java @@ -6,7 +6,6 @@ import java.util.HashSet; import mightypork.util.control.eventbus.clients.DelegatingClient; import mightypork.util.control.eventbus.clients.ToggleableClient; -import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; import mightypork.util.logging.Log; diff --git a/src/mightypork/util/control/eventbus/events/flags/DelayedEvent.java b/src/mightypork/util/control/eventbus/event_flags/DelayedEvent.java similarity index 85% rename from src/mightypork/util/control/eventbus/events/flags/DelayedEvent.java rename to src/mightypork/util/control/eventbus/event_flags/DelayedEvent.java index 65f8d12..36fd340 100644 --- a/src/mightypork/util/control/eventbus/events/flags/DelayedEvent.java +++ b/src/mightypork/util/control/eventbus/event_flags/DelayedEvent.java @@ -1,4 +1,4 @@ -package mightypork.util.control.eventbus.events.flags; +package mightypork.util.control.eventbus.event_flags; import java.lang.annotation.*; diff --git a/src/mightypork/util/control/eventbus/events/flags/ImmediateEvent.java b/src/mightypork/util/control/eventbus/event_flags/ImmediateEvent.java similarity index 80% rename from src/mightypork/util/control/eventbus/events/flags/ImmediateEvent.java rename to src/mightypork/util/control/eventbus/event_flags/ImmediateEvent.java index f7bd4d5..9884bae 100644 --- a/src/mightypork/util/control/eventbus/events/flags/ImmediateEvent.java +++ b/src/mightypork/util/control/eventbus/event_flags/ImmediateEvent.java @@ -1,4 +1,4 @@ -package mightypork.util.control.eventbus.events.flags; +package mightypork.util.control.eventbus.event_flags; import java.lang.annotation.*; diff --git a/src/mightypork/util/control/eventbus/events/flags/NonConsumableEvent.java b/src/mightypork/util/control/eventbus/event_flags/NonConsumableEvent.java similarity index 87% rename from src/mightypork/util/control/eventbus/events/flags/NonConsumableEvent.java rename to src/mightypork/util/control/eventbus/event_flags/NonConsumableEvent.java index e39f949..987e86b 100644 --- a/src/mightypork/util/control/eventbus/events/flags/NonConsumableEvent.java +++ b/src/mightypork/util/control/eventbus/event_flags/NonConsumableEvent.java @@ -1,4 +1,5 @@ -package mightypork.util.control.eventbus.events.flags; +package mightypork.util.control.eventbus.event_flags; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/mightypork/util/control/eventbus/events/flags/SingleReceiverEvent.java b/src/mightypork/util/control/eventbus/event_flags/SingleReceiverEvent.java similarity index 81% rename from src/mightypork/util/control/eventbus/events/flags/SingleReceiverEvent.java rename to src/mightypork/util/control/eventbus/event_flags/SingleReceiverEvent.java index 0bc033d..cd7fa43 100644 --- a/src/mightypork/util/control/eventbus/events/flags/SingleReceiverEvent.java +++ b/src/mightypork/util/control/eventbus/event_flags/SingleReceiverEvent.java @@ -1,4 +1,4 @@ -package mightypork.util.control.eventbus.events.flags; +package mightypork.util.control.eventbus.event_flags; import java.lang.annotation.*; diff --git a/src/mightypork/util/control/eventbus/events/flags/UnloggedEvent.java b/src/mightypork/util/control/eventbus/event_flags/UnloggedEvent.java similarity index 85% rename from src/mightypork/util/control/eventbus/events/flags/UnloggedEvent.java rename to src/mightypork/util/control/eventbus/event_flags/UnloggedEvent.java index 7eed194..b07deaa 100644 --- a/src/mightypork/util/control/eventbus/events/flags/UnloggedEvent.java +++ b/src/mightypork/util/control/eventbus/event_flags/UnloggedEvent.java @@ -1,4 +1,4 @@ -package mightypork.util.control.eventbus.events.flags; +package mightypork.util.control.eventbus.event_flags; import java.lang.annotation.*; diff --git a/src/mightypork/util/config/PropertyManager.java b/src/mightypork/util/files/config/PropertyManager.java similarity index 98% rename from src/mightypork/util/config/PropertyManager.java rename to src/mightypork/util/files/config/PropertyManager.java index d84c6e1..ff43043 100644 --- a/src/mightypork/util/config/PropertyManager.java +++ b/src/mightypork/util/files/config/PropertyManager.java @@ -1,4 +1,4 @@ -package mightypork.util.config; +package mightypork.util.files.config; import java.io.File; @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.Map.Entry; import java.util.TreeMap; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; import mightypork.util.math.Range; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; import mightypork.util.objects.Convert; diff --git a/src/mightypork/util/config/SimpleConfig.java b/src/mightypork/util/files/config/SimpleConfig.java similarity index 99% rename from src/mightypork/util/config/SimpleConfig.java rename to src/mightypork/util/files/config/SimpleConfig.java index d5cb83c..d742a22 100644 --- a/src/mightypork/util/config/SimpleConfig.java +++ b/src/mightypork/util/files/config/SimpleConfig.java @@ -1,4 +1,4 @@ -package mightypork.util.config; +package mightypork.util.files.config; import java.io.File; diff --git a/src/mightypork/util/config/SortedProperties.java b/src/mightypork/util/files/config/SortedProperties.java similarity index 99% rename from src/mightypork/util/config/SortedProperties.java rename to src/mightypork/util/files/config/SortedProperties.java index cc69a8d..c571ffa 100644 --- a/src/mightypork/util/config/SortedProperties.java +++ b/src/mightypork/util/files/config/SortedProperties.java @@ -1,4 +1,4 @@ -package mightypork.util.config; +package mightypork.util.files.config; import java.io.*; diff --git a/src/mightypork/util/ion/Ion.java b/src/mightypork/util/files/ion/Ion.java similarity index 98% rename from src/mightypork/util/ion/Ion.java rename to src/mightypork/util/files/ion/Ion.java index 0fbc28c..1d8b322 100644 --- a/src/mightypork/util/ion/Ion.java +++ b/src/mightypork/util/files/ion/Ion.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.*; @@ -212,7 +212,7 @@ public class Ion { */ public static T fromStream(InputStream in, Class objClass) throws IOException { - return unwrap((IonBundle)new IonInput(in).readObject(), objClass); + return unwrap((IonBundle) new IonInput(in).readObject(), objClass); } diff --git a/src/mightypork/util/ion/IonBinary.java b/src/mightypork/util/files/ion/IonBinary.java similarity index 94% rename from src/mightypork/util/ion/IonBinary.java rename to src/mightypork/util/files/ion/IonBinary.java index a53d345..a58abf2 100644 --- a/src/mightypork/util/ion/IonBinary.java +++ b/src/mightypork/util/files/ion/IonBinary.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/util/ion/IonBundle.java b/src/mightypork/util/files/ion/IonBundle.java similarity index 99% rename from src/mightypork/util/ion/IonBundle.java rename to src/mightypork/util/files/ion/IonBundle.java index a421644..3aa301e 100644 --- a/src/mightypork/util/ion/IonBundle.java +++ b/src/mightypork/util/files/ion/IonBundle.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/util/ion/IonBundled.java b/src/mightypork/util/files/ion/IonBundled.java similarity index 86% rename from src/mightypork/util/ion/IonBundled.java rename to src/mightypork/util/files/ion/IonBundled.java index ae2915f..7f4622c 100644 --- a/src/mightypork/util/ion/IonBundled.java +++ b/src/mightypork/util/files/ion/IonBundled.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/util/ion/IonInput.java b/src/mightypork/util/files/ion/IonInput.java similarity index 99% rename from src/mightypork/util/ion/IonInput.java rename to src/mightypork/util/files/ion/IonInput.java index 083e3bb..92f6375 100644 --- a/src/mightypork/util/ion/IonInput.java +++ b/src/mightypork/util/files/ion/IonInput.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.DataInput; diff --git a/src/mightypork/util/ion/IonMapWrapper.java b/src/mightypork/util/files/ion/IonMapWrapper.java similarity index 94% rename from src/mightypork/util/ion/IonMapWrapper.java rename to src/mightypork/util/files/ion/IonMapWrapper.java index 481a7ab..2724dfe 100644 --- a/src/mightypork/util/ion/IonMapWrapper.java +++ b/src/mightypork/util/files/ion/IonMapWrapper.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/util/ion/IonOutput.java b/src/mightypork/util/files/ion/IonOutput.java similarity index 99% rename from src/mightypork/util/ion/IonOutput.java rename to src/mightypork/util/files/ion/IonOutput.java index f443b78..4260c55 100644 --- a/src/mightypork/util/ion/IonOutput.java +++ b/src/mightypork/util/files/ion/IonOutput.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.DataOutput; diff --git a/src/mightypork/util/ion/IonSequenceWrapper.java b/src/mightypork/util/files/ion/IonSequenceWrapper.java similarity index 95% rename from src/mightypork/util/ion/IonSequenceWrapper.java rename to src/mightypork/util/files/ion/IonSequenceWrapper.java index becb53f..e9edb2b 100644 --- a/src/mightypork/util/ion/IonSequenceWrapper.java +++ b/src/mightypork/util/files/ion/IonSequenceWrapper.java @@ -1,4 +1,4 @@ -package mightypork.util.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/util/math/Calc.java b/src/mightypork/util/math/Calc.java index 516c657..f6a6d47 100644 --- a/src/mightypork/util/math/Calc.java +++ b/src/mightypork/util/math/Calc.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; import org.lwjgl.BufferUtils; diff --git a/src/mightypork/util/math/Polar.java b/src/mightypork/util/math/Polar.java index 4be6afd..ec378ab 100644 --- a/src/mightypork/util/math/Polar.java +++ b/src/mightypork/util/math/Polar.java @@ -1,7 +1,7 @@ package mightypork.util.math; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/color/Color.java b/src/mightypork/util/math/color/Color.java index 73d2996..b192236 100644 --- a/src/mightypork/util/math/color/Color.java +++ b/src/mightypork/util/math/color/Color.java @@ -5,8 +5,8 @@ import java.util.EmptyStackException; import java.util.Stack; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.constraints.num.Num; import mightypork.util.math.Calc; +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/util/math/color/ColorAlphaAdjuster.java b/src/mightypork/util/math/color/ColorAlphaAdjuster.java index 4e04371..61db6e5 100644 --- a/src/mightypork/util/math/color/ColorAlphaAdjuster.java +++ b/src/mightypork/util/math/color/ColorAlphaAdjuster.java @@ -1,7 +1,7 @@ package mightypork.util.math.color; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public class ColorAlphaAdjuster extends Color { diff --git a/src/mightypork/util/math/color/ColorHsb.java b/src/mightypork/util/math/color/ColorHsb.java index 0f038f2..e75f276 100644 --- a/src/mightypork/util/math/color/ColorHsb.java +++ b/src/mightypork/util/math/color/ColorHsb.java @@ -1,7 +1,7 @@ package mightypork.util.math.color; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public class ColorHsb extends Color { diff --git a/src/mightypork/util/math/color/ColorRgb.java b/src/mightypork/util/math/color/ColorRgb.java index 3cd28ba..15982a4 100644 --- a/src/mightypork/util/math/color/ColorRgb.java +++ b/src/mightypork/util/math/color/ColorRgb.java @@ -1,7 +1,7 @@ package mightypork.util.math.color; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public class ColorRgb extends Color { diff --git a/src/mightypork/util/constraints/ConstraintCache.java b/src/mightypork/util/math/constraints/ConstraintCache.java similarity index 94% rename from src/mightypork/util/constraints/ConstraintCache.java rename to src/mightypork/util/math/constraints/ConstraintCache.java index 2d1ee48..f509531 100644 --- a/src/mightypork/util/constraints/ConstraintCache.java +++ b/src/mightypork/util/math/constraints/ConstraintCache.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints; +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/util/constraints/DigestCache.java b/src/mightypork/util/math/constraints/DigestCache.java similarity index 95% rename from src/mightypork/util/constraints/DigestCache.java rename to src/mightypork/util/math/constraints/DigestCache.java index 8336b83..69fe9f0 100644 --- a/src/mightypork/util/constraints/DigestCache.java +++ b/src/mightypork/util/math/constraints/DigestCache.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints; +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/util/constraints/Digestable.java b/src/mightypork/util/math/constraints/Digestable.java similarity index 97% rename from src/mightypork/util/constraints/Digestable.java rename to src/mightypork/util/math/constraints/Digestable.java index 94e32d9..7d85ad9 100644 --- a/src/mightypork/util/constraints/Digestable.java +++ b/src/mightypork/util/math/constraints/Digestable.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints; +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/util/constraints/Pollable.java b/src/mightypork/util/math/constraints/Pollable.java similarity index 78% rename from src/mightypork/util/constraints/Pollable.java rename to src/mightypork/util/math/constraints/Pollable.java index 8a2e5b4..d838aae 100644 --- a/src/mightypork/util/constraints/Pollable.java +++ b/src/mightypork/util/math/constraints/Pollable.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints; +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/util/constraints/Poller.java b/src/mightypork/util/math/constraints/Poller.java similarity index 93% rename from src/mightypork/util/constraints/Poller.java rename to src/mightypork/util/math/constraints/Poller.java index 5ef48a2..c188e99 100644 --- a/src/mightypork/util/constraints/Poller.java +++ b/src/mightypork/util/math/constraints/Poller.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints; +package mightypork.util.math.constraints; import java.util.LinkedHashSet; diff --git a/src/mightypork/util/constraints/num/Num.java b/src/mightypork/util/math/constraints/num/Num.java similarity index 94% rename from src/mightypork/util/constraints/num/Num.java rename to src/mightypork/util/math/constraints/num/Num.java index 325fe6f..aa9fc30 100644 --- a/src/mightypork/util/constraints/num/Num.java +++ b/src/mightypork/util/math/constraints/num/Num.java @@ -1,16 +1,16 @@ -package mightypork.util.constraints.num; +package mightypork.util.math.constraints.num; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.constraints.DigestCache; -import mightypork.util.constraints.Digestable; -import mightypork.util.constraints.num.caching.NumCache; -import mightypork.util.constraints.num.caching.NumDigest; -import mightypork.util.constraints.num.mutable.NumVar; -import mightypork.util.constraints.num.proxy.NumBound; -import mightypork.util.constraints.num.proxy.NumBoundAdapter; -import mightypork.util.constraints.vect.Vect; import mightypork.util.math.Calc; +import mightypork.util.math.constraints.DigestCache; +import mightypork.util.math.constraints.Digestable; +import mightypork.util.math.constraints.num.caching.NumCache; +import mightypork.util.math.constraints.num.caching.NumDigest; +import mightypork.util.math.constraints.num.mutable.NumVar; +import mightypork.util.math.constraints.num.proxy.NumBound; +import mightypork.util.math.constraints.num.proxy.NumBoundAdapter; +import mightypork.util.math.constraints.vect.Vect; public abstract class Num implements NumBound, Digestable { diff --git a/src/mightypork/util/constraints/num/NumConst.java b/src/mightypork/util/math/constraints/num/NumConst.java similarity index 96% rename from src/mightypork/util/constraints/num/NumConst.java rename to src/mightypork/util/math/constraints/num/NumConst.java index 484fac3..1401c10 100644 --- a/src/mightypork/util/constraints/num/NumConst.java +++ b/src/mightypork/util/math/constraints/num/NumConst.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num; +package mightypork.util.math.constraints.num; -import mightypork.util.constraints.num.caching.NumDigest; +import mightypork.util.math.constraints.num.caching.NumDigest; /** diff --git a/src/mightypork/util/constraints/num/caching/AbstractNumCache.java b/src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java similarity index 81% rename from src/mightypork/util/constraints/num/caching/AbstractNumCache.java rename to src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java index 56494fd..0beb859 100644 --- a/src/mightypork/util/constraints/num/caching/AbstractNumCache.java +++ b/src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java @@ -1,10 +1,10 @@ -package mightypork.util.constraints.num.caching; +package mightypork.util.math.constraints.num.caching; -import mightypork.util.constraints.ConstraintCache; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.mutable.NumVar; -import mightypork.util.constraints.num.proxy.NumAdapter; +import mightypork.util.math.constraints.ConstraintCache; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.mutable.NumVar; +import mightypork.util.math.constraints.num.proxy.NumAdapter; /** diff --git a/src/mightypork/util/constraints/num/caching/NumCache.java b/src/mightypork/util/math/constraints/num/caching/NumCache.java similarity index 79% rename from src/mightypork/util/constraints/num/caching/NumCache.java rename to src/mightypork/util/math/constraints/num/caching/NumCache.java index 1ef6cde..f4f902d 100644 --- a/src/mightypork/util/constraints/num/caching/NumCache.java +++ b/src/mightypork/util/math/constraints/num/caching/NumCache.java @@ -1,8 +1,8 @@ -package mightypork.util.constraints.num.caching; +package mightypork.util.math.constraints.num.caching; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/util/constraints/num/caching/NumDigest.java b/src/mightypork/util/math/constraints/num/caching/NumDigest.java similarity index 67% rename from src/mightypork/util/constraints/num/caching/NumDigest.java rename to src/mightypork/util/math/constraints/num/caching/NumDigest.java index cf513e3..d33040b 100644 --- a/src/mightypork/util/constraints/num/caching/NumDigest.java +++ b/src/mightypork/util/math/constraints/num/caching/NumDigest.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.caching; +package mightypork.util.math.constraints.num.caching; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public class NumDigest { diff --git a/src/mightypork/util/constraints/num/mutable/NumAnimated.java b/src/mightypork/util/math/constraints/num/mutable/NumAnimated.java similarity index 97% rename from src/mightypork/util/constraints/num/mutable/NumAnimated.java rename to src/mightypork/util/math/constraints/num/mutable/NumAnimated.java index a05688a..5e32608 100644 --- a/src/mightypork/util/constraints/num/mutable/NumAnimated.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumAnimated.java @@ -1,10 +1,10 @@ -package mightypork.util.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.util.control.timing.Pauseable; -import mightypork.util.control.timing.Updateable; import mightypork.util.math.Calc; import mightypork.util.math.Easing; +import mightypork.util.timing.Pauseable; +import mightypork.util.timing.Updateable; /** diff --git a/src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java similarity index 94% rename from src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java rename to src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java index 7d0c9d4..7301cfe 100644 --- a/src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; import mightypork.util.math.Calc; diff --git a/src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java similarity index 94% rename from src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java rename to src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java index e0079ff..79d107e 100644 --- a/src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; import mightypork.util.math.Calc; diff --git a/src/mightypork/util/constraints/num/mutable/NumMutable.java b/src/mightypork/util/math/constraints/num/mutable/NumMutable.java similarity index 80% rename from src/mightypork/util/constraints/num/mutable/NumMutable.java rename to src/mightypork/util/math/constraints/num/mutable/NumMutable.java index f8a5c05..f99e945 100644 --- a/src/mightypork/util/constraints/num/mutable/NumMutable.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumMutable.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/util/constraints/num/mutable/NumVar.java b/src/mightypork/util/math/constraints/num/mutable/NumVar.java similarity index 79% rename from src/mightypork/util/constraints/num/mutable/NumVar.java rename to src/mightypork/util/math/constraints/num/mutable/NumVar.java index e239b28..2be037a 100644 --- a/src/mightypork/util/constraints/num/mutable/NumVar.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumVar.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/util/constraints/num/proxy/NumAdapter.java b/src/mightypork/util/math/constraints/num/proxy/NumAdapter.java similarity index 62% rename from src/mightypork/util/constraints/num/proxy/NumAdapter.java rename to src/mightypork/util/math/constraints/num/proxy/NumAdapter.java index 4ea7a8e..af87682 100644 --- a/src/mightypork/util/constraints/num/proxy/NumAdapter.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public abstract class NumAdapter extends Num { diff --git a/src/mightypork/util/constraints/num/proxy/NumBound.java b/src/mightypork/util/math/constraints/num/proxy/NumBound.java similarity index 58% rename from src/mightypork/util/constraints/num/proxy/NumBound.java rename to src/mightypork/util/math/constraints/num/proxy/NumBound.java index 988df28..662ab50 100644 --- a/src/mightypork/util/constraints/num/proxy/NumBound.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumBound.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java b/src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java similarity index 79% rename from src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java rename to src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java index 07bb34e..ab8e7f8 100644 --- a/src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public class NumBoundAdapter extends NumAdapter implements PluggableNumBound { diff --git a/src/mightypork/util/constraints/num/proxy/NumProxy.java b/src/mightypork/util/math/constraints/num/proxy/NumProxy.java similarity index 67% rename from src/mightypork/util/constraints/num/proxy/NumProxy.java rename to src/mightypork/util/math/constraints/num/proxy/NumProxy.java index f44d637..4c86092 100644 --- a/src/mightypork/util/constraints/num/proxy/NumProxy.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumProxy.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.util.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; public class NumProxy extends NumAdapter { diff --git a/src/mightypork/util/constraints/num/proxy/PluggableNumBound.java b/src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java similarity index 79% rename from src/mightypork/util/constraints/num/proxy/PluggableNumBound.java rename to src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java index 6daee3b..9f2b3ae 100644 --- a/src/mightypork/util/constraints/num/proxy/PluggableNumBound.java +++ b/src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; /** diff --git a/src/mightypork/util/constraints/rect/Rect.java b/src/mightypork/util/math/constraints/rect/Rect.java similarity index 95% rename from src/mightypork/util/constraints/rect/Rect.java rename to src/mightypork/util/math/constraints/rect/Rect.java index 625d537..8721f7b 100644 --- a/src/mightypork/util/constraints/rect/Rect.java +++ b/src/mightypork/util/math/constraints/rect/Rect.java @@ -1,20 +1,20 @@ -package mightypork.util.constraints.rect; +package mightypork.util.math.constraints.rect; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.constraints.DigestCache; -import mightypork.util.constraints.Digestable; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.NumConst; -import mightypork.util.constraints.rect.builders.TiledRect; -import mightypork.util.constraints.rect.caching.RectCache; -import mightypork.util.constraints.rect.caching.RectDigest; -import mightypork.util.constraints.rect.mutable.RectVar; -import mightypork.util.constraints.rect.proxy.RectBound; -import mightypork.util.constraints.rect.proxy.RectBoundAdapter; -import mightypork.util.constraints.rect.proxy.RectVectAdapter; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; +import mightypork.util.math.constraints.DigestCache; +import mightypork.util.math.constraints.Digestable; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.NumConst; +import mightypork.util.math.constraints.rect.builders.TiledRect; +import mightypork.util.math.constraints.rect.caching.RectCache; +import mightypork.util.math.constraints.rect.caching.RectDigest; +import mightypork.util.math.constraints.rect.mutable.RectVar; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; +import mightypork.util.math.constraints.rect.proxy.RectVectAdapter; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; /** diff --git a/src/mightypork/util/constraints/rect/RectConst.java b/src/mightypork/util/math/constraints/rect/RectConst.java similarity index 96% rename from src/mightypork/util/constraints/rect/RectConst.java rename to src/mightypork/util/math/constraints/rect/RectConst.java index 8664c0b..1d72569 100644 --- a/src/mightypork/util/constraints/rect/RectConst.java +++ b/src/mightypork/util/math/constraints/rect/RectConst.java @@ -1,10 +1,10 @@ -package mightypork.util.constraints.rect; +package mightypork.util.math.constraints.rect; -import mightypork.util.constraints.num.NumConst; -import mightypork.util.constraints.rect.caching.RectDigest; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; +import mightypork.util.math.constraints.num.NumConst; +import mightypork.util.math.constraints.rect.caching.RectDigest; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; /** diff --git a/src/mightypork/util/constraints/rect/builders/TiledRect.java b/src/mightypork/util/math/constraints/rect/builders/TiledRect.java similarity index 90% rename from src/mightypork/util/constraints/rect/builders/TiledRect.java rename to src/mightypork/util/math/constraints/rect/builders/TiledRect.java index b837aa7..cd269a1 100644 --- a/src/mightypork/util/constraints/rect/builders/TiledRect.java +++ b/src/mightypork/util/math/constraints/rect/builders/TiledRect.java @@ -1,11 +1,11 @@ -package mightypork.util.constraints.rect.builders; +package mightypork.util.math.constraints.rect.builders; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.proxy.RectProxy; -import mightypork.util.constraints.vect.Vect; import mightypork.util.logging.Log; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectProxy; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/constraints/rect/caching/AbstractRectCache.java b/src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java similarity index 79% rename from src/mightypork/util/constraints/rect/caching/AbstractRectCache.java rename to src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java index 6e88f05..b4206d6 100644 --- a/src/mightypork/util/constraints/rect/caching/AbstractRectCache.java +++ b/src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java @@ -1,10 +1,10 @@ -package mightypork.util.constraints.rect.caching; +package mightypork.util.math.constraints.rect.caching; -import mightypork.util.constraints.ConstraintCache; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.rect.mutable.RectVar; -import mightypork.util.constraints.rect.proxy.RectAdapter; +import mightypork.util.math.constraints.ConstraintCache; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.mutable.RectVar; +import mightypork.util.math.constraints.rect.proxy.RectAdapter; /** diff --git a/src/mightypork/util/constraints/rect/caching/RectCache.java b/src/mightypork/util/math/constraints/rect/caching/RectCache.java similarity index 79% rename from src/mightypork/util/constraints/rect/caching/RectCache.java rename to src/mightypork/util/math/constraints/rect/caching/RectCache.java index 32f6c96..b83a9c9 100644 --- a/src/mightypork/util/constraints/rect/caching/RectCache.java +++ b/src/mightypork/util/math/constraints/rect/caching/RectCache.java @@ -1,8 +1,8 @@ -package mightypork.util.constraints.rect.caching; +package mightypork.util.math.constraints.rect.caching; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/util/constraints/rect/caching/RectDigest.java b/src/mightypork/util/math/constraints/rect/caching/RectDigest.java similarity index 87% rename from src/mightypork/util/constraints/rect/caching/RectDigest.java rename to src/mightypork/util/math/constraints/rect/caching/RectDigest.java index 69e29be..471d534 100644 --- a/src/mightypork/util/constraints/rect/caching/RectDigest.java +++ b/src/mightypork/util/math/constraints/rect/caching/RectDigest.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.rect.caching; +package mightypork.util.math.constraints.rect.caching; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; public class RectDigest { diff --git a/src/mightypork/util/constraints/rect/mutable/RectMutable.java b/src/mightypork/util/math/constraints/rect/mutable/RectMutable.java similarity index 82% rename from src/mightypork/util/constraints/rect/mutable/RectMutable.java rename to src/mightypork/util/math/constraints/rect/mutable/RectMutable.java index 7b4c80a..8125442 100644 --- a/src/mightypork/util/constraints/rect/mutable/RectMutable.java +++ b/src/mightypork/util/math/constraints/rect/mutable/RectMutable.java @@ -1,8 +1,8 @@ -package mightypork.util.constraints.rect.mutable; +package mightypork.util.math.constraints.rect.mutable; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; /** @@ -71,17 +71,21 @@ public abstract class RectMutable extends Rect { setTo(Vect.ZERO, Vect.ZERO); } + public abstract void setOrigin(double x, double y); - public void setOrigin(Vect origin) { - setOrigin(origin.x(), origin.y()); + + public void setOrigin(Vect origin) + { + setOrigin(origin.x(), origin.y()); } - public void setSize(Vect size) { + public void setSize(Vect size) + { setSize(size.x(), size.y()); } - + public abstract void setSize(double x, double y); } diff --git a/src/mightypork/util/constraints/rect/mutable/RectVar.java b/src/mightypork/util/math/constraints/rect/mutable/RectVar.java similarity index 74% rename from src/mightypork/util/constraints/rect/mutable/RectVar.java rename to src/mightypork/util/math/constraints/rect/mutable/RectVar.java index c18dfe8..b88ad68 100644 --- a/src/mightypork/util/constraints/rect/mutable/RectVar.java +++ b/src/mightypork/util/math/constraints/rect/mutable/RectVar.java @@ -1,8 +1,8 @@ -package mightypork.util.constraints.rect.mutable; +package mightypork.util.math.constraints.rect.mutable; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; public class RectVar extends RectMutable { @@ -43,13 +43,13 @@ public class RectVar extends RectMutable { @Override public void setOrigin(double x, double y) { - this.pos.setTo(x,y); + this.pos.setTo(x, y); } @Override public void setSize(double x, double y) { - this.size.setTo(x,y); + this.size.setTo(x, y); } } diff --git a/src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java b/src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java similarity index 79% rename from src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java rename to src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java index 9f802bb..14ef1c4 100644 --- a/src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java +++ b/src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; /** diff --git a/src/mightypork/util/constraints/rect/proxy/RectAdapter.java b/src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java similarity index 79% rename from src/mightypork/util/constraints/rect/proxy/RectAdapter.java rename to src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java index 09b15ab..d4f3ef7 100644 --- a/src/mightypork/util/constraints/rect/proxy/RectAdapter.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java @@ -1,9 +1,9 @@ -package mightypork.util.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.proxy.VectAdapter; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.proxy.VectAdapter; /** diff --git a/src/mightypork/util/constraints/rect/proxy/RectBound.java b/src/mightypork/util/math/constraints/rect/proxy/RectBound.java similarity index 59% rename from src/mightypork/util/constraints/rect/proxy/RectBound.java rename to src/mightypork/util/math/constraints/rect/proxy/RectBound.java index ff629fa..197204a 100644 --- a/src/mightypork/util/constraints/rect/proxy/RectBound.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectBound.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java b/src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java similarity index 81% rename from src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java rename to src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java index 20e0429..166ca8f 100644 --- a/src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/util/constraints/rect/proxy/RectProxy.java b/src/mightypork/util/math/constraints/rect/proxy/RectProxy.java similarity index 67% rename from src/mightypork/util/constraints/rect/proxy/RectProxy.java rename to src/mightypork/util/math/constraints/rect/proxy/RectProxy.java index 88c4e6b..eec5c98 100644 --- a/src/mightypork/util/constraints/rect/proxy/RectProxy.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectProxy.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.util.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; public class RectProxy extends RectAdapter { diff --git a/src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java b/src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java similarity index 71% rename from src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java rename to src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java index d835106..3a77455 100644 --- a/src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java @@ -1,8 +1,8 @@ -package mightypork.util.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/constraints/vect/Vect.java b/src/mightypork/util/math/constraints/vect/Vect.java similarity index 96% rename from src/mightypork/util/constraints/vect/Vect.java rename to src/mightypork/util/math/constraints/vect/Vect.java index 96014b6..b5e9e2d 100644 --- a/src/mightypork/util/constraints/vect/Vect.java +++ b/src/mightypork/util/math/constraints/vect/Vect.java @@ -1,19 +1,19 @@ -package mightypork.util.constraints.vect; +package mightypork.util.math.constraints.vect; import mightypork.util.annotations.DefaultImpl; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.constraints.DigestCache; -import mightypork.util.constraints.Digestable; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.NumConst; -import mightypork.util.constraints.rect.Rect; -import mightypork.util.constraints.vect.caching.VectCache; -import mightypork.util.constraints.vect.caching.VectDigest; -import mightypork.util.constraints.vect.mutable.VectVar; -import mightypork.util.constraints.vect.proxy.VectBound; -import mightypork.util.constraints.vect.proxy.VectBoundAdapter; -import mightypork.util.constraints.vect.proxy.VectNumAdapter; +import mightypork.util.math.constraints.DigestCache; +import mightypork.util.math.constraints.Digestable; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.NumConst; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.caching.VectCache; +import mightypork.util.math.constraints.vect.caching.VectDigest; +import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.vect.proxy.VectBound; +import mightypork.util.math.constraints.vect.proxy.VectBoundAdapter; +import mightypork.util.math.constraints.vect.proxy.VectNumAdapter; /** diff --git a/src/mightypork/util/constraints/vect/VectConst.java b/src/mightypork/util/math/constraints/vect/VectConst.java similarity index 95% rename from src/mightypork/util/constraints/vect/VectConst.java rename to src/mightypork/util/math/constraints/vect/VectConst.java index f041dba..37fb47a 100644 --- a/src/mightypork/util/constraints/vect/VectConst.java +++ b/src/mightypork/util/math/constraints/vect/VectConst.java @@ -1,10 +1,10 @@ -package mightypork.util.constraints.vect; +package mightypork.util.math.constraints.vect; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.NumConst; -import mightypork.util.constraints.rect.RectConst; -import mightypork.util.constraints.vect.caching.VectDigest; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.NumConst; +import mightypork.util.math.constraints.rect.RectConst; +import mightypork.util.math.constraints.vect.caching.VectDigest; /** diff --git a/src/mightypork/util/constraints/vect/VectProxy.java b/src/mightypork/util/math/constraints/vect/VectProxy.java similarity index 65% rename from src/mightypork/util/constraints/vect/VectProxy.java rename to src/mightypork/util/math/constraints/vect/VectProxy.java index 0211d36..2a9411b 100644 --- a/src/mightypork/util/constraints/vect/VectProxy.java +++ b/src/mightypork/util/math/constraints/vect/VectProxy.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.vect; +package mightypork.util.math.constraints.vect; -import mightypork.util.constraints.vect.proxy.VectAdapter; +import mightypork.util.math.constraints.vect.proxy.VectAdapter; public class VectProxy extends VectAdapter { diff --git a/src/mightypork/util/constraints/vect/caching/AbstractVectCache.java b/src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java similarity index 79% rename from src/mightypork/util/constraints/vect/caching/AbstractVectCache.java rename to src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java index ceba706..14d6d31 100644 --- a/src/mightypork/util/constraints/vect/caching/AbstractVectCache.java +++ b/src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java @@ -1,10 +1,10 @@ -package mightypork.util.constraints.vect.caching; +package mightypork.util.math.constraints.vect.caching; -import mightypork.util.constraints.ConstraintCache; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.mutable.VectVar; -import mightypork.util.constraints.vect.proxy.VectAdapter; +import mightypork.util.math.constraints.ConstraintCache; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.vect.proxy.VectAdapter; /** diff --git a/src/mightypork/util/constraints/vect/caching/VectCache.java b/src/mightypork/util/math/constraints/vect/caching/VectCache.java similarity index 80% rename from src/mightypork/util/constraints/vect/caching/VectCache.java rename to src/mightypork/util/math/constraints/vect/caching/VectCache.java index 482c98c..fdade98 100644 --- a/src/mightypork/util/constraints/vect/caching/VectCache.java +++ b/src/mightypork/util/math/constraints/vect/caching/VectCache.java @@ -1,8 +1,8 @@ -package mightypork.util.constraints.vect.caching; +package mightypork.util.math.constraints.vect.caching; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/constraints/vect/caching/VectDigest.java b/src/mightypork/util/math/constraints/vect/caching/VectDigest.java similarity index 74% rename from src/mightypork/util/constraints/vect/caching/VectDigest.java rename to src/mightypork/util/math/constraints/vect/caching/VectDigest.java index 2350112..43afc51 100644 --- a/src/mightypork/util/constraints/vect/caching/VectDigest.java +++ b/src/mightypork/util/math/constraints/vect/caching/VectDigest.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.vect.caching; +package mightypork.util.math.constraints.vect.caching; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; public class VectDigest { diff --git a/src/mightypork/util/constraints/vect/mutable/VectAnimated.java b/src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java similarity index 94% rename from src/mightypork/util/constraints/vect/mutable/VectAnimated.java rename to src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java index 1c40be7..cf7215d 100644 --- a/src/mightypork/util/constraints/vect/mutable/VectAnimated.java +++ b/src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java @@ -1,12 +1,12 @@ -package mightypork.util.constraints.vect.mutable; +package mightypork.util.math.constraints.vect.mutable; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.constraints.num.mutable.NumAnimated; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.control.timing.Pauseable; -import mightypork.util.control.timing.Updateable; import mightypork.util.math.Easing; +import mightypork.util.math.constraints.num.mutable.NumAnimated; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.timing.Pauseable; +import mightypork.util.timing.Updateable; /** diff --git a/src/mightypork/util/constraints/vect/mutable/VectMutable.java b/src/mightypork/util/math/constraints/vect/mutable/VectMutable.java similarity index 90% rename from src/mightypork/util/constraints/vect/mutable/VectMutable.java rename to src/mightypork/util/math/constraints/vect/mutable/VectMutable.java index e80c975..f69e615 100644 --- a/src/mightypork/util/constraints/vect/mutable/VectMutable.java +++ b/src/mightypork/util/math/constraints/vect/mutable/VectMutable.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.vect.mutable; +package mightypork.util.math.constraints.vect.mutable; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/constraints/vect/mutable/VectVar.java b/src/mightypork/util/math/constraints/vect/mutable/VectVar.java similarity index 94% rename from src/mightypork/util/constraints/vect/mutable/VectVar.java rename to src/mightypork/util/math/constraints/vect/mutable/VectVar.java index 42ed563..fed287b 100644 --- a/src/mightypork/util/constraints/vect/mutable/VectVar.java +++ b/src/mightypork/util/math/constraints/vect/mutable/VectVar.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints.vect.mutable; +package mightypork.util.math.constraints.vect.mutable; /** diff --git a/src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java b/src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java similarity index 79% rename from src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java rename to src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java index a0536cb..0bb5985 100644 --- a/src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java +++ b/src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java @@ -1,4 +1,4 @@ -package mightypork.util.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; /** diff --git a/src/mightypork/util/constraints/vect/proxy/VectAdapter.java b/src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java similarity index 81% rename from src/mightypork/util/constraints/vect/proxy/VectAdapter.java rename to src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java index 04e7ed5..07a805e 100644 --- a/src/mightypork/util/constraints/vect/proxy/VectAdapter.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/constraints/vect/proxy/VectBound.java b/src/mightypork/util/math/constraints/vect/proxy/VectBound.java similarity index 65% rename from src/mightypork/util/constraints/vect/proxy/VectBound.java rename to src/mightypork/util/math/constraints/vect/proxy/VectBound.java index 4bb40ce..cc7ef8e 100644 --- a/src/mightypork/util/constraints/vect/proxy/VectBound.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectBound.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java b/src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java similarity index 79% rename from src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java rename to src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java index 2a4d39d..340b13d 100644 --- a/src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; public class VectBoundAdapter extends VectAdapter implements PluggableVectBound { diff --git a/src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java b/src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java similarity index 76% rename from src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java rename to src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java index 036574e..466c1b9 100644 --- a/src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java @@ -1,9 +1,9 @@ -package mightypork.util.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.proxy.NumBound; -import mightypork.util.constraints.vect.Vect; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.proxy.NumBound; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/objects/Convert.java b/src/mightypork/util/objects/Convert.java index 39cf6dd..cf8e9cb 100644 --- a/src/mightypork/util/objects/Convert.java +++ b/src/mightypork/util/objects/Convert.java @@ -1,11 +1,11 @@ package mightypork.util.objects; -import mightypork.util.constraints.vect.Vect; -import mightypork.util.constraints.vect.VectConst; import mightypork.util.logging.Log; import mightypork.util.math.Calc; import mightypork.util.math.Range; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; /** diff --git a/src/mightypork/util/control/timing/Animator.java b/src/mightypork/util/timing/Animator.java similarity index 89% rename from src/mightypork/util/control/timing/Animator.java rename to src/mightypork/util/timing/Animator.java index 7b3eeaa..f389beb 100644 --- a/src/mightypork/util/control/timing/Animator.java +++ b/src/mightypork/util/timing/Animator.java @@ -1,10 +1,10 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.constraints.num.Num; -import mightypork.util.constraints.num.mutable.NumAnimated; import mightypork.util.math.Easing; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.mutable.NumAnimated; public abstract class Animator extends Num implements Updateable, Pauseable { diff --git a/src/mightypork/util/control/timing/AnimatorBounce.java b/src/mightypork/util/timing/AnimatorBounce.java similarity index 88% rename from src/mightypork/util/control/timing/AnimatorBounce.java rename to src/mightypork/util/timing/AnimatorBounce.java index ed6eb7a..c6ade23 100644 --- a/src/mightypork/util/control/timing/AnimatorBounce.java +++ b/src/mightypork/util/timing/AnimatorBounce.java @@ -1,8 +1,8 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; -import mightypork.util.constraints.num.mutable.NumAnimated; import mightypork.util.math.Easing; +import mightypork.util.math.constraints.num.mutable.NumAnimated; /** diff --git a/src/mightypork/util/control/timing/AnimatorRewind.java b/src/mightypork/util/timing/AnimatorRewind.java similarity index 87% rename from src/mightypork/util/control/timing/AnimatorRewind.java rename to src/mightypork/util/timing/AnimatorRewind.java index fa5a6b3..829c9ec 100644 --- a/src/mightypork/util/control/timing/AnimatorRewind.java +++ b/src/mightypork/util/timing/AnimatorRewind.java @@ -1,8 +1,8 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; -import mightypork.util.constraints.num.mutable.NumAnimated; import mightypork.util.math.Easing; +import mightypork.util.math.constraints.num.mutable.NumAnimated; /** diff --git a/src/mightypork/util/control/timing/FpsMeter.java b/src/mightypork/util/timing/FpsMeter.java similarity index 94% rename from src/mightypork/util/control/timing/FpsMeter.java rename to src/mightypork/util/timing/FpsMeter.java index 5e41c99..ca4f988 100644 --- a/src/mightypork/util/control/timing/FpsMeter.java +++ b/src/mightypork/util/timing/FpsMeter.java @@ -1,4 +1,4 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; /** diff --git a/src/mightypork/util/control/timing/Pauseable.java b/src/mightypork/util/timing/Pauseable.java similarity index 87% rename from src/mightypork/util/control/timing/Pauseable.java rename to src/mightypork/util/timing/Pauseable.java index 79b7698..f849ab2 100644 --- a/src/mightypork/util/control/timing/Pauseable.java +++ b/src/mightypork/util/timing/Pauseable.java @@ -1,4 +1,4 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; /** diff --git a/src/mightypork/util/control/timing/TimedTask.java b/src/mightypork/util/timing/TimedTask.java similarity index 85% rename from src/mightypork/util/control/timing/TimedTask.java rename to src/mightypork/util/timing/TimedTask.java index cceca2d..350d60f 100644 --- a/src/mightypork/util/control/timing/TimedTask.java +++ b/src/mightypork/util/timing/TimedTask.java @@ -1,7 +1,7 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; -import mightypork.util.constraints.num.mutable.NumAnimated; +import mightypork.util.math.constraints.num.mutable.NumAnimated; /** diff --git a/src/mightypork/util/control/timing/TimerDelta.java b/src/mightypork/util/timing/TimerDelta.java similarity index 94% rename from src/mightypork/util/control/timing/TimerDelta.java rename to src/mightypork/util/timing/TimerDelta.java index f7f3225..07605f3 100644 --- a/src/mightypork/util/control/timing/TimerDelta.java +++ b/src/mightypork/util/timing/TimerDelta.java @@ -1,4 +1,4 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; /** diff --git a/src/mightypork/util/control/timing/TimerFps.java b/src/mightypork/util/timing/TimerFps.java similarity index 97% rename from src/mightypork/util/control/timing/TimerFps.java rename to src/mightypork/util/timing/TimerFps.java index 5e30d42..f9f84c1 100644 --- a/src/mightypork/util/control/timing/TimerFps.java +++ b/src/mightypork/util/timing/TimerFps.java @@ -1,4 +1,4 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; /** diff --git a/src/mightypork/util/control/timing/Updateable.java b/src/mightypork/util/timing/Updateable.java similarity index 85% rename from src/mightypork/util/control/timing/Updateable.java rename to src/mightypork/util/timing/Updateable.java index 0bb0c20..17337a5 100644 --- a/src/mightypork/util/control/timing/Updateable.java +++ b/src/mightypork/util/timing/Updateable.java @@ -1,4 +1,4 @@ -package mightypork.util.control.timing; +package mightypork.util.timing; /**