Display armour value in GUI

percivalalb · May 8, 2021 · a52e665 · a52e665
1 parent 38fae1b
commit a52e665
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/doggytalents/client/entity/render/DogRenderer.java b/src/main/java/doggytalents/client/entity/render/DogRenderer.java
@@ -49,15 +49,10 @@ public void render(DogEntity entityIn, float entityYaw, float partialTicks, Matr
             double d0 = this.renderManager.squareDistanceTo(entityIn);
             if (d0 <= 64 * 64) {
                 String tip = entityIn.getMode().getTip();
-                double armorValue = 0.0D;
-                if (entityIn.getAttribute(Attributes.ARMOR) != null) {
-                    armorValue = entityIn.getAttribute(Attributes.ARMOR).getValue();
-                }
-                String label = String.format(ConfigValues.DOG_GENDER ? "%s(%d)%s(%d)" : "%s(%d)(%d)",
+                String label = String.format(ConfigValues.DOG_GENDER ? "%s(%d)%s" : "%s(%d)",
                         new TranslationTextComponent(tip).getString(),
                         MathHelper.ceil(entityIn.getDogHunger()),
-                        new TranslationTextComponent(entityIn.getGender().getUnlocalisedTip()).getString(),
-                        (int) armorValue);
+                        new TranslationTextComponent(entityIn.getGender().getUnlocalisedTip()).getString());
 
                 RenderUtil.renderLabelWithScale(entityIn, this, label, matrixStackIn, bufferIn, packedLightIn, 0.01F, 0.12F);
 

diff --git a/src/main/java/doggytalents/client/screen/DogInfoScreen.java b/src/main/java/doggytalents/client/screen/DogInfoScreen.java
@@ -279,6 +279,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks
         String health = Util.format1DP(this.dog.getHealth());
         String healthMax = Util.format1DP(this.dog.getMaxHealth());
         String speedValue = Util.format2DP(this.dog.getAttribute(Attributes.MOVEMENT_SPEED).getValue());
+        String armorValue = Util.format2DP(this.dog.getAttribute(Attributes.ARMOR).getValue());
         String ageValue = Util.format2DP(this.dog.getGrowingAge());
         String ageRel = I18n.format(this.dog.isChild() ? "doggui.age.baby" : "doggui.age.adult");
 
@@ -297,8 +298,9 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks
         this.font.drawString(stack, I18n.format("doggui.speed") + " " + speedValue, this.width - 160, topY - 100, 0xFFFFFF);
         this.font.drawString(stack, I18n.format("doggui.owner") + " " + tamedString, this.width - 160, topY - 90, 0xFFFFFF);
         this.font.drawString(stack, I18n.format("doggui.age") + " " + ageString, this.width - 160, topY - 80, 0xFFFFFF);
+        this.font.drawString(stack, I18n.format("doggui.armor") + " " + armorValue, this.width - 160, topY - 70, 0xFFFFFF);
         if (ConfigValues.DOG_GENDER) {
-            this.font.drawString(stack, I18n.format("doggui.gender") + " "+ I18n.format(this.dog.getGender().getUnlocalisedName()), this.width - 160, topY - 70, 0xFFFFFF);
+            this.font.drawString(stack, I18n.format("doggui.gender") + " "+ I18n.format(this.dog.getGender().getUnlocalisedName()), this.width - 160, topY - 60, 0xFFFFFF);
         }
 
         this.font.drawString(stack, I18n.format("doggui.newname"), topX - 100, topY + 38, 4210752);

diff --git a/src/main/resources/assets/doggytalents/lang/en_gb.json b/src/main/resources/assets/doggytalents/lang/en_gb.json
@@ -207,6 +207,7 @@
    "doggui.owner": "Owner:",
    "doggui.gender": "Gender:",
    "doggui.age": "Age:",
+   "doggui.armor": "Armour:",
    "doggui.owner.you": "You",
    "doggui.age.baby": "Puppy",
    "doggui.age.adult": "Adult",

diff --git a/src/main/resources/assets/doggytalents/lang/en_us.json b/src/main/resources/assets/doggytalents/lang/en_us.json
@@ -207,6 +207,7 @@
    "doggui.owner": "Owner:",
    "doggui.gender": "Gender:",
    "doggui.age": "Age:",
+   "doggui.armor": "Armor:",
    "doggui.owner.you": "You",
    "doggui.age.baby": "Puppy",
    "doggui.age.adult": "Adult",