Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-27 16:40:10 +01:00
Code Issues Releases Aktivität

Fixup LODESTONE_TRACKER rewriting in 1.20.3->.5 and backwards (#3862)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EnZaXD 2024-05-19 09:40:10 +02:00 committet von GitHub
Ursprung 7d9c6fea69
Commit 052fb6e366
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
2 geänderte Dateien mit 21 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
Datei anzeigen

@ -469,10 +469,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
data.set(StructuredDataKey.RECIPES, recipesTag); data.set(StructuredDataKey.RECIPES, recipesTag);
} }
final CompoundTag lodestonePosTag = tag.getCompoundTag("LodestonePos"); final NumberTag trackedTag = tag.getNumberTag("LodestoneTracked");
final String lodestoneDimension = tag.getString("LodestoneDimension"); if (trackedTag != null) {
if (lodestonePosTag != null && lodestoneDimension != null) { final CompoundTag lodestonePosTag = tag.getCompoundTag("LodestonePos");
updateLodestoneTracker(tag, lodestonePosTag, lodestoneDimension, data); final String lodestoneDimension = tag.getString("LodestoneDimension");
updateLodestoneTracker(trackedTag.asBoolean(), lodestonePosTag, lodestoneDimension, data);
} }
final ListTag<CompoundTag> effectsTag = tag.getListTag("effects", CompoundTag.class); final ListTag<CompoundTag> effectsTag = tag.getListTag("effects", CompoundTag.class);
@ -1047,12 +1048,14 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
data.set(StructuredDataKey.SUSPICIOUS_STEW_EFFECTS, suspiciousStewEffects); data.set(StructuredDataKey.SUSPICIOUS_STEW_EFFECTS, suspiciousStewEffects);
} }
private void updateLodestoneTracker(final CompoundTag tag, final CompoundTag lodestonePosTag, final String lodestoneDimensionTag, final StructuredDataContainer data) { private void updateLodestoneTracker(final boolean tracked, final CompoundTag lodestonePosTag, final String lodestoneDimensionTag, final StructuredDataContainer data) {
final boolean tracked = tag.getBoolean("LodestoneTracked"); GlobalPosition position = null;
final int x = lodestonePosTag.getInt("X"); if (lodestonePosTag != null && lodestoneDimensionTag != null) {
final int y = lodestonePosTag.getInt("Y"); final int x = lodestonePosTag.getInt("X");
final int z = lodestonePosTag.getInt("Z"); final int y = lodestonePosTag.getInt("Y");
final GlobalPosition position = new GlobalPosition(lodestoneDimensionTag, x, y, z); final int z = lodestonePosTag.getInt("Z");
position = new GlobalPosition(lodestoneDimensionTag, x, y, z);
}
data.set(StructuredDataKey.LODESTONE_TRACKER, new LodestoneTracker(position, tracked)); data.set(StructuredDataKey.LODESTONE_TRACKER, new LodestoneTracker(position, tracked));
} }

14
common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java
Datei anzeigen

@ -220,13 +220,15 @@ public final class StructuredDataConverter {
register(StructuredDataKey.CHARGED_PROJECTILES, (connection, data, tag) -> convertItemList(connection, data, tag, "ChargedProjectiles")); register(StructuredDataKey.CHARGED_PROJECTILES, (connection, data, tag) -> convertItemList(connection, data, tag, "ChargedProjectiles"));
register(StructuredDataKey.BUNDLE_CONTENTS, (connection, data, tag) -> convertItemList(connection, data, tag, "Items")); register(StructuredDataKey.BUNDLE_CONTENTS, (connection, data, tag) -> convertItemList(connection, data, tag, "Items"));
register(StructuredDataKey.LODESTONE_TRACKER, (data, tag) -> { register(StructuredDataKey.LODESTONE_TRACKER, (data, tag) -> {
final CompoundTag positionTag = new CompoundTag();
tag.put("LodestonePos", positionTag);
tag.putBoolean("LodestoneTracked", data.tracked()); tag.putBoolean("LodestoneTracked", data.tracked());
tag.putString("LodestoneDimension", data.position().dimension()); if (data.position() != null) {
positionTag.putInt("X", data.position().x()); final CompoundTag positionTag = new CompoundTag();
positionTag.putInt("Y", data.position().y()); positionTag.putInt("X", data.position().x());
positionTag.putInt("Z", data.position().z()); positionTag.putInt("Y", data.position().y());
positionTag.putInt("Z", data.position().z());
tag.put("LodestonePos", positionTag);
tag.putString("LodestoneDimension", data.position().dimension());
}
}); });
register(StructuredDataKey.FIREWORKS, (data, tag) -> { register(StructuredDataKey.FIREWORKS, (data, tag) -> {
final CompoundTag fireworksTag = new CompoundTag(); final CompoundTag fireworksTag = new CompoundTag();