Generified revisions for the sake of extensibility

src/client/java/dev/enjarai/trickster/revision/CreateInnerCircleRevision.java

@@ -0,0 +1,17 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class CreateInnerCircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(0, 4, 8, 5);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        drawingPart.glyph = new SpellPart();
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/CreateOuterSubcircleRevision.java

@@ -0,0 +1,27 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class CreateOuterSubcircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(6, 3, 0, 4, 8);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        if (drawingPart != root) {
+            if (root.glyph == drawingPart) {
+                root.subParts.add(new SpellPart());
+            } else {
+                drawingPart.setSubPartInTree(current -> {
+                    current.subParts.add(new SpellPart());
+                    return current;
+                }, root, true);
+            }
+        }
+
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/CreateSubcircleRevision.java

@@ -0,0 +1,17 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class CreateSubcircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(0, 4, 8, 7);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        drawingPart.subParts.add(new SpellPart());
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/DeleteBranchRevision.java

@@ -0,0 +1,20 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class DeleteBranchRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(0, 4, 8, 5, 2, 1, 0, 3, 6, 7, 8);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        if (drawingPart == root)
+            return new SpellPart();
+
+        drawingPart.setSubPartInTree(current -> null, root, false);
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/DeleteCircleRevision.java

@@ -0,0 +1,22 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class DeleteCircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(0, 4, 8);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        var firstSubpart = drawingPart.getSubParts().stream().findFirst();
+
+        if (drawingPart == root)
+            return firstSubpart.orElse(new SpellPart());
+
+        drawingPart.setSubPartInTree(current -> firstSubpart.orElse(null), root, false);
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ExecuteOffHandRevision.java

@@ -0,0 +1,18 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ExecuteOffHandRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(4, 3, 0, 4, 5, 2, 4, 1);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        //TODO: make this independent of SpellPartWidget
+        ctx.executeOffhand();
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/InsertParentCircleRevision.java

@@ -0,0 +1,23 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class InsertParentCircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(3, 0, 4, 8);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        var newPart = new SpellPart();
+        newPart.subParts.add(drawingPart);
+
+        if (drawingPart == root)
+            return newPart;
+
+        drawingPart.setSubPartInTree(current -> newPart, root, false);
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/IntoInnerCircleRevision.java

@@ -0,0 +1,23 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class IntoInnerCircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(1, 0, 4, 8);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        var newPart = new SpellPart();
+        newPart.glyph = drawingPart;
+
+        if (drawingPart == root)
+            return newPart;
+
+        drawingPart.setSubPartInTree(current -> newPart, root, false);
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ReplaceCircleWithCrowMindRevision.java

@@ -0,0 +1,16 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ReplaceCircleWithCrowMindRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(4, 1, 2, 4, 3, 6, 8, 5);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        return root; //TODO
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ReplaceCircleWithOffHandRevision.java

@@ -0,0 +1,22 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ReplaceCircleWithOffHandRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(4, 0, 1, 4, 2, 1);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        var offhand = ctx.getOtherHandSpell().deepClone();
+
+        if (drawingPart == root)
+            return offhand;
+
+        drawingPart.setSubPartInTree(current -> offhand, root, false);
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ReplaceGlyphWithOffHandRevision.java

@@ -0,0 +1,17 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ReplaceGlyphWithOffHandRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(1, 2, 4, 1, 0, 4, 7);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        drawingPart.glyph = ctx.getOtherHandSpell().deepClone();
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ReplaceOuterCircleRevision.java

@@ -0,0 +1,23 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ReplaceOuterCircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(1, 2, 4, 6);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        if (drawingPart != root) {
+            if (root.glyph == drawingPart)
+                return drawingPart;
+
+            drawingPart.setSubPartInTree(current -> drawingPart, root, true);
+        }
+
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/Revision.java

