OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-01-23 00:41:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement priority option

Browse source
This commit is contained in:
Eclipse 2024-12-12 10:52:28 +00:00
parent 04fe043bbe
commit 5ecc61fc1d
No known key found for this signature in database
GPG key ID: 95E6998F82EC938A
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View file

@ -731,8 +731,11 @@ public class ItemRegistryPopulator {
/**
* Compares custom item definitions based on their predicates:
*
* <p>First by checking if they both have a similar range dispatch predicate, the one with the highest threshold going first,
* and then by the amount of predicates, from most to least.</p>
* <ol>
* <li>First by checking their priority values.</li>
* <li>Then by checking if they both have a similar range dispatch predicate, the one with the highest threshold going first.</li>
* <li>Lastly by the amount of predicates, from most to least.</li>
* </ol>
*
* <p>This comparator regards 2 custom item definitions as the same if their model differs, since it is only checking for predicates, and those
* don't matter if their models are different.</p>
@ -746,6 +749,11 @@ public class ItemRegistryPopulator {
if (first.equals(second) || !first.model().equals(second.model())) {
return 0;
}
if (first.priority() != second.priority()) {
return first.priority() - second.priority();
}
for (CustomItemPredicate predicate : first.predicates()) {
if (predicate instanceof RangeDispatchPredicate rangeDispatch) {
Optional<RangeDispatchPredicate> other = second.predicates().stream()