diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2025-06-22 17:46:35 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2025-06-22 17:46:35 -0400 |
| commit | 4db9b7d9d0c2bc3cc5cb876349710da16b6ba363 (patch) | |
| tree | 227008f042494d0d69fb340f762c8080451584c4 /src/main/java/de | |
| parent | 784c58b7718760ad131e7160387ecb53005390ad (diff) | |
| download | Skyblocker-4db9b7d9d0c2bc3cc5cb876349710da16b6ba363.tar.gz Skyblocker-4db9b7d9d0c2bc3cc5cb876349710da16b6ba363.tar.bz2 Skyblocker-4db9b7d9d0c2bc3cc5cb876349710da16b6ba363.zip | |
Fix #938
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java index d32b3151..8110bf32 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java @@ -80,6 +80,10 @@ public class AccessoriesHelper { if (!ACCESSORY_DATA.containsKey(accessoryId) || Utils.getProfileId().isEmpty()) return Pair.of(AccessoryReport.INELIGIBLE, null); Accessory accessory = ACCESSORY_DATA.get(accessoryId); + + //Ignore rift-only accessories + if (accessory.origin().orElse("").equals("RIFT")) return Pair.of(AccessoryReport.INELIGIBLE, null); + Set<Accessory> collectedAccessories = COLLECTED_ACCESSORIES.computeIfAbsent(ProfileAccessoryData::createDefault).pages().values().stream() .flatMap(ObjectOpenHashSet::stream) .filter(ACCESSORY_DATA::containsKey) @@ -151,11 +155,12 @@ public class AccessoriesHelper { * @author AzureAaron * @implSpec <a href="https://github.com/AzureAaron/aaron-mod/blob/1.20/src/main/java/net/azureaaron/mod/commands/MagicalPowerCommand.java#L475">Aaron's Mod</a> */ - public record Accessory(String id, Optional<String> family, int tier) { + public record Accessory(String id, Optional<String> family, int tier, Optional<String> origin) { private static final Codec<Accessory> CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.STRING.fieldOf("id").forGetter(Accessory::id), Codec.STRING.optionalFieldOf("family").forGetter(Accessory::family), - Codec.INT.optionalFieldOf("tier", 0).forGetter(Accessory::tier) + Codec.INT.optionalFieldOf("tier", 0).forGetter(Accessory::tier), + Codec.STRING.optionalFieldOf("origin").forGetter(Accessory::origin) ).apply(instance, Accessory::new)); public static final Codec<Map<String, Accessory>> MAP_CODEC = Codec.unboundedMap(Codec.STRING, CODEC); |