Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve wrenching behavior for disk drive and computer.

Browse Source
This commit is contained in:
Florian Nücke
2021-08-02 23:25:30 +02:00
parent d9d5ff6c36
commit 944ed7d223
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/li/cil/oc2/common/block/ComputerBlock.java
View File

@@ -25,10 +25,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.state.StateContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.shapes.ISelectionContext;
@@ -167,21 +164,25 @@ public final class ComputerBlock extends HorizontalBlock {
final ComputerTileEntity computer = (ComputerTileEntity) tileEntity;
final ItemStack heldItem = player.getItemInHand(hand);
if (!world.isClientSide) {
if (Wrenches.isWrench(heldItem)) {
if (player instanceof ServerPlayerEntity) {
if (Wrenches.isWrench(heldItem)) {
if (!player.isShiftKeyDown()) {
if (!world.isClientSide() && player instanceof ServerPlayerEntity) {
computer.openInventoryScreen((ServerPlayerEntity) player);
}
} else {
return ActionResultType.sidedSuccess(world.isClientSide());
}
} else {
if (!world.isClientSide()) {
if (player.isShiftKeyDown()) {
computer.start();
} else if (player instanceof ServerPlayerEntity) {
computer.openTerminalScreen((ServerPlayerEntity) player);
}
}
return ActionResultType.sidedSuccess(world.isClientSide());
}
return ActionResultType.sidedSuccess(world.isClientSide());
return super.use(state, world, pos, player, hand, hit);
}
@Override

25
src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java
View File

@@ -54,18 +54,25 @@ public final class DiskDriveBlock extends HorizontalBlock {
return super.use(state, world, pos, player, hand, hit);
}
if (!world.isClientSide()) {
final DiskDriveTileEntity diskDrive = (DiskDriveTileEntity) tileEntity;
final ItemStack stack = player.getItemInHand(hand);
if (player.isShiftKeyDown()) {
diskDrive.eject();
} else {
player.setItemInHand(hand, diskDrive.insert(stack));
final DiskDriveTileEntity diskDrive = (DiskDriveTileEntity) tileEntity;
final ItemStack heldStack = player.getItemInHand(hand);
if (player.isShiftKeyDown()) {
if (diskDrive.canEject()) {
if (!world.isClientSide()) {
diskDrive.eject(player);
}
return ActionResultType.sidedSuccess(world.isClientSide());
}
} else {
if (diskDrive.canInsert(heldStack)) {
if (!world.isClientSide()) {
player.setItemInHand(hand, diskDrive.insert(heldStack, player));
}
return ActionResultType.sidedSuccess(world.isClientSide());
}
}
return ActionResultType.sidedSuccess(world.isClientSide());
return super.use(state, world, pos, player, hand, hit);
}
///////////////////////////////////////////////////////////////////