From 29d4a7518a2b59c11821529084fe8bb0410ff32e Mon Sep 17 00:00:00 2001 From: kiriyaga <81517221+Kiriyaga7615@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:28:42 +0200 Subject: [PATCH] refactor: unnecessary duck removal --- .../commands/commands/PeekCommand.java | 4 ++-- .../systems/modules/render/Nametags.java | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/commands/commands/PeekCommand.java b/src/main/java/meteordevelopment/meteorclient/commands/commands/PeekCommand.java index 52e9761622..50715f241d 100644 --- a/src/main/java/meteordevelopment/meteorclient/commands/commands/PeekCommand.java +++ b/src/main/java/meteordevelopment/meteorclient/commands/commands/PeekCommand.java @@ -27,8 +27,8 @@ public void build(LiteralArgumentBuilder builder) { builder.executes(context -> { if (Utils.openContainer(mc.player.getMainHandStack(), ITEMS, true)) return SINGLE_SUCCESS; else if (Utils.openContainer(mc.player.getOffHandStack(), ITEMS, true)) return SINGLE_SUCCESS; - else if (mc.targetedEntity instanceof ItemFrameEntity && - Utils.openContainer(((ItemFrameEntity) mc.targetedEntity).getHeldItemStack(), ITEMS, true) + else if (mc.targetedEntity instanceof ItemFrameEntity frame && + Utils.openContainer(frame.getHeldItemStack(), ITEMS, true) ) return SINGLE_SUCCESS; else throw CANT_PEEK.create(); }); diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java index 7de7594abf..7d3bc8961c 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java @@ -355,14 +355,18 @@ private void onRender2D(Render2DEvent event) { EntityType type = entity.getType(); if (NametagUtils.to2D(pos, scale.get())) { - if (type == EntityType.PLAYER) renderNametagPlayer(event, (PlayerEntity) entity, shadow); - else if (type == EntityType.ITEM) renderNametagItem(((ItemEntity) entity).getStack(), shadow); - else if (type == EntityType.ITEM_FRAME || type == EntityType.GLOW_ITEM_FRAME) - renderNametagItem(((ItemFrameEntity) entity).getHeldItemStack(), shadow); - else if (type == EntityType.TNT) renderTntNametag(ticksToTime(((TntEntity) entity).getFuse()), shadow); + if (type == EntityType.PLAYER) + renderNametagPlayer(event, (PlayerEntity) entity, shadow); + else if (type == EntityType.ITEM) + renderNametagItem(((ItemEntity) entity).getStack(), shadow); + else if (entity instanceof ItemFrameEntity frame) + renderNametagItem(frame.getHeldItemStack(), shadow); + else if (type == EntityType.TNT) + renderTntNametag(ticksToTime(((TntEntity) entity).getFuse()), shadow); else if (type == EntityType.TNT_MINECART && ((TntMinecartEntity) entity).isPrimed()) renderTntNametag(ticksToTime(((TntMinecartEntity) entity).getFuseTicks()), shadow); - else if (entity instanceof LivingEntity) renderGenericLivingNametag((LivingEntity) entity, shadow); + else if (entity instanceof LivingEntity) + renderGenericLivingNametag((LivingEntity) entity, shadow); else renderGenericNametag(entity, shadow); } }