Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-19 14:30:16 +01:00
Code Issues Releases Aktivität

Handle show_entity type field

Quellcode durchsuchen
Dieser Commit ist enthalten in:
RaphiMC 2024-04-18 23:11:19 +02:00
Ursprung 57b37457d6
Commit 7825a1e460
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 0F6BB0657A03AC94
1 geänderte Dateien mit 79 neuen und 60 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

27
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
Datei anzeigen

@ -160,12 +160,11 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
@Override @Override
protected void handleHoverEvent(final CompoundTag hoverEventTag) { protected void handleHoverEvent(final CompoundTag hoverEventTag) {
final StringTag actionTag = hoverEventTag.getStringTag("action"); final StringTag actionTag = hoverEventTag.getStringTag("action");
if (actionTag == null || !actionTag.getValue().equals("show_item")) { if (actionTag == null) return;
return;
}
if (actionTag.getValue().equals("show_item")) {
final Tag valueTag = hoverEventTag.remove("value"); final Tag valueTag = hoverEventTag.remove("value");
if (valueTag != null) { // Convert legacy hover event to new format for rewriting if (valueTag != null) { // Convert legacy hover event to new format for rewriting (Doesn't handle all cases, but good enough)
final CompoundTag tag = ComponentUtil.deserializeShowItem(valueTag, SerializerVersion.V1_20_3); final CompoundTag tag = ComponentUtil.deserializeShowItem(valueTag, SerializerVersion.V1_20_3);
final CompoundTag contentsTag = new CompoundTag(); final CompoundTag contentsTag = new CompoundTag();
contentsTag.put("id", tag.getStringTag("id")); contentsTag.put("id", tag.getStringTag("id"));
@ -235,6 +234,26 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
} }
contentsTag.put("components", components); contentsTag.put("components", components);
} }
} else if (actionTag.getValue().equals("show_entity")) {
final Tag valueTag = hoverEventTag.remove("value");
if (valueTag != null) { // Convert legacy hover event to new format for rewriting (Doesn't handle all cases, but good enough)
final CompoundTag tag = ComponentUtil.deserializeShowItem(valueTag, SerializerVersion.V1_20_3);
final CompoundTag contentsTag = new CompoundTag();
contentsTag.put("type", tag.getStringTag("type"));
contentsTag.put("id", tag.getStringTag("id"));
contentsTag.put("name", SerializerVersion.V1_20_3.toTag(SerializerVersion.V1_20_3.toComponent(tag.getString("name"))));
hoverEventTag.put("contents", contentsTag);
}
final CompoundTag contentsTag = hoverEventTag.getCompoundTag("contents");
if (contentsTag == null) {
return;
}
if (this.protocol.getMappingData().getEntityMappings().mappedId(contentsTag.getString("type")) == -1) {
contentsTag.put("type", new StringTag("pig"));
}
}
} }
protected CompoundTag toTag(final Map<StructuredDataKey<?>, StructuredData<?>> data, final boolean empty) { protected CompoundTag toTag(final Map<StructuredDataKey<?>, StructuredData<?>> data, final boolean empty) {