Update for Minecraft 1.20.4

Update for 1.19.4 and bump the API and mappings ahead of the 1.20
release! :)

.gitignore

@@ -1,11 +1,18 @@
-# Ignore Gradle project-specific cache directory
+# IntelliJ IDEA stuff
+.idea/
+
+# VSCode stuff
+.vscode/
+
+# Gradle project-specific cache directory
 .gradle/
 
-# Ignore Gradle build output directory
+# Gradle build output directory
 build/
+bin/
 
-# Ignore run directory
+# Run directory
 run/
 
-# IntelliJ IDEA
-.idea/
+# Remapped source file directory
+remappedSrc/

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

@@ -4,5 +4,4 @@ HotbarReplace is a Minecraft mod for the Fabric modding framework which replaces
 
 ### 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

@@ -6,14 +6,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.5
-loader_version=0.14.17
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.6
 
 # Mod Properties
-mod_version = 0.1.1
+mod_version = 0.1.2
 maven_group = io.github.twokilohertz.hotbarreplace
 archives_base_name = HotbarReplace
 
 # Dependencies
-fabric_version=0.76.0+1.19.3
+fabric_version=0.95.1+1.20.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

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

@@ -6,7 +6,6 @@ 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;
@@ -23,41 +22,50 @@ public class HotbarReplace implements ModInitializer {
 
     @Override
     public void onInitialize() {
-        LOGGER.info("HotbarReplace v0.1.1 initialised");
+        LOGGER.info("HotbarReplace v0.1.2 initialised");
     }
 
     public static void tryReplaceSlot(ItemPlacementContext context, Item item) {
         // Return immediately if player is a spectator
         PlayerEntity player = context.getPlayer();
-        if (player.isSpectator()) return;
+        if (player.isSpectator())
+            return;
 
         // Creative inventories don't run out of anyway
-        if (player.getAbilities().creativeMode) return;
+        if (player.getAbilities().creativeMode)
+            return;
 
         // Get reference to player's current inventory
         PlayerInventory inventory = player.getInventory();
-        if (inventory == null) return;
+        if (inventory == null)
+            return;
 
         // Return if the inventory is empty
-        if (inventory.isEmpty()) return;
+        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);
+                    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
-                     PlayerInventory.MAIN_SIZE added to the selected slot (hotbar slot) is the correct slot ID
-                    */
+                     * Wait 50 milliseconds (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 + PlayerInventory.MAIN_SIZE, 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

@@ -18,13 +18,16 @@ public class BlockItemMixin {
     private void BlockItem_place_head(ItemPlacementContext context, CallbackInfoReturnable<ActionResult> info) {
         lastPlacedItem = context.getStack().getItem();
     }
+
     @Inject(at = @At("TAIL"), method = "Lnet/minecraft/item/BlockItem;place(Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/util/ActionResult;")
     private void mixin_BlockItem_place_tail(ItemPlacementContext context, CallbackInfoReturnable<ActionResult> info) {
         // Early return if the block place action would fail
-        if (info.getReturnValue() != ActionResult.SUCCESS) return;
+        if (info.getReturnValue() != ActionResult.SUCCESS)
+            return;
 
         // Check if the stack is not empty, return if so
-        if (context.getStack().getCount() != 0) return;
+        if (context.getStack().getCount() != 0)
+            return;
 
         // Try to replace the hotbar slot
         HotbarReplace.tryReplaceSlot(context, lastPlacedItem);

src/main/resources/fabric.mod.json

@@ -2,7 +2,6 @@
   "schemaVersion": 1,
   "id": "hotbarreplace",
   "version": "${version}",
-
   "name": "HotbarReplace",
   "description": "Replace blocks in your hotbar when you run out with blocks from your inventory",
   "authors": [
@@ -13,10 +12,8 @@
     "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": [
@@ -26,11 +23,10 @@
   "mixins": [
     "hotbarreplace.mixins.json"
   ],
-
   "depends": {
-    "fabricloader": ">=0.14.17",
+    "fabricloader": ">=0.15.6",
     "fabric-api": "*",
-    "minecraft": "~1.19.3",
+    "minecraft": "~1.20",
     "java": ">=17"
   }
-}
+}

src/main/resources/hotbarreplace.mixins.json

@@ -3,12 +3,11 @@
   "minVersion": "0.8",
   "package": "io.github.twokilohertz.hotbarreplace.mixin",
   "compatibilityLevel": "JAVA_17",
-  "mixins": [
-  ],
+  "mixins": [],
   "client": [
     "BlockItemMixin"
   ],
   "injectors": {
     "defaultRequire": 1
   }
-}
+}