From c4350bb0af034b64fb6eff44ace18e9213a1238e Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sun, 21 Apr 2024 14:50:08 -0500
Subject: [PATCH 1/7] Fix FAWE logging on newer builds

---
 build.gradle                                  | 11 +++--
 pom.xml                                       | 29 +++++++++-----
 .../listener/block/BlockFromToListener.java   |  2 +-
 .../worldedit/CoreProtectLogger.java          | 40 ++++++++++++++-----
 4 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/build.gradle b/build.gradle
index ea9e65a4..58fb5b4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'com.palantir.git-version' version '0.13.0'
 }
 
@@ -25,15 +25,14 @@ logger.info("Building version $version")
 repositories {
     jcenter()
     maven { url = 'https://hub.spigotmc.org/nexus/content/groups/public/' }
-    maven { url = 'https://papermc.io/repo/repository/maven-public/' }
+    maven { url = 'https://repo.papermc.io/repository/maven-public/' }
     maven { url = 'https://repo.codemc.org/repository/maven-public/' }
-    maven { url = 'https://maven.enginehub.org/repo/' }
 }
 
 dependencies {
-    compileOnly('com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT') {
-        exclude group: 'org.bukkit'
-    }
+    implementation(platform("com.intellectualsites.bom:bom-newest:1.44")) // Ref: https://github.com/IntellectualSites/bom
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit")
     compileOnly 'io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT'
     implementation 'org.bstats:bstats-bukkit-lite:1.8'
     implementation 'com.zaxxer:HikariCP:5.0.1'
diff --git a/pom.xml b/pom.xml
index 0c035ad7..0fad0792 100755
--- a/pom.xml
+++ b/pom.xml
@@ -88,11 +88,18 @@
       <id>codemc-repo</id>
       <url>https://repo.codemc.org/repository/maven-public/</url>
     </repository>
-    <repository>
-      <id>enginehub-repo</id>
-      <url>https://maven.enginehub.org/repo/</url>
-    </repository>
   </repositories>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.intellectualsites.bom</groupId>
+        <artifactId>bom-newest</artifactId> <!--  Ref: https://github.com/IntellectualSites/bom -->
+        <version>1.44</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <!--
     paper-api: io.papermc.paper
@@ -113,14 +120,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.sk89q.worldedit</groupId>
-      <artifactId>worldedit-bukkit</artifactId>
-      <version>7.0.0-SNAPSHOT</version>
+      <groupId>com.fastasyncworldedit</groupId>
+      <artifactId>FastAsyncWorldEdit-Core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fastasyncworldedit</groupId>
+      <artifactId>FastAsyncWorldEdit-Bukkit</artifactId>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.bukkit</groupId>
-          <artifactId>bukkit</artifactId>
+          <artifactId>FastAsyncWorldEdit-Core</artifactId>
+          <groupId>*</groupId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/src/main/java/net/coreprotect/listener/block/BlockFromToListener.java b/src/main/java/net/coreprotect/listener/block/BlockFromToListener.java
index 9eb797a8..794e35df 100644
--- a/src/main/java/net/coreprotect/listener/block/BlockFromToListener.java
+++ b/src/main/java/net/coreprotect/listener/block/BlockFromToListener.java
@@ -78,7 +78,7 @@ else if (type.equals(Material.LAVA)) {
                     Location location = toBlock.getLocation();
                     int timestamp = (int) (System.currentTimeMillis() / 1000L);
                     Object[] cacheData = CacheHandler.spreadCache.get(location);
-                    CacheHandler.spreadCache.put(location, new Object[] { timestamp, type });
+                    CacheHandler.spreadCache.put(location.toString(), new Object[] { timestamp, type });
                     if (toBlockState == null && cacheData != null && ((Material) cacheData[1]) == type) {
                         return;
                     }
diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
index df4b4e37..c62b680f 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
@@ -1,22 +1,23 @@
 package net.coreprotect.worldedit;
 
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
+import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
-
 import net.coreprotect.config.Config;
 import net.coreprotect.utility.Util;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 public class CoreProtectLogger extends AbstractDelegateExtent {
 
@@ -35,7 +36,7 @@ protected CoreProtectLogger(Actor actor, World world, Extent extent) {
     public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T block) throws WorldEditException {
         org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
         if (!Config.getConfig(world).WORLDEDIT) {
-            return eventExtent.setBlock(position, block);
+            return eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block);
         }
 
         BlockState oldBlock = eventExtent.getBlock(position);
@@ -48,7 +49,7 @@ public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T
         // e.g. BaseBlock block = eventWorld.getBlock(position);
         ItemStack[] containerData = CoreProtectEditSessionEvent.isFAWE() ? null : Util.getContainerContents(oldType, null, location);
 
-        if (eventExtent.setBlock(position, block)) {
+        if (eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block)) {
             WorldEditLogger.postProcess(eventExtent, eventActor, position, location, block, baseBlock, oldType, oldBlock, containerData);
             return true;
         }
@@ -56,8 +57,29 @@ public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T
         return false;
     }
 
+    @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block) throws WorldEditException {
-        return setBlock(BlockVector3.at(x,y,z), block);
+        return setBlock(BlockVector3.at(x, y, z), block);
     }
 
-}
+    public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksException {
+        org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
+        if (!Config.getConfig(world).WORLDEDIT) {
+            return eventExtent.setBlocks(region, pattern);
+        }
+
+        for (BlockVector3 position : region.clone()) {
+            BlockState oldBlock = eventExtent.getBlock(position);
+            Material oldType = BukkitAdapter.adapt(oldBlock.getBlockType());
+            Location location = new Location(world, position.getBlockX(), position.getBlockY(), position.getBlockZ());
+            BaseBlock baseBlock = WorldEditLogger.getBaseBlock(eventExtent, position, location, oldType, oldBlock);
+
+            // No clear way to get container content data from within the WorldEdit API
+            // Data may be available by converting oldBlock.toBaseBlock().getNbtData()
+            // e.g. BaseBlock block = eventWorld.getBlock(position);
+            ItemStack[] containerData = CoreProtectEditSessionEvent.isFAWE() ? null : Util.getContainerContents(oldType, null, location);
+            WorldEditLogger.postProcess(eventExtent, eventActor, position, location, pattern.applyBlock(position), baseBlock, oldType, oldBlock, containerData);
+        }
+        return eventExtent.setBlocks(region, pattern);
+    }
+}
\ No newline at end of file

