Skip to content

refactor: unnecessary ducks #6232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kiriyaga7615 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: unnecessary ducks #6232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d4a75
refactor: unnecessary duck removal
Kiriyaga7615 Sep 15, 2025
7c1d035
Merge branch 'MeteorDevelopment:master' into master
Kiriyaga7615 Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/commands/commands/PeekCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public void build(LiteralArgumentBuilder<CommandSource> 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();
});
Expand Down
16 changes: 10 additions & 6 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/render/Nametags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,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);
}
}
Expand Down
Loading