refactor! Remove deprecations marked for removal that are not present in upstream (#1483)

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/GriefDefenderFeature.java

@@ -32,7 +32,7 @@ public class GriefDefenderFeature extends BukkitMaskManager implements Listener
     }
 
     @Override
-    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, MaskType type) {
+    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, MaskType type, boolean isWhitelist) {
         final Player player = BukkitAdapter.adapt(wePlayer);
         final Location loc = player.getLocation();
         final Vector3i vector = Vector3i.from(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/GriefPreventionFeature.java

@@ -30,7 +30,7 @@ public class GriefPreventionFeature extends BukkitMaskManager implements Listene
     }
 
     @Override
-    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, MaskType type) {
+    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, MaskType type, boolean isWhitelist) {
         final Player player = BukkitAdapter.adapt(wePlayer);
         final Claim claim = GriefPrevention.instance.dataStore.getClaimAt(player.getLocation(), true, null);
         if (claim != null) {

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/ResidenceFeature.java

@@ -39,7 +39,7 @@ public class ResidenceFeature extends BukkitMaskManager implements Listener {
     }
 
     @Override
-    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, final MaskType type) {
+    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, final MaskType type, boolean isWhitelist) {
         final Player player = BukkitAdapter.adapt(wePlayer);
         final Location location = player.getLocation();
         ClaimedResidence residence = Residence.getInstance().getResidenceManager().getByLoc(location);

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/TownyFeature.java

@@ -66,7 +66,7 @@ public class TownyFeature extends BukkitMaskManager implements Listener {
     }
 
     @Override
-    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, MaskType type) {
+    public FaweMask getMask(final com.sk89q.worldedit.entity.Player wePlayer, MaskType type, boolean isWhitelist) {
         final Player player = BukkitAdapter.adapt(wePlayer);
         final Location location = player.getLocation();
         try {

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/PlotSquaredFeature.java

@@ -127,7 +127,7 @@ public class PlotSquaredFeature extends FaweMaskManager {
     }
 
     @Override
-    public FaweMask getMask(Player player, MaskType type) {
+    public FaweMask getMask(Player player, MaskType type, boolean isWhitelist) {
         final PlotPlayer<org.bukkit.entity.Player> pp = PlotPlayer.from(BukkitAdapter.adapt(player));
         if (pp == null) {
             return null;

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java

@@ -172,6 +172,9 @@ public class BukkitImplLoader {
                 if (className.equals(customCandidate)) {
                     LOGGER.warn("Failed to load the Bukkit adapter class '" + className + "'", e);
                 }
+                if (className.contains("Adapter") && className.contains("18")) {
+                    e.printStackTrace();
+                }
             }
         }
 

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

@@ -11,7 +11,6 @@ import com.fastasyncworldedit.core.queue.IQueueExtent;
 import com.fastasyncworldedit.core.queue.implementation.ParallelQueueExtent;
 import com.fastasyncworldedit.core.regions.FaweMaskManager;
 import com.fastasyncworldedit.core.regions.RegionWrapper;
-import com.fastasyncworldedit.core.util.EditSessionBuilder;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.fastasyncworldedit.core.util.MemUtil;
 import com.fastasyncworldedit.core.util.TaskManager;
@@ -60,17 +59,6 @@ public class FaweAPI {
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
 
-    /**
-     * Offers a lot of options for building an EditSession.
-     *
-     * @return A new EditSessionBuilder
-     * @deprecated See {@link WorldEdit#newEditSessionBuilder()}
-     */
-    @Deprecated(forRemoval = true)
-    public static EditSessionBuilder getEditSessionBuilder(World world) {
-        return new EditSessionBuilder(world);
-    }
-
     /**
      * The TaskManager has some useful methods for doing things asynchronously.
      *

worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMaskManager.java

@@ -23,38 +23,10 @@ public abstract class FaweMaskManager {
         return this.key;
     }
 
-    /**
-     * Get a {@link FaweMask} for the given player and {@link MaskType}
-     *
-     * @deprecated Use {@link #getMask(Player, MaskType, boolean)}
-     */
-    @Deprecated(forRemoval = true)
-    public FaweMask getMask(final Player player, MaskType type) {
-        return getMask(player, type, true);
-    }
-
     /**
      * Get a {@link FaweMask} for the given player and {@link MaskType}. If isWhitelist is false, will return a "blacklist" mask.
      */
-    public FaweMask getMask(final Player player, MaskType type, boolean isWhitelist) {
+    public abstract FaweMask getMask(final Player player, MaskType type, boolean isWhitelist);
-        return getMask(player, type);
-    }
-
-    /**
-     * @deprecated Not used internally
-     */
-    @Deprecated(forRemoval = true)
-    public boolean isValid(FaweMask mask) {
-        return true;
-    }
-
-    /**
-     * @deprecated Not used internally
-     */
-    @Deprecated(forRemoval = true)
-    public RegionFilter getFilter(String world) {
-        return null;
-    }
 
     public boolean isExclusive() {
         return Settings.IMP.REGION_RESTRICTIONS_OPTIONS.EXCLUSIVE_MANAGERS.contains(this.key);

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/EditSessionBuilder.java

@@ -1,498 +0,0 @@
-package com.fastasyncworldedit.core.util;
-
-import com.fastasyncworldedit.core.Fawe;
-import com.fastasyncworldedit.core.FaweCache;
-import com.fastasyncworldedit.core.configuration.Caption;
-import com.fastasyncworldedit.core.configuration.Settings;
-import com.fastasyncworldedit.core.extent.FaweRegionExtent;
-import com.fastasyncworldedit.core.extent.HistoryExtent;
-import com.fastasyncworldedit.core.extent.LimitExtent;
-import com.fastasyncworldedit.core.extent.MultiRegionExtent;
-import com.fastasyncworldedit.core.extent.NullExtent;
-import com.fastasyncworldedit.core.extent.SingleRegionExtent;
-import com.fastasyncworldedit.core.extent.SlowExtent;
-import com.fastasyncworldedit.core.extent.StripNBTExtent;
-import com.fastasyncworldedit.core.extent.processor.heightmap.HeightmapProcessor;
-import com.fastasyncworldedit.core.extent.processor.lighting.NullRelighter;
-import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
-import com.fastasyncworldedit.core.extent.processor.lighting.RelightProcessor;
-import com.fastasyncworldedit.core.extent.processor.lighting.Relighter;
-import com.fastasyncworldedit.core.history.DiskStorageHistory;
-import com.fastasyncworldedit.core.history.MemoryOptimizedHistory;
-import com.fastasyncworldedit.core.history.RollbackOptimizedHistory;
-import com.fastasyncworldedit.core.history.changeset.AbstractChangeSet;
-import com.fastasyncworldedit.core.history.changeset.BlockBagChangeSet;
-import com.fastasyncworldedit.core.history.changeset.NullChangeSet;
-import com.fastasyncworldedit.core.limit.FaweLimit;
-import com.fastasyncworldedit.core.queue.IQueueChunk;
-import com.fastasyncworldedit.core.queue.IQueueExtent;
-import com.fastasyncworldedit.core.queue.implementation.ParallelQueueExtent;
-import com.fastasyncworldedit.core.regions.RegionWrapper;
-import com.fastasyncworldedit.core.wrappers.WorldWrapper;
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.entity.Player;
-import com.sk89q.worldedit.event.extent.EditSessionEvent;
-import com.sk89q.worldedit.extension.platform.Capability;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.extent.inventory.BlockBag;
-import com.sk89q.worldedit.internal.util.LogManagerCompat;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.util.Identifiable;
-import com.sk89q.worldedit.util.eventbus.EventBus;
-import com.sk89q.worldedit.util.formatting.text.TextComponent;
-import com.sk89q.worldedit.world.World;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
-
-import javax.annotation.Nonnull;
-import java.util.Locale;
-import java.util.UUID;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * @deprecated Being replaced by {@link com.sk89q.worldedit.EditSessionBuilder}. See https://worldedit.enginehub.org/en/latest/api/concepts/edit-sessions/
- */
-@Deprecated(forRemoval = true)
-public class EditSessionBuilder {
-
-    private static final Logger LOGGER = LogManagerCompat.getLogger();
-
-    @Nonnull
-    private World world;
-    private Player player;
-    private FaweLimit limit;
-    private AbstractChangeSet changeSet;
-    private Region[] allowedRegions;
-    private Boolean fastmode;
-    private Boolean checkMemory;
-    private Boolean combineStages;
-    @Nonnull
-    private EventBus eventBus = WorldEdit.getInstance().getEventBus();
-    private BlockBag blockBag;
-    private EditSessionEvent event;
-    private String command;
-    private RelightMode relightMode;
-    private Relighter relighter;
-    private Boolean wnaMode;
-    private AbstractChangeSet changeTask;
-    private Extent bypassHistory;
-    private Extent bypassAll;
-    private Extent extent;
-    private boolean compiled;
-    private boolean wrapped;
-
-    /**
-     * An EditSession builder<br>
-     * - Unset values will revert to their default<br>
-     * <br>
-     * player: The player doing the edit (defaults to to null)<br>
-     * limit: Block/Entity/Action limit (defaults to unlimited)<br>
-     * changeSet: Stores changes (defaults to config.yml value)<br>
-     * allowedRegions: Allowed editable regions (defaults to player's allowed regions, or everywhere)<br>
-     * fastmode: bypasses history (defaults to player fastmode or config.yml console history)<br>
-     * checkMemory: If low memory checks are enabled (defaults to player's fastmode or true)<br>
-     * combineStages: If history is combined with dispatching
-     *
-     * @param world A world must be provided for all EditSession(s)
-     */
-    public EditSessionBuilder(World world) {
-        checkNotNull(world);
-        this.world = world;
-    }
-
-    public EditSessionBuilder player(@Nullable Player player) {
-        this.player = player;
-        return setDirty();
-    }
-
-    public EditSessionBuilder limit(@Nullable FaweLimit limit) {
-        this.limit = limit;
-        return setDirty();
-    }
-
-    public EditSessionBuilder limitUnlimited() {
-        return limit(FaweLimit.MAX.copy());
-    }
-
-    public EditSessionBuilder limitUnprocessed(@Nonnull Player player) {
-        checkNotNull(player);
-        limitUnlimited();
-        FaweLimit tmp = player.getLimit();
-        limit.INVENTORY_MODE = tmp.INVENTORY_MODE;
-        return setDirty();
-    }
-
-    public EditSessionBuilder changeSet(@Nullable AbstractChangeSet changeSet) {
-        this.changeSet = changeSet;
-        return setDirty();
-    }
-
-    public EditSessionBuilder changeSetNull() {
-        return changeSet(new NullChangeSet(world));
-    }
-
-    public EditSessionBuilder world(@Nonnull World world) {
-        checkNotNull(world);
-        this.world = world;
-        return setDirty();
-    }
-
-    public EditSessionBuilder command(String command) {
-        this.command = command;
-        return this;
-    }
-
-    public EditSessionBuilder changeSet(boolean disk, @Nullable UUID uuid, int compression) {
-        if (disk) {
-            if (Settings.IMP.HISTORY.USE_DATABASE) {
-                this.changeSet = new RollbackOptimizedHistory(world, uuid);
-            } else {
-                this.changeSet = new DiskStorageHistory(world, uuid);
-            }
-        } else {
-            this.changeSet = new MemoryOptimizedHistory(world);
-        }
-        return setDirty();
-    }
-
-    public EditSessionBuilder allowedRegions(@Nullable Region[] allowedRegions) {
-        this.allowedRegions = allowedRegions;
-        return setDirty();
-    }
-
-    @Deprecated
-    public EditSessionBuilder allowedRegions(@Nullable RegionWrapper[] allowedRegions) {
-        this.allowedRegions = allowedRegions;
-        return setDirty();
-    }
-
-    public EditSessionBuilder allowedRegions(@Nullable RegionWrapper allowedRegion) {
-        this.allowedRegions = allowedRegion == null ? null : allowedRegion.toArray();
-        return setDirty();
-    }
-
-    public EditSessionBuilder allowedRegionsEverywhere() {
-        return allowedRegions(new Region[]{RegionWrapper.GLOBAL()});
-    }
-
-    @Deprecated
-    public EditSessionBuilder autoQueue(@Nullable Boolean autoQueue) {
-        return this;
-    }
-
-    public EditSessionBuilder fastmode(@Nullable Boolean fastmode) {
-        this.fastmode = fastmode;
-        return setDirty();
-    }
-
-    public EditSessionBuilder relightMode(@Nullable RelightMode relightMode) {
-        this.relightMode = relightMode;
-        return setDirty();
-    }
-
-    public EditSessionBuilder checkMemory(@Nullable Boolean checkMemory) {
-        this.checkMemory = checkMemory;
-        return setDirty();
-    }
-
-    public EditSessionBuilder combineStages(@Nullable Boolean combineStages) {
-        this.combineStages = combineStages;
-        return setDirty();
-    }
-
-    public EditSessionBuilder blockBag(@Nullable BlockBag blockBag) {
-        this.blockBag = blockBag;
-        return setDirty();
-    }
-
-    public EditSessionBuilder eventBus(@Nonnull EventBus eventBus) {
-        this.eventBus = eventBus;
-        return setDirty();
-    }
-
-    public EditSessionBuilder event(@Nullable EditSessionEvent event) {
-        this.event = event;
-        return setDirty();
-    }
-
-    public EditSessionBuilder forceWNA() {
-        this.wnaMode = true;
-        return setDirty();
-    }
-
-    private EditSessionBuilder setDirty() {
-        compiled = false;
-        return this;
-    }
-
-    private Extent wrapExtent(
-            final Extent extent,
-            final EventBus eventBus,
-            EditSessionEvent event,
-            final EditSession.Stage stage
-    ) {
-        event = event.clone(stage);
-        event.setExtent(extent);
-        eventBus.post(event);
-        if (event.isCancelled()) {
-            return new NullExtent(extent, FaweCache.MANUAL);
-        }
-        final Extent toReturn = event.getExtent();
-        if (toReturn instanceof com.sk89q.worldedit.extent.NullExtent) {
-            return new NullExtent(toReturn, FaweCache.MANUAL);
-        }
-        if (toReturn != extent) {
-            String className = toReturn.getClass().getName().toLowerCase(Locale.ROOT);
-            for (String allowed : Settings.IMP.EXTENT.ALLOWED_PLUGINS) {
-                if (className.contains(allowed.toLowerCase(Locale.ROOT))) {
-                    this.wrapped = true;
-                    return toReturn;
-                }
-            }
-            if (Settings.IMP.EXTENT.DEBUG) {
-                if (event.getActor() != null) {
-                    event.getActor().printDebug(TextComponent.of("Potentially unsafe extent blocked: " + toReturn
-                            .getClass()
-                            .getName()));
-                    event.getActor().print(TextComponent.of(
-                            "- For area restrictions and block logging, it is recommended that third party plugins use the FAWE" +
-                                    " API"));
-                    event.getActor().print(TextComponent.of("- Add the following line to the `allowed-plugins` list in the " +
-                            "FAWE config.yml to let FAWE recognize the extent:"));
-                    event.getActor().print(toReturn.getClass().getName());
-                } else {
-                    LOGGER.warn("Potentially unsafe extent blocked: " + toReturn.getClass().getName());
-                    LOGGER.warn(
-                            " - For area restrictions and block logging, it is recommended that third party plugins use the FAWE API");
-                    LOGGER.warn(
-                            " - Add the following classpath to the `allowed-plugins` list in the FAWE config.yml to let FAWE " +
-                                    "recognize the extent:");
-                    LOGGER.warn(toReturn.getClass().getName());
-                }
-            }
-        }
-        return extent;
-    }
-
-    public EditSessionBuilder compile() {
-        if (compiled) {
-            return this;
-        }
-
-        compiled = true;
-        wrapped = false;
-        if (event == null) {
-            event = new EditSessionEvent(world, player, -1, null);
-        }
-        if (player == null && event.getActor() != null) {
-            player = (Player) event.getActor();
-        }
-        if (limit == null) {
-            if (player == null) {
-                limit = FaweLimit.MAX;
-            } else {
-                limit = player.getLimit();
-            }
-        }
-        if (fastmode == null) {
-            if (player == null) {
-                fastmode = !Settings.IMP.HISTORY.ENABLE_FOR_CONSOLE;
-            } else {
-                fastmode = player.getSession().hasFastMode();
-            }
-        }
-        if (checkMemory == null) {
-            checkMemory = player != null && !this.fastmode;
-        }
-        if (checkMemory) {
-            if (MemUtil.isMemoryLimitedSlow()) {
-                if (Permission.hasPermission(player, "worldedit.fast")) {
-                    player.print(Caption.of("fawe.info.worldedit.oom.admin"));
-                }
-                throw FaweCache.LOW_MEMORY;
-            }
-        }
-//        this.originalLimit = limit;
-        this.blockBag = limit.INVENTORY_MODE != 0 ? blockBag : null;
-        this.limit = limit.copy();
-
-        if (extent == null) {
-            IQueueExtent<IQueueChunk> queue = null;
-            World unwrapped = WorldWrapper.unwrap(world);
-            boolean placeChunks = (this.fastmode || this.limit.FAST_PLACEMENT) && (wnaMode == null || !wnaMode);
-
-            if (placeChunks) {
-                wnaMode = false;
-                if (unwrapped instanceof IQueueExtent) {
-                    extent = queue = (IQueueExtent) unwrapped;
-                } else if (Settings.IMP.QUEUE.PARALLEL_THREADS > 1 && !Fawe.isMainThread()) {
-                    ParallelQueueExtent parallel = new ParallelQueueExtent(Fawe.get().getQueueHandler(), world, fastmode);
-                    queue = parallel.getExtent();
-                    extent = parallel;
-                } else {
-                    extent = queue = Fawe.get().getQueueHandler().getQueue(world);
-                }
-            } else {
-                wnaMode = true;
-                extent = world;
-            }
-            if (combineStages == null) {
-                combineStages =
-                        // If it's enabled in the settings
-                        Settings.IMP.HISTORY.COMBINE_STAGES
-                                // If fast placement is disabled, it's slower to perform a copy on each chunk
-                                && this.limit.FAST_PLACEMENT
-                                // If the edit uses items from the inventory we can't use a delayed task
-                                && this.blockBag == null;
-            }
-            extent = this.bypassAll = wrapExtent(extent, eventBus, event, EditSession.Stage.BEFORE_CHANGE);
-            this.bypassHistory = this.extent = wrapExtent(bypassAll, eventBus, event, EditSession.Stage.BEFORE_REORDER);
-            if (!this.fastmode || changeSet != null) {
-                if (changeSet == null) {
-                    if (Settings.IMP.HISTORY.USE_DISK) {
-                        UUID uuid = player == null ? Identifiable.CONSOLE : player.getUniqueId();
-                        if (Settings.IMP.HISTORY.USE_DATABASE) {
-                            changeSet = new RollbackOptimizedHistory(world, uuid);
-                        } else {
-                            changeSet = new DiskStorageHistory(world, uuid);
-                        }
-//                    } else if (combineStages && Settings.IMP.HISTORY.COMPRESSION_LEVEL == 0) {
-//                        changeSet = new CPUOptimizedChangeSet(world);
-                    } else {
-                        if (combineStages && Settings.IMP.HISTORY.COMPRESSION_LEVEL == 0) {
-                            //TODO add CPUOptimizedChangeSet
-                        }
-                        changeSet = new MemoryOptimizedHistory(world);
-                    }
-                }
-                if (this.limit.SPEED_REDUCTION > 0) {
-                    this.extent = this.bypassHistory = new SlowExtent(this.bypassHistory, this.limit.SPEED_REDUCTION);
-                }
-                if (command != null && changeSet instanceof RollbackOptimizedHistory) {
-                    ((RollbackOptimizedHistory) changeSet).setCommand(this.command);
-                }
-                if (!(changeSet instanceof NullChangeSet)) {
-                    if (this.blockBag != null) {
-                        //TODO implement block bag as IBatchProcessor
-                        changeSet = new BlockBagChangeSet(changeSet, blockBag, limit.INVENTORY_MODE == 1);
-                    }
-                    if (combineStages) {
-                        changeTask = changeSet;
-                        this.extent = extent.enableHistory(changeSet);
-                    } else {
-                        this.extent = new HistoryExtent(extent, changeSet);
-//                        if (this.blockBag != null) {
-//                            this.extent = new BlockBagExtent(this.extent, blockBag, limit.INVENTORY_MODE == 1);
-//                        }
-                    }
-                }
-            }
-            if (allowedRegions == null) {
-                if (player != null && !player.hasPermission("fawe.bypass") && !player.hasPermission("fawe.bypass.regions")) {
-                    allowedRegions = player.getAllowedRegions();
-                }
-            }
-            FaweRegionExtent regionExtent = null;
-            if (allowedRegions != null) {
-                if (allowedRegions.length == 0) {
-                    regionExtent = new NullExtent(this.extent, FaweCache.NO_REGION);
-                } else {
-                    if (allowedRegions.length == 1) {
-                        regionExtent = new SingleRegionExtent(this.extent, this.limit, allowedRegions[0]);
-                    } else {
-                        regionExtent = new MultiRegionExtent(this.extent, this.limit, allowedRegions, null);
-                    }
-                }
-            } else {
-                allowedRegions = new Region[]{RegionWrapper.GLOBAL()};
-            }
-            // There's no need to do lighting (and it'll also just be a pain to implement) if we're not placing chunks
-            if (placeChunks) {
-                if (((relightMode != null && relightMode != RelightMode.NONE) || (relightMode == null && Settings.IMP.LIGHTING.MODE > 0))) {
-                    relighter = WorldEdit.getInstance().getPlatformManager()
-                            .queryCapability(Capability.WORLD_EDITING)
-                            .getRelighterFactory().createRelighter(relightMode, world, queue);
-                    extent.addProcessor(new RelightProcessor(relighter));
-                }
-                extent.addProcessor(new HeightmapProcessor(world.getMinY(), world.getMaxY()));
-            } else {
-                relighter = NullRelighter.INSTANCE;
-            }
-            if (limit != null && !limit.isUnlimited() && regionExtent != null) {
-                this.extent = new LimitExtent(regionExtent, limit);
-            } else if (limit != null && !limit.isUnlimited()) {
-                this.extent = new LimitExtent(this.extent, limit);
-            } else if (regionExtent != null) {
-                this.extent = regionExtent;
-            }
-            if (this.limit != null && this.limit.STRIP_NBT != null && !this.limit.STRIP_NBT.isEmpty()) {
-                if (placeChunks) {
-                    extent.addProcessor(new StripNBTExtent(this.extent, this.limit.STRIP_NBT));
-                } else {
-                    this.extent = new StripNBTExtent(this.extent, this.limit.STRIP_NBT);
-                }
-            }
-            this.extent = wrapExtent(this.extent, eventBus, event, EditSession.Stage.BEFORE_HISTORY);
-        }
-        return this;
-    }
-
-    public EditSession build() {
-        return new EditSession(this);
-    }
-
-    @Nonnull
-    public World getWorld() {
-        return world;
-    }
-
-    public Extent getExtent() {
-        return extent != null ? extent : world;
-    }
-
-    public boolean isWrapped() {
-        return wrapped;
-    }
-
-    public Extent getBypassHistory() {
-        return bypassHistory;
-    }
-
-    public Extent getBypassAll() {
-        return bypassAll;
-    }
-
-    @Nonnull
-    public FaweLimit getLimit() {
-        return limit;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    public AbstractChangeSet getChangeTask() {
-        return changeTask;
-    }
-
-    public BlockBag getBlockBag() {
-        return blockBag;
-    }
-
-    public Relighter getRelighter() {
-        return relighter;
-    }
-
-    public boolean isWNAMode() {
-        return wnaMode;
-    }
-
-    @Nullable
-    public Region[] getAllowedRegions() {
-        return allowedRegions;
-    }
-
-
-}

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -258,47 +258,6 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
     @Nullable
     private final Region[] allowedRegions;
 
-    @Deprecated(forRemoval = true)
-    public EditSession(
-            @Nonnull EventBus bus, World world, @Nullable Player actor,
-            @Nullable FaweLimit limit, @Nullable AbstractChangeSet changeSet,
-            @Nullable RegionWrapper[] allowedRegions, @Nullable Boolean autoQueue,
-            @Nullable Boolean fastmode, @Nullable Boolean checkMemory, @Nullable Boolean combineStages,
-            @Nullable BlockBag blockBag, @Nullable EditSessionEvent event
-    ) {
-        this(new EditSessionBuilder(bus).world(world).actor(actor)
-                .limit(limit)
-                .changeSet(changeSet)
-                .allowedRegions(allowedRegions)
-                .fastMode(fastmode)
-                .checkMemory(checkMemory)
-                .combineStages(combineStages)
-                .blockBag(blockBag)
-                .event(event));
-    }
-    //FAWE end
-
-    /**
-     * Construct the object with a maximum number of blocks and a block bag.
-     *
-     * @param eventBus  the event bus
-     * @param world     the world
-     * @param maxBlocks the maximum number of blocks that can be changed, or -1 to use no limit
-     * @param blockBag  an optional {@link BlockBag} to use, otherwise null
-     * @param event     the event to call with the extent
-     */
-    //FAWE start - EditSessionEvent
-    @Deprecated(forRemoval = true)
-    public EditSession(
-            @Nonnull EventBus eventBus,
-            World world,
-            int maxBlocks,
-            @Nullable BlockBag blockBag,
-            EditSessionEvent event
-    ) {
-        this(eventBus, world, null, null, null, null, true, null, null, null, blockBag, event);
-    }
-
     EditSession(EditSessionBuilder builder) {
         super(builder.compile().getExtent());
         this.world = builder.getWorld();
@@ -324,27 +283,6 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
         this.allowedRegions = builder.getAllowedRegions() != null ? builder.getAllowedRegions().clone() : null;
     }
 
-    @Deprecated(forRemoval = true)
-    public EditSession(com.fastasyncworldedit.core.util.EditSessionBuilder builder) {
-        super(builder.compile().getExtent());
-        this.world = builder.getWorld();
-        this.bypassHistory = builder.getBypassHistory();
-        this.bypassAll = builder.getBypassAll();
-        this.originalLimit = builder.getLimit();
-        this.limit = builder.getLimit().copy();
-        this.actor = builder.getPlayer();
-        this.changeSet = builder.getChangeTask();
-        this.minY = world.getMinY();
-        this.maxY = world.getMaxY();
-        this.blockBag = builder.getBlockBag();
-        this.history = changeSet != null;
-        this.relighter = builder.getRelighter();
-        this.wnaMode = builder.isWNAMode();
-        this.tracingExtents = null;
-
-        this.allowedRegions = builder.getAllowedRegions() != null ? builder.getAllowedRegions().clone() : null;
-    }
-
     /**
      * The limit for this specific edit (blocks etc).
      *

worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java

@@ -377,14 +377,6 @@ public final class EditSessionBuilder {
         return allowedRegions(new Region[]{RegionWrapper.GLOBAL()});
     }
 
-    /**
-     * Does nothing as of 1.13 new queueing system
-     */
-    @Deprecated(forRemoval = true)
-    public EditSessionBuilder autoQueue(@Nullable Boolean autoQueue) {
-        return this;
-    }
-
     /**
      * Set fast mode. Use null to set to actor's fast mode setting. Also set to true by default if history for console disabled
      */

worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java

@@ -56,13 +56,6 @@ public final class Constants {
     @Deprecated(forRemoval = true, since = "2.0.0")
     public static final int DATA_VERSION_MC_1_13_2 = 1631;
 
-    /**
-     * The DataVersion for Minecraft 1.14
-     * @deprecated If Fawe drops interaction with 1.14, this method is subject to removal.
-     */
-    @Deprecated(forRemoval = true, since = "2.0.0")
-    public static final int DATA_VERSION_MC_1_14 = 1952;
-
     /**
      * The DataVersion for Minecraft 1.15
      */

worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java

@@ -61,17 +61,6 @@ public class RegionIntersection extends AbstractRegion {
         this(null, regions);
     }
 
-    /**
-     * Create a new instance with the included list of regions.
-     *
-     * @param regions a list of regions, which is copied
-     * @deprecated Use {@link #RegionIntersection(List)} to match upstream
-     */
-    @Deprecated(forRemoval = true)
-    public RegionIntersection(Collection<Region> regions) {
-        this(null, regions);
-    }
-
     /**
      * Create a new instance with the included list of regions.
      *