optional speaker healthchecks

.tool-versions

@@ -1 +1 @@
-java adoptopenjdk-8.0.332+9
+java openjdk-21

modules/vistas-server/dependency-reduced-pom.xml

@@ -152,12 +152,6 @@
       <artifactId>junit</artifactId>
       <version>4.13.2</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <properties>

plugin/src/main/bash/data.bin

@@ -1 +1 @@
-BUILD_NUM="1502"
+BUILD_NUM="1503"

plugin/src/main/java/com/craftmend/openaudiomc/generic/client/helpers/ClientRtcLocationUpdate.java

@@ -15,7 +15,7 @@
 @AllArgsConstructor
 public class ClientRtcLocationUpdate {
 
-    private static final boolean PROCESS_OBSTRUCTIONS = StorageKey.SETTINGS_VC_PROCESS_OBSTRUCTIONS.getBoolean();
+//    private static final boolean PROCESS_OBSTRUCTIONS = StorageKey.SETTINGS_VC_PROCESS_OBSTRUCTIONS.getBoolean();
     private static IRayTracer rayTracer = new DummyTracer();
 
     private String streamKey;
@@ -24,15 +24,15 @@ public class ClientRtcLocationUpdate {
 
     public static ClientRtcLocationUpdate fromClientWithLocation(ClientConnection clientConnection, Location source, Vector3 targetLocation) {
         int obstructions = 0;
-
-        if (PROCESS_OBSTRUCTIONS) {
-            // check line-of-sight
-            obstructions = rayTracer.obstructionsBetweenLocations(
-                    source,
-                    targetLocation
-            );
-
-        }
+//
+//        if (PROCESS_OBSTRUCTIONS) {
+//            // check line-of-sight
+//            obstructions = rayTracer.obstructionsBetweenLocations(
+//                    source,
+//                    targetLocation
+//            );
+//
+//        }
 
         return new ClientRtcLocationUpdate(
                 clientConnection.getRtcSessionManager().getStreamKey(),
@@ -48,14 +48,14 @@ public static ClientRtcLocationUpdate fromClient(ClientConnection clientConnecti
 
         int obstructions = 0;
 
-        if (PROCESS_OBSTRUCTIONS) {
-            // check line-of-sight
-            obstructions = rayTracer.obstructionsBetweenLocations(
-                    player.getLocation(),
-                    originLocation
-            );
-
-        }
+//        if (PROCESS_OBSTRUCTIONS) {
+//            // check line-of-sight
+//            obstructions = rayTracer.obstructionsBetweenLocations(
+//                    player.getLocation(),
+//                    originLocation
+//            );
+//
+//        }
 
         return new ClientRtcLocationUpdate(
                 clientConnection.getRtcSessionManager().getStreamKey(),

plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java

@@ -73,7 +73,7 @@ public enum StorageKey {
     SETTING_VC_ENTERED_MUTED_REGION(false, "messages.voice-disabled-here", StorageLocation.CONFIG_FILE),
     SETTING_VC_LEFT_MUTED_REGION(false, "messages.voice-reenabled-here", StorageLocation.CONFIG_FILE),
     SETTINGS_VC_ANNOUNCEMENTS(false, "options.voicechat-announcements", StorageLocation.CONFIG_FILE),
-    SETTINGS_VC_PROCESS_OBSTRUCTIONS(false, "options.voicechat-obstructions", StorageLocation.CONFIG_FILE),
+//    SETTINGS_VC_PROCESS_OBSTRUCTIONS(false, "options.voicechat-obstructions", StorageLocation.CONFIG_FILE),
     SETTINGS_VC_ALLOW_JOIN_DURING_LOAD(false, "options.voicechat-allow-joining-while-loading", StorageLocation.CONFIG_FILE),
     SETTINGS_FORCE_OFFLINE_MODE(false, "options.force-offline-mode", StorageLocation.CONFIG_FILE),
     SETTINGS_DEFAULT_WORLD_NAME(false, "options.fallback-world-name", StorageLocation.CONFIG_FILE),

plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/speakers/objects/Speaker.java

@@ -18,6 +18,8 @@ public class Speaker extends DataStore implements BasicSpeaker {
 
     @Column @Getter private String source;
     @Column @Getter private UUID speakerId;
+    @Column(defaultValue = "true")
+    @Getter private Boolean requiresHealthCheck = true;
     @Column @Setter @Getter private Integer radius;
 
     @Column(

plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/speakers/tasks/SpeakerGarbageCollection.java

@@ -57,8 +57,9 @@ public void run() {
         possiblyFilterLimits(setSize, this.speakerService
                 .getSpeakerMap()
                 .values().stream()
-                        .filter(speaker -> !speaker.getValidated())
-                        .skip(fractionStart)
+                .filter(Speaker::getRequiresHealthCheck)
+                .filter(speaker -> !speaker.getValidated())
+                .skip(fractionStart)
         ).collect(Collectors.toList())
                 .forEach(speaker -> {
                     MappedLocation mappedLocation = speaker.getLocation();

plugin/src/main/resources/config.yml

@@ -239,10 +239,6 @@ options:
   # Decides if voicechat messages should go in the hotbar or chat. Setting this to false will default to chat
   voicechat-send-messages-in-hotbar: true
 
-  # Toggles voicechat obstruction detection. This can get quite resource intensive so it's off by default, but this muffles voices when
-  # One or more blocks are blocking the players line-of-sight
-  voicechat-obstructions: false
-
   # Automatically request a free voicechat license when the server starts
   voicechat-autoclaim-on-start: true
 

plugin/src/main/resources/data.bin

@@ -1 +1 @@
-BUILD_NUM="1502"
+BUILD_NUM="1503"

plugin/src/main/resources/openaudiomc-build.properties

@@ -1,3 +1,3 @@
-BUILD_VERSION="1502"
-BUILD_COMMIT="c1b8d01b0ffb085c03a6af17a91695c43f8a1ce8"
+BUILD_VERSION="1503"
+BUILD_COMMIT="3fc8135d91e657f180dcb5bd23d8505083fa5365"
 BUILD_AUTHOR="Mats"

plugin/src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ version: 6.10.6
 softdepend: [WorldGuard, Train_Carts, LiteBans, Essentials, PlaceholderAPI]
 main: com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot
 api-version: 1.13
-authors: [Mindgamesnl]
+authors: [Mindgamesnl, ToetMats]
 description: "OpenAudioMc: Proximity voice chat & audio plugin for Minecraft, no mods needed. Supports Bungeecord, Velocity, Spigot & more."
 website: https://openaudiomc.net/
 commands: