Skip to content

Fixes for DataHolder & ItemStackSnapshot #4182

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

Merged
aromaa merged 3 commits into from
Mar 12, 2025
Merged

Fixes for DataHolder & ItemStackSnapshot #4182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dedb024
fix DataHolder#getKeys
MrHell228 Mar 8, 2025
d54fced
fix ItemStackSnapshot getKeys & getValues
MrHell228 Mar 8, 2025
a300d77
Update SpongeAPI
MrHell228 Mar 12, 2025
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
2 changes: 1 addition & 1 deletion SpongeAPI
Open in desktop
Submodule SpongeAPI updated 2 files
+4 −0 gradle/verification-metadata.xml
+1 −1 src/main/java/org/spongepowered/api/data/type/HandPreference.java
3 changes: 2 additions & 1 deletion src/main/java/org/spongepowered/common/data/holder/SpongeDataHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ default <E, V extends Value<E>> Optional<V> getValue(final Key<V> key) {
default Set<Key<?>> getKeys() {
return this.impl$delegateDataHolder().stream()
.flatMap(dh -> this.impl$getAllProviders(dh).stream()
.filter(provider -> provider.get(dh).isPresent()).map(DataProvider::key))
.map(DataProvider::key))
.filter(this::supports)
.collect(ImmutableSet.toImmutableSet());
}

Expand Down
12 changes: 4 additions & 8 deletions src/main/java/org/spongepowered/common/item/SpongeItemStackSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ public class SpongeItemStackSnapshot implements ItemStackSnapshot {
private final int damageValue;
private final ImmutableList<DataManipulator.Immutable> manipulators;
private final transient ItemStack privateStack; // only for internal use since the processors have a huge say
private final ImmutableSet<Key<?>> keys;
private final ImmutableSet<org.spongepowered.api.data.value.Value.Immutable<?>> values;
private final Set<Key<?>> keys;
private final Set<org.spongepowered.api.data.value.Value.Immutable<?>> values;
private final DataComponentPatch components;
private @Nullable UUID creatorUniqueId;

Expand All @@ -95,17 +95,13 @@ public SpongeItemStackSnapshot(final ItemStack itemStack) {
this.itemType = itemStack.type();
this.quantity = itemStack.quantity();
final ImmutableList.Builder<DataManipulator.Immutable> builder = ImmutableList.builder();
final ImmutableSet.Builder<Key<?>> keyBuilder = ImmutableSet.builder();
final ImmutableSet.Builder<org.spongepowered.api.data.value.Value.Immutable<?>> valueBuilder = ImmutableSet.builder();
final DataManipulator.Mutable customData = ((SpongeDataHolderBridge) itemStack).bridge$getManipulator();
builder.add(customData.asImmutable());
keyBuilder.addAll(customData.getKeys());
valueBuilder.addAll(customData.getValues());
this.damageValue = ItemStackUtil.toNative(itemStack).getDamageValue();
this.manipulators = builder.build();
this.privateStack = itemStack.copy();
this.keys = keyBuilder.build();
this.values = valueBuilder.build();
this.keys = itemStack.getKeys();
this.values = itemStack.getValues();
this.components = ItemStackUtil.toNative(this.privateStack).getComponentsPatch();
}

Expand Down