mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

remove some more obf helpers

Browse source
This commit is contained in:
Jake Potrebic 2021-06-16 10:48:25 -07:00
parent 080d3d737a
commit cd8f24d472
No known key found for this signature in database
GPG key ID: 7C58557EC9C421F8
33 changed files with 127 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index d0cf2ab939392b8bf6558a69d5110a8c18c092b8..b2a88d2005795d8d92c3f550d9f8eeb316a45298 100644
index 2fd3d56768f9121c1e5de3f193258bb360bb103b..b513fa552440da7a722dfe8cbf92e7294495cd67 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -170,6 +170,44 @@ public final class ItemStack {
@ -34,7 +34,7 @@ index d0cf2ab939392b8bf6558a69d5110a8c18c092b8..b2a88d2005795d8d92c3f550d9f8eeb3
+ try {
+ list.set(index, convert(json));
+ } catch (JsonParseException e) {
+ list.set(index, net.minecraft.nbt.StringTag.create(org.bukkit.craftbukkit.util.CraftChatMessage.toJSON(new TextComponent(""))));
+ list.set(index, net.minecraft.nbt.StringTag.valueOf(org.bukkit.craftbukkit.util.CraftChatMessage.toJSON(new TextComponent(""))));
+ }
+ }
+ }
@ -43,12 +43,12 @@ index d0cf2ab939392b8bf6558a69d5110a8c18c092b8..b2a88d2005795d8d92c3f550d9f8eeb3
+ }
+
+ private net.minecraft.nbt.StringTag convert(String json) {
+ Component component = Component.Serializer.jsonToComponent(json);
+ Component component = Component.Serializer.fromJson(json);
+ if (component instanceof TextComponent && component.getContents().contains("\u00A7") && component.getSiblings().isEmpty()) {
+ // Only convert if the root component is a single comp with legacy in it, don't convert already normal components
+ component = org.bukkit.craftbukkit.util.CraftChatMessage.fromString(component.getContents())[0];
+ }
+ return net.minecraft.nbt.StringTag.create(org.bukkit.craftbukkit.util.CraftChatMessage.toJSON(component));
+ return net.minecraft.nbt.StringTag.valueOf(org.bukkit.craftbukkit.util.CraftChatMessage.toJSON(component));
+ }
// Paper end