fix: Fixed scheduler repeating task execution

Author: 4drian3d

common/src/main/java/io/github/miniplaceholders/expansion/proxyconnection/common/PlatformProvider.java

@@ -7,7 +7,8 @@
 import java.util.regex.Pattern;
 
 public abstract class PlatformProvider<S, M> {
-    public static final String CHANNEL = "bungeecord:main";
+    public static final String LEGACY_CHANNEL = "BungeeCord";
+    public static final String MODERN_CHANNEL = "bungeecord:main";
     public static final Pattern SPLIT_PATTERN = Pattern.compile(", ");
     protected final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
     protected S platformInstance;

fabric/src/main/java/io/github/miniplaceholders/expansion/proxyconnection/fabric/FabricProvider.java

@@ -23,7 +23,7 @@ public FabricProvider(Object platformInstance, Object miniInstance) {
 
     @Override
     public Expansion.Builder provideBuilder() {
-        executor.schedule(() -> {
+        executor.scheduleAtFixedRate(() -> {
             final var players = platformInstance.getPlayerList().getPlayers().iterator();
             if (!players.hasNext()) {
                 return;
@@ -35,9 +35,9 @@ public Expansion.Builder provideBuilder() {
                 output.writeUTF(server);
                 ServerPlayNetworking.send(player, new PluginMessagePacket(output.toByteArray()));
             }
-        }, 5, TimeUnit.SECONDS);
+        }, 30, 7, TimeUnit.SECONDS);
 
-        executor.schedule(() -> {
+        executor.scheduleAtFixedRate(() -> {
             final var players = platformInstance.getPlayerList().getPlayers().iterator();
             if (!players.hasNext()) {
                 return;
@@ -46,7 +46,7 @@ public Expansion.Builder provideBuilder() {
             final ByteArrayDataOutput output = ByteStreams.newDataOutput();
             output.writeUTF(BungeeMessageTypes.GET_SERVERS.rawType());
             ServerPlayNetworking.send(player, new PluginMessagePacket(output.toByteArray()));
-        }, 10, TimeUnit.MINUTES);
+        }, 1, 3, TimeUnit.MINUTES);
 
         PluginMessageEvent.EVENT.register((payload, context) -> {
             final ByteArrayDataInput data  = ByteStreams.newDataInput(payload.getData());

gradle.properties

@@ -1,3 +1,3 @@
 group = io.github.miniplaceholders
-version = 2.0.0
+version = 2.0.1
 description = MiniPlaceholders Example Expansion

paper/src/main/java/io/github/miniplaceholders/expansion/proxyconnection/paper/PaperProvider.java

@@ -23,9 +23,9 @@ public PaperProvider(Object platformInstance, Object miniInstance) {
 
     @Override
     public Expansion.Builder provideBuilder() {
-        platformInstance.getMessenger().registerOutgoingPluginChannel(miniInstance, CHANNEL);
-        platformInstance.getMessenger().registerIncomingPluginChannel(miniInstance, CHANNEL, this);
-        executor.schedule(() -> {
+        platformInstance.getMessenger().registerOutgoingPluginChannel(miniInstance, LEGACY_CHANNEL);
+        platformInstance.getMessenger().registerIncomingPluginChannel(miniInstance, LEGACY_CHANNEL, this);
+        executor.scheduleAtFixedRate(() -> {
             final var players = platformInstance.getOnlinePlayers().iterator();
             if (!players.hasNext()) {
                 return;
@@ -35,20 +35,20 @@ public Expansion.Builder provideBuilder() {
                 final ByteArrayDataOutput output = ByteStreams.newDataOutput();
                 output.writeUTF(BungeeMessageTypes.PLAYER_COUNT.rawType());
                 output.writeUTF(server);
-                player.sendPluginMessage(miniInstance, CHANNEL, output.toByteArray());
+                player.sendPluginMessage(miniInstance, LEGACY_CHANNEL, output.toByteArray());
             }
-        }, 5, TimeUnit.SECONDS);
+        }, 30, 7, TimeUnit.SECONDS);
 
-        executor.schedule(() -> {
+        executor.scheduleAtFixedRate(() -> {
             final var players = platformInstance.getOnlinePlayers().iterator();
             if (!players.hasNext()) {
                 return;
             }
             final Player player = players.next();
             final ByteArrayDataOutput output = ByteStreams.newDataOutput();
             output.writeUTF(BungeeMessageTypes.GET_SERVERS.rawType());
-            player.sendPluginMessage(miniInstance, CHANNEL, output.toByteArray());
-        }, 10, TimeUnit.MINUTES);
+            player.sendPluginMessage(miniInstance, LEGACY_CHANNEL, output.toByteArray());
+        }, 1, 3, TimeUnit.MINUTES);
 
         return Expansion.builder("proxyconnection")
                 .globalPlaceholder("player_count", (queue, context) -> {
@@ -64,7 +64,7 @@ public Expansion.Builder provideBuilder() {
 
     @Override
     public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte @NotNull [] message) {
-        if (!channel.equals("BungeeCord")) {
+        if (!channel.equals(LEGACY_CHANNEL)) {
             return;
         }
         final ByteArrayDataInput in = ByteStreams.newDataInput(message);

sponge/src/main/java/io/github/miniplaceholders/expansion/proxyconnection/sponge/SpongeProvider.java

@@ -21,7 +21,7 @@ public SpongeProvider(Object platformInstance, Object miniInstance) {
     public Expansion.Builder provideBuilder() {
         final RawDataChannel rawDataChannel = platformInstance.game()
                 .channelManager()
-                .ofType(ResourceKey.resolve(CHANNEL), RawDataChannel.class);
+                .ofType(ResourceKey.resolve(MODERN_CHANNEL), RawDataChannel.class);
         rawDataChannel.play()
                 .addHandler((data, state) -> {
                     final String subchannel = data.readUTF();
@@ -41,7 +41,7 @@ public Expansion.Builder provideBuilder() {
                         dataCache.updateServers(List.of(servers));
                     }
                 });
-        executor.schedule(() -> {
+        executor.scheduleAtFixedRate(() -> {
             final var players = platformInstance.onlinePlayers().iterator();
             if (!players.hasNext()) {
                 return;
@@ -53,17 +53,17 @@ public Expansion.Builder provideBuilder() {
                     buf.writeUTF(server);
                 });
             }
-        }, 5, TimeUnit.SECONDS);
+        }, 30, 7, TimeUnit.SECONDS);
 
-        executor.schedule(() -> {
+        executor.scheduleAtFixedRate(() -> {
             final var players = platformInstance.onlinePlayers().iterator();
             if (!players.hasNext()) {
                 return;
             }
             final ServerPlayer player = players.next();
             rawDataChannel.play().sendTo(player,
                     buf -> buf.writeUTF(BungeeMessageTypes.GET_SERVERS.rawType()));
-        }, 10, TimeUnit.MINUTES);
+        }, 1, 3, TimeUnit.MINUTES);
 
         return Expansion.builder("proxyconnection")
                 .globalPlaceholder("player_count", (queue, context) -> {