Add config options: openDebugPort, smartDebuggerSneakScroll

Author: object-Object

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())

Common/src/main/kotlin/gay/object/hexdebug/adapter/proxy/DebugProxyClient.kt

@@ -41,6 +41,7 @@ data class DebugProxyClient(val input: InputStream, val output: OutputStream) {
         var instance: DebugProxyClient? = null
             private set
 
+        private val enabled get() = HexDebugConfig.get().client.openDebugPort
         private val port get() = HexDebugConfig.get().client.debugPort
 
         private val executorService = Executors.newCachedThreadPool()
@@ -96,6 +97,9 @@ data class DebugProxyClient(val input: InputStream, val output: OutputStream) {
         }
 
         private suspend fun runServer(selector: SelectorManager) {
+            if (!enabled) {
+                awaitCancellation()
+            }
             HexDebug.LOGGER.info("Listening for debug client on port {}...", port)
             aSocket(selector).tcp().bind(port = port).use { serverSocket ->
                 while (true) {

Common/src/main/kotlin/gay/object/hexdebug/config/HexDebugConfig.kt

@@ -5,6 +5,7 @@ import me.shedaniel.autoconfig.AutoConfig
 import me.shedaniel.autoconfig.ConfigData
 import me.shedaniel.autoconfig.annotation.Config
 import me.shedaniel.autoconfig.annotation.ConfigEntry.Category
+import me.shedaniel.autoconfig.annotation.ConfigEntry.Gui.Tooltip
 import me.shedaniel.autoconfig.annotation.ConfigEntry.Gui.TransitiveObject
 import me.shedaniel.autoconfig.serializer.PartitioningSerializer
 import me.shedaniel.autoconfig.serializer.PartitioningSerializer.GlobalData
@@ -37,6 +38,13 @@ object HexDebugConfig {
 
     @Config(name = "client")
     class Client : ConfigData {
+        @Tooltip
+        val openDebugPort: Boolean = true
+
+        @Tooltip
         val debugPort: Int = 4444
+
+        @Tooltip
+        val smartDebuggerSneakScroll: Boolean = true
     }
 }

Common/src/main/resources/assets/hexdebug/lang/en_us.flatten.json5

@@ -20,7 +20,18 @@
       },
       option: {
         client: {
-          debugPort: "Debug Port",
+          openDebugPort: {
+            "": "Open Debug Port",
+            "@Tooltip": "Whether or not a port should be opened. If false, the Debugger effectively becomes useless.",
+          },
+          debugPort: {
+            "": "Debug Port",
+            "@Tooltip": "Port number (1024-65535) to open for the debug client (eg. VSCode) to connect to.",
+          },
+          smartDebuggerSneakScroll: {
+            "": "Smart Debugger Sneak-Scroll",
+            "@Tooltip": "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).",
+          },
         },
       },
     },