@@ -0,0 +1,20 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public interface Revision {
+    /**
+     * @return The pattern that triggers this revision.
+     */
+    Pattern pattern();
+
+    /**
+     * Applies this revision over the root spell part, replacing the root with this function's return.
+     * @param ctx The context of the editor.
+     * @param root The current root.
+     * @param drawingPart The spell part that is being drawn in.
+     * @return The new root spell part.
+     */
+    SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart);
+}

src/client/java/dev/enjarai/trickster/revision/Revisions.java

@@ -0,0 +1,38 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+
+import java.util.*;
+
+public class Revisions {
+    private static final Map<Pattern, Revision> REGISTRY = new HashMap<>();
+
+    public static final Revision CREATE_SUBCIRCLE = register(new CreateSubcircleRevision());
+    public static final Revision CREATE_INNER_CIRCLE = register(new CreateInnerCircleRevision());
+    public static final Revision INSERT_PARENT_CIRCLE = register(new InsertParentCircleRevision());
+    public static final Revision INTO_INNER_CIRCLE = register(new IntoInnerCircleRevision());
+    public static final Revision REPLACE_OUTER_CIRCLE = register(new ReplaceOuterCircleRevision());
+    public static final Revision CREATE_OUTER_SUBCIRCLE = register(new CreateOuterSubcircleRevision());
+    public static final Revision DELETE_CIRCLE = register(new DeleteCircleRevision());
+    public static final Revision DELETE_BRANCH = register(new DeleteBranchRevision());
+    public static final Revision SWAP_SUBCIRCLE = register(new SwapSubcircleRevision());
+    public static final Revision SHIFT_SUBCIRCLE_BACKWARDS = register(new ShiftSubcircleBackwardsRevision());
+    public static final Revision SHIFT_SUBCIRCLE_FORWARDS = register(new ShiftSubcircleForwardsRevision());
+    public static final Revision REPLACE_CIRCLE_WITH_OFF_HAND = register(new ReplaceCircleWithOffHandRevision());
+    public static final Revision REPLACE_GLYPH_WITH_OFF_HAND = register(new ReplaceGlyphWithOffHandRevision());
+    public static final Revision REPLACE_CIRCLE_WITH_CROW_MIND = register(new ReplaceCircleWithCrowMindRevision());
+    public static final Revision EXECUTE_OFF_HAND = register(new ExecuteOffHandRevision());
+    public static final Revision WRITE_ADDRESS_TO_OFF_HAND = register(new WriteAddressToOffHandRevision());
+
+    public static Optional<Revision> lookup(Pattern pattern) {
+        return Optional.ofNullable(REGISTRY.get(pattern));
+    }
+
+    public static Revision register(Revision revision) {
+        if (REGISTRY.put(revision.pattern(), revision) != null) {
+            //TODO: add override warning
+        }
+
+        return revision;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ShiftSubcircleBackwardsRevision.java

@@ -0,0 +1,19 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ShiftSubcircleBackwardsRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(1, 0, 3);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        if (!drawingPart.subParts.isEmpty())
+            drawingPart.subParts.add(drawingPart.subParts.removeFirst());
+
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/ShiftSubcircleForwardsRevision.java

@@ -0,0 +1,19 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class ShiftSubcircleForwardsRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(1, 2, 5);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        if (!drawingPart.subParts.isEmpty())
+            drawingPart.subParts.addFirst(drawingPart.subParts.removeLast());
+
+        return root;
+    }
+}

src/client/java/dev/enjarai/trickster/revision/SwapSubcircleRevision.java

@@ -0,0 +1,19 @@
+package dev.enjarai.trickster.revision;
+
+import dev.enjarai.trickster.spell.Pattern;
+import dev.enjarai.trickster.spell.SpellPart;
+
+public class SwapSubcircleRevision implements Revision {
+    @Override
+    public Pattern pattern() {
+        return Pattern.of(2, 4, 3);
+    }
+
+    @Override
+    public SpellPart apply(RevisionContext ctx, SpellPart root, SpellPart drawingPart) {
+        if (drawingPart.subParts.size() > 1)
+            drawingPart.subParts.addFirst(drawingPart.subParts.remove(1));
+
+        return root;
+    }
+}