cha0s/FunctionalStorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrades can now be inserted by right clicking and you dont need to shift to use the tools

Browse Source
This commit is contained in:
Buuz135 2021-12-24 11:49:43 +01:00
parent 28ecac8ac2
commit 9ed28467b9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/buuz135/functionalstorage/block/tile/ControllableDrawerTile.java
View File

@ -137,13 +137,23 @@ public abstract class ControllableDrawerTile<T extends ControllableDrawerTile<T>
} }
public InteractionResult onSlotActivated(Player playerIn, InteractionHand hand, Direction facing, double hitX, double hitY, double hitZ, int slot) { public InteractionResult onSlotActivated(Player playerIn, InteractionHand hand, Direction facing, double hitX, double hitY, double hitZ, int slot) {
ItemStack stack = playerIn.getItemInHand(hand);
if (stack.getItem().equals(FunctionalStorage.CONFIGURATION_TOOL.get()) || stack.getItem().equals(FunctionalStorage.LINKING_TOOL.get())) return InteractionResult.PASS;
if (!stack.isEmpty() && stack.getItem() instanceof UpgradeItem){
InventoryComponent component = ((UpgradeItem) stack.getItem()).getType() == UpgradeItem.Type.STORAGE ? storageUpgrades : utilityUpgrades;
for (int i = 0; i < component.getSlots(); i++) {
if (component.getStackInSlot(i).isEmpty()){
playerIn.setItemInHand(hand, component.insertItem(i, stack, false));
return InteractionResult.SUCCESS;
}
}
}
if (super.onActivated(playerIn, hand, facing, hitX, hitY, hitZ) == InteractionResult.SUCCESS) { if (super.onActivated(playerIn, hand, facing, hitX, hitY, hitZ) == InteractionResult.SUCCESS) {
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
if (slot == -1){ if (slot == -1){
openGui(playerIn); openGui(playerIn);
} else if (isServer()){ } else if (isServer()){
ItemStack stack = playerIn.getItemInHand(hand);
if (!stack.isEmpty() && getStorage().isItemValid(slot, stack)) { if (!stack.isEmpty() && getStorage().isItemValid(slot, stack)) {
playerIn.setItemInHand(hand, getStorage().insertItem(slot, stack, false)); playerIn.setItemInHand(hand, getStorage().insertItem(slot, stack, false));
} else if (System.currentTimeMillis() - INTERACTION_LOGGER.getOrDefault(playerIn.getUUID(), System.currentTimeMillis()) < 300) { } else if (System.currentTimeMillis() - INTERACTION_LOGGER.getOrDefault(playerIn.getUUID(), System.currentTimeMillis()) < 300) {