diff options
| author | Owen1212055 <[email protected]> | 2024-11-18 11:34:17 -0500 |
|---|---|---|
| committer | Owen1212055 <[email protected]> | 2024-11-18 14:50:39 -0500 |
| commit | 224a864e672a49e50deee88955f8567022033f32 (patch) | |
| tree | 08c36d816eb1b27a74025d21a1ebb9492eba7103 | |
| parent | ed7c913b56183aac508a56fa38819432be6988f8 (diff) | |
| download | Paper-224a864e672a49e50deee88955f8567022033f32.tar.gz Paper-224a864e672a49e50deee88955f8567022033f32.zip | |
Move to adventure
| -rw-r--r-- | patches/server/0010-Adventure.patch | 14 | ||||
| -rw-r--r-- | patches/server/1066-WIP-DataComponent-API.patch (renamed from patches/server/1065-WIP-DataComponent-API.patch) | 15 |
2 files changed, 9 insertions, 20 deletions
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index b22e85c55b..789578cdd1 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -1161,10 +1161,10 @@ index 0000000000000000000000000000000000000000..2fd6c3e65354071af71c7d8ebb97b559 +} diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java new file mode 100644 -index 0000000000000000000000000000000000000000..161bc8c577643094d824ea96fb6974c76e5e77f0 +index 0000000000000000000000000000000000000000..3eabc4a6a595cd761d20371256c19ac440f92ba2 --- /dev/null +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -@@ -0,0 +1,479 @@ +@@ -0,0 +1,483 @@ +package io.papermc.paper.adventure; + +import com.mojang.brigadier.StringReader; @@ -1314,6 +1314,10 @@ index 0000000000000000000000000000000000000000..161bc8c577643094d824ea96fb6974c7 + + // Key + ++ public static Key asAdventure(final ResourceLocation key) { ++ return Key.key(key.getNamespace(), key.getPath()); // todo move in the right patch ++ } ++ + public static ResourceLocation asVanilla(final Key key) { + return ResourceLocation.fromNamespaceAndPath(key.namespace(), key.value()); + } @@ -2704,7 +2708,7 @@ index 709330ca9caa82a6de71767b3d5c32f97ea1d68b..daf20aa9a83a2583c0c61a4123cc2e52 public boolean logIPs() { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 32e7c6e6f09e53fe8b5ade22dad8142cd09e0163..4303bde198050cd037f006234d269af406606eff 100644 +index 785c7e11f92610be58b624d252d1858658496af7..99607edee9fba8df87f0525bf0eadee865ab38a4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -190,6 +190,7 @@ import net.minecraft.world.item.trading.MerchantOffers; @@ -3639,7 +3643,7 @@ index 8b58884d6cb1088a2fffb36a99bfe4dc568326d1..9a79b948264150d0f7a843a8ddd2ea92 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 94004204b6cdbbbf35263faae56e3e06cb6b650c..2e33acc428dbfd3e123dfd6ef90bc020b8a08daf 100644 +index 39126769594a535ebd4bf7052f42e9eda9d3e10a..41ceea1093edbf777f9ebe252114be7f75438420 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -20,6 +20,12 @@ public class Main { @@ -5202,7 +5206,7 @@ index c71a4971f127fdfc753306019313ce1a31201120..fd3b12477c30d1eabdbe57ea77902793 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 5dea83c1a0de4e5123430bf2f902a78969021167..2e524520308dda7ce7df98d91c89a9cfe7542862 100644 +index 2d68086ef09b5f2d6b3d3e6200e621c23747b25a..f3789ea732b17a311d8203a58a97d11370ec7863 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1097,6 +1097,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/1065-WIP-DataComponent-API.patch b/patches/server/1066-WIP-DataComponent-API.patch index 37ec8ae222..552ac83ab0 100644 --- a/patches/server/1065-WIP-DataComponent-API.patch +++ b/patches/server/1066-WIP-DataComponent-API.patch @@ -7,21 +7,6 @@ Subject: [PATCH] WIP DataComponent API public net/minecraft/world/item/component/ItemContainerContents MAX_SIZE public net/minecraft/world/item/component/ItemContainerContents items -diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -index cfcaf215c4a901dd2938c7ce41db502c57b42bbf..e735cc98c53b62defa02d80f4b185641b5e27ae8 100644 ---- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -+++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -@@ -149,6 +149,10 @@ public final class PaperAdventure { - - // Key - -+ public static Key asAdventure(final ResourceLocation key) { -+ return Key.key(key.getNamespace(), key.getPath()); // todo move in the right patch -+ } -+ - public static ResourceLocation asVanilla(final Key key) { - return ResourceLocation.fromNamespaceAndPath(key.namespace(), key.value()); - } diff --git a/src/main/java/io/papermc/paper/datacomponent/ComponentAdapter.java b/src/main/java/io/papermc/paper/datacomponent/ComponentAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..4a49f65cae1354afbcd4afda07581790e06094be |