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

Fix adding multiple definitions for same item model and sorting of predicates

Browse source
This commit is contained in:
Eclipse 2024-12-12 15:04:31 +00:00
parent eb0b40c8b1
commit a4c17daf24
No known key found for this signature in database
GPG key ID: 95E6998F82EC938A
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
api/src/main/java/org/geysermc/geyser/api/util/Identifier.java
View file

@ -25,6 +25,7 @@
package org.geysermc.geyser.api.util;
import java.util.Objects;
import java.util.function.Function;
public final class Identifier {
@ -65,6 +66,20 @@ public final class Identifier {
return path;
}
@Override
public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
Identifier other = (Identifier) o;
return Objects.equals(namespace, other.namespace) && Objects.equals(path, other.path);
}
@Override
public int hashCode() {
return Objects.hash(namespace, path);
}
@Override
public String toString() {
return namespace + ":" + path;

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

@ -505,15 +505,7 @@ public class ItemRegistryPopulator {
// ComponentItemData - used to register some custom properties
componentItemData.add(customMapping.componentItemData());
System.out.println("putting " + customItem.bedrockIdentifier() + " for model " + identifierToKey(customItem.model()));
for (GeyserCustomMappingData existing : customItemDefinitions.get(identifierToKey(customItem.model()))) {
System.out.println("existing - " + existing);
System.out.println("trying to add - " + customMapping);
System.out.println("trying to add " + (customMapping.equals(existing) ? "DOES" : "does NOT") + " equal existing");
}
System.out.println("map size: " + customItemDefinitions.size());
customItemDefinitions.put(identifierToKey(customItem.model()), customMapping);
System.out.println("map size after: " + customItemDefinitions.size());
registry.put(customMapping.integerId(), customMapping.itemDefinition());
customIdMappings.put(customMapping.integerId(), customMapping.stringId());
@ -746,7 +738,7 @@ public class ItemRegistryPopulator {
* Compares custom item definitions based on their predicates:
*
* <ol>
* <li>First by checking their priority values.</li>
* <li>First by checking their priority values, higher priority values going first.</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>
@ -765,7 +757,11 @@ public class ItemRegistryPopulator {
}
if (first.priority() != second.priority()) {
return first.priority() - second.priority();
return second.priority() - first.priority();
}
if (first.predicates().isEmpty() || second.predicates().isEmpty()) {
return second.predicates().size() - first.predicates().size(); // No need checking for range predicates if either one has no predicates
}
for (CustomItemPredicate predicate : first.predicates()) {
@ -775,11 +771,11 @@ public class ItemRegistryPopulator {
.map(otherPredicate -> (RangeDispatchPredicate) otherPredicate)
.findFirst();
if (other.isPresent()) {
return (int) (rangeDispatch.threshold() - other.orElseThrow().threshold());
return (int) (other.orElseThrow().threshold() - rangeDispatch.threshold());
}
}
} // TODO not a fan of how this looks
}
return first.predicates().size() - second.predicates().size();
return second.predicates().size() - first.predicates().size();
}
}
}

1
core/src/main/java/org/geysermc/geyser/translator/item/CustomItemTranslator.java
View file

@ -90,7 +90,6 @@ public final class CustomItemTranslator {
}
}
if (allMatch) {
System.out.println("using " + customMapping.definition().bedrockIdentifier());
return customMapping.itemDefinition();
}
}