Lukas/bookshelf-inspector
1
0
Fork 0
mirror of https://github.com/lukasabbe/bookshelf-inspector.git synced 2026-04-30 10:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify HudRenderer shelf conditions

Browse Source
This commit is contained in:
Ismael Magro
2025-10-22 20:03:53 +02:00
parent fce406a858
commit e9ad9788c8
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java
+9 -5
View File
@@ -37,6 +37,9 @@ public class HudRenderer {
final int y = screenHeight / 2; final int y = screenHeight / 2;
final ItemStack itemStack = currentBookData.itemStack; final ItemStack itemStack = currentBookData.itemStack;
// If item is normal (no enchantments/potion effects/custom names), do not continue if "Display normal items" option is turned off
if(BookshelfInspectorClient.bookShelfData.latestBlockState.is(Tags.SHELVES) && ItemTools.isNormalStack(itemStack) && !BookshelfInspectorClient.config.shelfDisplayNormal) return;
int color = 0xFFFFFFFF; int color = 0xFFFFFFFF;
final Integer colorValue = itemStack.getRarity().color().getColor(); final Integer colorValue = itemStack.getRarity().color().getColor();
@@ -45,13 +48,13 @@ public class HudRenderer {
color = colorValue + 0xFF000000; color = colorValue + 0xFF000000;
} }
// Item name
float scaleFactor = ((float) BookshelfInspectorClient.config.scale /10); float scaleFactor = ((float) BookshelfInspectorClient.config.scale /10);
if(!BookshelfInspectorClient.bookShelfData.latestBlockState.is(Tags.SHELVES) || BookshelfInspectorClient.config.shelfDisplayNormal || !ItemTools.isNormalStack(itemStack)) {
final MutableComponent itemName = itemStack.getHoverName().copy(); final MutableComponent itemName = itemStack.getHoverName().copy();
drawScaledText(context, itemName, x,y+((int)(10*scaleFactor)), color, client.font); drawScaledText(context, itemName, x,y+((int)(10*scaleFactor)), color, client.font);
// Render item count // Item count
if (itemStack.isStackable()) { if (itemStack.isStackable()) {
float rightEdge = x + (client.font.width(itemName) / 2f) * scaleFactor; float rightEdge = x + (client.font.width(itemName) / 2f) * scaleFactor;
float spacing = 9 * scaleFactor; float spacing = 9 * scaleFactor;
@@ -63,9 +66,8 @@ public class HudRenderer {
ComponentUtils.mergeStyles(count, Style.EMPTY.withColor(ChatFormatting.GRAY)); ComponentUtils.mergeStyles(count, Style.EMPTY.withColor(ChatFormatting.GRAY));
drawScaledText(context, count, nextX,y+((int)(10*scaleFactor)), color, client.font); drawScaledText(context, count, nextX,y+((int)(10*scaleFactor)), color, client.font);
} }
}
// Render enchantments // Enchantments
ItemEnchantments itemEnchantments = ItemTools.getItemEnchantments(itemStack); ItemEnchantments itemEnchantments = ItemTools.getItemEnchantments(itemStack);
if(itemEnchantments != null){ if(itemEnchantments != null){
int i = ((int)(20*scaleFactor)); int i = ((int)(20*scaleFactor));
@@ -93,7 +95,7 @@ public class HudRenderer {
} }
} }
// Render potion components // Potion components
PotionContents itemPotionContents = ItemTools.getPotionContents(itemStack); PotionContents itemPotionContents = ItemTools.getPotionContents(itemStack);
if (itemPotionContents != null) { if (itemPotionContents != null) {
int i = ((int)(20*scaleFactor)); int i = ((int)(20*scaleFactor));
@@ -116,12 +118,14 @@ public class HudRenderer {
} }
} }
// Written book author
var writtenBookContentComponent = itemStack.getComponents().get(DataComponents.WRITTEN_BOOK_CONTENT); var writtenBookContentComponent = itemStack.getComponents().get(DataComponents.WRITTEN_BOOK_CONTENT);
if(writtenBookContentComponent != null){ if(writtenBookContentComponent != null){
drawScaledText(context, Component.translatable("book.byAuthor",writtenBookContentComponent.author()), x,y+(int)(20*scaleFactor), 0xFFFFFFFF, client.font); drawScaledText(context, Component.translatable("book.byAuthor",writtenBookContentComponent.author()), x,y+(int)(20*scaleFactor), 0xFFFFFFFF, client.font);
} }
} }
private static void drawScaledText(GuiGraphics context, Component text, int centerX, int y, int color, Font textRenderer){ private static void drawScaledText(GuiGraphics context, Component text, int centerX, int y, int color, Font textRenderer){
Matrix3x2fStack stack = context.pose(); Matrix3x2fStack stack = context.pose();
stack.pushMatrix(); stack.pushMatrix();