modules list and remove broken stuff
This commit is contained in:
parent
2a89f212e5
commit
b58eedfb9c
16 changed files with 168 additions and 44 deletions
|
@ -11,32 +11,39 @@ import net.minecraft.client.font.TextRenderer;
|
|||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
|
||||
public class HUD
|
||||
public class HUDOverlay
|
||||
{
|
||||
public static HUD INSTANCE = new HUD();
|
||||
public static HUDOverlay INSTANCE = new HUDOverlay();
|
||||
private MinecraftClient mc = MinecraftClient.getInstance();
|
||||
TextRenderer textRenderer = mc.textRenderer;
|
||||
public int hudColor = 0xFF00FFFF; /*ColorUtils.rgbaToInt(
|
||||
public boolean showClientTag = ((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).clientTag.value;
|
||||
public int hudColor = ColorUtils.rgbaToInt(
|
||||
(int)((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).r.value,
|
||||
(int)((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).g.value,
|
||||
(int)((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).b.value,
|
||||
255 );*/
|
||||
255 );
|
||||
|
||||
public void renderHUD(DrawContext drawContext, int scaledWidth, int scaledHeight)
|
||||
public void render(DrawContext drawContext, int scaledWidth, int scaledHeight)
|
||||
{
|
||||
// do not draw if F3 enabled
|
||||
if (mc.options.debugEnabled) return;
|
||||
|
||||
// draw stats
|
||||
drawContext.drawTextWithShadow(textRenderer, Moonlight.clientTag + " " + Moonlight.versionTag, 2, 2, 16777215);
|
||||
drawContext.drawTextWithShadow(textRenderer, "FPS: " + ColorUtils.gray + mc.fpsDebugString.split(" ")[0], 2, 12, hudColor);
|
||||
drawContext.drawTextWithShadow(textRenderer, "Ping: " + ColorUtils.gray + (mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid()) == null ? 0 : mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid()).getLatency()), 2, 22, hudColor);
|
||||
drawContext.drawTextWithShadow(textRenderer, "FPS: " + ColorUtils.gray + mc.fpsDebugString.split(" ")[0], 2, 2, hudColor);
|
||||
drawContext.drawTextWithShadow(textRenderer, "Ping: " + ColorUtils.gray + (mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid()) == null ? 0 : mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid()).getLatency()), 2, 12, hudColor);
|
||||
drawContext.drawTextWithShadow(textRenderer, "Meters/s: " + ColorUtils.gray + MathUtils.round(moveSpeed(), 2), 2, scaledHeight - 20, hudColor);
|
||||
|
||||
// draw coordinates
|
||||
drawContext.drawTextWithShadow(textRenderer, "X: " + ColorUtils.gray + MathUtils.round(mc.player.getX(), 1) +
|
||||
ColorUtils.reset + " Y: " + ColorUtils.gray + MathUtils.round(mc.player.getY(), 1) +
|
||||
ColorUtils.reset + " Z: " + ColorUtils.gray + MathUtils.round(mc.player.getZ(), 1), 2, scaledHeight - 10, hudColor);
|
||||
|
||||
// draw client tag (if enabled)
|
||||
if (showClientTag)
|
||||
{
|
||||
drawContext.drawTextWithShadow(textRenderer, Moonlight.clientTag + " " + Moonlight.versionTag,
|
||||
scaledWidth - textRenderer.getWidth(Moonlight.clientTag + " " + Moonlight.versionTag) - 2, scaledHeight - 10, 16777215);
|
||||
}
|
||||
}
|
||||
|
||||
private double moveSpeed()
|
|
@ -0,0 +1,41 @@
|
|||
package me.kawaiizenbo.moonlight.ui;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.ModuleManager;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
|
||||
import net.minecraft.client.font.TextRenderer;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
|
||||
public class ModulesListOverlay
|
||||
{
|
||||
public static ModulesListOverlay INSTANCE = new ModulesListOverlay();
|
||||
private MinecraftClient mc = MinecraftClient.getInstance();
|
||||
TextRenderer textRenderer = mc.textRenderer;
|
||||
private ArrayList<Module_> enabledModules = ModuleManager.INSTANCE.getEnabledModules();
|
||||
|
||||
public void render(DrawContext drawContext, int scaledWidth, int scaledHeight)
|
||||
{
|
||||
// do not draw if F3 enabled
|
||||
if (mc.options.debugEnabled) return;
|
||||
|
||||
int yOffset = 0;
|
||||
for (Module_ m : enabledModules)
|
||||
{
|
||||
if (!m.showInModulesList.value) continue;
|
||||
int nameWidth = textRenderer.getWidth(m.name);
|
||||
drawContext.fill(scaledWidth - nameWidth - 8, yOffset, scaledWidth, yOffset+12, 0x55222222);
|
||||
drawContext.fill(scaledWidth - 2, yOffset, scaledWidth, yOffset+12, HUDOverlay.INSTANCE.hudColor);
|
||||
drawContext.drawText(textRenderer, m.name, scaledWidth - nameWidth - 4, yOffset + 2, 0xFFFFFFFF, false);
|
||||
yOffset += 12;
|
||||
}
|
||||
}
|
||||
|
||||
public void update()
|
||||
{
|
||||
enabledModules = ModuleManager.INSTANCE.getEnabledModules();
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue