Upstream/PlayerBalancer
1
0
Fork 0
mirror of https://github.com/BGHDDevelopment/PlayerBalancer.git synced 2024-09-17 10:14:10 +02:00
Code Issues Projects Releases Wiki Activity

Restructured the providers, now using SecureRandom

Browse Source
This commit is contained in:
Jaime Martínez Rincón 2017-12-28 22:37:18 +01:00
parent 2c0b36c0cd
commit 8d47f52265
9 changed files with 96 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ProviderType.java
View File

@ -2,7 +2,13 @@ package com.jaimemartz.playerbalancer.connection;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.*;
import com.jaimemartz.playerbalancer.connection.provider.types.NullProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.progressive.ProgressiveFillerProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.progressive.ProgressiveLowestProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.progressive.ProgressiveProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.random.RandomFillerProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.random.RandomLowestProvider;
import com.jaimemartz.playerbalancer.connection.provider.types.random.RandomProvider;
import com.jaimemartz.playerbalancer.section.ServerSection;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
@ -28,8 +34,8 @@ public enum ProviderType {
}
},
LOWEST {
LowestProvider provider = new LowestProvider();
RANDOM_LOWEST {
RandomLowestProvider provider = new RandomLowestProvider();
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
@ -37,8 +43,8 @@ public enum ProviderType {
}
},
BALANCED {
BalancedProvider provider = new BalancedProvider();
RANDOM_FILLER {
RandomFillerProvider provider = new RandomFillerProvider();
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
@ -55,8 +61,17 @@ public enum ProviderType {
}
},
FILLER {
FillerProvider provider = new FillerProvider();
PROGRESSIVE_LOWEST {
ProgressiveLowestProvider provider = new ProgressiveLowestProvider();
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
return provider.requestTarget(plugin, section, servers, player);
}
},
PROGRESSIVE_FILLER {
ProgressiveFillerProvider provider = new ProgressiveFillerProvider();
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {

4
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/FillerProvider.java → Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveFillerProvider.java
View File

@ -1,4 +1,4 @@
package com.jaimemartz.playerbalancer.connection.provider.types;
package com.jaimemartz.playerbalancer.connection.provider.types.progressive;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
@ -9,7 +9,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.List;
public class FillerProvider extends AbstractProvider {
public class ProgressiveFillerProvider extends AbstractProvider {
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
int max = Integer.MIN_VALUE;

4
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/LowestProvider.java → Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveLowestProvider.java
View File

@ -1,4 +1,4 @@
package com.jaimemartz.playerbalancer.connection.provider.types;
package com.jaimemartz.playerbalancer.connection.provider.types.progressive;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
@ -8,7 +8,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.List;
public class LowestProvider extends AbstractProvider {
public class ProgressiveLowestProvider extends AbstractProvider {
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
int min = Integer.MAX_VALUE;

5
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/ProgressiveProvider.java → Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveProvider.java
View File

@ -1,4 +1,4 @@
package com.jaimemartz.playerbalancer.connection.provider.types;
package com.jaimemartz.playerbalancer.connection.provider.types.progressive;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
@ -8,7 +8,6 @@ import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
public class ProgressiveProvider extends AbstractProvider {
@Override
@ -20,6 +19,6 @@ public class ProgressiveProvider extends AbstractProvider {
}
}
return servers.get(ThreadLocalRandom.current().nextInt(servers.size()));
return null;
}
}

35
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomFillerProvider.java Normal file
View File

@ -0,0 +1,35 @@
package com.jaimemartz.playerbalancer.connection.provider.types.random;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
import com.jaimemartz.playerbalancer.section.ServerSection;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.ArrayList;
import java.util.List;
import static com.jaimemartz.playerbalancer.utils.RandomUtils.random;
public class RandomFillerProvider extends AbstractProvider {
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
List<ServerInfo> results = new ArrayList<>();
int max = Integer.MIN_VALUE;
for (ServerInfo server : servers) {
int count = plugin.getNetworkManager().getPlayers(server);
if (count >= max) {
if (count > max) {
max = count;
results.clear();
}
results.add(server);
}
}
return random(results);
}
}

9
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/BalancedProvider.java → Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomLowestProvider.java
View File

@ -1,4 +1,4 @@
package com.jaimemartz.playerbalancer.connection.provider.types;
package com.jaimemartz.playerbalancer.connection.provider.types.random;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
@ -8,9 +8,10 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
public class BalancedProvider extends AbstractProvider {
import static com.jaimemartz.playerbalancer.utils.RandomUtils.random;
public class RandomLowestProvider extends AbstractProvider {
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
List<ServerInfo> results = new ArrayList<>();
@ -28,6 +29,6 @@ public class BalancedProvider extends AbstractProvider {
}
}
return results.get(ThreadLocalRandom.current().nextInt(results.size()));
return random(results);
}
}

7
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/RandomProvider.java → Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomProvider.java
View File

@ -1,4 +1,4 @@
package com.jaimemartz.playerbalancer.connection.provider.types;
package com.jaimemartz.playerbalancer.connection.provider.types.random;
import com.jaimemartz.playerbalancer.PlayerBalancer;
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
@ -7,11 +7,12 @@ import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import static com.jaimemartz.playerbalancer.utils.RandomUtils.random;
public class RandomProvider extends AbstractProvider {
@Override
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
return servers.get(ThreadLocalRandom.current().nextInt(servers.size()));
return random(servers);
}
}

12
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/RandomUtils.java Normal file
View File

@ -0,0 +1,12 @@
package com.jaimemartz.playerbalancer.utils;
import java.security.SecureRandom;
import java.util.List;
public class RandomUtils {
private static final SecureRandom instance = new SecureRandom();
public static <T> T random(List<T> list) {
return list.get(instance.nextInt(list.size()));
}
}

24
Main Plugin/src/main/resources/default.conf
View File

@ -42,21 +42,21 @@ messages {
features {
balancer {
# Here you have an example of what you can do with the sections
# The plugin will print out info telling you if your config is right or not
# If a section does not have a provider it will be inherit from the parent
# The best way to understand this is to play around with it
# You can use regex to match a set of servers instead of adding each server
# You can have as many sections as you want, there is no limit here
# When connecting to a server in a section, you get redirected
# If a section does not have a provider it will try to inherit it from the parent
# When connecting to a server on a section while not being on it already, you get distributed
# You can use regex to match a set of servers instead of adding each server individually
# Providers you can use:
# NONE: Returns no server (no one will be able to connect to this section)
# BALANCED: Returns a server between the ones with the least players online
# LOWEST: Returns the first server found with the least players online
# RANDOM: Returns a server selected by a RNG algorithm (random)
# PROGRESSIVE: Returns the first server found that is not full
# FILLER: Returns the server with the most players online that is not full
# EXTERNAL: Returns the server determined by a provider created by other plugin
# Providers you can use: (you can request more!)
# NONE: Returns no server (no one will be able to connect to this section)
# RANDOM: Returns a random server, generated by SecureRandom
# RANDOM_LOWEST: Returns a random server between the ones with the least players online
# RANDOM_FILLER: Returns a random server between the ones with the most players online that is not full
# PROGRESSIVE: Returns the first server that is not full
# PROGRESSIVE_LOWEST: Returns the first server with the least players online
# PROGRESSIVE_FILLER: Returns the first server with the most players online that is not full
# EXTERNAL: Returns the server calculated by a provider created by other plugin
sections {
auth-lobbies {