From 37998ec5980c00d13237e8ab6c0ea38abb52f2d8 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Sat, 11 Sep 2021 12:23:03 +0100 Subject: [PATCH] Refactor heightmap classes to math where it makes more sense (not required by heightmap processor, nor are they processors, used for heightmap brushes etc.) --- .../core/command/tool/brush/FlattenBrush.java | 4 ++-- .../core/command/tool/brush/HeightBrush.java | 6 +++--- .../core/command/tool/brush/StencilBrush.java | 2 +- .../core/extent/clipboard/EmptyClipboard.java | 2 +- .../core/extent/processor/HeightmapProcessor.java | 2 +- .../core/function/mask/StencilBrushMask.java | 2 +- .../heightmap/AbstractDelegateHeightMap.java | 2 +- .../processor => math}/heightmap/ArrayHeightMap.java | 2 +- .../heightmap/AverageHeightMapFilter.java | 2 +- .../processor => math}/heightmap/FlatScalableHeightMap.java | 2 +- .../{extent/processor => math}/heightmap/HeightMap.java | 2 +- .../{extent/processor => math}/heightmap/HeightMapType.java | 2 +- .../processor => math}/heightmap/RotatableHeightMap.java | 2 +- .../processor => math}/heightmap/ScalableHeightMap.java | 2 +- .../java/com/fastasyncworldedit/core/queue/IChunkGet.java | 2 +- .../java/com/fastasyncworldedit/core/queue/IChunkSet.java | 2 +- .../core/queue/implementation/blocks/BitSetBlocks.java | 2 +- .../core/queue/implementation/blocks/CharSetBlocks.java | 2 +- .../core/queue/implementation/blocks/NullChunkGet.java | 2 +- .../core/queue/implementation/chunk/ChunkHolder.java | 2 +- .../core/queue/implementation/chunk/NullChunk.java | 2 +- .../java/com/sk89q/worldedit/command/BrushCommands.java | 4 ++-- .../main/java/com/sk89q/worldedit/extent/InputExtent.java | 2 +- .../main/java/com/sk89q/worldedit/extent/OutputExtent.java | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/AbstractDelegateHeightMap.java (85%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/ArrayHeightMap.java (95%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/AverageHeightMapFilter.java (95%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/FlatScalableHeightMap.java (91%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/HeightMap.java (99%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/HeightMapType.java (97%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/RotatableHeightMap.java (93%) rename worldedit-core/src/main/java/com/fastasyncworldedit/core/{extent/processor => math}/heightmap/ScalableHeightMap.java (98%) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/FlattenBrush.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/FlattenBrush.java index 60d5a17e3..e8de4fbce 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/FlattenBrush.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/HeightBrush.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/HeightBrush.java index be001af8f..2c00b445b 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/HeightBrush.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/StencilBrush.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/StencilBrush.java index 969a39fd4..4afaa02d5 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/StencilBrush.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/EmptyClipboard.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/EmptyClipboard.java index 8e18c2c19..d81c25456 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/EmptyClipboard.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/HeightmapProcessor.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/HeightmapProcessor.java index f1a620605..1b33fb2bc 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/HeightmapProcessor.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/StencilBrushMask.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/StencilBrushMask.java index 1b4dc618b..756cab771 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/StencilBrushMask.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/AbstractDelegateHeightMap.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/AbstractDelegateHeightMap.java similarity index 85% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/AbstractDelegateHeightMap.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/AbstractDelegateHeightMap.java index e13674574..501e35d1b 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/AbstractDelegateHeightMap.java +++ b/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 { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/ArrayHeightMap.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/ArrayHeightMap.java similarity index 95% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/ArrayHeightMap.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/ArrayHeightMap.java index 4567e0341..6d064f054 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/ArrayHeightMap.java +++ b/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 { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/AverageHeightMapFilter.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/AverageHeightMapFilter.java similarity index 95% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/AverageHeightMapFilter.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/AverageHeightMapFilter.java index 6009ef5cf..94365d414 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/AverageHeightMapFilter.java +++ b/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 { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/FlatScalableHeightMap.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/FlatScalableHeightMap.java similarity index 91% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/FlatScalableHeightMap.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/FlatScalableHeightMap.java index a32285a09..08f9991de 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/FlatScalableHeightMap.java +++ b/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 { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/HeightMap.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/HeightMap.java similarity index 99% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/HeightMap.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/HeightMap.java index 21d61b897..f97e20ba5 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/HeightMap.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/HeightMapType.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/HeightMapType.java similarity index 97% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/HeightMapType.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/HeightMapType.java index d49644f24..b34655f4d 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/HeightMapType.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/RotatableHeightMap.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/RotatableHeightMap.java similarity index 93% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/RotatableHeightMap.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/RotatableHeightMap.java index cf5230a7c..291f8e754 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/RotatableHeightMap.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/ScalableHeightMap.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/ScalableHeightMap.java similarity index 98% rename from worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/ScalableHeightMap.java rename to worldedit-core/src/main/java/com/fastasyncworldedit/core/math/heightmap/ScalableHeightMap.java index ba5ef6d5c..1ce85c377 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/heightmap/ScalableHeightMap.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java index 8004f7098..86a38c958 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java index 318e8ebeb..6098fb9b1 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/BitSetBlocks.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/BitSetBlocks.java index 96a2e4b83..ba3ecbf15 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/BitSetBlocks.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/CharSetBlocks.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/CharSetBlocks.java index 3958e09a6..2af218488 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/CharSetBlocks.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/NullChunkGet.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/NullChunkGet.java index 1e1e14dc8..a0c01384e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/NullChunkGet.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java index 95ba886ca..7880bfd87 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/NullChunk.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/NullChunk.java index 9f8b5ade0..6cfc65fe4 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/NullChunk.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index c5c224869..e8f719f86 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/InputExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/InputExtent.java index 58863920c..508a19eae 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/InputExtent.java +++ b/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; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java index ffe880557..36180bba8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java +++ b/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;