Merge branch 'main' into ignite-spell-tweaks

Common/src/main/java/at/petrak/hexcasting/api/mod/HexConfig.java

@@ -47,10 +47,13 @@ public interface ClientConfigAccess {
 
         double gridSnapThreshold();
 
+        boolean clickingTogglesDrawing();
+
         boolean DEFAULT_CTRL_TOGGLES_OFF_STROKE_ORDER = false;
         boolean DEFAULT_INVERT_SPELLBOOK_SCROLL = false;
         boolean DEFAULT_INVERT_ABACUS_SCROLL = false;
         double DEFAULT_GRID_SNAP_THRESHOLD = 0.5;
+        boolean DEFAULT_CLICKING_TOGGLES_DRAWING = false;
     }
 
     public interface ServerConfigAccess {

Common/src/main/java/at/petrak/hexcasting/client/gui/GuiSpellcasting.kt

@@ -131,7 +131,16 @@ class GuiSpellcasting constructor(
         if (super.mouseClicked(mxOut, myOut, pButton)) {
             return true
         }
+        if (HexConfig.client().clickingTogglesDrawing()) {
+            return if (this.drawState is PatternDrawState.BetweenPatterns)
+                drawStart(mxOut, myOut)
+            else
+                drawEnd()
+        }
+        return drawStart(mxOut, myOut)
+    }
 
+    private fun drawStart(mxOut: Double, myOut: Double): Boolean {
         val mx = Mth.clamp(mxOut, 0.0, this.width.toDouble())
         val my = Mth.clamp(myOut, 0.0, this.height.toDouble())
         if (this.drawState is PatternDrawState.BetweenPatterns) {
@@ -156,11 +165,23 @@ class GuiSpellcasting constructor(
         return false
     }
 
+    override fun mouseMoved(mxOut: Double, myOut: Double) {
+        super.mouseMoved(mxOut, myOut)
+
+        if (HexConfig.client().clickingTogglesDrawing() && this.drawState !is PatternDrawState.BetweenPatterns)
+            drawMove(mxOut, myOut)
+    }
+
     override fun mouseDragged(mxOut: Double, myOut: Double, pButton: Int, pDragX: Double, pDragY: Double): Boolean {
         if (super.mouseDragged(mxOut, myOut, pButton, pDragX, pDragY)) {
             return true
         }
+        if (HexConfig.client().clickingTogglesDrawing())
+            return false
+        return drawMove(mxOut, myOut)
+    }
 
+    private fun drawMove(mxOut: Double, myOut: Double): Boolean {
         val mx = Mth.clamp(mxOut, 0.0, this.width.toDouble())
         val my = Mth.clamp(myOut, 0.0, this.height.toDouble())
 
@@ -237,7 +258,12 @@ class GuiSpellcasting constructor(
         if (super.mouseReleased(mx, my, pButton)) {
             return true
         }
+        if (HexConfig.client().clickingTogglesDrawing())
+            return false
+        return drawEnd()
+    }
 
+    private fun drawEnd(): Boolean {
         when (this.drawState) {
             PatternDrawState.BetweenPatterns -> {}
             is PatternDrawState.JustStarted -> {

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/spells/cyclevariant.json

@@ -0,0 +1,18 @@
+{
+  "name": "hexcasting.action.hexcasting:cycle_variant",
+  "category": "hexcasting:patterns/spells",
+  "icon": "minecraft:smithing_table",
+  "sortnum": 6,
+  "advancement": "hexcasting:root",
+  "read_by_default": true,
+  "pages": [
+    {
+      "type": "hexcasting:pattern",
+      "op_id": "hexcasting:cycle_variant",
+      "anchor": "hexcasting:cycle_variant",
+      "input": "",
+      "output": "",
+      "text": "hexcasting.page.cycle_variant"
+    }
+  ]
+}

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/spells/flight.json

@@ -3,7 +3,7 @@
   "category": "hexcasting:patterns/spells",
   "icon": "minecraft:feather",
   "advancement": "hexcasting:root",
-  "sortnum": 6,
+  "sortnum": 7,
   "read_by_default": true,
   "pages": [
     "hexcasting.page.flights.1",

Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java

@@ -132,6 +132,8 @@ public static final class Client implements HexConfig.ClientConfigAccess, Config
         private boolean invertAbacusScrollDirection = DEFAULT_INVERT_SPELLBOOK_SCROLL;
         @ConfigEntry.Gui.Tooltip
         private double gridSnapThreshold = DEFAULT_GRID_SNAP_THRESHOLD;
+        @ConfigEntry.Gui.Tooltip
+        private boolean clickingTogglesDrawing = DEFAULT_CLICKING_TOGGLES_DRAWING;
 
         @Override
         public void validatePostLoad() throws ValidationException {
@@ -157,6 +159,11 @@ public boolean invertAbacusScrollDirection() {
         public double gridSnapThreshold() {
             return gridSnapThreshold;
         }
+
+        @Override
+        public boolean clickingTogglesDrawing() {
+             return clickingTogglesDrawing;
+        }
     }
 
     @Config(name = "server")

Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java

@@ -82,6 +82,7 @@ public static class Client implements HexConfig.ClientConfigAccess {
         private static ForgeConfigSpec.BooleanValue invertSpellbookScrollDirection;
         private static ForgeConfigSpec.BooleanValue invertAbacusScrollDirection;
         private static ForgeConfigSpec.DoubleValue gridSnapThreshold;
+        private static ForgeConfigSpec.BooleanValue clickingTogglesDrawing;
 
         public Client(ForgeConfigSpec.Builder builder) {
             ctrlTogglesOffStrokeOrder = builder.comment(
@@ -98,6 +99,9 @@ public Client(ForgeConfigSpec.Builder builder) {
                     "When using a staff, the distance from one dot you have to go to snap to the next dot, where 0.5 " +
                         "means 50% of the way.")
                 .defineInRange("gridSnapThreshold", DEFAULT_GRID_SNAP_THRESHOLD, 0.5, 1.0);
+            clickingTogglesDrawing = builder.comment(
+                            "Whether you click to start and stop drawing instead of clicking and dragging")
+                    .define("clickingTogglesDrawing", DEFAULT_CLICKING_TOGGLES_DRAWING);
         }
 
         @Override
@@ -119,6 +123,11 @@ public boolean ctrlTogglesOffStrokeOrder() {
         public double gridSnapThreshold() {
             return gridSnapThreshold.get();
         }
+
+        @Override
+        public boolean clickingTogglesDrawing() {
+            return clickingTogglesDrawing.get();
+        }
     }
 
     public static class Server implements HexConfig.ServerConfigAccess {