added support to prevent hotbar selection change when changing settings

Author: Taskeren

src/main/java/cn/elytra/mod/bandit/mixin/MinecraftMixin.java

@@ -0,0 +1,22 @@
+package cn.elytra.mod.bandit.mixin;
+
+import cn.elytra.mod.bandit.MixinBridger;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Minecraft.class)
+public class MinecraftMixin {
+
+    @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/InventoryPlayer;changeCurrentItem(I)V"), cancellable = true)
+    private void bandit$hookMouseScroll(CallbackInfo ci, @Local(ordinal = 1) int i) {
+        var shouldCancel = MixinBridger.fireMouseScrollCancelable(i);
+        if(shouldCancel) {
+            ci.cancel();
+        }
+    }
+
+}

src/main/kotlin/cn/elytra/mod/bandit/MixinBridger.kt

@@ -0,0 +1,22 @@
+package cn.elytra.mod.bandit
+
+object MixinBridger {
+
+    /**
+     * Callbacks in this list will be fired when mouse scrolls.
+     * Return `true` to cancel the scroll operation (the selected item in hotbar won't change), but
+     * will not prevent continuing the callback.
+     */
+    val onMouseScrollCancelable: MutableList<(scrollValue: Int) -> Boolean> = mutableListOf()
+
+    // internal usage only
+    @JvmStatic
+    fun fireMouseScrollCancelable(value: Int): Boolean {
+        var canceled = false
+        for(callback in onMouseScrollCancelable) {
+            canceled = canceled or callback(value)
+        }
+        return canceled
+    }
+
+}

src/main/kotlin/cn/elytra/mod/bandit/client/VeinMiningHUD.kt

@@ -144,7 +144,7 @@ object VeinMiningHUD {
     private fun drawExecutorSelectionMenu(heightBase: Int) = drawCircleList(executors, heightBase)
     private fun drawBlockFilterSelectionMenu(heightBase: Int) = drawCircleList(blockFilters, heightBase)
 
-    internal fun withActiveMenu(block: CircleList<*>.() -> Unit) {
+    internal inline fun withActiveMenu(block: CircleList<*>.() -> Unit) {
         activeMenu?.let(block)
     }
 

src/main/kotlin/cn/elytra/mod/bandit/client/VeinMiningHandlerClient.kt

@@ -1,6 +1,7 @@
 package cn.elytra.mod.bandit.client
 
 import cn.elytra.mod.bandit.BanditMod
+import cn.elytra.mod.bandit.MixinBridger
 import cn.elytra.mod.bandit.client.VeinMiningHandlerClient.keyPressed
 import cn.elytra.mod.bandit.client.VeinMiningHandlerClient.onMouseInput
 import cn.elytra.mod.bandit.client.VeinMiningHandlerClient.veinMiningBlockFilterId
@@ -10,13 +11,11 @@ import com.gtnewhorizon.gtnhlib.blockpos.BlockPos
 import com.gtnewhorizon.gtnhlib.eventbus.EventBusSubscriber
 import cpw.mods.fml.client.event.ConfigChangedEvent
 import cpw.mods.fml.common.eventhandler.SubscribeEvent
-import cpw.mods.fml.common.gameevent.InputEvent
 import cpw.mods.fml.common.gameevent.TickEvent
 import net.minecraft.client.Minecraft
 import net.minecraft.client.settings.KeyBinding
 import net.minecraftforge.client.event.RenderWorldLastEvent
 import org.lwjgl.input.Keyboard
-import org.lwjgl.input.Mouse
 
 /**
  * The object that handles all the things about Vein Mining on the client side.
@@ -54,6 +53,11 @@ object VeinMiningHandlerClient {
      */
     var maxSelectionRenderCount = 1024
 
+    init {
+        // register the callback
+        MixinBridger.onMouseScrollCancelable += this::onMouseInput
+    }
+
     @JvmStatic
     @SubscribeEvent
     fun onClientTick(e: TickEvent.ClientTickEvent) {
@@ -67,17 +71,17 @@ object VeinMiningHandlerClient {
         }
     }
 
-    @JvmStatic
-    @SubscribeEvent
-    fun onMouseInput(e: InputEvent.MouseInputEvent) {
-        val d = Mouse.getEventDWheel()
+    fun onMouseInput(d: Int): Boolean {
         VeinMiningHUD.withActiveMenu {
             if(d < 0) {
                 this.move(1)
+                return true
             } else if (d > 0) {
                 this.move(-1)
+                return true
             }
         }
+        return false
     }
 
     @JvmStatic

src/main/resources/mixins.bandit.json

@@ -6,6 +6,7 @@
   "target": "@env(DEFAULT)",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "MinecraftMixin",
     "MinecraftServerMixin"
   ]
 }