minor gui tweaks

Author: kobber

common/src/main/java/com/evandev/fieldguide/Constants.java

@@ -29,6 +29,7 @@ public class Constants {
     public static final ResourceLocation CELL_BACKGROUND_TEXTURE = new ResourceLocation(MOD_ID, "textures/gui/cell_background.png");
     public static final ResourceLocation ITEM_BACKGROUND_TEXTURE = new ResourceLocation(MOD_ID, "textures/gui/item_background.png");
     public static final ResourceLocation CELL_BACKGROUND_HOVER_TEXTURE = new ResourceLocation(MOD_ID, "textures/gui/cell_background_hover.png");
+    public static final ResourceLocation HEALTH_FRAME_TEXTURE = new ResourceLocation(MOD_ID, "textures/gui/health_frame.png");
 
     // ICONS
     public static final ResourceLocation SEARCH_ICON = new ResourceLocation(MOD_ID, "textures/gui/icons/search.png");

common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideEntryScreen.java

@@ -190,31 +190,38 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
         return false;
     }
 
-    private void renderAttributeTextAndIcon(GuiGraphics guiGraphics, int iconOffset, String text, Bounds bounds) {
+    private void renderAttributes(GuiGraphics guiGraphics, LivingEntity entity) {
+        RenderSystem.setShaderTexture(0, Constants.ATTRIBUTES_TEXTURE);
         int iconSize = 9;
-        int iconSpacing = 4;
-        int width = iconSize + iconSpacing + font.width(text);
+        int iconSpacing = 2;
+        int gap = 8;
 
-        // Center within given bounds
-        int y = bounds.y_center() - iconSize / 2;
-        int x = bounds.x_center() - width / 2;
+        int yPos = leftPageBounds.top() + 13;
 
-        guiGraphics.blit(Constants.ATTRIBUTES_TEXTURE, x, y, 0, iconOffset, iconSize, iconSize, 32, 32);
-        guiGraphics.drawString(this.font, text, x + iconSize + iconSpacing, y + 1, Constants.TEXT_COLOR, false);
-    }
+        String health = String.valueOf((int)entity.getMaxHealth() / 2);
+        String armor = String.valueOf(entity.getArmorValue());
+        boolean showArmor = !armor.equals("0");
 
-    private void renderAttributes(GuiGraphics guiGraphics, LivingEntity entity) {
-        RenderSystem.setShaderTexture(0, Constants.ATTRIBUTES_TEXTURE);
+        int healthWidth = this.font.width(health) + iconSpacing + iconSize;
+        int armorWidth = this.font.width(armor) + iconSpacing + iconSize;
+        int totalWidth = healthWidth + (showArmor ? gap + armorWidth : 0);
 
-        // Health
-        String health = String.valueOf((int)entity.getMaxHealth() / 2);
-        Bounds healthBounds = new Bounds(leftPageBounds.left(), leftPageBounds.bottom() - 48, leftPageBounds.width() / 2, 20);
-        renderAttributeTextAndIcon(guiGraphics, 0, health, healthBounds);
+        int xPos = this.leftPageBounds.x_center() - (totalWidth / 2);
 
-        // Armor
-        String armor = String.valueOf(entity.getArmorValue());
-        Bounds armorBounds = new Bounds(leftPageBounds.x_center(), leftPageBounds.bottom() - 48, leftPageBounds.width() / 2, 20);
-        renderAttributeTextAndIcon(guiGraphics, 9, armor, armorBounds);
+        // Draw Health
+        guiGraphics.blit(Constants.ATTRIBUTES_TEXTURE, xPos, yPos, 0, 0, iconSize, iconSize, 32, 32);
+        guiGraphics.drawString(this.font, health, xPos + iconSize + iconSpacing, yPos + 1, Constants.TEXT_COLOR, false);
+
+        // Draw Frame
+        guiGraphics.blit(Constants.HEALTH_FRAME_TEXTURE, xPos - 9, yPos - 4, 0, 0, 8, 16, 16, 16);
+        guiGraphics.blit(Constants.HEALTH_FRAME_TEXTURE, xPos + totalWidth + 1, yPos - 4, 8, 0, 8, 16, 16, 16);
+
+        if (showArmor) {
+            // Draw Armor
+            xPos = xPos + healthWidth + gap;
+            guiGraphics.blit(Constants.ATTRIBUTES_TEXTURE, xPos, yPos, 0, iconSize, iconSize, iconSize, 32, 32);
+            guiGraphics.drawString(this.font, armor, xPos + iconSize + iconSpacing, yPos + 1, Constants.TEXT_COLOR, false);
+        }
     }
 
     @Override
@@ -289,7 +296,7 @@ public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, flo
         }
 
         int xPos = leftPageBounds.x_center();
-        int yPos = leftPageBounds.y_center() - 20;
+        int yPos = leftPageBounds.y_center();
 
         if (entry instanceof EntityType && renderedEntity instanceof LivingEntity living) {
             if (unlocked) {

common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideScreen.java

@@ -374,9 +374,10 @@ public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, flo
                         ResourceLocation texture = new ResourceLocation(biomeId.getNamespace(), "textures/immersiveoverlays/" + biomeId.getPath() + ".png");
                         int iconSize = 16;
                         int iconY = titleY - 5;
-                        guiGraphics.blit(texture, this.leftPageBounds.left(), iconY, 0, 0, iconSize, iconSize, iconSize, iconSize);
+                        int iconX = this.leftPageBounds.left() - 3;
+                        guiGraphics.blit(texture, iconX, iconY, 0, 0, iconSize, iconSize, iconSize, iconSize);
                         Component searchTitle = Component.translatable("biome." + biomeId.getNamespace() + "." + biomeId.getPath());
-                        guiGraphics.drawString(this.font, searchTitle, this.leftPageBounds.left() + iconSize + 4, titleY, Constants.TEXT_COLOR, false);
+                        guiGraphics.drawString(this.font, searchTitle, iconX + iconSize + 4, titleY, Constants.TEXT_COLOR, false);
                     }
                 } else if (searchQuery.startsWith("=^")) {
                     guiGraphics.drawString(this.font, "Drops " + searchQuery.substring(2), this.leftPageBounds.left(), titleY, Constants.TEXT_COLOR, false);
@@ -406,14 +407,15 @@ public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, flo
             }
         }
 
-        if (currentPage > 0 || isSearching) {
-            renderGrid(guiGraphics, mouseX, mouseY);
-        }
-
         // Back button
         this.backButton.visible = this.isSearching;
 
         super.render(guiGraphics, mouseX, mouseY, partialTick);
+
+        // Render grid
+        if (currentPage > 0 || isSearching) {
+            renderGrid(guiGraphics, mouseX, mouseY);
+        }
     }
 
     private void renderCategoryInfo(GuiGraphics guiGraphics) {