Feature: Be able to yoink single items.

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 	id("me.modmuss50.mod-publish-plugin") version "0.8.4"
 }
 
-val modVersion = "1.7.2"
+val modVersion = "1.8.0"
 
 version = "${modVersion}+${property("mod.mod_version") as String}"
 group = property("maven_group") as String

src/client/java/me/thatonedevil/mixin/client/HandledScreenAccessor.java

@@ -0,0 +1,15 @@
+package me.thatonedevil.mixin.client;
+
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.screen.slot.Slot;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(HandledScreen.class)
+public interface HandledScreenAccessor {
+
+    @Accessor("focusedSlot")
+    Slot yoinkgui$getFocusedSlot();
+}
+
+

src/client/java/me/thatonedevil/mixin/client/ScreenMixin.java

@@ -2,14 +2,21 @@
 
 import me.thatonedevil.YoinkGUIClient;
 import me.thatonedevil.config.YoinkGuiSettings;
+import me.thatonedevil.handlers.ParseButtonHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.*;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
 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;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import static net.minecraft.text.Text.literal;
 
@@ -52,10 +59,10 @@ private void render(DrawContext context, int mouseX, int mouseY, float deltaTick
         int mouseXUi = (int) (client.mouse.getX() * scaledWidth / client.getWindow().getWidth());
         int mouseYUi = (int) (client.mouse.getY() * scaledHeight / client.getWindow().getHeight());
 
-        YoinkGUIClient.INSTANCE.setParseButtonHovered(mouseXUi >= parseButtonX && mouseXUi <= parseButtonX + parseButtonWidth &&
+        ParseButtonHandler.INSTANCE.setParseButtonHovered(mouseXUi >= parseButtonX && mouseXUi <= parseButtonX + parseButtonWidth &&
                 mouseYUi >= parseButtonY && mouseYUi <= parseButtonY + parseButtonHeight);
 
-        int parseBgColor = YoinkGUIClient.INSTANCE.getParseButtonHovered() ? 0xAA444444 : 0xAA000000;
+        int parseBgColor = ParseButtonHandler.INSTANCE.getParseButtonHovered() ? 0xAA444444 : 0xAA000000;
         context.fill(parseButtonX, parseButtonY, parseButtonX + parseButtonWidth, parseButtonY + parseButtonHeight, parseBgColor);
         context.drawCenteredTextWithShadow(
                 client.textRenderer,
@@ -64,7 +71,28 @@ private void render(DrawContext context, int mouseX, int mouseY, float deltaTick
                 parseButtonY + (parseButtonHeight - 8) / 2,
                 0xFFFFFFFF
         );
+    }
+
+    @Inject(method = "getTooltipFromItem", at = @At("RETURN"), cancellable = true)
+    private static void onGetTooltipFromItem(MinecraftClient client, ItemStack stack, CallbackInfoReturnable<List<Text>> cir) {
+        if (!(client.currentScreen instanceof HandledScreen)) {
+            return;
+        }
+
+        YoinkGuiSettings config = YoinkGUIClient.getYoinkGuiSettings();
+
+        if (!config.getEnableSingleItemYoink().get()) {
+            return;
+        }
+
+        List<Text> originalTooltip = cir.getReturnValue();
+
+        List<Text> modifiedTooltip = new ArrayList<>(originalTooltip);
+
+        modifiedTooltip.add(literal(""));
+        modifiedTooltip.add(literal("§ePress Y to Yoink item"));
 
+        cir.setReturnValue(modifiedTooltip);
     }
 
 }

src/client/kotlin/me/thatonedevil/NBTParser.kt

@@ -12,6 +12,7 @@ import me.thatonedevil.utils.Utils
 import me.thatonedevil.nbt.ComponentValueRegistry
 import me.thatonedevil.utils.LatestErrorLog
 import me.thatonedevil.utils.api.UpdateChecker.serverName
+import net.minecraft.nbt.NbtElement
 import java.io.File
 import java.io.FileWriter
 import java.time.Duration
@@ -74,34 +75,42 @@ object NBTParser {
         }
     }
 
