From 77e91f3be41f54c8a950ccbc963aee7023b61bcc Mon Sep 17 00:00:00 2001 From: CTAK-CO6AK <72935702+CTAK-CO6AK@users.noreply.github.com> Date: Sat, 7 Nov 2020 11:15:31 +0400 Subject: [PATCH 1/3] Add option to hide armorstand's healthbar --- .../java/net/torocraft/torohealth/display/Hud.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/torocraft/torohealth/display/Hud.java b/src/main/java/net/torocraft/torohealth/display/Hud.java index dee1d1b2..37340330 100644 --- a/src/main/java/net/torocraft/torohealth/display/Hud.java +++ b/src/main/java/net/torocraft/torohealth/display/Hud.java @@ -67,17 +67,22 @@ public void tick() { } public void setEntity(LivingEntity entity) { + if(ToroHealth.CONFIG.hud.hideArmorStands && entity instanceof ArmorStandEntity) { + if(age > ToroHealth.CONFIG.hud.hideDelay) + setEntityWork(null); + return; + } + if (entity != null) { age = 0; + if (entity != this.entity) { + setEntityWork(entity); + } } if (entity == null && age > ToroHealth.CONFIG.hud.hideDelay) { setEntityWork(null); } - - if (entity != null && entity != this.entity) { - setEntityWork(entity); - } } private void setEntityWork(LivingEntity entity) { From e315777efede3d392a89202b5ca2fb4df202cf28 Mon Sep 17 00:00:00 2001 From: CTAK-CO6AK <72935702+CTAK-CO6AK@users.noreply.github.com> Date: Sat, 7 Nov 2020 11:16:40 +0400 Subject: [PATCH 2/3] Add option to hide armorstand's healthbar --- src/main/java/net/torocraft/torohealth/config/Config.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/torocraft/torohealth/config/Config.java b/src/main/java/net/torocraft/torohealth/config/Config.java index f8488ca2..71b187ad 100644 --- a/src/main/java/net/torocraft/torohealth/config/Config.java +++ b/src/main/java/net/torocraft/torohealth/config/Config.java @@ -31,6 +31,7 @@ public static class Hud { public boolean showEntity = true; public boolean showBar = true; public boolean showSkin = true; + public boolean hideArmorStands = false; } public static class Particle { @@ -49,6 +50,7 @@ public static class Bar { public static class InWorld { public Mode mode = Mode.NONE; + public boolean hideArmorStands = true; public float distance = 60f; } From 604087639d9e619b2b03315f68ce63c9c569d39e Mon Sep 17 00:00:00 2001 From: CTAK-CO6AK <72935702+CTAK-CO6AK@users.noreply.github.com> Date: Sat, 7 Nov 2020 11:18:36 +0400 Subject: [PATCH 3/3] Add option to hide armorstand's healthbar --- .../java/net/torocraft/torohealth/bars/HealthBarRenderer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java b/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java index 4d1cfb89..3cf74012 100644 --- a/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java +++ b/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java @@ -41,6 +41,10 @@ public static void renderInWorld(MatrixStack matrix, LivingEntity entity, Camera if (Mode.WHEN_HOLDING_WEAPON.equals(getConfig().mode) && !ToroHealth.IS_HOLDING_WEAPON) { return; } + + if(getConfig().hideArmorStands && entity instanceof ArmorStandEntity) { + return; + } MinecraftClient client = MinecraftClient.getInstance(); float scaleToGui = 0.025f;