/ch mute_non_OP

Author: USS-Shenzhou

gradle.properties

@@ -30,7 +30,7 @@ mod_name=Channel
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU GPL 3.0
 # The mod version. See https://semver.org/
-mod_version=26.1.2-7+alpha
+mod_version=26.1.2-8+alpha
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/cn/ussshenzhou/channel/audio/OpusManager.java

@@ -34,12 +34,12 @@ public static byte[] encode(byte[] audio, int sampleRate) throws OpusException {
         return Arrays.copyOf(result, length);
     }
 
-    public static short[] decode(byte[] opus, int sampleRate, UUID from) throws OpusException {
-        var length = OpusPacketInfo.getNumSamples(opus, 0, opus.length, sampleRate);
+    public static short[] decode(byte[] opus, UUID from) throws OpusException {
+        var length = OpusPacketInfo.getNumSamples(opus, 0, opus.length, 48000);
         var outArray = new short[length];
-        if (!decoders.containsKey(from) || decoders.get(from).sampleRate != sampleRate) {
+        if (!decoders.containsKey(from)) {
             try {
-                decoders.put(from, new Decoder(sampleRate, new OpusDecoder(sampleRate, 1)));
+                decoders.put(from, new Decoder(48000, new OpusDecoder(48000, 1)));
             } catch (Exception e) {
                 LogUtils.getLogger().error(e.getMessage());
             }

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

@@ -9,6 +9,7 @@
 import cn.ussshenzhou.channel.util.AudioHelper;
 import com.google.common.collect.MapMaker;
 import com.mojang.logging.LogUtils;
+import it.unimi.dsi.fastutil.ints.IntArraySet;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -72,22 +73,28 @@ private static void handleInternal(AudioPacket2C packet, Level level) throws Exc
             return;
         }
         var earPos = AudioHelper.getEarPos();
-        var decoded = OpusManager.decode(packet.opus, packet.sampleRate, packet.from);
-        if (Minecraft.getInstance().player != null && earPos.distanceToSqr(x, y, z) <= 64 * 64) {
+        var decoded = OpusManager.decode(packet.opus, packet.from);
+        if (Minecraft.getInstance().player != null && !Minecraft.getInstance().player.getUUID().equals(packet.from) && earPos.distanceToSqr(x, y, z) <= 64 * 64) {
             // direct talking sound always apply
-            var audio = getDirectAudioAndCheckSampleRate(packet.from, packet.sampleRate);
+            var audio = getDirectAudioAndCheckSampleRate(packet.from, 48000);
             audio.push(decoded);
             audio.setPos(x, y, z);
         }
         // through speaker
-        var resampled = WebRTCHelper.resample(decoded, packet.sampleRate, 48000);
+        if (packet.channels.length == 0) {
+            return;
+        }
+        var channels = IntArraySet.of(packet.channels);
         for (var speaker : CHANNELED_BLOCK_CACHE_C) {
+            if (!channels.contains(speaker.getChannel())) {
+                continue;
+            }
             var pos = speaker.getBlockPos();
             if (earPos.distanceToSqr(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5) > 64 * 64) {
                 return;
             }
             var audio = getSpeakerAudioAndCheckSampleRate(speaker, 48000);
-            audio.push(packet.from, resampled);
+            audio.push(packet.from, decoded);
         }
     }
 

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

@@ -58,13 +58,13 @@ public void updateSourceParameters(SourceAudioData data, int auxSlot) {
         double extraDecay = 1;
         if (distance >= 32) {
             extraDecay = 1 - (distance - 32) / 32;
-            correctedGain *= extraDecay;
         }
-        alFilterf(this.alDirectFilter, AL_LOWPASS_GAIN, (float) (correctedGain / REVERB_ENHANCE));
+        double wallDecay = Math.pow(0.5, data.wallThickness());
+        alFilterf(this.alDirectFilter, AL_LOWPASS_GAIN, (float) (extraDecay * correctedGain * wallDecay / REVERB_ENHANCE));
         alFilterf(this.alDirectFilter, AL_LOWPASS_GAINHF, data.directHF());
         alSourcei(this.alSource, AL_DIRECT_FILTER, this.alDirectFilter);
 
-        alFilterf(this.alReverbFilter, AL_LOWPASS_GAIN, (float) extraDecay);
+        alFilterf(this.alReverbFilter, AL_LOWPASS_GAIN, (float) (extraDecay * wallDecay));
         alFilterf(this.alReverbFilter, AL_LOWPASS_GAINHF, 1);
         alSource3i(this.alSource, AL_AUXILIARY_SEND_FILTER, auxSlot, 0, this.alReverbFilter);
 

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

@@ -66,7 +66,10 @@ public static void run() {
         });
         post(() -> {
             journeyStandardDeviation = (float) Math.sqrt(journeySquaredDiffSum / pointTotalAmount);
-            density = Mth.clamp(journeyStandardDeviation / (MAX_DISTANCE / 2f) + (inWater ? 0.6f : 0), 0, 1);
+            float targetDensity = Mth.clamp(journeyStandardDeviation / (MAX_DISTANCE / 2f) + (inWater ? 0.6f : 0), 0, 1);
+            float delta = Mth.clamp(targetDensity - density, -0.01f, 0.01f);
+            //noinspection NonAtomicOperationOnVolatileField
+            density += delta;
         });
     }
 
@@ -390,12 +393,12 @@ static SourceAudioData calculateSourceAudioData(Vec3 sourcePos) {
         var cameraPos = AudioHelper.getEarPos();
         var tuple = calculateVirtualDirection(sourcePos);
         double meanReverbWeight = tuple.getA();
-        var hitA = shoot(sourcePos, cameraPos, ClipContext.Block.OUTLINE);
+        var hitA = shoot(sourcePos, cameraPos, CHANNEL_OUTLINE);
         float wallThickness;
         if (hitA.getType() == HitResult.Type.MISS) {
             wallThickness = 0;
         } else {
-            var hitB = shoot(cameraPos, sourcePos, ClipContext.Block.OUTLINE);
+            var hitB = shoot(cameraPos, sourcePos, CHANNEL_OUTLINE);
             wallThickness = (float) hitA.getLocation().distanceTo(hitB.getLocation());
         }
         double wallDecay = Math.pow(inWater ? 0.5 : 0.25, wallThickness);
@@ -410,7 +413,7 @@ static SourceAudioData calculateSourceAudioData(Vec3 sourcePos) {
             directHF *= 0.15f;
             reverbGain = Mth.clamp(reverbGain * 1.3f, 0, 1);
         }
-        return new SourceAudioData(directGain, directHF, reverbGain, finalPos);
+        return new SourceAudioData(directGain, wallThickness, directHF, reverbGain, finalPos);
     }
 
     private static Tuple<Double, Vec3> calculateVirtualDirection(Vec3 sourcePos) {

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

@@ -43,6 +43,8 @@ public class RayTraceManager {
     private static int AUX_SLOT = -1, REVERB_EFFECT;
     private static final ConcurrentHashMap<Vec3, SourceAudioData> SOURCE_AUDIO_DATA_CACHE = new ConcurrentHashMap<>();
     static boolean inWater = false;
+    public static ClipContext.Block CHANNEL_OUTLINE = ClipContext.Block.valueOf("CHANNEL_OUTLINE");
+    public static ClipContext.Block CHANNEL_VISUAL = ClipContext.Block.valueOf("CHANNEL_VISUAL");
 
     public static int getSlot() {
         if (AUX_SLOT == -1) {
@@ -101,12 +103,13 @@ private static void generateHitPoints() {
             boolean debug = ChannelClientConfig.get().showRaytrace;
             var earPos = AudioHelper.getEarPos();
             for (var ray : generateRays(getRayAmount(), 0)) {
+                //TODO IExtensibleEnum
                 //noinspection DataFlowIssue
-                generateOneRay(earPos, ray, level, debug, ClipContext.Block.OUTLINE, 0x80ffffff);
+                generateOneRay(earPos, ray, level, debug, CHANNEL_OUTLINE, 0x80ffffff);
             }
             for (var ray : generateRays(getRayAmount(), 0.5)) {
                 //noinspection DataFlowIssue
-                generateOneRay(earPos, ray, level, debug, ClipContext.Block.VISUAL, 0x8000ff00);
+                generateOneRay(earPos, ray, level, debug, CHANNEL_VISUAL, 0x8000ff00);
             }
         }
     }
@@ -174,8 +177,8 @@ private static void setEaxReverb() {
         alEffectf(REVERB_EFFECT, AL_EAXREVERB_LATE_REVERB_GAIN, lateRefGain);
         alEffectf(REVERB_EFFECT, AL_EAXREVERB_LATE_REVERB_DELAY, lateRefDelay);
         //-----Echo-----
-        alEffectf(REVERB_EFFECT, AL_EAXREVERB_ECHO_TIME, echoTime);
-        alEffectf(REVERB_EFFECT, AL_EAXREVERB_ECHO_DEPTH, echoDepth);
+        alEffectf(REVERB_EFFECT, AL_EAXREVERB_ECHO_TIME, Float.isNaN(echoTime) ? 0.25f : echoTime);
+        alEffectf(REVERB_EFFECT, AL_EAXREVERB_ECHO_DEPTH, Float.isNaN(echoDepth) ? 0.05f : echoDepth);
         //-----Modulation-----
         alEffectf(REVERB_EFFECT, AL_EAXREVERB_MODULATION_TIME, 0.4f);
         alEffectf(REVERB_EFFECT, AL_EAXREVERB_MODULATION_DEPTH, 0.025f);
@@ -240,6 +243,6 @@ public static BlockHitResult shoot(Vec3 from, Vec3 to, ClipContext.Block blockCo
     }
 
     public static boolean canSee(Vec3 from, Vec3 to) {
-        return shoot(from, to, ClipContext.Block.OUTLINE).getType() == HitResult.Type.MISS;
+        return shoot(from, to, CHANNEL_OUTLINE).getType() == HitResult.Type.MISS;
     }
 }

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

@@ -4,6 +4,7 @@
 
 public record SourceAudioData(
         float directGain,
+        float wallThickness,
         float directHF,
         float reverbGain,
         Vec3 virtualPos

src/main/java/cn/ussshenzhou/channel/audio/client/send/MicReader.java

@@ -46,7 +46,7 @@ public static synchronized void frameLengthChange() {
     }
 
     private static synchronized void read() {
-        if (Minecraft.getInstance().getConnection() == null || MicrophoneHud.getStatus() == MicrophoneHud.Status.SUBSPACE) {
+        if (Minecraft.getInstance().getConnection() == null || MicrophoneHud.getStatus() == MicrophoneHud.Status.SUBSPACE || MicrophoneHud.getStatus() == MicrophoneHud.Status.OP) {
             return;
         }
         var cfg = ChannelClientConfig.get();
@@ -91,7 +91,7 @@ private static synchronized void read() {
             }
             //-----encode-----
             var opus = OpusManager.encode(audio, networkSampleRate);
-            var packet = new TalkPacket2S(networkSampleRate, opus);
+            var packet = new TalkPacket2S(opus);
             if (SubspaceConnection.using()) {
                 SubspaceConnection.send(packet);
             } else {

src/main/java/cn/ussshenzhou/channel/audio/client/send/WebRTCHelper.java

@@ -183,33 +183,6 @@ private static byte[] resample(byte[] raw, int sampleRateIn, int sampleRateOut)
         }
     }
 
-    @SuppressWarnings("IntegerMultiplicationImplicitCastToLong")
-    public static short[] resample(short[] raw, int sampleRateIn, int sampleRateOut) {
-        var resampler = CreateResampler(sampleRateIn, sampleRateOut, ModConstant.MIC_CHANNEL);
-        var segAmount = MicReader.getFrameLength() / 10;
-        var inStepSamples = raw.length / segAmount;
-        var outStepSamples = (int) ((float) raw.length / sampleRateIn * sampleRateOut / segAmount);
-        int totalOutSamples = (int) ((float) raw.length / sampleRateIn * sampleRateOut);
-        try (var arena = Arena.ofConfined()) {
-            var src = arena.allocate(raw.length * 2);
-            var dst = arena.allocate(totalOutSamples * 2);
-            MemorySegment.copy(raw, 0, src, ValueLayout.JAVA_SHORT, 0, raw.length);
-            for (int i = 0; i < segAmount; i++) {
-                long srcOffset = (long) i * inStepSamples * 2;
-                long destOffset = (long) i * outStepSamples * 2;
-                var subSrc = src.asSlice(srcOffset, inStepSamples * 2);
-                var subDest = dst.asSlice(destOffset, outStepSamples * 2);
-                Resample(resampler,
-                        subSrc, sampleRateIn / 100,
-                        subDest, sampleRateOut / 100);
-            }
-            short[] result = new short[totalOutSamples];
-            MemorySegment.copy(dst, ValueLayout.JAVA_SHORT, 0, result, 0, totalOutSamples);
-            FreeResampler(resampler);
-            return result;
-        }
-    }
-
     private static boolean vad(MemorySegment audio, int sampleRate, int samplesPerChannel) {
         if (ChannelClientConfig.get().trigger != Trigger.VAD) {
             return true;

src/main/java/cn/ussshenzhou/channel/audio/server/RelayHandler.java

@@ -5,6 +5,7 @@
 import cn.ussshenzhou.channel.blockentity.ChanneledBlockEntity;
 import cn.ussshenzhou.channel.blockentity.MicBlockEntity;
 import cn.ussshenzhou.channel.blockentity.SpeakerBlockEntity;
+import cn.ussshenzhou.channel.config.ChannelServerConfig;
 import cn.ussshenzhou.channel.network.AudioPacket2C;
 import cn.ussshenzhou.t88.network.NetworkHelper;
 import com.google.common.collect.MapMaker;
@@ -15,6 +16,7 @@
 import net.minecraft.SharedConstants;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.Permissions;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -144,18 +146,21 @@ private static IntArraySet findNearbyReceivingDeviceChannels(ServerPlayer to) {
             .setDaemon(true)
             .build());
 
-    public static void process(ServerPlayer from, byte[] opusAudio, int sampleRate) {
+    public static void process(ServerPlayer from, byte[] opusAudio) {
+        if (ChannelServerConfig.get().muteNoneOP && !from.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
+            return;
+        }
         SERVER_RELAY_THREAD.execute(() -> {
             try {
-                talking(from, opusAudio, sampleRate);
+                talking(from, opusAudio);
             } catch (Exception e) {
                 LogUtils.getLogger().error("Something went wrong, but it should be okay. You can ignore this if nothing else went wrong.");
                 LogUtils.getLogger().error(e.getMessage(), e);
             }
         });
     }
 
-    public static void talking(ServerPlayer from, byte[] opusAudio, int sampleRate) {
+    public static void talking(ServerPlayer from, byte[] opusAudio) {
         HashSet<ServerPlayer> tos = new HashSet<>();
         for (var p : from.level().players()) {
             if (closeHear(from, p)) {
@@ -171,7 +176,7 @@ public static void talking(ServerPlayer from, byte[] opusAudio, int sampleRate)
                 }
             }
         }
-        tos.forEach(to -> NetworkHelper.sendToPlayer(to, new AudioPacket2C(sampleRate, from.getUUID(), opusAudio, channels)));
+        tos.forEach(to -> NetworkHelper.sendToPlayer(to, new AudioPacket2C(from.getUUID(), opusAudio, channels)));
     }
 
     public static boolean closeHear(ServerPlayer from, ServerPlayer to) {