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

Merge pull request #139 from allie-signet/configurable-sound-cooldown

Browse Source 
Make sound card cooldown configurable.
This commit is contained in:
Sangar
2022-02-27 17:21:55 +01:00
committed by GitHub
parent e67a3b9e50 3c8e8be6dc
commit f8608c64da
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/li/cil/oc2/common/Config.java
View File

@@ -39,6 +39,7 @@ public final class Config {
@Path("energy.items") public static int networkTunnelEnergyPerTick = 2;
@Path("gameplay") public static ResourceLocation blockOperationsModuleToolTier = TierSortingRegistry.getName(Tiers.DIAMOND);
@Path("gameplay") public static long soundCardCoolDownSeconds = 2;
@Path("admin") public static UUID fakePlayerUUID = UUID.fromString("e39dd9a7-514f-4a2d-aa5e-b6030621416d");
@Path("admin.network") public static int projectorAverageMaxBytesPerSecond = 160 * 1024;

3
src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java
View File

@@ -6,6 +6,7 @@ import li.cil.oc2.api.bus.device.object.Callback;
import li.cil.oc2.api.bus.device.object.Parameter;
import li.cil.oc2.common.util.BlockLocation;
import li.cil.oc2.common.util.TickUtils;
import li.cil.oc2.common.Config;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
@@ -21,7 +22,7 @@ import java.util.Optional;
import java.util.function.Supplier;
public final class SoundCardItemDevice extends AbstractItemRPCDevice {
private static final int COOLDOWN_IN_TICKS = TickUtils.toTicks(Duration.ofSeconds(2));
private final int COOLDOWN_IN_TICKS = TickUtils.toTicks(Duration.ofSeconds(Config.soundCardCoolDownSeconds));
private static final int MAX_FIND_RESULTS = 25;
///////////////////////////////////////////////////////////////////