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

Give block module a cooldown.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-19 11:37:20 +01:00
parent 6a8c96d8df
commit 21e742435a
5 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/api/bus/device/Device.java
View File

@@ -22,6 +22,6 @@ public interface Device extends INBTSerializable<CompoundNBT> {
}
@Override
default void deserializeNBT(final CompoundNBT nbt) {
default void deserializeNBT(final CompoundNBT tag) {
}
}

50
src/main/java/li/cil/oc2/common/bus/device/item/BlockOperationsModuleDevice.java
View File

@@ -8,6 +8,7 @@ import li.cil.oc2.api.bus.device.rpc.RPCDevice;
import li.cil.oc2.api.bus.device.rpc.RPCMethod;
import li.cil.oc2.api.capabilities.Robot;
import li.cil.oc2.common.Config;
import li.cil.oc2.common.Constants;
import li.cil.oc2.common.bus.device.util.IdentityProxy;
import li.cil.oc2.common.tags.ItemTags;
import li.cil.oc2.common.util.FakePlayerUtils;
@@ -16,12 +17,14 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.*;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.GameType;
import net.minecraft.world.World;
@@ -34,15 +37,24 @@ import javax.annotation.Nullable;
import java.util.List;
public final class BlockOperationsModuleDevice extends IdentityProxy<ItemStack> implements RPCDevice, ItemDevice {
private static final String LAST_OPERATION_TAG_NAME = "cooldown";
private static final int COOLDOWN = Constants.TICK_SECONDS;
///////////////////////////////////////////////////////////////////
public enum PlacementDirection {
FRONT,
UP,
DOWN,
}
///////////////////////////////////////////////////////////////////
private final Entity entity;
private final Robot robot;
private final ObjectDevice device;
private long lastOperation;
///////////////////////////////////////////////////////////////////
@@ -55,6 +67,18 @@ public final class BlockOperationsModuleDevice extends IdentityProxy<ItemStack>
///////////////////////////////////////////////////////////////////
@Override
public CompoundNBT serializeNBT() {
final CompoundNBT tag = new CompoundNBT();
tag.putLong(LAST_OPERATION_TAG_NAME, lastOperation);
return tag;
}
@Override
public void deserializeNBT(final CompoundNBT tag) {
lastOperation = MathHelper.clamp(tag.getLong(LAST_OPERATION_TAG_NAME), 0, entity.getEntityWorld().getGameTime());
}
@Override
public List<String> getTypeNames() {
return device.getTypeNames();
@@ -67,6 +91,12 @@ public final class BlockOperationsModuleDevice extends IdentityProxy<ItemStack>
@Callback
public boolean excavate(@Parameter("direction") @Nullable final PlacementDirection direction) {
if (isOnCooldown()) {
return false;
}
beginCooldown();
final World world = entity.getEntityWorld();
if (!(world instanceof ServerWorld)) {
return false;
@@ -95,6 +125,12 @@ public final class BlockOperationsModuleDevice extends IdentityProxy<ItemStack>
@Callback
public boolean place(@Parameter("direction") @Nullable final PlacementDirection direction) {
if (isOnCooldown()) {
return false;
}
beginCooldown();
final World world = entity.getEntityWorld();
if (!(world instanceof ServerWorld)) {
return false;
@@ -140,6 +176,12 @@ public final class BlockOperationsModuleDevice extends IdentityProxy<ItemStack>
@Callback
public boolean repair() {
if (isOnCooldown()) {
return false;
}
beginCooldown();
if (identity.getDamage() == 0) {
return false;
}
@@ -171,6 +213,14 @@ public final class BlockOperationsModuleDevice extends IdentityProxy<ItemStack>
///////////////////////////////////////////////////////////////////
private void beginCooldown() {
lastOperation = entity.getEntityWorld().getGameTime();
}
private boolean isOnCooldown() {
return entity.getEntityWorld().getGameTime() - lastOperation < COOLDOWN;
}
private Direction getAdjustedDirection(@Nullable final PlacementDirection placementDirection) {
if (placementDirection == PlacementDirection.UP) {
return Direction.UP;

2
src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java
View File

@@ -86,7 +86,7 @@ public final class ByteBufferFlashMemoryVMDevice extends IdentityProxy<ItemStack
}
@Override
public void deserializeNBT(final CompoundNBT nbt) {
public void deserializeNBT(final CompoundNBT tag) {
}

10
src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java
View File

@@ -87,12 +87,12 @@ public final class MemoryDevice extends IdentityProxy<ItemStack> implements VMDe
}
@Override
public void deserializeNBT(final CompoundNBT nbt) {
if (nbt.hasUniqueId(BLOB_HANDLE_TAG_NAME)) {
blobHandle = nbt.getUniqueId(BLOB_HANDLE_TAG_NAME);
public void deserializeNBT(final CompoundNBT tag) {
if (tag.hasUniqueId(BLOB_HANDLE_TAG_NAME)) {
blobHandle = tag.getUniqueId(BLOB_HANDLE_TAG_NAME);
}
if (nbt.contains(ADDRESS_TAG_NAME, NBTTagIds.TAG_LONG)) {
address.set(nbt.getLong(ADDRESS_TAG_NAME));
if (tag.contains(ADDRESS_TAG_NAME, NBTTagIds.TAG_LONG)) {
address.set(tag.getLong(ADDRESS_TAG_NAME));
}
}

11
src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java
View File

@@ -29,7 +29,6 @@ import javax.annotation.Nullable;
import java.util.List;
public final class RedstoneInterfaceCardItemDevice extends IdentityProxy<ItemStack> implements RPCDevice, DocumentedDevice, ItemDevice, ICapabilityProvider {
private static final String OUTPUT_TAG_NAME = "output";
private static final String GET_REDSTONE_INPUT = "getRedstoneInput";
@@ -73,14 +72,14 @@ public final class RedstoneInterfaceCardItemDevice extends IdentityProxy<ItemSta
@Override
public CompoundNBT serializeNBT() {
final CompoundNBT nbt = new CompoundNBT();
nbt.putByteArray(OUTPUT_TAG_NAME, output);
return nbt;
final CompoundNBT tag = new CompoundNBT();
tag.putByteArray(OUTPUT_TAG_NAME, output);
return tag;
}
@Override
public void deserializeNBT(final CompoundNBT nbt) {
final byte[] serializedOutput = nbt.getByteArray(OUTPUT_TAG_NAME);
public void deserializeNBT(final CompoundNBT tag) {
final byte[] serializedOutput = tag.getByteArray(OUTPUT_TAG_NAME);
System.arraycopy(serializedOutput, 0, output, 0, Math.min(serializedOutput.length, output.length));
}