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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class Minecraft {
public static WorldState worldState = WorldState.MENU;
public static PlayState playState = PlayState.ACTIVE;
public static boolean sprintToggled = false;
public static int ping = -1;

@InfoString.Getter
public static String getIp() {
Expand All @@ -42,6 +43,14 @@ public static String getFps() {
});
}

@InfoString.Getter
public static int getPing() {
return Interface.get().map(Interface::getPing).orElseGet(() -> {
API.LOGGER.info(API.COMPATIBILITY_MARKER, "Failed to get Ping, are you playing on an unsupported minecraft version?");
return -1;
});
}

@InfoString.Getter
public static String getMcVersion() {
return vfpVersion == null ? version : vfpVersion + " (VFP)";
Expand Down Expand Up @@ -141,6 +150,8 @@ static Optional<Interface> get() {

String getFPS();

int getPing();

void displayGuiScreen(MPKGuiScreen screen);

String getCurrentGuiScreen();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Options;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.PlayerTabOverlay;
import net.minecraft.client.gui.navigation.ScreenRectangle;
import net.minecraft.client.gui.render.TextureSetup;
import net.minecraft.client.gui.render.state.GuiElementRenderState;
import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.multiplayer.PlayerInfo;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.RenderPipelines;
Expand Down Expand Up @@ -304,6 +306,11 @@ public String getFPS() {
return String.valueOf(net.minecraft.client.Minecraft.getInstance().getFps());
}

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();
}

public void displayGuiScreen(MPKGuiScreen screen) {
net.minecraft.client.Minecraft.getInstance().setScreen(
screen == null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,10 @@ public String getFPS() {
return String.valueOf(Minecraft.getDebugFPS());
}

public int getPing() {
return Minecraft.getMinecraft().getConnection().getPlayerInfo(Minecraft.getMinecraft().player.getUniqueID()).getResponseTime();
}

/**
* Is called in {@link io.github.kurrycat.mpkmod.compatibility.MCClasses.Minecraft.Interface Minecraft.Interface}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,10 @@ public String getFPS() {
return String.valueOf(Minecraft.getDebugFPS());
}

public int getPing() {
return Minecraft.getMinecraft().getNetHandler().getPlayerInfo(Minecraft.getMinecraft().thePlayer.getUniqueID()).getResponseTime();
}

/**
* Is called in {@link io.github.kurrycat.mpkmod.compatibility.MCClasses.Minecraft.Interface Minecraft.Interface}
*/
Expand Down