3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-07-11 09:48:03 +02:00

Put item name and lore through component rewriter

An absolute classic moment where servers are putting hover events into not hoverable item names and lore
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-04-23 13:07:05 +02:00
Ursprung d80fd46c2f
Commit 34bc5b9d36
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
2 geänderte Dateien mit 19 neuen und 9 gelöschten Zeilen

Datei anzeigen

@ -68,6 +68,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
private final EntityPacketRewriter1_20_5 entityRewriter = new EntityPacketRewriter1_20_5(this); private final EntityPacketRewriter1_20_5 entityRewriter = new EntityPacketRewriter1_20_5(this);
private final BlockItemPacketRewriter1_20_5 itemRewriter = new BlockItemPacketRewriter1_20_5(this); private final BlockItemPacketRewriter1_20_5 itemRewriter = new BlockItemPacketRewriter1_20_5(this);
private final TagRewriter<ClientboundPacket1_20_3> tagRewriter = new TagRewriter<>(this); private final TagRewriter<ClientboundPacket1_20_3> tagRewriter = new TagRewriter<>(this);
private final ComponentRewriter<ClientboundPacket1_20_3> componentRewriter = new ComponentRewriter1_20_5(this);
public Protocol1_20_5To1_20_3() { public Protocol1_20_5To1_20_3() {
super(ClientboundPacket1_20_3.class, ClientboundPacket1_20_5.class, ServerboundPacket1_20_3.class, ServerboundPacket1_20_5.class); super(ClientboundPacket1_20_3.class, ClientboundPacket1_20_5.class, ServerboundPacket1_20_3.class, ServerboundPacket1_20_5.class);
@ -86,7 +87,6 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
new StatisticsRewriter<>(this).register(ClientboundPackets1_20_3.STATISTICS); new StatisticsRewriter<>(this).register(ClientboundPackets1_20_3.STATISTICS);
final ComponentRewriter<ClientboundPacket1_20_3> componentRewriter = new ComponentRewriter1_20_5(this);
componentRewriter.registerComponentPacket(ClientboundPackets1_20_3.SYSTEM_CHAT); componentRewriter.registerComponentPacket(ClientboundPackets1_20_3.SYSTEM_CHAT);
componentRewriter.registerComponentPacket(ClientboundPackets1_20_3.DISGUISED_CHAT); componentRewriter.registerComponentPacket(ClientboundPackets1_20_3.DISGUISED_CHAT);
@ -307,6 +307,10 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
return tagRewriter; return tagRewriter;
} }
public ComponentRewriter<ClientboundPacket1_20_3> getComponentRewriter() {
return componentRewriter;
}
@Override @Override
protected PacketTypesProvider<ClientboundPacket1_20_3, ClientboundPacket1_20_5, ServerboundPacket1_20_3, ServerboundPacket1_20_5> createPacketTypesProvider() { protected PacketTypesProvider<ClientboundPacket1_20_3, ClientboundPacket1_20_5, ServerboundPacket1_20_3, ServerboundPacket1_20_5> createPacketTypesProvider() {
return new SimplePacketTypesProvider<>( return new SimplePacketTypesProvider<>(

Datei anzeigen

@ -389,7 +389,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
data.set(StructuredDataKey.HIDE_ADDITIONAL_TOOLTIP); data.set(StructuredDataKey.HIDE_ADDITIONAL_TOOLTIP);
} }
updateDisplay(data, tag.getCompoundTag("display"), hideFlagsValue); updateDisplay(connection, data, tag.getCompoundTag("display"), hideFlagsValue);
final NumberTag damage = tag.getNumberTag("Damage"); final NumberTag damage = tag.getNumberTag("Damage");
if (damage != null && damage.asInt() != 0) { if (damage != null && damage.asInt() != 0) {
@ -483,7 +483,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
if (old.identifier() == 1085) { if (old.identifier() == 1085) {
updateWritableBookPages(data, tag); updateWritableBookPages(data, tag);
} else if (old.identifier() == 1086) { } else if (old.identifier() == 1086) {
updateWrittenBookPages(data, tag); updateWrittenBookPages(connection, data, tag);
} }
updatePotionTags(data, tag); updatePotionTags(data, tag);
@ -1073,7 +1073,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
data.set(StructuredDataKey.WRITABLE_BOOK_CONTENT, pages.toArray(new FilterableString[0])); data.set(StructuredDataKey.WRITABLE_BOOK_CONTENT, pages.toArray(new FilterableString[0]));
} }
private void updateWrittenBookPages(final StructuredDataContainer data, final CompoundTag tag) { private void updateWrittenBookPages(final UserConnection connection, final StructuredDataContainer data, final CompoundTag tag) {
final ListTag<StringTag> pagesTag = tag.getListTag("pages", StringTag.class); final ListTag<StringTag> pagesTag = tag.getListTag("pages", StringTag.class);
final CompoundTag filteredPagesTag = tag.getCompoundTag("filtered_pages"); final CompoundTag filteredPagesTag = tag.getCompoundTag("filtered_pages");
if (pagesTag == null) { if (pagesTag == null) {
@ -1087,11 +1087,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
if (filteredPagesTag != null) { if (filteredPagesTag != null) {
final StringTag filteredPage = filteredPagesTag.getStringTag(String.valueOf(i)); final StringTag filteredPage = filteredPagesTag.getStringTag(String.valueOf(i));
if (filteredPage != null) { if (filteredPage != null) {
filtered = ComponentUtil.jsonStringToTag(filteredPage.getValue()); filtered = jsonToTag(connection, filteredPage);
} }
} }
final Tag parsedPage = ComponentUtil.jsonStringToTag(page.getValue()); final Tag parsedPage = jsonToTag(connection, page);
pages.add(new FilterableComponent(parsedPage, filtered)); pages.add(new FilterableComponent(parsedPage, filtered));
} }
@ -1110,6 +1110,12 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
data.set(StructuredDataKey.WRITTEN_BOOK_CONTENT, writtenBook); data.set(StructuredDataKey.WRITTEN_BOOK_CONTENT, writtenBook);
} }
private Tag jsonToTag(final UserConnection connection, final StringTag stringTag) {
final Tag tag = ComponentUtil.jsonStringToTag(stringTag.getValue());
protocol.getComponentRewriter().processTag(connection, tag);
return tag;
}
private void updateItemList(final UserConnection connection, final StructuredDataContainer data, final CompoundTag tag, private void updateItemList(final UserConnection connection, final StructuredDataContainer data, final CompoundTag tag,
final String key, final StructuredDataKey<Item[]> dataKey, final boolean allowEmpty) { final String key, final StructuredDataKey<Item[]> dataKey, final boolean allowEmpty) {
final ListTag<CompoundTag> itemsTag = tag.getListTag(key, CompoundTag.class); final ListTag<CompoundTag> itemsTag = tag.getListTag(key, CompoundTag.class);
@ -1265,7 +1271,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
data.set(StructuredDataKey.MAP_DECORATIONS, updatedDecorationsTag); data.set(StructuredDataKey.MAP_DECORATIONS, updatedDecorationsTag);
} }
private void updateDisplay(final StructuredDataContainer data, final CompoundTag displayTag, final int hideFlags) { private void updateDisplay(final UserConnection connection, final StructuredDataContainer data, final CompoundTag displayTag, final int hideFlags) {
if (displayTag == null) { if (displayTag == null) {
return; return;
} }
@ -1277,13 +1283,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
final StringTag nameTag = displayTag.getStringTag("Name"); final StringTag nameTag = displayTag.getStringTag("Name");
if (nameTag != null) { if (nameTag != null) {
data.set(StructuredDataKey.CUSTOM_NAME, ComponentUtil.jsonStringToTag(nameTag.getValue())); data.set(StructuredDataKey.CUSTOM_NAME, jsonToTag(connection, nameTag));
} }
final ListTag<StringTag> loreTag = displayTag.getListTag("Lore", StringTag.class); final ListTag<StringTag> loreTag = displayTag.getListTag("Lore", StringTag.class);
if (loreTag != null) { if (loreTag != null) {
// Apply limit as per new network codec. Some servers send these lores to do trickery with shaders // Apply limit as per new network codec. Some servers send these lores to do trickery with shaders
data.set(StructuredDataKey.LORE, loreTag.stream().limit(256).map(t -> ComponentUtil.jsonStringToTag(t.getValue())).toArray(Tag[]::new)); data.set(StructuredDataKey.LORE, loreTag.stream().limit(256).map(t -> jsonToTag(connection, t)).toArray(Tag[]::new));
} }
final NumberTag colorTag = displayTag.getNumberTag("color"); final NumberTag colorTag = displayTag.getNumberTag("color");