Yeh i hate this shit

NgLam2911 · NgLam2911 · commit 8f6e70113243 · 2025-12-25T14:51:11.000+07:00
diff --git a/src/lemmesay/LemmeSay.java b/src/lemmesay/LemmeSay.java
@@ -3,17 +3,20 @@
 import arc.Events;
 import arc.util.CommandHandler;
 import arc.util.Log;
-import lemmesay.net.packet.VCPackets;
+import lemmesay.net.packet.VCNet;
+import lemmesay.utils.VersionInfo;
 import mindustry.game.EventType;
 import mindustry.gen.PingCallPacket;
 import mindustry.mod.Mod;
 
 public class LemmeSay extends Mod{
 
-    public static final int PROTOCOL_VERSION = 1;
+    public static LemmeSay instance;
+
+
 
     public LemmeSay() {
-        VCPackets.init();
+        VCNet.init();
     }
 
     @Override
@@ -33,13 +36,13 @@ private void registerEvents(){
             // On normal client, its does nothing cuz this packet can only send by client
             // so u know when a server send this packet, magic will come.
             var packet = new PingCallPacket();
-            packet.time = -291103L; // "Random" negative number to identify our custom ping (it's not actually random)
+            packet.time = VersionInfo.IDENTIFIER;
             player.con.send(packet, true);
         });
     }
 
     private void loadConfig(){
-        //TODO: Load configuration settings
+
     }
 
     @Override
