mic and speaker

Author: USS-Shenzhou

build.gradle

@@ -109,7 +109,7 @@ dependencies {
     // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
     // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
 
-    implementation(annotationProcessor("cn.ussshenzhou:t88:26.+"))
+    implementation(annotationProcessor("cn.ussshenzhou:t88:26.1+"))
 
     implementation 'io.github.jaredmdobson:concentus:1.0.2'
     jarJar 'io.github.jaredmdobson:concentus:1.0.2'

gradle.properties

@@ -30,12 +30,12 @@ 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-6+alpha
+mod_version=26.1.2-7+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
 mod_group_id=cn.ussshenzhou
 # The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
-mod_authors=
+mod_authors=USS_Shenzhou, MalayP
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
 mod_description=

src/main/java/cn/ussshenzhou/channel/Channel.java

@@ -1,5 +1,8 @@
 package cn.ussshenzhou.channel;
 
+import cn.ussshenzhou.channel.Item.ModItems;
+import cn.ussshenzhou.channel.block.ModBlocks;
+import cn.ussshenzhou.channel.blockentity.ModBlockEntityTypes;
 import cn.ussshenzhou.channel.config.ChannelClientConfig;
 import cn.ussshenzhou.channel.config.ChannelPlayerConfig;
 import cn.ussshenzhou.channel.config.ChannelServerConfig;
@@ -16,13 +19,21 @@
 @Mod(Channel.MODID)
 public class Channel {
     public static final String MODID = "channel";
+    public static final float DISTANCE_COMPENSATE = 2;
+    public static final float DISTANCE_COMPENSATE_SQR = 2 * 2;
 
     public Channel(IEventBus modEventBus, ModContainer modContainer) {
         if (FMLEnvironment.getDist() == Dist.CLIENT) {
             ConfigHelper.loadConfig(new ChannelClientConfig());
             ConfigHelper.loadConfig(new ChannelPlayerConfig());
         }
         ConfigHelper.loadConfig(new ChannelServerConfig());
+
+        ModBlocks.BLOCKS.register(modEventBus);
+        ModItems.ITEMS.register(modEventBus);
+        ModItems.CREATIVE_MODE_TABS.register(modEventBus);
+        ModItems.DATA_COMPONENTS.register(modEventBus);
+        ModBlockEntityTypes.BLOCK_ENTITIES.register(modEventBus);
     }
     //TODO 参考发光/泛光，声音越大，回声越强
 }

src/main/java/cn/ussshenzhou/channel/Item/HandheldMic.java

@@ -0,0 +1,36 @@
+package cn.ussshenzhou.channel.Item;
+
+import cn.ussshenzhou.channel.gui.ItemChannelSettingScreen;
+import com.mojang.logging.annotations.MethodsReturnNonnullByDefault;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.Level;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.function.Supplier;
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+public class HandheldMic extends Item {
+    public HandheldMic(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    public InteractionResult use(Level level, Player player, InteractionHand hand) {
+        if (!level.isClientSide()) {
+            return InteractionResult.PASS;
+        }
+        return new Supplier<InteractionResult>() {
+            @Override
+            public InteractionResult get() {
+                Minecraft.getInstance().setScreen(new ItemChannelSettingScreen(hand, player.getItemInHand(hand)));
+                return InteractionResult.SUCCESS;
+            }
+        }.get();
+
+    }
+}

src/main/java/cn/ussshenzhou/channel/Item/ModItems.java

@@ -0,0 +1,81 @@
+package cn.ussshenzhou.channel.Item;
+
+import cn.ussshenzhou.channel.Channel;
+import cn.ussshenzhou.channel.block.ModBlocks;
+import com.mojang.serialization.Codec;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
+import net.neoforged.neoforge.registries.DeferredRegister;
+
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+
+/**
+ * @author USS_Shenzhou
+ */
+@EventBusSubscriber
+public class ModItems {
+    //----------Data Component----------
+    public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(Registries.DATA_COMPONENT_TYPE, Channel.MODID);
+
+    public static final Supplier<DataComponentType<Integer>> CHANNEL = DATA_COMPONENTS.registerComponentType("channel", builder ->
+            builder.persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT)
+    );
+
+    //----------Item----------
+    public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(BuiltInRegistries.ITEM, Channel.MODID);
+
+    public static final Supplier<Item> HANDHELD_MIC_ITEM = ITEMS.register("handheld_mic", () -> new HandheldMic(new Item.Properties()
+            .stacksTo(1)
+            .component(CHANNEL.get(), 0)
+            .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Channel.MODID, "handheld_mic")))
+    ));
+    public static final Supplier<Item> MIC_ITEM = ITEMS.register("mic", () -> new BlockItem(ModBlocks.MIC_BLOCK.get(), new Item.Properties()
+            .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Channel.MODID, "mic")))
+    ));
+    public static final Supplier<Item> SPEAKER_ITEM = ITEMS.register("speaker", () -> new BlockItem(ModBlocks.SPEAKER_BLOCK.get(), new Item.Properties()
+            .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Channel.MODID, "speaker")))
+    ));
+    public static final Supplier<Item> SPEAKER_STAND_ITEM = ITEMS.register("speaker_stand", () -> new BlockItem(ModBlocks.SPEAKER_STAND_BLOCK.get(), new Item.Properties()
+            .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Channel.MODID, "speaker_stand")))
+    ));
+    public static final Supplier<Item> SPEAKER_HANG_ITEM = ITEMS.register("speaker_hang", () -> new BlockItem(ModBlocks.SPEAKER_HANG_BLOCK.get(), new Item.Properties()
+            .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Channel.MODID, "speaker_hang")))
+    ));
+
+    //----------Creative Mode Tab----------
+    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Channel.MODID);
+
+    public static final Supplier<CreativeModeTab> TAB = CREATIVE_MODE_TABS.register("main", () -> CreativeModeTab.builder()
+            .icon(() -> new ItemStack(MIC_ITEM.get()))
+            .title(Component.translatable("channel.tab.title"))
+            .build());
+
+    @SubscribeEvent
+    public static void onBuildContents(BuildCreativeModeTabContentsEvent event) {
+        var tab = BuiltInRegistries.CREATIVE_MODE_TAB.getKey(event.getTab());
+        if (tab != null && tab.equals(BuiltInRegistries.CREATIVE_MODE_TAB.getKey(TAB.get()))) {
+            event.acceptAll(Stream.of(
+                    HANDHELD_MIC_ITEM,
+                    MIC_ITEM,
+                    SPEAKER_ITEM,
+                    SPEAKER_STAND_ITEM,
+                    SPEAKER_HANG_ITEM
+            ).map(s -> new ItemStack(s.get())).toList());
+        }
+    }
+}