From a3d9f6d592b277a70ae4a026a987a508a3f9a486 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sun, 21 Apr 2024 15:58:49 -0500
Subject: [PATCH 2/7] fix regular WE logging

---
 .../worldedit/CoreProtectLogger.java          | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
index c62b680f..03ec2caf 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
@@ -36,7 +36,11 @@ protected CoreProtectLogger(Actor actor, World world, Extent extent) {
     public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T block) throws WorldEditException {
         org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
         if (!Config.getConfig(world).WORLDEDIT) {
-            return eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block);
+            if (CoreProtectEditSessionEvent.isFAWE()) {
+                return eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block);
+            } else {
+                return eventExtent.setBlock(position, block);
+            }
         }
 
         BlockState oldBlock = eventExtent.getBlock(position);
@@ -49,9 +53,16 @@ public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T
         // e.g. BaseBlock block = eventWorld.getBlock(position);
         ItemStack[] containerData = CoreProtectEditSessionEvent.isFAWE() ? null : Util.getContainerContents(oldType, null, location);
 
-        if (eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block)) {
-            WorldEditLogger.postProcess(eventExtent, eventActor, position, location, block, baseBlock, oldType, oldBlock, containerData);
-            return true;
+        if (CoreProtectEditSessionEvent.isFAWE()) {
+            if (eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block)) {
+                WorldEditLogger.postProcess(eventExtent, eventActor, position, location, block, baseBlock, oldType, oldBlock, containerData);
+                return true;
+            }
+        } else {
+            if (eventExtent.setBlock(position, block)) {
+                WorldEditLogger.postProcess(eventExtent, eventActor, position, location, block, baseBlock, oldType, oldBlock, containerData);
+                return true;
+            }
         }
 
         return false;

From ef0ac61616e8db2efbafee19eb3c155533b98474 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Wed, 24 Apr 2024 15:53:58 -0500
Subject: [PATCH 3/7] Fix registering of FAWE for event bus