-
-    suspend fun saveFormattedNBTToFile(nbtList: List<String>, configDir: File) = withContext(Dispatchers.IO) {
+    private suspend fun saveNbtFile(
+        configDir: String,
+        rawItems: List<String>
+    ) = withContext(Dispatchers.IO) {
         val start = LocalDateTime.now()
         val formattedTime = start.format(DateTimeFormatter.ofPattern("MM-dd HH-mm-ss"))
+
         try {
-            val yoinkDir = File(configDir, "assets/yoinkgui").apply { mkdirs() }
-            val fileName = "${serverName}-${formattedTime}.txt"
-            val file = File(yoinkDir, fileName)
+            val yoinkDir = File(configDir).apply { mkdirs() }
+            val file = File(yoinkDir, "${serverName}-${formattedTime}.txt")
 
             FileWriter(file).use { writer ->
-                val contentItems = nbtList.mapIndexedNotNull { i, raw ->
-                    val formatted = parseNewNBTFormat(raw)
-                    if (formatted.isNotBlank()) Pair(i, formatted) else null
+                val items = rawItems.mapNotNull { raw ->
+                    val formatted = runCatching { parseNewNBTFormat(raw) }.getOrNull()
+                    if (formatted.isNullOrBlank()) null else raw to formatted
                 }
 
                 writer.write("=== Formatted NBT Data ===\n")
                 writer.write("Generated: $formattedTime\n")
-                writer.write("Items with content: ${contentItems.size} / ${nbtList.size}\n\n")
+                writer.write("Items with content: ${items.size} / ${rawItems.size}\n\n")
+
                 writer.write("=== Details ===\n")
                 writer.write("Mod Version: ${BuildConfig.VERSION}\n")
                 writer.write("Minecraft Version: ${BuildConfig.MC_VERSION}\n\n")
 
-                contentItems.forEachIndexed { outIdx, (originalIndex, formatted) ->
-                    writer.write("=== ITEM ${originalIndex + 1} ===\n")
-                    if (YoinkGuiSettings.includeRawNbt.get()) { writer.write("Raw NBT: ${nbtList[originalIndex]}\n") }
+                items.forEachIndexed { index, (raw, formatted) ->
+                    writer.write("=== ITEM ${index + 1} ===\n")
+                    if (YoinkGuiSettings.includeRawNbt.get()) {
+                        writer.write("Raw NBT: $raw\n")
+                    }
 
                     writer.write("\n$formatted\n")
-                    if (outIdx < contentItems.lastIndex) writer.write("\n${"=".repeat(50)}\n\n")
+
+                    if (index < items.lastIndex) {
+                        writer.write("\n${"=".repeat(50)}\n\n")
+                    }
                 }
             }
 
@@ -118,4 +127,25 @@ object NBTParser {
             logger.error("Error saving NBT file: ${e.message}", e)
         }
     }
+
+    suspend fun saveFormattedNBTToFile(
+        nbtList: List<String>,
+        configDir: String
+    ) {
+        saveNbtFile(
+            "${configDir}/yoinkgui",
+            nbtList
+        )
+    }
+
+    suspend fun saveSingleItem(
+        rawNbt: String,
+        configDir: String
+    ) {
+        saveNbtFile(
+            "${configDir}/yoinkgui/items",
+            listOf(rawNbt)
+        )
+    }
+
 }

src/client/kotlin/me/thatonedevil/YoinkGUIClient.kt

@@ -1,106 +1,31 @@
 package me.thatonedevil
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import me.thatonedevil.commands.YoinkGuiClientCommandRegistry
 import me.thatonedevil.config.YoinkGuiSettings
-import me.thatonedevil.gui.ButtonPositionScreen
-import me.thatonedevil.inventory.TopInventory
-import me.thatonedevil.inventory.YoinkInventory
-import me.thatonedevil.utils.LatestErrorLog
-import me.thatonedevil.utils.Utils.sendChat
-import me.thatonedevil.utils.Utils.toClickCopy
+import me.thatonedevil.handlers.KeyboardEventHandler
+import me.thatonedevil.handlers.ParseButtonHandler
+import me.thatonedevil.keybinds.KeybindManager
 import me.thatonedevil.utils.api.UpdateChecker
 import net.fabricmc.api.ClientModInitializer
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
-import net.minecraft.client.MinecraftClient
-import net.minecraft.client.option.KeyBinding
-import net.minecraft.client.util.InputUtil
-import net.minecraft.util.Identifier
-import org.lwjgl.glfw.GLFW
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+
 object YoinkGUIClient : ClientModInitializer {
-    var parseButtonHovered = false
-    private var wasLeftClicking = false
     val logger: Logger = LoggerFactory.getLogger(BuildConfig.MOD_ID)
 
     @JvmStatic
     val yoinkGuiSettings = YoinkGuiSettings
 
-    //? if >=1.21.9 {
-    private val positionButtonKeybind = KeyBindingHelper.registerKeyBinding(
-        KeyBinding(
-            "key.yoinkgui.position",
-            InputUtil.Type.KEYSYM,
-            GLFW.GLFW_KEY_M,
-            KeyBinding.Category.create(Identifier.of("keybinds"))
-        )
-    )
-    //? } else {
-    /*private val positionButtonKeybind = KeyBindingHelper.registerKeyBinding(
-        KeyBinding(
-            "key.yoinkgui.position",
-            InputUtil.Type.KEYSYM,
-            GLFW.GLFW_KEY_M,
-            "key.category.minecraft.keybinds"
-        )
-    )*/
-    //?}
-
     override fun onInitializeClient() {
-        ClientTickEvents.END_CLIENT_TICK.register { client ->
-            if (positionButtonKeybind.wasPressed()) {
-                client.setScreen(ButtonPositionScreen(client.currentScreen))
-            }
-
-            val isLeftClicking = GLFW.glfwGetMouseButton(client.window.handle, GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS
-
-            if (client.currentScreen == null) {
-                return@register
-            }
-            if (client.currentScreen is ButtonPositionScreen) {
-                return@register
-            }
-
-            if (client.player != null && isLeftClicking && !wasLeftClicking) {
-                when {
-                    parseButtonHovered -> handleParseButton(client)
-                }
-            }
-
-            wasLeftClicking = isLeftClicking
-        }
-
         UpdateChecker.setupJoinListener()
         YoinkGuiClientCommandRegistry.register()
-        yoinkGuiSettings // Load settings on client init
-    }
-
-    fun handleParseButton(client: MinecraftClient) {
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val player = client.player ?: return@launch
-                val configDir = client.runDirectory.resolve("config")
-                val yoinkInventory = YoinkInventory(player, TopInventory(client))
-                val yoinkedItems = yoinkInventory.apply { yoinkItems() }.getYoinkedItems().map { it.toString() }
+        KeybindManager().register()
 
-                if (yoinkedItems.isEmpty()) {
-                    sendChat("<color:#FF6961>Inventory is empty!")
-                    return@launch
-                }
-
-                NBTParser.saveFormattedNBTToFile(yoinkedItems, configDir)
-
-            } catch (e: Exception) {
-                LatestErrorLog.record(e, "Error during NBT parsing")
-                sendChat("<color:#FF6961>Error during NBT parsing: ${e.message} &7&o(Report on github, Click to copy)".toClickCopy(e.message.toString()))
-                logger.error("Error during NBT parsing: ${e.stackTraceToString()}")
+        yoinkGuiSettings // Load settings on client init
 
-            }
-        }
+        // Register event handlers
+        ParseButtonHandler.register()
+        KeyboardEventHandler.register()
     }
 }

src/client/kotlin/me/thatonedevil/commands/YoinkGuiClientCommandRegistry.kt

@@ -2,6 +2,7 @@ package me.thatonedevil.commands
 
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
+import me.thatonedevil.config.ModMenuIntegration
 import me.thatonedevil.gui.ButtonPositionScreen
 import me.thatonedevil.gui.ChangelogScreen
 import me.thatonedevil.utils.api.UpdateChecker
@@ -52,6 +53,16 @@ object YoinkGuiClientCommandRegistry {
                     ClientCommandManager.literal("debug")
                         .executes { _ -> debugCommand.execute() }
                 )
+                .then(
+                    ClientCommandManager.literal("config")
+                        .executes { context ->
+                            val client = context.source.client
+                            client.send {
+                                client.setScreen(ModMenuIntegration().createScreen(null))
+                            }
+                            Command.SINGLE_SUCCESS
+                        }
+                )
 
         )
     }

