Refactor heightmap classes to math where it makes more sense

(not required by heightmap processor, nor are they processors, used for heightmap brushes etc.)

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/FlattenBrush.java

@@ -1,7 +1,7 @@
 package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
-import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap;
+import com.fastasyncworldedit.core.math.heightmap.HeightMap;
+import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/HeightBrush.java

@@ -1,9 +1,9 @@
 package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
-import com.fastasyncworldedit.core.extent.processor.heightmap.RotatableHeightMap;
-import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap;
+import com.fastasyncworldedit.core.math.heightmap.HeightMap;
+import com.fastasyncworldedit.core.math.heightmap.RotatableHeightMap;
+import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap;
 import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/StencilBrush.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
+import com.fastasyncworldedit.core.math.heightmap.HeightMap;
 import com.fastasyncworldedit.core.function.mask.StencilBrushMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/EmptyClipboard.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core.extent.clipboard;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Entity;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/HeightmapProcessor.java

@@ -1,7 +1,7 @@
 package com.fastasyncworldedit.core.extent.processor;
 
 import com.fastasyncworldedit.core.FaweCache;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.queue.IBatchProcessor;
 import com.fastasyncworldedit.core.queue.IChunk;
 import com.fastasyncworldedit.core.queue.IChunkGet;

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/StencilBrushMask.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core.function.mask;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
+import com.fastasyncworldedit.core.math.heightmap.HeightMap;
 import com.fastasyncworldedit.core.math.MutableVector3;
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.EditSession;

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/AbstractDelegateHeightMap.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 public class AbstractDelegateHeightMap implements HeightMap {
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/ArrayHeightMap.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 public class ArrayHeightMap extends ScalableHeightMap {
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/AverageHeightMapFilter.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 public class AverageHeightMapFilter {
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/FlatScalableHeightMap.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 public class FlatScalableHeightMap extends ScalableHeightMap {
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/HeightMap.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/HeightMapType.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 import com.fastasyncworldedit.core.registry.state.PropertyKey;
 import com.sk89q.worldedit.registry.state.Property;

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/RotatableHeightMap.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 import com.fastasyncworldedit.core.math.MutableVector3;
 import com.sk89q.worldedit.math.BlockVector3;

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/ScalableHeightMap.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.extent.processor.heightmap;
+package com.fastasyncworldedit.core.math.heightmap;
 
 import com.fastasyncworldedit.core.math.IntPair;
 import com.fastasyncworldedit.core.math.MutableBlockVector3;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core.queue;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.extent.InputExtent;
 import com.sk89q.worldedit.math.BlockVector3;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core.queue;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.extent.OutputExtent;
 import com.sk89q.worldedit.function.operation.Operation;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/BitSetBlocks.java

@@ -1,7 +1,7 @@
 package com.fastasyncworldedit.core.queue.implementation.blocks;
 
 import com.fastasyncworldedit.core.FaweCache;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.queue.IChunkSet;
 import com.fastasyncworldedit.core.util.collection.MemBlockSet;
 import com.sk89q.jnbt.CompoundTag;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/CharSetBlocks.java

@@ -2,7 +2,7 @@ package com.fastasyncworldedit.core.queue.implementation.blocks;
 
 import com.fastasyncworldedit.core.FaweCache;
 import com.fastasyncworldedit.core.configuration.Settings;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.math.BlockVector3ChunkMap;
 import com.fastasyncworldedit.core.queue.IChunkSet;
 import com.fastasyncworldedit.core.queue.Pool;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/NullChunkGet.java

@@ -1,7 +1,7 @@
 package com.fastasyncworldedit.core.queue.implementation.blocks;
 
 import com.fastasyncworldedit.core.FaweCache;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.queue.IBlocks;
 import com.fastasyncworldedit.core.queue.IChunkGet;
 import com.fastasyncworldedit.core.queue.IChunkSet;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java

@@ -4,7 +4,7 @@ import com.fastasyncworldedit.core.FaweCache;
 import com.fastasyncworldedit.core.configuration.Settings;
 import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock;
 import com.fastasyncworldedit.core.extent.processor.EmptyBatchProcessor;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.queue.Filter;
 import com.fastasyncworldedit.core.queue.IChunk;
 import com.fastasyncworldedit.core.queue.IChunkGet;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/NullChunk.java

@@ -1,7 +1,7 @@
 package com.fastasyncworldedit.core.queue.implementation.chunk;
 
 import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.queue.Filter;
 import com.fastasyncworldedit.core.queue.IChunkSet;
 import com.fastasyncworldedit.core.queue.IQueueChunk;

worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java

@@ -50,8 +50,8 @@ import com.fastasyncworldedit.core.command.tool.sweep.SweepBrush;
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.fastasyncworldedit.core.configuration.Settings;
 import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder;
-import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap;
-import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap.Shape;
+import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap;
+import com.fastasyncworldedit.core.math.heightmap.ScalableHeightMap.Shape;
 import com.fastasyncworldedit.core.function.mask.IdMask;
 import com.fastasyncworldedit.core.function.mask.SingleBlockTypeMask;
 import com.fastasyncworldedit.core.object.FaweLimit;

worldedit-core/src/main/java/com/sk89q/worldedit/extent/InputExtent.java

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldedit.extent;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.math.MutableBlockVector3;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.internal.util.DeprecationUtil;

worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldedit.extent;
 
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
+import com.fastasyncworldedit.core.math.heightmap.HeightMapType;
 import com.fastasyncworldedit.core.math.MutableBlockVector3;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.WorldEditException;