From d9da812258b24ab5a65413051bce130bdfbb7c25 Mon Sep 17 00:00:00 2001 From: Allie Signet Date: Fri, 25 Feb 2022 20:33:09 -0300 Subject: [PATCH 1/2] make sound card cooldown configurable --- src/main/java/li/cil/oc2/common/Config.java | 1 + .../oc2/common/bus/device/rpc/item/SoundCardItemDevice.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/li/cil/oc2/common/Config.java b/src/main/java/li/cil/oc2/common/Config.java index c54f96d2..3005cc19 100644 --- a/src/main/java/li/cil/oc2/common/Config.java +++ b/src/main/java/li/cil/oc2/common/Config.java @@ -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.devices") 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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java index 61846725..a976e7ce 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java @@ -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 static final int COOLDOWN_IN_TICKS = TickUtils.toTicks(Duration.ofSeconds(Config.soundCardCoolDownSeconds)); private static final int MAX_FIND_RESULTS = 25; /////////////////////////////////////////////////////////////////// From 3c8e8be6dcf761d0380a8725be16a6ecc0f4623a Mon Sep 17 00:00:00 2001 From: Allie Signet Date: Sun, 27 Feb 2022 13:20:03 -0300 Subject: [PATCH 2/2] config field changes for soundcard --- src/main/java/li/cil/oc2/common/Config.java | 2 +- .../cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/Config.java b/src/main/java/li/cil/oc2/common/Config.java index 3005cc19..5b96b57f 100644 --- a/src/main/java/li/cil/oc2/common/Config.java +++ b/src/main/java/li/cil/oc2/common/Config.java @@ -39,7 +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.devices") public static long soundCardCoolDownSeconds = 2; + @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; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java index a976e7ce..b8d80c17 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java @@ -22,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(Config.soundCardCoolDownSeconds)); + private final int COOLDOWN_IN_TICKS = TickUtils.toTicks(Duration.ofSeconds(Config.soundCardCoolDownSeconds)); private static final int MAX_FIND_RESULTS = 25; ///////////////////////////////////////////////////////////////////