Fascinated/wildaddons
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

add tps monitor

Browse Source
This commit is contained in:
Lee 2023-03-06 19:29:41 +00:00
parent 2de44e792c
commit f5c7e8532a
12 changed files with 174 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cc/fascinated/wildaddons/addon/Addon.java
View File

@ -16,13 +16,15 @@ public abstract class Addon implements EventListener {
this.name = name;
this.description = description;
this.category = category;
this.enabled = true;
EventManager.registerListener(this);
onEnable();
}
public enum Category {
CHAT
CHAT,
UI
}
/**

6
src/main/java/cc/fascinated/wildaddons/addon/AddonManager.java
View File

@ -1,6 +1,7 @@
package cc.fascinated.wildaddons.addon;
import cc.fascinated.wildaddons.addon.impl.chat.AutoWelcomer;
import cc.fascinated.wildaddons.addon.impl.chat.AutoWelcomerAddon;
import cc.fascinated.wildaddons.addon.impl.ui.OverlayAddon;
import java.util.HashSet;
import java.util.Set;
@ -13,7 +14,8 @@ public class AddonManager {
public static final Set<Addon> ADDONS = new HashSet<>();
public AddonManager() {
registerAddon(new AutoWelcomer());
registerAddon(new AutoWelcomerAddon());
registerAddon(new OverlayAddon());
}
/**

7
src/main/java/cc/fascinated/wildaddons/addon/impl/chat/AutoWelcomer.java → src/main/java/cc/fascinated/wildaddons/addon/impl/chat/AutoWelcomerAddon.java
View File

@ -8,9 +8,9 @@ import cc.fascinated.wildaddons.utils.PlayerUtils;
import java.util.concurrent.ThreadLocalRandom;
public class AutoWelcomer extends Addon {
public class AutoWelcomerAddon extends Addon {
public AutoWelcomer() {
public AutoWelcomerAddon() {
super("Auto Welcomer",
"Automatically sends the welcome command when a new player joins.",
Category.CHAT
@ -19,6 +19,9 @@ public class AutoWelcomer extends Addon {
@Override
public void onChat(String message, String messageStripped) {
if (!this.isEnabled()) { // This addon is disabled
return;
}
if (!PlayerListener.isMoving()) { // To prevent bans lol
return;
}

32
src/main/java/cc/fascinated/wildaddons/addon/impl/ui/OverlayAddon.java Normal file
View File

@ -0,0 +1,32 @@
package cc.fascinated.wildaddons.addon.impl.ui;
import cc.fascinated.wildaddons.Main;
import cc.fascinated.wildaddons.addon.Addon;
import cc.fascinated.wildaddons.tpsmonitor.TpsMonitor;
import cc.fascinated.wildaddons.utils.NumberUtils;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
public class OverlayAddon extends Addon {
public OverlayAddon() {
super("Overlay", "Adds basic client and server info to the overlay", Category.UI);
}
@Override
public void onEnable() {
HudRenderCallback.EVENT.register((matrixStack, somefloatidkwhatitdoes) -> {
if (!this.isEnabled()) {
return;
}
MinecraftClient minecraftClient = Main.getMinecraftClient();
TextRenderer renderer = minecraftClient.textRenderer;
renderer.drawWithShadow(matrixStack, "FPS: " + minecraftClient.getCurrentFps(), 5, 5, 0xffffff);
renderer.drawWithShadow(matrixStack, "TPS: " + TpsMonitor.getFormattedTPS(), 5, 16, 0xffffff);
});
}
}

2
src/main/java/cc/fascinated/wildaddons/client/WildAddonsClient.java
View File

@ -3,6 +3,7 @@ package cc.fascinated.wildaddons.client;
import cc.fascinated.wildaddons.addon.AddonManager;
import cc.fascinated.wildaddons.event.EventManager;
import cc.fascinated.wildaddons.listener.PlayerListener;
import cc.fascinated.wildaddons.tpsmonitor.TpsMonitor;
import net.fabricmc.api.ClientModInitializer;
public class WildAddonsClient implements ClientModInitializer {
@ -15,5 +16,6 @@ public class WildAddonsClient implements ClientModInitializer {
new AddonManager();
EventManager.registerListener(new PlayerListener());
EventManager.registerListener(new TpsMonitor());
}
}

16
src/main/java/cc/fascinated/wildaddons/event/EventListener.java
View File

@ -1,5 +1,7 @@
package cc.fascinated.wildaddons.event;
import net.minecraft.network.Packet;
public interface EventListener {
default void onTick() {}
@ -11,4 +13,18 @@ public interface EventListener {
* @param messageStripped the message without colors
*/
default void onChat(String message, String messageStripped) {}
/**
* Gets called when the client receives a packet.
*
* @param packet the packet
*/
default void onPacketReceive(Packet<?> packet) {}
/**
* Gets called when the client sends a packet.
*
* @param packet the packet
*/
default void onPacketSend(Packet<?> packet) {}
}

