Merge branch 'main' into dependabot/gradle/org.gradle.toolchains.foojay-resolver-convention-1.0.0

Author: Yarden-zamir

.github/workflows/publish.yml

@@ -37,8 +37,8 @@ jobs:
           modrinth-id: column-quick-swap
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
-          # curseforge-id: UPDATE_ME
-          # curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          curseforge-id: 1410978
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
           files: |
             build/libs/!(*-@(fabric|sources|dev)).jar

README.md

@@ -0,0 +1,12 @@
+# Column Quick Swap
+
+Quickly swap items between your hotbar and the inventory column above it.
+
+## Usage
+
+1. Hold **V** (default) while hovering over a hotbar slot
+2. A popup appears showing the 3 inventory slots directly above
+3. Select a slot to swap with your hotbar:
+   - **Mouse**: Hover and release V
+   - **Keys**: Press 1, 2, or 3 (top to bottom)
+   - **Scroll**: Change hotbar selection while picker is open

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xms2G -Duser.language=en -XX:+UseParallelGC
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
 
 systemProp.file.encoding=utf-8
 

src/main/kotlin/yarden_zamir/column_quick_swap/Config.kt

@@ -21,7 +21,24 @@ internal val json = Json {
 
 @OnlyIn(Dist.CLIENT)
 @Serializable
-data class ClientConfig(val pressTicks: Int = 20) {
+data class ClientConfig(
+    /** Ticks to hold key before popup opens (0 = instant) */
+    val pressTicks: Int = 0,
+    /** Play sound when swapping items */
+    val playSound: Boolean = true,
+    /** Sound volume (0.0 to 1.0) */
+    val soundVolume: Float = 0.3f,
+    /** Sound pitch (higher = higher pitch) */
+    val soundPitch: Float = 1.4f,
+    /** Close popup and select item when key is released */
+    val closeOnRelease: Boolean = true,
+    /** Highlight color for hovered slot (ARGB hex) */
+    val highlightColor: Int = 0x80FFFFFF.toInt(),
+    /** Show item tooltips on hover */
+    val showTooltips: Boolean = true,
+    /** Allow scrolling to change hotbar slot while popup is open */
+    val allowScroll: Boolean = true
+) {
     companion object {
         private val path = FMLPaths.CONFIGDIR.get() / "${ColumnQuickSwap.ID}.client.json"
 

src/main/kotlin/yarden_zamir/column_quick_swap/client/ColumnPickScreen.kt

@@ -13,6 +13,7 @@ import net.minecraftforge.api.distmarker.Dist
 import net.minecraftforge.api.distmarker.OnlyIn
 import net.minecraftforge.client.event.ScreenEvent
 import net.minecraftforge.common.MinecraftForge
+import yarden_zamir.column_quick_swap.ClientConfig
 import yarden_zamir.column_quick_swap.ColumnQuickSwap
 import yarden_zamir.column_quick_swap.DrawableNineSliceTexture
 import yarden_zamir.column_quick_swap.networking.C2SSwapColumnSlotPacket
@@ -101,17 +102,19 @@ class ColumnPickScreen(
     }
 
     private fun selectSlot(columnRow: Int) {
-        // Play click sound - quieter, higher pitch
-        minecraft?.soundManager?.play(
-            SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK.value(), 1.4f, 0.3f)
-        )
+        val cfg = ClientConfig.config
+        if (cfg.playSound) {
+            minecraft?.soundManager?.play(
+                SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK.value(), cfg.soundPitch, cfg.soundVolume)
+            )
+        }
         Networking.channel.sendToServer(C2SSwapColumnSlotPacket(hotbarSlot, columnRow))
         onClose()
     }
 
     override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-        // Check if key released - select hovered item
-        if (!SlotInteractManager.columnPicking) {
+        // Check if key released - select hovered item (if closeOnRelease enabled)
+        if (ClientConfig.config.closeOnRelease && !SlotInteractManager.columnPicking) {
             renderables.asSequence()
                 .filterIsInstance<ColumnSlotButton>()
                 .firstOrNull { it.isMouseOver(mouseX.toDouble(), mouseY.toDouble()) }
@@ -156,6 +159,8 @@ class ColumnPickScreen(
     override fun isPauseScreen(): Boolean = false
 
     override fun mouseScrolled(mouseX: Double, mouseY: Double, delta: Double): Boolean {
+        if (!ClientConfig.config.allowScroll) return false
+
         // Allow scrolling to change hotbar selection
         val player = minecraft?.player ?: return false
         val inventory = player.inventory
@@ -207,8 +212,8 @@ private class ColumnSlotButton(
 
         // Hover highlight
         if (isMouseOver(mouseX.toDouble(), mouseY.toDouble())) {
-            guiGraphics.fill(x + 1, y + 1, x + width - 1, y + height - 1, 0x80FFFFFF.toInt())
-            if (!item.isEmpty) {
+            guiGraphics.fill(x + 1, y + 1, x + width - 1, y + height - 1, ClientConfig.config.highlightColor)
+            if (!item.isEmpty && ClientConfig.config.showTooltips) {
                 renderTooltip(guiGraphics, mouseX, mouseY)
             }
         }

src/main/kotlin/yarden_zamir/column_quick_swap/client/SlotInteractManager.kt

@@ -22,7 +22,7 @@ object SlotInteractManager {
     private const val OPEN_COOLDOWN_MS = 100L
 
     val COLUMN_PICK_KEY =
-        KeyMapping("key.column_quick_swap.column_pick", InputConstants.KEY_G, "key.categories.inventory")
+        KeyMapping("key.column_quick_swap.column_pick", InputConstants.KEY_V, "key.categories.inventory")
 
     init {
         MOD_BUS.addListener { event: RegisterKeyMappingsEvent ->