adam/HotbarReplace
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Update for Minecraft 1.20.4

Browse Source
This commit is contained in:
Adam Macdonald 2024-01-24 14:55:23 +00:00
parent a4d23cb3f5
commit d701906701
7 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@ -1,15 +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/

2
LICENSE
View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2023 Adam Macdonald
Copyright (c) 2024 Adam Macdonald
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

8
gradle.properties
View File

@ -6,9 +6,9 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.4
loader_version=0.14.24
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.6
# Mod Properties
mod_version = 0.1.2
@ -16,4 +16,4 @@ maven_group = io.github.twokilohertz.hotbarreplace
archives_base_name = HotbarReplace
# Dependencies
fabric_version=0.90.4+1.20.2
fabric_version=0.95.1+1.20.4

30
src/main/java/io/github/twokilohertz/hotbarreplace/HotbarReplace.java
View File

@ -28,34 +28,44 @@ public class HotbarReplace implements ModInitializer {
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;
// If current screen handler is null, return
if (player.currentScreenHandler == null) return;
if (player.currentScreenHandler == null)
return;
// 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 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
*/
* 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);
}

7
src/main/java/io/github/twokilohertz/hotbarreplace/mixin/BlockItemMixin.java
View File

@ -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);

8
src/main/resources/fabric.mod.json
View File

@ -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": "MIT",
"icon": "assets/hotbarreplace/icon.png",
"environment": "*",
"entrypoints": {
"main": [
@ -26,11 +23,10 @@
"mixins": [
"hotbarreplace.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.21",
"fabricloader": ">=0.15.6",
"fabric-api": "*",
"minecraft": "~1.20",
"java": ">=17"
}
}
}

5
src/main/resources/hotbarreplace.mixins.json
View File

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