diff --git a/build.gradle b/build.gradle index 9fc84cd..e3da84f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 33d69be..a4b4d50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true # Fabric Properties -minecraft_version=1.21 -yarn_mappings=1.21+build.9 -loader_version=0.15.11 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +loader_version=0.16.13 # Mod Properties mod_version = 0.1.3 @@ -13,4 +13,4 @@ maven_group = xyz.twokilohertz archives_base_name = HotbarReplace # Dependencies -fabric_version=0.100.7+1.21 +fabric_version=0.121.0+1.21.5 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi 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, +# * DEFAULT_JVM_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. diff --git a/src/client/java/xyz/twokilohertz/HotbarReplace.java b/src/client/java/xyz/twokilohertz/HotbarReplace.java index 333fda7..0bfaac1 100644 --- a/src/client/java/xyz/twokilohertz/HotbarReplace.java +++ b/src/client/java/xyz/twokilohertz/HotbarReplace.java @@ -65,7 +65,7 @@ public class HotbarReplace implements ClientModInitializer { scheduler.schedule(() -> { client.interactionManager.clickSlot(player.currentScreenHandler.syncId, - inventory.selectedSlot + PlayerInventory.MAIN_SIZE, GLFW.GLFW_MOUSE_BUTTON_1, + inventory.getSelectedSlot() + PlayerInventory.MAIN_SIZE, GLFW.GLFW_MOUSE_BUTTON_1, SlotActionType.PICKUP, player); }, click_delay, TimeUnit.MILLISECONDS); } diff --git a/src/client/java/xyz/twokilohertz/mixin/BlockItemMixin.java b/src/client/java/xyz/twokilohertz/mixin/BlockItemMixin.java index 9bc8121..faa746e 100644 --- a/src/client/java/xyz/twokilohertz/mixin/BlockItemMixin.java +++ b/src/client/java/xyz/twokilohertz/mixin/BlockItemMixin.java @@ -20,7 +20,7 @@ public class BlockItemMixin { } @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 info) { + private void BlockItem_place_tail(ItemPlacementContext context, CallbackInfoReturnable info) { // Early return if the block place action would fail if (info.getReturnValue() != ActionResult.SUCCESS) return;