Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-22 10:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Add default firework flight length in 1.20.5->1.20.3 (#3866)

Browse Source
This commit is contained in:
EnZaXD 2024-05-20 14:11:16 +02:00 committed by GitHub
parent 47f5617f83
commit d5ccb17951
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
View File

@ -387,6 +387,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
return dataItem; return dataItem;
} }
if (dataConverter.backupInconvertibleData()) {
// In 1.20.6, some items have default values which are not written into the components
if (item.identifier() == 1105 && !data.contains(StructuredDataKey.FIREWORKS)) {
data.set(StructuredDataKey.FIREWORKS, new Fireworks(1, new FireworkExplosion[0]));
}
}
for (final StructuredData<?> structuredData : data.data().values()) { for (final StructuredData<?> structuredData : data.data().values()) {
dataConverter.writeToTag(connection, structuredData, tag); dataConverter.writeToTag(connection, structuredData, tag);
} }

16
common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java
View File

@ -234,14 +234,16 @@ public final class StructuredDataConverter {
}); });
register(StructuredDataKey.FIREWORKS, (data, tag) -> { register(StructuredDataKey.FIREWORKS, (data, tag) -> {
final CompoundTag fireworksTag = new CompoundTag(); final CompoundTag fireworksTag = new CompoundTag();
fireworksTag.putInt("Flight", data.flightDuration()); fireworksTag.putByte("Flight", (byte) data.flightDuration());
tag.put("Fireworks", fireworksTag); tag.put("Fireworks", fireworksTag);
final ListTag<CompoundTag> explosionsTag = new ListTag<>(CompoundTag.class); if (data.explosions().length > 0) {
for (final FireworkExplosion explosion : data.explosions()) { final ListTag<CompoundTag> explosionsTag = new ListTag<>(CompoundTag.class);
explosionsTag.add(convertExplosion(explosion)); for (final FireworkExplosion explosion : data.explosions()) {
explosionsTag.add(convertExplosion(explosion));
}
fireworksTag.put("Explosions", explosionsTag);
} }
fireworksTag.put("Explosions", explosionsTag);
}); });
register(StructuredDataKey.FIREWORK_EXPLOSION, (data, tag) -> tag.put("Explosion", convertExplosion(data))); register(StructuredDataKey.FIREWORK_EXPLOSION, (data, tag) -> tag.put("Explosion", convertExplosion(data)));
register(StructuredDataKey.PROFILE, (data, tag) -> { register(StructuredDataKey.PROFILE, (data, tag) -> {
@ -871,6 +873,10 @@ public final class StructuredDataConverter {
rewriters.put(key, c); rewriters.put(key, c);
} }
public boolean backupInconvertibleData() {
return backupInconvertibleData;
}
@FunctionalInterface @FunctionalInterface
interface SimpleDataConverter<T> { interface SimpleDataConverter<T> {