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 @@ -1326,15 +1326,15 @@ private void onRender2D(Render2DEvent event) {
} else vec3.set(placeRenderPos.getX() + 0.5, placeRenderPos.getY() + 0.5, placeRenderPos.getZ() + 0.5);

if (NametagUtils.to2D(vec3, damageTextScale.get())) {
NametagUtils.begin(vec3);
NametagUtils.begin(vec3, event.graphics);
TextRenderer.get().begin(event.graphics, 1, false, true);

String text = String.format("%.1f", renderDamage);
double w = TextRenderer.get().getWidth(text) / 2;
TextRenderer.get().render(text, -w, 0, damageColor.get(), true);

TextRenderer.get().end();
NametagUtils.end();
NametagUtils.end(event.graphics);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ private void onRender2D(Render2DEvent event) {

TextRenderer text = TextRenderer.get();

NametagUtils.begin(pos);
NametagUtils.begin(pos, event.graphics);
text.beginBig(event.graphics);

double xScreen = text.getWidth(levelText) / 2.0;
Expand All @@ -402,7 +402,7 @@ private void onRender2D(Render2DEvent event) {
}
text.end();

NametagUtils.end();
NametagUtils.end(event.graphics);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void onRender2D(Render2DEvent event) {
private void renderNametag(GuiGraphicsExtractor graphics, String name) {
TextRenderer text = TextRenderer.get();

NametagUtils.begin(pos);
NametagUtils.begin(pos, graphics);
text.beginBig(graphics);

double w = text.getWidth(name);
Expand All @@ -101,7 +101,7 @@ private void renderNametag(GuiGraphicsExtractor graphics, String name) {
text.render(name, x, y, TEXT);

text.end();
NametagUtils.end();
NametagUtils.end(graphics);
}

private String getOwnerName(EntityReference<LivingEntity> owner) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public void render2D(GuiGraphicsExtractor graphics) {

if (!NametagUtils.to2D(pos, scale)) return;

NametagUtils.begin(pos);
NametagUtils.begin(pos, graphics);

// Compute health things
double healthPercentage = (double) health / maxHealth;
Expand All @@ -265,7 +265,7 @@ public void render2D(GuiGraphicsExtractor graphics) {
text.render(healthText, hX, 0, healthColor);
text.end();

NametagUtils.end();
NametagUtils.end(graphics);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ private void renderNametagItem(GuiGraphicsExtractor graphics, ItemStack stack, b
if (stack.isEmpty()) return;

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

String name = Names.get(stack);
String count = " x" + stack.getCount();
Expand All @@ -621,12 +621,12 @@ private void renderNametagItem(GuiGraphicsExtractor graphics, ItemStack stack, b
if (itemCount.get()) text.render(count, hX, hY, GOLD, shadow);
text.end();

NametagUtils.end();
NametagUtils.end(graphics);
}

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

//Name
String nameText = entity.getType().getDescription().getString();
Expand Down Expand Up @@ -661,12 +661,12 @@ private void renderGenericLivingNametag(GuiGraphicsExtractor graphics, LivingEnt
text.render(healthText, hX, hY, healthColor, shadow);
text.end();

NametagUtils.end();
NametagUtils.end(graphics);
}

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

//Name
String nameText = entity.getType().getDescription().getString();
Expand All @@ -684,12 +684,12 @@ private void renderGenericNametag(GuiGraphicsExtractor graphics, Entity entity,
text.render(nameText, hX, hY, nameColor.get(), shadow);
text.end();

NametagUtils.end();
NametagUtils.end(graphics);
}

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

double width = text.getWidth(fuseText, shadow);
double heightDown = text.getHeight(shadow);
Expand All @@ -705,7 +705,7 @@ private void renderTntNametag(GuiGraphicsExtractor graphics, String fuseText, bo
text.render(fuseText, hX, hY, nameColor.get(), shadow);
text.end();

NametagUtils.end();
NametagUtils.end(graphics);
}

private ItemStack getItem(Player entity, int index) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2871,15 +2871,15 @@ public void renderLetter(GuiGraphicsExtractor graphics) {
vec3.set(blockPos.getX() + 0.5, blockPos.getY() + 0.5, blockPos.getZ() + 0.5);
if (!NametagUtils.to2D(vec3, 2)) return;

NametagUtils.begin(vec3);
NametagUtils.begin(vec3, graphics);
TextRenderer.get().begin(graphics, 1.0, false, true);

String letter = packet ? "P" : "N";
double w = TextRenderer.get().getWidth(letter) / 2.0;
TextRenderer.get().render(letter, -w, 0.0, Color.WHITE, true);

TextRenderer.get().end();
NametagUtils.end();
NametagUtils.end(graphics);
}
}

Expand Down
Loading