356 lines
15 KiB
Diff
356 lines
15 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <novau233@163.com>
|
|
Date: Sun, 2 Jun 2024 12:18:05 +0000
|
|
Subject: [PATCH] Add a simple membar
|
|
|
|
|
|
diff --git a/src/main/java/me/earthme/luminol/commands/MembarCommand.java b/src/main/java/me/earthme/luminol/commands/MembarCommand.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..a5cbad6b947b1c3e1499bc6d311e17a5eb570c2f
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/earthme/luminol/commands/MembarCommand.java
|
|
@@ -0,0 +1,47 @@
|
|
+package me.earthme.luminol.commands;
|
|
+
|
|
+import me.earthme.luminol.config.modules.misc.MembarConfig;
|
|
+import me.earthme.luminol.functions.GlobalServerMemoryBar;
|
|
+import net.kyori.adventure.text.Component;
|
|
+import net.kyori.adventure.text.format.TextColor;
|
|
+import org.bukkit.command.Command;
|
|
+import org.bukkit.command.CommandSender;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+public class MembarCommand extends Command {
|
|
+ public MembarCommand(@NotNull String name) {
|
|
+ super(name);
|
|
+ this.setPermission("luminol.commands.membar");
|
|
+ this.setDescription("Show the memory usage through a bossbar");
|
|
+ this.setUsage("/membar");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
|
|
+ if (!testPermission(sender)){
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ if (!MembarConfig.memoryBarEnabled){
|
|
+ sender.sendMessage(Component.text("Membar was already disabled!").color(TextColor.color(255,0,0)));
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ if (!(sender instanceof Player player)){
|
|
+ sender.sendMessage(Component.text("Only player can use this command!").color(TextColor.color(255,0,0)));
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ if (GlobalServerMemoryBar.isPlayerVisible(player)) {
|
|
+ player.sendMessage(Component.text("Disabled mem bar").color(TextColor.color(0,255,0)));
|
|
+ GlobalServerMemoryBar.setVisibilityForPlayer(player,false);
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ player.sendMessage(Component.text("Enabled mem bar").color(TextColor.color(0,255,0)));
|
|
+ GlobalServerMemoryBar.setVisibilityForPlayer(player,true);
|
|
+
|
|
+ return true;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/MembarConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/MembarConfig.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..b632c4a636974535bf001f010de1dcb6b25868c0
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/MembarConfig.java
|
|
@@ -0,0 +1,50 @@
|
|
+package me.earthme.luminol.config.modules.misc;
|
|
+
|
|
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
|
+import me.earthme.luminol.commands.MembarCommand;
|
|
+import me.earthme.luminol.config.ConfigInfo;
|
|
+import me.earthme.luminol.config.DoNotLoad;
|
|
+import me.earthme.luminol.config.EnumConfigCategory;
|
|
+import me.earthme.luminol.config.IConfigModule;
|
|
+import me.earthme.luminol.functions.GlobalServerMemoryBar;
|
|
+import org.bukkit.Bukkit;
|
|
+
|
|
+import java.util.List;
|
|
+
|
|
+public class MembarConfig implements IConfigModule {
|
|
+ @ConfigInfo(baseName = "enabled")
|
|
+ public static boolean memoryBarEnabled = false;
|
|
+ @ConfigInfo(baseName = "format")
|
|
+ public static String memBarFormat = "<gray>Memory usage <yellow>:</yellow> <used>MB<yellow>/</yellow><available>MB";
|
|
+ @ConfigInfo(baseName = "memory_color_list")
|
|
+ public static List<String> memColors = List.of("GREEN","YELLOW","RED","PURPLE");
|
|
+ @ConfigInfo(baseName = "update_interval_ticks")
|
|
+ public static int updateInterval = 15;
|
|
+
|
|
+ @DoNotLoad
|
|
+ private static boolean inited = false;
|
|
+
|
|
+ @Override
|
|
+ public EnumConfigCategory getCategory() {
|
|
+ return EnumConfigCategory.MISC;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getBaseName() {
|
|
+ return "membar";
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void onLoaded(CommentedFileConfig configInstance){
|
|
+ if (memoryBarEnabled){
|
|
+ GlobalServerMemoryBar.init();
|
|
+ }else{
|
|
+ GlobalServerMemoryBar.cancelBarUpdateTask();
|
|
+ }
|
|
+
|
|
+ if (!inited){
|
|
+ Bukkit.getCommandMap().register("membar","luminol",new MembarCommand("membar"));
|
|
+ inited = true;
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..a33a45194273cc1b4e4157a5449c7994968a3480
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
|
|
@@ -0,0 +1,186 @@
|
|
+package me.earthme.luminol.functions;
|
|
+
|
|
+import io.papermc.paper.threadedregions.ThreadedRegionizer;
|
|
+import io.papermc.paper.threadedregions.TickRegions;
|
|
+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
|
|
+import me.earthme.luminol.config.modules.misc.MembarConfig;
|
|
+import net.kyori.adventure.bossbar.BossBar;
|
|
+import net.kyori.adventure.text.Component;
|
|
+import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
|
|
+import net.minecraft.server.level.ServerLevel;
|
|
+import net.minecraft.server.level.ServerPlayer;
|
|
+import org.apache.logging.log4j.LogManager;
|
|
+import org.apache.logging.log4j.Logger;
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.craftbukkit.entity.CraftPlayer;
|
|
+import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+import java.lang.management.ManagementFactory;
|
|
+import java.lang.management.MemoryUsage;
|
|
+import java.util.*;
|
|
+
|
|
+public class GlobalServerMemoryBar {
|
|
+ protected static final MinecraftInternalPlugin NULL_PLUGIN = new MinecraftInternalPlugin();
|
|
+ protected static final Map<UUID, BossBar> uuid2Bossbars = new HashMap<>();
|
|
+ protected static volatile ScheduledTask membarTask = null;
|
|
+ private static final Logger logger = LogManager.getLogger();
|
|
+
|
|
+ public static void init(){
|
|
+ cancelBarUpdateTask();
|
|
+
|
|
+ Bukkit.getGlobalRegionScheduler().runAtFixedRate(NULL_PLUGIN, c -> {
|
|
+ membarTask = c;
|
|
+ try {
|
|
+ update();
|
|
+ }catch (Exception e){
|
|
+ logger.error(e);
|
|
+ }
|
|
+ },1, MembarConfig.updateInterval);
|
|
+ }
|
|
+
|
|
+ public static void removeAllBars(){
|
|
+ for (Map.Entry<UUID,BossBar> barEntry : uuid2Bossbars.entrySet()){
|
|
+ final UUID playerUUID = barEntry.getKey();
|
|
+ final BossBar memBar = barEntry.getValue();
|
|
+
|
|
+ final Player targetPlayer = Bukkit.getPlayer(playerUUID);{
|
|
+ if (targetPlayer != null){
|
|
+ targetPlayer.hideBossBar(memBar);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ uuid2Bossbars.clear();
|
|
+ }
|
|
+
|
|
+ public static void cancelBarUpdateTask(){
|
|
+ removeAllBars();
|
|
+
|
|
+ if (membarTask == null || membarTask.isCancelled()){
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ membarTask.cancel();
|
|
+ }
|
|
+
|
|
+ public static boolean isPlayerVisible(Player player){
|
|
+ return ((CraftPlayer) player).getHandle().isMemBarVisible;
|
|
+ }
|
|
+
|
|
+ public static void setVisibilityForPlayer(Player target,boolean canSee){
|
|
+ ((CraftPlayer) target).getHandle().isMemBarVisible = canSee;
|
|
+ }
|
|
+
|
|
+ private static void update(){
|
|
+ updateBarValues();
|
|
+ cleanUpPlayers();
|
|
+ }
|
|
+
|
|
+ private static void cleanUpPlayers(){
|
|
+ final List<UUID> toRemove = new ArrayList<>();
|
|
+
|
|
+ for (Map.Entry<UUID,BossBar> bossBarEntry : uuid2Bossbars.entrySet()){
|
|
+ final UUID uuid = bossBarEntry.getKey();
|
|
+ boolean shouldRemove = true;
|
|
+
|
|
+ final Player target = Bukkit.getPlayer(uuid);
|
|
+ if (target != null){
|
|
+ shouldRemove = !isPlayerVisible(target);
|
|
+ }
|
|
+
|
|
+ if (shouldRemove){
|
|
+ toRemove.add(uuid);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ for (UUID uuid : toRemove){
|
|
+ final BossBar removed = uuid2Bossbars.remove(uuid);
|
|
+ if (removed != null){
|
|
+ final Player targetPlayer = Bukkit.getPlayer(uuid);
|
|
+ if (targetPlayer != null){
|
|
+ targetPlayer.hideBossBar(removed);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private static void updateBarValues(){
|
|
+ MemoryUsage heap = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
|
|
+
|
|
+ long used = heap.getUsed();
|
|
+ long xmx = heap.getMax();
|
|
+
|
|
+
|
|
+
|
|
+ for (Player apiPlayer : Bukkit.getOnlinePlayers()){
|
|
+ final ServerPlayer nmsPlayer = ((CraftPlayer) apiPlayer).getHandle();
|
|
+ final ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> region = ((ServerLevel) nmsPlayer.level()).regioniser.getRegionAtUnsynchronised(nmsPlayer.sectionX,nmsPlayer.sectionZ);
|
|
+
|
|
+ if (region == null){
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ BossBar targetBossbar = uuid2Bossbars.get(nmsPlayer.getUUID());
|
|
+
|
|
+ if (targetBossbar == null && isPlayerVisible(apiPlayer)){
|
|
+ targetBossbar = BossBar.bossBar(Component.text(""),0.0F, BossBar.Color.valueOf(MembarConfig.memColors.get(3)), BossBar.Overlay.NOTCHED_20);
|
|
+ uuid2Bossbars.put(nmsPlayer.getUUID(),targetBossbar);
|
|
+ apiPlayer.showBossBar(targetBossbar);
|
|
+ }
|
|
+
|
|
+ if (targetBossbar != null){
|
|
+ updateMembar(targetBossbar,used,xmx);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private static void updateMembar(@NotNull BossBar bar, long used, long xmx){
|
|
+ double percent = Math.max(Math.min((float) used / xmx, 1.0F), 0.0F);
|
|
+ bar.name(MiniMessage.miniMessage().deserialize(
|
|
+ MembarConfig.memBarFormat,
|
|
+ Placeholder.component("used", getMemoryComponent(used,xmx)),
|
|
+ Placeholder.component("available",getMaxMemComponent(xmx))
|
|
+ ));
|
|
+ bar.color(barColorFromMemory(percent));
|
|
+ bar.progress((float) percent);
|
|
+ }
|
|
+
|
|
+ private static @NotNull Component getMaxMemComponent(double max){
|
|
+ final BossBar.Color colorBukkit = BossBar.Color.GREEN;
|
|
+ final String colorString = colorBukkit.name();
|
|
+
|
|
+ final String content = "<%s><text></%s>";
|
|
+ final String replaced = String.format(content,colorString,colorString);
|
|
+
|
|
+ return MiniMessage.miniMessage().deserialize(replaced,Placeholder.parsed("text", String.format("%.2f", (double)max / (1024 * 1024))));
|
|
+ }
|
|
+
|
|
+ private static @NotNull Component getMemoryComponent(long used,long max){
|
|
+ final BossBar.Color colorBukkit = barColorFromMemory(Math.max(Math.min((float) used / max, 1.0F), 0.0F));
|
|
+ final String colorString = colorBukkit.name();
|
|
+
|
|
+ final String content = "<%s><text></%s>";
|
|
+ final String replaced = String.format(content,colorString,colorString);
|
|
+
|
|
+ return MiniMessage.miniMessage().deserialize(replaced,Placeholder.parsed("text", String.format("%.2f", (double)used / (1024 * 1024))));
|
|
+ }
|
|
+
|
|
+ private static BossBar.Color barColorFromMemory(double memPercent){
|
|
+ if (memPercent == -1){
|
|
+ return BossBar.Color.valueOf(MembarConfig.memColors.get(3));
|
|
+ }
|
|
+
|
|
+ if (memPercent <= 50){
|
|
+ return BossBar.Color.valueOf(MembarConfig.memColors.getFirst());
|
|
+ }
|
|
+
|
|
+ if (memPercent <= 70){
|
|
+ return BossBar.Color.valueOf(MembarConfig.memColors.get(1));
|
|
+ }
|
|
+
|
|
+ return BossBar.Color.valueOf(MembarConfig.memColors.get(2));
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
index 0c9b1289f445b7951a8c92c6d9effb0a7fb8ba01..b82ed9280f96bacbb87ae77a6afd5d82d8863b58 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -851,6 +851,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
@Override
|
|
public void stopServer() {
|
|
me.earthme.luminol.functions.GlobalServerTpsBar.cancelBarUpdateTask(); //Luminol - Tpsbar
|
|
+ me.earthme.luminol.functions.GlobalServerMemoryBar.cancelBarUpdateTask(); //Luminol - Memory bar
|
|
super.stopServer();
|
|
//Util.shutdownExecutors(); // Paper - moved into super
|
|
SkullBlockEntity.clear();
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index a8f2eddba3ac3b7c551d39e260e096067e8bdc0f..92e9860b146b6e3e1dc593bfd5bfddab3318761d 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -303,6 +303,7 @@ public class ServerPlayer extends Player {
|
|
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
|
|
public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
|
|
public volatile boolean isTpsBarVisible = false; //Luminol - Tps bar
|
|
+ public volatile boolean isMemBarVisible = false; //Luminol - Memory bar
|
|
|
|
public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances getViewDistances() {
|
|
return this.viewDistances.get();
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 28583ad8117167400faf3ca0dc4bc9f3f44dbedb..730887465bf9ca380ef692b4c2d4a28bc6caaaa9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2373,6 +2373,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
//Luminol start - Tpsbar
|
|
getHandle().isTpsBarVisible = data.getBoolean("tpsbarVisible");
|
|
//Luminol end
|
|
+ //Luminol start - Membar
|
|
+ getHandle().isMemBarVisible = data.getBoolean("membarVisible");
|
|
+ //Luminol end
|
|
}
|
|
}
|
|
|
|
@@ -2397,6 +2400,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
//Luminol start - Tpsbar
|
|
data.putBoolean("tpsbarVisible",handle.isTpsBarVisible);
|
|
//Luminol end
|
|
+ //Luminol start - Membar
|
|
+ data.putBoolean("membarVisible",handle.isMemBarVisible);
|
|
+ //Luminol end
|
|
// Paper start - persist for use in offline save data
|
|
if (!nbttagcompound.contains("Paper")) {
|
|
nbttagcompound.put("Paper", new CompoundTag());
|