diff --git a/src/lemmesay/net/packet/MicPacket.java b/src/lemmesay/net/packet/MicPacket.java
@@ -10,6 +10,7 @@
 
 public class MicPacket extends Packet {
     private byte[] DATA;
+    public int playerId;
     public byte[] audioData;
 
     public MicPacket() { this.DATA = NODATA; }
@@ -26,12 +27,14 @@ public void read(Reads read, int length) {
 
     @Override
     public void write(Writes write) {
+        write.i(playerId);
         TypeIO.writeBytes(write, this.audioData);
     }
 
     @Override
     public void handled() {
         BAIS.setBytes(this.DATA);
+        this.playerId = READ.i();
         this.audioData = TypeIO.readBytes(READ);
     }
 
diff --git a/src/lemmesay/net/packet/VCNet.java b/src/lemmesay/net/packet/VCNet.java
@@ -2,36 +2,34 @@
 
 import arc.util.Log;
 import lemmesay.LemmeSay;
+import lemmesay.utils.VersionInfo;
 import mindustry.Vars;
 import mindustry.gen.PingCallPacket;
 import mindustry.gen.PingResponseCallPacket;
 import mindustry.net.Net;
 
-public class VCPackets {
+public class VCNet {
 
-    public static void init(){
+    public static void registerPackets(){
         Net.registerPacket(VoiceRequestPacket::new);
         Net.registerPacket(VoiceResponsePacket::new);
         Net.registerPacket(MicPacket::new);
+    }
 
+    public static void handlePackets(){
         Vars.net.handleClient(PingCallPacket.class, ping -> {
             Log.info("Received PingCallPacket with time: " + ping.time);
             // Normal server cant send this packet so i use this trick to detect modded client on modded server.
-            var packet = new PingResponseCallPacket();
-            if (ping.time == -291103L){
-                packet.time = ping.time;
+            if (ping.time == VersionInfo.IDENTIFIER){
+                var packet = new VoiceRequestPacket();
+                packet.protocolVersion = VersionInfo.getProtocolVersion();
                 Vars.net.send(packet, true);
             }
         });
+    }
 
-        Vars.net.handleServer(PingResponseCallPacket.class, (con, ping) -> {
-            Log.info("Received PingResponseCallPacket with time: " + ping.time);
-            // Normal client cant send this packet so i use this trick to detect modded server on modded client.
-            var packet = new VoiceRequestPacket();
-            packet.protocolVersion = LemmeSay.PROTOCOL_VERSION;
-            if (con.isConnected()){
-                con.send(packet, true);
-            }
-        });
+    public static void init(){
+        registerPackets();
+        handlePackets();
     }
 }
diff --git a/src/lemmesay/net/packet/VoiceRequestPacket.java b/src/lemmesay/net/packet/VoiceRequestPacket.java
@@ -6,8 +6,12 @@
 import arc.util.io.Reads;
 import arc.util.io.Writes;
 import lemmesay.LemmeSay;
+import lemmesay.net.session.Session;
+import lemmesay.net.session.SessionManager;
+import lemmesay.utils.VersionInfo;
 import lemmesay.voice.VoiceManager;
 import mindustry.Vars;
+import mindustry.net.NetConnection;
 import mindustry.net.Packet;
 
 public class VoiceRequestPacket extends Packet {
@@ -38,18 +42,18 @@ public void handled() {
     }
 
     @Override
-    public void handleClient() {
-        Log.info("Received VoiceRequestPacket from server");
-        VoiceResponsePacket packet = new VoiceResponsePacket();
-        if (this.protocolVersion != LemmeSay.PROTOCOL_VERSION){
-            packet.responseCode = this.protocolVersion < LemmeSay.PROTOCOL_VERSION ?
+    public void handleServer(NetConnection con) {
+        Log.debug("Received VoiceRequestPacket from client with protocol version: " + this.protocolVersion);
+        var responsePacket = new VoiceResponsePacket();
+        if (this.protocolVersion != VersionInfo.getProtocolVersion()){
+            responsePacket.responseCode = this.protocolVersion < VersionInfo.getProtocolVersion() ?
                     VoiceResponsePacket.CLIENT_OUTDATED : VoiceResponsePacket.SERVER_OUTDATED;
-            Vars.net.send(packet, true);
+            con.send(responsePacket, true);
             return;
         }
-        packet.responseCode = VoiceResponsePacket.ACCEPTED;
-        Vars.net.send(packet, true);
-
-        Threads.daemon(new VoiceManager());
+        responsePacket.responseCode = VoiceResponsePacket.ACCEPTED;
+        con.send(responsePacket, true);
+        SessionManager.addSession(new Session(con));
+        Log.info("Accepted voice communication from " + con.player.name());
     }
 }
diff --git a/src/lemmesay/net/packet/VoiceResponsePacket.java b/src/lemmesay/net/packet/VoiceResponsePacket.java
@@ -1,10 +1,12 @@
 package lemmesay.net.packet;
 
 import arc.util.Log;
+import arc.util.Threads;
 import arc.util.io.Reads;
 import arc.util.io.Writes;
 import lemmesay.net.session.Session;
 import lemmesay.net.session.SessionManager;
+import lemmesay.voice.VoiceManager;
 import mindustry.net.NetConnection;
 import mindustry.net.Packet;
 
@@ -41,11 +43,16 @@ public void handled() {
     }
 
     @Override
-    public void handleServer(NetConnection con) {
-        Log.info("Received VoiceResponsePacket from client with response code: " + this.responseCode);
-        if (this.responseCode == ACCEPTED) {
-            Log.info("Client accepted voice communication.");
-            SessionManager.addSession(new Session(con));
+    public void handleClient() {
+        switch (this.responseCode) {
+            case ACCEPTED -> Log.info("Voice communication accepted by server.");
+            case CLIENT_OUTDATED -> Log.warn("Voice communication rejected: Client is outdated.");
+            case SERVER_OUTDATED -> Log.warn("Voice communication rejected: Server is outdated.");
+            case UNKNOWN -> Log.warn("Voice communication rejected: Unknown error.");
+            default -> Log.warn("Voice communication rejected: Unrecognized response code " + this.responseCode);
+        }
+        if (this.responseCode == ACCEPTED){
+            VoiceManager.startVoiceThread();
         }
     }
 }
diff --git a/src/lemmesay/utils/VersionInfo.java b/src/lemmesay/utils/VersionInfo.java
@@ -1,4 +1,19 @@
 package lemmesay.utils;
 
 public class VersionInfo {
+
+    public static final String VERSION = "1.0.0";
+    public static final String BUILD = "7";
+    public static final int PROTOCOL = 2;
+    public static final int DEV_PROTOCOL = 0x40000001;
+    public static final boolean DEV_BUILD = true;
+    public static final long IDENTIFIER = 0x291103L; // DO NOT EDIT.
+
+    public static String getFullVersion() {
+        return VERSION + (DEV_BUILD ? "-dev" : "") + " (build " + BUILD + ")";
+    }
+
+    public static int getProtocolVersion() {
+        return DEV_BUILD ? DEV_PROTOCOL : PROTOCOL;
+    }
 }
diff --git a/src/lemmesay/voice/VoiceConfig.java b/src/lemmesay/voice/VoiceConfig.java
@@ -0,0 +1,57 @@
+package lemmesay.voice;
+
+import arc.util.Log;
+import lemmesay.voice.microphone.Microphone;
+import lemmesay.voice.process.denoiser.Denoiser;
+import lemmesay.voice.process.opus.OpusDecoder;
+import lemmesay.voice.process.opus.OpusEncoder;
+import lemmesay.voice.speaker.Speaker;
+
+public class VoiceConfig {
+
+    public static Microphone mic;
+    public static Speaker speaker;
+    // Audio processing
+    public static Denoiser denoiser;
+    public static OpusEncoder encoder;
+    public static OpusDecoder decoder;
+    // Toggles;
+    public static boolean enableVoice = false;
+    public static boolean enableDenoiser = true;
+
+    public static void closeProcessors(){
+        try{
+            if(denoiser != null && !denoiser.isClosed()){
+                denoiser.close();
+            }
+            if(encoder != null && !encoder.isClosed()){
+                encoder.close();
+            }
+            if(decoder != null && !decoder.isClosed()){
+                decoder.close();
+            }
+        } catch (Exception e){
+            Log.err(e);
+        }
+    }
+
+    public static void closeSpeaker(){
+        try{
+            if(speaker != null){
+                speaker.close();
+            }
+        } catch (Exception e){
+            Log.err(e);
+        }
+    }
+
+    public static void closeMicrophone(){
+        try{
+            if(mic != null){
+                mic.close();
+            }
+        } catch (Exception e){
+            Log.err(e);
+        }
+    }
+}
diff --git a/src/lemmesay/voice/VoiceManager.java b/src/lemmesay/voice/VoiceManager.java
@@ -1,41 +1,50 @@
 package lemmesay.voice;
 
 import arc.util.Log;
+import arc.util.Threads;
 import lemmesay.voice.microphone.JavaxMicrophone;
 import mindustry.Vars;
 
-public class VoiceManager implements Runnable {
+public class VoiceManager{
 
     // WARNING: LAZY Implement.
     private static final int SAMPLE_RATE = 48000;
     private static final int CHANNELS = 1;
     private static final int BUFFER_SIZE = 960;
 
-    @Override
-    public void run() {
-        JavaxMicrophone mic = new JavaxMicrophone(SAMPLE_RATE, BUFFER_SIZE, "");
-        mic.open();
-        mic.start();
-        Log.info("Microphone capture started for voice chat.");
-        while (true) {
-            if (!Vars.net.client()) {
-                Log.info("Voice chat disconnected, stopping microphone capture.");
-                mic.close();
-                VoiceProcessing.getInstance().close();
-                Log.info("Voice processing resources released.");
-                break;
-            }
-            try {
-                short[] audioData = mic.read();
-                VoiceProcessing.getInstance().handleAudio(audioData);
-                Thread.sleep(20);
-            } catch (IllegalStateException e) {
-                Log.warn("Failed to read from microphone: " + e.getMessage());
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                mic.close();
-                Log.info("Voice chat thread interrupted, stopping microphone capture.");
-                break;
+    public static void startVoiceThread() {
+        Log.info("Starting voice communication thread.");
+        Threads.daemon(VoiceThread::new);
+        Vars.player.usid();
+    }
+
+    public static class VoiceThread implements Runnable {
+        @Override
+        public void run() {
+            JavaxMicrophone mic = new JavaxMicrophone(SAMPLE_RATE, BUFFER_SIZE, "");
+            mic.open();
+            mic.start();
+            Log.info("Microphone capture started for voice chat.");
+            while (true) {
+                if (!Vars.net.client()) {
+                    Log.info("Voice chat disconnected, stopping microphone capture.");
+                    mic.close();
+                    VoiceProcessing.getInstance().close();
+                    Log.info("Voice processing resources released.");
+                    break;
+                }
+                try {
+                    short[] audioData = mic.read();
+                    VoiceProcessing.getInstance().handleAudio(audioData);
+                    Thread.sleep(20);
+                } catch (IllegalStateException e) {
+                    Log.warn("Failed to read from microphone: " + e.getMessage());
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    mic.close();
+                    Log.info("Voice chat thread interrupted, stopping microphone capture.");
+                    break;
+                }
             }
         }
     }
diff --git a/src/lemmesay/voice/VoiceProcessing.java b/src/lemmesay/voice/VoiceProcessing.java
diff --git a/src/lemmesay/voice/process/opus/OpusManager.java b/src/lemmesay/voice/process/opus/OpusManager.java
diff --git a/src/lemmesay/voice/process/opus/impl/NativeOpusDecoder.java b/src/lemmesay/voice/process/opus/impl/NativeOpusDecoder.java
diff --git a/src/lemmesay/voice/process/opus/impl/NativeOpusEncoder.java b/src/lemmesay/voice/process/opus/impl/NativeOpusEncoder.java