src/main/java/cn/ussshenzhou/channel/audio/client/Initializer.java

@@ -1,6 +1,6 @@
 package cn.ussshenzhou.channel.audio.client;
 
-import cn.ussshenzhou.channel.audio.client.receive.AudioManagerManager;
+import cn.ussshenzhou.channel.audio.client.receive.AudioManager;
 import cn.ussshenzhou.channel.audio.client.send.MicManager;
 import cn.ussshenzhou.channel.audio.client.send.MicReader;
 import cn.ussshenzhou.channel.audio.client.send.WebRTCHelper;
@@ -23,6 +23,6 @@ public static void init(ClientStartedEvent event) {
         MicReader.init();
         WebRTCHelper.init();
         NvidiaHelper.init();
-        AudioManagerManager.init();
+        AudioManager.init();
     }
 }

…el/audio/client/receive/PlayerAudio.java …/channel/audio/client/receive/Audio.javasrc/main/java/cn/ussshenzhou/channel/audio/client/receive/PlayerAudio.java renamed to src/main/java/cn/ussshenzhou/channel/audio/client/receive/Audio.java src/main/java/cn/ussshenzhou/channel/audio/client/receive/PlayerAudio.java renamed to src/main/java/cn/ussshenzhou/channel/audio/client/receive/Audio.java

