From 6843e746bcb708c34c52d790e1c838ee3be1d462 Mon Sep 17 00:00:00 2001 From: ondra Date: Wed, 16 Apr 2014 14:32:56 +0200 Subject: [PATCH] Moved general purpose stuff into util, renamed utils->util --- .../gamecore/audio/DeferredAudio.java | 8 ++-- .../gamecore/audio/JointVolume.java | 2 +- src/mightypork/gamecore/audio/NullAudio.java | 4 +- src/mightypork/gamecore/audio/SoundBank.java | 2 +- .../gamecore/audio/SoundSystem.java | 12 ++--- src/mightypork/gamecore/audio/Volume.java | 4 +- .../audio/players/BaseAudioPlayer.java | 2 +- .../gamecore/audio/players/EffectPlayer.java | 2 +- .../gamecore/audio/players/LoopPlayer.java | 6 +-- .../gamecore/control/AppAccess.java | 2 +- .../gamecore/control/AppAdapter.java | 2 +- .../gamecore/control/AppModule.java | 2 +- .../gamecore/control/AppSubModule.java | 6 +-- src/mightypork/gamecore/control/BaseApp.java | 17 ++++--- src/mightypork/gamecore/control/GameLoop.java | 8 ++-- .../gamecore/control/SlickLogRedirector.java | 2 +- .../{bus => }/events/DestroyEvent.java | 7 +-- .../control/{bus => }/events/KeyEvent.java | 4 +- .../{bus => }/events/LayoutChangeEvent.java | 6 ++- .../{bus => }/events/MainLoopTaskRequest.java | 5 ++- .../{bus => }/events/MouseButtonEvent.java | 7 +-- .../{bus => }/events/MouseMotionEvent.java | 9 ++-- .../{bus => }/events/ResourceLoadRequest.java | 5 ++- .../{bus => }/events/ScreenChangeEvent.java | 5 ++- .../{bus => }/events/ScreenRequestEvent.java | 5 ++- .../control/{bus => }/events/UpdateEvent.java | 9 ++-- src/mightypork/gamecore/gui/AlignX.java | 3 +- src/mightypork/gamecore/gui/AlignY.java | 3 +- .../gui/components/ClickableComponent.java | 2 +- .../gamecore/gui/components/Component.java | 4 +- .../gui/components/InputComponent.java | 14 +++--- .../gui/components/LayoutComponent.java | 8 ++-- .../gui/components/PluggableRenderable.java | 6 +-- .../gui/components/VisualComponent.java | 12 ++--- .../gui/components/layout/ColumnHolder.java | 6 +-- .../components/layout/ConstraintLayout.java | 4 +- .../layout/HorizontalFixedFlowLayout.java | 8 ++-- .../gui/components/layout/RowHolder.java | 6 +-- .../layout/VerticalFixedFlowLayout.java | 8 ++-- .../gui/components/painters/QuadPainter.java | 4 +- .../gui/components/painters/TextPainter.java | 10 ++--- .../gamecore/gui/screens/LayeredScreen.java | 2 +- .../gamecore/gui/screens/Screen.java | 12 ++--- .../gamecore/gui/screens/ScreenLayer.java | 6 +-- .../gamecore/gui/screens/ScreenRegistry.java | 6 +-- .../gamecore/input/InputSystem.java | 17 +++---- src/mightypork/gamecore/input/KeyBinder.java | 2 +- src/mightypork/gamecore/input/KeyBinding.java | 2 +- .../gamecore/input/KeyBindingPool.java | 4 +- .../gamecore/loading/AsyncResourceLoader.java | 12 ++--- .../gamecore/loading/DeferredResource.java | 8 ++-- .../gamecore/render/DisplaySystem.java | 12 ++--- src/mightypork/gamecore/render/Render.java | 14 +++--- .../gamecore/render/fonts/FontBank.java | 11 ++--- .../gamecore/render/fonts/FontRenderer.java | 6 +-- .../gamecore/render/fonts/GLFont.java | 4 +- .../render/fonts/impl/CachedFont.java | 14 +++--- .../render/fonts/impl/DeferredFont.java | 12 ++--- .../render/fonts/impl/DeferredFontNative.java | 4 +- .../render/textures/DeferredTexture.java | 6 +-- .../gamecore/render/textures/TextureBank.java | 4 +- .../gamecore/render/textures/TxQuad.java | 2 +- src/mightypork/rogue/App.java | 6 +-- src/mightypork/rogue/Config.java | 4 +- src/mightypork/rogue/MainLoop.java | 4 +- src/mightypork/rogue/Paths.java | 2 +- src/mightypork/rogue/Res.java | 2 +- .../rogue/events/ActionRequest.java | 4 +- src/mightypork/rogue/screens/LayerFps.java | 14 +++--- .../rogue/screens/main_menu/MenuButton.java | 4 +- .../rogue/screens/main_menu/MenuLayer.java | 27 ++++++------ .../screens/test_bouncyboxes/BouncyBox.java | 14 +++--- .../test_bouncyboxes/LayerBouncyBoxes.java | 6 +-- .../test_bouncyboxes/ScreenTestBouncy.java | 2 +- .../screens/test_cat_sound/LayerColor.java | 8 ++-- .../test_cat_sound/LayerFlyingCat.java | 21 ++++----- .../screens/test_cat_sound/ScreenTestCat.java | 2 +- .../test_render/LayerTestGradient.java | 4 +- .../screens/test_render/ScreenTestRender.java | 1 - src/mightypork/test/TestConstCaching.java | 6 +-- src/mightypork/test/TestConstr.java | 14 +++--- src/mightypork/test/TestConvert.java | 2 +- src/mightypork/test/TestCoords.java | 8 ++-- src/mightypork/test/TestTiled.java | 6 +-- src/mightypork/test/TestVec.java | 6 +-- .../annotations/DefaultImpl.java | 2 +- .../annotations/FactoryMethod.java | 2 +- .../config/PropertyManager.java | 12 ++--- .../{utils => util}/config/SimpleConfig.java | 6 +-- .../config/SortedProperties.java | 2 +- .../gui => util/control}/Action.java | 5 +-- .../gui => util/control}/ActionTrigger.java | 2 +- .../interf => util/control}/Destroyable.java | 2 +- .../interf => util/control}/Enableable.java | 2 +- .../control/eventbus}/BufferedHashSet.java | 2 +- .../control/eventbus}/BusAccess.java | 2 +- .../control/eventbus}/EventBus.java | 20 ++++----- .../control/eventbus}/EventChannel.java | 12 ++--- .../control/eventbus}/clients/BusNode.java | 6 +-- .../control/eventbus}/clients/ClientHub.java | 4 +- .../eventbus}/clients/DelegatingClient.java | 2 +- .../eventbus}/clients/RootBusNode.java | 6 +-- .../eventbus}/clients/ToggleableClient.java | 2 +- .../control/eventbus}/events/Event.java | 10 ++--- .../eventbus/events/flags}/DelayedEvent.java | 2 +- .../events/flags}/ImmediateEvent.java | 2 +- .../events/flags}/SingleReceiverEvent.java | 2 +- .../eventbus/events/flags}/UnloggedEvent.java | 2 +- .../control/timing/FpsMeter.java | 2 +- .../control/timing/Pauseable.java | 2 +- .../control/timing/TimerDelta.java | 2 +- .../control/timing/TimerFps.java | 2 +- .../control/timing/Updateable.java | 2 +- .../{utils => util}/files/FileTreeDiff.java | 10 ++--- .../{utils => util}/files/FileUtils.java | 20 ++++----- .../{utils => util}/files/InstanceLock.java | 2 +- .../{utils => util}/files/OsUtils.java | 2 +- .../files/ion/AbstractIonList.java | 2 +- .../files/ion/AbstractIonMap.java | 2 +- .../files/ion/BinaryUtils.java | 2 +- .../{utils => util}/files/ion/Ion.java | 8 ++-- .../files/ion/IonException.java | 2 +- .../{utils => util}/files/ion/IonList.java | 2 +- .../{utils => util}/files/ion/IonMap.java | 2 +- .../{utils => util}/files/ion/IonMarks.java | 2 +- .../{utils => util}/files/ion/Ionizable.java | 2 +- .../files/ion/IonizableOptional.java | 2 +- .../files => util/files/zip}/ZipBuilder.java | 9 ++-- .../files => util/files/zip}/ZipUtils.java | 18 ++++---- .../{utils => util}/logging/Log.java | 16 ++++--- .../Alias.java => util/logging/LogAlias.java} | 4 +- .../logging/monitors}/BaseLogMonitor.java | 2 +- .../logging/monitors}/LogMonitor.java | 2 +- .../logging/monitors}/LogToSysoutMonitor.java | 2 +- .../logging/writers}/ArchivingLog.java | 4 +- .../logging/writers}/LogWriter.java | 4 +- .../logging/writers}/SimpleLog.java | 5 ++- src/mightypork/{utils => util}/math/Calc.java | 4 +- .../{utils => util}/math/Easing.java | 4 +- .../{utils => util}/math/Polar.java | 4 +- .../{utils => util}/math/Range.java | 2 +- .../{utils => util}/math/color/Color.java | 8 ++-- .../{utils => util}/math/color/ColorHsb.java | 5 ++- .../{utils => util}/math/color/ColorRgb.java | 7 +-- .../math/constraints/ConstraintCache.java | 4 +- .../math/constraints/DigestCache.java | 2 +- .../math/constraints/Digestable.java | 3 +- .../math/constraints/Pollable.java | 2 +- .../math/constraints/Poller.java | 2 +- .../math/constraints/num/Num.java | 20 ++++----- .../math/constraints/num/NumConst.java | 5 ++- .../num/caching/AbstractNumCache.java | 11 ++--- .../constraints/num/caching/NumCache.java | 11 ++--- .../constraints/num/caching/NumDigest.java | 5 ++- .../constraints/num/mutable/NumAnimated.java | 10 ++--- .../num/mutable/NumAnimatedDeg.java | 8 ++-- .../num/mutable/NumAnimatedRad.java | 8 ++-- .../constraints/num/mutable/NumMutable.java | 5 ++- .../math/constraints/num/mutable/NumVar.java | 5 ++- .../constraints/num/proxy/NumAdapter.java | 5 ++- .../math/constraints/num/proxy/NumBound.java | 5 ++- .../num/proxy/NumBoundAdapter.java | 5 ++- .../math/constraints/num/proxy/NumProxy.java | 5 ++- .../num/proxy/PluggableNumBound.java | 2 +- .../math/constraints/rect/Rect.java | 44 ++++++++++--------- .../math/constraints/rect/RectConst.java | 10 ++--- .../constraints/rect/builders/TiledRect.java | 8 ++-- .../rect/caching/AbstractRectCache.java | 11 ++--- .../constraints/rect/caching/RectCache.java | 6 +-- .../constraints/rect/caching/RectDigest.java | 10 ++--- .../constraints/rect/mutable/RectMutable.java | 6 +-- .../constraints/rect/mutable/RectVar.java | 6 +-- .../rect/proxy/PluggableRectBound.java | 2 +- .../constraints/rect/proxy/RectAdapter.java | 8 ++-- .../constraints/rect/proxy/RectBound.java | 5 ++- .../rect/proxy/RectBoundAdapter.java | 5 ++- .../constraints/rect/proxy/RectProxy.java | 5 ++- .../rect/proxy/RectVectAdapter.java | 6 +-- .../math/constraints/vect/Vect.java | 28 ++++++------ .../math/constraints/vect/VectConst.java | 10 ++--- .../math/constraints/vect/VectProxy.java | 5 ++- .../vect/caching/AbstractVectCache.java | 11 ++--- .../constraints/vect/caching/VectCache.java | 6 +-- .../constraints/vect/caching/VectDigest.java | 5 ++- .../vect/mutable/VectAnimated.java | 14 +++--- .../constraints/vect/mutable/VectMutable.java | 5 ++- .../constraints/vect/mutable/VectVar.java | 2 +- .../vect/proxy/PluggableVectBound.java | 2 +- .../constraints/vect/proxy/VectAdapter.java | 5 ++- .../constraints/vect/proxy/VectBound.java | 5 ++- .../vect/proxy/VectBoundAdapter.java | 5 ++- .../vect/proxy/VectNumAdapter.java | 8 ++-- .../{utils => util}/objects/Convert.java | 12 ++--- .../{utils => util}/objects/MapSort.java | 2 +- .../{utils => util}/objects/Mutable.java | 2 +- .../{utils => util}/objects/ObjectUtils.java | 2 +- .../{utils => util}/objects/Pair.java | 4 +- .../{utils => util}/objects/Triad.java | 4 +- .../objects/VarargsParser.java | 2 +- .../string/StringProvider.java | 2 +- .../{utils => util}/string/StringUtils.java | 2 +- .../util/string/validation/CharFilter.java | 7 +++ .../string/validation/FileSuffixFilter.java | 2 +- .../string/validation/RegexCharFilter.java} | 6 +-- .../string/validation/StringFilter.java | 2 +- .../validation/WhitelistCharFilter.java} | 6 +-- .../string/validation/CharValidator.java | 7 --- .../validation/FilenameCharValidator.java | 10 ----- 208 files changed, 656 insertions(+), 629 deletions(-) rename src/mightypork/gamecore/control/{bus => }/events/DestroyEvent.java (56%) rename src/mightypork/gamecore/control/{bus => }/events/KeyEvent.java (92%) rename src/mightypork/gamecore/control/{bus => }/events/LayoutChangeEvent.java (71%) rename src/mightypork/gamecore/control/{bus => }/events/MainLoopTaskRequest.java (80%) rename src/mightypork/gamecore/control/{bus => }/events/MouseButtonEvent.java (90%) rename src/mightypork/gamecore/control/{bus => }/events/MouseMotionEvent.java (76%) rename src/mightypork/gamecore/control/{bus => }/events/ResourceLoadRequest.java (80%) rename src/mightypork/gamecore/control/{bus => }/events/ScreenChangeEvent.java (89%) rename src/mightypork/gamecore/control/{bus => }/events/ScreenRequestEvent.java (77%) rename src/mightypork/gamecore/control/{bus => }/events/UpdateEvent.java (60%) rename src/mightypork/{utils => util}/annotations/DefaultImpl.java (92%) rename src/mightypork/{utils => util}/annotations/FactoryMethod.java (91%) rename src/mightypork/{utils => util}/config/PropertyManager.java (97%) rename src/mightypork/{utils => util}/config/SimpleConfig.java (97%) rename src/mightypork/{utils => util}/config/SortedProperties.java (99%) rename src/mightypork/{gamecore/gui => util/control}/Action.java (87%) rename src/mightypork/{gamecore/gui => util/control}/ActionTrigger.java (87%) rename src/mightypork/{gamecore/control/interf => util/control}/Destroyable.java (80%) rename src/mightypork/{gamecore/control/interf => util/control}/Enableable.java (89%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/BufferedHashSet.java (98%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/BusAccess.java (80%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/EventBus.java (93%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/EventChannel.java (93%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/clients/BusNode.java (92%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/clients/ClientHub.java (86%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/clients/DelegatingClient.java (91%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/clients/RootBusNode.java (77%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/clients/ToggleableClient.java (81%) rename src/mightypork/{gamecore/control/bus => util/control/eventbus}/events/Event.java (69%) rename src/mightypork/{gamecore/control/bus/events/types => util/control/eventbus/events/flags}/DelayedEvent.java (85%) rename src/mightypork/{gamecore/control/bus/events/types => util/control/eventbus/events/flags}/ImmediateEvent.java (80%) rename src/mightypork/{gamecore/control/bus/events/types => util/control/eventbus/events/flags}/SingleReceiverEvent.java (81%) rename src/mightypork/{gamecore/control/bus/events/types => util/control/eventbus/events/flags}/UnloggedEvent.java (85%) rename src/mightypork/{gamecore => util}/control/timing/FpsMeter.java (94%) rename src/mightypork/{gamecore => util}/control/timing/Pauseable.java (86%) rename src/mightypork/{gamecore => util}/control/timing/TimerDelta.java (93%) rename src/mightypork/{gamecore => util}/control/timing/TimerFps.java (97%) rename src/mightypork/{gamecore => util}/control/timing/Updateable.java (84%) rename src/mightypork/{utils => util}/files/FileTreeDiff.java (90%) rename src/mightypork/{utils => util}/files/FileUtils.java (94%) rename src/mightypork/{utils => util}/files/InstanceLock.java (96%) rename src/mightypork/{utils => util}/files/OsUtils.java (98%) rename src/mightypork/{utils => util}/files/ion/AbstractIonList.java (97%) rename src/mightypork/{utils => util}/files/ion/AbstractIonMap.java (98%) rename src/mightypork/{utils => util}/files/ion/BinaryUtils.java (99%) rename src/mightypork/{utils => util}/files/ion/Ion.java (97%) rename src/mightypork/{utils => util}/files/ion/IonException.java (89%) rename src/mightypork/{utils => util}/files/ion/IonList.java (98%) rename src/mightypork/{utils => util}/files/ion/IonMap.java (98%) rename src/mightypork/{utils => util}/files/ion/IonMarks.java (96%) rename src/mightypork/{utils => util}/files/ion/Ionizable.java (95%) rename src/mightypork/{utils => util}/files/ion/IonizableOptional.java (87%) rename src/mightypork/{utils/files => util/files/zip}/ZipBuilder.java (91%) rename src/mightypork/{utils/files => util/files/zip}/ZipUtils.java (88%) rename src/mightypork/{utils => util}/logging/Log.java (92%) rename src/mightypork/{utils/annotations/Alias.java => util/logging/LogAlias.java} (84%) rename src/mightypork/{utils/logging => util/logging/monitors}/BaseLogMonitor.java (93%) rename src/mightypork/{utils/logging => util/logging/monitors}/LogMonitor.java (81%) rename src/mightypork/{utils/logging => util/logging/monitors}/LogToSysoutMonitor.java (87%) rename src/mightypork/{utils/logging => util/logging/writers}/ArchivingLog.java (97%) rename src/mightypork/{utils/logging => util/logging/writers}/LogWriter.java (90%) rename src/mightypork/{utils/logging => util/logging/writers}/SimpleLog.java (95%) rename src/mightypork/{utils => util}/math/Calc.java (99%) rename src/mightypork/{utils => util}/math/Easing.java (98%) rename src/mightypork/{utils => util}/math/Polar.java (97%) rename src/mightypork/{utils => util}/math/Range.java (98%) rename src/mightypork/{utils => util}/math/color/Color.java (95%) rename src/mightypork/{utils => util}/math/color/ColorHsb.java (90%) rename src/mightypork/{utils => util}/math/color/ColorRgb.java (85%) rename src/mightypork/{utils => util}/math/constraints/ConstraintCache.java (93%) rename src/mightypork/{utils => util}/math/constraints/DigestCache.java (95%) rename src/mightypork/{utils => util}/math/constraints/Digestable.java (96%) rename src/mightypork/{utils => util}/math/constraints/Pollable.java (78%) rename src/mightypork/{utils => util}/math/constraints/Poller.java (93%) rename src/mightypork/{utils => util}/math/constraints/num/Num.java (94%) rename src/mightypork/{utils => util}/math/constraints/num/NumConst.java (96%) rename src/mightypork/{utils => util}/math/constraints/num/caching/AbstractNumCache.java (80%) rename src/mightypork/{utils => util}/math/constraints/num/caching/NumCache.java (68%) rename src/mightypork/{utils => util}/math/constraints/num/caching/NumDigest.java (67%) rename src/mightypork/{utils => util}/math/constraints/num/mutable/NumAnimated.java (96%) rename src/mightypork/{utils => util}/math/constraints/num/mutable/NumAnimatedDeg.java (82%) rename src/mightypork/{utils => util}/math/constraints/num/mutable/NumAnimatedRad.java (82%) rename src/mightypork/{utils => util}/math/constraints/num/mutable/NumMutable.java (79%) rename src/mightypork/{utils => util}/math/constraints/num/mutable/NumVar.java (78%) rename src/mightypork/{utils => util}/math/constraints/num/proxy/NumAdapter.java (61%) rename src/mightypork/{utils => util}/math/constraints/num/proxy/NumBound.java (58%) rename src/mightypork/{utils => util}/math/constraints/num/proxy/NumBoundAdapter.java (78%) rename src/mightypork/{utils => util}/math/constraints/num/proxy/NumProxy.java (66%) rename src/mightypork/{utils => util}/math/constraints/num/proxy/PluggableNumBound.java (79%) rename src/mightypork/{utils => util}/math/constraints/rect/Rect.java (93%) rename src/mightypork/{utils => util}/math/constraints/rect/RectConst.java (96%) rename src/mightypork/{utils => util}/math/constraints/rect/builders/TiledRect.java (93%) rename src/mightypork/{utils => util}/math/constraints/rect/caching/AbstractRectCache.java (78%) rename src/mightypork/{utils => util}/math/constraints/rect/caching/RectCache.java (68%) rename src/mightypork/{utils => util}/math/constraints/rect/caching/RectDigest.java (67%) rename src/mightypork/{utils => util}/math/constraints/rect/mutable/RectMutable.java (89%) rename src/mightypork/{utils => util}/math/constraints/rect/mutable/RectVar.java (79%) rename src/mightypork/{utils => util}/math/constraints/rect/proxy/PluggableRectBound.java (78%) rename src/mightypork/{utils => util}/math/constraints/rect/proxy/RectAdapter.java (79%) rename src/mightypork/{utils => util}/math/constraints/rect/proxy/RectBound.java (59%) rename src/mightypork/{utils => util}/math/constraints/rect/proxy/RectBoundAdapter.java (81%) rename src/mightypork/{utils => util}/math/constraints/rect/proxy/RectProxy.java (66%) rename src/mightypork/{utils => util}/math/constraints/rect/proxy/RectVectAdapter.java (71%) rename src/mightypork/{utils => util}/math/constraints/vect/Vect.java (95%) rename src/mightypork/{utils => util}/math/constraints/vect/VectConst.java (95%) rename src/mightypork/{utils => util}/math/constraints/vect/VectProxy.java (65%) rename src/mightypork/{utils => util}/math/constraints/vect/caching/AbstractVectCache.java (78%) rename src/mightypork/{utils => util}/math/constraints/vect/caching/VectCache.java (70%) rename src/mightypork/{utils => util}/math/constraints/vect/caching/VectDigest.java (74%) rename src/mightypork/{utils => util}/math/constraints/vect/mutable/VectAnimated.java (92%) rename src/mightypork/{utils => util}/math/constraints/vect/mutable/VectMutable.java (90%) rename src/mightypork/{utils => util}/math/constraints/vect/mutable/VectVar.java (93%) rename src/mightypork/{utils => util}/math/constraints/vect/proxy/PluggableVectBound.java (79%) rename src/mightypork/{utils => util}/math/constraints/vect/proxy/VectAdapter.java (81%) rename src/mightypork/{utils => util}/math/constraints/vect/proxy/VectBound.java (64%) rename src/mightypork/{utils => util}/math/constraints/vect/proxy/VectBoundAdapter.java (78%) rename src/mightypork/{utils => util}/math/constraints/vect/proxy/VectNumAdapter.java (75%) rename src/mightypork/{utils => util}/objects/Convert.java (96%) rename src/mightypork/{utils => util}/objects/MapSort.java (98%) rename src/mightypork/{utils => util}/objects/Mutable.java (96%) rename src/mightypork/{utils => util}/objects/ObjectUtils.java (95%) rename src/mightypork/{utils => util}/objects/Pair.java (94%) rename src/mightypork/{utils => util}/objects/Triad.java (94%) rename src/mightypork/{utils => util}/objects/VarargsParser.java (97%) rename src/mightypork/{utils => util}/string/StringProvider.java (93%) rename src/mightypork/{utils => util}/string/StringUtils.java (99%) create mode 100644 src/mightypork/util/string/validation/CharFilter.java rename src/mightypork/{utils => util}/string/validation/FileSuffixFilter.java (94%) rename src/mightypork/{utils/string/validation/CharValidatorRegex.java => util/string/validation/RegexCharFilter.java} (54%) rename src/mightypork/{utils => util}/string/validation/StringFilter.java (80%) rename src/mightypork/{utils/string/validation/CharValidatorWhitelist.java => util/string/validation/WhitelistCharFilter.java} (53%) delete mode 100644 src/mightypork/utils/string/validation/CharValidator.java delete mode 100644 src/mightypork/utils/string/validation/FilenameCharValidator.java diff --git a/src/mightypork/gamecore/audio/DeferredAudio.java b/src/mightypork/gamecore/audio/DeferredAudio.java index 0d32b27..7235a15 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.utils.annotations.Alias; -import mightypork.utils.files.FileUtils; -import mightypork.utils.math.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; @@ -17,7 +17,7 @@ import org.newdawn.slick.openal.SoundStore; * * @author MightyPork */ -@Alias(name = "Audio") +@LogAlias(name = "Audio") public class DeferredAudio extends DeferredResource { private enum PlayMode diff --git a/src/mightypork/gamecore/audio/JointVolume.java b/src/mightypork/gamecore/audio/JointVolume.java index d07d237..63dbdac 100644 --- a/src/mightypork/gamecore/audio/JointVolume.java +++ b/src/mightypork/gamecore/audio/JointVolume.java @@ -1,7 +1,7 @@ package mightypork.gamecore.audio; -import mightypork.utils.math.Calc; +import mightypork.util.math.Calc; /** diff --git a/src/mightypork/gamecore/audio/NullAudio.java b/src/mightypork/gamecore/audio/NullAudio.java index f32d99d..c2d77ce 100644 --- a/src/mightypork/gamecore/audio/NullAudio.java +++ b/src/mightypork/gamecore/audio/NullAudio.java @@ -2,7 +2,7 @@ package mightypork.gamecore.audio; import mightypork.gamecore.loading.NullResource; -import mightypork.utils.annotations.Alias; +import mightypork.util.logging.LogAlias; /** @@ -11,7 +11,7 @@ import mightypork.utils.annotations.Alias; * * @author MightyPork */ -@Alias(name = "NullAudio") +@LogAlias(name = "NullAudio") public class NullAudio extends DeferredAudio implements NullResource { /** diff --git a/src/mightypork/gamecore/audio/SoundBank.java b/src/mightypork/gamecore/audio/SoundBank.java index ed74512..d280c46 100644 --- a/src/mightypork/gamecore/audio/SoundBank.java +++ b/src/mightypork/gamecore/audio/SoundBank.java @@ -8,7 +8,7 @@ import mightypork.gamecore.audio.players.EffectPlayer; import mightypork.gamecore.audio.players.LoopPlayer; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAdapter; -import mightypork.utils.logging.Log; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/gamecore/audio/SoundSystem.java b/src/mightypork/gamecore/audio/SoundSystem.java index b27cae5..57f6302 100644 --- a/src/mightypork/gamecore/audio/SoundSystem.java +++ b/src/mightypork/gamecore/audio/SoundSystem.java @@ -8,12 +8,12 @@ import java.util.Set; import mightypork.gamecore.audio.players.EffectPlayer; import mightypork.gamecore.audio.players.LoopPlayer; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.control.bus.clients.RootBusNode; -import mightypork.gamecore.control.bus.events.ResourceLoadRequest; -import mightypork.gamecore.control.timing.Updateable; -import mightypork.utils.math.Calc.Buffers; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.gamecore.control.events.ResourceLoadRequest; +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 org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; diff --git a/src/mightypork/gamecore/audio/Volume.java b/src/mightypork/gamecore/audio/Volume.java index b6c0070..ccd646c 100644 --- a/src/mightypork/gamecore/audio/Volume.java +++ b/src/mightypork/gamecore/audio/Volume.java @@ -1,8 +1,8 @@ package mightypork.gamecore.audio; -import mightypork.utils.math.Calc; -import mightypork.utils.objects.Mutable; +import mightypork.util.math.Calc; +import mightypork.util.objects.Mutable; /** diff --git a/src/mightypork/gamecore/audio/players/BaseAudioPlayer.java b/src/mightypork/gamecore/audio/players/BaseAudioPlayer.java index 14d3353..79c5977 100644 --- a/src/mightypork/gamecore/audio/players/BaseAudioPlayer.java +++ b/src/mightypork/gamecore/audio/players/BaseAudioPlayer.java @@ -3,7 +3,7 @@ package mightypork.gamecore.audio.players; import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.Volume; -import mightypork.gamecore.control.interf.Destroyable; +import mightypork.util.control.Destroyable; /** diff --git a/src/mightypork/gamecore/audio/players/EffectPlayer.java b/src/mightypork/gamecore/audio/players/EffectPlayer.java index 8f4f955..1e24187 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.utils.math.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 2e8c6f9..f734b32 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.gamecore.control.timing.Pauseable; -import mightypork.gamecore.control.timing.Updateable; -import mightypork.utils.math.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 org.lwjgl.openal.AL10; diff --git a/src/mightypork/gamecore/control/AppAccess.java b/src/mightypork/gamecore/control/AppAccess.java index 6c4d5c3..0511089 100644 --- a/src/mightypork/gamecore/control/AppAccess.java +++ b/src/mightypork/gamecore/control/AppAccess.java @@ -2,9 +2,9 @@ package mightypork.gamecore.control; import mightypork.gamecore.audio.SoundSystem; -import mightypork.gamecore.control.bus.BusAccess; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; +import mightypork.util.control.eventbus.BusAccess; /** diff --git a/src/mightypork/gamecore/control/AppAdapter.java b/src/mightypork/gamecore/control/AppAdapter.java index 410dbf4..e5c708e 100644 --- a/src/mightypork/gamecore/control/AppAdapter.java +++ b/src/mightypork/gamecore/control/AppAdapter.java @@ -2,9 +2,9 @@ package mightypork.gamecore.control; import mightypork.gamecore.audio.SoundSystem; -import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; +import mightypork.util.control.eventbus.EventBus; /** diff --git a/src/mightypork/gamecore/control/AppModule.java b/src/mightypork/gamecore/control/AppModule.java index f799581..55dc591 100644 --- a/src/mightypork/gamecore/control/AppModule.java +++ b/src/mightypork/gamecore/control/AppModule.java @@ -2,9 +2,9 @@ package mightypork.gamecore.control; import mightypork.gamecore.audio.SoundSystem; -import mightypork.gamecore.control.bus.clients.RootBusNode; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; +import mightypork.util.control.eventbus.clients.RootBusNode; /** diff --git a/src/mightypork/gamecore/control/AppSubModule.java b/src/mightypork/gamecore/control/AppSubModule.java index 5f5727c..0431743 100644 --- a/src/mightypork/gamecore/control/AppSubModule.java +++ b/src/mightypork/gamecore/control/AppSubModule.java @@ -2,11 +2,11 @@ package mightypork.gamecore.control; import mightypork.gamecore.audio.SoundSystem; -import mightypork.gamecore.control.bus.clients.BusNode; -import mightypork.gamecore.control.bus.clients.DelegatingClient; -import mightypork.gamecore.control.bus.clients.RootBusNode; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; +import mightypork.util.control.eventbus.clients.BusNode; +import mightypork.util.control.eventbus.clients.DelegatingClient; +import mightypork.util.control.eventbus.clients.RootBusNode; /** diff --git a/src/mightypork/gamecore/control/BaseApp.java b/src/mightypork/gamecore/control/BaseApp.java index e14d34b..de9f886 100644 --- a/src/mightypork/gamecore/control/BaseApp.java +++ b/src/mightypork/gamecore/control/BaseApp.java @@ -8,18 +8,17 @@ import java.util.logging.Level; import javax.swing.JOptionPane; import mightypork.gamecore.audio.SoundSystem; -import mightypork.gamecore.control.bus.EventBus; -import mightypork.gamecore.control.bus.events.*; -import mightypork.gamecore.control.interf.Destroyable; -import mightypork.gamecore.control.timing.Updateable; +import mightypork.gamecore.control.events.*; import mightypork.gamecore.gui.screens.ScreenRegistry; import mightypork.gamecore.input.InputSystem; -import mightypork.gamecore.loading.AsyncResourceLoader; import mightypork.gamecore.render.DisplaySystem; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.files.InstanceLock; -import mightypork.utils.logging.Log; -import mightypork.utils.logging.LogWriter; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.control.Destroyable; +import mightypork.util.control.eventbus.EventBus; +import mightypork.util.control.timing.Updateable; +import mightypork.util.files.InstanceLock; +import mightypork.util.logging.Log; +import mightypork.util.logging.writers.LogWriter; /** diff --git a/src/mightypork/gamecore/control/GameLoop.java b/src/mightypork/gamecore/control/GameLoop.java index e8132bd..7cd2035 100644 --- a/src/mightypork/gamecore/control/GameLoop.java +++ b/src/mightypork/gamecore/control/GameLoop.java @@ -4,12 +4,12 @@ package mightypork.gamecore.control; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import mightypork.gamecore.control.bus.events.MainLoopTaskRequest; -import mightypork.gamecore.control.bus.events.UpdateEvent; -import mightypork.gamecore.control.timing.TimerDelta; +import mightypork.gamecore.control.events.MainLoopTaskRequest; +import mightypork.gamecore.control.events.UpdateEvent; import mightypork.gamecore.gui.components.Renderable; import mightypork.gamecore.gui.screens.ScreenRegistry; -import mightypork.utils.annotations.DefaultImpl; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.control.timing.TimerDelta; /** diff --git a/src/mightypork/gamecore/control/SlickLogRedirector.java b/src/mightypork/gamecore/control/SlickLogRedirector.java index d861c12..614a7a4 100644 --- a/src/mightypork/gamecore/control/SlickLogRedirector.java +++ b/src/mightypork/gamecore/control/SlickLogRedirector.java @@ -3,7 +3,7 @@ package mightypork.gamecore.control; import java.util.logging.Level; -import mightypork.utils.logging.LogWriter; +import mightypork.util.logging.writers.LogWriter; import org.newdawn.slick.util.LogSystem; diff --git a/src/mightypork/gamecore/control/bus/events/DestroyEvent.java b/src/mightypork/gamecore/control/events/DestroyEvent.java similarity index 56% rename from src/mightypork/gamecore/control/bus/events/DestroyEvent.java rename to src/mightypork/gamecore/control/events/DestroyEvent.java index 3ad2f62..3de1046 100644 --- a/src/mightypork/gamecore/control/bus/events/DestroyEvent.java +++ b/src/mightypork/gamecore/control/events/DestroyEvent.java @@ -1,8 +1,9 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.ImmediateEvent; -import mightypork.gamecore.control.interf.Destroyable; +import mightypork.util.control.Destroyable; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.ImmediateEvent; /** diff --git a/src/mightypork/gamecore/control/bus/events/KeyEvent.java b/src/mightypork/gamecore/control/events/KeyEvent.java similarity index 92% rename from src/mightypork/gamecore/control/bus/events/KeyEvent.java rename to src/mightypork/gamecore/control/events/KeyEvent.java index c7a49c3..1aaadf2 100644 --- a/src/mightypork/gamecore/control/bus/events/KeyEvent.java +++ b/src/mightypork/gamecore/control/events/KeyEvent.java @@ -1,6 +1,8 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; +import mightypork.util.control.eventbus.events.Event; + import org.lwjgl.input.Keyboard; diff --git a/src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java b/src/mightypork/gamecore/control/events/LayoutChangeEvent.java similarity index 71% rename from src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java rename to src/mightypork/gamecore/control/events/LayoutChangeEvent.java index 9624ecf..b22741f 100644 --- a/src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java +++ b/src/mightypork/gamecore/control/events/LayoutChangeEvent.java @@ -1,7 +1,8 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.ImmediateEvent; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.ImmediateEvent; /** @@ -24,6 +25,7 @@ public class LayoutChangeEvent implements Event { } public interface Listener { + public void onLayoutChanged(); } } diff --git a/src/mightypork/gamecore/control/bus/events/MainLoopTaskRequest.java b/src/mightypork/gamecore/control/events/MainLoopTaskRequest.java similarity index 80% rename from src/mightypork/gamecore/control/bus/events/MainLoopTaskRequest.java rename to src/mightypork/gamecore/control/events/MainLoopTaskRequest.java index 9786541..e4f254e 100644 --- a/src/mightypork/gamecore/control/bus/events/MainLoopTaskRequest.java +++ b/src/mightypork/gamecore/control/events/MainLoopTaskRequest.java @@ -1,7 +1,8 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; /** diff --git a/src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java b/src/mightypork/gamecore/control/events/MouseButtonEvent.java similarity index 90% rename from src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java rename to src/mightypork/gamecore/control/events/MouseButtonEvent.java index 3018cbe..385aafe 100644 --- a/src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java +++ b/src/mightypork/gamecore/control/events/MouseButtonEvent.java @@ -1,8 +1,9 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.utils.math.constraints.rect.proxy.RectBound; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/control/bus/events/MouseMotionEvent.java b/src/mightypork/gamecore/control/events/MouseMotionEvent.java similarity index 76% rename from src/mightypork/gamecore/control/bus/events/MouseMotionEvent.java rename to src/mightypork/gamecore/control/events/MouseMotionEvent.java index 5be202a..5ba5ed2 100644 --- a/src/mightypork/gamecore/control/bus/events/MouseMotionEvent.java +++ b/src/mightypork/gamecore/control/events/MouseMotionEvent.java @@ -1,9 +1,10 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.UnloggedEvent; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.UnloggedEvent; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; /** diff --git a/src/mightypork/gamecore/control/bus/events/ResourceLoadRequest.java b/src/mightypork/gamecore/control/events/ResourceLoadRequest.java similarity index 80% rename from src/mightypork/gamecore/control/bus/events/ResourceLoadRequest.java rename to src/mightypork/gamecore/control/events/ResourceLoadRequest.java index 3497047..506806d 100644 --- a/src/mightypork/gamecore/control/bus/events/ResourceLoadRequest.java +++ b/src/mightypork/gamecore/control/events/ResourceLoadRequest.java @@ -1,8 +1,9 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; import mightypork.gamecore.loading.Deferred; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; /** diff --git a/src/mightypork/gamecore/control/bus/events/ScreenChangeEvent.java b/src/mightypork/gamecore/control/events/ScreenChangeEvent.java similarity index 89% rename from src/mightypork/gamecore/control/bus/events/ScreenChangeEvent.java rename to src/mightypork/gamecore/control/events/ScreenChangeEvent.java index f7be505..0ffb582 100644 --- a/src/mightypork/gamecore/control/bus/events/ScreenChangeEvent.java +++ b/src/mightypork/gamecore/control/events/ScreenChangeEvent.java @@ -1,7 +1,8 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/control/bus/events/ScreenRequestEvent.java b/src/mightypork/gamecore/control/events/ScreenRequestEvent.java similarity index 77% rename from src/mightypork/gamecore/control/bus/events/ScreenRequestEvent.java rename to src/mightypork/gamecore/control/events/ScreenRequestEvent.java index ceb7193..c9ccbfd 100644 --- a/src/mightypork/gamecore/control/bus/events/ScreenRequestEvent.java +++ b/src/mightypork/gamecore/control/events/ScreenRequestEvent.java @@ -1,7 +1,8 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; /** diff --git a/src/mightypork/gamecore/control/bus/events/UpdateEvent.java b/src/mightypork/gamecore/control/events/UpdateEvent.java similarity index 60% rename from src/mightypork/gamecore/control/bus/events/UpdateEvent.java rename to src/mightypork/gamecore/control/events/UpdateEvent.java index 1771801..f86e482 100644 --- a/src/mightypork/gamecore/control/bus/events/UpdateEvent.java +++ b/src/mightypork/gamecore/control/events/UpdateEvent.java @@ -1,9 +1,10 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.gamecore.control.events; -import mightypork.gamecore.control.bus.events.types.ImmediateEvent; -import mightypork.gamecore.control.bus.events.types.UnloggedEvent; -import mightypork.gamecore.control.timing.Updateable; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.ImmediateEvent; +import mightypork.util.control.eventbus.events.flags.UnloggedEvent; +import mightypork.util.control.timing.Updateable; /** diff --git a/src/mightypork/gamecore/gui/AlignX.java b/src/mightypork/gamecore/gui/AlignX.java index 07e3f00..4d541b9 100644 --- a/src/mightypork/gamecore/gui/AlignX.java +++ b/src/mightypork/gamecore/gui/AlignX.java @@ -1,5 +1,6 @@ package mightypork.gamecore.gui; + /** * Horizontal align sides * @@ -8,4 +9,4 @@ package mightypork.gamecore.gui; public enum AlignX { LEFT, CENTER, RIGHT; -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/gui/AlignY.java b/src/mightypork/gamecore/gui/AlignY.java index 7c8f4cb..888734f 100644 --- a/src/mightypork/gamecore/gui/AlignY.java +++ b/src/mightypork/gamecore/gui/AlignY.java @@ -1,5 +1,6 @@ package mightypork.gamecore.gui; + /** * Vertical align sides * @@ -8,4 +9,4 @@ package mightypork.gamecore.gui; public enum AlignY { TOP, CENTER, BOTTOM; -} \ No newline at end of file +} diff --git a/src/mightypork/gamecore/gui/components/ClickableComponent.java b/src/mightypork/gamecore/gui/components/ClickableComponent.java index a649ad7..a17afef 100644 --- a/src/mightypork/gamecore/gui/components/ClickableComponent.java +++ b/src/mightypork/gamecore/gui/components/ClickableComponent.java @@ -1,7 +1,7 @@ package mightypork.gamecore.gui.components; -import mightypork.gamecore.control.bus.events.MouseButtonEvent; +import mightypork.gamecore.control.events.MouseButtonEvent; public abstract class ClickableComponent extends InputComponent { diff --git a/src/mightypork/gamecore/gui/components/Component.java b/src/mightypork/gamecore/gui/components/Component.java index 5e55b98..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.utils.math.constraints.rect.Rect; -import mightypork.utils.math.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/InputComponent.java b/src/mightypork/gamecore/gui/components/InputComponent.java index 8efae9d..8143ec5 100644 --- a/src/mightypork/gamecore/gui/components/InputComponent.java +++ b/src/mightypork/gamecore/gui/components/InputComponent.java @@ -1,10 +1,10 @@ package mightypork.gamecore.gui.components; -import mightypork.gamecore.control.bus.events.MouseButtonEvent; -import mightypork.gamecore.control.interf.Enableable; -import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.ActionTrigger; +import mightypork.gamecore.control.events.MouseButtonEvent; +import mightypork.util.control.Action; +import mightypork.util.control.ActionTrigger; +import mightypork.util.control.Enableable; public abstract class InputComponent extends VisualComponent implements Enableable, ActionTrigger, MouseButtonEvent.Listener { @@ -33,7 +33,9 @@ public abstract class InputComponent extends VisualComponent implements Enableab return enabled; } - protected void triggerAction() { - if(action != null) action.run(); + + protected void triggerAction() + { + if (action != null) action.run(); } } diff --git a/src/mightypork/gamecore/gui/components/LayoutComponent.java b/src/mightypork/gamecore/gui/components/LayoutComponent.java index 5db04e1..79015a0 100644 --- a/src/mightypork/gamecore/gui/components/LayoutComponent.java +++ b/src/mightypork/gamecore/gui/components/LayoutComponent.java @@ -7,12 +7,12 @@ import java.util.LinkedList; import mightypork.gamecore.audio.SoundSystem; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppSubModule; -import mightypork.gamecore.control.bus.EventBus; -import mightypork.gamecore.control.bus.clients.ClientHub; -import mightypork.gamecore.control.interf.Enableable; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; -import mightypork.utils.math.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 231159f..bbbe0ad 100644 --- a/src/mightypork/gamecore/gui/components/PluggableRenderable.java +++ b/src/mightypork/gamecore/gui/components/PluggableRenderable.java @@ -1,9 +1,9 @@ package mightypork.gamecore.gui.components; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.proxy.PluggableRectBound; -import mightypork.utils.math.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 8e0136c..6298ccc 100644 --- a/src/mightypork/gamecore/gui/components/VisualComponent.java +++ b/src/mightypork/gamecore/gui/components/VisualComponent.java @@ -1,12 +1,12 @@ package mightypork.gamecore.gui.components; -import mightypork.gamecore.control.bus.events.LayoutChangeEvent; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.caching.AbstractRectCache; -import mightypork.utils.math.constraints.rect.proxy.RectBound; -import mightypork.utils.math.constraints.rect.proxy.RectBoundAdapter; +import mightypork.gamecore.control.events.LayoutChangeEvent; +import mightypork.util.annotations.DefaultImpl; +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 b7295c2..9742581 100644 --- a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java @@ -2,10 +2,10 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.Component; -import mightypork.utils.math.constraints.rect.builders.TiledRect; -import mightypork.utils.math.constraints.rect.proxy.RectBound; +import mightypork.gamecore.gui.components.LayoutComponent; +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 5591f11..2e54a37 100644 --- a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java @@ -2,9 +2,9 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.Component; -import mightypork.utils.math.constraints.rect.proxy.RectBound; +import mightypork.gamecore.gui.components.LayoutComponent; +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 fd9bf83..9c88258 100644 --- a/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java @@ -3,11 +3,11 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.AlignX; -import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.Component; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.proxy.RectBound; +import mightypork.gamecore.gui.components.LayoutComponent; +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 92fb6bd..a18ed81 100644 --- a/src/mightypork/gamecore/gui/components/layout/RowHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/RowHolder.java @@ -2,10 +2,10 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.Component; -import mightypork.utils.math.constraints.rect.builders.TiledRect; -import mightypork.utils.math.constraints.rect.proxy.RectBound; +import mightypork.gamecore.gui.components.LayoutComponent; +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 30f7872..75c38cd 100644 --- a/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java @@ -3,11 +3,11 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.AlignY; -import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.Component; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.proxy.RectBound; +import mightypork.gamecore.gui.components.LayoutComponent; +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/QuadPainter.java b/src/mightypork/gamecore/gui/components/painters/QuadPainter.java index 045b6e5..ff8d67d 100644 --- a/src/mightypork/gamecore/gui/components/painters/QuadPainter.java +++ b/src/mightypork/gamecore/gui/components/painters/QuadPainter.java @@ -3,8 +3,8 @@ package mightypork.gamecore.gui.components.painters; import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.render.Render; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.color.Color; +import mightypork.util.annotations.FactoryMethod; +import mightypork.util.math.color.Color; /** diff --git a/src/mightypork/gamecore/gui/components/painters/TextPainter.java b/src/mightypork/gamecore/gui/components/painters/TextPainter.java index 7dac3b9..39d8e50 100644 --- a/src/mightypork/gamecore/gui/components/painters/TextPainter.java +++ b/src/mightypork/gamecore/gui/components/painters/TextPainter.java @@ -5,11 +5,11 @@ 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.utils.math.color.Color; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.string.StringProvider; -import mightypork.utils.string.StringProvider.StringWrapper; +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/LayeredScreen.java b/src/mightypork/gamecore/gui/screens/LayeredScreen.java index 35cca7f..0cbfcb6 100644 --- a/src/mightypork/gamecore/gui/screens/LayeredScreen.java +++ b/src/mightypork/gamecore/gui/screens/LayeredScreen.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.TreeSet; import mightypork.gamecore.control.AppAccess; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index ea27ef9..5113a07 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/src/mightypork/gamecore/gui/screens/Screen.java @@ -3,17 +3,17 @@ package mightypork.gamecore.gui.screens; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppSubModule; -import mightypork.gamecore.control.bus.events.LayoutChangeEvent; -import mightypork.gamecore.control.bus.events.ScreenChangeEvent; +import mightypork.gamecore.control.events.LayoutChangeEvent; +import mightypork.gamecore.control.events.ScreenChangeEvent; import mightypork.gamecore.gui.components.Renderable; import mightypork.gamecore.input.KeyBinder; import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.render.Render; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.proxy.RectBound; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/gui/screens/ScreenLayer.java b/src/mightypork/gamecore/gui/screens/ScreenLayer.java index b041d14..a233d60 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenLayer.java +++ b/src/mightypork/gamecore/gui/screens/ScreenLayer.java @@ -5,15 +5,15 @@ import java.util.Collection; import java.util.LinkedHashSet; import mightypork.gamecore.control.AppSubModule; -import mightypork.gamecore.control.timing.Updateable; import mightypork.gamecore.gui.Hideable; import mightypork.gamecore.gui.components.Renderable; import mightypork.gamecore.gui.components.layout.ConstraintLayout; import mightypork.gamecore.input.KeyBinder; import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.control.timing.Updateable; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java index cda4e21..b11f065 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenRegistry.java +++ b/src/mightypork/gamecore/gui/screens/ScreenRegistry.java @@ -5,10 +5,10 @@ import java.util.HashMap; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppModule; -import mightypork.gamecore.control.bus.events.ScreenRequestEvent; +import mightypork.gamecore.control.events.ScreenRequestEvent; import mightypork.gamecore.gui.components.Renderable; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.logging.Log; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/gamecore/input/InputSystem.java b/src/mightypork/gamecore/input/InputSystem.java index ff898a8..8ac3801 100644 --- a/src/mightypork/gamecore/input/InputSystem.java +++ b/src/mightypork/gamecore/input/InputSystem.java @@ -2,15 +2,15 @@ package mightypork.gamecore.input; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.control.bus.clients.RootBusNode; -import mightypork.gamecore.control.bus.events.KeyEvent; -import mightypork.gamecore.control.bus.events.MouseButtonEvent; -import mightypork.gamecore.control.bus.events.MouseMotionEvent; -import mightypork.gamecore.control.timing.Updateable; +import mightypork.gamecore.control.events.KeyEvent; +import mightypork.gamecore.control.events.MouseButtonEvent; +import mightypork.gamecore.control.events.MouseMotionEvent; import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest.RequestType; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.util.control.eventbus.clients.RootBusNode; +import mightypork.util.control.timing.Updateable; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; import org.lwjgl.LWJGLException; import org.lwjgl.input.Keyboard; @@ -174,7 +174,8 @@ public class InputSystem extends RootBusNode implements Updateable, KeyBinder { /** - * Get absolute mouse position. This vect is final and views at it can safely be made. + * Get absolute mouse position. This vect is final and views at it can + * safely be made. * * @return mouse position */ diff --git a/src/mightypork/gamecore/input/KeyBinder.java b/src/mightypork/gamecore/input/KeyBinder.java index c5786b9..b04fe84 100644 --- a/src/mightypork/gamecore/input/KeyBinder.java +++ b/src/mightypork/gamecore/input/KeyBinder.java @@ -1,7 +1,7 @@ package mightypork.gamecore.input; -import mightypork.gamecore.gui.Action; +import mightypork.util.control.Action; /** diff --git a/src/mightypork/gamecore/input/KeyBinding.java b/src/mightypork/gamecore/input/KeyBinding.java index 2aa03ae..4897f4b 100644 --- a/src/mightypork/gamecore/input/KeyBinding.java +++ b/src/mightypork/gamecore/input/KeyBinding.java @@ -1,7 +1,7 @@ package mightypork.gamecore.input; -import mightypork.gamecore.control.bus.events.KeyEvent; +import mightypork.gamecore.control.events.KeyEvent; /** diff --git a/src/mightypork/gamecore/input/KeyBindingPool.java b/src/mightypork/gamecore/input/KeyBindingPool.java index d0bc11f..8738ed9 100644 --- a/src/mightypork/gamecore/input/KeyBindingPool.java +++ b/src/mightypork/gamecore/input/KeyBindingPool.java @@ -5,8 +5,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import mightypork.gamecore.control.bus.events.KeyEvent; -import mightypork.utils.logging.Log; +import mightypork.gamecore.control.events.KeyEvent; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/gamecore/loading/AsyncResourceLoader.java b/src/mightypork/gamecore/loading/AsyncResourceLoader.java index 2acc5ab..540f363 100644 --- a/src/mightypork/gamecore/loading/AsyncResourceLoader.java +++ b/src/mightypork/gamecore/loading/AsyncResourceLoader.java @@ -5,12 +5,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; -import mightypork.gamecore.control.bus.BusAccess; -import mightypork.gamecore.control.bus.events.MainLoopTaskRequest; -import mightypork.gamecore.control.bus.events.ResourceLoadRequest; -import mightypork.gamecore.control.interf.Destroyable; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.logging.Log; +import mightypork.gamecore.control.events.MainLoopTaskRequest; +import mightypork.gamecore.control.events.ResourceLoadRequest; +import mightypork.util.annotations.FactoryMethod; +import mightypork.util.control.Destroyable; +import mightypork.util.control.eventbus.BusAccess; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/gamecore/loading/DeferredResource.java b/src/mightypork/gamecore/loading/DeferredResource.java index 0b95b7b..d5d871d 100644 --- a/src/mightypork/gamecore/loading/DeferredResource.java +++ b/src/mightypork/gamecore/loading/DeferredResource.java @@ -1,9 +1,9 @@ package mightypork.gamecore.loading; -import mightypork.gamecore.control.interf.Destroyable; -import mightypork.utils.annotations.Alias; -import mightypork.utils.logging.Log; +import mightypork.util.control.Destroyable; +import mightypork.util.logging.Log; +import mightypork.util.logging.LogAlias; /** @@ -13,7 +13,7 @@ import mightypork.utils.logging.Log; * * @author MightyPork */ -@Alias(name = "Resource") +@LogAlias(name = "Resource") public abstract class DeferredResource implements Deferred, Destroyable { private final String resource; diff --git a/src/mightypork/gamecore/render/DisplaySystem.java b/src/mightypork/gamecore/render/DisplaySystem.java index 35fb94c..2d1b276 100644 --- a/src/mightypork/gamecore/render/DisplaySystem.java +++ b/src/mightypork/gamecore/render/DisplaySystem.java @@ -7,12 +7,12 @@ import java.nio.ByteBuffer; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppModule; -import mightypork.gamecore.control.bus.events.ScreenChangeEvent; -import mightypork.gamecore.control.timing.FpsMeter; -import mightypork.utils.logging.Log; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.proxy.RectBound; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.gamecore.control.events.ScreenChangeEvent; +import mightypork.util.control.timing.FpsMeter; +import mightypork.util.logging.Log; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.vect.Vect; import org.lwjgl.BufferUtils; import org.lwjgl.LWJGLException; diff --git a/src/mightypork/gamecore/render/Render.java b/src/mightypork/gamecore/render/Render.java index 0c1854e..809bae7 100644 --- a/src/mightypork/gamecore/render/Render.java +++ b/src/mightypork/gamecore/render/Render.java @@ -6,13 +6,13 @@ import static org.lwjgl.opengl.GL11.*; import java.io.IOException; import mightypork.gamecore.render.textures.TxQuad; -import mightypork.utils.files.FileUtils; -import mightypork.utils.logging.Log; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.caching.RectDigest; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; +import mightypork.util.files.FileUtils; +import mightypork.util.logging.Log; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.caching.RectDigest; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; import org.lwjgl.opengl.GL11; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/gamecore/render/fonts/FontBank.java b/src/mightypork/gamecore/render/fonts/FontBank.java index 6ba7a7d..10a5554 100644 --- a/src/mightypork/gamecore/render/fonts/FontBank.java +++ b/src/mightypork/gamecore/render/fonts/FontBank.java @@ -5,7 +5,7 @@ import java.util.HashMap; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAdapter; -import mightypork.gamecore.control.bus.events.ResourceLoadRequest; +import mightypork.gamecore.control.events.ResourceLoadRequest; import mightypork.gamecore.render.fonts.impl.DeferredFont; import org.newdawn.slick.opengl.Texture; @@ -16,7 +16,7 @@ import org.newdawn.slick.opengl.Texture; * * @author MightyPork */ -public class FontBank extends AppAdapter { +public class FontBank extends AppAdapter { /** * @param app app access @@ -53,7 +53,8 @@ public class FontBank extends AppAdapter { { fonts.put(key, font); } - + + /** * Add a font alias. * @@ -76,9 +77,9 @@ public class FontBank extends AppAdapter { { GLFont f = fonts.get(key); - if(f == null) f = fonts.get(aliases.get(key)); + if (f == null) f = fonts.get(aliases.get(key)); - if (f == null) { + if (f == null) { throw new RuntimeException("There's no font called " + key + "!"); } diff --git a/src/mightypork/gamecore/render/fonts/FontRenderer.java b/src/mightypork/gamecore/render/fonts/FontRenderer.java index 4905cfd..8cb6d43 100644 --- a/src/mightypork/gamecore/render/fonts/FontRenderer.java +++ b/src/mightypork/gamecore/render/fonts/FontRenderer.java @@ -3,9 +3,9 @@ package mightypork.gamecore.render.fonts; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.render.Render; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/render/fonts/GLFont.java b/src/mightypork/gamecore/render/fonts/GLFont.java index a5fb428..3aa5b93 100644 --- a/src/mightypork/gamecore/render/fonts/GLFont.java +++ b/src/mightypork/gamecore/render/fonts/GLFont.java @@ -1,8 +1,8 @@ package mightypork.gamecore.render.fonts; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/render/fonts/impl/CachedFont.java b/src/mightypork/gamecore/render/fonts/impl/CachedFont.java index f2f8705..07e2ffb 100644 --- a/src/mightypork/gamecore/render/fonts/impl/CachedFont.java +++ b/src/mightypork/gamecore/render/fonts/impl/CachedFont.java @@ -20,10 +20,10 @@ import java.util.Map; import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.textures.FilterMode; -import mightypork.utils.logging.Log; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; +import mightypork.util.logging.Log; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; import org.lwjgl.BufferUtils; import org.lwjgl.util.glu.GLU; @@ -294,8 +294,7 @@ public class CachedFont implements GLFont { byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()).put(newI); } else { - byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()) - .put(((DataBufferByte) (bufferedImage.getData().getDataBuffer())).getData()); + byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()).put(((DataBufferByte) (bufferedImage.getData().getDataBuffer())).getData()); } byteBuffer.flip(); @@ -413,8 +412,7 @@ public class CachedFont implements GLFont { chtx = chars.get(charCurrent); if (chtx != null) { - drawQuad((totalwidth), 0, (totalwidth + chtx.width), (chtx.height), chtx.texPosX, chtx.texPosY, chtx.texPosX + chtx.width, chtx.texPosY - + chtx.height); + drawQuad((totalwidth), 0, (totalwidth + chtx.width), (chtx.height), chtx.texPosX, chtx.texPosY, chtx.texPosX + chtx.width, chtx.texPosY + chtx.height); totalwidth += chtx.width; } } diff --git a/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java b/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java index ed4bc2b..c844bc9 100644 --- a/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java +++ b/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java @@ -10,10 +10,10 @@ import mightypork.gamecore.loading.DeferredResource; import mightypork.gamecore.loading.MustLoadInMainThread; import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.textures.FilterMode; -import mightypork.utils.annotations.Alias; -import mightypork.utils.files.FileUtils; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.files.FileUtils; +import mightypork.util.logging.LogAlias; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.vect.Vect; /** @@ -22,7 +22,7 @@ import mightypork.utils.math.constraints.vect.Vect; * @author MightyPork */ @MustLoadInMainThread -@Alias(name = "Font") +@LogAlias(name = "Font") public class DeferredFont extends DeferredResource implements GLFont { public static enum FontStyle @@ -129,7 +129,7 @@ public class DeferredFont extends DeferredResource implements GLFont { */ protected Font getAwtFont(String resource, float size, int style) throws FontFormatException, IOException { - try(InputStream in = FileUtils.getResource(resource)) { + try (InputStream in = FileUtils.getResource(resource)) { Font awtFont = Font.createFont(Font.TRUETYPE_FONT, in); diff --git a/src/mightypork/gamecore/render/fonts/impl/DeferredFontNative.java b/src/mightypork/gamecore/render/fonts/impl/DeferredFontNative.java index cb7359a..c7b4ba6 100644 --- a/src/mightypork/gamecore/render/fonts/impl/DeferredFontNative.java +++ b/src/mightypork/gamecore/render/fonts/impl/DeferredFontNative.java @@ -6,7 +6,7 @@ import java.awt.FontFormatException; import java.io.IOException; import mightypork.gamecore.render.textures.FilterMode; -import mightypork.utils.annotations.Alias; +import mightypork.util.logging.LogAlias; /** @@ -14,7 +14,7 @@ import mightypork.utils.annotations.Alias; * * @author MightyPork */ -@Alias(name = "FontNative") +@LogAlias(name = "FontNative") public class DeferredFontNative extends DeferredFont { /** diff --git a/src/mightypork/gamecore/render/textures/DeferredTexture.java b/src/mightypork/gamecore/render/textures/DeferredTexture.java index 2f3da12..3e55cad 100644 --- a/src/mightypork/gamecore/render/textures/DeferredTexture.java +++ b/src/mightypork/gamecore/render/textures/DeferredTexture.java @@ -4,8 +4,8 @@ package mightypork.gamecore.render.textures; import mightypork.gamecore.loading.DeferredResource; import mightypork.gamecore.loading.MustLoadInMainThread; import mightypork.gamecore.render.Render; -import mightypork.utils.annotations.Alias; -import mightypork.utils.math.constraints.rect.Rect; +import mightypork.util.logging.LogAlias; +import mightypork.util.math.constraints.rect.Rect; import org.lwjgl.opengl.GL11; import org.newdawn.slick.opengl.Texture; @@ -17,7 +17,7 @@ import org.newdawn.slick.opengl.Texture; * @author MightyPork */ @MustLoadInMainThread -@Alias(name = "Texture") +@LogAlias(name = "Texture") public class DeferredTexture extends DeferredResource implements FilteredTexture { private Texture backingTexture; diff --git a/src/mightypork/gamecore/render/textures/TextureBank.java b/src/mightypork/gamecore/render/textures/TextureBank.java index d667fd3..dd08083 100644 --- a/src/mightypork/gamecore/render/textures/TextureBank.java +++ b/src/mightypork/gamecore/render/textures/TextureBank.java @@ -5,8 +5,8 @@ import java.util.HashMap; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAdapter; -import mightypork.gamecore.control.bus.events.ResourceLoadRequest; -import mightypork.utils.math.constraints.rect.Rect; +import mightypork.gamecore.control.events.ResourceLoadRequest; +import mightypork.util.math.constraints.rect.Rect; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/gamecore/render/textures/TxQuad.java b/src/mightypork/gamecore/render/textures/TxQuad.java index a9414d1..68f2533 100644 --- a/src/mightypork/gamecore/render/textures/TxQuad.java +++ b/src/mightypork/gamecore/render/textures/TxQuad.java @@ -1,7 +1,7 @@ package mightypork.gamecore.render.textures; -import mightypork.utils.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.Rect; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/rogue/App.java b/src/mightypork/rogue/App.java index e6ee79c..e6201aa 100644 --- a/src/mightypork/rogue/App.java +++ b/src/mightypork/rogue/App.java @@ -6,7 +6,6 @@ import java.util.Locale; import mightypork.gamecore.control.BaseApp; import mightypork.gamecore.control.GameLoop; -import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.gui.screens.ScreenRegistry; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.input.KeyStroke; @@ -19,8 +18,9 @@ import mightypork.rogue.screens.main_menu.ScreenMainMenu; import mightypork.rogue.screens.test_bouncyboxes.ScreenTestBouncy; import mightypork.rogue.screens.test_cat_sound.ScreenTestCat; import mightypork.rogue.screens.test_render.ScreenTestRender; -import mightypork.utils.logging.Log; -import mightypork.utils.logging.LogWriter; +import mightypork.util.control.eventbus.EventBus; +import mightypork.util.logging.Log; +import mightypork.util.logging.writers.LogWriter; /** diff --git a/src/mightypork/rogue/Config.java b/src/mightypork/rogue/Config.java index 4428437..132184b 100644 --- a/src/mightypork/rogue/Config.java +++ b/src/mightypork/rogue/Config.java @@ -1,8 +1,8 @@ package mightypork.rogue; -import mightypork.utils.config.PropertyManager; -import mightypork.utils.logging.Log; +import mightypork.util.config.PropertyManager; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/rogue/MainLoop.java b/src/mightypork/rogue/MainLoop.java index 321e0ce..7feefea 100644 --- a/src/mightypork/rogue/MainLoop.java +++ b/src/mightypork/rogue/MainLoop.java @@ -9,12 +9,12 @@ import java.util.Date; import mightypork.gamecore.control.BaseApp; import mightypork.gamecore.control.GameLoop; -import mightypork.gamecore.gui.Action; import mightypork.gamecore.render.Screenshot; import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest.RequestType; import mightypork.rogue.util.Utils; -import mightypork.utils.logging.Log; +import mightypork.util.control.Action; +import mightypork.util.logging.Log; public class MainLoop extends GameLoop implements ActionRequest.Listener { diff --git a/src/mightypork/rogue/Paths.java b/src/mightypork/rogue/Paths.java index 0e76a2b..ac037a4 100644 --- a/src/mightypork/rogue/Paths.java +++ b/src/mightypork/rogue/Paths.java @@ -3,7 +3,7 @@ package mightypork.rogue; import java.io.File; -import mightypork.utils.files.OsUtils; +import mightypork.util.files.OsUtils; public class Paths { diff --git a/src/mightypork/rogue/Res.java b/src/mightypork/rogue/Res.java index ec8500b..e1f61c1 100644 --- a/src/mightypork/rogue/Res.java +++ b/src/mightypork/rogue/Res.java @@ -59,7 +59,7 @@ public class Res { font = new DeferredFont("/res/font/PolygonPixel5x7Standard.ttf", Glyphs.basic, 16); fonts.loadFont("polygon_pixel", font); - + font = new DeferredFont("/res/font/PressStart2P.ttf", Glyphs.basic, 16); fonts.loadFont("press_start", font); diff --git a/src/mightypork/rogue/events/ActionRequest.java b/src/mightypork/rogue/events/ActionRequest.java index 1870e73..bf7cd0a 100644 --- a/src/mightypork/rogue/events/ActionRequest.java +++ b/src/mightypork/rogue/events/ActionRequest.java @@ -1,8 +1,8 @@ package mightypork.rogue.events; -import mightypork.gamecore.control.bus.events.Event; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; /** diff --git a/src/mightypork/rogue/screens/LayerFps.java b/src/mightypork/rogue/screens/LayerFps.java index 068f718..d6bd575 100644 --- a/src/mightypork/rogue/screens/LayerFps.java +++ b/src/mightypork/rogue/screens/LayerFps.java @@ -1,7 +1,6 @@ package mightypork.rogue.screens; -import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.gui.screens.Screen; @@ -10,11 +9,11 @@ import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.gamecore.render.fonts.GLFont; import mightypork.rogue.Res; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.rect.proxy.RectBound; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.string.StringProvider; +import mightypork.util.control.Action; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.string.StringProvider; public class LayerFps extends ScreenLayer { @@ -50,12 +49,13 @@ public class LayerFps extends ScreenLayer { } }); - tp.setRect(constraint); + tp.setRect(constraint); tp.setShadow(Color.BLACK, Vect.make(tp.height().div(16))); root.add(tp); } + @Override protected void renderLayer() { diff --git a/src/mightypork/rogue/screens/main_menu/MenuButton.java b/src/mightypork/rogue/screens/main_menu/MenuButton.java index b81b06c..608592c 100644 --- a/src/mightypork/rogue/screens/main_menu/MenuButton.java +++ b/src/mightypork/rogue/screens/main_menu/MenuButton.java @@ -1,11 +1,12 @@ package mightypork.rogue.screens.main_menu; + import mightypork.gamecore.gui.AlignX; 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.utils.math.color.Color; +import mightypork.util.math.color.Color; class MenuButton extends ClickableComponent { @@ -13,6 +14,7 @@ class MenuButton extends ClickableComponent { private static GLFont font = Res.getFont("main_menu_button"); private TextPainter painter; + public MenuButton(String text, Color color) { this.painter = new TextPainter(font, AlignX.CENTER, color, text); painter.setRect(this.shrink(this.height().perc(5))); diff --git a/src/mightypork/rogue/screens/main_menu/MenuLayer.java b/src/mightypork/rogue/screens/main_menu/MenuLayer.java index 706c688..350b02c 100644 --- a/src/mightypork/rogue/screens/main_menu/MenuLayer.java +++ b/src/mightypork/rogue/screens/main_menu/MenuLayer.java @@ -1,35 +1,33 @@ package mightypork.rogue.screens.main_menu; -import java.net.Authenticator.RequestorType; -import mightypork.gamecore.control.bus.events.ScreenRequestEvent; -import mightypork.gamecore.gui.Action; -import mightypork.gamecore.gui.AlignX; +import mightypork.gamecore.control.events.ScreenRequestEvent; import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.components.layout.VerticalFixedFlowLayout; -import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.render.fonts.GLFont; import mightypork.rogue.Res; import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest.RequestType; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.rect.Rect; +import mightypork.util.control.Action; +import mightypork.util.math.color.Color; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.rect.Rect; class MenuLayer extends ScreenLayer { - + public MenuLayer(Screen screen) { super(screen); init(); } - + + private void init() { - Rect menuBox = root.shrink(root.height().min(root.width()).mul(0.1)); + Rect menuBox = root.shrink(root.height().min(root.width()).mul(0.1)); Num lineHeight = menuBox.height().min(menuBox.width()).mul(0.1); @@ -37,10 +35,10 @@ class MenuLayer extends ScreenLayer { root.add(layout); GLFont f = Res.getFont("press_start"); - MenuButton b1,b2,b3,b4; + MenuButton b1, b2, b3, b4; layout.add(b1 = new MenuButton("Render test", Color.WHITE)); layout.add(b2 = new MenuButton("Bouncy Cubes", Color.CYAN)); - layout.add(b3 = new MenuButton("Flying Cat",Color.MAGENTA)); + layout.add(b3 = new MenuButton("Flying Cat", Color.MAGENTA)); layout.add(b4 = new MenuButton("Bye!", Color.GREEN)); b1.setAction(new Action() { @@ -80,7 +78,8 @@ class MenuLayer extends ScreenLayer { } }); } - + + @Override public int getPriority() { diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java index fd73fd1..bc00302 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java @@ -3,15 +3,15 @@ package mightypork.rogue.screens.test_bouncyboxes; import java.util.Random; -import mightypork.gamecore.control.timing.Updateable; import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.render.Render; -import mightypork.utils.math.Easing; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.mutable.NumAnimated; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.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; 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 d5dc911..c91750e 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.utils.math.color.Color; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.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_bouncyboxes/ScreenTestBouncy.java b/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java index dce9db8..d99ab17 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/ScreenTestBouncy.java @@ -2,7 +2,7 @@ package mightypork.rogue.screens.test_bouncyboxes; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.control.bus.events.ScreenRequestEvent; +import mightypork.gamecore.control.events.ScreenRequestEvent; import mightypork.gamecore.gui.screens.LayeredScreen; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; diff --git a/src/mightypork/rogue/screens/test_cat_sound/LayerColor.java b/src/mightypork/rogue/screens/test_cat_sound/LayerColor.java index 9215ff8..8076161 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/LayerColor.java +++ b/src/mightypork/rogue/screens/test_cat_sound/LayerColor.java @@ -1,19 +1,21 @@ package mightypork.rogue.screens.test_cat_sound; + import mightypork.gamecore.gui.components.painters.QuadPainter; import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.ScreenLayer; -import mightypork.utils.math.color.Color; +import mightypork.util.math.color.Color; -public class LayerColor extends ScreenLayer{ +public class LayerColor extends ScreenLayer { public LayerColor(Screen screen, Color color) { super(screen); root.add(new QuadPainter(color)); } - + + @Override public int getPriority() { diff --git a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java index 71e927c..019ec04 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java +++ b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java @@ -3,8 +3,7 @@ package mightypork.rogue.screens.test_cat_sound; import java.util.Random; -import mightypork.gamecore.control.bus.events.MouseButtonEvent; -import mightypork.gamecore.control.timing.Updateable; +import mightypork.gamecore.control.events.MouseButtonEvent; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.painters.ImagePainter; import mightypork.gamecore.gui.components.painters.QuadPainter; @@ -14,13 +13,12 @@ import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.rogue.Res; -import mightypork.utils.math.Easing; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.mutable.NumAnimated; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.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 MouseButtonEvent.Listener { @@ -51,18 +49,17 @@ public class LayerFlyingCat extends ScreenLayer implements MouseButtonEvent.List QuadPainter cat_frame = QuadPainter.gradV(Color.YELLOW, Color.RED); cat_frame.setRect(cat.grow(cat.height().mul(0.05))); cat_frame.enableCaching(false); - + // frame shadow QuadPainter cat_shadow = new QuadPainter(Color.dark(0.4)); cat_shadow.setRect(cat_frame.move(Vect.make(cat.height().mul(0.05)))); cat_shadow.enableCaching(false); - + // add to root layout root.add(cat_shadow); root.add(cat_frame); root.add(cat); - // Meow TextPainter tp = new TextPainter(Res.getFont("press_start")); tp.setAlign(AlignX.CENTER); diff --git a/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java b/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java index d4df1d4..47b7738 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java +++ b/src/mightypork/rogue/screens/test_cat_sound/ScreenTestCat.java @@ -2,7 +2,7 @@ package mightypork.rogue.screens.test_cat_sound; import mightypork.gamecore.control.AppAccess; -import mightypork.gamecore.control.bus.events.ScreenRequestEvent; +import mightypork.gamecore.control.events.ScreenRequestEvent; import mightypork.gamecore.gui.screens.LayeredScreen; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; diff --git a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java index 6c99ed4..97c089b 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.Screen; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.render.Render; -import mightypork.utils.math.color.Color; -import mightypork.utils.math.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/screens/test_render/ScreenTestRender.java b/src/mightypork/rogue/screens/test_render/ScreenTestRender.java index 7bd0714..4ecdd03 100644 --- a/src/mightypork/rogue/screens/test_render/ScreenTestRender.java +++ b/src/mightypork/rogue/screens/test_render/ScreenTestRender.java @@ -4,7 +4,6 @@ package mightypork.rogue.screens.test_render; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.screens.LayeredScreen; import mightypork.rogue.screens.LayerFps; -import mightypork.rogue.screens.test_cat_sound.LayerFlyingCat; public class ScreenTestRender extends LayeredScreen { diff --git a/src/mightypork/test/TestConstCaching.java b/src/mightypork/test/TestConstCaching.java index 0980b19..e7ce2c1 100644 --- a/src/mightypork/test/TestConstCaching.java +++ b/src/mightypork/test/TestConstCaching.java @@ -1,9 +1,9 @@ package mightypork.test; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.caching.VectCache; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.caching.VectCache; +import mightypork.util.math.constraints.vect.mutable.VectVar; public class TestConstCaching { diff --git a/src/mightypork/test/TestConstr.java b/src/mightypork/test/TestConstr.java index 9c2ea9a..a613fa7 100644 --- a/src/mightypork/test/TestConstr.java +++ b/src/mightypork/test/TestConstr.java @@ -3,13 +3,13 @@ package mightypork.test; import java.util.Locale; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.mutable.NumVar; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.RectConst; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.mutable.NumVar; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.RectConst; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; +import mightypork.util.math.constraints.vect.mutable.VectVar; public class TestConstr { diff --git a/src/mightypork/test/TestConvert.java b/src/mightypork/test/TestConvert.java index df1a7fa..bfa763d 100644 --- a/src/mightypork/test/TestConvert.java +++ b/src/mightypork/test/TestConvert.java @@ -3,7 +3,7 @@ package mightypork.test; import java.util.Locale; -import mightypork.utils.objects.Convert; +import mightypork.util.objects.Convert; public class TestConvert { diff --git a/src/mightypork/test/TestCoords.java b/src/mightypork/test/TestCoords.java index 9fbd137..5a49036 100644 --- a/src/mightypork/test/TestCoords.java +++ b/src/mightypork/test/TestCoords.java @@ -1,10 +1,10 @@ package mightypork.test; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.mutable.NumVar; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.mutable.NumVar; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; public class TestCoords { diff --git a/src/mightypork/test/TestTiled.java b/src/mightypork/test/TestTiled.java index c3e219c..1aa00ca 100644 --- a/src/mightypork/test/TestTiled.java +++ b/src/mightypork/test/TestTiled.java @@ -1,9 +1,9 @@ package mightypork.test; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.mutable.NumVar; -import mightypork.utils.math.constraints.rect.Rect; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.num.mutable.NumVar; +import mightypork.util.math.constraints.rect.Rect; public class TestTiled { diff --git a/src/mightypork/test/TestVec.java b/src/mightypork/test/TestVec.java index 830bdc2..cfda41e 100644 --- a/src/mightypork/test/TestVec.java +++ b/src/mightypork/test/TestVec.java @@ -1,9 +1,9 @@ package mightypork.test; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; +import mightypork.util.math.constraints.vect.mutable.VectVar; public class TestVec { diff --git a/src/mightypork/utils/annotations/DefaultImpl.java b/src/mightypork/util/annotations/DefaultImpl.java similarity index 92% rename from src/mightypork/utils/annotations/DefaultImpl.java rename to src/mightypork/util/annotations/DefaultImpl.java index 6b94802..7d5ef30 100644 --- a/src/mightypork/utils/annotations/DefaultImpl.java +++ b/src/mightypork/util/annotations/DefaultImpl.java @@ -1,4 +1,4 @@ -package mightypork.utils.annotations; +package mightypork.util.annotations; import java.lang.annotation.Documented; diff --git a/src/mightypork/utils/annotations/FactoryMethod.java b/src/mightypork/util/annotations/FactoryMethod.java similarity index 91% rename from src/mightypork/utils/annotations/FactoryMethod.java rename to src/mightypork/util/annotations/FactoryMethod.java index 7869603..250b7d0 100644 --- a/src/mightypork/utils/annotations/FactoryMethod.java +++ b/src/mightypork/util/annotations/FactoryMethod.java @@ -1,4 +1,4 @@ -package mightypork.utils.annotations; +package mightypork.util.annotations; import java.lang.annotation.Documented; diff --git a/src/mightypork/utils/config/PropertyManager.java b/src/mightypork/util/config/PropertyManager.java similarity index 97% rename from src/mightypork/utils/config/PropertyManager.java rename to src/mightypork/util/config/PropertyManager.java index 0a67876..1a9c7f6 100644 --- a/src/mightypork/utils/config/PropertyManager.java +++ b/src/mightypork/util/config/PropertyManager.java @@ -1,4 +1,4 @@ -package mightypork.utils.config; +package mightypork.util.config; import java.io.File; @@ -9,10 +9,10 @@ import java.util.ArrayList; import java.util.Map.Entry; import java.util.TreeMap; -import mightypork.utils.math.Range; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; -import mightypork.utils.objects.Convert; +import mightypork.util.math.Range; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.VectConst; +import mightypork.util.objects.Convert; /** @@ -179,7 +179,7 @@ public class PropertyManager { } } - try(FileInputStream fis = new FileInputStream(file)) { + try (FileInputStream fis = new FileInputStream(file)) { props.load(fis); } catch (final IOException e) { needsSave = true; diff --git a/src/mightypork/utils/config/SimpleConfig.java b/src/mightypork/util/config/SimpleConfig.java similarity index 97% rename from src/mightypork/utils/config/SimpleConfig.java rename to src/mightypork/util/config/SimpleConfig.java index c4949a6..d5cb83c 100644 --- a/src/mightypork/utils/config/SimpleConfig.java +++ b/src/mightypork/util/config/SimpleConfig.java @@ -1,4 +1,4 @@ -package mightypork.utils.config; +package mightypork.util.config; import java.io.File; @@ -9,8 +9,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import mightypork.utils.files.FileUtils; -import mightypork.utils.logging.Log; +import mightypork.util.files.FileUtils; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/utils/config/SortedProperties.java b/src/mightypork/util/config/SortedProperties.java similarity index 99% rename from src/mightypork/utils/config/SortedProperties.java rename to src/mightypork/util/config/SortedProperties.java index d45c24a..cc69a8d 100644 --- a/src/mightypork/utils/config/SortedProperties.java +++ b/src/mightypork/util/config/SortedProperties.java @@ -1,4 +1,4 @@ -package mightypork.utils.config; +package mightypork.util.config; import java.io.*; diff --git a/src/mightypork/gamecore/gui/Action.java b/src/mightypork/util/control/Action.java similarity index 87% rename from src/mightypork/gamecore/gui/Action.java rename to src/mightypork/util/control/Action.java index 4445525..780b491 100644 --- a/src/mightypork/gamecore/gui/Action.java +++ b/src/mightypork/util/control/Action.java @@ -1,7 +1,4 @@ -package mightypork.gamecore.gui; - - -import mightypork.gamecore.control.interf.Enableable; +package mightypork.util.control; /** diff --git a/src/mightypork/gamecore/gui/ActionTrigger.java b/src/mightypork/util/control/ActionTrigger.java similarity index 87% rename from src/mightypork/gamecore/gui/ActionTrigger.java rename to src/mightypork/util/control/ActionTrigger.java index 4a6ff27..d86c90b 100644 --- a/src/mightypork/gamecore/gui/ActionTrigger.java +++ b/src/mightypork/util/control/ActionTrigger.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.gui; +package mightypork.util.control; /** diff --git a/src/mightypork/gamecore/control/interf/Destroyable.java b/src/mightypork/util/control/Destroyable.java similarity index 80% rename from src/mightypork/gamecore/control/interf/Destroyable.java rename to src/mightypork/util/control/Destroyable.java index dc6a145..cb085ab 100644 --- a/src/mightypork/gamecore/control/interf/Destroyable.java +++ b/src/mightypork/util/control/Destroyable.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.interf; +package mightypork.util.control; /** diff --git a/src/mightypork/gamecore/control/interf/Enableable.java b/src/mightypork/util/control/Enableable.java similarity index 89% rename from src/mightypork/gamecore/control/interf/Enableable.java rename to src/mightypork/util/control/Enableable.java index a7681ad..42eaddd 100644 --- a/src/mightypork/gamecore/control/interf/Enableable.java +++ b/src/mightypork/util/control/Enableable.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.interf; +package mightypork.util.control; /** diff --git a/src/mightypork/gamecore/control/bus/BufferedHashSet.java b/src/mightypork/util/control/eventbus/BufferedHashSet.java similarity index 98% rename from src/mightypork/gamecore/control/bus/BufferedHashSet.java rename to src/mightypork/util/control/eventbus/BufferedHashSet.java index daf18d7..70ccfa3 100644 --- a/src/mightypork/gamecore/control/bus/BufferedHashSet.java +++ b/src/mightypork/util/control/eventbus/BufferedHashSet.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus; +package mightypork.util.control.eventbus; import java.util.Collection; diff --git a/src/mightypork/gamecore/control/bus/BusAccess.java b/src/mightypork/util/control/eventbus/BusAccess.java similarity index 80% rename from src/mightypork/gamecore/control/bus/BusAccess.java rename to src/mightypork/util/control/eventbus/BusAccess.java index 7b98a82..e605e05 100644 --- a/src/mightypork/gamecore/control/bus/BusAccess.java +++ b/src/mightypork/util/control/eventbus/BusAccess.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus; +package mightypork.util.control.eventbus; /** diff --git a/src/mightypork/gamecore/control/bus/EventBus.java b/src/mightypork/util/control/eventbus/EventBus.java similarity index 93% rename from src/mightypork/gamecore/control/bus/EventBus.java rename to src/mightypork/util/control/eventbus/EventBus.java index 5ee44a9..719b5ca 100644 --- a/src/mightypork/gamecore/control/bus/EventBus.java +++ b/src/mightypork/util/control/eventbus/EventBus.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus; +package mightypork.util.control.eventbus; import java.util.Collection; @@ -6,15 +6,15 @@ import java.util.concurrent.DelayQueue; import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; -import mightypork.gamecore.control.bus.clients.DelegatingClient; -import mightypork.gamecore.control.bus.events.Event; -import mightypork.gamecore.control.bus.events.types.DelayedEvent; -import mightypork.gamecore.control.bus.events.types.ImmediateEvent; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; -import mightypork.gamecore.control.bus.events.types.UnloggedEvent; -import mightypork.gamecore.control.interf.Destroyable; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.logging.Log; +import mightypork.util.annotations.FactoryMethod; +import mightypork.util.control.Destroyable; +import mightypork.util.control.eventbus.clients.DelegatingClient; +import mightypork.util.control.eventbus.events.Event; +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.logging.Log; /** diff --git a/src/mightypork/gamecore/control/bus/EventChannel.java b/src/mightypork/util/control/eventbus/EventChannel.java similarity index 93% rename from src/mightypork/gamecore/control/bus/EventChannel.java rename to src/mightypork/util/control/eventbus/EventChannel.java index 6fa3ee7..e996349 100644 --- a/src/mightypork/gamecore/control/bus/EventChannel.java +++ b/src/mightypork/util/control/eventbus/EventChannel.java @@ -1,14 +1,14 @@ -package mightypork.gamecore.control.bus; +package mightypork.util.control.eventbus; import java.util.Collection; import java.util.HashSet; -import mightypork.gamecore.control.bus.clients.DelegatingClient; -import mightypork.gamecore.control.bus.clients.ToggleableClient; -import mightypork.gamecore.control.bus.events.Event; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; -import mightypork.utils.logging.Log; +import mightypork.util.control.eventbus.clients.DelegatingClient; +import mightypork.util.control.eventbus.clients.ToggleableClient; +import mightypork.util.control.eventbus.events.Event; +import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent; +import mightypork.util.logging.Log; /** diff --git a/src/mightypork/gamecore/control/bus/clients/BusNode.java b/src/mightypork/util/control/eventbus/clients/BusNode.java similarity index 92% rename from src/mightypork/gamecore/control/bus/clients/BusNode.java rename to src/mightypork/util/control/eventbus/clients/BusNode.java index 5ffe7b6..c2e36ca 100644 --- a/src/mightypork/gamecore/control/bus/clients/BusNode.java +++ b/src/mightypork/util/control/eventbus/clients/BusNode.java @@ -1,12 +1,12 @@ -package mightypork.gamecore.control.bus.clients; +package mightypork.util.control.eventbus.clients; import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import mightypork.gamecore.control.bus.BusAccess; -import mightypork.gamecore.control.bus.EventBus; +import mightypork.util.control.eventbus.BusAccess; +import mightypork.util.control.eventbus.EventBus; /** diff --git a/src/mightypork/gamecore/control/bus/clients/ClientHub.java b/src/mightypork/util/control/eventbus/clients/ClientHub.java similarity index 86% rename from src/mightypork/gamecore/control/bus/clients/ClientHub.java rename to src/mightypork/util/control/eventbus/clients/ClientHub.java index dfdabf2..59fe902 100644 --- a/src/mightypork/gamecore/control/bus/clients/ClientHub.java +++ b/src/mightypork/util/control/eventbus/clients/ClientHub.java @@ -1,9 +1,9 @@ -package mightypork.gamecore.control.bus.clients; +package mightypork.util.control.eventbus.clients; import java.util.Collection; -import mightypork.gamecore.control.bus.EventBus; +import mightypork.util.control.eventbus.EventBus; /** diff --git a/src/mightypork/gamecore/control/bus/clients/DelegatingClient.java b/src/mightypork/util/control/eventbus/clients/DelegatingClient.java similarity index 91% rename from src/mightypork/gamecore/control/bus/clients/DelegatingClient.java rename to src/mightypork/util/control/eventbus/clients/DelegatingClient.java index 089726a..63c665f 100644 --- a/src/mightypork/gamecore/control/bus/clients/DelegatingClient.java +++ b/src/mightypork/util/control/eventbus/clients/DelegatingClient.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus.clients; +package mightypork.util.control.eventbus.clients; import java.util.Collection; diff --git a/src/mightypork/gamecore/control/bus/clients/RootBusNode.java b/src/mightypork/util/control/eventbus/clients/RootBusNode.java similarity index 77% rename from src/mightypork/gamecore/control/bus/clients/RootBusNode.java rename to src/mightypork/util/control/eventbus/clients/RootBusNode.java index a399276..a02d4b6 100644 --- a/src/mightypork/gamecore/control/bus/clients/RootBusNode.java +++ b/src/mightypork/util/control/eventbus/clients/RootBusNode.java @@ -1,8 +1,8 @@ -package mightypork.gamecore.control.bus.clients; +package mightypork.util.control.eventbus.clients; -import mightypork.gamecore.control.bus.BusAccess; -import mightypork.gamecore.control.interf.Destroyable; +import mightypork.util.control.Destroyable; +import mightypork.util.control.eventbus.BusAccess; /** diff --git a/src/mightypork/gamecore/control/bus/clients/ToggleableClient.java b/src/mightypork/util/control/eventbus/clients/ToggleableClient.java similarity index 81% rename from src/mightypork/gamecore/control/bus/clients/ToggleableClient.java rename to src/mightypork/util/control/eventbus/clients/ToggleableClient.java index fe79833..1ef61ec 100644 --- a/src/mightypork/gamecore/control/bus/clients/ToggleableClient.java +++ b/src/mightypork/util/control/eventbus/clients/ToggleableClient.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus.clients; +package mightypork.util.control.eventbus.clients; /** diff --git a/src/mightypork/gamecore/control/bus/events/Event.java b/src/mightypork/util/control/eventbus/events/Event.java similarity index 69% rename from src/mightypork/gamecore/control/bus/events/Event.java rename to src/mightypork/util/control/eventbus/events/Event.java index 2a5ba9c..19fbbd5 100644 --- a/src/mightypork/gamecore/control/bus/events/Event.java +++ b/src/mightypork/util/control/eventbus/events/Event.java @@ -1,10 +1,10 @@ -package mightypork.gamecore.control.bus.events; +package mightypork.util.control.eventbus.events; -import mightypork.gamecore.control.bus.events.types.DelayedEvent; -import mightypork.gamecore.control.bus.events.types.ImmediateEvent; -import mightypork.gamecore.control.bus.events.types.SingleReceiverEvent; -import mightypork.gamecore.control.bus.events.types.UnloggedEvent; +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; /** diff --git a/src/mightypork/gamecore/control/bus/events/types/DelayedEvent.java b/src/mightypork/util/control/eventbus/events/flags/DelayedEvent.java similarity index 85% rename from src/mightypork/gamecore/control/bus/events/types/DelayedEvent.java rename to src/mightypork/util/control/eventbus/events/flags/DelayedEvent.java index 9dd4d21..65f8d12 100644 --- a/src/mightypork/gamecore/control/bus/events/types/DelayedEvent.java +++ b/src/mightypork/util/control/eventbus/events/flags/DelayedEvent.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus.events.types; +package mightypork.util.control.eventbus.events.flags; import java.lang.annotation.*; diff --git a/src/mightypork/gamecore/control/bus/events/types/ImmediateEvent.java b/src/mightypork/util/control/eventbus/events/flags/ImmediateEvent.java similarity index 80% rename from src/mightypork/gamecore/control/bus/events/types/ImmediateEvent.java rename to src/mightypork/util/control/eventbus/events/flags/ImmediateEvent.java index 42004f5..f7bd4d5 100644 --- a/src/mightypork/gamecore/control/bus/events/types/ImmediateEvent.java +++ b/src/mightypork/util/control/eventbus/events/flags/ImmediateEvent.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus.events.types; +package mightypork.util.control.eventbus.events.flags; import java.lang.annotation.*; diff --git a/src/mightypork/gamecore/control/bus/events/types/SingleReceiverEvent.java b/src/mightypork/util/control/eventbus/events/flags/SingleReceiverEvent.java similarity index 81% rename from src/mightypork/gamecore/control/bus/events/types/SingleReceiverEvent.java rename to src/mightypork/util/control/eventbus/events/flags/SingleReceiverEvent.java index fd75dd6..0bc033d 100644 --- a/src/mightypork/gamecore/control/bus/events/types/SingleReceiverEvent.java +++ b/src/mightypork/util/control/eventbus/events/flags/SingleReceiverEvent.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus.events.types; +package mightypork.util.control.eventbus.events.flags; import java.lang.annotation.*; diff --git a/src/mightypork/gamecore/control/bus/events/types/UnloggedEvent.java b/src/mightypork/util/control/eventbus/events/flags/UnloggedEvent.java similarity index 85% rename from src/mightypork/gamecore/control/bus/events/types/UnloggedEvent.java rename to src/mightypork/util/control/eventbus/events/flags/UnloggedEvent.java index 1f776d3..7eed194 100644 --- a/src/mightypork/gamecore/control/bus/events/types/UnloggedEvent.java +++ b/src/mightypork/util/control/eventbus/events/flags/UnloggedEvent.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.bus.events.types; +package mightypork.util.control.eventbus.events.flags; import java.lang.annotation.*; diff --git a/src/mightypork/gamecore/control/timing/FpsMeter.java b/src/mightypork/util/control/timing/FpsMeter.java similarity index 94% rename from src/mightypork/gamecore/control/timing/FpsMeter.java rename to src/mightypork/util/control/timing/FpsMeter.java index eae4e5b..5e41c99 100644 --- a/src/mightypork/gamecore/control/timing/FpsMeter.java +++ b/src/mightypork/util/control/timing/FpsMeter.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.timing; +package mightypork.util.control.timing; /** diff --git a/src/mightypork/gamecore/control/timing/Pauseable.java b/src/mightypork/util/control/timing/Pauseable.java similarity index 86% rename from src/mightypork/gamecore/control/timing/Pauseable.java rename to src/mightypork/util/control/timing/Pauseable.java index 41830c3..79b7698 100644 --- a/src/mightypork/gamecore/control/timing/Pauseable.java +++ b/src/mightypork/util/control/timing/Pauseable.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.timing; +package mightypork.util.control.timing; /** diff --git a/src/mightypork/gamecore/control/timing/TimerDelta.java b/src/mightypork/util/control/timing/TimerDelta.java similarity index 93% rename from src/mightypork/gamecore/control/timing/TimerDelta.java rename to src/mightypork/util/control/timing/TimerDelta.java index 53febfb..acc96e7 100644 --- a/src/mightypork/gamecore/control/timing/TimerDelta.java +++ b/src/mightypork/util/control/timing/TimerDelta.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.timing; +package mightypork.util.control.timing; /** diff --git a/src/mightypork/gamecore/control/timing/TimerFps.java b/src/mightypork/util/control/timing/TimerFps.java similarity index 97% rename from src/mightypork/gamecore/control/timing/TimerFps.java rename to src/mightypork/util/control/timing/TimerFps.java index 087db15..a699585 100644 --- a/src/mightypork/gamecore/control/timing/TimerFps.java +++ b/src/mightypork/util/control/timing/TimerFps.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.timing; +package mightypork.util.control.timing; /** diff --git a/src/mightypork/gamecore/control/timing/Updateable.java b/src/mightypork/util/control/timing/Updateable.java similarity index 84% rename from src/mightypork/gamecore/control/timing/Updateable.java rename to src/mightypork/util/control/timing/Updateable.java index 10af7fe..0bb0c20 100644 --- a/src/mightypork/gamecore/control/timing/Updateable.java +++ b/src/mightypork/util/control/timing/Updateable.java @@ -1,4 +1,4 @@ -package mightypork.gamecore.control.timing; +package mightypork.util.control.timing; /** diff --git a/src/mightypork/utils/files/FileTreeDiff.java b/src/mightypork/util/files/FileTreeDiff.java similarity index 90% rename from src/mightypork/utils/files/FileTreeDiff.java rename to src/mightypork/util/files/FileTreeDiff.java index 6f427ba..41d4cfc 100644 --- a/src/mightypork/utils/files/FileTreeDiff.java +++ b/src/mightypork/util/files/FileTreeDiff.java @@ -1,4 +1,4 @@ -package mightypork.utils.files; +package mightypork.util.files; import java.io.File; @@ -12,7 +12,7 @@ import java.util.zip.Adler32; import java.util.zip.CheckedInputStream; import java.util.zip.Checksum; -import mightypork.utils.logging.Log; +import mightypork.util.logging.Log; public class FileTreeDiff { @@ -72,11 +72,9 @@ public class FileTreeDiff { ck1.reset(); ck2.reset(); - try(FileInputStream in1 = new FileInputStream(pair.a); - FileInputStream in2 = new FileInputStream(pair.b)) { + try (FileInputStream in1 = new FileInputStream(pair.a); FileInputStream in2 = new FileInputStream(pair.b)) { - try(CheckedInputStream cin1 = new CheckedInputStream(in1, ck1); - CheckedInputStream cin2 = new CheckedInputStream(in2, ck2)) { + try (CheckedInputStream cin1 = new CheckedInputStream(in1, ck1); CheckedInputStream cin2 = new CheckedInputStream(in2, ck2)) { while (true) { final int read1 = cin1.read(BUFFER); diff --git a/src/mightypork/utils/files/FileUtils.java b/src/mightypork/util/files/FileUtils.java similarity index 94% rename from src/mightypork/utils/files/FileUtils.java rename to src/mightypork/util/files/FileUtils.java index b6c2ce2..df56340 100644 --- a/src/mightypork/utils/files/FileUtils.java +++ b/src/mightypork/util/files/FileUtils.java @@ -1,13 +1,13 @@ -package mightypork.utils.files; +package mightypork.util.files; import java.io.*; import java.util.ArrayList; import java.util.List; -import mightypork.utils.logging.Log; -import mightypork.utils.string.StringUtils; -import mightypork.utils.string.validation.StringFilter; +import mightypork.util.logging.Log; +import mightypork.util.string.StringUtils; +import mightypork.util.string.validation.StringFilter; public class FileUtils { @@ -95,8 +95,7 @@ public class FileUtils { public static void copyFile(File source, File target) throws IOException { - try(InputStream in = new FileInputStream(source); - OutputStream out = new FileOutputStream(target)) { + try (InputStream in = new FileInputStream(source); OutputStream out = new FileOutputStream(target)) { copyStream(in, out); } @@ -161,7 +160,7 @@ public class FileUtils { */ public static String fileToString(File file) throws IOException { - try(FileInputStream fin = new FileInputStream(file)) { + try (FileInputStream fin = new FileInputStream(file)) { return streamToString(fin); } @@ -361,7 +360,7 @@ public class FileUtils { */ public static void stringToFile(File file, String text) throws IOException { - try(PrintStream out = new PrintStream(new FileOutputStream(file), false, "UTF-8")) { + try (PrintStream out = new PrintStream(new FileOutputStream(file), false, "UTF-8")) { out.print(text); @@ -482,8 +481,7 @@ public class FileUtils { */ public static void resourceToFile(String resname, File file) throws IOException { - try(InputStream in = FileUtils.getResource(resname); - OutputStream out = new FileOutputStream(file)) { + try (InputStream in = FileUtils.getResource(resname); OutputStream out = new FileOutputStream(file)) { FileUtils.copyStream(in, out); } @@ -500,7 +498,7 @@ public class FileUtils { */ public static String resourceToString(String resname) throws IOException { - try(InputStream in = FileUtils.getResource(resname)) { + try (InputStream in = FileUtils.getResource(resname)) { return streamToString(in); } } diff --git a/src/mightypork/utils/files/InstanceLock.java b/src/mightypork/util/files/InstanceLock.java similarity index 96% rename from src/mightypork/utils/files/InstanceLock.java rename to src/mightypork/util/files/InstanceLock.java index 6b7a43b..0af2375 100644 --- a/src/mightypork/utils/files/InstanceLock.java +++ b/src/mightypork/util/files/InstanceLock.java @@ -1,4 +1,4 @@ -package mightypork.utils.files; +package mightypork.util.files; import java.io.File; diff --git a/src/mightypork/utils/files/OsUtils.java b/src/mightypork/util/files/OsUtils.java similarity index 98% rename from src/mightypork/utils/files/OsUtils.java rename to src/mightypork/util/files/OsUtils.java index d51580e..b3f6fe3 100644 --- a/src/mightypork/utils/files/OsUtils.java +++ b/src/mightypork/util/files/OsUtils.java @@ -1,4 +1,4 @@ -package mightypork.utils.files; +package mightypork.util.files; import java.io.File; diff --git a/src/mightypork/utils/files/ion/AbstractIonList.java b/src/mightypork/util/files/ion/AbstractIonList.java similarity index 97% rename from src/mightypork/utils/files/ion/AbstractIonList.java rename to src/mightypork/util/files/ion/AbstractIonList.java index 15633b2..8883758 100644 --- a/src/mightypork/utils/files/ion/AbstractIonList.java +++ b/src/mightypork/util/files/ion/AbstractIonList.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/utils/files/ion/AbstractIonMap.java b/src/mightypork/util/files/ion/AbstractIonMap.java similarity index 98% rename from src/mightypork/utils/files/ion/AbstractIonMap.java rename to src/mightypork/util/files/ion/AbstractIonMap.java index d6963d3..3cd4b8e 100644 --- a/src/mightypork/utils/files/ion/AbstractIonMap.java +++ b/src/mightypork/util/files/ion/AbstractIonMap.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/utils/files/ion/BinaryUtils.java b/src/mightypork/util/files/ion/BinaryUtils.java similarity index 99% rename from src/mightypork/utils/files/ion/BinaryUtils.java rename to src/mightypork/util/files/ion/BinaryUtils.java index 9efde90..e421a08 100644 --- a/src/mightypork/utils/files/ion/BinaryUtils.java +++ b/src/mightypork/util/files/ion/BinaryUtils.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; import java.io.IOException; diff --git a/src/mightypork/utils/files/ion/Ion.java b/src/mightypork/util/files/ion/Ion.java similarity index 97% rename from src/mightypork/utils/files/ion/Ion.java rename to src/mightypork/util/files/ion/Ion.java index 3d0dbb6..1ce8735 100644 --- a/src/mightypork/utils/files/ion/Ion.java +++ b/src/mightypork/util/files/ion/Ion.java @@ -1,11 +1,11 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; import java.io.*; import java.util.HashMap; import java.util.Map; -import mightypork.utils.math.Calc; +import mightypork.util.math.Calc; /** @@ -67,7 +67,7 @@ public class Ion { */ public static Object fromFile(File file) throws IonException { - try(InputStream in = new FileInputStream(file)) { + try (InputStream in = new FileInputStream(file)) { final Object obj = fromStream(in); return obj; @@ -113,7 +113,7 @@ public class Ion { */ public static void toFile(File path, Object obj) throws IonException { - try(OutputStream out = new FileOutputStream(path)) { + try (OutputStream out = new FileOutputStream(path)) { final String f = path.toString(); final File dir = new File(f.substring(0, f.lastIndexOf(File.separator))); diff --git a/src/mightypork/utils/files/ion/IonException.java b/src/mightypork/util/files/ion/IonException.java similarity index 89% rename from src/mightypork/utils/files/ion/IonException.java rename to src/mightypork/util/files/ion/IonException.java index 6ddeb40..cc14ea2 100644 --- a/src/mightypork/utils/files/ion/IonException.java +++ b/src/mightypork/util/files/ion/IonException.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; public class IonException extends Exception { diff --git a/src/mightypork/utils/files/ion/IonList.java b/src/mightypork/util/files/ion/IonList.java similarity index 98% rename from src/mightypork/utils/files/ion/IonList.java rename to src/mightypork/util/files/ion/IonList.java index 266062b..2517407 100644 --- a/src/mightypork/utils/files/ion/IonList.java +++ b/src/mightypork/util/files/ion/IonList.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; /** diff --git a/src/mightypork/utils/files/ion/IonMap.java b/src/mightypork/util/files/ion/IonMap.java similarity index 98% rename from src/mightypork/utils/files/ion/IonMap.java rename to src/mightypork/util/files/ion/IonMap.java index 2cfaf9d..8769655 100644 --- a/src/mightypork/utils/files/ion/IonMap.java +++ b/src/mightypork/util/files/ion/IonMap.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; /** diff --git a/src/mightypork/utils/files/ion/IonMarks.java b/src/mightypork/util/files/ion/IonMarks.java similarity index 96% rename from src/mightypork/utils/files/ion/IonMarks.java rename to src/mightypork/util/files/ion/IonMarks.java index 5e2f927..9195f96 100644 --- a/src/mightypork/utils/files/ion/IonMarks.java +++ b/src/mightypork/util/files/ion/IonMarks.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; /** diff --git a/src/mightypork/utils/files/ion/Ionizable.java b/src/mightypork/util/files/ion/Ionizable.java similarity index 95% rename from src/mightypork/utils/files/ion/Ionizable.java rename to src/mightypork/util/files/ion/Ionizable.java index 3327a95..89f5298 100644 --- a/src/mightypork/utils/files/ion/Ionizable.java +++ b/src/mightypork/util/files/ion/Ionizable.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; import java.io.InputStream; diff --git a/src/mightypork/utils/files/ion/IonizableOptional.java b/src/mightypork/util/files/ion/IonizableOptional.java similarity index 87% rename from src/mightypork/utils/files/ion/IonizableOptional.java rename to src/mightypork/util/files/ion/IonizableOptional.java index de2f42b..cd47ecd 100644 --- a/src/mightypork/utils/files/ion/IonizableOptional.java +++ b/src/mightypork/util/files/ion/IonizableOptional.java @@ -1,4 +1,4 @@ -package mightypork.utils.files.ion; +package mightypork.util.files.ion; /** diff --git a/src/mightypork/utils/files/ZipBuilder.java b/src/mightypork/util/files/zip/ZipBuilder.java similarity index 91% rename from src/mightypork/utils/files/ZipBuilder.java rename to src/mightypork/util/files/zip/ZipBuilder.java index 875baa6..98fbd9a 100644 --- a/src/mightypork/utils/files/ZipBuilder.java +++ b/src/mightypork/util/files/zip/ZipBuilder.java @@ -1,4 +1,4 @@ -package mightypork.utils.files; +package mightypork.util.files.zip; import java.io.BufferedOutputStream; @@ -10,7 +10,8 @@ import java.util.HashSet; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import mightypork.utils.logging.Log; +import mightypork.util.files.FileUtils; +import mightypork.util.logging.Log; /** @@ -74,7 +75,7 @@ public class ZipBuilder { out.putNextEntry(new ZipEntry(path)); - try(InputStream in = FileUtils.stringToStream(text)) { + try (InputStream in = FileUtils.stringToStream(text)) { FileUtils.copyStream(in, out); } } @@ -95,7 +96,7 @@ public class ZipBuilder { out.putNextEntry(new ZipEntry(path)); - try(InputStream in = FileUtils.getResource(resPath)) { + try (InputStream in = FileUtils.getResource(resPath)) { FileUtils.copyStream(in, out); } } diff --git a/src/mightypork/utils/files/ZipUtils.java b/src/mightypork/util/files/zip/ZipUtils.java similarity index 88% rename from src/mightypork/utils/files/ZipUtils.java rename to src/mightypork/util/files/zip/ZipUtils.java index faa330d..13649d5 100644 --- a/src/mightypork/utils/files/ZipUtils.java +++ b/src/mightypork/util/files/zip/ZipUtils.java @@ -1,4 +1,4 @@ -package mightypork.utils.files; +package mightypork.util.files.zip; import java.io.*; @@ -8,8 +8,9 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import mightypork.utils.logging.Log; -import mightypork.utils.string.validation.StringFilter; +import mightypork.util.files.FileUtils; +import mightypork.util.logging.Log; +import mightypork.util.string.validation.StringFilter; /** @@ -33,7 +34,7 @@ public class ZipUtils { */ public static List extractZip(File file, File outputDir, StringFilter filter) throws IOException { - try(ZipFile zip = new ZipFile(file)) { + try (ZipFile zip = new ZipFile(file)) { return extractZip(zip, outputDir, filter); } } @@ -89,7 +90,7 @@ public class ZipUtils { */ public static List listZip(File zipFile) throws IOException { - try(ZipFile zip = new ZipFile(zipFile)) { + try (ZipFile zip = new ZipFile(zipFile)) { return listZip(zip); } } @@ -133,10 +134,7 @@ public class ZipUtils { { if (!destFile.getParentFile().mkdirs()) throw new IOException("Could not create output directory."); - try(InputStream in = zip.getInputStream(entry); - BufferedInputStream is = new BufferedInputStream(in); - FileOutputStream fos = new FileOutputStream(destFile); - BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER_SIZE)) { + try (InputStream in = zip.getInputStream(entry); BufferedInputStream is = new BufferedInputStream(in); FileOutputStream fos = new FileOutputStream(destFile); BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER_SIZE)) { FileUtils.copyStream(is, dest); } @@ -170,7 +168,7 @@ public class ZipUtils { public static boolean entryExists(File selectedFile, String string) { - try(ZipFile zf = new ZipFile(selectedFile)) { + try (ZipFile zf = new ZipFile(selectedFile)) { return zf.getEntry(string) != null; } catch (final IOException | RuntimeException e) { Log.w("Error reading zip.", e); diff --git a/src/mightypork/utils/logging/Log.java b/src/mightypork/util/logging/Log.java similarity index 92% rename from src/mightypork/utils/logging/Log.java rename to src/mightypork/util/logging/Log.java index 810f1b9..8f6e86b 100644 --- a/src/mightypork/utils/logging/Log.java +++ b/src/mightypork/util/logging/Log.java @@ -1,4 +1,4 @@ -package mightypork.utils.logging; +package mightypork.util.logging; import java.io.File; @@ -7,9 +7,13 @@ import java.io.StringWriter; import java.util.HashMap; import java.util.logging.Level; -import mightypork.utils.annotations.Alias; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.string.StringUtils; +import mightypork.util.annotations.FactoryMethod; +import mightypork.util.logging.monitors.LogMonitor; +import mightypork.util.logging.monitors.LogToSysoutMonitor; +import mightypork.util.logging.writers.ArchivingLog; +import mightypork.util.logging.writers.LogWriter; +import mightypork.util.logging.writers.SimpleLog; +import mightypork.util.string.StringUtils; /** @@ -286,7 +290,7 @@ public class Log { } - static String formatMessage(Level level, String message, Throwable throwable, long start_ms) + public static String formatMessage(Level level, String message, Throwable throwable, long start_ms) { final String nl = System.getProperty("line.separator"); @@ -352,7 +356,7 @@ public class Log { public static String str(Class cls) { - final Alias ln = cls.getAnnotation(Alias.class); + final LogAlias ln = cls.getAnnotation(LogAlias.class); if (ln != null) { return ln.name(); } diff --git a/src/mightypork/utils/annotations/Alias.java b/src/mightypork/util/logging/LogAlias.java similarity index 84% rename from src/mightypork/utils/annotations/Alias.java rename to src/mightypork/util/logging/LogAlias.java index 02f44ad..9d080f1 100644 --- a/src/mightypork/utils/annotations/Alias.java +++ b/src/mightypork/util/logging/LogAlias.java @@ -1,4 +1,4 @@ -package mightypork.utils.annotations; +package mightypork.util.logging; import java.lang.annotation.Documented; @@ -15,7 +15,7 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented -public @interface Alias { +public @interface LogAlias { String name(); } diff --git a/src/mightypork/utils/logging/BaseLogMonitor.java b/src/mightypork/util/logging/monitors/BaseLogMonitor.java similarity index 93% rename from src/mightypork/utils/logging/BaseLogMonitor.java rename to src/mightypork/util/logging/monitors/BaseLogMonitor.java index 728320b..997bd2f 100644 --- a/src/mightypork/utils/logging/BaseLogMonitor.java +++ b/src/mightypork/util/logging/monitors/BaseLogMonitor.java @@ -1,4 +1,4 @@ -package mightypork.utils.logging; +package mightypork.util.logging.monitors; import java.util.logging.Level; diff --git a/src/mightypork/utils/logging/LogMonitor.java b/src/mightypork/util/logging/monitors/LogMonitor.java similarity index 81% rename from src/mightypork/utils/logging/LogMonitor.java rename to src/mightypork/util/logging/monitors/LogMonitor.java index 7b76627..bf355ad 100644 --- a/src/mightypork/utils/logging/LogMonitor.java +++ b/src/mightypork/util/logging/monitors/LogMonitor.java @@ -1,4 +1,4 @@ -package mightypork.utils.logging; +package mightypork.util.logging.monitors; import java.util.logging.Level; diff --git a/src/mightypork/utils/logging/LogToSysoutMonitor.java b/src/mightypork/util/logging/monitors/LogToSysoutMonitor.java similarity index 87% rename from src/mightypork/utils/logging/LogToSysoutMonitor.java rename to src/mightypork/util/logging/monitors/LogToSysoutMonitor.java index 1daee12..909efec 100644 --- a/src/mightypork/utils/logging/LogToSysoutMonitor.java +++ b/src/mightypork/util/logging/monitors/LogToSysoutMonitor.java @@ -1,4 +1,4 @@ -package mightypork.utils.logging; +package mightypork.util.logging.monitors; import java.util.logging.Level; diff --git a/src/mightypork/utils/logging/ArchivingLog.java b/src/mightypork/util/logging/writers/ArchivingLog.java similarity index 97% rename from src/mightypork/utils/logging/ArchivingLog.java rename to src/mightypork/util/logging/writers/ArchivingLog.java index cb2479a..116b2ef 100644 --- a/src/mightypork/utils/logging/ArchivingLog.java +++ b/src/mightypork/util/logging/writers/ArchivingLog.java @@ -1,4 +1,4 @@ -package mightypork.utils.logging; +package mightypork.util.logging.writers; import java.io.File; @@ -9,7 +9,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; -import mightypork.utils.files.FileUtils; +import mightypork.util.files.FileUtils; /** diff --git a/src/mightypork/utils/logging/LogWriter.java b/src/mightypork/util/logging/writers/LogWriter.java similarity index 90% rename from src/mightypork/utils/logging/LogWriter.java rename to src/mightypork/util/logging/writers/LogWriter.java index d225291..99df21b 100644 --- a/src/mightypork/utils/logging/LogWriter.java +++ b/src/mightypork/util/logging/writers/LogWriter.java @@ -1,8 +1,10 @@ -package mightypork.utils.logging; +package mightypork.util.logging.writers; import java.util.logging.Level; +import mightypork.util.logging.monitors.LogMonitor; + /** * Log interface diff --git a/src/mightypork/utils/logging/SimpleLog.java b/src/mightypork/util/logging/writers/SimpleLog.java similarity index 95% rename from src/mightypork/utils/logging/SimpleLog.java rename to src/mightypork/util/logging/writers/SimpleLog.java index 6f51d10..604ddea 100644 --- a/src/mightypork/utils/logging/SimpleLog.java +++ b/src/mightypork/util/logging/writers/SimpleLog.java @@ -1,4 +1,4 @@ -package mightypork.utils.logging; +package mightypork.util.logging.writers; import java.io.File; @@ -11,6 +11,9 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import mightypork.util.logging.Log; +import mightypork.util.logging.monitors.LogMonitor; + /** * Basic logger diff --git a/src/mightypork/utils/math/Calc.java b/src/mightypork/util/math/Calc.java similarity index 99% rename from src/mightypork/utils/math/Calc.java rename to src/mightypork/util/math/Calc.java index 516dc7d..41d03be 100644 --- a/src/mightypork/utils/math/Calc.java +++ b/src/mightypork/util/math/Calc.java @@ -1,4 +1,4 @@ -package mightypork.utils.math; +package mightypork.util.math; import java.nio.FloatBuffer; @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; import org.lwjgl.BufferUtils; diff --git a/src/mightypork/utils/math/Easing.java b/src/mightypork/util/math/Easing.java similarity index 98% rename from src/mightypork/utils/math/Easing.java rename to src/mightypork/util/math/Easing.java index 926f63a..4f34a09 100644 --- a/src/mightypork/utils/math/Easing.java +++ b/src/mightypork/util/math/Easing.java @@ -1,7 +1,7 @@ -package mightypork.utils.math; +package mightypork.util.math; -import mightypork.utils.annotations.FactoryMethod; +import mightypork.util.annotations.FactoryMethod; /** diff --git a/src/mightypork/utils/math/Polar.java b/src/mightypork/util/math/Polar.java similarity index 97% rename from src/mightypork/utils/math/Polar.java rename to src/mightypork/util/math/Polar.java index 4f6b6af..1d40249 100644 --- a/src/mightypork/utils/math/Polar.java +++ b/src/mightypork/util/math/Polar.java @@ -1,7 +1,7 @@ -package mightypork.utils.math; +package mightypork.util.math; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/Range.java b/src/mightypork/util/math/Range.java similarity index 98% rename from src/mightypork/utils/math/Range.java rename to src/mightypork/util/math/Range.java index d5d0d24..7596d24 100644 --- a/src/mightypork/utils/math/Range.java +++ b/src/mightypork/util/math/Range.java @@ -1,4 +1,4 @@ -package mightypork.utils.math; +package mightypork.util.math; import java.util.Random; diff --git a/src/mightypork/utils/math/color/Color.java b/src/mightypork/util/math/color/Color.java similarity index 95% rename from src/mightypork/utils/math/color/Color.java rename to src/mightypork/util/math/color/Color.java index 76ba2e2..ab46bfb 100644 --- a/src/mightypork/utils/math/color/Color.java +++ b/src/mightypork/util/math/color/Color.java @@ -1,11 +1,11 @@ -package mightypork.utils.math.color; +package mightypork.util.math.color; import java.util.Stack; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.Calc; -import mightypork.utils.math.constraints.num.Num; +import mightypork.util.annotations.FactoryMethod; +import mightypork.util.math.Calc; +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/utils/math/color/ColorHsb.java b/src/mightypork/util/math/color/ColorHsb.java similarity index 90% rename from src/mightypork/utils/math/color/ColorHsb.java rename to src/mightypork/util/math/color/ColorHsb.java index bdffd50..028f6b8 100644 --- a/src/mightypork/utils/math/color/ColorHsb.java +++ b/src/mightypork/util/math/color/ColorHsb.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.color; +package mightypork.util.math.color; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; public class ColorHsb extends Color { diff --git a/src/mightypork/utils/math/color/ColorRgb.java b/src/mightypork/util/math/color/ColorRgb.java similarity index 85% rename from src/mightypork/utils/math/color/ColorRgb.java rename to src/mightypork/util/math/color/ColorRgb.java index 279f819..76fa7dd 100644 --- a/src/mightypork/utils/math/color/ColorRgb.java +++ b/src/mightypork/util/math/color/ColorRgb.java @@ -1,10 +1,11 @@ -package mightypork.utils.math.color; +package mightypork.util.math.color; -import mightypork.utils.math.constraints.num.Num; +import mightypork.util.math.constraints.num.Num; -public class ColorRgb extends Color { +public class ColorRgb extends Color { + private final Num r; private final Num g; private final Num b; diff --git a/src/mightypork/utils/math/constraints/ConstraintCache.java b/src/mightypork/util/math/constraints/ConstraintCache.java similarity index 93% rename from src/mightypork/utils/math/constraints/ConstraintCache.java rename to src/mightypork/util/math/constraints/ConstraintCache.java index 6021fad..d690398 100644 --- a/src/mightypork/utils/math/constraints/ConstraintCache.java +++ b/src/mightypork/util/math/constraints/ConstraintCache.java @@ -1,6 +1,4 @@ -package mightypork.utils.math.constraints; - - +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/utils/math/constraints/DigestCache.java b/src/mightypork/util/math/constraints/DigestCache.java similarity index 95% rename from src/mightypork/utils/math/constraints/DigestCache.java rename to src/mightypork/util/math/constraints/DigestCache.java index 56ce9e5..af88dc4 100644 --- a/src/mightypork/utils/math/constraints/DigestCache.java +++ b/src/mightypork/util/math/constraints/DigestCache.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints; +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/utils/math/constraints/Digestable.java b/src/mightypork/util/math/constraints/Digestable.java similarity index 96% rename from src/mightypork/utils/math/constraints/Digestable.java rename to src/mightypork/util/math/constraints/Digestable.java index 9be9e95..7d85ad9 100644 --- a/src/mightypork/utils/math/constraints/Digestable.java +++ b/src/mightypork/util/math/constraints/Digestable.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints; +package mightypork.util.math.constraints; /** @@ -54,7 +54,6 @@ public interface Digestable { /** * If digest caching is enabled, mark current cached value as "dirty". Dirty * digest should be re-created next time a value is requested.
- * */ void markDigestDirty(); diff --git a/src/mightypork/utils/math/constraints/Pollable.java b/src/mightypork/util/math/constraints/Pollable.java similarity index 78% rename from src/mightypork/utils/math/constraints/Pollable.java rename to src/mightypork/util/math/constraints/Pollable.java index 5fe1fec..d838aae 100644 --- a/src/mightypork/utils/math/constraints/Pollable.java +++ b/src/mightypork/util/math/constraints/Pollable.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints; +package mightypork.util.math.constraints; /** diff --git a/src/mightypork/utils/math/constraints/Poller.java b/src/mightypork/util/math/constraints/Poller.java similarity index 93% rename from src/mightypork/utils/math/constraints/Poller.java rename to src/mightypork/util/math/constraints/Poller.java index e158935..c188e99 100644 --- a/src/mightypork/utils/math/constraints/Poller.java +++ b/src/mightypork/util/math/constraints/Poller.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints; +package mightypork.util.math.constraints; import java.util.LinkedHashSet; diff --git a/src/mightypork/utils/math/constraints/num/Num.java b/src/mightypork/util/math/constraints/num/Num.java similarity index 94% rename from src/mightypork/utils/math/constraints/num/Num.java rename to src/mightypork/util/math/constraints/num/Num.java index 2f3a677..5e87608 100644 --- a/src/mightypork/utils/math/constraints/num/Num.java +++ b/src/mightypork/util/math/constraints/num/Num.java @@ -1,15 +1,15 @@ -package mightypork.utils.math.constraints.num; +package mightypork.util.math.constraints.num; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.Calc; -import mightypork.utils.math.constraints.DigestCache; -import mightypork.utils.math.constraints.Digestable; -import mightypork.utils.math.constraints.num.caching.NumCache; -import mightypork.utils.math.constraints.num.caching.NumDigest; -import mightypork.utils.math.constraints.num.mutable.NumVar; -import mightypork.utils.math.constraints.num.proxy.NumBound; -import mightypork.utils.math.constraints.num.proxy.NumBoundAdapter; +import mightypork.util.annotations.FactoryMethod; +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; public abstract class Num implements NumBound, Digestable { diff --git a/src/mightypork/utils/math/constraints/num/NumConst.java b/src/mightypork/util/math/constraints/num/NumConst.java similarity index 96% rename from src/mightypork/utils/math/constraints/num/NumConst.java rename to src/mightypork/util/math/constraints/num/NumConst.java index 83a717d..dd70f22 100644 --- a/src/mightypork/utils/math/constraints/num/NumConst.java +++ b/src/mightypork/util/math/constraints/num/NumConst.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num; +package mightypork.util.math.constraints.num; -import mightypork.utils.math.constraints.num.caching.NumDigest; + +import mightypork.util.math.constraints.num.caching.NumDigest; /** diff --git a/src/mightypork/utils/math/constraints/num/caching/AbstractNumCache.java b/src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java similarity index 80% rename from src/mightypork/utils/math/constraints/num/caching/AbstractNumCache.java rename to src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java index c26c661..e7df0cf 100644 --- a/src/mightypork/utils/math/constraints/num/caching/AbstractNumCache.java +++ b/src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java @@ -1,9 +1,10 @@ -package mightypork.utils.math.constraints.num.caching; +package mightypork.util.math.constraints.num.caching; -import mightypork.utils.math.constraints.ConstraintCache; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.mutable.NumVar; -import mightypork.utils.math.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/utils/math/constraints/num/caching/NumCache.java b/src/mightypork/util/math/constraints/num/caching/NumCache.java similarity index 68% rename from src/mightypork/utils/math/constraints/num/caching/NumCache.java rename to src/mightypork/util/math/constraints/num/caching/NumCache.java index 024d2d2..10eabe6 100644 --- a/src/mightypork/utils/math/constraints/num/caching/NumCache.java +++ b/src/mightypork/util/math/constraints/num/caching/NumCache.java @@ -1,7 +1,8 @@ -package mightypork.utils.math.constraints.num.caching; +package mightypork.util.math.constraints.num.caching; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.math.constraints.num.Num; /** @@ -24,8 +25,8 @@ public class NumCache extends AbstractNumCache { { return source; } - - + + @Override @DefaultImpl public void onChange() diff --git a/src/mightypork/utils/math/constraints/num/caching/NumDigest.java b/src/mightypork/util/math/constraints/num/caching/NumDigest.java similarity index 67% rename from src/mightypork/utils/math/constraints/num/caching/NumDigest.java rename to src/mightypork/util/math/constraints/num/caching/NumDigest.java index 277d9b7..a00287c 100644 --- a/src/mightypork/utils/math/constraints/num/caching/NumDigest.java +++ b/src/mightypork/util/math/constraints/num/caching/NumDigest.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.caching; +package mightypork.util.math.constraints.num.caching; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; public class NumDigest { diff --git a/src/mightypork/utils/math/constraints/num/mutable/NumAnimated.java b/src/mightypork/util/math/constraints/num/mutable/NumAnimated.java similarity index 96% rename from src/mightypork/utils/math/constraints/num/mutable/NumAnimated.java rename to src/mightypork/util/math/constraints/num/mutable/NumAnimated.java index 0f44479..78604f2 100644 --- a/src/mightypork/utils/math/constraints/num/mutable/NumAnimated.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumAnimated.java @@ -1,10 +1,10 @@ -package mightypork.utils.math.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.gamecore.control.timing.Pauseable; -import mightypork.gamecore.control.timing.Updateable; -import mightypork.utils.math.Calc; -import mightypork.utils.math.Easing; +import mightypork.util.control.timing.Pauseable; +import mightypork.util.control.timing.Updateable; +import mightypork.util.math.Calc; +import mightypork.util.math.Easing; /** diff --git a/src/mightypork/utils/math/constraints/num/mutable/NumAnimatedDeg.java b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java similarity index 82% rename from src/mightypork/utils/math/constraints/num/mutable/NumAnimatedDeg.java rename to src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java index 7090e53..34ae1a8 100644 --- a/src/mightypork/utils/math/constraints/num/mutable/NumAnimatedDeg.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java @@ -1,9 +1,9 @@ -package mightypork.utils.math.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.utils.math.Calc; -import mightypork.utils.math.Calc.Deg; -import mightypork.utils.math.Easing; +import mightypork.util.math.Calc; +import mightypork.util.math.Calc.Deg; +import mightypork.util.math.Easing; /** diff --git a/src/mightypork/utils/math/constraints/num/mutable/NumAnimatedRad.java b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java similarity index 82% rename from src/mightypork/utils/math/constraints/num/mutable/NumAnimatedRad.java rename to src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java index 91d5283..38eafb7 100644 --- a/src/mightypork/utils/math/constraints/num/mutable/NumAnimatedRad.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java @@ -1,9 +1,9 @@ -package mightypork.utils.math.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.utils.math.Calc; -import mightypork.utils.math.Calc.Rad; -import mightypork.utils.math.Easing; +import mightypork.util.math.Calc; +import mightypork.util.math.Calc.Rad; +import mightypork.util.math.Easing; /** diff --git a/src/mightypork/utils/math/constraints/num/mutable/NumMutable.java b/src/mightypork/util/math/constraints/num/mutable/NumMutable.java similarity index 79% rename from src/mightypork/utils/math/constraints/num/mutable/NumMutable.java rename to src/mightypork/util/math/constraints/num/mutable/NumMutable.java index 02bc7d8..f99e945 100644 --- a/src/mightypork/utils/math/constraints/num/mutable/NumMutable.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumMutable.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/utils/math/constraints/num/mutable/NumVar.java b/src/mightypork/util/math/constraints/num/mutable/NumVar.java similarity index 78% rename from src/mightypork/utils/math/constraints/num/mutable/NumVar.java rename to src/mightypork/util/math/constraints/num/mutable/NumVar.java index 74a7b53..8ed9161 100644 --- a/src/mightypork/utils/math/constraints/num/mutable/NumVar.java +++ b/src/mightypork/util/math/constraints/num/mutable/NumVar.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.mutable; +package mightypork.util.math.constraints.num.mutable; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/utils/math/constraints/num/proxy/NumAdapter.java b/src/mightypork/util/math/constraints/num/proxy/NumAdapter.java similarity index 61% rename from src/mightypork/utils/math/constraints/num/proxy/NumAdapter.java rename to src/mightypork/util/math/constraints/num/proxy/NumAdapter.java index 5e59b85..af87682 100644 --- a/src/mightypork/utils/math/constraints/num/proxy/NumAdapter.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumAdapter.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; public abstract class NumAdapter extends Num { diff --git a/src/mightypork/utils/math/constraints/num/proxy/NumBound.java b/src/mightypork/util/math/constraints/num/proxy/NumBound.java similarity index 58% rename from src/mightypork/utils/math/constraints/num/proxy/NumBound.java rename to src/mightypork/util/math/constraints/num/proxy/NumBound.java index 2bb3ee8..662ab50 100644 --- a/src/mightypork/utils/math/constraints/num/proxy/NumBound.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumBound.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; /** diff --git a/src/mightypork/utils/math/constraints/num/proxy/NumBoundAdapter.java b/src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java similarity index 78% rename from src/mightypork/utils/math/constraints/num/proxy/NumBoundAdapter.java rename to src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java index 4de56d8..3a8bed4 100644 --- a/src/mightypork/utils/math/constraints/num/proxy/NumBoundAdapter.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; public class NumBoundAdapter extends NumAdapter implements PluggableNumBound { diff --git a/src/mightypork/utils/math/constraints/num/proxy/NumProxy.java b/src/mightypork/util/math/constraints/num/proxy/NumProxy.java similarity index 66% rename from src/mightypork/utils/math/constraints/num/proxy/NumProxy.java rename to src/mightypork/util/math/constraints/num/proxy/NumProxy.java index b1942bd..971e49d 100644 --- a/src/mightypork/utils/math/constraints/num/proxy/NumProxy.java +++ b/src/mightypork/util/math/constraints/num/proxy/NumProxy.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; -import mightypork.utils.math.constraints.num.Num; + +import mightypork.util.math.constraints.num.Num; public class NumProxy extends NumAdapter { diff --git a/src/mightypork/utils/math/constraints/num/proxy/PluggableNumBound.java b/src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java similarity index 79% rename from src/mightypork/utils/math/constraints/num/proxy/PluggableNumBound.java rename to src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java index 46c7170..9f2b3ae 100644 --- a/src/mightypork/utils/math/constraints/num/proxy/PluggableNumBound.java +++ b/src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints.num.proxy; +package mightypork.util.math.constraints.num.proxy; /** diff --git a/src/mightypork/utils/math/constraints/rect/Rect.java b/src/mightypork/util/math/constraints/rect/Rect.java similarity index 93% rename from src/mightypork/utils/math/constraints/rect/Rect.java rename to src/mightypork/util/math/constraints/rect/Rect.java index e5ec8f5..97db88a 100644 --- a/src/mightypork/utils/math/constraints/rect/Rect.java +++ b/src/mightypork/util/math/constraints/rect/Rect.java @@ -1,21 +1,20 @@ -package mightypork.utils.math.constraints.rect; +package mightypork.util.math.constraints.rect; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.constraints.DigestCache; -import mightypork.utils.math.constraints.Digestable; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.NumConst; -import mightypork.utils.math.constraints.num.mutable.NumAnimated; -import mightypork.utils.math.constraints.rect.builders.TiledRect; -import mightypork.utils.math.constraints.rect.caching.RectCache; -import mightypork.utils.math.constraints.rect.caching.RectDigest; -import mightypork.utils.math.constraints.rect.mutable.RectVar; -import mightypork.utils.math.constraints.rect.proxy.RectBound; -import mightypork.utils.math.constraints.rect.proxy.RectBoundAdapter; -import mightypork.utils.math.constraints.rect.proxy.RectVectAdapter; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.VectConst; +import mightypork.util.annotations.FactoryMethod; +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; /** @@ -84,23 +83,26 @@ public abstract class Rect implements RectBound, Digestable { return Rect.make(origin, size); } - - + + public static Rect make(Num side) { - return make(side,side); + return make(side, side); } + public static RectConst make(NumConst side) { - return make(side,side); + return make(side, side); } + public static RectConst make(double side) { - return make(side,side); + return make(side, side); } + @FactoryMethod public static RectConst make(NumConst x, NumConst y, NumConst width, NumConst height) { diff --git a/src/mightypork/utils/math/constraints/rect/RectConst.java b/src/mightypork/util/math/constraints/rect/RectConst.java similarity index 96% rename from src/mightypork/utils/math/constraints/rect/RectConst.java rename to src/mightypork/util/math/constraints/rect/RectConst.java index d154968..4a088d2 100644 --- a/src/mightypork/utils/math/constraints/rect/RectConst.java +++ b/src/mightypork/util/math/constraints/rect/RectConst.java @@ -1,10 +1,10 @@ -package mightypork.utils.math.constraints.rect; +package mightypork.util.math.constraints.rect; -import mightypork.utils.math.constraints.num.NumConst; -import mightypork.utils.math.constraints.rect.caching.RectDigest; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.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/utils/math/constraints/rect/builders/TiledRect.java b/src/mightypork/util/math/constraints/rect/builders/TiledRect.java similarity index 93% rename from src/mightypork/utils/math/constraints/rect/builders/TiledRect.java rename to src/mightypork/util/math/constraints/rect/builders/TiledRect.java index d43ded2..d03f782 100644 --- a/src/mightypork/utils/math/constraints/rect/builders/TiledRect.java +++ b/src/mightypork/util/math/constraints/rect/builders/TiledRect.java @@ -1,9 +1,9 @@ -package mightypork.utils.math.constraints.rect.builders; +package mightypork.util.math.constraints.rect.builders; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.proxy.RectProxy; +import mightypork.util.math.constraints.num.Num; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.proxy.RectProxy; /** diff --git a/src/mightypork/utils/math/constraints/rect/caching/AbstractRectCache.java b/src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java similarity index 78% rename from src/mightypork/utils/math/constraints/rect/caching/AbstractRectCache.java rename to src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java index 4154a7e..ec2e693 100644 --- a/src/mightypork/utils/math/constraints/rect/caching/AbstractRectCache.java +++ b/src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java @@ -1,9 +1,10 @@ -package mightypork.utils.math.constraints.rect.caching; +package mightypork.util.math.constraints.rect.caching; -import mightypork.utils.math.constraints.ConstraintCache; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.mutable.RectVar; -import mightypork.utils.math.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/utils/math/constraints/rect/caching/RectCache.java b/src/mightypork/util/math/constraints/rect/caching/RectCache.java similarity index 68% rename from src/mightypork/utils/math/constraints/rect/caching/RectCache.java rename to src/mightypork/util/math/constraints/rect/caching/RectCache.java index ade9f08..7ae54e3 100644 --- a/src/mightypork/utils/math/constraints/rect/caching/RectCache.java +++ b/src/mightypork/util/math/constraints/rect/caching/RectCache.java @@ -1,8 +1,8 @@ -package mightypork.utils.math.constraints.rect.caching; +package mightypork.util.math.constraints.rect.caching; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.rect.Rect; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/utils/math/constraints/rect/caching/RectDigest.java b/src/mightypork/util/math/constraints/rect/caching/RectDigest.java similarity index 67% rename from src/mightypork/utils/math/constraints/rect/caching/RectDigest.java rename to src/mightypork/util/math/constraints/rect/caching/RectDigest.java index f5dce39..3530387 100644 --- a/src/mightypork/utils/math/constraints/rect/caching/RectDigest.java +++ b/src/mightypork/util/math/constraints/rect/caching/RectDigest.java @@ -1,7 +1,8 @@ -package mightypork.utils.math.constraints.rect.caching; +package mightypork.util.math.constraints.rect.caching; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.rect.RectConst; + +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.rect.RectConst; public class RectDigest { @@ -37,7 +38,6 @@ public class RectDigest { @Override public String toString() { - return String - .format("Rect{ at: (%.1f, %.1f), size: (%.1f, %.1f), bounds: L %.1f R %.1f T %.1f B %.1f }", x, y, width, height, left, right, top, bottom); + return String.format("Rect{ at: (%.1f, %.1f), size: (%.1f, %.1f), bounds: L %.1f R %.1f T %.1f B %.1f }", x, y, width, height, left, right, top, bottom); } } diff --git a/src/mightypork/utils/math/constraints/rect/mutable/RectMutable.java b/src/mightypork/util/math/constraints/rect/mutable/RectMutable.java similarity index 89% rename from src/mightypork/utils/math/constraints/rect/mutable/RectMutable.java rename to src/mightypork/util/math/constraints/rect/mutable/RectMutable.java index 3093dd3..9a319d9 100644 --- a/src/mightypork/utils/math/constraints/rect/mutable/RectMutable.java +++ b/src/mightypork/util/math/constraints/rect/mutable/RectMutable.java @@ -1,8 +1,8 @@ -package mightypork.utils.math.constraints.rect.mutable; +package mightypork.util.math.constraints.rect.mutable; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/rect/mutable/RectVar.java b/src/mightypork/util/math/constraints/rect/mutable/RectVar.java similarity index 79% rename from src/mightypork/utils/math/constraints/rect/mutable/RectVar.java rename to src/mightypork/util/math/constraints/rect/mutable/RectVar.java index cefa488..cf5a1ae 100644 --- a/src/mightypork/utils/math/constraints/rect/mutable/RectVar.java +++ b/src/mightypork/util/math/constraints/rect/mutable/RectVar.java @@ -1,8 +1,8 @@ -package mightypork.utils.math.constraints.rect.mutable; +package mightypork.util.math.constraints.rect.mutable; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.mutable.VectVar; +import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.math.constraints.vect.mutable.VectVar; public class RectVar extends RectMutable { diff --git a/src/mightypork/utils/math/constraints/rect/proxy/PluggableRectBound.java b/src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java similarity index 78% rename from src/mightypork/utils/math/constraints/rect/proxy/PluggableRectBound.java rename to src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java index c78fb35..14ef1c4 100644 --- a/src/mightypork/utils/math/constraints/rect/proxy/PluggableRectBound.java +++ b/src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; /** diff --git a/src/mightypork/utils/math/constraints/rect/proxy/RectAdapter.java b/src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java similarity index 79% rename from src/mightypork/utils/math/constraints/rect/proxy/RectAdapter.java rename to src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java index 51fd4fe..d4f3ef7 100644 --- a/src/mightypork/utils/math/constraints/rect/proxy/RectAdapter.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java @@ -1,9 +1,9 @@ -package mightypork.utils.math.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.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/utils/math/constraints/rect/proxy/RectBound.java b/src/mightypork/util/math/constraints/rect/proxy/RectBound.java similarity index 59% rename from src/mightypork/utils/math/constraints/rect/proxy/RectBound.java rename to src/mightypork/util/math/constraints/rect/proxy/RectBound.java index 6728555..197204a 100644 --- a/src/mightypork/utils/math/constraints/rect/proxy/RectBound.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectBound.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.utils.math.constraints.rect.Rect; + +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/utils/math/constraints/rect/proxy/RectBoundAdapter.java b/src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java similarity index 81% rename from src/mightypork/utils/math/constraints/rect/proxy/RectBoundAdapter.java rename to src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java index cd6d92d..c108b4d 100644 --- a/src/mightypork/utils/math/constraints/rect/proxy/RectBoundAdapter.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.utils.math.constraints.rect.Rect; + +import mightypork.util.math.constraints.rect.Rect; /** diff --git a/src/mightypork/utils/math/constraints/rect/proxy/RectProxy.java b/src/mightypork/util/math/constraints/rect/proxy/RectProxy.java similarity index 66% rename from src/mightypork/utils/math/constraints/rect/proxy/RectProxy.java rename to src/mightypork/util/math/constraints/rect/proxy/RectProxy.java index 6b9b75f..956c632 100644 --- a/src/mightypork/utils/math/constraints/rect/proxy/RectProxy.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectProxy.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.utils.math.constraints.rect.Rect; + +import mightypork.util.math.constraints.rect.Rect; public class RectProxy extends RectAdapter { diff --git a/src/mightypork/utils/math/constraints/rect/proxy/RectVectAdapter.java b/src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java similarity index 71% rename from src/mightypork/utils/math/constraints/rect/proxy/RectVectAdapter.java rename to src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java index fd2c0f0..e2085c6 100644 --- a/src/mightypork/utils/math/constraints/rect/proxy/RectVectAdapter.java +++ b/src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java @@ -1,8 +1,8 @@ -package mightypork.utils.math.constraints.rect.proxy; +package mightypork.util.math.constraints.rect.proxy; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/Vect.java b/src/mightypork/util/math/constraints/vect/Vect.java similarity index 95% rename from src/mightypork/utils/math/constraints/vect/Vect.java rename to src/mightypork/util/math/constraints/vect/Vect.java index 690af67..981217a 100644 --- a/src/mightypork/utils/math/constraints/vect/Vect.java +++ b/src/mightypork/util/math/constraints/vect/Vect.java @@ -1,19 +1,19 @@ -package mightypork.utils.math.constraints.vect; +package mightypork.util.math.constraints.vect; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.constraints.DigestCache; -import mightypork.utils.math.constraints.Digestable; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.NumConst; -import mightypork.utils.math.constraints.rect.Rect; -import mightypork.utils.math.constraints.vect.caching.VectCache; -import mightypork.utils.math.constraints.vect.caching.VectDigest; -import mightypork.utils.math.constraints.vect.mutable.VectVar; -import mightypork.utils.math.constraints.vect.proxy.VectBound; -import mightypork.utils.math.constraints.vect.proxy.VectBoundAdapter; -import mightypork.utils.math.constraints.vect.proxy.VectNumAdapter; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.annotations.FactoryMethod; +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/utils/math/constraints/vect/VectConst.java b/src/mightypork/util/math/constraints/vect/VectConst.java similarity index 95% rename from src/mightypork/utils/math/constraints/vect/VectConst.java rename to src/mightypork/util/math/constraints/vect/VectConst.java index 2e21492..c5470de 100644 --- a/src/mightypork/utils/math/constraints/vect/VectConst.java +++ b/src/mightypork/util/math/constraints/vect/VectConst.java @@ -1,10 +1,10 @@ -package mightypork.utils.math.constraints.vect; +package mightypork.util.math.constraints.vect; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.NumConst; -import mightypork.utils.math.constraints.rect.RectConst; -import mightypork.utils.math.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/utils/math/constraints/vect/VectProxy.java b/src/mightypork/util/math/constraints/vect/VectProxy.java similarity index 65% rename from src/mightypork/utils/math/constraints/vect/VectProxy.java rename to src/mightypork/util/math/constraints/vect/VectProxy.java index f2cb6d7..f920368 100644 --- a/src/mightypork/utils/math/constraints/vect/VectProxy.java +++ b/src/mightypork/util/math/constraints/vect/VectProxy.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.vect; +package mightypork.util.math.constraints.vect; -import mightypork.utils.math.constraints.vect.proxy.VectAdapter; + +import mightypork.util.math.constraints.vect.proxy.VectAdapter; public class VectProxy extends VectAdapter { diff --git a/src/mightypork/utils/math/constraints/vect/caching/AbstractVectCache.java b/src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java similarity index 78% rename from src/mightypork/utils/math/constraints/vect/caching/AbstractVectCache.java rename to src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java index adf3848..dfd21bc 100644 --- a/src/mightypork/utils/math/constraints/vect/caching/AbstractVectCache.java +++ b/src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java @@ -1,9 +1,10 @@ -package mightypork.utils.math.constraints.vect.caching; +package mightypork.util.math.constraints.vect.caching; -import mightypork.utils.math.constraints.ConstraintCache; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.constraints.vect.mutable.VectVar; -import mightypork.utils.math.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/utils/math/constraints/vect/caching/VectCache.java b/src/mightypork/util/math/constraints/vect/caching/VectCache.java similarity index 70% rename from src/mightypork/utils/math/constraints/vect/caching/VectCache.java rename to src/mightypork/util/math/constraints/vect/caching/VectCache.java index fe4a693..4ae9c4c 100644 --- a/src/mightypork/utils/math/constraints/vect/caching/VectCache.java +++ b/src/mightypork/util/math/constraints/vect/caching/VectCache.java @@ -1,8 +1,8 @@ -package mightypork.utils.math.constraints.vect.caching; +package mightypork.util.math.constraints.vect.caching; -import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.annotations.DefaultImpl; +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/caching/VectDigest.java b/src/mightypork/util/math/constraints/vect/caching/VectDigest.java similarity index 74% rename from src/mightypork/utils/math/constraints/vect/caching/VectDigest.java rename to src/mightypork/util/math/constraints/vect/caching/VectDigest.java index e0dfcf2..38afa73 100644 --- a/src/mightypork/utils/math/constraints/vect/caching/VectDigest.java +++ b/src/mightypork/util/math/constraints/vect/caching/VectDigest.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.vect.caching; +package mightypork.util.math.constraints.vect.caching; -import mightypork.utils.math.constraints.vect.Vect; + +import mightypork.util.math.constraints.vect.Vect; public class VectDigest { diff --git a/src/mightypork/utils/math/constraints/vect/mutable/VectAnimated.java b/src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java similarity index 92% rename from src/mightypork/utils/math/constraints/vect/mutable/VectAnimated.java rename to src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java index bbecd36..babed01 100644 --- a/src/mightypork/utils/math/constraints/vect/mutable/VectAnimated.java +++ b/src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java @@ -1,12 +1,12 @@ -package mightypork.utils.math.constraints.vect.mutable; +package mightypork.util.math.constraints.vect.mutable; -import mightypork.gamecore.control.timing.Pauseable; -import mightypork.gamecore.control.timing.Updateable; -import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.Easing; -import mightypork.utils.math.constraints.num.mutable.NumAnimated; -import mightypork.utils.math.constraints.vect.Vect; +import mightypork.util.annotations.FactoryMethod; +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; /** diff --git a/src/mightypork/utils/math/constraints/vect/mutable/VectMutable.java b/src/mightypork/util/math/constraints/vect/mutable/VectMutable.java similarity index 90% rename from src/mightypork/utils/math/constraints/vect/mutable/VectMutable.java rename to src/mightypork/util/math/constraints/vect/mutable/VectMutable.java index ea200e7..f69e615 100644 --- a/src/mightypork/utils/math/constraints/vect/mutable/VectMutable.java +++ b/src/mightypork/util/math/constraints/vect/mutable/VectMutable.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.vect.mutable; +package mightypork.util.math.constraints.vect.mutable; -import mightypork.utils.math.constraints.vect.Vect; + +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/mutable/VectVar.java b/src/mightypork/util/math/constraints/vect/mutable/VectVar.java similarity index 93% rename from src/mightypork/utils/math/constraints/vect/mutable/VectVar.java rename to src/mightypork/util/math/constraints/vect/mutable/VectVar.java index cd6a7a6..039e0d6 100644 --- a/src/mightypork/utils/math/constraints/vect/mutable/VectVar.java +++ b/src/mightypork/util/math/constraints/vect/mutable/VectVar.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints.vect.mutable; +package mightypork.util.math.constraints.vect.mutable; /** diff --git a/src/mightypork/utils/math/constraints/vect/proxy/PluggableVectBound.java b/src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java similarity index 79% rename from src/mightypork/utils/math/constraints/vect/proxy/PluggableVectBound.java rename to src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java index 54f761c..0bb5985 100644 --- a/src/mightypork/utils/math/constraints/vect/proxy/PluggableVectBound.java +++ b/src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; /** diff --git a/src/mightypork/utils/math/constraints/vect/proxy/VectAdapter.java b/src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java similarity index 81% rename from src/mightypork/utils/math/constraints/vect/proxy/VectAdapter.java rename to src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java index e933ca3..07a805e 100644 --- a/src/mightypork/utils/math/constraints/vect/proxy/VectAdapter.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.utils.math.constraints.vect.Vect; + +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/proxy/VectBound.java b/src/mightypork/util/math/constraints/vect/proxy/VectBound.java similarity index 64% rename from src/mightypork/utils/math/constraints/vect/proxy/VectBound.java rename to src/mightypork/util/math/constraints/vect/proxy/VectBound.java index 976f340..cc7ef8e 100644 --- a/src/mightypork/utils/math/constraints/vect/proxy/VectBound.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectBound.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.utils.math.constraints.vect.Vect; + +import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/proxy/VectBoundAdapter.java b/src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java similarity index 78% rename from src/mightypork/utils/math/constraints/vect/proxy/VectBoundAdapter.java rename to src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java index d4ca7ad..37c6a9a 100644 --- a/src/mightypork/utils/math/constraints/vect/proxy/VectBoundAdapter.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java @@ -1,6 +1,7 @@ -package mightypork.utils.math.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.utils.math.constraints.vect.Vect; + +import mightypork.util.math.constraints.vect.Vect; public class VectBoundAdapter extends VectAdapter implements PluggableVectBound { diff --git a/src/mightypork/utils/math/constraints/vect/proxy/VectNumAdapter.java b/src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java similarity index 75% rename from src/mightypork/utils/math/constraints/vect/proxy/VectNumAdapter.java rename to src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java index 10b90ae..de03afa 100644 --- a/src/mightypork/utils/math/constraints/vect/proxy/VectNumAdapter.java +++ b/src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java @@ -1,9 +1,9 @@ -package mightypork.utils.math.constraints.vect.proxy; +package mightypork.util.math.constraints.vect.proxy; -import mightypork.utils.math.constraints.num.Num; -import mightypork.utils.math.constraints.num.proxy.NumBound; -import mightypork.utils.math.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/utils/objects/Convert.java b/src/mightypork/util/objects/Convert.java similarity index 96% rename from src/mightypork/utils/objects/Convert.java rename to src/mightypork/util/objects/Convert.java index a0cc389..cf8e9cb 100644 --- a/src/mightypork/utils/objects/Convert.java +++ b/src/mightypork/util/objects/Convert.java @@ -1,11 +1,11 @@ -package mightypork.utils.objects; +package mightypork.util.objects; -import mightypork.utils.logging.Log; -import mightypork.utils.math.Calc; -import mightypork.utils.math.Range; -import mightypork.utils.math.constraints.vect.Vect; -import mightypork.utils.math.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/utils/objects/MapSort.java b/src/mightypork/util/objects/MapSort.java similarity index 98% rename from src/mightypork/utils/objects/MapSort.java rename to src/mightypork/util/objects/MapSort.java index be3477a..2b3f8ab 100644 --- a/src/mightypork/utils/objects/MapSort.java +++ b/src/mightypork/util/objects/MapSort.java @@ -1,4 +1,4 @@ -package mightypork.utils.objects; +package mightypork.util.objects; import java.util.*; diff --git a/src/mightypork/utils/objects/Mutable.java b/src/mightypork/util/objects/Mutable.java similarity index 96% rename from src/mightypork/utils/objects/Mutable.java rename to src/mightypork/util/objects/Mutable.java index f4bde57..d9a27c3 100644 --- a/src/mightypork/utils/objects/Mutable.java +++ b/src/mightypork/util/objects/Mutable.java @@ -1,4 +1,4 @@ -package mightypork.utils.objects; +package mightypork.util.objects; /** diff --git a/src/mightypork/utils/objects/ObjectUtils.java b/src/mightypork/util/objects/ObjectUtils.java similarity index 95% rename from src/mightypork/utils/objects/ObjectUtils.java rename to src/mightypork/util/objects/ObjectUtils.java index 1bbd929..83c569f 100644 --- a/src/mightypork/utils/objects/ObjectUtils.java +++ b/src/mightypork/util/objects/ObjectUtils.java @@ -1,4 +1,4 @@ -package mightypork.utils.objects; +package mightypork.util.objects; import java.util.ArrayList; diff --git a/src/mightypork/utils/objects/Pair.java b/src/mightypork/util/objects/Pair.java similarity index 94% rename from src/mightypork/utils/objects/Pair.java rename to src/mightypork/util/objects/Pair.java index 27c8246..d87079e 100644 --- a/src/mightypork/utils/objects/Pair.java +++ b/src/mightypork/util/objects/Pair.java @@ -1,7 +1,7 @@ -package mightypork.utils.objects; +package mightypork.util.objects; -import mightypork.utils.math.Calc; +import mightypork.util.math.Calc; /** diff --git a/src/mightypork/utils/objects/Triad.java b/src/mightypork/util/objects/Triad.java similarity index 94% rename from src/mightypork/utils/objects/Triad.java rename to src/mightypork/util/objects/Triad.java index f02e6ce..4f81eaf 100644 --- a/src/mightypork/utils/objects/Triad.java +++ b/src/mightypork/util/objects/Triad.java @@ -1,7 +1,7 @@ -package mightypork.utils.objects; +package mightypork.util.objects; -import mightypork.utils.math.Calc; +import mightypork.util.math.Calc; /** diff --git a/src/mightypork/utils/objects/VarargsParser.java b/src/mightypork/util/objects/VarargsParser.java similarity index 97% rename from src/mightypork/utils/objects/VarargsParser.java rename to src/mightypork/util/objects/VarargsParser.java index 2b31785..574d524 100644 --- a/src/mightypork/utils/objects/VarargsParser.java +++ b/src/mightypork/util/objects/VarargsParser.java @@ -1,4 +1,4 @@ -package mightypork.utils.objects; +package mightypork.util.objects; import java.util.LinkedHashMap; diff --git a/src/mightypork/utils/string/StringProvider.java b/src/mightypork/util/string/StringProvider.java similarity index 93% rename from src/mightypork/utils/string/StringProvider.java rename to src/mightypork/util/string/StringProvider.java index 2751b98..04b25c8 100644 --- a/src/mightypork/utils/string/StringProvider.java +++ b/src/mightypork/util/string/StringProvider.java @@ -1,4 +1,4 @@ -package mightypork.utils.string; +package mightypork.util.string; /** diff --git a/src/mightypork/utils/string/StringUtils.java b/src/mightypork/util/string/StringUtils.java similarity index 99% rename from src/mightypork/utils/string/StringUtils.java rename to src/mightypork/util/string/StringUtils.java index 985cd57..eded93c 100644 --- a/src/mightypork/utils/string/StringUtils.java +++ b/src/mightypork/util/string/StringUtils.java @@ -1,4 +1,4 @@ -package mightypork.utils.string; +package mightypork.util.string; /** diff --git a/src/mightypork/util/string/validation/CharFilter.java b/src/mightypork/util/string/validation/CharFilter.java new file mode 100644 index 0000000..fc9106c --- /dev/null +++ b/src/mightypork/util/string/validation/CharFilter.java @@ -0,0 +1,7 @@ +package mightypork.util.string.validation; + + +public interface CharFilter { + + public boolean isValid(char c); +} diff --git a/src/mightypork/utils/string/validation/FileSuffixFilter.java b/src/mightypork/util/string/validation/FileSuffixFilter.java similarity index 94% rename from src/mightypork/utils/string/validation/FileSuffixFilter.java rename to src/mightypork/util/string/validation/FileSuffixFilter.java index e246682..a79417c 100644 --- a/src/mightypork/utils/string/validation/FileSuffixFilter.java +++ b/src/mightypork/util/string/validation/FileSuffixFilter.java @@ -1,4 +1,4 @@ -package mightypork.utils.string.validation; +package mightypork.util.string.validation; import java.io.File; diff --git a/src/mightypork/utils/string/validation/CharValidatorRegex.java b/src/mightypork/util/string/validation/RegexCharFilter.java similarity index 54% rename from src/mightypork/utils/string/validation/CharValidatorRegex.java rename to src/mightypork/util/string/validation/RegexCharFilter.java index 4b2d548..942461e 100644 --- a/src/mightypork/utils/string/validation/CharValidatorRegex.java +++ b/src/mightypork/util/string/validation/RegexCharFilter.java @@ -1,12 +1,12 @@ -package mightypork.utils.string.validation; +package mightypork.util.string.validation; -public class CharValidatorRegex implements CharValidator { +public class RegexCharFilter implements CharFilter { private final String formula; - public CharValidatorRegex(String regex) { + public RegexCharFilter(String regex) { this.formula = regex; } diff --git a/src/mightypork/utils/string/validation/StringFilter.java b/src/mightypork/util/string/validation/StringFilter.java similarity index 80% rename from src/mightypork/utils/string/validation/StringFilter.java rename to src/mightypork/util/string/validation/StringFilter.java index 706cbd2..b42a1b7 100644 --- a/src/mightypork/utils/string/validation/StringFilter.java +++ b/src/mightypork/util/string/validation/StringFilter.java @@ -1,4 +1,4 @@ -package mightypork.utils.string.validation; +package mightypork.util.string.validation; /** diff --git a/src/mightypork/utils/string/validation/CharValidatorWhitelist.java b/src/mightypork/util/string/validation/WhitelistCharFilter.java similarity index 53% rename from src/mightypork/utils/string/validation/CharValidatorWhitelist.java rename to src/mightypork/util/string/validation/WhitelistCharFilter.java index 834d2ad..6fa264b 100644 --- a/src/mightypork/utils/string/validation/CharValidatorWhitelist.java +++ b/src/mightypork/util/string/validation/WhitelistCharFilter.java @@ -1,12 +1,12 @@ -package mightypork.utils.string.validation; +package mightypork.util.string.validation; -public class CharValidatorWhitelist implements CharValidator { +public class WhitelistCharFilter implements CharFilter { private final String whitelist; - public CharValidatorWhitelist(String allowed) { + public WhitelistCharFilter(String allowed) { this.whitelist = allowed; } diff --git a/src/mightypork/utils/string/validation/CharValidator.java b/src/mightypork/utils/string/validation/CharValidator.java deleted file mode 100644 index 14c1bd5..0000000 --- a/src/mightypork/utils/string/validation/CharValidator.java +++ /dev/null @@ -1,7 +0,0 @@ -package mightypork.utils.string.validation; - - -public interface CharValidator { - - public boolean isValid(char c); -} diff --git a/src/mightypork/utils/string/validation/FilenameCharValidator.java b/src/mightypork/utils/string/validation/FilenameCharValidator.java deleted file mode 100644 index 2f64c25..0000000 --- a/src/mightypork/utils/string/validation/FilenameCharValidator.java +++ /dev/null @@ -1,10 +0,0 @@ -package mightypork.utils.string.validation; - - -public class FilenameCharValidator extends CharValidatorRegex { - - public FilenameCharValidator() { - super("[a-zA-Z0-9 +\\-.,_%@#$!'\"]"); - } - -}