Compare commits

...
2 Commits
Author SHA1 Message Date
jmp 6ffce0713f 1.1.2 2020-07-10 00:36:41 -07:00
jmp ac1dea2867 1.1.1 2020-07-09 19:18:29 -07:00
8 changed files with 64 additions and 45 deletions

No files matched your search

+7 -2
View File
@@ -6,7 +6,7 @@
<groupId>xyz.jpenilla</groupId>
<artifactId>MiniMOTD</artifactId>
<version>1.1.0</version>
<version>1.1.2</version>
<packaging>jar</packaging>
<name>MiniMOTD</name>
@@ -122,6 +122,11 @@
<artifactId>adventure-platform-bungeecord</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-bungeecord</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
@@ -147,7 +152,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.10</version>
<version>1.18.12</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -1,9 +1,8 @@
package xyz.jpenilla.minimotd.bungee;
import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.bungeecord.BungeeCordComponentSerializer;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ConnectedPlayer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command;
@@ -12,12 +11,10 @@ import java.util.List;
public class BungeeCommand extends Command {
private final MiniMOTD miniMOTD;
private final BungeeAudiences audience;
public BungeeCommand(MiniMOTD miniMOTD) {
super("minimotd");
super("minimotdbungee");
this.miniMOTD = miniMOTD;
this.audience = BungeeAudiences.create(miniMOTD);
}
@Override
@@ -86,7 +83,7 @@ public class BungeeCommand extends Command {
} else {
finalMessage = MiniMessage.get().stripTokens(message);
}
audience.audience(sender).sendMessage(MiniMessage.get().parse(finalMessage));
sender.sendMessage(BungeeCordComponentSerializer.get().serialize(MiniMessage.get().parse(finalMessage)));
}
private void send(CommandSender sender, List<String> messages) {
@@ -30,6 +30,8 @@ public class BungeeConfig extends MiniMOTDConfig {
setJustXMoreEnabled(config.getBoolean(JUST_X_MORE_ENABLED));
setMaxPlayers(config.getInt(MAX_PLAYERS));
setXValue(config.getInt(X_VALUE));
setFakePlayersEnabled(config.getBoolean(FAKE_PLAYERS_ENABLED));
setFakePlayers(config.getString(FAKE_PLAYERS));
}
private Configuration loadFromDisk() {
@@ -11,6 +11,8 @@ import net.md_5.bungee.chat.ComponentSerializer;
import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.event.EventPriority;
import java.util.concurrent.ThreadLocalRandom;
public class PingListener implements Listener {
private final BungeeConfig cfg;
@@ -25,9 +27,24 @@ public class PingListener implements Listener {
if (response != null) {
final ServerPing.Players players = response.getPlayers();
int onlinePlayers = players.getOnline();
/*if (cfg.isFakePlayersEnabled()) {
onlinePlayers = onlinePlayers + cfg.getFakePlayersAmount(onlinePlayers);
}*/
if (cfg.isFakePlayersEnabled()) {
try {
if (cfg.getFakePlayers().contains(":")) {
final String[] fakePlayers = cfg.getFakePlayers().split(":");
final int start = Integer.parseInt(fakePlayers[0]);
final int end = Integer.parseInt(fakePlayers[1]);
onlinePlayers = onlinePlayers + ThreadLocalRandom.current().nextInt(start, end);
} else if (cfg.getFakePlayers().contains("%")) {
final double factor = 1 + (Double.parseDouble(cfg.getFakePlayers().replace("%", "")) / 100);
onlinePlayers = (int) Math.ceil(factor * onlinePlayers);
} else {
final int addedPlayers = Integer.parseInt(cfg.getFakePlayers());
onlinePlayers = onlinePlayers + addedPlayers;
}
} catch (NumberFormatException ex) {
System.out.println("[MiniMOTD] fakePlayers config incorrect");
}
}
players.setOnline(onlinePlayers);
int maxPlayers = cfg.getAdjustedMaxPlayers(onlinePlayers, players.getMax());
@@ -9,21 +9,22 @@ import java.util.Random;
@FieldNameConstants
public abstract class MiniMOTDConfig {
private final Random r = new Random();
@Getter private final ArrayList<String> motds = new ArrayList<>();
@Getter @Setter private boolean motdEnabled;
@Getter @Setter private boolean maxPlayersEnabled;
@Getter @Setter private boolean justXMoreEnabled;
@Getter @Setter private int xValue;
@Getter @Setter private int maxPlayers;
public final String MOTDS = "motd." + Fields.motds;
public final String MOTD_ENABLED = "motd." + Fields.motdEnabled;
public final String MAX_PLAYERS_ENABLED = Fields.maxPlayers + "." + Fields.maxPlayersEnabled;
public final String JUST_X_MORE_ENABLED = Fields.maxPlayers + "." + Fields.justXMoreEnabled;
public final String MAX_PLAYERS = Fields.maxPlayers + "." + Fields.maxPlayers;
public final String X_VALUE = Fields.maxPlayers + "." + Fields.xValue;
public final String FAKE_PLAYERS_ENABLED = "bungeeOnly." + Fields.fakePlayersEnabled;
public final String FAKE_PLAYERS = "bungeeOnly." + Fields.fakePlayers;
@Getter private final ArrayList<String> motds = new ArrayList<>();
@Getter @Setter private boolean motdEnabled;
@Getter @Setter private boolean maxPlayersEnabled;
@Getter @Setter private boolean justXMoreEnabled;
@Getter @Setter private boolean fakePlayersEnabled;
@Getter @Setter private int xValue;
@Getter @Setter private int maxPlayers;
@Getter @Setter private String fakePlayers;
public abstract void reload();
@@ -31,7 +32,7 @@ public abstract class MiniMOTDConfig {
if (motds.size() == 1) {
return motds.get(0);
} else {
return motds.get(r.nextInt(motds.size()))
return motds.get(new Random().nextInt(motds.size()))
.replace("{onlinePlayers}", String.valueOf(onlinePlayers))
.replace("{maxPlayers}", String.valueOf(maxPlayers));
}
@@ -1,21 +0,0 @@
package xyz.jpenilla.minimotd.common;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import java.util.ArrayList;
import java.util.List;
public class MiniMessageUtil {
public static String miniMessageToLegacy(String message) {
return LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build().serialize(MiniMessage.get().parse(message));
}
public static List<String> miniMessageToLegacy(List<String> messages) {
final List<String> l = new ArrayList<>();
for (String message : messages) {
l.add(miniMessageToLegacy(message));
}
return l;
}
}
@@ -1,8 +1,9 @@
package xyz.jpenilla.minimotd.spigot;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.configuration.file.FileConfiguration;
import xyz.jpenilla.minimotd.common.MiniMOTDConfig;
import xyz.jpenilla.minimotd.common.MiniMessageUtil;
public class SpigotConfig extends MiniMOTDConfig {
private final MiniMOTD miniMOTD;
@@ -25,7 +26,7 @@ public class SpigotConfig extends MiniMOTDConfig {
} else {
temp = motd;
}
getMotds().add(MiniMessageUtil.miniMessageToLegacy(temp.replace("{br}", "\n")));
getMotds().add(miniMessageToLegacy(temp.replace("{br}", "\n")));
}
setMotdEnabled(config.getBoolean(MOTD_ENABLED));
setMaxPlayersEnabled(config.getBoolean(MAX_PLAYERS_ENABLED));
@@ -33,4 +34,8 @@ public class SpigotConfig extends MiniMOTDConfig {
setMaxPlayers(config.getInt(MAX_PLAYERS));
setXValue(config.getInt(X_VALUE));
}
private String miniMessageToLegacy(String message) {
return LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build().serialize(MiniMessage.get().parse(message));
}
}
+14 -1
View File
@@ -19,4 +19,17 @@ maxPlayers:
# Changes the Max Players to X more than the online players
# Example: 16/19 players online.
justXMoreEnabled: false
xValue: 3
xValue: 3
bungeeOnly:
# Do you want to enable this feature?
fakePlayersEnabled: false
# Modes: static, random, percent
# static: This many fake players will be added
# ex: fakePlayers: "3"
# random: A random number of fake players in this range will be added
# ex: fakePlayers: "3:6"
# percent: The player count will be inflated by this much, rounding up
# ex: fakePlayers: "25%"
fakePlayers: "25%"