Merge branch 'main' into 1.19

# Conflicts:
#	CHANGELOG.md
#	Common/src/generated/resources/data/hexdebug/advancements/recipes/hexdebug.hexdebug/evaluator.json
#	Common/src/main/kotlin/gay/object/hexdebug/debugger/HexDebugger.kt
#	Common/src/main/kotlin/gay/object/hexdebug/registry/HexDebugItems.kt
#	Common/src/main/resources/assets/hexdebug/lang/en_us.flatten.json5
#	Common/src/main/resources/hexdebug-common.mixins.json
#	Forge/src/main/kotlin/gay/object/hexdebug/forge/ForgeHexDebug.kt
#	Forge/src/main/kotlin/gay/object/hexdebug/forge/datagen/HexDebugRecipes.kt
#	gradle.properties

Author: object-Object

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and [Pydantic's HISTORY.md](https://github.com/pydantic/pydantic/blob/main/HISTORY.md), and this project *mostly* adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [UNRELEASED]
+
+### Added
+
+- New item: Evaluator!
+    - A staff that allows evaluating expressions in an ongoing debug session. The stack and ravenmind update to reflect the state of the Debugger whenever it changes.
+    - When the Evaluator's grid is cleared, the Debugger is reset to the state it was in just before the first pattern was drawn in the Evaluator.
+- New config options:
+    - Open Debug Port: Whether or not a port should be opened. If false, the Debugger effectively becomes useless.
+    - Smart Debugger Sneak-Scroll: If a hex is not currently being debugged and a Debugger is in your main hand, prefer shift-scrolling whatever item is in your offhand (eg. a spellbook).
+        - This was already a feature; it's just configurable now.
+
+### Changed
+
+- Moved some relatively unimportant log messages from INFO to DEBUG.
+
 ## 0.1.1+1.19.2
 
 - Initial version for 1.19.2.

Common/build.gradle.kts

@@ -29,5 +29,5 @@ dependencies {
 
     api(libs.bundles.lsp4j)
 
-    implementation(libs.ktor.network)
+    implementation(libs.bundles.ktor)
 }

Common/src/generated/resources/assets/hexdebug/models/item/debugger.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "overrides": [
     {
       "model": "hexdebug:item/debugger/not_debugging/continue/empty",

Common/src/generated/resources/assets/hexdebug/models/item/evaluator.json

@@ -0,0 +1,20 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "overrides": [
+    {
+      "model": "hexdebug:item/evaluator/default",
+      "predicate": {
+        "hexdebug:eval_state": 0.0
+      }
+    },
+    {
+      "model": "hexdebug:item/evaluator/modified",
+      "predicate": {
+        "hexdebug:eval_state": 0.5
+      }
+    }
+  ],
+  "textures": {
+    "layer0": "hexdebug:item/evaluator"
+  }
+}

Common/src/generated/resources/assets/hexdebug/models/item/evaluator/default.json

@@ -0,0 +1,3 @@
+{
+  "parent": "hexdebug:item/evaluator"
+}

Common/src/generated/resources/assets/hexdebug/models/item/evaluator/modified.json

@@ -0,0 +1,6 @@
+{
+  "parent": "hexdebug:item/evaluator",
+  "textures": {
+    "layer1": "hexdebug:item/evaluator/eval_state/modified"
+  }
+}

Common/src/generated/resources/data/hexcasting/tags/items/staves.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "hexdebug:evaluator"
+  ]
+}

Common/src/generated/resources/data/hexdebug/recipes/debugger.json

@@ -1,20 +1,20 @@
 {
   "type": "minecraft:crafting_shaped",
   "key": {
-    "A": {
-      "item": "hexcasting:artifact"
-    },
     "C": {
       "item": "hexcasting:charged_amethyst"
     },
-    "G": {
+    "L": {
       "item": "minecraft:gold_ingot"
+    },
+    "U": {
+      "item": "hexcasting:artifact"
     }
   },
   "pattern": [
     " CC",
-    " AC",
-    "G  "
+    " UC",
+    "L  "
   ],
   "result": {
     "item": "hexdebug:debugger"

Common/src/generated/resources/data/hexdebug/recipes/evaluator.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "C": {
+      "item": "hexcasting:charged_amethyst"
+    },
+    "L": {
+      "item": "hexcasting:slate_block"
+    },
+    "U": {
+      "item": "hexcasting:slate_block"
+    }
+  },
+  "pattern": [
+    " CC",
+    " UC",
+    "L  "
+  ],
+  "result": {
+    "item": "hexdebug:evaluator"
+  },
+  "show_notification": true
+}

Common/src/main/java/gay/object/hexdebug/mixin/MixinShiftScrollListener.java

@@ -1,16 +1,14 @@
 package gay.object.hexdebug.mixin;
 
 import at.petrak.hexcasting.client.ShiftScrollListener;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import gay.object.hexdebug.config.HexDebugConfig;
 import gay.object.hexdebug.items.ItemDebugger;
 import gay.object.hexdebug.registry.HexDebugItems;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.Item;
 import org.jetbrains.annotations.Contract;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -45,6 +43,7 @@ public abstract class MixinShiftScrollListener {
             && (player.isShiftKeyDown() || !needsSneaking)
             && !player.isSpectator()
             // additional logic
+            && HexDebugConfig.INSTANCE.get().getClient().getSmartDebuggerSneakScroll()
             && !ItemDebugger.isDebugging()
             && player.getMainHandItem().getItem() == HexDebugItems.DEBUGGER.getValue()
             && hexdebug$invokeIsScrollableItem(player.getOffhandItem().getItem())