From 77f8f11d99d98abdbf973d27b8a53f9d394eaa36 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 18:15:55 -0400 Subject: [PATCH] Move a lot of utilities in engine to util because they are utilities --- src/main/java/com/volmit/iris/Iris.java | 2 +- .../command/studio/CommandIrisStudioProfile.java | 2 +- .../iris/core/command/world/CommandIrisVerify.java | 4 ++-- .../com/volmit/iris/core/edit/BlockSignal.java | 2 +- .../com/volmit/iris/core/gui/NoiseExplorerGUI.java | 6 +++--- .../pregenerator/methods/AsyncPregenMethod.java | 2 +- .../com/volmit/iris/core/project/IrisProject.java | 2 +- .../java/com/volmit/iris/engine/IrisComplex.java | 7 +++---- .../java/com/volmit/iris/engine/IrisEngine.java | 2 +- .../com/volmit/iris/engine/IrisEngineCompound.java | 4 ++-- .../iris/engine/actuator/IrisBiomeActuator.java | 4 ++-- .../iris/engine/actuator/IrisDecorantActuator.java | 2 +- .../engine/actuator/IrisTerrainIslandActuator.java | 2 +- .../engine/actuator/IrisTerrainNormalActuator.java | 4 ++-- .../engine/decorator/IrisCeilingDecorator.java | 2 +- .../engine/decorator/IrisSeaFloorDecorator.java | 2 +- .../engine/decorator/IrisSeaSurfaceDecorator.java | 2 +- .../engine/decorator/IrisShoreLineDecorator.java | 2 +- .../engine/decorator/IrisSurfaceDecorator.java | 2 +- .../com/volmit/iris/engine/framework/Engine.java | 4 ++-- .../iris/engine/framework/EngineActuator.java | 2 +- .../engine/framework/EngineAssignedActuator.java | 2 +- .../engine/framework/EngineAssignedBiModifier.java | 2 +- .../engine/framework/EngineAssignedModifier.java | 2 +- .../iris/engine/framework/EngineBiModifier.java | 2 +- .../engine/framework/EngineCompositeGenerator.java | 6 +++--- .../iris/engine/framework/EngineCompound.java | 4 ++-- .../iris/engine/framework/EngineDecorator.java | 2 +- .../iris/engine/framework/EngineModifier.java | 2 +- .../engine/framework/EngineParallaxManager.java | 4 ++-- .../volmit/iris/engine/framework/EngineTarget.java | 2 +- .../volmit/iris/engine/framework/IrisAccess.java | 5 +---- .../iris/engine/framework/PregeneratedData.java | 2 +- .../iris/engine/headless/HeadlessGenerator.java | 2 +- .../engine/interpolation/IrisInterpolation.java | 4 ++-- .../iris/engine/modifier/IrisCaveModifier.java | 6 +++--- .../iris/engine/modifier/IrisCaveModifier2.java | 6 +++--- .../iris/engine/modifier/IrisDepositModifier.java | 2 +- .../iris/engine/modifier/IrisPostModifier.java | 2 +- .../iris/engine/modifier/IrisRavineModifier.java | 4 ++-- .../com/volmit/iris/engine/object/IrisBiome.java | 2 +- .../iris/engine/object/IrisBiomePaletteLayer.java | 2 +- .../volmit/iris/engine/object/IrisCarveLayer.java | 6 +++--- .../volmit/iris/engine/object/IrisCavernZone.java | 2 +- .../com/volmit/iris/engine/object/IrisCaverns.java | 4 ++-- .../volmit/iris/engine/object/IrisDecorator.java | 2 +- .../volmit/iris/engine/object/IrisDimension.java | 3 +-- .../iris/engine/object/IrisEngineStreamType.java | 2 +- .../volmit/iris/engine/object/IrisExpression.java | 4 ++-- .../iris/engine/object/IrisExpressionLoad.java | 2 +- .../volmit/iris/engine/object/IrisGenerator.java | 2 +- .../iris/engine/object/IrisGeneratorStyle.java | 4 ++-- .../com/volmit/iris/engine/object/IrisLoot.java | 2 +- .../iris/engine/object/IrisMaterialPalette.java | 2 +- .../iris/engine/object/IrisNoiseGenerator.java | 2 +- .../iris/engine/object/IrisObjectPlacement.java | 2 +- .../iris/engine/object/IrisObjectReplace.java | 2 +- .../com/volmit/iris/engine/object/IrisRegion.java | 2 +- .../volmit/iris/engine/object/IrisRegionRidge.java | 2 +- .../volmit/iris/engine/object/IrisRegionSpot.java | 2 +- .../volmit/iris/engine/object/IrisStyledRange.java | 4 ++-- .../com/volmit/iris/engine/object/NoiseStyle.java | 8 ++++---- .../iris/engine/object/matter/MatterHunk.java | 4 ++-- .../iris/engine/object/matter/MatterSlice.java | 3 +-- .../iris/engine/parallax/ParallaxAccess.java | 2 +- .../iris/engine/parallax/ParallaxChunkMeta.java | 6 ++---- .../iris/engine/parallax/ParallaxRegion.java | 14 +++++++------- .../volmit/iris/engine/parallax/ParallaxWorld.java | 4 ++-- .../volmit/iris/{engine => util}/hunk/Hunk.java | 14 +++++++------- .../iris/{engine => util}/hunk/HunkFace.java | 2 +- .../hunk/io/BasicHunkIOAdapter.java | 4 ++-- .../hunk/io/BlockDataHunkIOAdapter.java | 2 +- .../hunk/io/BooleanHunkIOAdapter.java | 2 +- .../{engine => util}/hunk/io/HunkIOAdapter.java | 4 ++-- .../iris/{engine => util}/hunk/io/HunkRegion.java | 2 +- .../{engine => util}/hunk/io/HunkRegionSlice.java | 6 +++--- .../hunk/io/PaletteHunkIOAdapter.java | 4 ++-- .../hunk/io/StringHunkIOAdapter.java | 2 +- .../hunk/io/TileDataHunkIOAdapter.java | 2 +- .../{engine => util}/hunk/storage/ArrayHunk.java | 4 ++-- .../hunk/storage/AtomicDoubleHunk.java | 4 ++-- .../{engine => util}/hunk/storage/AtomicHunk.java | 4 ++-- .../hunk/storage/AtomicIntegerHunk.java | 4 ++-- .../hunk/storage/AtomicLongHunk.java | 4 ++-- .../{engine => util}/hunk/storage/MappedHunk.java | 4 ++-- .../{engine => util}/hunk/storage/StorageHunk.java | 4 ++-- .../hunk/storage/SynchronizedArrayHunk.java | 4 ++-- .../hunk/view/BiomeGridHunkView.java | 4 ++-- .../hunk/view/ChunkBiomeHunkView.java | 4 ++-- .../hunk/view/ChunkDataHunkView.java | 4 ++-- .../{engine => util}/hunk/view/ChunkHunkView.java | 4 ++-- .../{engine => util}/hunk/view/DriftHunkView.java | 4 ++-- .../hunk/view/FringedHunkView.java | 4 ++-- .../hunk/view/FunctionalHunkView.java | 4 ++-- .../iris/{engine => util}/hunk/view/HunkView.java | 4 ++-- .../hunk/view/InvertedHunkView.java | 4 ++-- .../{engine => util}/hunk/view/ListeningHunk.java | 4 ++-- .../{engine => util}/hunk/view/ReadOnlyHunk.java | 4 ++-- .../hunk/view/RotatedXHunkView.java | 4 ++-- .../hunk/view/RotatedYHunkView.java | 4 ++-- .../hunk/view/RotatedZHunkView.java | 4 ++-- .../hunk/view/SynchronizedHunkView.java | 4 ++-- .../{engine => util}/hunk/view/WriteTrackHunk.java | 4 ++-- .../volmit/iris/{engine => util}/noise/CNG.java | 8 ++++---- .../iris/{engine => util}/noise/CNGFactory.java | 2 +- .../iris/{engine => util}/noise/CellGenerator.java | 2 +- .../{engine => util}/noise/CellHeightNoise.java | 2 +- .../iris/{engine => util}/noise/CellularNoise.java | 2 +- .../iris/{engine => util}/noise/CloverNoise.java | 2 +- .../iris/{engine => util}/noise/CubicNoise.java | 2 +- .../{engine => util}/noise/ExpressionNoise.java | 2 +- .../iris/{engine => util}/noise/FastNoise.java | 2 +- .../{engine => util}/noise/FastNoiseDouble.java | 2 +- .../iris/{engine => util}/noise/FlatNoise.java | 2 +- .../noise/FractalBillowPerlinNoise.java | 4 ++-- .../noise/FractalBillowSimplexNoise.java | 4 ++-- .../{engine => util}/noise/FractalCubicNoise.java | 4 ++-- .../noise/FractalFBMSimplexNoise.java | 4 ++-- .../noise/FractalRigidMultiSimplexNoise.java | 4 ++-- .../iris/{engine => util}/noise/GlobNoise.java | 2 +- .../{engine => util}/noise/InterpolatedNoise.java | 2 +- .../iris/{engine => util}/noise/NoiseFactory.java | 2 +- .../{engine => util}/noise/NoiseGenerator.java | 2 +- .../iris/{engine => util}/noise/NoiseType.java | 2 +- .../iris/{engine => util}/noise/OctaveNoise.java | 2 +- .../iris/{engine => util}/noise/PerlinNoise.java | 2 +- .../noise/RarityCellGenerator.java | 2 +- .../iris/{engine => util}/noise/SimplexNoise.java | 2 +- .../iris/{engine => util}/noise/VascularNoise.java | 2 +- .../iris/{engine => util}/noise/WhiteNoise.java | 2 +- .../{engine => util}/parallel/BurstExecutor.java | 2 +- .../{engine => util}/parallel/BurstedHunk.java | 4 ++-- .../iris/{engine => util}/parallel/GridLock.java | 4 ++-- .../iris/{engine => util}/parallel/HyperLock.java | 2 +- .../iris/{engine => util}/parallel/MultiBurst.java | 2 +- .../{engine => util}/parallel/NOOPGridLock.java | 2 +- .../java/com/volmit/iris/util/scheduling/J.java | 2 +- .../{engine => util}/stream/ArraySignificance.java | 2 +- .../iris/{engine => util}/stream/BasicLayer.java | 2 +- .../iris/{engine => util}/stream/BasicStream.java | 2 +- .../{engine => util}/stream/ProceduralLayer.java | 2 +- .../{engine => util}/stream/ProceduralStream.java | 14 +++++++------- .../iris/{engine => util}/stream/Significance.java | 2 +- .../stream/arithmetic/AddingStream.java | 6 +++--- .../stream/arithmetic/ClampedStream.java | 6 +++--- .../arithmetic/CoordinateBitShiftLeftStream.java | 6 +++--- .../arithmetic/CoordinateBitShiftRightStream.java | 6 +++--- .../stream/arithmetic/DividingStream.java | 6 +++--- .../stream/arithmetic/FittedStream.java | 6 +++--- .../stream/arithmetic/MaxingStream.java | 6 +++--- .../stream/arithmetic/MinningStream.java | 6 +++--- .../stream/arithmetic/ModuloStream.java | 6 +++--- .../stream/arithmetic/MultiplyingStream.java | 6 +++--- .../stream/arithmetic/OffsetStream.java | 6 +++--- .../stream/arithmetic/RadialStream.java | 6 +++--- .../stream/arithmetic/RoundingDoubleStream.java | 6 +++--- .../stream/arithmetic/SlopeStream.java | 6 +++--- .../stream/arithmetic/SubtractingStream.java | 6 +++--- .../stream/arithmetic/ZoomStream.java | 6 +++--- .../stream/convert/AwareConversionStream2D.java | 6 +++--- .../stream/convert/AwareConversionStream3D.java | 6 +++--- .../stream/convert/CachedConversionStream.java | 6 +++--- .../stream/convert/ConversionStream.java | 6 +++--- .../stream/convert/ForceDoubleStream.java | 6 +++--- .../stream/convert/RoundingStream.java | 6 +++--- .../stream/convert/SelectionStream.java | 6 +++--- .../stream/convert/SignificanceStream.java | 10 +++++----- .../stream/convert/To3DStream.java | 6 +++--- .../stream/interpolation/BiHermiteStream.java | 6 +++--- .../stream/interpolation/BiStarcastStream.java | 6 +++--- .../stream/interpolation/BicubicStream.java | 6 +++--- .../stream/interpolation/BilinearStream.java | 6 +++--- .../stream/interpolation/Interpolated.java | 4 ++-- .../stream/interpolation/InterpolatingStream.java | 6 +++--- .../stream/interpolation/Interpolator.java | 4 ++-- .../stream/interpolation/InterpolatorFactory.java | 4 ++-- .../stream/interpolation/TriHermiteStream.java | 6 +++--- .../stream/interpolation/TriStarcastStream.java | 6 +++--- .../stream/interpolation/TricubicStream.java | 6 +++--- .../stream/interpolation/TrilinearStream.java | 6 +++--- .../{engine => util}/stream/sources/CNGStream.java | 8 ++++---- .../stream/sources/FunctionStream.java | 6 +++--- .../stream/utility/CachedStream2D.java | 6 +++--- .../stream/utility/CachedStream3D.java | 6 +++--- .../stream/utility/NullSafeStream.java | 6 +++--- .../stream/utility/ProfiledStream.java | 6 +++--- .../stream/utility/SemaphoreStream.java | 6 +++--- .../stream/utility/SynchronizedStream.java | 6 +++--- 188 files changed, 366 insertions(+), 374 deletions(-) rename src/main/java/com/volmit/iris/{engine => util}/hunk/Hunk.java (99%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/HunkFace.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/BasicHunkIOAdapter.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/BlockDataHunkIOAdapter.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/BooleanHunkIOAdapter.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/HunkIOAdapter.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/HunkRegion.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/HunkRegionSlice.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/PaletteHunkIOAdapter.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/StringHunkIOAdapter.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/io/TileDataHunkIOAdapter.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/ArrayHunk.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/AtomicDoubleHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/AtomicHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/AtomicIntegerHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/AtomicLongHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/MappedHunk.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/StorageHunk.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/storage/SynchronizedArrayHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/BiomeGridHunkView.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/ChunkBiomeHunkView.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/ChunkDataHunkView.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/ChunkHunkView.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/DriftHunkView.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/FringedHunkView.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/FunctionalHunkView.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/HunkView.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/InvertedHunkView.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/ListeningHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/ReadOnlyHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/RotatedXHunkView.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/RotatedYHunkView.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/RotatedZHunkView.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/SynchronizedHunkView.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/hunk/view/WriteTrackHunk.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CNG.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CNGFactory.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CellGenerator.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CellHeightNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CellularNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CloverNoise.java (99%) rename src/main/java/com/volmit/iris/{engine => util}/noise/CubicNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/ExpressionNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FastNoise.java (99%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FastNoiseDouble.java (99%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FlatNoise.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FractalBillowPerlinNoise.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FractalBillowSimplexNoise.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FractalCubicNoise.java (93%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FractalFBMSimplexNoise.java (93%) rename src/main/java/com/volmit/iris/{engine => util}/noise/FractalRigidMultiSimplexNoise.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/noise/GlobNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/InterpolatedNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/NoiseFactory.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/noise/NoiseGenerator.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/noise/NoiseType.java (99%) rename src/main/java/com/volmit/iris/{engine => util}/noise/OctaveNoise.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/noise/PerlinNoise.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/noise/RarityCellGenerator.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/noise/SimplexNoise.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/noise/VascularNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/noise/WhiteNoise.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/parallel/BurstExecutor.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/parallel/BurstedHunk.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/parallel/GridLock.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/parallel/HyperLock.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/parallel/MultiBurst.java (99%) rename src/main/java/com/volmit/iris/{engine => util}/parallel/NOOPGridLock.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/stream/ArraySignificance.java (98%) rename src/main/java/com/volmit/iris/{engine => util}/stream/BasicLayer.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/stream/BasicStream.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/stream/ProceduralLayer.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/stream/ProceduralStream.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/stream/Significance.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/AddingStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/ClampedStream.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/CoordinateBitShiftLeftStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/CoordinateBitShiftRightStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/DividingStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/FittedStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/MaxingStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/MinningStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/ModuloStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/MultiplyingStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/OffsetStream.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/RadialStream.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/RoundingDoubleStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/SlopeStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/SubtractingStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/arithmetic/ZoomStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/AwareConversionStream2D.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/AwareConversionStream3D.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/CachedConversionStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/ConversionStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/ForceDoubleStream.java (89%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/RoundingStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/SelectionStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/SignificanceStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/convert/To3DStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/BiHermiteStream.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/BiStarcastStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/BicubicStream.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/BilinearStream.java (93%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/Interpolated.java (95%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/InterpolatingStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/Interpolator.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/InterpolatorFactory.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/TriHermiteStream.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/TriStarcastStream.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/TricubicStream.java (97%) rename src/main/java/com/volmit/iris/{engine => util}/stream/interpolation/TrilinearStream.java (94%) rename src/main/java/com/volmit/iris/{engine => util}/stream/sources/CNGStream.java (90%) rename src/main/java/com/volmit/iris/{engine => util}/stream/sources/FunctionStream.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/stream/utility/CachedStream2D.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/utility/CachedStream3D.java (92%) rename src/main/java/com/volmit/iris/{engine => util}/stream/utility/NullSafeStream.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/stream/utility/ProfiledStream.java (96%) rename src/main/java/com/volmit/iris/{engine => util}/stream/utility/SemaphoreStream.java (91%) rename src/main/java/com/volmit/iris/{engine => util}/stream/utility/SynchronizedStream.java (90%) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index a29197e41..2317a611d 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -33,7 +33,7 @@ import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiomeCustom; import com.volmit.iris.engine.object.IrisCompat; import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java index b8832074c..e27960e85 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.interpolation.InterpolationMethod; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java index 48303cc87..69bca7fe1 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java @@ -24,8 +24,8 @@ import com.volmit.iris.engine.data.mca.Chunk; import com.volmit.iris.engine.data.mca.MCAFile; import com.volmit.iris.engine.data.mca.MCAUtil; import com.volmit.iris.engine.framework.IrisAccess; -import com.volmit.iris.engine.parallel.BurstExecutor; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/core/edit/BlockSignal.java b/src/main/java/com/volmit/iris/core/edit/BlockSignal.java index aabd80cc7..3d0af9384 100644 --- a/src/main/java/com/volmit/iris/core/edit/BlockSignal.java +++ b/src/main/java/com/volmit/iris/core/edit/BlockSignal.java @@ -18,7 +18,7 @@ package com.volmit.iris.core.edit; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.SR; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java index 9d18a763b..d93312361 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.gui; import com.volmit.iris.Iris; import com.volmit.iris.core.events.IrisEngineHotloadEvent; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.NoiseStyle; -import com.volmit.iris.engine.parallel.BurstExecutor; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.math.M; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java index ff2551caf..fb23ac99d 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java @@ -21,7 +21,7 @@ package com.volmit.iris.core.pregenerator.methods; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.scheduling.J; import io.papermc.lib.PaperLib; diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java index 8274556a8..ca454d7b3 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -30,7 +30,7 @@ import com.volmit.iris.core.tools.IrisWorldCreator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.*; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index 4ebc22cbb..d4b0305b4 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -25,11 +25,11 @@ import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.modifier.IrisCaveModifier; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.math.M; @@ -41,7 +41,6 @@ import org.bukkit.block.data.BlockData; import java.util.List; import java.util.UUID; -import java.util.concurrent.atomic.AtomicBoolean; @Data public class IrisComplex implements DataProvider { diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 7fa004512..1586a2915 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -24,7 +24,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.events.IrisEngineHotloadEvent; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.framework.*; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.IrisDecorator; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java index cb8f25e41..bc27cce3b 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java @@ -25,12 +25,12 @@ import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineCompound; import com.volmit.iris.engine.framework.EngineData; import com.volmit.iris.engine.framework.EngineTarget; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisDimensionIndex; import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java index fc9f304e4..5fb42142b 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -23,8 +23,8 @@ import com.volmit.iris.core.nms.INMS; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.hunk.view.BiomeGridHunkView; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.hunk.view.BiomeGridHunkView; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiomeCustom; import com.volmit.iris.util.documentation.BlockCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index 16cf9e3a0..6751f7d98 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -22,7 +22,7 @@ import com.volmit.iris.engine.decorator.*; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.framework.EngineDecorator; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisCaveLayer; import com.volmit.iris.util.documentation.BlockCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java index fad4c045a..e086b1d94 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index 54c39a64e..6ec1e6ee5 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java index 400bda80d..af0028ebf 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.DecorationPart; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDecorator; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java index a8c45b42f..549186e2f 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.DecorationPart; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDecorator; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java index 702b7bbfe..3aa2a24ad 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.DecorationPart; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDecorator; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java index fc46b4fb9..64f5ea236 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.DecorationPart; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDecorator; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java index 1680befca..f98eff3af 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.Iris; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.DecorationPart; import com.volmit.iris.engine.object.InferredType; import com.volmit.iris.engine.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index a3d468c39..32558b92d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -25,12 +25,12 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.engine.IrisEngineData; import com.volmit.iris.engine.parallax.ParallaxAccess; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java index 6aac05f1f..36fb43b59 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java @@ -18,7 +18,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; public interface EngineActuator extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java index fb0c0428c..81d5526f2 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java @@ -18,7 +18,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; public abstract class EngineAssignedActuator extends EngineAssignedComponent implements EngineActuator { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java index 714a24ae6..1d62295fc 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java @@ -19,7 +19,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public abstract class EngineAssignedBiModifier extends EngineAssignedComponent implements EngineBiModifier { public EngineAssignedBiModifier(Engine engine, String name) { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java index 39e7e3ad6..6bbdf4a34 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java @@ -18,7 +18,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; public abstract class EngineAssignedModifier extends EngineAssignedComponent implements EngineModifier { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java index 804b7e8d5..e616aa70c 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java @@ -19,7 +19,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public interface EngineBiModifier extends EngineComponent { void modify(int x, int z, Hunk a, Hunk b); diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java index 242a3bf30..93911962e 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java @@ -31,13 +31,13 @@ import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.data.mca.NBTWorld; import com.volmit.iris.engine.data.nbt.tag.CompoundTag; import com.volmit.iris.engine.headless.HeadlessGenerator; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.parallel.BurstExecutor; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java index 3bf51cc1d..e770eaad3 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java @@ -22,12 +22,12 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java index feb489a1c..25c24097a 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java @@ -19,7 +19,7 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.documentation.BlockCoordinates; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java index fa734bff2..350c40413 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java @@ -18,7 +18,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; public interface EngineModifier extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java index 0cd2a006c..46f3649b9 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java @@ -24,14 +24,14 @@ import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.engine.parallax.ParallaxChunkMeta; -import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index 6bfbb35f5..e3f663742 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.parallax.ParallaxWorld; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import lombok.Data; import java.io.File; diff --git a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java index 3deb1b2b2..14273b04c 100644 --- a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java @@ -21,16 +21,13 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.data.mca.NBTWorld; import com.volmit.iris.engine.headless.HeadlessGenerator; import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java index c9e1133f6..58ececa38 100644 --- a/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java +++ b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.chunk.TerrainChunk; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/headless/HeadlessGenerator.java b/src/main/java/com/volmit/iris/engine/headless/HeadlessGenerator.java index 9191fdaa4..9cc58d6fd 100644 --- a/src/main/java/com/volmit/iris/engine/headless/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/headless/HeadlessGenerator.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.engine.data.mca.MCAUtil; import com.volmit.iris.engine.data.mca.NBTWorld; import com.volmit.iris.engine.framework.EngineCompositeGenerator; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.Position2; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/interpolation/IrisInterpolation.java b/src/main/java/com/volmit/iris/engine/interpolation/IrisInterpolation.java index 5d1aee879..76a576159 100644 --- a/src/main/java/com/volmit/iris/engine/interpolation/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/engine/interpolation/IrisInterpolation.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.interpolation; import com.google.common.util.concurrent.AtomicDouble; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.function.NoiseProvider3; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java index 406592399..2b5f5166d 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java @@ -21,12 +21,12 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.noise.FastNoiseDouble; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.noise.FastNoiseDouble; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisCaveLayer; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java index 0b34cff8c..82f780de8 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java @@ -21,10 +21,10 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.noise.FastNoiseDouble; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.noise.FastNoiseDouble; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index 3c549ecb4..b23429e93 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDepositGenerator; import com.volmit.iris.engine.object.IrisObject; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index 4d47685ae..fc1c86f7b 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java index e4a2ae5a7..135dc5c88 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java @@ -21,8 +21,8 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.MathHelper; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java index 6a6dc1581..fd0a9b395 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -27,7 +27,7 @@ import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java index 910e0f1d9..e5559cedb 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java index f15e66ce8..4773fb9e0 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java @@ -21,13 +21,13 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCavernZone.java b/src/main/java/com/volmit/iris/engine/object/IrisCavernZone.java index e5aabaad6..82b5adbc3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCavernZone.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCavernZone.java @@ -24,7 +24,7 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCaverns.java b/src/main/java/com/volmit/iris/engine/object/IrisCaverns.java index 1424733d4..ec3f93093 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCaverns.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCaverns.java @@ -22,8 +22,8 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java index 0738a4b54..dbc2ea826 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 3c8756380..8ff5caf96 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -22,11 +22,10 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.io.IO; -import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java index 1dcbb695b..c1f4bda90 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.framework.EngineFramework; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisExpression.java b/src/main/java/com/volmit/iris/engine/object/IrisExpression.java index aef37c8a4..bcf6a6252 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisExpression.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisExpression.java @@ -26,8 +26,8 @@ import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java b/src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java index 0f494bd38..fcd046c0d 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java @@ -22,7 +22,7 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java index 04a7b1759..c1b8f96fa 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.noise.CellGenerator; +import com.volmit.iris.util.noise.CellGenerator; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java index ee9ddce8e..73e7e2c13 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CNG; -import com.volmit.iris.engine.noise.ExpressionNoise; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.noise.ExpressionNoise; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java index ccf7273ae..8faa9dc4e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java index 508417f51..c9188b1f4 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java index ed496e770..c6b6759ac 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java index cbfd8b4c8..ba701d2ef 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java @@ -24,7 +24,7 @@ import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.interpolation.InterpolationMethod; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java index d4da54532..b5a25337e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java index 854ee15ad..a7befd171 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.gui.components.RenderType; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java b/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java index ae897a35d..2191efb81 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java @@ -19,7 +19,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CellGenerator; +import com.volmit.iris.util.noise.CellGenerator; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java b/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java index 60b2db5c4..7cb4bd93e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java @@ -19,7 +19,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.cache.AtomicCache; -import com.volmit.iris.engine.noise.CellGenerator; +import com.volmit.iris.util.noise.CellGenerator; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java b/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java index 8598e8112..d712bc80b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java index 5d4cbf6c4..d7b36c7da 100644 --- a/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java @@ -18,11 +18,11 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; -import com.volmit.iris.engine.noise.CNGFactory; -import com.volmit.iris.engine.noise.NoiseType; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.noise.CNGFactory; +import com.volmit.iris.util.noise.NoiseType; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.math.RNG; @Desc("Styles of noise") diff --git a/src/main/java/com/volmit/iris/engine/object/matter/MatterHunk.java b/src/main/java/com/volmit/iris/engine/object/matter/MatterHunk.java index 8d74b5420..a85cbeeb7 100644 --- a/src/main/java/com/volmit/iris/engine/object/matter/MatterHunk.java +++ b/src/main/java/com/volmit/iris/engine/object/matter/MatterHunk.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.object.matter; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.hunk.storage.StorageHunk; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.hunk.storage.StorageHunk; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.Consumer4; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/matter/MatterSlice.java b/src/main/java/com/volmit/iris/engine/object/matter/MatterSlice.java index e8841eae8..7fdf997e9 100644 --- a/src/main/java/com/volmit/iris/engine/object/matter/MatterSlice.java +++ b/src/main/java/com/volmit/iris/engine/object/matter/MatterSlice.java @@ -19,10 +19,9 @@ package com.volmit.iris.engine.object.matter; import com.volmit.iris.engine.cache.Cache; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.data.Varint; -import java.io.DataInput; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java index b8f605671..8ce9bda6b 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java @@ -18,7 +18,7 @@ package com.volmit.iris.engine.parallax; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java index d3ff3d156..0f47173b0 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.parallax; import com.google.gson.Gson; -import com.volmit.iris.engine.hunk.io.HunkIOAdapter; -import com.volmit.iris.engine.hunk.io.PaletteHunkIOAdapter; +import com.volmit.iris.util.hunk.io.HunkIOAdapter; +import com.volmit.iris.util.hunk.io.PaletteHunkIOAdapter; import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.oldnbt.CompoundTag; import lombok.AllArgsConstructor; @@ -29,9 +29,7 @@ import lombok.Data; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.util.List; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java index e28b5a63f..7ab5263ec 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java @@ -20,14 +20,14 @@ package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.hunk.io.HunkIOAdapter; -import com.volmit.iris.engine.hunk.io.HunkRegion; -import com.volmit.iris.engine.hunk.io.HunkRegionSlice; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.hunk.io.HunkIOAdapter; +import com.volmit.iris.util.hunk.io.HunkRegion; +import com.volmit.iris.util.hunk.io.HunkRegionSlice; import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.engine.parallel.GridLock; -import com.volmit.iris.engine.parallel.MultiBurst; -import com.volmit.iris.engine.parallel.NOOPGridLock; +import com.volmit.iris.util.parallel.GridLock; +import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.util.parallel.NOOPGridLock; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.M; import com.volmit.iris.util.oldnbt.ByteArrayTag; diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java index febd98adc..00e9226af 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.documentation.ChunkCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/hunk/Hunk.java b/src/main/java/com/volmit/iris/util/hunk/Hunk.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/hunk/Hunk.java rename to src/main/java/com/volmit/iris/util/hunk/Hunk.java index abd29d514..250fbb38e 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/Hunk.java @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk; +package com.volmit.iris.util.hunk; -import com.volmit.iris.engine.hunk.io.HunkIOAdapter; -import com.volmit.iris.engine.hunk.storage.*; -import com.volmit.iris.engine.hunk.view.*; +import com.volmit.iris.util.hunk.io.HunkIOAdapter; +import com.volmit.iris.util.hunk.storage.*; +import com.volmit.iris.util.hunk.view.*; import com.volmit.iris.engine.interpolation.InterpolationMethod; import com.volmit.iris.engine.interpolation.InterpolationMethod3D; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.parallel.BurstExecutor; -import com.volmit.iris.engine.parallel.MultiBurst; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.*; import com.volmit.iris.util.math.BlockPosition; diff --git a/src/main/java/com/volmit/iris/engine/hunk/HunkFace.java b/src/main/java/com/volmit/iris/util/hunk/HunkFace.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/HunkFace.java rename to src/main/java/com/volmit/iris/util/hunk/HunkFace.java index 618af5360..cbf5fa04b 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/HunkFace.java +++ b/src/main/java/com/volmit/iris/util/hunk/HunkFace.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk; +package com.volmit.iris.util.hunk; public enum HunkFace { TOP, diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/BasicHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/hunk/io/BasicHunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java index 6451fa679..5249917f2 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/BasicHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Function3; import java.io.*; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/BlockDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/BlockDataHunkIOAdapter.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/hunk/io/BlockDataHunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/BlockDataHunkIOAdapter.java index d00c0f915..54e0327fc 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/BlockDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/BlockDataHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.engine.data.B; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/BooleanHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/BooleanHunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/io/BooleanHunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/BooleanHunkIOAdapter.java index ee7b7e97e..aeaaaeb26 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/BooleanHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/BooleanHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java index 6943ea18c..b1dbfa1ef 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.engine.data.IOAdapter; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Function3; import com.volmit.iris.util.io.CustomOutputStream; import com.volmit.iris.util.oldnbt.ByteArrayTag; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegion.java b/src/main/java/com/volmit/iris/util/hunk/io/HunkRegion.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/hunk/io/HunkRegion.java rename to src/main/java/com/volmit/iris/util/hunk/io/HunkRegion.java index bf5dd3a51..92e47bf38 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegion.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/HunkRegion.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java rename to src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java index 6fda27b11..b4a9f3966 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/PaletteHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/hunk/io/PaletteHunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java index 987dc26b5..37862ef2b 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/PaletteHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.DataPalette; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Function3; import java.io.*; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/StringHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/StringHunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/io/StringHunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/StringHunkIOAdapter.java index 915a4f810..f0ebbac37 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/StringHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/StringHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/TileDataHunkIOAdapter.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java rename to src/main/java/com/volmit/iris/util/hunk/io/TileDataHunkIOAdapter.java index dfb6abb88..9490f570d 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/TileDataHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.io; +package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.engine.object.tile.TileData; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/ArrayHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/ArrayHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/hunk/storage/ArrayHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/ArrayHunk.java index 127539811..3bb135d52 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/ArrayHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/ArrayHunk.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; import com.volmit.iris.engine.cache.Cache; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicDoubleHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicDoubleHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/storage/AtomicDoubleHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/AtomicDoubleHunk.java index 2abb0761c..b067ce5c5 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicDoubleHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicDoubleHunk.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; import com.google.common.util.concurrent.AtomicDoubleArray; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/storage/AtomicHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/AtomicHunk.java index 9e1277e16..da6a46dd4 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicIntegerHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicIntegerHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/storage/AtomicIntegerHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/AtomicIntegerHunk.java index da7575f13..7c743d0a7 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicIntegerHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicIntegerHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicLongHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicLongHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/storage/AtomicLongHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/AtomicLongHunk.java index 573d87400..71f02b88d 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicLongHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/AtomicLongHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java index 5f6f4a16c..713ab508c 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.Consumer4; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/StorageHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/StorageHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/hunk/storage/StorageHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/StorageHunk.java index fd04473d2..e4cb2c709 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/StorageHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/StorageHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; @Data diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/SynchronizedArrayHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/storage/SynchronizedArrayHunk.java rename to src/main/java/com/volmit/iris/util/hunk/storage/SynchronizedArrayHunk.java index 3d6cc5187..a93e28ee5 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/SynchronizedArrayHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/SynchronizedArrayHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.storage; +package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java index c676cba83..1ce534580 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.engine.data.chunk.LinkedTerrainChunk; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import lombok.Getter; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/ChunkBiomeHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/ChunkBiomeHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/ChunkBiomeHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/ChunkBiomeHunkView.java index a770b4be5..8acbdd605 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/ChunkBiomeHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ChunkBiomeHunkView.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; import com.volmit.iris.Iris; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/ChunkDataHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/ChunkDataHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkView.java index c236fa422..e229178cb 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/ChunkDataHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/ChunkHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/ChunkHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/ChunkHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/ChunkHunkView.java index 3f1a99462..64ad662aa 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/ChunkHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ChunkHunkView.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; import com.volmit.iris.Iris; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/DriftHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/DriftHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/DriftHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/DriftHunkView.java index 4833f9af9..71a1b2c97 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/DriftHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/DriftHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class DriftHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/FringedHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/FringedHunkView.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/hunk/view/FringedHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/FringedHunkView.java index 399188993..7a3b75620 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/FringedHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/FringedHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class FringedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/FunctionalHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/FunctionalHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/view/FunctionalHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/FunctionalHunkView.java index 05dfc1b91..3629824f4 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/FunctionalHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/FunctionalHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/HunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/HunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/HunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/HunkView.java index 56c1cecae..c965fa8cf 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/HunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/HunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public class HunkView implements Hunk { private final int ox; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/InvertedHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/InvertedHunkView.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/hunk/view/InvertedHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/InvertedHunkView.java index 7037b0b17..e255135b4 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/InvertedHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/InvertedHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class InvertedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/ListeningHunk.java b/src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/ListeningHunk.java rename to src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java index 0b8fcb15d..293c3199a 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/ListeningHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Consumer4; @SuppressWarnings("ClassCanBeRecord") diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/ReadOnlyHunk.java b/src/main/java/com/volmit/iris/util/hunk/view/ReadOnlyHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/ReadOnlyHunk.java rename to src/main/java/com/volmit/iris/util/hunk/view/ReadOnlyHunk.java index e3f2370bb..6871cf047 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/ReadOnlyHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ReadOnlyHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class ReadOnlyHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/RotatedXHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/RotatedXHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/view/RotatedXHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/RotatedXHunkView.java index 1322457bf..6ecf57b70 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/RotatedXHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/RotatedXHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public class RotatedXHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/RotatedYHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/RotatedYHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/view/RotatedYHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/RotatedYHunkView.java index 9c6f102c9..25cba47cf 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/RotatedYHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/RotatedYHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public class RotatedYHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/RotatedZHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/RotatedZHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/hunk/view/RotatedZHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/RotatedZHunkView.java index e19ce21e8..dda7c6239 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/RotatedZHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/RotatedZHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public class RotatedZHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/SynchronizedHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/SynchronizedHunkView.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/hunk/view/SynchronizedHunkView.java rename to src/main/java/com/volmit/iris/util/hunk/view/SynchronizedHunkView.java index 98f7a7d12..e98d6ef77 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/SynchronizedHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/SynchronizedHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class SynchronizedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/WriteTrackHunk.java b/src/main/java/com/volmit/iris/util/hunk/view/WriteTrackHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/hunk/view/WriteTrackHunk.java rename to src/main/java/com/volmit/iris/util/hunk/view/WriteTrackHunk.java index 97fd86584..987ac3c1e 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/WriteTrackHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/WriteTrackHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.hunk.view; +package com.volmit.iris.util.hunk.view; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/com/volmit/iris/engine/noise/CNG.java b/src/main/java/com/volmit/iris/util/noise/CNG.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/noise/CNG.java rename to src/main/java/com/volmit/iris/util/noise/CNG.java index c93ea5af1..0b1659243 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CNG.java +++ b/src/main/java/com/volmit/iris/util/noise/CNG.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.Iris; import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.arithmetic.FittedStream; -import com.volmit.iris.engine.stream.sources.CNGStream; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.arithmetic.FittedStream; +import com.volmit.iris.util.stream.sources.CNGStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NoiseInjector; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/CNGFactory.java b/src/main/java/com/volmit/iris/util/noise/CNGFactory.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/noise/CNGFactory.java rename to src/main/java/com/volmit/iris/util/noise/CNGFactory.java index 7d0f09bb9..567b37ff0 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CNGFactory.java +++ b/src/main/java/com/volmit/iris/util/noise/CNGFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java b/src/main/java/com/volmit/iris/util/noise/CellGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/noise/CellGenerator.java rename to src/main/java/com/volmit/iris/util/noise/CellGenerator.java index 7fb04b3cc..66b422fa1 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java +++ b/src/main/java/com/volmit/iris/util/noise/CellGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java b/src/main/java/com/volmit/iris/util/noise/CellHeightNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java rename to src/main/java/com/volmit/iris/util/noise/CellHeightNoise.java index e59d1d1c8..a00873e4f 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/CellHeightNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java b/src/main/java/com/volmit/iris/util/noise/CellularNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/CellularNoise.java rename to src/main/java/com/volmit/iris/util/noise/CellularNoise.java index 7c1f7a52b..ec4a1710e 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/CellularNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/CloverNoise.java b/src/main/java/com/volmit/iris/util/noise/CloverNoise.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/noise/CloverNoise.java rename to src/main/java/com/volmit/iris/util/noise/CloverNoise.java index f86888bb4..422cda197 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CloverNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/CloverNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; public class CloverNoise implements NoiseGenerator { private final Noise2D n2; diff --git a/src/main/java/com/volmit/iris/engine/noise/CubicNoise.java b/src/main/java/com/volmit/iris/util/noise/CubicNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/CubicNoise.java rename to src/main/java/com/volmit/iris/util/noise/CubicNoise.java index b18a286ae..55d468442 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CubicNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/CubicNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/ExpressionNoise.java b/src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/ExpressionNoise.java rename to src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java index 55839585f..da8d37aa4 100644 --- a/src/main/java/com/volmit/iris/engine/noise/ExpressionNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.engine.object.IrisExpression; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/FastNoise.java b/src/main/java/com/volmit/iris/util/noise/FastNoise.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/noise/FastNoise.java rename to src/main/java/com/volmit/iris/util/noise/FastNoise.java index 79efb6d5d..ebce04eb6 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FastNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FastNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.Vector2f; import com.volmit.iris.util.math.Vector3f; diff --git a/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java b/src/main/java/com/volmit/iris/util/noise/FastNoiseDouble.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java rename to src/main/java/com/volmit/iris/util/noise/FastNoiseDouble.java index c14c20db0..6db2b0c7f 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java +++ b/src/main/java/com/volmit/iris/util/noise/FastNoiseDouble.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.Vector2f; import com.volmit.iris.util.math.Vector3f; diff --git a/src/main/java/com/volmit/iris/engine/noise/FlatNoise.java b/src/main/java/com/volmit/iris/util/noise/FlatNoise.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/noise/FlatNoise.java rename to src/main/java/com/volmit/iris/util/noise/FlatNoise.java index 4aceb1aec..0c37eeef7 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FlatNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FlatNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; public class FlatNoise implements NoiseGenerator { public FlatNoise(long seed) { diff --git a/src/main/java/com/volmit/iris/engine/noise/FractalBillowPerlinNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/noise/FractalBillowPerlinNoise.java rename to src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java index 69fa458d4..a24abf169 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FractalBillowPerlinNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; -import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; public class FractalBillowPerlinNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/engine/noise/FractalBillowSimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/noise/FractalBillowSimplexNoise.java rename to src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java index 163bc19c2..ffaa392e3 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FractalBillowSimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; -import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; public class FractalBillowSimplexNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/engine/noise/FractalCubicNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/noise/FractalCubicNoise.java rename to src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java index 5699c5ab1..3a77f5444 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FractalCubicNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; -import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; public class FractalCubicNoise implements NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/engine/noise/FractalFBMSimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/noise/FractalFBMSimplexNoise.java rename to src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java index 50bb9807a..aa2663d89 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FractalFBMSimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; -import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; public class FractalFBMSimplexNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/engine/noise/FractalRigidMultiSimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/noise/FractalRigidMultiSimplexNoise.java rename to src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java index daf1ebb60..3f0547ffa 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FractalRigidMultiSimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; -import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; public class FractalRigidMultiSimplexNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/engine/noise/GlobNoise.java b/src/main/java/com/volmit/iris/util/noise/GlobNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/GlobNoise.java rename to src/main/java/com/volmit/iris/util/noise/GlobNoise.java index a0d890e21..37b5416a7 100644 --- a/src/main/java/com/volmit/iris/engine/noise/GlobNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/GlobNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/InterpolatedNoise.java b/src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/InterpolatedNoise.java rename to src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java index 7b6ab8ef4..0bd657df6 100644 --- a/src/main/java/com/volmit/iris/engine/noise/InterpolatedNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.engine.interpolation.InterpolationMethod; import com.volmit.iris.engine.interpolation.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/engine/noise/NoiseFactory.java b/src/main/java/com/volmit/iris/util/noise/NoiseFactory.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/noise/NoiseFactory.java rename to src/main/java/com/volmit/iris/util/noise/NoiseFactory.java index bc666413e..a4fa4c3bf 100644 --- a/src/main/java/com/volmit/iris/engine/noise/NoiseFactory.java +++ b/src/main/java/com/volmit/iris/util/noise/NoiseFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; @FunctionalInterface public interface NoiseFactory { diff --git a/src/main/java/com/volmit/iris/engine/noise/NoiseGenerator.java b/src/main/java/com/volmit/iris/util/noise/NoiseGenerator.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/noise/NoiseGenerator.java rename to src/main/java/com/volmit/iris/util/noise/NoiseGenerator.java index 4757428f8..f59ec8d3e 100644 --- a/src/main/java/com/volmit/iris/engine/noise/NoiseGenerator.java +++ b/src/main/java/com/volmit/iris/util/noise/NoiseGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; public interface NoiseGenerator { double noise(double x); diff --git a/src/main/java/com/volmit/iris/engine/noise/NoiseType.java b/src/main/java/com/volmit/iris/util/noise/NoiseType.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/noise/NoiseType.java rename to src/main/java/com/volmit/iris/util/noise/NoiseType.java index 39a03231f..c19fbc512 100644 --- a/src/main/java/com/volmit/iris/engine/noise/NoiseType.java +++ b/src/main/java/com/volmit/iris/util/noise/NoiseType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.engine.interpolation.InterpolationMethod; diff --git a/src/main/java/com/volmit/iris/engine/noise/OctaveNoise.java b/src/main/java/com/volmit/iris/util/noise/OctaveNoise.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/noise/OctaveNoise.java rename to src/main/java/com/volmit/iris/util/noise/OctaveNoise.java index 9f937ee4b..8b05fd242 100644 --- a/src/main/java/com/volmit/iris/engine/noise/OctaveNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/OctaveNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; public interface OctaveNoise { void setOctaves(int o); diff --git a/src/main/java/com/volmit/iris/engine/noise/PerlinNoise.java b/src/main/java/com/volmit/iris/util/noise/PerlinNoise.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/noise/PerlinNoise.java rename to src/main/java/com/volmit/iris/util/noise/PerlinNoise.java index a216624f4..dfcf03b27 100644 --- a/src/main/java/com/volmit/iris/engine/noise/PerlinNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/PerlinNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/RarityCellGenerator.java b/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/noise/RarityCellGenerator.java rename to src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java index 1133ca030..37770ff9a 100644 --- a/src/main/java/com/volmit/iris/engine/noise/RarityCellGenerator.java +++ b/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/noise/SimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/SimplexNoise.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/noise/SimplexNoise.java rename to src/main/java/com/volmit/iris/util/noise/SimplexNoise.java index 06a30942d..a62003fa8 100644 --- a/src/main/java/com/volmit/iris/engine/noise/SimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/SimplexNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/VascularNoise.java b/src/main/java/com/volmit/iris/util/noise/VascularNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/VascularNoise.java rename to src/main/java/com/volmit/iris/util/noise/VascularNoise.java index b9c2a7304..0d52b5d77 100644 --- a/src/main/java/com/volmit/iris/engine/noise/VascularNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/VascularNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/noise/WhiteNoise.java b/src/main/java/com/volmit/iris/util/noise/WhiteNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/noise/WhiteNoise.java rename to src/main/java/com/volmit/iris/util/noise/WhiteNoise.java index 7b990b0ed..c68adbcea 100644 --- a/src/main/java/com/volmit/iris/engine/noise/WhiteNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/WhiteNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.noise; +package com.volmit.iris.util.noise; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/parallel/BurstExecutor.java b/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/parallel/BurstExecutor.java rename to src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java index 508cf531d..7e43908fe 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/BurstExecutor.java +++ b/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.parallel; +package com.volmit.iris.util.parallel; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/parallel/BurstedHunk.java b/src/main/java/com/volmit/iris/util/parallel/BurstedHunk.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/parallel/BurstedHunk.java rename to src/main/java/com/volmit/iris/util/parallel/BurstedHunk.java index fe50601f5..7f749a653 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/BurstedHunk.java +++ b/src/main/java/com/volmit/iris/util/parallel/BurstedHunk.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.parallel; +package com.volmit.iris.util.parallel; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; public interface BurstedHunk extends Hunk { int getOffsetX(); diff --git a/src/main/java/com/volmit/iris/engine/parallel/GridLock.java b/src/main/java/com/volmit/iris/util/parallel/GridLock.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/parallel/GridLock.java rename to src/main/java/com/volmit/iris/util/parallel/GridLock.java index d7d93ebef..af791ae2f 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/GridLock.java +++ b/src/main/java/com/volmit/iris/util/parallel/GridLock.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.parallel; +package com.volmit.iris.util.parallel; import com.volmit.iris.Iris; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.NastyRunnable; import com.volmit.iris.util.io.IORunnable; diff --git a/src/main/java/com/volmit/iris/engine/parallel/HyperLock.java b/src/main/java/com/volmit/iris/util/parallel/HyperLock.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/parallel/HyperLock.java rename to src/main/java/com/volmit/iris/util/parallel/HyperLock.java index 9575d639f..3878318c4 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/HyperLock.java +++ b/src/main/java/com/volmit/iris/util/parallel/HyperLock.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.parallel; +package com.volmit.iris.util.parallel; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java rename to src/main/java/com/volmit/iris/util/parallel/MultiBurst.java index dadb072d3..4e69de674 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.parallel; +package com.volmit.iris.util.parallel; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; diff --git a/src/main/java/com/volmit/iris/engine/parallel/NOOPGridLock.java b/src/main/java/com/volmit/iris/util/parallel/NOOPGridLock.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/parallel/NOOPGridLock.java rename to src/main/java/com/volmit/iris/util/parallel/NOOPGridLock.java index 04b712564..83afb0216 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/NOOPGridLock.java +++ b/src/main/java/com/volmit/iris/util/parallel/NOOPGridLock.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.parallel; +package com.volmit.iris.util.parallel; import com.volmit.iris.util.function.NastyRunnable; import com.volmit.iris.util.io.IORunnable; diff --git a/src/main/java/com/volmit/iris/util/scheduling/J.java b/src/main/java/com/volmit/iris/util/scheduling/J.java index cd85271a4..392012233 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; -import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NastyFunction; import com.volmit.iris.util.function.NastyFuture; diff --git a/src/main/java/com/volmit/iris/engine/stream/ArraySignificance.java b/src/main/java/com/volmit/iris/util/stream/ArraySignificance.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/stream/ArraySignificance.java rename to src/main/java/com/volmit/iris/util/stream/ArraySignificance.java index 698402082..8e8c319ab 100644 --- a/src/main/java/com/volmit/iris/engine/stream/ArraySignificance.java +++ b/src/main/java/com/volmit/iris/util/stream/ArraySignificance.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream; +package com.volmit.iris.util.stream; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/stream/BasicLayer.java b/src/main/java/com/volmit/iris/util/stream/BasicLayer.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/stream/BasicLayer.java rename to src/main/java/com/volmit/iris/util/stream/BasicLayer.java index 238af145e..f61ace25d 100644 --- a/src/main/java/com/volmit/iris/engine/stream/BasicLayer.java +++ b/src/main/java/com/volmit/iris/util/stream/BasicLayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream; +package com.volmit.iris.util.stream; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/stream/BasicStream.java b/src/main/java/com/volmit/iris/util/stream/BasicStream.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/stream/BasicStream.java rename to src/main/java/com/volmit/iris/util/stream/BasicStream.java index a28ae4d3d..15409cec5 100644 --- a/src/main/java/com/volmit/iris/engine/stream/BasicStream.java +++ b/src/main/java/com/volmit/iris/util/stream/BasicStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream; +package com.volmit.iris.util.stream; public abstract class BasicStream extends BasicLayer implements ProceduralStream { private final ProceduralStream source; diff --git a/src/main/java/com/volmit/iris/engine/stream/ProceduralLayer.java b/src/main/java/com/volmit/iris/util/stream/ProceduralLayer.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/stream/ProceduralLayer.java rename to src/main/java/com/volmit/iris/util/stream/ProceduralLayer.java index fcdc36d9e..f5e82a41c 100644 --- a/src/main/java/com/volmit/iris/engine/stream/ProceduralLayer.java +++ b/src/main/java/com/volmit/iris/util/stream/ProceduralLayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream; +package com.volmit.iris.util.stream; public interface ProceduralLayer { long getSeed(); diff --git a/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java rename to src/main/java/com/volmit/iris/util/stream/ProceduralStream.java index 7d12f1e06..88c1c98cc 100644 --- a/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream; +package com.volmit.iris.util.stream; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.IrisStyledRange; import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.stream.arithmetic.*; -import com.volmit.iris.engine.stream.convert.*; -import com.volmit.iris.engine.stream.interpolation.Interpolated; -import com.volmit.iris.engine.stream.sources.FunctionStream; -import com.volmit.iris.engine.stream.utility.*; +import com.volmit.iris.util.stream.arithmetic.*; +import com.volmit.iris.util.stream.convert.*; +import com.volmit.iris.util.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.sources.FunctionStream; +import com.volmit.iris.util.stream.utility.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/Significance.java b/src/main/java/com/volmit/iris/util/stream/Significance.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/stream/Significance.java rename to src/main/java/com/volmit/iris/util/stream/Significance.java index 995fec947..4343e4577 100644 --- a/src/main/java/com/volmit/iris/engine/stream/Significance.java +++ b/src/main/java/com/volmit/iris/util/stream/Significance.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream; +package com.volmit.iris.util.stream; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/AddingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/AddingStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java index 5c6a0e935..5b1fb6063 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/AddingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/ClampedStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/ClampedStream.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/ClampedStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/ClampedStream.java index 246cfa832..a5c72ccd7 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/ClampedStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/ClampedStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class ClampedStream extends BasicStream implements ProceduralStream { private final double min; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftLeftStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/CoordinateBitShiftLeftStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftLeftStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/CoordinateBitShiftLeftStream.java index 21c451865..c7b533efb 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftLeftStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/CoordinateBitShiftLeftStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class CoordinateBitShiftLeftStream extends BasicStream implements ProceduralStream { private final int amount; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftRightStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/CoordinateBitShiftRightStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftRightStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/CoordinateBitShiftRightStream.java index e4821a947..ec6a57125 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftRightStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/CoordinateBitShiftRightStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class CoordinateBitShiftRightStream extends BasicStream implements ProceduralStream { private final int amount; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/DividingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/DividingStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java index 6e3a6dc93..a8467f135 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/DividingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/FittedStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/FittedStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/FittedStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/FittedStream.java index 601949102..968d70f54 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/FittedStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/FittedStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class FittedStream extends BasicStream implements ProceduralStream { private final double min; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/MaxingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/MaxingStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java index f1e3d383b..e8cff1343 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/MaxingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/MinningStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/MinningStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java index c5e153b57..7be723f42 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/MinningStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/ModuloStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/ModuloStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java index f3f188e01..3b1756dcf 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/ModuloStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/MultiplyingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/MultiplyingStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java index 693abd710..30c4ddb5e 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/MultiplyingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/OffsetStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/OffsetStream.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/OffsetStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/OffsetStream.java index 86a35f967..73de0c002 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/OffsetStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/OffsetStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class OffsetStream extends BasicStream implements ProceduralStream { private final double ox; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/RadialStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/RadialStream.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/RadialStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/RadialStream.java index 50dbcd0cb..1ec1df63f 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/RadialStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/RadialStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class RadialStream extends BasicStream implements ProceduralStream { private final double scale; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/RoundingDoubleStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/RoundingDoubleStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/RoundingDoubleStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/RoundingDoubleStream.java index b92719326..ffadbac18 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/RoundingDoubleStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/RoundingDoubleStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class RoundingDoubleStream extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/SlopeStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/SlopeStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/SlopeStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/SlopeStream.java index f5b3535d8..72fb225f7 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/SlopeStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/SlopeStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class SlopeStream extends BasicStream { private final int range; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/SubtractingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/SubtractingStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java index 23e7c3d0c..080a484d7 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/SubtractingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/arithmetic/ZoomStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/ZoomStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/arithmetic/ZoomStream.java rename to src/main/java/com/volmit/iris/util/stream/arithmetic/ZoomStream.java index 12842c23b..a87556bea 100644 --- a/src/main/java/com/volmit/iris/engine/stream/arithmetic/ZoomStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/ZoomStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.arithmetic; +package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class ZoomStream extends BasicStream { private final double ox; diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream2D.java b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream2D.java rename to src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java index 365a0d197..73df91515 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream2D.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function3; public class AwareConversionStream2D extends BasicStream { diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream3D.java b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream3D.java rename to src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java index 0ebcec405..8cf476667 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream3D.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function4; public class AwareConversionStream3D extends BasicStream { diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/CachedConversionStream.java b/src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/convert/CachedConversionStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java index 1f362e4f7..257e5021b 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/CachedConversionStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicLayer; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicLayer; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.collection.KMap; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/ConversionStream.java b/src/main/java/com/volmit/iris/util/stream/convert/ConversionStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/convert/ConversionStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/ConversionStream.java index fca106faa..d46fb05c6 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/ConversionStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/ConversionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicLayer; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicLayer; +import com.volmit.iris.util.stream.ProceduralStream; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/ForceDoubleStream.java b/src/main/java/com/volmit/iris/util/stream/convert/ForceDoubleStream.java similarity index 89% rename from src/main/java/com/volmit/iris/engine/stream/convert/ForceDoubleStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/ForceDoubleStream.java index 0a061afd7..867a58791 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/ForceDoubleStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/ForceDoubleStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class ForceDoubleStream extends BasicStream { private ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/RoundingStream.java b/src/main/java/com/volmit/iris/util/stream/convert/RoundingStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/convert/RoundingStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/RoundingStream.java index 3c7466861..b650ca099 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/RoundingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/RoundingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class RoundingStream extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/SelectionStream.java b/src/main/java/com/volmit/iris/util/stream/convert/SelectionStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/convert/SelectionStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/SelectionStream.java index 85003fb7b..ec32af1aa 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/SelectionStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/SelectionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import java.util.List; diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/convert/SignificanceStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java index 07dcc7ed8..696cf15e0 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/SignificanceStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.ArraySignificance; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.stream.Significance; +import com.volmit.iris.util.stream.ArraySignificance; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.Significance; import com.volmit.iris.util.collection.KList; public class SignificanceStream, T> extends BasicStream { diff --git a/src/main/java/com/volmit/iris/engine/stream/convert/To3DStream.java b/src/main/java/com/volmit/iris/util/stream/convert/To3DStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/convert/To3DStream.java rename to src/main/java/com/volmit/iris/util/stream/convert/To3DStream.java index a607117e2..d53d802b8 100644 --- a/src/main/java/com/volmit/iris/engine/stream/convert/To3DStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/To3DStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.convert; +package com.volmit.iris.util.stream.convert; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class To3DStream extends BasicStream { public To3DStream(ProceduralStream stream) { diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/BiHermiteStream.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/BiHermiteStream.java index 7dc9668c0..d6fa94a63 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/BiHermiteStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class BiHermiteStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BiStarcastStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/BiStarcastStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/BiStarcastStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/BiStarcastStream.java index 6b2fc74e5..371d5115d 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BiStarcastStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/BiStarcastStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class BiStarcastStream extends BasicStream implements Interpolator { private final int rad; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/BicubicStream.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/BicubicStream.java index 8ad53e0b5..7db8d718b 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/BicubicStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class BicubicStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/BilinearStream.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/BilinearStream.java index 7e6856fd1..06ec05329 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/BilinearStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class BilinearStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java index 1562441eb..a07ef21f0 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java index bbddeabda..071170c57 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.InterpolationMethod; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.NoiseProvider; public class InterpolatingStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolator.java b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolator.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolator.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/Interpolator.java index 33b913c72..fb22cc38c 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolator.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolator.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; public interface Interpolator { @SuppressWarnings("unchecked") diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java b/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatorFactory.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatorFactory.java index 01962fc02..9fab5d2d9 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatorFactory.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.InterpolationMethod; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.ProceduralStream; @SuppressWarnings("ClassCanBeRecord") public class InterpolatorFactory { diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/TriHermiteStream.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/TriHermiteStream.java index 8777e5f26..546d50dd7 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/TriHermiteStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class TriHermiteStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TriStarcastStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/TriStarcastStream.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/TriStarcastStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/TriStarcastStream.java index d033ca8b6..0921a8062 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TriStarcastStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/TriStarcastStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class TriStarcastStream extends BasicStream implements Interpolator { private final int rad; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/TricubicStream.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/TricubicStream.java index 610fe7362..5d82d0623 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/TricubicStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class TricubicStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/TrilinearStream.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java rename to src/main/java/com/volmit/iris/util/stream/interpolation/TrilinearStream.java index efbe7bb52..2730465ee 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/TrilinearStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.interpolation; +package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.interpolation.IrisInterpolation; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class TrilinearStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/sources/CNGStream.java b/src/main/java/com/volmit/iris/util/stream/sources/CNGStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/sources/CNGStream.java rename to src/main/java/com/volmit/iris/util/stream/sources/CNGStream.java index 9367d4b75..0f0f1dc73 100644 --- a/src/main/java/com/volmit/iris/engine/stream/sources/CNGStream.java +++ b/src/main/java/com/volmit/iris/util/stream/sources/CNGStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.sources; +package com.volmit.iris.util.stream.sources; -import com.volmit.iris.engine.noise.CNG; -import com.volmit.iris.engine.stream.BasicLayer; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.stream.BasicLayer; +import com.volmit.iris.util.stream.ProceduralStream; public class CNGStream extends BasicLayer implements ProceduralStream { private final CNG cng; diff --git a/src/main/java/com/volmit/iris/engine/stream/sources/FunctionStream.java b/src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/stream/sources/FunctionStream.java rename to src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java index 70dcb60c1..c620ac9a2 100644 --- a/src/main/java/com/volmit/iris/engine/stream/sources/FunctionStream.java +++ b/src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.sources; +package com.volmit.iris.util.stream.sources; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java rename to src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java index 6037c40aa..04959b31c 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.utility; +package com.volmit.iris.util.stream.utility; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.engine.cache.Cache; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class CachedStream2D extends BasicStream implements ProceduralStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream3D.java b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/stream/utility/CachedStream3D.java rename to src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java index 0d6564e36..b454bed8e 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream3D.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.utility; +package com.volmit.iris.util.stream.utility; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.math.BlockPosition; public class CachedStream3D extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/NullSafeStream.java b/src/main/java/com/volmit/iris/util/stream/utility/NullSafeStream.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/stream/utility/NullSafeStream.java rename to src/main/java/com/volmit/iris/util/stream/utility/NullSafeStream.java index 9b6d6b5ed..bcb2b7cb8 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/NullSafeStream.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/NullSafeStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.utility; +package com.volmit.iris.util.stream.utility; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class NullSafeStream extends BasicStream implements ProceduralStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java rename to src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java index be066a254..587314b2b 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.utility; +package com.volmit.iris.util.stream.utility; import com.volmit.iris.Iris; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RollingSequence; diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/SemaphoreStream.java b/src/main/java/com/volmit/iris/util/stream/utility/SemaphoreStream.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/stream/utility/SemaphoreStream.java rename to src/main/java/com/volmit/iris/util/stream/utility/SemaphoreStream.java index 982ab008a..548224df2 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/SemaphoreStream.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/SemaphoreStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.utility; +package com.volmit.iris.util.stream.utility; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import java.util.concurrent.Semaphore; diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/SynchronizedStream.java b/src/main/java/com/volmit/iris/util/stream/utility/SynchronizedStream.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/stream/utility/SynchronizedStream.java rename to src/main/java/com/volmit/iris/util/stream/utility/SynchronizedStream.java index f45d5a0b6..43cd14e9e 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/SynchronizedStream.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/SynchronizedStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.stream.utility; +package com.volmit.iris.util.stream.utility; -import com.volmit.iris.engine.stream.BasicStream; -import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class SynchronizedStream extends BasicStream { public SynchronizedStream(ProceduralStream stream) {