Update README.md

.gitignore

@@ -1,3 +1,5 @@
 .gradle
 .idea
+.project
+.settings/
 build

README.md

@@ -1,8 +1,10 @@
-## WorldEdit Tick Spreader
+## WETS-OG
 
-Spread WorldEdit operations across multiple ticks.
+A fork of [WETS](https://github.com/emilyy-dev/wets) **without Fabric support** maintained for [TrueOG](https://true-og.net/).
 
-That's all. Download on [modrinth](https://modrinth.com/mod/wets).
+The default blocks per tick is 100.
+
+Spreads WorldEdit operations across multiple ticks.
 
 Semi-configurable, single command `/wets` (`/worldedit-tick-spreader`), one permission (`wets`), two possible arguments:
 * `/wets (sorted | not-sorted)` - whether blocks will be placed in a sorted arrangement or not. Sorted is default.
@@ -14,5 +16,4 @@ Sorted placing and block count per tick, affected by commands, are per-player.
 ## License
 Project licensed under the MIT license (also known as Expat license).
 
-The Fabric build of this project redistributes
-[lucko/fabric-permissions-api](https://github.com/lucko/fabric-permissions-api) which is licensed under the MIT license.
+The original project which supports Fabric API can be found [here](https://github.com/emilyy-dev/wets).

build.gradle.kts

@@ -1,20 +1,16 @@
 plugins {
   id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-  id("fabric-loom") version "1.0-SNAPSHOT" apply false
 }
 
 subprojects {
   apply(plugin = "java")
 
-  repositories {
-    mavenCentral()
-    maven("https://maven.enginehub.org/repo/")
+  extensions.configure<JavaPluginExtension>("java") {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
   }
 
-  dependencies {
-    "implementation"("com.sk89q.worldedit:worldedit-core:7.2.13")
-    "implementation"("it.unimi.dsi:fastutil:8.5.9")
-    "compileOnly"("org.jetbrains:annotations:23.0.0")
+  repositories {
+    mavenCentral().mavenContent { releasesOnly() }
   }
 
   tasks {

bukkit/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 repositories {
   maven("https://repo.papermc.io/repository/maven-public/")
+  maven("https://maven.enginehub.org/repo/")
 }
 
 dependencies {
@@ -20,5 +21,7 @@ tasks {
     archiveClassifier.set("bukkit")
   }
 
-  build { dependsOn(shadowJar) }
+  assemble {
+    dependsOn(shadowJar)
+  }
 }

bukkit/src/main/java/ar/emily/wets/bukkit/WESpreadPlugin.java

@@ -20,7 +20,12 @@ public final class WESpreadPlugin extends JavaPlugin implements Listener {
 
   private static final List<String> COMPLETIONS = List.of("sorted", "not-sorted");
 
-  private final WESpread plugin = new WESpread(new AbstractScheduler(getServer()::getCurrentTick, task -> getServer().getScheduler().runTaskTimer(this, task, 1L, 1L)));
+  private final AbstractScheduler scheduler =
+      new AbstractScheduler(
+          getServer()::getCurrentTick,
+          task -> getServer().getScheduler().runTaskTimer(this, task, 1L, 1L)
+      );
+  private final WESpread plugin = new WESpread(this.scheduler);
 
   @EventHandler
   public void on(final PlayerQuitEvent event) {
@@ -34,14 +39,10 @@ public final class WESpreadPlugin extends JavaPlugin implements Listener {
 
   @Override
   public void onEnable() {
+    this.scheduler.setup();
     getServer().getPluginManager().registerEvents(this, this);
   }
 
-  @Override
-  public void onDisable() {
-    this.plugin.flush();
-  }
-
   @Override
   public boolean onCommand(
       final @NotNull CommandSender sender,

bukkit/src/main/resources/plugin.yml

@@ -1,8 +1,8 @@
-name: WorldEditTickSpreader
+name: WETS-OG
 version: ${version}
-website: https://github.com/emilyy-dev/wets
+website: https://github.com/NotAlexNoyle/WETS-OG
 main: ar.emily.wets.bukkit.WESpreadPlugin
-api-version: 1.13
+api-version: 1.18
 depend:
   - WorldEdit
 
@@ -15,4 +15,4 @@ commands:
 
 permissions:
   wets:
-    default: op
+    default: op

common/build.gradle.kts

@@ -1 +1,13 @@
+plugins {
+  `java-library`
+}
 
+repositories {
+  maven("https://maven.enginehub.org/repo/")
+}
+
+dependencies {
+  api("com.sk89q.worldedit:worldedit-core:7.2.13")
+  api("it.unimi.dsi:fastutil:8.5.9")
+  compileOnlyApi("org.jetbrains:annotations:23.0.0")
+}

common/src/main/java/ar/emily/wets/common/AbstractScheduler.java

@@ -6,15 +6,20 @@ import java.util.Queue;
 import java.util.function.Consumer;
 import java.util.function.IntSupplier;
 
-public class AbstractScheduler implements Scheduler {
+public final class AbstractScheduler implements Scheduler {
 
   private final IntSupplier currentTickGetter;
   private final Queue<AbstractTask> pendingTasks = new ArrayDeque<>();
   private final Queue<AbstractTask> tasks = new ArrayDeque<>();
+  private final Consumer<Runnable> underlyingScheduler;
 
   public AbstractScheduler(final IntSupplier currentTickGetter, final Consumer<Runnable> underlyingScheduler) {
     this.currentTickGetter = currentTickGetter;
-    underlyingScheduler.accept(() -> {
+    this.underlyingScheduler = underlyingScheduler;
+  }
+
+  public void setup() {
+    this.underlyingScheduler.accept(() -> {
       processPendingTasks();
       processTasks();
     });

common/src/main/java/ar/emily/wets/common/V5UUID.java

@@ -0,0 +1,55 @@
+package ar.emily.wets.common;
+
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
+import static java.lang.invoke.MethodHandles.byteArrayViewVarHandle;
+
+// why am i overcomplicating this
+final class V5UUID {
+
+  private static final VarHandle AS_LONG_ARRAY = byteArrayViewVarHandle(long[].class, ByteOrder.BIG_ENDIAN);
+  private static final MessageDigest MD;
+
+  static {
+    try {
+      MD = MessageDigest.getInstance("SHA-1");
+    } catch (final NoSuchAlgorithmException ex) {
+      // shouldn't throw, SHA-1 is a standard algorithm that is required by Java SE
+      // https://docs.oracle.com/en/java/javase/17/docs/specs/security/standard-names.html
+      throw new ExceptionInInitializerError(ex);
+    }
+  }
+
+  // MessageDigest isn't thread safe, that's why it's being cloned
+  @SuppressWarnings("AccessToNonThreadSafeStaticField")
+  private static MessageDigest md() {
+    try {
+      return (MessageDigest) MD.clone();
+    } catch (final CloneNotSupportedException ex) {
+      // shouldn't throw
+      throw new RuntimeException(ex);
+    }
+  }
+
+  // use V5 UUID as to not collide with V3 or V4 UUIDs, which are used by the game
+  static UUID create(final byte[] bs) {
+    final var md = md();
+    md.update(bs);
+    final byte[] digest = md.digest();
+    digest[6] &= 0x0f; // clear version
+    digest[6] |= 0x50; // set version 5
+    digest[8] &= 0x3f; // clear variant
+    digest[8] |= (byte) 0x80; // set variant 1
+    return new UUID(
+        (long) AS_LONG_ARRAY.get(digest, 0),
+        (long) AS_LONG_ARRAY.get(digest, 8)
+    );
+  }
+
+  private V5UUID() {
+  }
+}

common/src/main/java/ar/emily/wets/common/WESpread.java

@@ -3,15 +3,17 @@ package ar.emily.wets.common;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
+import com.sk89q.worldedit.event.platform.PlatformUnreadyEvent;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.AbstractBufferingExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.function.operation.RunContext;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Identifiable;
 import com.sk89q.worldedit.util.collection.BlockMap;
+import com.sk89q.worldedit.util.eventbus.EventHandler;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
@@ -22,10 +24,12 @@ import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import org.jetbrains.annotations.Nullable;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.LongSupplier;
@@ -33,17 +37,21 @@ import java.util.stream.Stream;
 
 public final class WESpread {
 
-  private static final Component PLAYERS_ONLY = TextComponent.of("This command can only be ran by players", TextColor.RED);
+  public static final UUID NON_IDENTIFIABLE_ACTOR_ID =
+      V5UUID.create(WESpread.class.descriptorString().getBytes(StandardCharsets.UTF_8));
+
+  // @formatter:off
   private static final Component INVALID_ARGUMENT = TextComponent.of("Blocks per tick must be a valid positive number", TextColor.RED);
   private static final Component COMMAND_USAGE = TextComponent.of("Usage: /wets (<blocks per tick> | sorted | not-sorted)");
   private static final Component COMMAND_SORTED = TextComponent.of("Block placement of new operations will now be sorted");
   private static final Component COMMAND_NOT_SORTED = TextComponent.of("Block placement of new operations will now be unsorted");
   private static final Component COMMAND_BPT_UPDATED = TextComponent.of("Blocks per tick placement updated");
+  // @formatter:on
 
   private final Scheduler scheduler;
   private final Object2LongMap<UUID> blocksPerTickMap = new Object2LongOpenHashMap<>();
   private final Set<UUID> actorsWhosePlacementIsNotSorted = new HashSet<>();
-  private long defaultBlocksPerTick = 1;
+  private long defaultBlocksPerTick = 100;
 
   public WESpread(final Scheduler scheduler) {
     this.scheduler = scheduler;
@@ -54,23 +62,30 @@ public final class WESpread {
     this.actorsWhosePlacementIsNotSorted.remove(id);
   }
 
-  public void flush() {
+  public void load() {
+    WorldEdit.getInstance().getEventBus().register(this);
+  }
+
+  // we really really really want to flush the queue before worldedit itself unloads
+  @Subscribe(priority = EventHandler.Priority.VERY_EARLY)
+  public void on(final PlatformUnreadyEvent event) {
+    WorldEdit.getInstance().getEventBus().unregister(this);
     this.defaultBlocksPerTick = Long.MAX_VALUE;
     this.blocksPerTickMap.clear();
     this.actorsWhosePlacementIsNotSorted.clear();
     this.scheduler.flush();
   }
 
-  public void load() {
-    WorldEdit.getInstance().getEventBus().register(new Object() {
-      @Subscribe
-      public void on(final EditSessionEvent event) {
-        final @Nullable Actor actor = event.getActor();
-        if (event.getStage() == EditSession.Stage.BEFORE_CHANGE && actor != null) {
-          event.setExtent(new SchedulingExtent(event.getExtent(), actor.getUniqueId()));
-        }
-      }
-    });
+  @Subscribe
+  public void on(final EditSessionEvent event) {
+    if (event.getStage() == EditSession.Stage.BEFORE_CHANGE) {
+      final UUID actorId =
+          Optional.ofNullable(event.getActor())
+              .map(Identifiable::getUniqueId)
+              // use a set ID for non-identifiable actors, such as console or potentially API users
+              .orElse(NON_IDENTIFIABLE_ACTOR_ID);
+      event.setExtent(new SchedulingExtent(event.getExtent(), actorId));
+    }
   }
 
   public void command(final Actor source, final List<String> args) {
@@ -78,18 +93,15 @@ public final class WESpread {
       source.print(COMMAND_USAGE);
       return;
     }
-    if (!(source instanceof Player player)) {
-      source.print(PLAYERS_ONLY);
-      return;
-    }
 
+    final UUID id = source.isPlayer() ? source.getUniqueId() : NON_IDENTIFIABLE_ACTOR_ID;
     final String arg = args.iterator().next();
     if ("sorted".equals(arg)) {
-      this.actorsWhosePlacementIsNotSorted.remove(player.getUniqueId());
+      this.actorsWhosePlacementIsNotSorted.remove(id);
       source.print(COMMAND_SORTED);
       return;
     } else if ("not-sorted".equals(arg)) {
-      this.actorsWhosePlacementIsNotSorted.add(player.getUniqueId());
+      this.actorsWhosePlacementIsNotSorted.add(id);
       source.print(COMMAND_NOT_SORTED);
       return;
     }
@@ -97,7 +109,7 @@ public final class WESpread {
     try {
       long blocksPerTick = Long.parseLong(arg);
       if (blocksPerTick < 0) { blocksPerTick = Long.MAX_VALUE; }
-      this.blocksPerTickMap.put(player.getUniqueId(), blocksPerTick);
+      this.blocksPerTickMap.put(id, 100);
       source.print(COMMAND_BPT_UPDATED);
     } catch (final NumberFormatException exception) {
       source.print(INVALID_ARGUMENT);
@@ -111,10 +123,10 @@ public final class WESpread {
     private final LongSupplier blocksPerTick;
     private final boolean sorted;
 
-    private SchedulingExtent(final Extent delegate, final UUID playerId) {
+    private SchedulingExtent(final Extent delegate, final UUID actor) {
       super(delegate);
-      this.sorted = !WESpread.this.actorsWhosePlacementIsNotSorted.contains(playerId);
-      this.blocksPerTick = () -> WESpread.this.blocksPerTickMap.getOrDefault(playerId, WESpread.this.defaultBlocksPerTick);
+      this.sorted = !WESpread.this.actorsWhosePlacementIsNotSorted.contains(actor);
+      this.blocksPerTick = () -> WESpread.this.blocksPerTickMap.getOrDefault(actor, WESpread.this.defaultBlocksPerTick);
     }
 
     @Override
@@ -143,8 +155,7 @@ public final class WESpread {
 
         @Override
         public Operation resume(final RunContext run) {
-          //noinspection PointlessBooleanExpression
-          if (this.started == false && it.hasNext()) {
+          if (!this.started && it.hasNext()) {
             this.started = true;
             WESpread.this.scheduler.runPeriodically(this::putBlock, 1L, 1L);
           }
@@ -159,7 +170,7 @@ public final class WESpread {
               setDelegateBlock(entry.getKey(), entry.getValue());
             }
           } catch (final WorldEditException exception) {
-            throw new RuntimeException(exception.getMessage(), exception);
+            throw new RuntimeException(exception);
           } finally {
             if (!it.hasNext()) { task.cancel(); }
           }

fabric/build.gradle.kts

@@ -1,29 +0,0 @@
-plugins {
-  id("fabric-loom")
-}
-
-repositories {
-  maven("https://oss.sonatype.org/content/repositories/snapshots/")
-}
-
-dependencies {
-  minecraft("com.mojang:minecraft:1.19.3")
-  mappings(loom.officialMojangMappings())
-  modImplementation("net.fabricmc:fabric-loader:0.14.11")
-  setOf(
-    "fabric-command-api-v2",
-    "fabric-lifecycle-events-v1"
-  )
-    .forEach { modImplementation(fabricApi.module(it, "0.72.0+1.19.3")) }
-
-  modImplementation("com.sk89q.worldedit:worldedit-fabric-mc1.19.3:7.2.13")
-  modImplementation("me.lucko:fabric-permissions-api:0.2-SNAPSHOT") { include(this) }
-  implementation(project(":wets-common")) { include(this) }
-}
-
-tasks {
-  remapJar {
-    archiveBaseName.set("WETS")
-    archiveClassifier.set("fabric")
-  }
-}

fabric/src/main/java/ar/emily/wets/fabric/WESpreadMod.java

@@ -1,67 +0,0 @@
-package ar.emily.wets.fabric;
-
-import ar.emily.wets.common.AbstractScheduler;
-import ar.emily.wets.common.WESpread;
-import com.mojang.brigadier.Command;
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.tree.LiteralCommandNode;
-import com.sk89q.worldedit.fabric.FabricAdapter;
-import me.lucko.fabric.api.permissions.v0.Permissions;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-import net.minecraft.commands.CommandSourceStack;
-
-import java.util.List;
-import java.util.function.Predicate;
-
-import static com.mojang.brigadier.arguments.LongArgumentType.getLong;
-import static com.mojang.brigadier.arguments.LongArgumentType.longArg;
-import static net.minecraft.commands.Commands.LEVEL_GAMEMASTERS;
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
-
-public final class WESpreadMod implements ModInitializer {
-
-  private static final List<String> SORTED = List.of("sorted");
-  private static final List<String> NOT_SORTED = List.of("not-sorted");
-
-  private WESpread plugin;
-
-  @Override
-  public void onInitialize() {
-    CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> command(dispatcher));
-    ServerLifecycleEvents.SERVER_STARTING.register(server -> {
-      this.plugin = new WESpread(new AbstractScheduler(server::getTickCount, task -> ServerTickEvents.END_SERVER_TICK.register(s -> task.run())));
-      this.plugin.load();
-    });
-    ServerLifecycleEvents.SERVER_STOPPING.register(server -> this.plugin.flush());
-    ServerPlayConnectionEvents.DISCONNECT.register((packetListener, server) ->
-        this.plugin.playerLogout(packetListener.getPlayer().getUUID())
-    );
-  }
-
-  private int executeCommand(final CommandContext<CommandSourceStack> ctx, final List<String> args) throws CommandSyntaxException {
-    this.plugin.command(FabricAdapter.adaptPlayer(ctx.getSource().getPlayerOrException()), args);
-    return Command.SINGLE_SUCCESS;
-  }
-
-  private void command(final CommandDispatcher<CommandSourceStack> dispatcher) {
-    final Predicate<CommandSourceStack> permissionRequirement = Permissions.require("wets", LEVEL_GAMEMASTERS);
-    final LiteralCommandNode<CommandSourceStack> wetsCommand = dispatcher.register(
-        literal("worldedit-tick-spreader")
-            .requires(permissionRequirement)
-            .then(literal("sorted").executes(ctx -> executeCommand(ctx, SORTED)))
-            .then(literal("not-sorted").executes(ctx -> executeCommand(ctx, NOT_SORTED)))
-            .then(argument("blocks-per-tick", longArg()).executes(ctx ->
-                executeCommand(ctx, List.of(String.valueOf(getLong(ctx, "blocks-per-tick"))))
-            ))
-    );
-
-    dispatcher.register(literal("wets").requires(permissionRequirement).redirect(wetsCommand));
-  }
-}

fabric/src/main/resources/fabric.mod.json

@@ -1,31 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "worldedit-tick-spreader",
-  "version": "${version}",
-
-  "icon": "assets/worldedit-tick-spreader/icon.png",
-  "name": "WorldEdit Tick Spreader",
-  "authors": [
-    "emilyy-dev"
-  ],
-  "contact": {
-    "sources": "https://github.com/emilyy-dev/wets",
-    "issues": "https://github.com/emilyy-dev/wets/issues"
-  },
-
-  "license": "MIT",
-  "environment": "*",
-  "entrypoints": {
-    "main": [
-      "ar.emily.wets.fabric.WESpreadMod"
-    ]
-  },
-
-  "depends": {
-    "fabric-permissions-api-v0": "*",
-    "fabricloader": "*",
-    "java": ">=17",
-    "minecraft": "1.19.3",
-    "worldedit": "*"
-  }
-}

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.caching=false
 group=ar.emily
-version=0.0.2
+version=0.0.3

settings.gradle.kts

@@ -2,13 +2,12 @@ rootProject.name = "worldedit-spread-placing"
 
 pluginManagement {
   repositories {
-    maven("https://maven.fabricmc.net/")
     mavenCentral()
     gradlePluginPortal()
   }
 }
 
-listOf("common", "bukkit", "fabric").forEach {
+listOf("common", "bukkit").forEach {
   include(it)
   project(":$it").name = "wets-$it"
 }