---
 .../java/net/coreprotect/config/Config.java   |  4 +--
 .../CoreProtectEditSessionEvent.java          | 36 ++++++++-----------
 .../worldedit/CoreProtectLogger.java          |  1 +
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/main/java/net/coreprotect/config/Config.java b/src/main/java/net/coreprotect/config/Config.java
index bae4f161..1884c61e 100644
--- a/src/main/java/net/coreprotect/config/Config.java
+++ b/src/main/java/net/coreprotect/config/Config.java
@@ -42,7 +42,7 @@ public class Config extends Language {
     public String MYSQL_USERNAME;
     public String MYSQL_PASSWORD;
     public String LANGUAGE;
-    public boolean ENABLE_AWE;
+    public boolean ENABLE_FAWE;
     public boolean ENABLE_SSL;
     public boolean DISABLE_WAL;
     public boolean HOVER_EVENTS;
@@ -190,7 +190,7 @@ public class Config extends Language {
     }
 
     private void readValues() {
-        this.ENABLE_AWE = this.getBoolean("enable-awe", false);
+        this.ENABLE_FAWE = this.getBoolean("enable-fawe", false);
         this.ENABLE_SSL = this.getBoolean("enable-ssl", false);
         this.DISABLE_WAL = this.getBoolean("disable-wal", false);
         this.HOVER_EVENTS = this.getBoolean("hover-events", true);
diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java b/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
index fe9b3942..1e2f4bdd 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
@@ -1,14 +1,11 @@
 package net.coreprotect.worldedit;
 
-import org.bukkit.Bukkit;
-
 import com.sk89q.worldedit.EditSession.Stage;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
 import com.sk89q.worldedit.world.World;
-
 import net.coreprotect.CoreProtect;
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
@@ -16,6 +13,7 @@
 import net.coreprotect.language.Selector;
 import net.coreprotect.thread.Scheduler;
 import net.coreprotect.utility.Chat;
+import org.bukkit.Bukkit;
 
 public class CoreProtectEditSessionEvent {
 
@@ -37,14 +35,20 @@ public static void register() {
         }
 
         try {
-            if (Bukkit.getServer().getPluginManager().getPlugin("AsyncWorldEdit") == null || Config.getGlobal().ENABLE_AWE) {
-                WorldEdit.getInstance().getEventBus().register(event);
+            if (Bukkit.getServer().getPluginManager().getPlugin("FastAsyncWorldEdit") == null || Config.getGlobal().ENABLE_FAWE) {
+                WorldEdit.getInstance().getEventBus().register(new Object() {
+                    @Subscribe
+                    public void onEditSessionEvent(EditSessionEvent event) {
+                        if (event.getActor() != null && event.getStage() == Stage.BEFORE_CHANGE) {
+                            event.setExtent(new CoreProtectLogger(event.getActor(), event.getWorld(), event.getExtent()));
+                        }
+                    }
+                });
                 initialized = true;
                 ConfigHandler.worldeditEnabled = true;
                 isFAWE = (Bukkit.getServer().getPluginManager().getPlugin("FastAsyncWorldEdit") != null);
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             // Failed to initialize WorldEdit logging
         }
 
@@ -52,12 +56,10 @@ public static void register() {
             try {
                 if (isInitialized()) {
                     Chat.console(Phrase.build(Phrase.INTEGRATION_SUCCESS, "WorldEdit", Selector.FIRST));
-                }
-                else {
+                } else {
                     Chat.console(Phrase.build(Phrase.INTEGRATION_ERROR, "WorldEdit", Selector.FIRST));
                 }
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         });
@@ -73,18 +75,8 @@ public static void unregister() {
             initialized = false;
             ConfigHandler.worldeditEnabled = false;
             Chat.console(Phrase.build(Phrase.INTEGRATION_SUCCESS, "WorldEdit", Selector.SECOND));
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             Chat.console(Phrase.build(Phrase.INTEGRATION_ERROR, "WorldEdit", Selector.SECOND));
         }
     }
-
-    @Subscribe
-    public void wrapForLogging(EditSessionEvent event) {
-        Actor actor = event.getActor();
-        World world = event.getWorld();
-        if (actor != null && event.getStage() == (isFAWE ? Stage.BEFORE_HISTORY : Stage.BEFORE_CHANGE)) {
-            event.setExtent(new CoreProtectLogger(actor, world, event.getExtent()));
-        }
-    }
 }
diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
index 03ec2caf..4b1497bc 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
@@ -73,6 +73,7 @@ public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T b
         return setBlock(BlockVector3.at(x, y, z), block);
     }
 
+    @Override
     public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksException {
         org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
         if (!Config.getConfig(world).WORLDEDIT) {

From 53215be7ab8b5d8691ee1a9ffa236ab22e16cdbd Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Wed, 24 Apr 2024 15:59:42 -0500
Subject: [PATCH 4/7] Remove jcenter

---
 build.gradle                                                    | 1 -
 .../net/coreprotect/worldedit/CoreProtectEditSessionEvent.java  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 58fb5b4a..74073eea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@ if (System.getenv("BUILD_NUMBER") != null) {
 logger.info("Building version $version")
 
 repositories {
-    jcenter()
     maven { url = 'https://hub.spigotmc.org/nexus/content/groups/public/' }
     maven { url = 'https://repo.papermc.io/repository/maven-public/' }
     maven { url = 'https://repo.codemc.org/repository/maven-public/' }
diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java b/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
index 1e2f4bdd..e7bcb55a 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
@@ -3,9 +3,7 @@
 import com.sk89q.worldedit.EditSession.Stage;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
-import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
-import com.sk89q.worldedit.world.World;
 import net.coreprotect.CoreProtect;
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;

From 9fc56831b6a571b2893afd4536d7559b1e9555b5 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Thu, 25 Apr 2024 14:53:08 -0500
Subject: [PATCH 5/7] Add missing `replaceBlocks` method

---
 .../worldedit/CoreProtectLogger.java          | 53 +++++++++++++------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
index 4b1497bc..09f0b16c 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
@@ -6,6 +6,7 @@
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
@@ -19,13 +20,15 @@
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-public class CoreProtectLogger extends AbstractDelegateExtent {
+public class CoreProtectLogger extends AbstractDelegateExtent
+{
 
     private final Actor eventActor;
     private final World eventWorld;
     private final Extent eventExtent;
 
-    protected CoreProtectLogger(Actor actor, World world, Extent extent) {
+    protected CoreProtectLogger(Actor actor, World world, Extent extent)
+    {
         super(extent);
         this.eventActor = actor;
         this.eventWorld = world;
@@ -33,12 +36,17 @@ protected CoreProtectLogger(Actor actor, World world, Extent extent) {
     }
 
     @Override
-    public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T block) throws WorldEditException {
+    public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T block) throws WorldEditException
+    {
         org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
-        if (!Config.getConfig(world).WORLDEDIT) {
-            if (CoreProtectEditSessionEvent.isFAWE()) {
+        if (!Config.getConfig(world).WORLDEDIT)
+        {
+            if (CoreProtectEditSessionEvent.isFAWE())
+            {
                 return eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block);
-            } else {
+            }
+            else
+            {
                 return eventExtent.setBlock(position, block);
             }
         }
@@ -53,13 +61,18 @@ public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T
         // e.g. BaseBlock block = eventWorld.getBlock(position);
         ItemStack[] containerData = CoreProtectEditSessionEvent.isFAWE() ? null : Util.getContainerContents(oldType, null, location);
 
-        if (CoreProtectEditSessionEvent.isFAWE()) {
-            if (eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block)) {
+        if (CoreProtectEditSessionEvent.isFAWE())
+        {
+            if (eventExtent.setBlock(position.getX(), position.getY(), position.getZ(), block))
+            {
                 WorldEditLogger.postProcess(eventExtent, eventActor, position, location, block, baseBlock, oldType, oldBlock, containerData);
                 return true;
             }
-        } else {
-            if (eventExtent.setBlock(position, block)) {
+        }
+        else
+        {
+            if (eventExtent.setBlock(position, block))
+            {
                 WorldEditLogger.postProcess(eventExtent, eventActor, position, location, block, baseBlock, oldType, oldBlock, containerData);
                 return true;
             }
@@ -69,18 +82,28 @@ public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T
     }
 
     @Override
-    public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block) throws WorldEditException {
-        return setBlock(BlockVector3.at(x, y, z), block);
+    public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block) throws WorldEditException
+    {
+        return this.setBlock(BlockVector3.at(x, y, z), block);
+    }
+
+    @Override
+    public int replaceBlocks(final Region region, final Mask mask, final Pattern pattern) throws MaxChangedBlocksException
+    {
+        return this.setBlocks(region, pattern);
     }
 
     @Override
-    public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksException {
+    public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksException
+    {
         org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
-        if (!Config.getConfig(world).WORLDEDIT) {
+        if (!Config.getConfig(world).WORLDEDIT)
+        {
             return eventExtent.setBlocks(region, pattern);
         }
 
-        for (BlockVector3 position : region.clone()) {
+        for (BlockVector3 position : region.clone())
+        {
             BlockState oldBlock = eventExtent.getBlock(position);
             Material oldType = BukkitAdapter.adapt(oldBlock.getBlockType());
             Location location = new Location(world, position.getBlockX(), position.getBlockY(), position.getBlockZ());

From 28d3f0c45d124bd4e75e97990a1821c0d431a032 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Thu, 25 Apr 2024 14:59:44 -0500
Subject: [PATCH 6/7] Remove FAWE toggle entirely

---
 .../java/net/coreprotect/config/Config.java   |  2 -
 .../CoreProtectEditSessionEvent.java          | 87 +++++++++++--------
 .../worldedit/CoreProtectLogger.java          |  1 -
 3 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/src/main/java/net/coreprotect/config/Config.java b/src/main/java/net/coreprotect/config/Config.java
index 1884c61e..b4b501a6 100644
--- a/src/main/java/net/coreprotect/config/Config.java
+++ b/src/main/java/net/coreprotect/config/Config.java
@@ -42,7 +42,6 @@ public class Config extends Language {
     public String MYSQL_USERNAME;
     public String MYSQL_PASSWORD;
     public String LANGUAGE;
-    public boolean ENABLE_FAWE;
     public boolean ENABLE_SSL;
     public boolean DISABLE_WAL;
     public boolean HOVER_EVENTS;
@@ -190,7 +189,6 @@ public class Config extends Language {
     }
 
     private void readValues() {
-        this.ENABLE_FAWE = this.getBoolean("enable-fawe", false);
         this.ENABLE_SSL = this.getBoolean("enable-ssl", false);
         this.DISABLE_WAL = this.getBoolean("disable-wal", false);
         this.HOVER_EVENTS = this.getBoolean("hover-events", true);
diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java b/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
index e7bcb55a..ccd59038 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectEditSessionEvent.java
@@ -5,7 +5,6 @@
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
 import net.coreprotect.CoreProtect;
-import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
@@ -13,68 +12,88 @@
 import net.coreprotect.utility.Chat;
 import org.bukkit.Bukkit;
 
-public class CoreProtectEditSessionEvent {
-
+public class CoreProtectEditSessionEvent
+{
     private static boolean initialized = false;
     private static boolean isFAWE = false;
     private static CoreProtectEditSessionEvent event = new CoreProtectEditSessionEvent();
 
-    public static boolean isInitialized() {
+    public static boolean isInitialized()
+    {
         return initialized;
     }
 
-    public static boolean isFAWE() {
+    public static boolean isFAWE()
+    {
         return isFAWE;
     }
 
-    public static void register() {
-        if (isInitialized()) {
+    public static void register()
+    {
+        if (isInitialized())
+        {
             return;
         }
 
-        try {
-            if (Bukkit.getServer().getPluginManager().getPlugin("FastAsyncWorldEdit") == null || Config.getGlobal().ENABLE_FAWE) {
-                WorldEdit.getInstance().getEventBus().register(new Object() {
-                    @Subscribe
-                    public void onEditSessionEvent(EditSessionEvent event) {
-                        if (event.getActor() != null && event.getStage() == Stage.BEFORE_CHANGE) {
-                            event.setExtent(new CoreProtectLogger(event.getActor(), event.getWorld(), event.getExtent()));
-                        }
+        try
+        {
+            WorldEdit.getInstance().getEventBus().register(new Object()
+            {
+                @Subscribe
+                public void onEditSessionEvent(EditSessionEvent event)
+                {
+                    if (event.getActor() != null && event.getStage() == Stage.BEFORE_CHANGE)
+                    {
+                        event.setExtent(new CoreProtectLogger(event.getActor(), event.getWorld(), event.getExtent()));
                     }
-                });
-                initialized = true;
-                ConfigHandler.worldeditEnabled = true;
-                isFAWE = (Bukkit.getServer().getPluginManager().getPlugin("FastAsyncWorldEdit") != null);
-            }
-        } catch (Exception e) {
+                }
+            });
+            initialized = true;
+            ConfigHandler.worldeditEnabled = true;
+            isFAWE = (Bukkit.getServer().getPluginManager().getPlugin("FastAsyncWorldEdit") != null);
+        }
+        catch (Exception e)
+        {
             // Failed to initialize WorldEdit logging
         }
 
-        Scheduler.runTask(CoreProtect.getInstance(), () -> {
-            try {
-                if (isInitialized()) {
-                    Chat.console(Phrase.build(Phrase.INTEGRATION_SUCCESS, "WorldEdit", Selector.FIRST));
-                } else {
-                    Chat.console(Phrase.build(Phrase.INTEGRATION_ERROR, "WorldEdit", Selector.FIRST));
+        Scheduler.runTask(CoreProtect.getInstance(), () ->
+        {
+            try
+            {
+                if (isInitialized())
+                {
+                    Chat.console(Phrase.build(Phrase.INTEGRATION_SUCCESS, isFAWE() ? "FastAsyncWorldEdit" : "WorldEdit", Selector.FIRST));
                 }
-            } catch (Exception e) {
+                else
+                {
+                    Chat.console(Phrase.build(Phrase.INTEGRATION_ERROR, isFAWE() ? "FastAsyncWorldEdit" : "WorldEdit", Selector.FIRST));
+                }
+            }
+            catch (Exception e)
+            {
                 e.printStackTrace();
             }
         });
     }
 
-    public static void unregister() {
-        if (!isInitialized()) {
+    public static void unregister()
+    {
+        if (!isInitialized())
+        {
             return;
         }
 
-        try {
+        try
+        {
             WorldEdit.getInstance().getEventBus().unregister(event);
             initialized = false;
             ConfigHandler.worldeditEnabled = false;
-            Chat.console(Phrase.build(Phrase.INTEGRATION_SUCCESS, "WorldEdit", Selector.SECOND));
-        } catch (Exception e) {
-            Chat.console(Phrase.build(Phrase.INTEGRATION_ERROR, "WorldEdit", Selector.SECOND));
+            Chat.console(Phrase.build(Phrase.INTEGRATION_SUCCESS, isFAWE() ? "FastAsyncWorldEdit" : "WorldEdit", Selector.SECOND));
+        }
+        catch (Exception e)
+        {
+            Chat.console(Phrase.build(Phrase.INTEGRATION_ERROR, isFAWE() ? "FastAsyncWorldEdit" : "WorldEdit", Selector.SECOND));
         }
     }
 }
diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
index 09f0b16c..7dfdf9eb 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
@@ -22,7 +22,6 @@
 
 public class CoreProtectLogger extends AbstractDelegateExtent
 {
-
     private final Actor eventActor;
     private final World eventWorld;
     private final Extent eventExtent;

From 162c4a80bb7c21e389660be5ab9e1318852a9e1f Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Thu, 25 Apr 2024 15:19:33 -0500
Subject: [PATCH 7/7] oops, i can't do it that way

---
 .../coreprotect/worldedit/CoreProtectLogger.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
index 7dfdf9eb..ac49bb32 100755
--- a/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
+++ b/src/main/java/net/coreprotect/worldedit/CoreProtectLogger.java
@@ -89,7 +89,13 @@ public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T b
     @Override
     public int replaceBlocks(final Region region, final Mask mask, final Pattern pattern) throws MaxChangedBlocksException
     {
-        return this.setBlocks(region, pattern);
+        org.bukkit.World world = BukkitAdapter.adapt(eventWorld);
+        if (!Config.getConfig(world).WORLDEDIT)
+        {
+            return eventExtent.replaceBlocks(region, mask, pattern);
+        }
+        processPatternToBlocks(world, region, pattern);
+        return eventExtent.replaceBlocks(region, mask, pattern);
     }
 
     @Override
@@ -100,7 +106,12 @@ public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksExce
         {
             return eventExtent.setBlocks(region, pattern);
         }
+        processPatternToBlocks(world, region, pattern);
+        return eventExtent.setBlocks(region, pattern);
+    }
 
+    private void processPatternToBlocks(org.bukkit.World world, Region region, Pattern pattern)
+    {
         for (BlockVector3 position : region.clone())
         {
             BlockState oldBlock = eventExtent.getBlock(position);
@@ -114,6 +125,5 @@ public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksExce
             ItemStack[] containerData = CoreProtectEditSessionEvent.isFAWE() ? null : Util.getContainerContents(oldType, null, location);
             WorldEditLogger.postProcess(eventExtent, eventActor, position, location, pattern.applyBlock(position), baseBlock, oldType, oldBlock, containerData);
         }
-        return eventExtent.setBlocks(region, pattern);
     }
 }
\ No newline at end of file