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

Reimplement unbreakable predicate check

Browse source
This commit is contained in:
Eclipse 2024-12-12 11:47:41 +00:00
parent 2263cc8290
commit 3fac2cd8f7
No known key found for this signature in database
GPG key ID: 95E6998F82EC938A
1 changed files with 11 additions and 1 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/CustomItemRegistryPopulator.java
View file

@ -41,6 +41,7 @@ import org.geysermc.geyser.api.item.custom.CustomRenderOffsets;
import org.geysermc.geyser.api.item.custom.NonVanillaCustomItemData;
import org.geysermc.geyser.api.item.custom.v2.CustomItemBedrockOptions;
import org.geysermc.geyser.api.item.custom.v2.CustomItemDefinition;
import org.geysermc.geyser.api.item.custom.v2.predicate.ConditionPredicate;
import org.geysermc.geyser.api.item.custom.v2.predicate.CustomItemPredicate;
import org.geysermc.geyser.api.util.CreativeCategory;
import org.geysermc.geyser.api.util.Identifier;
@ -300,7 +301,7 @@ public class CustomItemRegistryPopulator {
int stackSize = maxDamage > 0 || equippable != null ? 1 : components.getOrDefault(DataComponentType.MAX_STACK_SIZE, 0); // This should never be 0 since we're patching components on top of the vanilla one's
itemProperties.putInt("max_stack_size", stackSize);
if (maxDamage > 0/* && customItemData.customItemOptions().unbreakable() != TriState.TRUE*/) { // TODO Insert check back in once predicates are here?
if (maxDamage > 0 && !isUnbreakableItem(definition)) {
componentBuilder.putCompound("minecraft:durability", NbtMap.builder()
.putCompound("damage_chance", NbtMap.builder()
.putInt("max", 1)
@ -614,6 +615,15 @@ public class CustomItemRegistryPopulator {
return NbtMap.builder().putList("scale", NbtType.FLOAT, List.of(x, y, z)).build();
}
private static boolean isUnbreakableItem(CustomItemDefinition definition) {
for (CustomItemPredicate predicate : definition.predicates()) {
if (predicate instanceof ConditionPredicate condition && condition.property() == ConditionPredicate.ConditionProperty.UNBREAKABLE && condition.expected()) {
return true;
}
}
return false;
}
// TODO is this right?
private static DataComponents patchDataComponents(Item javaItem, CustomItemDefinition definition) {
return javaItem.gatherComponents(definition.components());