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

24w14a

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-04-03 16:32:47 +02:00
Ursprung a2c1c52f51
Commit 67e6e1a2e3
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
5 geänderte Dateien mit 59 neuen und 58 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
Datei anzeigen

@ -83,7 +83,7 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new SubVersionRange("1.20", 0, 1)); public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new SubVersionRange("1.20", 0, 1));
public static final ProtocolVersion v1_20_2 = register(764, "1.20.2"); public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
public static final ProtocolVersion v1_20_3 = register(765, "1.20.3/1.20.4", new SubVersionRange("1.20", 3, 4)); public static final ProtocolVersion v1_20_3 = register(765, "1.20.3/1.20.4", new SubVersionRange("1.20", 3, 4));
public static final ProtocolVersion v1_20_5 = register(766, 182, "1.20.5"); public static final ProtocolVersion v1_20_5 = register(766, 184, "1.20.5");
public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null); public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
public static ProtocolVersion register(int version, String name) { public static ProtocolVersion register(int version, String name) {

3
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java
Datei anzeigen

@ -139,7 +139,8 @@ public enum ClientboundPackets1_20_5 implements ClientboundPacket1_20_5 {
ENTITY_PROPERTIES, // 0x75 ENTITY_PROPERTIES, // 0x75
ENTITY_EFFECT, // 0x76 ENTITY_EFFECT, // 0x76
DECLARE_RECIPES, // 0x77 DECLARE_RECIPES, // 0x77
TAGS; // 0x78 TAGS, // 0x78
PROJECTILE_POWER; // 0x79
@Override @Override
public int getId() { public int getId() {

106
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java
Datei anzeigen

@ -24,59 +24,59 @@ public enum ServerboundPackets1_20_5 implements ServerboundPacket1_20_5 {
SET_DIFFICULTY, // 0x02 SET_DIFFICULTY, // 0x02
CHAT_ACK, // 0x03 CHAT_ACK, // 0x03
CHAT_COMMAND, // 0x04 CHAT_COMMAND, // 0x04
CHAT_COMMAND_SIGNED, // 0x04 CHAT_COMMAND_SIGNED, // 0x05
CHAT_MESSAGE, // 0x05 CHAT_MESSAGE, // 0x06
CHAT_SESSION_UPDATE, // 0x06 CHAT_SESSION_UPDATE, // 0x07
CHUNK_BATCH_RECEIVED, // 0x07 CHUNK_BATCH_RECEIVED, // 0x08
CLIENT_STATUS, // 0x08 CLIENT_STATUS, // 0x09
CLIENT_SETTINGS, // 0x09 CLIENT_SETTINGS, // 0x0A
TAB_COMPLETE, // 0x0A TAB_COMPLETE, // 0x0B
CONFIGURATION_ACKNOWLEDGED, // 0x0B CONFIGURATION_ACKNOWLEDGED, // 0x0C
CLICK_WINDOW_BUTTON, // 0x0C CLICK_WINDOW_BUTTON, // 0x0D
CLICK_WINDOW, // 0x0D CLICK_WINDOW, // 0x0E
CLOSE_WINDOW, // 0x0E CLOSE_WINDOW, // 0x0F
CONTAINER_SLOT_STATE_CHANGED, // 0x0F CONTAINER_SLOT_STATE_CHANGED, // 0x10
COOKIE_RESPONSE, // 0x10 COOKIE_RESPONSE, // 0x11
PLUGIN_MESSAGE, // 0x11 PLUGIN_MESSAGE, // 0x12
DEBUG_SAMPLE_SUBSCRIPTION, // 0x12 DEBUG_SAMPLE_SUBSCRIPTION, // 0x13
EDIT_BOOK, // 0x13 EDIT_BOOK, // 0x14
ENTITY_NBT_REQUEST, // 0x14 ENTITY_NBT_REQUEST, // 0x15
INTERACT_ENTITY, // 0x15 INTERACT_ENTITY, // 0x16
GENERATE_JIGSAW, // 0x16 GENERATE_JIGSAW, // 0x17
KEEP_ALIVE, // 0x17 KEEP_ALIVE, // 0x18
LOCK_DIFFICULTY, // 0x18 LOCK_DIFFICULTY, // 0x19
PLAYER_POSITION, // 0x19 PLAYER_POSITION, // 0x1A
PLAYER_POSITION_AND_ROTATION, // 0x1A PLAYER_POSITION_AND_ROTATION, // 0x1B
PLAYER_ROTATION, // 0x1B PLAYER_ROTATION, // 0x1C
PLAYER_MOVEMENT, // 0x1C PLAYER_MOVEMENT, // 0x1D
VEHICLE_MOVE, // 0x1D VEHICLE_MOVE, // 0x1E
STEER_BOAT, // 0x1E STEER_BOAT, // 0x1F
PICK_ITEM, // 0x1F PICK_ITEM, // 0x20
PING_REQUEST, // 0x20 PING_REQUEST, // 0x21
CRAFT_RECIPE_REQUEST, // 0x21 CRAFT_RECIPE_REQUEST, // 0x22
PLAYER_ABILITIES, // 0x22 PLAYER_ABILITIES, // 0x23
PLAYER_DIGGING, // 0x23 PLAYER_DIGGING, // 0x24
ENTITY_ACTION, // 0x24 ENTITY_ACTION, // 0x25
STEER_VEHICLE, // 0x25 STEER_VEHICLE, // 0x26
PONG, // 0x26 PONG, // 0x27
RECIPE_BOOK_DATA, // 0x27 RECIPE_BOOK_DATA, // 0x28
SEEN_RECIPE, // 0x28 SEEN_RECIPE, // 0x29
RENAME_ITEM, // 0x29 RENAME_ITEM, // 0x2A
RESOURCE_PACK_STATUS, // 0x2A RESOURCE_PACK_STATUS, // 0x2B
ADVANCEMENT_TAB, // 0x2B ADVANCEMENT_TAB, // 0x2C
SELECT_TRADE, // 0x2C SELECT_TRADE, // 0x2D
SET_BEACON_EFFECT, // 0x2D SET_BEACON_EFFECT, // 0x2E
HELD_ITEM_CHANGE, // 0x2E HELD_ITEM_CHANGE, // 0x2F
UPDATE_COMMAND_BLOCK, // 0x2F UPDATE_COMMAND_BLOCK, // 0x30
UPDATE_COMMAND_BLOCK_MINECART, // 0x30 UPDATE_COMMAND_BLOCK_MINECART, // 0x31
CREATIVE_INVENTORY_ACTION, // 0x31 CREATIVE_INVENTORY_ACTION, // 0x32
UPDATE_JIGSAW_BLOCK, // 0x32 UPDATE_JIGSAW_BLOCK, // 0x33
UPDATE_STRUCTURE_BLOCK, // 0x33 UPDATE_STRUCTURE_BLOCK, // 0x34
UPDATE_SIGN, // 0x34 UPDATE_SIGN, // 0x35
ANIMATION, // 0x35 ANIMATION, // 0x36
SPECTATE, // 0x36 SPECTATE, // 0x37
PLAYER_BLOCK_PLACEMENT, // 0x37 PLAYER_BLOCK_PLACEMENT, // 0x38
USE_ITEM; // 0x38 USE_ITEM; // 0x39
@Override @Override
public int getId() { public int getId() {

4
common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
Datei anzeigen

@ -94,7 +94,7 @@ public final class ComponentUtil {
public static @Nullable String tagToJsonString(@Nullable final Tag tag) { public static @Nullable String tagToJsonString(@Nullable final Tag tag) {
try { try {
final ATextComponent component = TextComponentCodec.V1_20_3.deserializeNbtTree(tag); final ATextComponent component = SerializerVersion.V1_20_3.toComponent(tag);
return component != null ? SerializerVersion.V1_20_3.jsonSerializer.serialize(component) : null; return component != null ? SerializerVersion.V1_20_3.jsonSerializer.serialize(component) : null;
} catch (final Exception e) { } catch (final Exception e) {
Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting tag: " + tag, e); Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting tag: " + tag, e);
@ -109,7 +109,7 @@ public final class ComponentUtil {
try { try {
final ATextComponent component = TextComponentSerializer.V1_20_3.deserialize(json); final ATextComponent component = TextComponentSerializer.V1_20_3.deserialize(json);
return TextComponentCodec.V1_20_3.serializeNbt(component); return SerializerVersion.V1_20_3.toTag(component);
} catch (final Exception e) { } catch (final Exception e) {
Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting component: " + json, e); Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting component: " + json, e);
return new StringTag("<error>"); return new StringTag("<error>");

2
gradle.properties
Datei anzeigen

@ -1,5 +1,5 @@
# Project properties - we put these here so they can be modified without causing a recompile of the build scripts # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
projectVersion=4.10.0-24w13a-SNAPSHOT projectVersion=4.10.0-24w14a-SNAPSHOT
# Smile emoji # Smile emoji
mcVersions=1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9 mcVersions=1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9