refactor: apply final/abstract to various fawe extent classes

IntellectualSites · Mar 15, 2024 · acda71b · acda71b
1 parent 0264ba3
commit acda71b
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 21 deletions.
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java
@@ -9,7 +9,7 @@
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
-public class BlockTranslateExtent extends AbstractDelegateExtent {
+public final class BlockTranslateExtent extends AbstractDelegateExtent {
 
     private final int dx;
     private final int dy;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/DisallowedBlocksExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/DisallowedBlocksExtent.java
@@ -29,7 +29,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class DisallowedBlocksExtent extends AbstractDelegateExtent implements IBatchProcessor {
+public final class DisallowedBlocksExtent extends AbstractDelegateExtent implements IBatchProcessor {
 
     private static final BlockState RESERVED = BlockTypes.__RESERVED__.getDefaultState();
     private final Set<PropertyRemap<?>> remaps;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ExtentHeightCacher.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ExtentHeightCacher.java
@@ -4,7 +4,7 @@
 
 import java.util.Arrays;
 
-public class ExtentHeightCacher extends PassthroughExtent {
+public final class ExtentHeightCacher extends PassthroughExtent {
 
     private transient int cacheBotX = Integer.MIN_VALUE;
     private transient int cacheBotZ = Integer.MIN_VALUE;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/HeightBoundExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/HeightBoundExtent.java
@@ -12,7 +12,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-public class HeightBoundExtent extends FaweRegionExtent {
+public final class HeightBoundExtent extends FaweRegionExtent {
 
     private final int min;
     private final int max;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/HistoryExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/HistoryExtent.java
@@ -25,7 +25,7 @@
 /**
  * Stores changes to a {@link ChangeSet}.
  */
-public class HistoryExtent extends AbstractDelegateExtent {
+public final class HistoryExtent extends AbstractDelegateExtent {
 
     private final MutableBlockVector3 mutable = new MutableBlockVector3();
     private AbstractChangeSet changeSet;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/LimitExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/LimitExtent.java
@@ -37,7 +37,7 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-public class LimitExtent extends AbstractDelegateExtent {
+public final class LimitExtent extends AbstractDelegateExtent {
 
     private final FaweLimit limit;
     private final boolean[] faweExceptionReasonsUsed = new boolean[FaweException.Type.values().length];

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/MemoryCheckingExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/MemoryCheckingExtent.java
@@ -8,7 +8,7 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.Extent;
 
-public class MemoryCheckingExtent extends PassthroughExtent {
+public final class MemoryCheckingExtent extends PassthroughExtent {
 
     private final Actor actor;
 

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/MultiRegionExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/MultiRegionExtent.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.concurrent.Future;
 
-public class MultiRegionExtent extends FaweRegionExtent {
+public final class MultiRegionExtent extends FaweRegionExtent {
 
     @Nullable
     private final RegionIntersection intersection;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/NullExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/NullExtent.java
@@ -40,7 +40,7 @@
 import java.util.concurrent.Future;
 
 //todo This should be removed in favor of com.sk89q.worldedit.extent.NullExtent
-public class NullExtent extends FaweRegionExtent implements IBatchProcessor {
+public final class NullExtent extends FaweRegionExtent implements IBatchProcessor {
 
     private final FaweException reason;
 

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/PassthroughExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/PassthroughExtent.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Set;
 
-public class PassthroughExtent extends AbstractDelegateExtent {
+public abstract class PassthroughExtent extends AbstractDelegateExtent {
 
     /**
      * Create a new instance.

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/PositionTransformExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/PositionTransformExtent.java
@@ -11,7 +11,7 @@
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
-public class PositionTransformExtent extends ResettableExtent {
+public final class PositionTransformExtent extends ResettableExtent {
 
     private transient MutableBlockVector3 mutable = new MutableBlockVector3();
     private transient BlockVector3 min;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ProcessedWEExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ProcessedWEExtent.java
@@ -18,7 +18,7 @@
 
 import java.util.UUID;
 
-public class ProcessedWEExtent extends AbstractDelegateExtent {
+public final class ProcessedWEExtent extends AbstractDelegateExtent {
 
     private final FaweLimit limit;
     private final Extent extent;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ResettableExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ResettableExtent.java
@@ -14,7 +14,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public class ResettableExtent extends AbstractDelegateExtent implements Serializable {
+public abstract class ResettableExtent extends AbstractDelegateExtent implements Serializable {
 
     public ResettableExtent(Extent parent) {
         super(parent);

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SingleRegionExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SingleRegionExtent.java
@@ -11,7 +11,7 @@
 import java.util.Collections;
 import java.util.concurrent.Future;
 
-public class SingleRegionExtent extends FaweRegionExtent {
+public final class SingleRegionExtent extends FaweRegionExtent {
 
     private final Region region;
 

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SlowExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SlowExtent.java
@@ -6,7 +6,7 @@
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
-public class SlowExtent extends AbstractDelegateExtent {
+public final class SlowExtent extends AbstractDelegateExtent {
 
     private final long THRESHOLD = 50 * 1000000; // 1 tick
     private final long nanos;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SourceMaskExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SourceMaskExtent.java
@@ -9,7 +9,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public class SourceMaskExtent extends TemporalExtent {
+public final class SourceMaskExtent extends TemporalExtent {
 
     private Mask mask;
     private final MutableBlockVector3 mutable = new MutableBlockVector3();

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/StripNBTExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/StripNBTExtent.java
@@ -34,7 +34,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-public class StripNBTExtent extends AbstractDelegateExtent implements IBatchProcessor {
+public final class StripNBTExtent extends AbstractDelegateExtent implements IBatchProcessor {
 
     private final Set<String> strip;
 

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SupplyingExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SupplyingExtent.java
@@ -7,7 +7,7 @@
 /**
  * An extent that delegates actions to another extent that may change at any time.
  */
-public class SupplyingExtent extends PassthroughExtent {
+public final class SupplyingExtent extends PassthroughExtent {
 
     private final Supplier<Extent> extentSupplier;
 

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TemporalExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TemporalExtent.java
@@ -8,7 +8,7 @@
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
-public class TemporalExtent extends PassthroughExtent {
+public abstract class TemporalExtent extends PassthroughExtent {
 
     private int x;
     private int y;

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TransformExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TransformExtent.java
@@ -12,6 +12,12 @@
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
+/**
+ * Unused internal, will be removed
+ *
+ * @deprecated Will be removed - unused internally
+ */
+@Deprecated(forRemoval = true, since = "TODO")
 public class TransformExtent extends BlockTransformExtent {
 
     private final MutableVector3 mutable1 = new MutableVector3();

diff --git a/...e/src/main/java/com/fastasyncworldedit/core/queue/implementation/ParallelQueueExtent.java b/...e/src/main/java/com/fastasyncworldedit/core/queue/implementation/ParallelQueueExtent.java
@@ -43,7 +43,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.stream.IntStream;
 
-public class ParallelQueueExtent extends PassthroughExtent {
+public final class ParallelQueueExtent extends PassthroughExtent {
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final ThreadLocal<Extent> extents = new ThreadLocal<>();

diff --git a/...c/main/java/com/fastasyncworldedit/core/queue/implementation/SingleThreadQueueExtent.java b/...c/main/java/com/fastasyncworldedit/core/queue/implementation/SingleThreadQueueExtent.java
@@ -43,7 +43,7 @@
  * This queue is reusable {@link #init(Extent, IChunkCache, IChunkCache)}
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
-public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implements IQueueExtent<IQueueChunk> {
+public final class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implements IQueueExtent<IQueueChunk> {
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
 

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
@@ -81,6 +81,7 @@
  * Transforms blocks themselves (but not their position) according to a
  * given transform.
  */
+//TODO - Make final upon removal of TransformExtent
 public class BlockTransformExtent extends ResettableExtent {
 
     //FAWE start