Skip to content

fix shulker peek #4573

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

Closed
wants to merge 1 commit into from
Closed

fix shulker peek #4573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 16 additions & 27 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/render/BetterTooltips.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package meteordevelopment.meteorclient.systems.modules.render;

import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import meteordevelopment.meteorclient.events.game.ItemStackTooltipEvent;
import meteordevelopment.meteorclient.events.render.TooltipDataEvent;
import meteordevelopment.meteorclient.mixin.EntityAccessor;
Expand All @@ -31,15 +31,12 @@
import net.minecraft.entity.EntityType;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffectUtil;
import net.minecraft.inventory.Inventories;
import net.minecraft.item.*;
import net.minecraft.nbt.NbtList;
import net.minecraft.registry.DynamicRegistryManager;
import net.minecraft.text.MutableText;
import net.minecraft.text.RawFilteredPair;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.collection.DefaultedList;

import java.io.IOException;
import java.util.Comparator;
Expand Down Expand Up @@ -358,35 +355,27 @@ else if (event.itemStack.getItem() instanceof EntityBucketItem bucketItem && pre
}

public void applyCompactShulkerTooltip(ItemStack shulkerItem, List<Text> tooltip) {
NbtComponent nbtComponent = shulkerItem.get(DataComponentTypes.BLOCK_ENTITY_DATA);
ContainerComponent containerComponent = shulkerItem.get(DataComponentTypes.CONTAINER);

if (nbtComponent != null) {
if (nbtComponent.contains("LootTable")) {
if (containerComponent != null) {
if (shulkerItem.contains(DataComponentTypes.CONTAINER_LOOT)) {
tooltip.add(Text.literal("???????"));
}

if (nbtComponent.contains("Items")) {
DefaultedList<ItemStack> items = DefaultedList.ofSize(27, ItemStack.EMPTY);
Inventories.readNbt(nbtComponent.copyNbt(), items, DynamicRegistryManager.EMPTY);
Multiset<Item> counts = HashMultiset.create();

Object2IntMap<Item> counts = new Object2IntOpenHashMap<>();

for (ItemStack item : items) {
if (item.isEmpty()) continue;

int count = counts.getInt(item.getItem());
counts.put(item.getItem(), count + item.getCount());
}
for (ItemStack item : containerComponent.iterateNonEmpty()) {
counts.add(item.getItem(), item.getCount());
}

counts.keySet().stream().sorted(Comparator.comparingInt(value -> -counts.getInt(value))).limit(5).forEach(item -> {
MutableText mutableText = item.getName().copyContentOnly();
mutableText.append(Text.literal(" x").append(String.valueOf(counts.getInt(item))).formatted(Formatting.GRAY));
tooltip.add(mutableText);
});
counts.entrySet().stream().sorted(Comparator.comparingInt(entry -> -entry.getCount())).limit(5).forEach(entry -> {
MutableText mutableText = entry.getElement().getName().copyContentOnly();
mutableText.append(Text.literal(" x").append(Integer.toString(entry.getCount())).formatted(Formatting.GRAY));
tooltip.add(mutableText);
});

if (counts.size() > 5) {
tooltip.add((Text.translatable("container.shulkerBox.more", counts.size() - 5)).formatted(Formatting.ITALIC));
}
if (counts.size() > 5) {
tooltip.add((Text.translatable("container.shulkerBox.more", counts.size() - 5)).formatted(Formatting.ITALIC));
}
}
}
Expand Down
Loading