@@ -1,38 +1,37 @@
 package cn.ussshenzhou.channel.audio.client.receive;
 
 import cn.ussshenzhou.channel.audio.client.rt.RayTraceManager;
+import cn.ussshenzhou.channel.audio.client.rt.SourceAudioData;
 import cn.ussshenzhou.channel.config.ChannelClientConfig;
-import cn.ussshenzhou.channel.config.ChannelPlayerConfig;
-import cn.ussshenzhou.channel.gui.OutputConfigPanel;
 import cn.ussshenzhou.channel.util.AudioHelper;
-import com.mojang.logging.LogUtils;
 import io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueue;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.*;
-
-import static org.lwjgl.openal.AL11.*;
+import java.util.List;
+
+import static org.lwjgl.openal.AL10.*;
+import static org.lwjgl.openal.AL10.AL_FALSE;
+import static org.lwjgl.openal.AL10.AL_LOOPING;
+import static org.lwjgl.openal.AL10.AL_MAX_GAIN;
+import static org.lwjgl.openal.AL10.AL_PITCH;
+import static org.lwjgl.openal.AL10.AL_REFERENCE_DISTANCE;
+import static org.lwjgl.openal.AL10.AL_ROLLOFF_FACTOR;
+import static org.lwjgl.openal.AL10.alSourcef;
+import static org.lwjgl.openal.AL10.alSourcei;
+import static org.lwjgl.openal.AL11.alSource3i;
 import static org.lwjgl.openal.EXTEfx.*;