2
src/main/java/cc/fascinated/wildaddons/mixin/PlayerMixin.java → src/main/java/cc/fascinated/wildaddons/mixin/ChatHudMixin.java
View File

@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ChatHud.class)
public class PlayerMixin {
public class ChatHudMixin {
@Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At("HEAD"))
public void onChat(Text text, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) {

29
src/main/java/cc/fascinated/wildaddons/mixin/ClientConnectionMixin.java Normal file
View File

@ -0,0 +1,29 @@
package cc.fascinated.wildaddons.mixin;
import cc.fascinated.wildaddons.event.EventListener;
import cc.fascinated.wildaddons.event.EventManager;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.Packet;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientConnection.class)
public class ClientConnectionMixin {
@Inject(method = "send(Lnet/minecraft/network/Packet;)V", at = @At("HEAD"))
public void send(Packet<?> packet, CallbackInfo ci) {
for (EventListener listener : EventManager.getListeners()) {
listener.onPacketSend(packet);
}
}
@Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/Packet;)V", at = @At("HEAD"))
public void channelRead0(ChannelHandlerContext channelHandlerContext, Packet<?> packet, CallbackInfo ci) {
for (EventListener listener : EventManager.getListeners()) {
listener.onPacketReceive(packet);
}
}
}

1
src/main/java/cc/fascinated/wildaddons/mixin/MinecraftClientMixin.java
View File

@ -5,6 +5,7 @@ import cc.fascinated.wildaddons.event.EventListener;
import cc.fascinated.wildaddons.event.EventManager;
import cc.fascinated.wildaddons.utils.PlayerUtils;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

57
src/main/java/cc/fascinated/wildaddons/tpsmonitor/TpsMonitor.java Normal file
View File

@ -0,0 +1,57 @@
package cc.fascinated.wildaddons.tpsmonitor;
import cc.fascinated.wildaddons.event.EventListener;
import cc.fascinated.wildaddons.utils.NumberUtils;
import com.google.common.collect.EvictingQueue;
import lombok.Getter;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
public class TpsMonitor implements EventListener {
private static final EvictingQueue<Float> serverTPS = EvictingQueue.create(3);
private static long systemTime = 0;
private static long worldTicks = 0;
@Override
public void onPacketReceive(Packet<?> packet) {
if (!(packet instanceof WorldTimeUpdateS2CPacket)) {
return;
}
WorldTimeUpdateS2CPacket updatePacket = (WorldTimeUpdateS2CPacket) packet;
long currentWorldTicks = updatePacket.getTime();
if (systemTime == 0) {
systemTime = System.currentTimeMillis();
}
long currentSystemTime = System.currentTimeMillis();
serverTPS.add((((float) (currentWorldTicks - worldTicks)) / (((float) (currentSystemTime - systemTime)) / 50.0f)) * 20.0f);
systemTime = System.currentTimeMillis();
worldTicks = currentWorldTicks;
}
/**
* Gets the average server TPS
* of the last 3 seconds.
*
* @return the tps
*/
public static float calculateServerTPS() {
float sum = 0.0f;
for (Float f : serverTPS) {
sum += f;
}
return sum / (float) serverTPS.size();
}
/**
* Get the TPS formatted
*
* @return the formatted tps
*/
public static String getFormattedTPS() {
float tps = calculateServerTPS();
return tps > 20.00 ? "20.00*" : NumberUtils.format(tps);
}
}

22
src/main/java/cc/fascinated/wildaddons/utils/NumberUtils.java Normal file
View File

@ -0,0 +1,22 @@
package cc.fascinated.wildaddons.utils;
import java.text.DecimalFormat;
public class NumberUtils {
private static final DecimalFormat formatter = new DecimalFormat("##.##");
static {
formatter.setMinimumFractionDigits(2);
formatter.setMaximumFractionDigits(2);
}
/**
* Formats the given number.
*
* @param number the number to format
* @return the formatted number
*/
public static String format(Object number) {
return formatter.format(number);
}
}

3
src/main/resources/WildAddons.mixins.json
View File

@ -4,7 +4,8 @@
"package": "cc.fascinated.wildaddons.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"PlayerMixin",
"ChatHudMixin",
"ClientConnectionMixin",
"MinecraftClientMixin"
],
"client": [