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
2 changes: 1 addition & 1 deletion src/main/java/com/genyo/addon/GenyoAddon.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class GenyoAddon extends MeteorAddon {
public static final Logger LOG = LogUtils.getLogger();
public static final Category CATEGORY = new Category("Example");
public static final HudGroup HUD_GROUP = new HudGroup("Example");
public static final HudGroup HUD_GROUP = new HudGroup("Genyo");

@Override
public void onInitialize() {
Expand Down
16 changes: 13 additions & 3 deletions src/main/java/com/genyo/addon/hud/PvPNeccessaryHud.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.genyo.addon.hud;

import com.genyo.addon.GenyoAddon;
import com.genyo.addon.mixin.HudRendererAccessor;
import com.genyo.addon.utils.HudUtils;
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.hud.HudElement;
import meteordevelopment.meteorclient.systems.hud.HudElementInfo;
Expand Down Expand Up @@ -94,7 +96,7 @@ private PvPNeccessaryHud() {

private void calculateSize() {
int offset = items.get().size();
setSize(21 * getScale() * offset, 17 * getScale());
setSize(21 * getScale() * offset, 17 * getScale() + 20);
}

@Override
Expand All @@ -115,7 +117,8 @@ public void render(HudRenderer renderer) {
int scaleOffset = (int) (getScale() * 10);
int offset = i+1 != 1 ? i * 50 * scaleOffset / (20 - margin.get()) : 0;

renderer.post(() -> render(renderer, itemStack, x + offset, y));
//renderer.post(() -> render(renderer, itemStack, x + offset, y));
((HudRendererAccessor) renderer).getHudRenderer().post(() -> render(renderer, itemStack, x + offset, y));
}
}

Expand All @@ -131,6 +134,12 @@ private void render(HudRenderer renderer, ItemStack itemStack, int x, int y) {
String countOverride = null;
boolean resetToZero = false;

countOverride = String.valueOf(itemStack.getCount());

if (itemStack.getCount() == 1) {
countOverride = "1";
}

if (itemStack.isEmpty()) {
if (noneMode.get() == NoneMode.ShowCount)
countOverride = "0";
Expand All @@ -139,7 +148,8 @@ private void render(HudRenderer renderer, ItemStack itemStack, int x, int y) {
resetToZero = true;
}

renderer.item(itemStack, x, y, getScale(), true, countOverride);
//renderer.item(itemStack, x, y, getScale(), true, countOverride);
HudUtils.drawItem(renderer.drawContext, itemStack, x, y, getScale(), countOverride);

if (resetToZero)
itemStack.setCount(0);
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/com/genyo/addon/mixin/HudRendererAccessor.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.genyo.addon.mixin;

import meteordevelopment.meteorclient.systems.hud.HudRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(HudRenderer.class)
public interface HudRendererAccessor {

@Accessor(value = "INSTANCE", remap = false)
HudRenderer getHudRenderer();

}
35 changes: 35 additions & 0 deletions src/main/java/com/genyo/addon/utils/HudUtils.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.genyo.addon.utils;

import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.item.ItemStack;

import static meteordevelopment.meteorclient.MeteorClient.mc;

public class HudUtils {

public static void drawItem(DrawContext drawContext, ItemStack itemStack, int x, int y, float scale, String countOverride) {
MatrixStack matrices = drawContext.getMatrices();
matrices.push();
matrices.scale(scale, scale, 1f);
matrices.translate(0, 0, 401); // Thanks Mojang

int scaledX = (int) (x / scale);
int scaledY = (int) (y / scale);

drawContext.drawItem(itemStack, scaledX, scaledY);

int count = Integer.parseInt(countOverride);

if (count < 10) {
scaledX -= 5;
} else if (count < 100) {
scaledX -= 2;
}

drawContext.drawStackOverlay(mc.textRenderer, itemStack, scaledX, scaledY + 8, countOverride);

matrices.pop();
}

}
3 changes: 2 additions & 1 deletion src/main/resources/genyo.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"package": "com.genyo.addon.mixin",
"compatibilityLevel": "JAVA_21",
"client": [
"ExampleMixin"
"ExampleMixin",
"HudRendererAccessor"
],
"injectors": {
"defaultRequire": 1
Expand Down
Loading