minor improve

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-21+beta
+mod_version=26.1.2-22+beta
 # 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/client/receive/Audio.java

@@ -37,7 +37,7 @@ public Audio(int sampleRate) {
         alSourcef(alSource, AL_GAIN, 1);
         alSourcef(alSource, AL_PITCH, 1);
         alSourcef(alSource, AL_LOOPING, AL_FALSE);
-        alSourcef(alSource, AL_REFERENCE_DISTANCE, 1.5f);
+        alSourcef(alSource, AL_REFERENCE_DISTANCE, 2);
         alSourcef(alSource, AL_MAX_GAIN, AudioHelper.db2factor(30));
         if (ChannelClientConfig.get().rayTraceAudio) {
             alSourcef(alSource, AL_ROLLOFF_FACTOR, 0);

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

@@ -27,7 +27,7 @@ public class SpeakerAudio extends Audio {
     private final WeakReference<SpeakerBlockEntity> speakerBlockEntity;
     private final ConcurrentHashMap<UUID, MpscArrayQueue<short[]>> audioBuffers = new ConcurrentHashMap<>();
     protected int x, y, z;
-    public static final float REVERB_ENHANCE = 1.5f;
+    public static final float REVERB_ENHANCE = 3f;
 
     public SpeakerAudio(SpeakerBlockEntity speakerBlockEntity, int sampleRate) {
         super(sampleRate);
@@ -59,12 +59,12 @@ public void updateSourceParameters(SourceAudioData data, int auxSlot) {
         if (distance >= 32) {
             extraDecay = 1 - (distance - 32) / 32;
         }
-        double wallDecay = Math.pow(0.5, data.wallThickness());
-        alFilterf(this.alDirectFilter, AL_LOWPASS_GAIN, (float) (extraDecay * correctedGain * wallDecay / REVERB_ENHANCE));
+        double directWallDecay = Math.pow(0.5, data.wallThickness());
+        alFilterf(this.alDirectFilter, AL_LOWPASS_GAIN, (float) (extraDecay * correctedGain * directWallDecay));
         alFilterf(this.alDirectFilter, AL_LOWPASS_GAINHF, data.directHF());
         alSourcei(this.alSource, AL_DIRECT_FILTER, this.alDirectFilter);
 
-        alFilterf(this.alReverbFilter, AL_LOWPASS_GAIN, (float) (extraDecay * wallDecay));
+        alFilterf(this.alReverbFilter, AL_LOWPASS_GAIN, (float) (Math.sqrt(data.reverbGain()) * REVERB_ENHANCE));
         alFilterf(this.alReverbFilter, AL_LOWPASS_GAINHF, 1);
         alSource3i(this.alSource, AL_AUXILIARY_SEND_FILTER, auxSlot, 0, this.alReverbFilter);
 
@@ -83,7 +83,7 @@ public boolean play() {
 
     @Override
     protected float getGain() {
-        return REVERB_ENHANCE * AudioHelper.db2factor(ChannelClientConfig.get().outputAdjust);
+        return AudioHelper.db2factor(ChannelClientConfig.get().outputAdjust);
     }
 
     @Override