+import static org.lwjgl.openal.EXTEfx.AL_AUXILIARY_SEND_FILTER;
+
+public abstract class Audio {
+    protected static final int MAX_BUFFER_10MS = 3 * 100;
+    protected int readyBufferMs = 0;
+    protected final int alSource, sampleRate, alDirectFilter, alReverbFilter;
+    protected double x, y, z;
 
-/**
- * @author USS_Shenzhou
- */
-public class PlayerAudio {
-    private static final int MAX_BUFFER_10MS = 3 * 100;
-    private final MpscArrayQueue<short[]> audioBuffer = new MpscArrayQueue<>((int) (1.1 * MAX_BUFFER_10MS));
-    private int readyBufferMs = 0;
-    public final int alSource, sampleRate, alDirectFilter, alReverbFilter;
-    public final UUID playerId;
-    private double x, y, z;
-
-    public PlayerAudio(UUID playerId, int sampleRate) {
-        this.playerId = playerId;
+    public Audio(int sampleRate) {
         this.sampleRate = sampleRate;
         this.alSource = alGenSources();
         alSourcef(alSource, AL_GAIN, 1);
@@ -56,57 +55,29 @@ public PlayerAudio(UUID playerId, int sampleRate) {
         }
     }
 
-    public void push(short[] audio) {
-        int length = sampleRate / 100;
-        for (int i = 0; i < audio.length / length; i++) {
-            audioBuffer.offer(Arrays.copyOfRange(audio, i * length, (i + 1) * length));
-        }
-    }
+    public void updateSourceParameters(SourceAudioData data, int auxSlot) {
+        alFilterf(this.alDirectFilter, AL_LOWPASS_GAIN, data.directGain());
+        alFilterf(this.alDirectFilter, AL_LOWPASS_GAINHF, data.directHF());
+        alSourcei(this.alSource, AL_DIRECT_FILTER, this.alDirectFilter);
 
-    @Nullable
-    public List<ByteBuffer> read(int sizeIn10Ms) {
-        if (audioBuffer.isEmpty()) {
-            return null;
-        }
-        checkTooMuchDelay();
-        int toRead = Math.min(sizeIn10Ms, audioBuffer.size());
-        int length = sampleRate / 100;
-        List<ByteBuffer> buffers = new ArrayList<>(toRead);
-        for (int i = 0; i < toRead; i++) {
-            var chunk = audioBuffer.poll();
-            if (chunk != null) {
-                var buffer = ByteBuffer.allocateDirect(length * 2).order(ByteOrder.LITTLE_ENDIAN);
-                buffer.asShortBuffer().put(chunk).rewind();
-                buffers.add(buffer);
-            }
-        }
-        return buffers;
-    }
+        alFilterf(this.alReverbFilter, AL_LOWPASS_GAIN, data.reverbGain());
+        alFilterf(this.alReverbFilter, AL_LOWPASS_GAINHF, 1);
+        alSource3i(this.alSource, AL_AUXILIARY_SEND_FILTER, auxSlot, 0, this.alReverbFilter);
 
-    public void checkTooMuchDelay() {
-        if (audioBuffer.size() >= ChannelClientConfig.get().networkTolerance * 1.5 / 10 || audioBuffer.size() >= MAX_BUFFER_10MS) {
-            int targetBufferSize = (int) (ChannelClientConfig.get().networkTolerance * 1.1 / 10);
-            int drop = audioBuffer.size() - targetBufferSize;
-            for (int i = 0; i < drop; i++) {
-                audioBuffer.poll();
-            }
-        }
+        alSource3f(this.alSource, AL_POSITION, (float) data.virtualPos().x, (float) data.virtualPos().y, (float) data.virtualPos().z);
     }
 
-    public void play() {
+    public boolean play() {
         //TODO close self by last active time
-        var vol = ChannelPlayerConfig.getOrDefault(playerId);
-        alSourcef(alSource, AL_GAIN, AudioHelper.db2factor(vol));
-        OutputConfigPanel.PlayerVolumePanel.update(playerId, vol);
-
+        //TODO use low-pass filter to make underwater effect in 26.2
+        alSourcef(alSource, AL_GAIN, getGain());
         int processed = alGetSourcei(alSource, AL_BUFFERS_PROCESSED);
         while (processed-- > 0) {
             int buf = alSourceUnqueueBuffers(alSource);
             readyBufferMs -= 10;
             alDeleteBuffers(buf);
         }
         var pcms = read(MAX_BUFFER_10MS);
-        //TODO use low-pass filter to make underwater effect in 26.2
         if (pcms != null) {
             for (ByteBuffer pcm : pcms) {
                 int buf = alGenBuffers();
@@ -123,6 +94,22 @@ public void play() {
                 alSourcePlay(alSource);
             }
         }
+        return false;
+    }
+
+    protected abstract float getGain();
+
+    @Nullable
+    public abstract List<ByteBuffer> read(int sizeIn10Ms);
+
+    protected static void checkTooMuchDelay(MpscArrayQueue<short[]> buffer) {
+        if (buffer.size() >= ChannelClientConfig.get().networkTolerance * 1.5 / 10 || buffer.size() >= MAX_BUFFER_10MS) {
+            int targetBufferSize = (int) (ChannelClientConfig.get().networkTolerance * 1.1 / 10);
+            int drop = buffer.size() - targetBufferSize;
+            for (int i = 0; i < drop; i++) {
+                buffer.poll();
+            }
+        }
     }
 
     public void close() {
@@ -137,11 +124,7 @@ public void close() {
     }
 
     public Vec3 getPos(Level level) {
-        var player = level.getPlayerByUUID(this.playerId);
-        if (player == null) {
-            return new Vec3(x, y, z);
-        }
-        return player.getEyePosition();
+        return new Vec3(x, y, z);
     }
 
     public void setPos(double x, double y, double z) {
@@ -151,15 +134,8 @@ public void setPos(double x, double y, double z) {
     }
 
     @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof PlayerAudio that)) {
-            return false;
-        }
-        return playerId == that.playerId;
-    }
+    public abstract int hashCode();
 
     @Override
-    public int hashCode() {
-        return Objects.hashCode(playerId);
-    }
+    public abstract boolean equals(Object obj);
 }