diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
index bbe943387b..de6077ed8b 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
@@ -389,6 +389,7 @@ public static Biome adapt(BiomeType biomeType) {
      * @return WorldEdit EntityType
      */
     public static EntityType adapt(org.bukkit.entity.EntityType entityType) {
+        @SuppressWarnings("deprecation")
         final String name = entityType.getName();
         if (name == null) {
             return null;
@@ -396,6 +397,7 @@ public static EntityType adapt(org.bukkit.entity.EntityType entityType) {
         return EntityTypes.get(name.toLowerCase(Locale.ROOT));
     }
 
+    @SuppressWarnings("deprecation")
     public static org.bukkit.entity.EntityType adapt(EntityType entityType) {
         if (!entityType.getId().startsWith("minecraft:")) {
             throw new IllegalArgumentException("Bukkit only supports vanilla entities");
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java
index c6d6fd9b0b..b3d1854370 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java
@@ -29,6 +29,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class BukkitBlockCategoryRegistry implements BlockCategoryRegistry {
 
     private Set<BlockType> getFromBukkitTag(Tag<Material> tag) {
@@ -40,7 +42,9 @@ public Set<BlockType> getCategorisedByName(String category) {
         String[] split = category.split(":");
         String namespace = split.length > 1 ? split[0] : "minecraft";
         String key =  split.length > 1 ? split[1] : category;
+        @SuppressWarnings("deprecation")
         Tag<Material> tag = Bukkit.getTag(Tag.REGISTRY_BLOCKS, new NamespacedKey(namespace, key), Material.class);
+        checkNotNull(tag);
         return getFromBukkitTag(tag);
     }
 }
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
index 36f93ec3f0..3f6e11d790 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
@@ -96,7 +96,7 @@ public void printError(String msg) {
 
     @Override
     public void print(Component component) {
-        TextAdapter.sendComponent(sender, WorldEditText.format(component, getLocale()));
+        TextAdapter.sendMessage(sender, WorldEditText.format(component, getLocale()));
     }
 
     @Override
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
index dc1e41443c..1b8e0893fe 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
@@ -103,6 +103,7 @@ public boolean isBurnable() {
             return material.isBurnable();
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public boolean isTranslucent() {
             return material.isTransparent();
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
index 5eb2a9f3ad..36776342b1 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
@@ -96,7 +96,7 @@ public void printError(String msg) {
 
     @Override
     public void print(Component component) {
-        TextAdapter.sendComponent(sender, WorldEditText.format(component, getLocale()));
+        TextAdapter.sendMessage(sender, WorldEditText.format(component, getLocale()));
     }
 
     @Override
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java
index 2beb469e50..d79780ca23 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java
@@ -29,6 +29,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class BukkitItemCategoryRegistry implements ItemCategoryRegistry {
 
     private Set<ItemType> getFromBukkitTag(Tag<Material> tag) {
@@ -40,7 +42,9 @@ public Set<ItemType> getCategorisedByName(String category) {
         String[] split = category.split(":");
         String namespace = split.length > 1 ? split[0] : "minecraft";
         String key =  split.length > 1 ? split[1] : category;
+        @SuppressWarnings("deprecation")
         Tag<Material> tag = Bukkit.getTag(Tag.REGISTRY_ITEMS, new NamespacedKey(namespace, key), Material.class);
+        checkNotNull(tag);
         return getFromBukkitTag(tag);
     }
 }
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
index e1ffaa30c0..40a6bd6b8f 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
@@ -135,7 +135,7 @@ public void printError(String msg) {
 
     @Override
     public void print(Component component) {
-        TextAdapter.sendComponent(player, WorldEditText.format(component, getLocale()));
+        TextAdapter.sendMessage(player, WorldEditText.format(component, getLocale()));
     }
 
     @Override
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java
index 005b9bc936..8c0bff6e71 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java
@@ -109,6 +109,7 @@ public boolean isValidMobType(String type) {
         if (!type.startsWith("minecraft:")) {
             return false;
         }
+        @SuppressWarnings("deprecation")
         final EntityType entityType = EntityType.fromName(type.substring(10));
         return entityType != null && entityType.isAlive();
     }
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
index ab1e112735..7331c9ec86 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
@@ -77,7 +77,9 @@ public class BukkitWorld extends AbstractWorld {
     private static final Map<Integer, Effect> effects = new HashMap<>();
     static {
         for (Effect effect : Effect.values()) {
-            effects.put(effect.getId(), effect);
+            @SuppressWarnings("deprecation")
+            int id = effect.getId();
+            effects.put(id, effect);
         }
 
         boolean temp;
@@ -349,6 +351,7 @@ public int getMaxY() {
         return getWorld().getMaxHeight() - 1;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void fixAfterFastMode(Iterable<BlockVector2> chunks) {
         World world = getWorld();
@@ -504,7 +507,7 @@ public boolean fullySupports3DBiomes() {
         return HAS_3D_BIOMES && getWorld().getEnvironment() != World.Environment.NORMAL;
     }
 
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     @Override
     public BiomeType getBiome(BlockVector3 position) {
         if (HAS_3D_BIOMES) {
@@ -514,7 +517,7 @@ public BiomeType getBiome(BlockVector3 position) {
         }
     }
 
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
         if (HAS_3D_BIOMES) {
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
index 84115a6aec..6f74f85c2e 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -171,6 +171,7 @@ private void setupWorldData() {
         WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent());
     }
 
+    @SuppressWarnings("deprecation")
     private void initializeRegistries() {
         // Biome
         for (Biome biome : Biome.values()) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
index 9a0996967d..f1bcdf1147 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
@@ -162,11 +162,15 @@ public void deleteChunks(Actor actor, World world, LocalSession session,
             throw new StopExecutionException(TextComponent.of("Failed to write chunk list: " + e.getMessage()));
         }
 
-        actor.print(String.format("%d chunk(s) have been marked for deletion the next time the server starts.",
-                newBatch.getChunkCount()));
+        actor.print(TextComponent.of(
+            String.format("%d chunk(s) have been marked for deletion the next time the server starts.",
+                newBatch.getChunkCount())
+        ));
         if (currentInfo.batches.size() > 1) {
-            actor.printDebug(String.format("%d chunks total marked for deletion. (May have overlaps).",
-                    currentInfo.batches.stream().mapToInt(ChunkDeletionInfo.ChunkBatch::getChunkCount).sum()));
+            actor.printDebug(TextComponent.of(
+                String.format("%d chunks total marked for deletion. (May have overlaps).",
+                    currentInfo.batches.stream().mapToInt(ChunkDeletionInfo.ChunkBatch::getChunkCount).sum())
+            ));
         }
         actor.print(TextComponent.of("You can mark more chunks for deletion, or to stop now, run: ", TextColor.LIGHT_PURPLE)
                 .append(TextComponent.of("/stop", TextColor.AQUA)
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
index 10005b6c39..8d6b461498 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
@@ -27,18 +27,21 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
+import javax.annotation.Nullable;
+
 /**
  * A super pickaxe mode that will remove blocks in an area.
  */
 public class AreaPickaxe implements BlockTool {
 
-    private int range;
+    private final int range;
 
     public AreaPickaxe(int range) {
         this.range = range;
@@ -50,7 +53,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         int ox = clicked.getBlockX();
         int oy = clicked.getBlockY();
         int oz = clicked.getBlockZ();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
index afb37c38e2..b3fedfb424 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
@@ -29,6 +29,7 @@
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.registry.state.Property;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
@@ -40,6 +41,8 @@
 import java.util.Map;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 /**
  * A mode that cycles the data values of supported blocks.
  */
@@ -115,12 +118,12 @@ private boolean handleCycle(LocalConfiguration config, Player player, LocalSessi
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         return handleCycle(config, player, session, clicked, true);
     }
 
     @Override
-    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         return handleCycle(config, player, session, clicked, false);
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
index a04ff8b157..f27ff39ce6 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
@@ -29,11 +29,13 @@
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
+import javax.annotation.Nullable;
+
 /**
  * A mode that replaces one block.
  */
@@ -51,7 +53,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         BlockBag bag = session.getBlockBag(player);
 
         try (EditSession editSession = session.createEditSession(player)) {
@@ -74,7 +76,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla
 
 
     @Override
-    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         BaseBlock targetBlock = player.getWorld().getFullBlock(clicked.toVector().toBlockPoint());
 
         if (targetBlock != null) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockTool.java
index 41b905dcdc..add19f34c0 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockTool.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockTool.java
@@ -23,6 +23,8 @@
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.internal.util.DeprecationUtil;
+import com.sk89q.worldedit.internal.util.NonAbstractForCompatibility;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 
@@ -33,23 +35,19 @@ public interface BlockTool extends Tool {
     /**
      * Perform the primary action of this tool.
      *
-     * @param server
-     * @param config
-     * @param player
-     * @param session
-     * @param clicked
      * @return true to cancel the original event which triggered this action (if possible)
+     * @deprecated New subclasses should override
+     * {@link #actPrimary(Platform, LocalConfiguration, Player, LocalSession, Location, Direction)}
+     * instead
      */
     @Deprecated
     default boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
-        throw new AssertionError("actPrimary must be overridden");
+        return actPrimary(server, config, player, session, clicked, null);
     }
 
     /**
      * Perform the primary action of this tool.
      *
-     * <p>Note: This will not be default in WorldEdit 8</p>
-     *
      * @param server The platform
      * @param config The config instance
      * @param player The player
@@ -57,8 +55,15 @@ default boolean actPrimary(Platform server, LocalConfiguration config, Player pl
      * @param clicked The location that was clicked
      * @param face The face that was clicked
      * @return true to cancel the original event which triggered this action (if possible)
+     * @apiNote This must be overridden by new subclasses. See {@link NonAbstractForCompatibility}
+     *          for details
      */
+    @NonAbstractForCompatibility(
+        delegateName = "actPrimary",
+        delegateParams = { Platform.class, LocalConfiguration.class, Player.class, LocalSession.class, Location.class }
+    )
     default boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
+        DeprecationUtil.checkDelegatingOverride(getClass());
         return actPrimary(server, config, player, session, clicked);
     }
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DoubleActionBlockTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DoubleActionBlockTool.java
index 159e92bac6..e7efc6c4aa 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DoubleActionBlockTool.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DoubleActionBlockTool.java
@@ -23,6 +23,8 @@
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.internal.util.DeprecationUtil;
+import com.sk89q.worldedit.internal.util.NonAbstractForCompatibility;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 
@@ -36,23 +38,19 @@ public interface DoubleActionBlockTool extends BlockTool {
     /**
      * Perform the secondary action of this block tool.
      *
-     * @param server
-     * @param config
-     * @param player
-     * @param session
-     * @param clicked
      * @return true to cancel the original event which triggered this action (if possible)
+     * @deprecated New subclasses must override
+     * {@link #actSecondary(Platform, LocalConfiguration, Player, LocalSession, Location, Direction)}
+     * instead
      */
     @Deprecated
     default boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
-        throw new AssertionError("actPrimary must be overridden");
+        return actSecondary(server, config, player, session, clicked, null);
     }
 
     /**
      * Perform the secondary action of this block tool.
      *
-     * <p>Note: This will not be default in WorldEdit 8</p>
-     *
      * @param server The platform
      * @param config The config instance
      * @param player The player
@@ -60,8 +58,15 @@ default boolean actSecondary(Platform server, LocalConfiguration config, Player
      * @param clicked The location that was clicked
      * @param face The face that was clicked
      * @return true to cancel the original event which triggered this action (if possible)
+     * @apiNote This must be overridden by new subclasses. See {@link NonAbstractForCompatibility}
+     *          for details
      */
+    @NonAbstractForCompatibility(
+        delegateName = "actSecondary",
+        delegateParams = { Platform.class, LocalConfiguration.class, Player.class, LocalSession.class, Location.class }
+    )
     default boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
+        DeprecationUtil.checkDelegatingOverride(getClass());
         return actSecondary(server, config, player, session, clicked);
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
index a5dc969849..c890bfd2be 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
@@ -40,6 +40,8 @@
 import java.util.LinkedList;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /**
  * A pickaxe mode that removes floating treetops (logs and leaves not connected
  * to anything else)
@@ -67,7 +69,8 @@ private boolean isTreeBlock(BlockType type) {
 
     @Override
     public boolean actPrimary(Platform server, LocalConfiguration config,
-            Player player, LocalSession session, Location clicked) {
+                              Player player, LocalSession session, Location clicked,
+                              @Nullable Direction face) {
 
         final World world = (World) clicked.getExtent();
         final BlockState state = world.getBlock(clicked.toVector().toBlockPoint());
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
index 961b3349c5..52e15c009d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
@@ -28,6 +28,7 @@
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.World;
@@ -37,6 +38,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /**
  * A tool that flood fills blocks.
  */
@@ -56,7 +59,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         World world = (World) clicked.getExtent();
 
         BlockVector3 origin = clicked.toVector().toBlockPoint();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
index 481c59a50e..d6c0e2b8ee 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
@@ -27,6 +27,7 @@
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
@@ -36,6 +37,8 @@
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 
+import javax.annotation.Nullable;
+
 /**
  * Looks up information about a block.
  */
@@ -47,7 +50,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
 
         World world = (World) clicked.getExtent();
         EditSession editSession = session.createEditSession(player);
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
index f85055dab2..e80a390aef 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
@@ -27,6 +27,7 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.World;
@@ -36,6 +37,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /**
  * A pickaxe mode that recursively finds adjacent blocks within range of
  * an initial block and of the same type.
@@ -54,7 +57,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         World world = (World) clicked.getExtent();
 
         BlockVector3 origin = clicked.toVector().toBlockPoint();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SelectionWand.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SelectionWand.java
index fcc83209c1..17e2628f9c 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SelectionWand.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SelectionWand.java
@@ -27,12 +27,15 @@
 import com.sk89q.worldedit.extension.platform.permission.ActorSelectorLimits;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 
+import javax.annotation.Nullable;
+
 public class SelectionWand implements DoubleActionBlockTool {
 
     @Override
-    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         RegionSelector selector = session.getRegionSelector(player.getWorld());
         BlockVector3 blockPoint = clicked.toVector().toBlockPoint();
 
@@ -43,7 +46,7 @@ public boolean actSecondary(Platform server, LocalConfiguration config, Player p
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         RegionSelector selector = session.getRegionSelector(player.getWorld());
         BlockVector3 blockPoint = clicked.toVector().toBlockPoint();
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
index ea724bdd89..f6a1b1b2ad 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
@@ -27,12 +27,15 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
+import javax.annotation.Nullable;
+
 /**
  * A super pickaxe mode that removes one block.
  */
@@ -44,7 +47,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
         World world = (World) clicked.getExtent();
         BlockVector3 blockPoint = clicked.toVector().toBlockPoint();
         final BlockType blockType = world.getBlock(blockPoint).getBlockType();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java
index 4eaed7f4fe..94d562d268 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java
@@ -27,10 +27,13 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 
+import javax.annotation.Nullable;
+
 /**
  * Plants a tree.
  */
@@ -48,7 +51,7 @@ public boolean canUse(Actor player) {
     }
 
     @Override
-    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked, @Nullable Direction face) {
 
         try (EditSession editSession = session.createEditSession(player)) {
             try {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java
index 80622c37d9..1f065c23e0 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java
@@ -133,6 +133,7 @@ public ListenableFuture<T> buildAndExec(ListeningExecutorService executor) {
         return future;
     }
 
+    @SuppressWarnings("deprecation")
     private T runTask() {
         T result = null;
         try {
@@ -183,6 +184,7 @@ private T runTask() {
     // com.sk89q.minecraft.util.commands.CommandException. the ExceptionConverter currently expects converted
     // exceptions to be org.enginehub.piston.CommandException, throw it wraps the resulting InvocationTargetException in
     // a CommandExecutionException. here, we unwrap those layers to retrieve the original WG error message
+    @SuppressWarnings("deprecation")
     private Component tryExtractOldCommandException(CommandException converted) {
         Component message = null;
         if (converted instanceof CommandExecutionException) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java
index 45ec7111cf..b0486dca45 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java
@@ -36,6 +36,7 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.internal.registry.InputParser;
+import com.sk89q.worldedit.internal.util.DeprecationUtil;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.util.HandSide;
@@ -350,8 +351,7 @@ private BaseBlock parseLogic(String input, ParserContext context) throws InputPa
             return state.toBaseBlock();
         }
 
-        if (blockType == BlockTypes.SIGN || blockType == BlockTypes.WALL_SIGN
-                || BlockCategories.SIGNS.contains(blockType)) {
+        if (DeprecationUtil.isSign(blockType)) {
             // Allow special sign text syntax
             String[] text = new String[4];
             text[0] = blockAndExtraData.length > 1 ? blockAndExtraData[1] : "";
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractBufferingExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractBufferingExtent.java
index 6db14c1fed..59bd81f75c 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractBufferingExtent.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractBufferingExtent.java
@@ -20,6 +20,8 @@
 package com.sk89q.worldedit.extent;
 
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.internal.util.DeprecationUtil;
+import com.sk89q.worldedit.internal.util.NonAbstractForCompatibility;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -69,22 +71,30 @@ public BaseBlock getFullBlock(BlockVector3 position) {
         return block;
     }
 
+    /**
+     * @deprecated New subclasses should override {@link #getBufferedFullBlock(BlockVector3)}
+     *     instead
+     */
     @Deprecated
     protected Optional<BaseBlock> getBufferedBlock(BlockVector3 position) {
-        throw new IllegalStateException("Invalid BufferingExtent provided. Must override `getBufferedFullBlock(BlockVector3)`.");
+        return Optional.ofNullable(getBufferedFullBlock(position));
     }
 
-    //TODO make below abstract
     /**
      * Gets a block from the buffer, or null if not buffered.
      *
-     * This **must** be overridden, and will be abstract in WorldEdit 8.
-     *
      * @param position The position
      * @return The buffered block, or null
+     * @apiNote This must be overridden by new subclasses. See {@link NonAbstractForCompatibility}
+     *          for details
      */
+    @NonAbstractForCompatibility(
+        delegateName = "getBufferedBlock",
+        delegateParams = { BlockVector3.class }
+    )
     @Nullable
     protected BaseBlock getBufferedFullBlock(BlockVector3 position) {
+        DeprecationUtil.checkDelegatingOverride(getClass());
         return getBufferedBlock(position).orElse(null);
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java
index ff1ebd53f8..777a99e6b9 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java
@@ -26,6 +26,7 @@
 import com.google.gson.JsonSyntaxException;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.internal.util.DeprecationUtil;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
@@ -35,7 +36,7 @@ public class SignCompatibilityHandler implements NBTCompatibilityHandler {
 
     @Override
     public <B extends BlockStateHolder<B>> boolean isAffectedBlock(B block) {
-        return block.getBlockType() == BlockTypes.SIGN || block.getBlockType() == BlockTypes.WALL_SIGN;
+        return DeprecationUtil.isSign(block.getBlockType());
     }
 
     @Override
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
index ab1d96735d..1f67c1054d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
@@ -132,8 +132,12 @@ public class MultiStageReorder extends AbstractBufferingExtent implements Reorde
         BlockCategories.DOORS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.FINAL));
         BlockCategories.BANNERS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.FINAL));
         BlockCategories.SIGNS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.FINAL));
-        priorityMap.put(BlockTypes.SIGN, PlacementPriority.FINAL);
-        priorityMap.put(BlockTypes.WALL_SIGN, PlacementPriority.FINAL);
+        @SuppressWarnings("deprecation")
+        BlockType sign = BlockTypes.SIGN;
+        priorityMap.put(sign, PlacementPriority.FINAL);
+        @SuppressWarnings("deprecation")
+        BlockType wallSign = BlockTypes.WALL_SIGN;
+        priorityMap.put(wallSign, PlacementPriority.FINAL);
         priorityMap.put(BlockTypes.CACTUS, PlacementPriority.FINAL);
         priorityMap.put(BlockTypes.SUGAR_CANE, PlacementPriority.FINAL);
         priorityMap.put(BlockTypes.PISTON_HEAD, PlacementPriority.FINAL);
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetBlockMap.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetBlockMap.java
index 99607ae165..9d33f5534f 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetBlockMap.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetBlockMap.java
@@ -22,11 +22,9 @@
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.util.LocatedBlock;
 import com.sk89q.worldedit.util.collection.BlockMap;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
-import java.util.List;
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -53,8 +51,4 @@ public Operation resume(RunContext run) throws WorldEditException {
     public void cancel() {
     }
 
-    @Override
-    public void addStatusMessages(List<String> messages) {
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/exception/ExceptionConverterHelper.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/exception/ExceptionConverterHelper.java
index 42959c5fb9..87dc18288d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/exception/ExceptionConverterHelper.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/exception/ExceptionConverterHelper.java
@@ -65,6 +65,7 @@ public ExceptionConverterHelper() {
         this.handlers = handlers;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void convert(Throwable t) throws CommandException {
         Class<?> throwableClass = t.getClass();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/DeprecationUtil.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/DeprecationUtil.java
index 1376383c72..a4939b823d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/DeprecationUtil.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/DeprecationUtil.java
@@ -21,6 +21,9 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Throwables;
+import com.sk89q.worldedit.world.block.BlockCategories;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.lang.reflect.Method;
 import java.util.stream.Stream;
@@ -94,4 +97,13 @@ private static String methodToString(Method method) {
         return builder.toString();
     }
 
+    public static boolean isSign(BlockType blockType) {
+        @SuppressWarnings("deprecation")
+        BlockType sign = BlockTypes.SIGN;
+        @SuppressWarnings("deprecation")
+        BlockType wallSign = BlockTypes.WALL_SIGN;
+        return blockType == sign || blockType == wallSign
+            || BlockCategories.SIGNS.contains(blockType);
+    }
+
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java
index 9442deacab..ea9ee4d49e 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java
@@ -131,7 +131,7 @@ public boolean contains(BlockVector3 position) {
         return false;
     }
 
-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings("unchecked")
     @Override
     public Iterator<BlockVector3> iterator() {
         Iterator<BlockVector3>[] iterators = (Iterator<BlockVector3>[]) new Iterator[regions.size()];
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java
index c9fdad50fb..c473b74b11 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java
@@ -46,31 +46,37 @@ public Vector3 toWorldRel(double x, double y, double z) {
         return current.add(x, y, z);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int getBlockType(double x, double y, double z) {
         return extent.getBlock(toWorld(x, y, z)).getBlockType().getLegacyId();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int getBlockData(double x, double y, double z) {
         return extent.getBlock(toWorld(x, y, z)).getBlockType().getLegacyData();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int getBlockTypeAbs(double x, double y, double z) {
         return extent.getBlock(BlockVector3.at(x, y, z)).getBlockType().getLegacyId();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int getBlockDataAbs(double x, double y, double z) {
         return extent.getBlock(BlockVector3.at(x, y, z)).getBlockType().getLegacyData();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int getBlockTypeRel(double x, double y, double z) {
         return extent.getBlock(toWorldRel(x, y, z).toBlockPoint()).getBlockType().getLegacyId();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int getBlockDataRel(double x, double y, double z) {
         return extent.getBlock(toWorldRel(x, y, z).toBlockPoint()).getBlockType().getLegacyData();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
index 6209dbb682..cfb32a1de9 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
@@ -60,6 +60,7 @@ public class BlockType implements Keyed {
     private final LazyReference<Map<Map<Property<?>, Object>, BlockState>> blockStatesMap
         = LazyReference.from(() -> BlockState.generateStateMap(this));
 
+    @Deprecated
     private final LazyReference<String> name = LazyReference.from(() -> WorldEdit.getInstance().getPlatformManager()
         .queryCapability(Capability.GAME_HOOKS).getRegistries().getBlockRegistry().getName(this));
     private final LazyReference<Integer> legacyId = LazyReference.from(() -> computeLegacy(0));
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
index dc67aaaca3..3815d41108 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
@@ -25,6 +25,7 @@
 /**
  * Stores a list of common Block String IDs.
  */
+@SuppressWarnings("unused")
 public final class BlockTypes {
 
     @Nullable public static final BlockType ACACIA_BUTTON = get("minecraft:acacia_button");
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
index ae0f0e6261..169ed4af91 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
@@ -57,6 +57,8 @@ public Component getRichName(BlockType blockType) {
     @Nullable
     @Override
     @Deprecated
+    // dumb_intellij.jpg
+    @SuppressWarnings("deprecation")
     public String getName(BlockType blockType) {
         BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.getId());
         return blockEntry != null ? blockEntry.localizedName : null;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
index 899b7a65ec..994dae51bd 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
@@ -55,6 +55,8 @@ public Component getRichName(ItemType itemType) {
     @Nullable
     @Override
     @Deprecated
+    // dumb_intellij.jpg
+    @SuppressWarnings("deprecation")
     public String getName(ItemType itemType) {
         BundledItemData.ItemEntry itemEntry = getEntryById(itemType);
         if (itemEntry != null) {
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java
index e9b8d62a61..215f4290ea 100644
--- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java
+++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java
@@ -72,6 +72,7 @@ public String getName() {
         return sender.getName();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void printRaw(String msg) {
         for (String part : msg.split("\n")) {
@@ -96,9 +97,10 @@ public void printError(String msg) {
 
     @Override
     public void print(Component component) {
-        TextAdapter.sendComponent(sender, WorldEditText.format(component, getLocale()));
+        TextAdapter.sendMessage(sender, WorldEditText.format(component, getLocale()));
     }
 
+    @SuppressWarnings("deprecation")
     private void sendColorized(String msg, TextColor formatting) {
         for (String part : msg.split("\n")) {
             sender.sendMessage(Text.of(formatting, TextSerializers.LEGACY_FORMATTING_CODE.deserialize(part)));
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
index 6603a5bd42..037de0327a 100644
--- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
+++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
@@ -83,6 +83,7 @@ public String getName() {
         return this.player.getName();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public String getDisplayName() {
         return player.getDisplayNameData().displayName().getDirect().map(TextSerializers.LEGACY_FORMATTING_CODE::serialize).orElse(getName());
@@ -155,7 +156,7 @@ public void printError(String msg) {
 
     @Override
     public void print(Component component) {
-        TextAdapter.sendComponent(player, WorldEditText.format(component, getLocale()));
+        TextAdapter.sendMessage(player, WorldEditText.format(component, getLocale()));
     }
 
     private void sendColorized(String msg, TextColor formatting) {