src/client/kotlin/me/thatonedevil/config/ModMenuIntegration.kt

@@ -18,7 +18,7 @@ class ModMenuIntegration : ModMenuApi {
         createScreen(parentScreen)
     }
 
-    private fun createScreen(parentScreen: Screen?): Screen {
+    fun createScreen(parentScreen: Screen?): Screen {
         val screen = YetAnotherConfigLib.createBuilder()
             .save {
                 YoinkGuiSettings.saveToFile()
@@ -36,6 +36,12 @@ class ModMenuIntegration : ModMenuApi {
                         field = yoinkGuiSettings.enableYoinkButton,
                         defaultValue = true
                     ))
+                    .option(booleanOption(
+                        name = "Enable Single Item Yoink",
+                        field = yoinkGuiSettings.enableSingleItemYoink,
+                        defaultValue = true,
+                        description = "Allows yoinking single items when pressing X while hovering."
+                    ))
                     .build())
                 .build())
 

src/client/kotlin/me/thatonedevil/config/YoinkGuiSettings.kt

@@ -19,6 +19,8 @@ open class YoinkGuiSettings() : JsonFileCodecConfig<YoinkGuiSettings>(
     }
 
     val enableYoinkButton by register<Boolean>(default = true, BOOL)
+    val enableSingleItemYoink by register<Boolean>(default = true, BOOL)
+
     val buttonScaleFactor by register<Float>(default = 1.0f, FLOAT)
     val buttonX by register<Int>(default = 40, INT)
     val buttonY by register<Int>(default = 35, INT)