Skip to content

Commit 29d4a75

Browse files
committed
refactor: unnecessary duck removal
1 parent b9cbdb0 commit 29d4a75

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

src/main/java/meteordevelopment/meteorclient/commands/commands/PeekCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
2727
builder.executes(context -> {
2828
if (Utils.openContainer(mc.player.getMainHandStack(), ITEMS, true)) return SINGLE_SUCCESS;
2929
else if (Utils.openContainer(mc.player.getOffHandStack(), ITEMS, true)) return SINGLE_SUCCESS;
30-
else if (mc.targetedEntity instanceof ItemFrameEntity &&
31-
Utils.openContainer(((ItemFrameEntity) mc.targetedEntity).getHeldItemStack(), ITEMS, true)
30+
else if (mc.targetedEntity instanceof ItemFrameEntity frame &&
31+
Utils.openContainer(frame.getHeldItemStack(), ITEMS, true)
3232
) return SINGLE_SUCCESS;
3333
else throw CANT_PEEK.create();
3434
});

src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,14 +355,18 @@ private void onRender2D(Render2DEvent event) {
355355
EntityType<?> type = entity.getType();
356356

357357
if (NametagUtils.to2D(pos, scale.get())) {
358-
if (type == EntityType.PLAYER) renderNametagPlayer(event, (PlayerEntity) entity, shadow);
359-
else if (type == EntityType.ITEM) renderNametagItem(((ItemEntity) entity).getStack(), shadow);
360-
else if (type == EntityType.ITEM_FRAME || type == EntityType.GLOW_ITEM_FRAME)
361-
renderNametagItem(((ItemFrameEntity) entity).getHeldItemStack(), shadow);
362-
else if (type == EntityType.TNT) renderTntNametag(ticksToTime(((TntEntity) entity).getFuse()), shadow);
358+
if (type == EntityType.PLAYER)
359+
renderNametagPlayer(event, (PlayerEntity) entity, shadow);
360+
else if (type == EntityType.ITEM)
361+
renderNametagItem(((ItemEntity) entity).getStack(), shadow);
362+
else if (entity instanceof ItemFrameEntity frame)
363+
renderNametagItem(frame.getHeldItemStack(), shadow);
364+
else if (type == EntityType.TNT)
365+
renderTntNametag(ticksToTime(((TntEntity) entity).getFuse()), shadow);
363366
else if (type == EntityType.TNT_MINECART && ((TntMinecartEntity) entity).isPrimed())
364367
renderTntNametag(ticksToTime(((TntMinecartEntity) entity).getFuseTicks()), shadow);
365-
else if (entity instanceof LivingEntity) renderGenericLivingNametag((LivingEntity) entity, shadow);
368+
else if (entity instanceof LivingEntity)
369+
renderGenericLivingNametag((LivingEntity) entity, shadow);
366370
else renderGenericNametag(entity, shadow);
367371
}
368372
}

0 commit comments

Comments
 (0)