Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7664: Item meta should prevail over block states

Browse Source
This commit is contained in:
md_5 2024-05-10 19:33:23 +10:00
parent c2ccc46ec3
commit 4af0f22e8a
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms-patches/net/minecraft/core/component/DataComponentPatch.patch
View File

@ -18,7 +18,7 @@
} }
}; };
private static final String REMOVED_PREFIX = "!"; private static final String REMOVED_PREFIX = "!";
@@ -270,6 +270,38 @@ @@ -270,6 +270,42 @@
a() {} a() {}
@ -31,6 +31,10 @@
+ this.map.remove(type); + this.map.remove(type);
+ } + }
+ +
+ public boolean isSet(DataComponentType<?> type) {
+ return map.containsKey(type);
+ }
+
+ public boolean isEmpty() { + public boolean isEmpty() {
+ return this.map.isEmpty(); + return this.map.isEmpty();
+ } + }

2
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@ -212,7 +212,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
tag.put(BLOCK_ENTITY_TAG, CustomData.of(blockEntityTag.getSnapshotNBTWithoutComponents())); tag.put(BLOCK_ENTITY_TAG, CustomData.of(blockEntityTag.getSnapshotNBTWithoutComponents()));
for (TypedDataComponent<?> component : blockEntityTag.collectComponents()) { for (TypedDataComponent<?> component : blockEntityTag.collectComponents()) {
tag.builder.set(component); tag.putIfAbsent(component);
} }
} }
} }

10
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@ -45,6 +45,7 @@ import net.minecraft.core.IRegistryCustom;
import net.minecraft.core.component.DataComponentPatch; import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.component.DataComponentType; import net.minecraft.core.component.DataComponentType;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
import net.minecraft.core.component.TypedDataComponent;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.DynamicOpsNBT; import net.minecraft.nbt.DynamicOpsNBT;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;
@ -173,13 +174,20 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
static final class Applicator { static final class Applicator {
final DataComponentPatch.a builder = DataComponentPatch.builder(); private final DataComponentPatch.a builder = DataComponentPatch.builder();
<T> Applicator put(ItemMetaKeyType<T> key, T value) { <T> Applicator put(ItemMetaKeyType<T> key, T value) {
builder.set(key.TYPE, value); builder.set(key.TYPE, value);
return this; return this;
} }
<T> Applicator putIfAbsent(TypedDataComponent<?> component) {
if (!builder.isSet(component.type())) {
builder.set(component);
}
return this;
}
DataComponentPatch build() { DataComponentPatch build() {
return builder.build(); return builder.build();
} }