Skip to content
This repository was archived by the owner on Jun 19, 2021. It is now read-only.

Commit 85efae0

Browse files
committed
Updates
1 parent b0b9a48 commit 85efae0

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@
2727
import java.net.URISyntaxException;
2828
import java.net.URL;
2929
import java.time.Instant;
30-
import java.util.ArrayList;
31-
import java.util.Arrays;
30+
import java.util.*;
3231
import java.util.List;
33-
import java.util.Map;
34-
import java.util.Optional;
3532
import java.util.concurrent.CancellationException;
3633
import java.util.concurrent.CompletableFuture;
3734
import java.util.concurrent.TimeUnit;
@@ -245,7 +242,17 @@ private void checkJvmFlags(EmbedBuilder embedBuilder, JsonObject system) {
245242
if (jvmFlags.contains("-XX:+UseZGC")) {
246243
final String jvmVersion = system.get("jvmversion").getAsString();
247244
if (Integer.parseInt(jvmVersion.split("\\.")[0]) < 14)
248-
embedBuilder.addField("Java version & ZGC", "If you are going to use ZGC, you should also use Java 14+.", true);
245+
embedBuilder.addField("Java version & ZGC", "If you are going to use ZGC, you should also use Java 15 or later.", true);
246+
if (jvmFlags.contains("-Xmx")) {
247+
int maxMem = 0;
248+
String xmxString = jvmFlags.substring(jvmFlags.indexOf("-Xmx"));
249+
xmxString = xmxString.substring(4,xmxString.indexOf(" ")).toLowerCase(Locale.ENGLISH).replace("g", "000").replace("m", "");
250+
try {
251+
if (Integer.parseInt(xmxString) < 10000) {
252+
embedBuilder.addField("Low Memory", "ZGC is only good with a lot of memory. It's recommended to only use it with 10GB+ of memory.", true);
253+
}
254+
} catch (NumberFormatException ignored) { }
255+
}
249256
} else if (jvmFlags.contains("-Daikars.new.flags=true")) {
250257
if (!jvmFlags.contains("XX:G1MixedGCCountTarget=4"))
251258
embedBuilder.addField("Outdated JVM Flags", "Add `-XX:G1MixedGCCountTarget=4` to flags.", true);

src/main/java/org/yatopiamc/bot/timings/TimingsSuggestions.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public class TimingsSuggestions {
4444
suggestions.put("ExploitFixer", new PluginSuggestion("", "You probably don't need ExploitFixer as Paper already fixes all dupe and crash bugs."));
4545
suggestions.put("EntityTrackerFixer", new PluginSuggestion("", "You don't need EntityTrackerFixer as Paper already has its features."));
4646
suggestions.put("Orebfuscator", new PluginSuggestion("", "You don't need Orebfuscator as [Paper](https://gist.github.com/stonar96/ba18568bd91e5afd590e8038d14e245e) already has its features."));
47-
suggestions.put("GroupManager", new PluginSuggestion("", "GroupManager is an outdated permission plugin. Consider replacing it with [LuckPerms](https://www.spigotmc.org/resources/luckperms.28140/)."));
48-
suggestions.put("PermissionsEx", new PluginSuggestion("", "PermissionsEx is an outdated permission plugin. Consider replacing it with [LuckPerms](https://www.spigotmc.org/resources/luckperms.28140/)."));
49-
suggestions.put("bPermissions", new PluginSuggestion("", "bPermissions is an outdated permission plugin. Consider replacing it with [LuckPerms](https://www.spigotmc.org/resources/luckperms.28140/)."));
47+
suggestions.put("GroupManager", new PluginSuggestion("", "GroupManager is an outdated permission plugin. Consider replacing it with [LuckPerms](https://luckperms.net/download)."));
48+
suggestions.put("PermissionsEx", new PluginSuggestion("", "PermissionsEx is an outdated permission plugin. Consider replacing it with [LuckPerms](https://luckperms.net/download)."));
49+
suggestions.put("bPermissions", new PluginSuggestion("", "bPermissions is an outdated permission plugin. Consider replacing it with [LuckPerms](https://luckperms.net/download)."));
5050
suggestions.put("PhantomSMP", new PluginSuggestion("", "You probably don't need PhantomSMP as Paper already has its features. See phantoms-only-attack-insomniacs in paper.yml"));
5151
suggestions.put("EpicHeads", new PluginSuggestion("", "This plugin was made by Songoda. Songoda resources are poorly developed and often cause problems. You should find an alternative such as [HeadsPlus](https://spigotmc.org/resources/headsplus-»-1-8-1-16-4.40265/) or [HeadDatabase](https://www.spigotmc.org/resources/head-database.14280/)."));
5252
return suggestions;

0 commit comments

Comments
 (0)