OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-18 12:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement assetid

Browse source
This commit is contained in:
Owen1212055 2024-12-04 00:33:47 -05:00
parent 7e601ad916
commit 3b35456b3f
No known key found for this signature in database
GPG key ID: 2133292072886A30
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/api/0495-DataComponent-API.patch
View file

@ -1187,7 +1187,7 @@ index 0000000000000000000000000000000000000000..a128348247d8845321d3fecebaa09a51
+} +}
diff --git a/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java diff --git a/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..135ebe0b84027073793c21c71d37eff496d23fec index 0000000000000000000000000000000000000000..f72d412a09c710f30eb219abc25ca4c95d49f4b1
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java +++ b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
@@ -0,0 +1,169 @@ @@ -0,0 +1,169 @@
@ -1241,9 +1241,9 @@ index 0000000000000000000000000000000000000000..135ebe0b84027073793c21c71d37eff4
+ Key equipSound(); + Key equipSound();
+ +
+ /** + /**
+ * Gets the model key if present. + * Gets the asset id if present.
+ * + *
+ * @return the model key or null + * @return the asset id or null
+ */ + */
+ @Contract(pure = true) + @Contract(pure = true)
+ @Nullable Key assetId(); + @Nullable Key assetId();

22
patches/server/1031-DataComponent-API.patch
View file

@ -1243,25 +1243,31 @@ index 0000000000000000000000000000000000000000..422e1a4d606481f0dc68843fbbc8126c
+} +}
diff --git a/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java b/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java diff --git a/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java b/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..cb4dd5b88da769f00060ad24ff4ccd8e0a40a1a6 index 0000000000000000000000000000000000000000..f0c2b30069b2df060a39683636296567bce172a6
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java +++ b/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java
@@ -0,0 +1,170 @@ @@ -0,0 +1,174 @@
+package io.papermc.paper.datacomponent.item; +package io.papermc.paper.datacomponent.item;
+ +
+import io.papermc.paper.adventure.PaperAdventure; +import io.papermc.paper.adventure.PaperAdventure;
+import io.papermc.paper.registry.PaperRegistries;
+import io.papermc.paper.registry.RegistryKey; +import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.set.PaperRegistrySets; +import io.papermc.paper.registry.set.PaperRegistrySets;
+import io.papermc.paper.registry.set.RegistryKeySet; +import io.papermc.paper.registry.set.RegistryKeySet;
+import java.util.Optional; +import java.util.Optional;
+import java.util.function.Function;
+import net.kyori.adventure.key.Key; +import net.kyori.adventure.key.Key;
+import net.minecraft.core.Holder; +import net.minecraft.core.Holder;
+import net.minecraft.core.HolderSet; +import net.minecraft.core.HolderSet;
+import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries; +import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundEvents;
+import net.minecraft.util.datafix.fixes.EquippableAssetRenameFix;
+import net.minecraft.world.item.equipment.EquipmentAsset;
+import net.minecraft.world.item.equipment.EquipmentAssets;
+import org.bukkit.craftbukkit.CraftEquipmentSlot; +import org.bukkit.craftbukkit.CraftEquipmentSlot;
+import org.bukkit.craftbukkit.util.Handleable; +import org.bukkit.craftbukkit.util.Handleable;
+import org.bukkit.entity.EntityType; +import org.bukkit.entity.EntityType;
@ -1289,11 +1295,9 @@ index 0000000000000000000000000000000000000000..cb4dd5b88da769f00060ad24ff4ccd8e
+ +
+ @Override + @Override
+ public @Nullable Key assetId() { + public @Nullable Key assetId() {
+ // TODO + return this.impl.assetId()
+ throw new UnsupportedOperationException("Not yet implemented"); + .map(PaperAdventure::asAdventureKey)
+ //return this.impl.assetId() + .orElse(null);
+ // .map(PaperAdventure::asAdventure)
+ // .orElse(null);
+ } + }
+ +
+ @Override + @Override
@ -1342,7 +1346,7 @@ index 0000000000000000000000000000000000000000..cb4dd5b88da769f00060ad24ff4ccd8e
+ +
+ private final net.minecraft.world.entity.EquipmentSlot equipmentSlot; + private final net.minecraft.world.entity.EquipmentSlot equipmentSlot;
+ private Holder<SoundEvent> equipSound = SoundEvents.ARMOR_EQUIP_GENERIC; + private Holder<SoundEvent> equipSound = SoundEvents.ARMOR_EQUIP_GENERIC;
+ private Optional<ResourceLocation> assetId = Optional.empty(); + private Optional<ResourceKey<EquipmentAsset>> assetId = Optional.empty();
+ private Optional<ResourceLocation> cameraOverlay = Optional.empty(); + private Optional<ResourceLocation> cameraOverlay = Optional.empty();
+ private Optional<HolderSet<net.minecraft.world.entity.EntityType<?>>> allowedEntities = Optional.empty(); + private Optional<HolderSet<net.minecraft.world.entity.EntityType<?>>> allowedEntities = Optional.empty();
+ private boolean dispensable = true; + private boolean dispensable = true;
@ -1362,7 +1366,7 @@ index 0000000000000000000000000000000000000000..cb4dd5b88da769f00060ad24ff4ccd8e
+ @Override + @Override
+ public Builder assetId(final @Nullable Key model) { + public Builder assetId(final @Nullable Key model) {
+ this.assetId = Optional.ofNullable(model) + this.assetId = Optional.ofNullable(model)
+ .map(PaperAdventure::asVanilla); + .map(key -> PaperAdventure.asVanilla(EquipmentAssets.ROOT_ID, key));
+ +
+ return this; + return this;
+ } + }