send current voicechat mutes to new players, add BetterPerspectiveIntegration

Author: jumpingpxl

betterperspective/src/main/java/net/labymod/serverapi/integration/betterperspective/BetterPerspectiveIntegration.java

@@ -1,14 +1,28 @@
 package net.labymod.serverapi.integration.betterperspective;
 
 import com.google.auto.service.AutoService;
+import net.labymod.serverapi.core.AbstractLabyModPlayer;
 import net.labymod.serverapi.core.AbstractLabyModProtocolService;
+import net.labymod.serverapi.core.integration.LabyModIntegrationPlayer;
 import net.labymod.serverapi.core.integration.LabyModProtocolIntegration;
+import net.labymod.serverapi.core.model.moderation.Permission;
 
 @AutoService(LabyModProtocolIntegration.class)
 public class BetterPerspectiveIntegration implements LabyModProtocolIntegration {
 
+  public static final Permission UNLOCK_CAMERA_PERMISSION = Permission.of(
+      "better_perspective_unlock_camera"
+  );
+
+  private AbstractLabyModProtocolService protocolService;
+
+  @Override
+  public void initialize(AbstractLabyModProtocolService protocolService) {
+    this.protocolService = protocolService;
+  }
+
   @Override
-  public void initialize(AbstractLabyModProtocolService abstractLabyModProtocolService) {
-    System.out.println("Initializing ToggleSneakIntegration");
+  public LabyModIntegrationPlayer createIntegrationPlayer(AbstractLabyModPlayer<?> labyModPlayer) {
+    return new BetterPerspectivePlayer(this.protocolService, labyModPlayer.getUniqueId());
   }
 }

betterperspective/src/main/java/net/labymod/serverapi/integration/betterperspective/BetterPerspectivePlayer.java

@@ -0,0 +1,39 @@
+package net.labymod.serverapi.integration.betterperspective;
+
+import net.labymod.serverapi.core.AbstractLabyModProtocolService;
+import net.labymod.serverapi.core.integration.LabyModIntegrationPlayer;
+import net.labymod.serverapi.core.packet.clientbound.game.moderation.PermissionPacket;
+
+import java.util.UUID;
+
+public class BetterPerspectivePlayer implements LabyModIntegrationPlayer {
+
+  private final AbstractLabyModProtocolService protocolService;
+  private final UUID uniqueId;
+
+  protected BetterPerspectivePlayer(AbstractLabyModProtocolService protocolService, UUID uniqueId) {
+    this.protocolService = protocolService;
+    this.uniqueId = uniqueId;
+  }
+
+  public void allowUnlockCamera() {
+    this.protocolService.labyModProtocol().sendPacket(
+        this.uniqueId,
+        new PermissionPacket(BetterPerspectiveIntegration.UNLOCK_CAMERA_PERMISSION.allow())
+    );
+  }
+
+  public void denyUnlockCamera() {
+    this.protocolService.labyModProtocol().sendPacket(
+        this.uniqueId,
+        new PermissionPacket(BetterPerspectiveIntegration.UNLOCK_CAMERA_PERMISSION.deny())
+    );
+  }
+
+  @Override
+  public String toString() {
+    return "BetterPerspectivePlayer{" +
+        "uniqueId=" + this.uniqueId +
+        '}';
+  }
+}

build.gradle.kts

@@ -44,7 +44,7 @@ subprojects {
 
     dependencies {
         compileOnly("org.jetbrains:annotations:22.0.0")
-        implementation("net.labymod.serverapi:core:0.1.7")
+        implementation("net.labymod.serverapi:core:0.1.9")
         compileOnly("com.google.auto.service:auto-service:1.1.1")
         annotationProcessor("com.google.auto.service:auto-service:1.1.1")
     }

voicechat/src/main/java/net/labymod/serverapi/integration/voicechat/VoiceChatIntegration.java

@@ -7,11 +7,15 @@
 import net.labymod.serverapi.core.AddonProtocol;
 import net.labymod.serverapi.core.integration.LabyModIntegrationPlayer;
 import net.labymod.serverapi.core.integration.LabyModProtocolIntegration;
+import net.labymod.serverapi.integration.voicechat.model.VoiceChatMute;
 import net.labymod.serverapi.integration.voicechat.packets.VoiceChatMutePacket;
 import net.labymod.serverapi.integration.voicechat.packets.VoiceChatOpenChannelsPacket;
 import net.labymod.serverapi.integration.voicechat.packets.VoiceChatUnmutePacket;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @AutoService(LabyModProtocolIntegration.class)
 public class VoiceChatIntegration implements LabyModProtocolIntegration {
 
@@ -21,7 +25,6 @@ public class VoiceChatIntegration implements LabyModProtocolIntegration {
   @Override
   public void initialize(AbstractLabyModProtocolService protocolService) {
     this.protocolService = protocolService;
-    System.out.println("Initializing VoiceChatIntegration");
 
     this.addonProtocol = new AddonProtocol(protocolService, "voicechat");
     this.addonProtocol.registerPacket(0, VoiceChatMutePacket.class, Direction.CLIENTBOUND);
@@ -33,6 +36,18 @@ public void initialize(AbstractLabyModProtocolService protocolService) {
 
   @Override
   public LabyModIntegrationPlayer createIntegrationPlayer(AbstractLabyModPlayer<?> labyModPlayer) {
+    List<VoiceChatMute> mutes = new ArrayList<>();
+    for (AbstractLabyModPlayer<?> player : this.protocolService.getPlayers()) {
+      VoiceChatPlayer integrationPlayer = player.getIntegrationPlayer(VoiceChatPlayer.class);
+      if (integrationPlayer != null && integrationPlayer.isMuted()) {
+        mutes.add(integrationPlayer.getMute());
+      }
+    }
+
+    if (!mutes.isEmpty()) {
+      labyModPlayer.sendPacket(new VoiceChatMutePacket(mutes));
+    }
+
     return new VoiceChatPlayer(
         this.protocolService,
         this.addonProtocol,

voicechat/src/main/java/net/labymod/serverapi/integration/voicechat/VoiceChatPlayer.java

@@ -57,4 +57,12 @@ public void openVoiceChatChannels() {
   public boolean isMuted() {
     return this.mute != null;
   }
+
+  @Override
+  public String toString() {
+    return "VoiceChatPlayer{" +
+        "mute=" + this.mute +
+        ", uniqueId=" + this.uniqueId +
+        '}';
+  }
 }

voicechat/src/main/java/net/labymod/serverapi/integration/voicechat/packets/VoiceChatOpenChannelsPacket.java

@@ -24,4 +24,9 @@ public void read(@NotNull PayloadReader reader) {
   public void write(@NotNull PayloadWriter writer) {
     // NO-OP
   }
+
+  @Override
+  public String toString() {
+    return "VoiceChatOpenChannelsPacket{}";
+  }
 }