Items from armour slots no longer moved to hotbar, fixes #1

LICENSE

@@ -1,15 +1,21 @@
-HotbarReplace Minecraft Mod
-Copyright (C) 2023  Adam Macdonald
+MIT License
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+Copyright (c) 2023 Adam Macdonald
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,8 @@
+## HotbarReplace
+
+HotbarReplace is a Minecraft mod for the Fabric modding framework which replaces blocks in your hotbar with blocks of the same type from your inventory.
+
+### Known issues/Improvements
+
+* The mod won't refill your hotbar slot with other stacks in other hotbar slots
+* Make the mod more resilient to network delay and packet loss (don't hardcode a 50 ms delay)

gradle.properties

@@ -11,8 +11,8 @@ yarn_mappings=1.19.3+build.5
 loader_version=0.14.17
 
 # Mod Properties
-mod_version = 0.1.0
-maven_group = io.github.twokilohertz
+mod_version = 0.1.2
+maven_group = io.github.twokilohertz.hotbarreplace
 archives_base_name = HotbarReplace
 
 # Dependencies

src/main/java/io/github/twokilohertz/hotbarreplace/HotbarReplace.java

@@ -1,4 +1,4 @@
-package io.github.twokilohertz;
+package io.github.twokilohertz.hotbarreplace;
 
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.client.MinecraftClient;
@@ -6,13 +6,11 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.item.ItemStack;
 import net.minecraft.screen.slot.SlotActionType;
 import org.lwjgl.glfw.GLFW;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -24,7 +22,7 @@ public class HotbarReplace implements ModInitializer {
 
     @Override
     public void onInitialize() {
-        LOGGER.info("HotbarReplace initialised");
+        LOGGER.info("HotbarReplace v0.1.2 initialised");
     }
 
     public static void tryReplaceSlot(ItemPlacementContext context, Item item) {
@@ -42,21 +40,22 @@ public class HotbarReplace implements ModInitializer {
         // Return if the inventory is empty
         if (inventory.isEmpty()) return;
 
-        // Attempt to find a stack of matching items
-        for (int i = 0; i < inventory.main.size(); i++) {
-            if (i == inventory.selectedSlot) continue;
+        // If current screen handler is null, return
+        if (player.currentScreenHandler == null) return;
 
-            ItemStack stack = inventory.main.get(i);
-
-            if (stack.isOf(item)) {
+        // Attempt to find a stack of matching items in the player's inventory
+        for (int i = 0; i < player.currentScreenHandler.slots.size(); i++) {
+            if (player.currentScreenHandler.slots.get(i).getStack().isOf(item)) {
                 // Simulate moving the stack from one slot to another
                 if (client != null) {
                     client.interactionManager.clickSlot(player.currentScreenHandler.syncId, i, GLFW.GLFW_MOUSE_BUTTON_1, SlotActionType.PICKUP, player);
 
-                    // Wait 50 seconds (on another thread) before attempting to move the new stack
-                    // The magic number 36 is the offset to get the hotbar slotId
+                    /*
+                     Wait 50 seconds (on another thread) before attempting to move the new stack
+                     PlayerInventory.MAIN_SIZE added to the selected slot (hotbar slot) is the correct slot ID
+                    */
                     scheduler.schedule(() -> {
-                        client.interactionManager.clickSlot(player.currentScreenHandler.syncId, inventory.selectedSlot + 36, GLFW.GLFW_MOUSE_BUTTON_1, SlotActionType.PICKUP, player);
+                        client.interactionManager.clickSlot(player.currentScreenHandler.syncId, inventory.selectedSlot + PlayerInventory.MAIN_SIZE, GLFW.GLFW_MOUSE_BUTTON_1, SlotActionType.PICKUP, player);
                     }, 50, TimeUnit.MILLISECONDS);
                 }
 

src/main/java/io/github/twokilohertz/hotbarreplace/mixin/BlockItemMixin.java

@@ -1,4 +1,4 @@
-package io.github.twokilohertz.mixin;
+package io.github.twokilohertz.hotbarreplace.mixin;
 
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
@@ -8,7 +8,7 @@ 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.CallbackInfoReturnable;
-import io.github.twokilohertz.HotbarReplace;
+import io.github.twokilohertz.hotbarreplace.HotbarReplace;
 
 @Mixin(BlockItem.class)
 public class BlockItemMixin {

src/main/resources/fabric.mod.json

@@ -9,17 +9,18 @@
     "Adam Macdonald"
   ],
   "contact": {
-    "homepage": "https://twokilohertz.github.io/",
-    "sources": "https://twokilohertz.github.io/"
+    "homepage": "https://github.com/twokilohertz/HotbarReplace",
+    "sources": "https://github.com/twokilohertz/HotbarReplace",
+    "issues": "https://github.com/twokilohertz/HotbarReplace/issues"
   },
 
-  "license": "GPLv3",
+  "license": "MIT",
   "icon": "assets/hotbarreplace/icon.png",
 
   "environment": "*",
   "entrypoints": {
     "main": [
-      "io.github.twokilohertz.HotbarReplace"
+      "io.github.twokilohertz.hotbarreplace.HotbarReplace"
     ]
   },
   "mixins": [

src/main/resources/hotbarreplace.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "io.github.twokilohertz.mixin",
+  "package": "io.github.twokilohertz.hotbarreplace.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],