Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions common/src/main/resources/META-INF/mods.toml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
import net.minecraft.client.input.KeyEvent;
import net.minecraft.client.input.MouseButtonInfo;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.multiplayer.PlayerInfo;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.util.Util;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;

import java.util.Map;
import java.util.Optional;

public class EventHandler {
private static final ButtonMSList timeQueue = new ButtonMSList();
Expand Down Expand Up @@ -157,6 +159,11 @@ public void onClientTickEnd(Minecraft mc) {
timeQueue.clear();
}

//TODO: Dirty fix for getting the player ping in the right thread
Minecraft.getInstance().getConnection().getListedOnlinePlayers().stream()
.filter(playerInfo -> playerInfo.getProfile().id().equals(Minecraft.getInstance().player.getUUID()))
.findFirst().ifPresent(playerInfo -> FunctionCompatibility.ping = playerInfo.getLatency());

API.Events.onTickEnd();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,12 @@ public String getFPS() {
return String.valueOf(net.minecraft.client.Minecraft.getInstance().getFps());
}

public static int ping = -1;

public int getPing() {
PlayerInfo info = net.minecraft.client.Minecraft.getInstance().getConnection().getListedOnlinePlayers().stream().filter(playerInfo -> playerInfo.getProfile().id().equals(net.minecraft.client.Minecraft.getInstance().player.getUUID())).findFirst().get();
return info.getLatency();
//PlayerInfo info = net.minecraft.client.Minecraft.getInstance().getConnection().getListedOnlinePlayers().stream().filter(playerInfo -> playerInfo.getProfile().id().equals(net.minecraft.client.Minecraft.getInstance().player.getUUID())).findFirst().get();
//return info.getLatency();
return ping;
}

public void displayGuiScreen(MPKGuiScreen screen) {
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion fabric-1.21.11/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"sources": "https://github.com/MPKMod/MPKMod2"
},
"license": "MIT",
"icon": "assets/mpkmod/icon.png",
"icon": "mpkmod_logo.png",
"environment": "client",
"entrypoints": {
"main": [
Expand Down