Alter implementation

dordsor21 · dordsor21 · commit 6ae144909dc9 · 2025-05-18T12:50:28.000+01:00
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/SchemGen.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/SchemGen.java
@@ -1,6 +1,7 @@
 package com.fastasyncworldedit.core.function.generator;
 
 import com.fastasyncworldedit.core.math.MutableBlockVector3;
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
@@ -92,7 +93,7 @@ public boolean spawn(Random random, int x, int z) throws WorldEditException {
         if (transform.isIdentity()) {
             clipboard.paste(extent, mutable, false);
         } else {
-            transform.mutate();
+            MutatingOperationTransformHolder.transform(transform);
             clipboard.paste(extent, mutable, false, transform);
         }
         mutable.mutY(y);
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/RandomFullClipboardPattern.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/RandomFullClipboardPattern.java
@@ -1,6 +1,7 @@
 package com.fastasyncworldedit.core.function.pattern;
 
 import com.fastasyncworldedit.core.math.MutableBlockVector3;
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
@@ -67,7 +68,7 @@ public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws W
         if (newTransform.isIdentity()) {
             clipboard.paste(extent, set, false);
         } else {
-            newTransform.mutate();
+            MutatingOperationTransformHolder.transform(newTransform);
             clipboard.paste(extent, set, false, newTransform);
         }
         return true;
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/transform/MutatingOperationTransformHolder.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/math/transform/MutatingOperationTransformHolder.java
@@ -1,6 +1,8 @@
 package com.fastasyncworldedit.core.math.transform;
 
+import com.fastasyncworldedit.core.extent.transform.MultiTransform;
 import com.sk89q.worldedit.math.Vector3;
+import com.sk89q.worldedit.math.transform.CombinedTransform;
 import com.sk89q.worldedit.math.transform.Transform;
 
 import java.util.function.Function;
@@ -28,6 +30,23 @@ public MutatingOperationTransformHolder(T transform, Function<? super T, ? exten
         this.operation = operation;
     }
 
+    /**
+     * Perform a mutation on the given transform, if supported. Else, does nothing. This mutation will depend on the specific
+     * transform implementation.
+     * <p>
+     * Implementation detail: it may be possible for this method to be called multiple times before an operation actually occurs.
+     *
+     * @since TODO
+     */
+    public static void transform(Transform transform) {
+        switch (transform) {
+            case MutatingOperationTransformHolder<?> mutating -> mutating.mutate();
+            case CombinedTransform combined -> combined.getTransforms().forEach(MutatingOperationTransformHolder::transform);
+            default -> {
+            }
+        }
+    }
+
     /**
      * Apply the mutator to the transform
      *
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
@@ -32,6 +32,7 @@
 import com.fastasyncworldedit.core.extent.clipboard.WorldCopyClipboard;
 import com.fastasyncworldedit.core.internal.io.FastByteArrayOutputStream;
 import com.fastasyncworldedit.core.limit.FaweLimit;
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.fastasyncworldedit.core.util.ImgurUtility;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.fastasyncworldedit.core.util.MaskTraverser;
@@ -404,7 +405,7 @@ public void run(OutputStream out) {
             final Clipboard target;
             // If we have a transform, bake it into the copy
             if (!transform.isIdentity()) {
-                transform.mutate();
+                MutatingOperationTransformHolder.transform(transform);
                 target = clipboard.transform(transform);
             } else {
                 target = clipboard;
@@ -474,7 +475,7 @@ public void place(
         if (selectPasted || onlySelect || removeEntities) {
             BlockVector3 clipboardOffset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
             Transform transform = holder.getTransform();
-            transform.mutate();
+            MutatingOperationTransformHolder.transform(transform);
             BlockVector3 realTo = to.add(transform.apply(clipboardOffset.toVector3()).toBlockPoint());
             BlockVector3 max = realTo.add(transform
                     .apply(region.getMaximumPoint().subtract(region.getMinimumPoint()).toVector3())
@@ -566,7 +567,7 @@ public void paste(
 
         if (selectPasted || onlySelect || removeEntities) {
             BlockVector3 clipboardOffset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
-            holder.getTransform().mutate(); //FAWE: mutate transform
+            MutatingOperationTransformHolder.transform(holder.getTransform()); //FAWE: mutate transform
             Vector3 realTo = to.toVector3().add(holder.getTransform().apply(clipboardOffset.toVector3()));
             Vector3 max = realTo.add(holder
                     .getTransform()
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -915,7 +915,7 @@ private abstract static class SchematicOutputTask<T> implements Callable<T> {
         protected void writeToOutputStream(OutputStream outputStream) throws IOException, WorldEditException {
             Clipboard clipboard = holder.getClipboard();
             Transform transform = holder.getTransform();
-            transform.mutate(); //FAWE: mutate transform
+            MutatingOperationTransformHolder.transform(transform); //FAWE: mutate transform
             Clipboard target = clipboard.transform(transform);
 
             try (Closer closer = Closer.create()) {
@@ -955,7 +955,7 @@ public Void call() throws Exception {
             Clipboard target;
 
             //FAWE start
-            transform.mutate();
+            MutatingOperationTransformHolder.transform(transform);
             boolean checkFilesize = Settings.settings().PATHS.PER_PLAYER_SCHEMATICS
                     && actor.getLimit().SCHEM_FILE_SIZE_LIMIT > -1;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java
@@ -21,6 +21,7 @@
 
 import com.fastasyncworldedit.core.extent.ResettableExtent;
 import com.fastasyncworldedit.core.extent.SupplyingExtent;
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.sk89q.worldedit.EmptyClipboardException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
@@ -98,7 +99,7 @@ public static void register(WorldEdit worldEdit, CommandManager commandManager)
                             try {
                                 ClipboardHolder holder = context.getSession().getClipboard();
                                 Transform transform = holder.getTransform();
-                                transform.mutate(); //FAWE: mutate transform
+                                MutatingOperationTransformHolder.transform(transform); //FAWE: mutate transform
                                 Extent target;
                                 if (transform.isIdentity()) {
                                     target = holder.getClipboard();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java
@@ -19,6 +19,7 @@
 
 package com.sk89q.worldedit.command.tool.brush;
 
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
@@ -90,7 +91,7 @@ public void build(EditSession editSession, BlockVector3 position, Pattern patter
             int rotate = 90 * ThreadLocalRandom.current().nextInt(4);
             transform = ((AffineTransform) transform).rotateY(rotate);
             if (originalTransform != null) {
-                originalTransform.mutate();
+                MutatingOperationTransformHolder.transform(originalTransform);
                 transform = originalTransform.combine(transform);
             }
         }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/math/transform/CombinedTransform.java b/worldedit-core/src/main/java/com/sk89q/worldedit/math/transform/CombinedTransform.java
@@ -19,6 +19,7 @@
 
 package com.sk89q.worldedit.math.transform;
 
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.sk89q.worldedit.math.Vector3;
 
 import java.util.ArrayList;
@@ -96,11 +97,18 @@ public Transform combine(Transform other) {
         }
     }
 
-    @Override
-    public void mutate() {
-        for (Transform transform : transforms) {
-            transform.mutate();
-        }
+    //FAWE start
+
+    /**
+     * Get an unmodifiable view of the transforms stored by this {@link CombinedTransform}. Individuable transforms may be
+     * mutable ({@link MutatingOperationTransformHolder})
+     *
+     * @return view of held transforms
+     * @since TODO
+     */
+    public List<Transform> getTransforms() {
+        return List.of(transforms);
     }
+    //FAWE end
 
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/math/transform/Transform.java b/worldedit-core/src/main/java/com/sk89q/worldedit/math/transform/Transform.java
@@ -58,18 +58,4 @@ public interface Transform {
      */
     Transform combine(Transform other);
 
-    //FAWE start- mutating transforms
-
-    /**
-     * Perform a mutation on this transform, if supported. Else, does nothing. This mutation will depend on the specific
-     * transform implementation.
-     * <p>
-     * Implementation detail: it may be possible for this method to be called multiple times before an operation actually occurs.
-     *
-     * @since TODO
-     */
-    default void mutate() {
-    }
-    //FAWE end
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java
@@ -19,6 +19,7 @@
 
 package com.sk89q.worldedit.session;
 
+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.fastasyncworldedit.core.util.MaskTraverser;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.extent.Extent;
@@ -144,7 +145,7 @@ public Operation build() {
         //FAWE start
         Extent extent = clipboard;
         if (!transform.isIdentity()) {
-            transform.mutate();
+            MutatingOperationTransformHolder.transform(transform);
             extent = new BlockTransformExtent(extent, transform);
         }
         //FAWE end

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`package com.sk89q.worldedit.command.tool.brush;`
`21`	`21`
	`22`	`+import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;`
`22`	`23`	`import com.sk89q.worldedit.EditSession;`
`23`	`24`	`import com.sk89q.worldedit.MaxChangedBlocksException;`
`24`	`25`	`import com.sk89q.worldedit.extent.clipboard.Clipboard;`
`@@ -90,7 +91,7 @@ public void build(EditSession editSession, BlockVector3 position, Pattern patter`
`90`	`91`	`int rotate = 90 * ThreadLocalRandom.current().nextInt(4);`
`91`	`92`	`transform = ((AffineTransform) transform).rotateY(rotate);`
`92`	`93`	`if (originalTransform != null) {`
`93`		`- originalTransform.mutate();`
	`94`	`+ MutatingOperationTransformHolder.transform(originalTransform);`
`94`	`95`	`transform = originalTransform.combine(transform);`
`95`	`96`	`}`
`96`	`97`	`}`