Feature/propagate diff and object cleanup (#1190)

* Feature/main/propagate diff annotations (#1187)

* 25% done

* More work

* More work

* 50%

* More work

* 75%

* 100% & cleanup

* Update adapters

* Squish squash, applesauce

commit 275ba9bd84
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Jul 17 01:10:20 2021 +0200

    Update dependency com.comphenix.protocol:ProtocolLib to v4.7.0 (#1173)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>

commit 9fd8984804
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Jul 17 01:09:29 2021 +0200

    Update dependency org.checkerframework:checker-qual to v3.16.0 (#1184)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>

commit 861fb45e5c
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 19:07:02 2021 +0100

    Fix #1075

commit 420c45a29a
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 18:48:21 2021 +0100

    Entity removal should be on the main thread as we're just passing through rather than doing chunk operations
     - Fixes #1164
     - Not working: butcher/remove history

commit 4d4db7dcd0
Author: SirYwell <hannesgreule@outlook.de>
Date:   Fri Jul 16 17:52:44 2021 +0200

    Make sure leaves category is loaded for heightmaps (fixes #1176)

commit c98f6e4f37
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 10:44:52 2021 +0100

    Do not allow generation commands to generate outside selection

commit 2485f5eccc
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 10:43:15 2021 +0100

    EditSession needs to override some Extent methods to ensure block changes are correctly set through the various extents
    Fixes #1152

commit d9418ec8ae
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 09:52:44 2021 +0100

    Undo part of 41073bb1a0
    Fixes #1178

* Update Upstream

fb1fb84 Fixed typo and grammar

* We don't support custom heights yet

* Casing inconsistency

* Address a few comments

* Address comments

* Don't refactor to AP classpath

* Document annotation style

* Refactoring & shade cleanup

* Address a few comments

* More work

* Resolve comments not being resolved yet

* Feature/main/propagate diff annotations (#1187) (#1194)

* Remove beta package, fix history packages, move classes out of object package

* Resolve comments not being resolved yet

* Remove beta package, fix history packages, move classes out of object package

Co-authored-by: NotMyFault <mc.cache@web.de>

* brushes should be under brush

* More refactoring
 - Filters/processors should be in the same place and are related to extents
 - Transforms are in `extent.transform` in upstream

* Move history classes under history

* Update adapters

Co-authored-by: dordsor21 <dordsor21@gmail.com>

worldedit-core/src/main/java/com/fastasyncworldedit/core/FAWEPlatformAdapterImpl.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core;
 
-import com.fastasyncworldedit.core.beta.IChunkGet;
+import com.fastasyncworldedit.core.queue.IChunkGet;
 
 public interface FAWEPlatformAdapterImpl {
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java

@@ -1,6 +1,6 @@
 package com.fastasyncworldedit.core;
 
-import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
+import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
 import com.fastasyncworldedit.core.configuration.Settings;
 import com.fastasyncworldedit.core.util.CachedTextureUtil;
 import com.fastasyncworldedit.core.util.CleanTextureUtil;

worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweAPI.java

@@ -1,15 +1,15 @@
 package com.fastasyncworldedit.core;
 
-import com.fastasyncworldedit.core.beta.IQueueChunk;
-import com.fastasyncworldedit.core.beta.IQueueExtent;
-import com.fastasyncworldedit.core.beta.implementation.lighting.Relighter;
-import com.fastasyncworldedit.core.beta.implementation.queue.ParallelQueueExtent;
+import com.fastasyncworldedit.core.queue.IQueueChunk;
+import com.fastasyncworldedit.core.queue.IQueueExtent;
+import com.fastasyncworldedit.core.extent.processor.lighting.Relighter;
+import com.fastasyncworldedit.core.queue.implementation.ParallelQueueExtent;
 import com.fastasyncworldedit.core.configuration.Settings;
-import com.fastasyncworldedit.core.object.RegionWrapper;
-import com.fastasyncworldedit.core.object.RelightMode;
-import com.fastasyncworldedit.core.object.changeset.DiskStorageHistory;
-import com.fastasyncworldedit.core.object.changeset.SimpleChangeSetSummary;
-import com.fastasyncworldedit.core.object.exception.FaweException;
+import com.fastasyncworldedit.core.regions.RegionWrapper;
+import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
+import com.fastasyncworldedit.core.history.DiskStorageHistory;
+import com.fastasyncworldedit.core.history.changeset.SimpleChangeSetSummary;
+import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.fastasyncworldedit.core.regions.FaweMaskManager;
 import com.fastasyncworldedit.core.util.EditSessionBuilder;
 import com.fastasyncworldedit.core.util.MainUtil;

worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweCache.java

@@ -1,17 +1,17 @@
 package com.fastasyncworldedit.core;
 
-import com.fastasyncworldedit.core.beta.IChunkSet;
-import com.fastasyncworldedit.core.beta.Trimable;
-import com.fastasyncworldedit.core.beta.implementation.queue.Pool;
-import com.fastasyncworldedit.core.beta.implementation.queue.QueuePool;
+import com.fastasyncworldedit.core.queue.IChunkSet;
+import com.fastasyncworldedit.core.queue.Trimable;
+import com.fastasyncworldedit.core.queue.Pool;
+import com.fastasyncworldedit.core.queue.implementation.QueuePool;
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.fastasyncworldedit.core.configuration.Settings;
-import com.fastasyncworldedit.core.object.collection.BitArray;
-import com.fastasyncworldedit.core.object.collection.BitArrayUnstretched;
-import com.fastasyncworldedit.core.object.collection.CleanableThreadLocal;
-import com.fastasyncworldedit.core.object.exception.FaweBlockBagException;
-import com.fastasyncworldedit.core.object.exception.FaweChunkLoadException;
-import com.fastasyncworldedit.core.object.exception.FaweException;
+import com.fastasyncworldedit.core.math.BitArray;
+import com.fastasyncworldedit.core.math.BitArrayUnstretched;
+import com.fastasyncworldedit.core.util.collection.CleanableThreadLocal;
+import com.fastasyncworldedit.core.internal.exception.FaweBlockBagException;
+import com.fastasyncworldedit.core.internal.exception.FaweChunkLoadException;
+import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.fastasyncworldedit.core.util.MathMan;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -31,8 +31,8 @@ import com.sk89q.jnbt.ShortTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.internal.util.LogManagerCompat;
-import com.sk89q.worldedit.math.MutableBlockVector3;
-import com.sk89q.worldedit.math.MutableVector3;
+import com.fastasyncworldedit.core.math.MutableBlockVector3;
+import com.fastasyncworldedit.core.math.MutableVector3;
 import com.sk89q.worldedit.world.block.BlockTypesCache;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;

worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java

@@ -1,7 +1,7 @@
 package com.fastasyncworldedit.core;
 
-import com.fastasyncworldedit.core.beta.implementation.preloader.Preloader;
-import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
+import com.fastasyncworldedit.core.queue.implementation.preloader.Preloader;
+import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
 import com.fastasyncworldedit.core.regions.FaweMaskManager;
 import com.fastasyncworldedit.core.util.TaskManager;
 import com.fastasyncworldedit.core.util.image.ImageViewer;

worldedit-core/src/main/java/com/fastasyncworldedit/core/beta/FilterBlockMask.java

@@ -1,8 +0,0 @@
-package com.fastasyncworldedit.core.beta;
-
-import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
-
-public interface FilterBlockMask {
-
-    boolean applyBlock(FilterBlock block);
-}

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/ListFilters.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.command;
+package com.fastasyncworldedit.core.command;
 
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.util.StringMan;
@@ -13,7 +13,6 @@ import java.util.UUID;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-//TODO This class breaks compilation
 //@CommandContainer
 public class ListFilters {
     public class Filter {

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/MaskCommands.java

@@ -1,5 +1,5 @@
 // TODO: Ping @MattBDev to reimplement (or remove because this class is stupid) 2020-02-04
-//package com.sk89q.worldedit.command;
+//package com.fastasyncworldedit.core.command;
 //
 //import com.boydti.fawe.object.mask.AdjacentAnyMask;
 //import com.boydti.fawe.object.mask.AdjacentMask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/MethodCommands.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.command;
+package com.fastasyncworldedit.core.command;
 
 import com.sk89q.worldedit.command.argument.Arguments;
 import org.enginehub.piston.inject.InjectedValueAccess;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool;
 
 import com.sk89q.worldedit.entity.Player;
 

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool;
 
 public interface ResettableTool {
     boolean reset();

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool;
 
 public enum TargetMode {
     TARGET_BLOCK_RANGE,

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.mask.RadiusMask;
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.function.mask.RadiusMask;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

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

@@ -1,13 +1,13 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.random.SimplexNoise;
+import com.fastasyncworldedit.core.math.random.SimplexNoise;
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableVector3;
+import com.fastasyncworldedit.core.math.MutableVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.transform.AffineTransform;
 

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.brush.scroll.Scroll;
-import com.fastasyncworldedit.core.object.extent.ResettableExtent;
+import com.fastasyncworldedit.core.command.tool.scroll.Scroll;
+import com.fastasyncworldedit.core.extent.ResettableExtent;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.function.mask.Mask;
@@ -15,7 +15,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static com.fastasyncworldedit.core.object.brush.BrushSettings.SettingType.BRUSH;
+import static com.fastasyncworldedit.core.command.tool.brush.BrushSettings.SettingType.BRUSH;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BrushSettings {

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

@@ -1,5 +1,6 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
+import com.fastasyncworldedit.core.command.tool.ResettableTool;
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.util.StringMan;
 import com.fastasyncworldedit.core.wrappers.AsyncPlayer;

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

@@ -1,9 +1,10 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
+import com.fastasyncworldedit.core.command.tool.ResettableTool;
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.clipboard.ResizableClipboardBuilder;
-import com.fastasyncworldedit.core.object.function.NullRegionFunction;
-import com.fastasyncworldedit.core.object.function.mask.AbstractDelegateMask;
+import com.fastasyncworldedit.core.extent.clipboard.ResizableClipboardBuilder;
+import com.fastasyncworldedit.core.function.NullRegionFunction;
+import com.fastasyncworldedit.core.function.mask.AbstractDelegateMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

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

@@ -1,6 +1,6 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.clipboard.CPUOptimizedClipboard;
+import com.fastasyncworldedit.core.extent.clipboard.CPUOptimizedClipboard;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.EditSession;

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.brush.heightmap.HeightMap;
-import com.fastasyncworldedit.core.object.brush.heightmap.ScalableHeightMap;
+import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
+import com.fastasyncworldedit.core.extent.processor.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,10 +1,10 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.brush.heightmap.HeightMap;
-import com.fastasyncworldedit.core.object.brush.heightmap.RotatableHeightMap;
-import com.fastasyncworldedit.core.object.brush.heightmap.ScalableHeightMap;
-import com.fastasyncworldedit.core.object.exception.FaweException;
+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.internal.exception.FaweException;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,8 +1,8 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.brush.mask.ImageBrushMask;
-import com.fastasyncworldedit.core.object.collection.SummedColorTable;
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.function.mask.ImageBrushMask;
+import com.fastasyncworldedit.core.util.collection.SummedColorTable;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.fastasyncworldedit.core.util.TextureUtil;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalSession;

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

@@ -1,12 +1,12 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.fastasyncworldedit.core.configuration.Settings;
 import com.fastasyncworldedit.core.database.DBHandler;
 import com.fastasyncworldedit.core.database.RollbackDatabase;
-import com.fastasyncworldedit.core.logging.RollbackOptimizedHistory;
-import com.fastasyncworldedit.core.object.change.MutableFullBlockChange;
+import com.fastasyncworldedit.core.history.RollbackOptimizedHistory;
+import com.fastasyncworldedit.core.history.change.MutableFullBlockChange;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;

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

@@ -1,9 +1,9 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.brush.mask.LayerBrushMask;
-import com.fastasyncworldedit.core.object.collection.BlockVectorSet;
-import com.fastasyncworldedit.core.object.mask.AdjacentAnyMask;
-import com.fastasyncworldedit.core.object.mask.RadiusMask;
+import com.fastasyncworldedit.core.function.mask.LayerBrushMask;
+import com.fastasyncworldedit.core.math.BlockVectorSet;
+import com.fastasyncworldedit.core.function.mask.AdjacentAnyMask;
+import com.fastasyncworldedit.core.function.mask.RadiusMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,5 +1,6 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
+import com.fastasyncworldedit.core.command.tool.ResettableTool;
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.util.MaskTraverser;
 import com.fastasyncworldedit.core.util.MathMan;

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

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 public class RaiseBrush extends ErodeBrush {
     public RaiseBrush() {

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.mask.RadiusMask;
-import com.fastasyncworldedit.core.object.visitor.DFSRecursiveVisitor;
+import com.fastasyncworldedit.core.function.mask.RadiusMask;
+import com.fastasyncworldedit.core.function.visitor.DFSRecursiveVisitor;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,6 +1,6 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.random.SimplexNoise;
+import com.fastasyncworldedit.core.math.random.SimplexNoise;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,10 +1,10 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.collection.BlockVectorSet;
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
-import com.fastasyncworldedit.core.object.mask.AdjacentAnyMask;
-import com.fastasyncworldedit.core.object.mask.RadiusMask;
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.math.BlockVectorSet;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.function.mask.AdjacentAnyMask;
+import com.fastasyncworldedit.core.function.mask.RadiusMask;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,6 +1,6 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
 import com.fastasyncworldedit.core.util.StringMan;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

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

@@ -1,6 +1,6 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.function.pattern.Pattern;

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.function.mask.Mask;
@@ -9,7 +9,7 @@ import com.sk89q.worldedit.function.mask.Masks;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.function.visitor.BreadthFirstSearch;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableBlockVector3;
+import com.fastasyncworldedit.core.math.MutableBlockVector3;
 
 import java.util.concurrent.ThreadLocalRandom;
 

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

@@ -1,8 +1,8 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.brush.mask.SplatterBrushMask;
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.function.mask.SplatterBrushMask;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.function.operation.Operations;

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

@@ -1,9 +1,10 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.FaweCache;
+import com.fastasyncworldedit.core.command.tool.ResettableTool;
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.mask.IdMask;
-import com.fastasyncworldedit.core.object.visitor.DFSRecursiveVisitor;
+import com.fastasyncworldedit.core.function.mask.IdMask;
+import com.fastasyncworldedit.core.function.visitor.DFSRecursiveVisitor;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.command.tool.brush.Brush;
@@ -13,7 +14,7 @@ import com.sk89q.worldedit.function.mask.MaskIntersection;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableVector3;
+import com.fastasyncworldedit.core.math.MutableVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.interpolation.Node;
 

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.brush.heightmap.HeightMap;
-import com.fastasyncworldedit.core.object.brush.mask.StencilBrushMask;
+import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
+import com.fastasyncworldedit.core.function.mask.StencilBrushMask;
 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/SurfaceSphereBrush.java

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
-import com.fastasyncworldedit.core.object.mask.RadiusMask;
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.function.mask.RadiusMask;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.command.tool.brush.Brush;

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

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush;
+package com.fastasyncworldedit.core.command.tool.brush;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
@@ -9,7 +9,7 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableBlockVector3;
+import com.fastasyncworldedit.core.math.MutableBlockVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.interpolation.KochanekBartelsInterpolation;
 import com.sk89q.worldedit.math.interpolation.Node;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/Scroll.java

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.clipboard.MultiClipboardHolder;
+import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.tool.BrushTool;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollClipboard.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.LocalSession;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollMask.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.command.tool.BrushTool;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollPattern.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.command.tool.BrushTool;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollRange.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.WorldEdit;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollSize.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.tool.BrushTool;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollTarget.java

@@ -1,6 +1,6 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
-import com.fastasyncworldedit.core.object.brush.TargetMode;
+import com.fastasyncworldedit.core.command.tool.TargetMode;
 import com.fastasyncworldedit.core.util.MathMan;
 import com.sk89q.worldedit.command.tool.BrushTool;
 import com.sk89q.worldedit.entity.Player;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollTargetOffset.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.scroll;
+package com.fastasyncworldedit.core.command.tool.scroll;
 
 import com.sk89q.worldedit.command.tool.BrushTool;
 import com.sk89q.worldedit.entity.Player;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollTool.java

@@ -0,0 +1,7 @@
+package com.fastasyncworldedit.core.command.tool.scroll;
+
+import com.sk89q.worldedit.entity.Player;
+
+public interface ScrollTool {
+    boolean increment(Player player, int amount);
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/sweep/ClipboardSpline.java

@@ -1,6 +1,6 @@
-package com.fastasyncworldedit.core.object.brush.sweep;
+package com.fastasyncworldedit.core.command.tool.sweep;
 
-import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
+import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
@@ -11,7 +11,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.interpolation.Interpolation;
 import com.sk89q.worldedit.math.transform.AffineTransform;
-import com.sk89q.worldedit.math.transform.RoundedTransform;
+import com.fastasyncworldedit.core.math.transform.RoundedTransform;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.session.ClipboardHolder;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/sweep/Spline.java

@@ -1,4 +1,4 @@
-package com.fastasyncworldedit.core.object.brush.sweep;
+package com.fastasyncworldedit.core.command.tool.sweep;
 
 import com.google.common.base.Preconditions;
 import com.sk89q.worldedit.EditSession;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/sweep/SweepBrush.java

@@ -1,7 +1,7 @@
-package com.fastasyncworldedit.core.object.brush.sweep;
+package com.fastasyncworldedit.core.command.tool.sweep;
 
+import com.fastasyncworldedit.core.command.tool.ResettableTool;
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.brush.ResettableTool;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.EmptyClipboardException;
 import com.sk89q.worldedit.LocalSession;

worldedit-core/src/main/java/com/fastasyncworldedit/core/database/DBHandler.java

@@ -13,7 +13,7 @@ public class DBHandler {
 
     public static final DBHandler IMP = new DBHandler();
 
-    private Map<World, RollbackDatabase> databases = new ConcurrentHashMap<>(8, 0.9f, 1);
+    private final Map<World, RollbackDatabase> databases = new ConcurrentHashMap<>(8, 0.9f, 1);
 
     public RollbackDatabase getDatabase(World world) {
         RollbackDatabase database = databases.get(world);

worldedit-core/src/main/java/com/fastasyncworldedit/core/database/RollbackDatabase.java

@@ -2,9 +2,9 @@ package com.fastasyncworldedit.core.database;
 
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.configuration.Settings;
-import com.fastasyncworldedit.core.logging.RollbackOptimizedHistory;
-import com.fastasyncworldedit.core.object.collection.YieldIterable;
-import com.fastasyncworldedit.core.object.task.AsyncNotifyQueue;
+import com.fastasyncworldedit.core.history.RollbackOptimizedHistory;
+import com.fastasyncworldedit.core.util.collection.YieldIterable;
+import com.fastasyncworldedit.core.util.task.AsyncNotifyQueue;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import com.sk89q.worldedit.math.BlockVector3;

worldedit-core/src/main/java/com/fastasyncworldedit/core/entity/LazyBaseEntity.java

@@ -1,8 +1,9 @@
-package com.sk89q.worldedit.entity;
+package com.fastasyncworldedit.core.entity;
 
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.util.TaskManager;
 import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.world.entity.EntityType;
 
 import java.util.function.Supplier;

worldedit-core/src/main/java/com/fastasyncworldedit/core/entity/MapMetadatable.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.entity;
+package com.fastasyncworldedit.core.entity;
 
 import org.jetbrains.annotations.NotNull;
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/entity/Metadatable.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.entity;
+package com.fastasyncworldedit.core.entity;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

worldedit-core/src/main/java/com/fastasyncworldedit/core/event/extent/ActorSaveClipboardEvent.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.event.extent;
+package com.fastasyncworldedit.core.event.extent;
 
 import com.sk89q.worldedit.event.Cancellable;
 import com.sk89q.worldedit.event.Event;

worldedit-core/src/main/java/com/fastasyncworldedit/core/event/extent/PasteEvent.java

@@ -1,23 +1,4 @@
-/*
- * WorldEdit, a Minecraft world manipulation toolkit
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldEdit team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldedit.event.extent;
+package com.fastasyncworldedit.core.event.extent;
 
 import com.sk89q.worldedit.event.Cancellable;
 import com.sk89q.worldedit.event.Event;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/RichParser.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.factory.parser;
+package com.fastasyncworldedit.core.extension.factory.parser;
 
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.google.common.base.Preconditions;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/AdjacentMaskParser.java

@@ -1,10 +1,10 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
-import com.fastasyncworldedit.core.object.mask.AdjacentAnyMask;
-import com.fastasyncworldedit.core.object.mask.AdjacentMask;
+import com.fastasyncworldedit.core.function.mask.AdjacentAnyMask;
+import com.fastasyncworldedit.core.function.mask.AdjacentMask;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/AngleMaskParser.java

@@ -1,10 +1,10 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.mask.AngleMask;
+import com.fastasyncworldedit.core.function.mask.AngleMask;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/DefaultMaskParser.java

@@ -1,24 +1,6 @@
 // TODO: Ping @MattBDev to reimplement 2020-02-04
-///*
-// * WorldEdit, a Minecraft world manipulation toolkit
-// * Copyright (C) sk89q <http://www.sk89q.com>
-// * Copyright (C) WorldEdit team and contributors
-// *
-// * This program is free software: you can redistribute it and/or modify it
-// * under the terms of the GNU Lesser General Public License as published by the
-// * Free Software Foundation, either version 3 of the License, or
-// * (at your option) any later version.
-// *
-// * This program is distributed in the hope that it will be useful, but WITHOUT
-// * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-// * for more details.
-// *
-// * You should have received a copy of the GNU Lesser General Public License
-// * along with this program. If not, see <http://www.gnu.org/licenses/>.
-// */
-//
-//package com.sk89q.worldedit.extension.factory.parser.mask;
+//*
+//package com.fastasyncworldedit.core.extension.factory.parser.mask;
 //
 //import com.boydti.fawe.command.FaweParser;
 //import com.boydti.fawe.command.SuggestInputParseException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/ExtremaMaskParser.java

@@ -1,10 +1,10 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.mask.ExtremaMask;
+import com.fastasyncworldedit.core.function.mask.ExtremaMask;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/FalseMaskParser.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.WorldEdit;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/LiquidMaskParser.java

@@ -1,6 +1,6 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
-import com.fastasyncworldedit.core.object.mask.LiquidMask;
+import com.fastasyncworldedit.core.function.mask.LiquidMask;
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.ParserContext;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/ROCAngleMaskParser.java

@@ -1,10 +1,10 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.mask.ROCAngleMask;
+import com.fastasyncworldedit.core.function.mask.ROCAngleMask;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RadiusMaskParser.java

@@ -1,9 +1,9 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
-import com.fastasyncworldedit.core.object.mask.RadiusMask;
+import com.fastasyncworldedit.core.function.mask.RadiusMask;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichOffsetMaskParser.java

@@ -1,8 +1,8 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/SimplexMaskParser.java

@@ -1,9 +1,9 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
-import com.fastasyncworldedit.core.object.mask.SimplexMask;
+import com.fastasyncworldedit.core.function.mask.SimplexMask;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/SurfaceMaskParser.java

@@ -1,6 +1,6 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
-import com.fastasyncworldedit.core.object.mask.SurfaceMask;
+import com.fastasyncworldedit.core.function.mask.SurfaceMask;
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.InputParseException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/TrueMaskParser.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.WorldEdit;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/WallMaskParser.java

@@ -1,6 +1,6 @@
-package com.sk89q.worldedit.extension.factory.parser.mask;
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
 
-import com.fastasyncworldedit.core.object.mask.WallMask;
+import com.fastasyncworldedit.core.function.mask.WallMask;
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.InputParseException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/XAxisMaskParser.java

@@ -0,0 +1,29 @@
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
+
+import com.fastasyncworldedit.core.function.mask.XAxisMask;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.internal.registry.SimpleInputParser;
+
+import java.util.List;
+
+public class XAxisMaskParser extends SimpleInputParser<Mask> {
+
+    private final List<String> aliases = ImmutableList.of("#xaxis");
+
+    public XAxisMaskParser(WorldEdit worldEdit) {
+        super(worldEdit);
+    }
+
+    @Override
+    public List<String> getMatchedAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Mask parseFromSimpleInput(String input, ParserContext context) {
+        return new XAxisMask(context.getExtent());
+    }
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/YAxisMaskParser.java

@@ -0,0 +1,29 @@
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
+
+import com.fastasyncworldedit.core.function.mask.YAxisMask;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.internal.registry.SimpleInputParser;
+
+import java.util.List;
+
+public class YAxisMaskParser extends SimpleInputParser<Mask> {
+
+    private final List<String> aliases = ImmutableList.of("#yaxis");
+
+    public YAxisMaskParser(WorldEdit worldEdit) {
+        super(worldEdit);
+    }
+
+    @Override
+    public List<String> getMatchedAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Mask parseFromSimpleInput(String input, ParserContext context) {
+        return new YAxisMask(context.getExtent());
+    }
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/ZAxisMaskParser.java

@@ -0,0 +1,29 @@
+package com.fastasyncworldedit.core.extension.factory.parser.mask;
+
+import com.fastasyncworldedit.core.function.mask.ZAxisMask;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.internal.registry.SimpleInputParser;
+
+import java.util.List;
+
+public class ZAxisMaskParser extends SimpleInputParser<Mask> {
+
+    private final List<String> aliases = ImmutableList.of("#zaxis");
+
+    public ZAxisMaskParser(WorldEdit worldEdit) {
+        super(worldEdit);
+    }
+
+    @Override
+    public List<String> getMatchedAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Mask parseFromSimpleInput(String input, ParserContext context) {
+        return new ZAxisMask();
+    }
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/BiomePatternParser.java

@@ -1,9 +1,9 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.pattern.BiomeApplyingPattern;
+import com.fastasyncworldedit.core.function.pattern.BiomeApplyingPattern;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.NoMatchException;
 import com.sk89q.worldedit.extension.input.ParserContext;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/BufferedPatternParser.java

@@ -1,9 +1,9 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.pattern.BufferedPattern;
+import com.fastasyncworldedit.core.function.pattern.BufferedPattern;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/DefaultPatternParser.java

@@ -1,24 +1,6 @@
 // TODO: Ping @MattBDev to reimplement (or remove because this class is stupid) 2020-02-04
 ///*
-// * WorldEdit, a Minecraft world manipulation toolkit
-// * Copyright (C) sk89q <http://www.sk89q.com>
-// * Copyright (C) WorldEdit team and contributors
-// *
-// * This program is free software: you can redistribute it and/or modify it
-// * under the terms of the GNU Lesser General Public License as published by the
-// * Free Software Foundation, either version 3 of the License, or
-// * (at your option) any later version.
-// *
-// * This program is distributed in the hope that it will be useful, but WITHOUT
-// * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-// * for more details.
-// *
-// * You should have received a copy of the GNU Lesser General Public License
-// * along with this program. If not, see <http://www.gnu.org/licenses/>.
-// */
-//
-//package com.sk89q.worldedit.extension.factory.parser.pattern;
+//package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 //
 //import com.boydti.fawe.command.FaweParser;
 //import com.boydti.fawe.command.SuggestInputParseException;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/ExistingPatternParser.java

@@ -1,6 +1,6 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
-import com.fastasyncworldedit.core.object.pattern.ExistingPattern;
+import com.fastasyncworldedit.core.function.pattern.ExistingPattern;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/Linear2DPatternParser.java

@@ -1,11 +1,11 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.pattern.Linear2DBlockPattern;
+import com.fastasyncworldedit.core.function.pattern.Linear2DBlockPattern;
 import com.google.common.base.Preconditions;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/Linear3DPatternParser.java

@@ -1,11 +1,11 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.pattern.Linear3DBlockPattern;
+import com.fastasyncworldedit.core.function.pattern.Linear3DBlockPattern;
 import com.google.common.base.Preconditions;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/NoisePatternParser.java

@@ -1,10 +1,10 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.object.random.NoiseRandom;
+import com.fastasyncworldedit.core.math.random.NoiseRandom;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.extension.factory.parser.RichParser;
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/PerlinPatternParser.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.math.noise.PerlinNoise;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RandomPatternParser.java

@@ -1,23 +1,4 @@
-/*
- * WorldEdit, a Minecraft world manipulation toolkit
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldEdit team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.sk89q.util.StringUtil;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RidgedMultiFractalPatternParser.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.math.noise.RidgedMultiFractalNoise;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/SimplexPatternParser.java

@@ -1,7 +1,7 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.math.noise.SimplexNoiseGenerator;
+import com.fastasyncworldedit.core.math.random.SimplexNoiseGenerator;
 
 public class SimplexPatternParser extends NoisePatternParser {
     private static final String SIMPLEX_NAME = "simplex";

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/VoronoiPatternParser.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.factory.parser.pattern;
+package com.fastasyncworldedit.core.extension.factory.parser.pattern;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.math.noise.VoronoiNoise;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/Binding.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.platform.binding;
+package com.fastasyncworldedit.core.extension.platform.binding;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/Bindings.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.platform.binding;
+package com.fastasyncworldedit.core.extension.platform.binding;
 
 import com.fastasyncworldedit.core.util.StringMan;
 import com.sk89q.worldedit.WorldEdit;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/CommandBindings.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.platform.binding;
+package com.fastasyncworldedit.core.extension.platform.binding;
 
 import com.sk89q.worldedit.WorldEdit;
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ConsumeBindings.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.platform.binding;
+package com.fastasyncworldedit.core.extension.platform.binding;
 
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.configuration.Caption;
@@ -14,7 +14,7 @@ import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.internal.annotation.Selection;
-import com.sk89q.worldedit.internal.annotation.Time;
+import com.sk89q.worldedit.command.util.annotation.Time;
 import com.sk89q.worldedit.internal.expression.Expression;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/PrimitiveBindings.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.platform.binding;
+package com.fastasyncworldedit.core.extension.platform.binding;
 
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.sk89q.worldedit.WorldEdit;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ProvideBindings.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.extension.platform.binding;
+package com.fastasyncworldedit.core.extension.platform.binding;
 
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.fastasyncworldedit.core.database.DBHandler;
@@ -14,7 +14,7 @@ import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.internal.annotation.AllowedRegion;
+import com.sk89q.worldedit.command.util.annotation.AllowedRegion;
 import com.sk89q.worldedit.internal.annotation.Selection;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.session.request.Request;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java

@@ -1,10 +1,10 @@
-package com.fastasyncworldedit.core.object.extent;
+package com.fastasyncworldedit.core.extent;
 
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableBlockVector3;
+import com.fastasyncworldedit.core.math.MutableBlockVector3;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ExtentHeightCacher.java

@@ -1,7 +1,6 @@
-package com.fastasyncworldedit.core.object.extent;
+package com.fastasyncworldedit.core.extent;
 
 import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.extent.PassthroughExtent;
 
 import java.util.Arrays;