Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements to Nametags module #4869

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Improvements to Nametags module #4869

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42b9d64
add TNT Minecarts, ignore empty ItemStacks, more default values, bett…
RealMuffinTime Aug 25, 2024
94a53eb
fix display tnt minecarts if not primed
RealMuffinTime Aug 28, 2024
12c32c7
couple of improvements
Wide-Cat Aug 29, 2024
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
39 changes: 33 additions & 6 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import net.minecraft.entity.*;
import net.minecraft.entity.decoration.ItemFrameEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.vehicle.TntMinecartEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.entry.RegistryEntry;
Expand Down Expand Up @@ -297,7 +298,7 @@ public class Nametags extends Module {
private final List<Entity> entityList = new ArrayList<>();

public Nametags() {
super(Categories.Render, "nametags", "Displays customizable nametags above players.");
super(Categories.Render, "nametags", "Displays customizable nametags above players, items and other entities.");
}

private static String ticksToTime(int ticks) {
Expand Down Expand Up @@ -358,8 +359,11 @@ private void onRender2D(Render2DEvent event) {
else if (type == EntityType.ITEM) renderNametagItem(((ItemEntity) entity).getStack(), shadow);
else if (type == EntityType.ITEM_FRAME)
renderNametagItem(((ItemFrameEntity) entity).getHeldItemStack(), shadow);
else if (type == EntityType.TNT) renderTntNametag((TntEntity) entity, shadow);
else if (entity instanceof LivingEntity) renderGenericNametag((LivingEntity) entity, shadow);
else if (type == EntityType.TNT) renderTntNametag(ticksToTime(((TntEntity) entity).getFuse()), shadow);
else if (type == EntityType.TNT_MINECART && ((TntMinecartEntity) entity).isPrimed())
renderTntNametag(ticksToTime(((TntMinecartEntity) entity).getFuseTicks()), shadow);
else if (entity instanceof LivingEntity) renderGenericLivingNametag((LivingEntity) entity, shadow);
else renderGenericNametag(entity, shadow);
}
}
}
Expand Down Expand Up @@ -577,6 +581,8 @@ private void renderNametagPlayer(Render2DEvent event, PlayerEntity player, boole
}

private void renderNametagItem(ItemStack stack, boolean shadow) {
if (stack.isEmpty()) return;

TextRenderer text = TextRenderer.get();
NametagUtils.begin(pos);

Expand Down Expand Up @@ -604,7 +610,7 @@ private void renderNametagItem(ItemStack stack, boolean shadow) {
NametagUtils.end();
}

private void renderGenericNametag(LivingEntity entity, boolean shadow) {
private void renderGenericLivingNametag(LivingEntity entity, boolean shadow) {
TextRenderer text = TextRenderer.get();
NametagUtils.begin(pos);

Expand Down Expand Up @@ -644,11 +650,32 @@ private void renderGenericNametag(LivingEntity entity, boolean shadow) {
NametagUtils.end();
}

private void renderTntNametag(TntEntity entity, boolean shadow) {
private void renderGenericNametag(Entity entity, boolean shadow) {
TextRenderer text = TextRenderer.get();
NametagUtils.begin(pos);

String fuseText = ticksToTime(entity.getFuse());
//Name
String nameText = entity.getType().getName().getString();

double nameWidth = text.getWidth(nameText, shadow);
double heightDown = text.getHeight(shadow);
double widthHalf = nameWidth / 2;

drawBg(-widthHalf, -heightDown, nameWidth, heightDown);

text.beginBig();
double hX = -widthHalf;
double hY = -heightDown;

text.render(nameText, hX, hY, nameColor.get(), shadow);
text.end();

NametagUtils.end();
}

private void renderTntNametag(String fuseText, boolean shadow) {
TextRenderer text = TextRenderer.get();
NametagUtils.begin(pos);

double width = text.getWidth(fuseText, shadow);
double heightDown = text.getHeight(shadow);
Expand Down
Loading