Skip to content

Commit 018b802

Browse files
committed
fix
1 parent 22871a4 commit 018b802

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/main/java/cn/ussshenzhou/channel/audio/client/receive/BaseAudioManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public void init() {
5151

5252
@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
5353
protected void initAL() {
54+
LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(15));
5455
var library = Minecraft.getInstance().getSoundManager().soundEngine.library;
5556
alCtx = library.context;
5657
alDevice = library.currentDevice;

src/main/java/cn/ussshenzhou/channel/audio/client/rt/RayTraceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void play(double x, double y, double z, PlayerAudio audio) {
5858
audio.read(BaseAudioManager.PLAY_RATE10);
5959
return;
6060
}
61-
var data = SOURCE_AUDIO_DATA_CACHE.computeIfAbsent(sourcePos, RayTraceCalculator::calculateSourceAudioData);
61+
var data = SOURCE_AUDIO_DATA_CACHE.compute(sourcePos, (p, _) -> RayTraceCalculator.calculateSourceAudioData(p));
6262
alFilterf(audio.alDirectFilter, AL_LOWPASS_GAIN, data.directGain());
6363
alFilterf(audio.alDirectFilter, AL_LOWPASS_GAINHF, data.directHF());
6464
alSourcei(audio.alSource, AL_DIRECT_FILTER, audio.alDirectFilter);

src/main/java/cn/ussshenzhou/channel/input/ModKeyMappingRegistry.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import com.mojang.blaze3d.platform.InputConstants;
88
import net.minecraft.client.KeyMapping;
99
import net.minecraft.client.Minecraft;
10+
import net.minecraft.client.gui.components.AbstractTextAreaWidget;
11+
import net.minecraft.client.gui.components.EditBox;
12+
import net.minecraft.client.gui.components.MultilineTextField;
1013
import net.minecraft.resources.Identifier;
1114
import net.minecraft.util.Util;
1215
import net.neoforged.api.distmarker.Dist;
@@ -50,6 +53,10 @@ public static void onKeyInput(InputEvent.Key event) {
5053

5154
@SubscribeEvent
5255
public static void mute(InputEvent.Key event) {
56+
var screen = Minecraft.getInstance().screen;
57+
if (screen != null && (screen.getFocused() instanceof EditBox || screen.getFocused() instanceof MultilineTextField || screen.getFocused() instanceof AbstractTextAreaWidget)) {
58+
return;
59+
}
5360
var cfg = ChannelClientConfig.get();
5461
if (event.getKey() == PTT.getKey().getValue() && modifierMatch(event.getModifiers(), PTT.getKeyModifier().codes())) {
5562
if (event.getAction() == InputConstants.PRESS || event.getAction() == InputConstants.REPEAT) {

0 commit comments

Comments
 (0)