Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

23w46a (probably)

This commit is contained in:
Nassim Jahnke 2023-11-19 16:13:04 +01:00
parent dbf4271c9d
commit 07b173bb74
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
6 changed files with 81 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
View File

@ -85,7 +85,7 @@ public class ProtocolVersion {
public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new VersionRange("1.20", 0, 1));
public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
public static final ProtocolVersion v1_20_3 = register(765, 162, "1.20.3");
public static final ProtocolVersion v1_20_3 = register(765, 163, "1.20.3");
public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
public static ProtocolVersion register(int version, String name) {

36
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
View File

@ -52,6 +52,7 @@ import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
import com.viaversion.viaversion.api.type.types.version.Types1_20_3;
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.CommandRewriter1_19_4;
import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2;
import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2;
import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2;
@ -103,6 +104,34 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
soundRewriter.registerSound(ClientboundPackets1_20_2.ENTITY_SOUND);
new StatisticsRewriter<>(this).register(ClientboundPackets1_20_2.STATISTICS);
new CommandRewriter1_19_4<>(this).registerDeclareCommands1_19(ClientboundPackets1_20_2.DECLARE_COMMANDS);
registerClientbound(ClientboundPackets1_20_2.UPDATE_SCORE, wrapper -> {
wrapper.passthrough(Type.STRING); // Owner
final byte action = wrapper.read(Type.BYTE);
wrapper.passthrough(Type.STRING); // Objective name
// Write or pass through value
if (action != -1) {
wrapper.passthrough(Type.VAR_INT);
} else {
wrapper.write(Type.VAR_INT, 0);
}
// Null display and number format
wrapper.write(Type.OPTIONAL_TAG, null);
wrapper.write(Type.BOOLEAN, false);
});
registerClientbound(ClientboundPackets1_20_2.SCOREBOARD_OBJECTIVE, wrapper -> {
wrapper.passthrough(Type.STRING); // Objective Name
final byte action = wrapper.passthrough(Type.BYTE); // Method
if (action == 0 || action == 2) {
convertComponent(wrapper); // Display Name
wrapper.passthrough(Type.VAR_INT); // Render type
wrapper.write(Type.BOOLEAN, false); // Null number format
}
});
registerServerbound(ServerboundPackets1_20_3.UPDATE_JIGSAW_BLOCK, wrapper -> {
wrapper.passthrough(Type.POSITION1_14); // Position
@ -210,13 +239,6 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
convertComponent(wrapper); // Sender
convertOptionalComponent(wrapper); // Target
});
registerClientbound(ClientboundPackets1_20_2.SCOREBOARD_OBJECTIVE, wrapper -> {
wrapper.passthrough(Type.STRING); // Objective Name
final byte action = wrapper.passthrough(Type.BYTE); // Mode
if (action == 0 || action == 2) {
convertComponent(wrapper); // Display Name
}
});
registerClientbound(ClientboundPackets1_20_2.TEAMS, wrapper -> {
wrapper.passthrough(Type.STRING); // Team Name
final byte action = wrapper.passthrough(Type.BYTE); // Mode

99
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPackets1_20_3.java
View File

@ -87,55 +87,56 @@ public enum ClientboundPackets1_20_3 implements ClientboundPacketType {
UNLOCK_RECIPES, // 0x3F
REMOVE_ENTITIES, // 0x40
REMOVE_ENTITY_EFFECT, // 0x41
RESOURCE_PACK, // 0x42
RESPAWN, // 0x43
ENTITY_HEAD_LOOK, // 0x44
MULTI_BLOCK_CHANGE, // 0x45
SELECT_ADVANCEMENTS_TAB, // 0x46
SERVER_DATA, // 0x47
ACTIONBAR, // 0x48
WORLD_BORDER_CENTER, // 0x49
WORLD_BORDER_LERP_SIZE, // 0x4A
WORLD_BORDER_SIZE, // 0x4B
WORLD_BORDER_WARNING_DELAY, // 0x4C
WORLD_BORDER_WARNING_DISTANCE, // 0x4D
CAMERA, // 0x4E
HELD_ITEM_CHANGE, // 0x4F
UPDATE_VIEW_POSITION, // 0x50
UPDATE_VIEW_DISTANCE, // 0x51
SPAWN_POSITION, // 0x52
DISPLAY_SCOREBOARD, // 0x53
ENTITY_METADATA, // 0x54
ATTACH_ENTITY, // 0x55
ENTITY_VELOCITY, // 0x56
ENTITY_EQUIPMENT, // 0x57
SET_EXPERIENCE, // 0x58
UPDATE_HEALTH, // 0x59
SCOREBOARD_OBJECTIVE, // 0x5A
SET_PASSENGERS, // 0x5B
TEAMS, // 0x5C
UPDATE_SCORE, // 0x5D
SET_SIMULATION_DISTANCE, // 0x5E
TITLE_SUBTITLE, // 0x5F
TIME_UPDATE, // 0x60
TITLE_TEXT, // 0x61
TITLE_TIMES, // 0x62
ENTITY_SOUND, // 0x63
SOUND, // 0x64
START_CONFIGURATION, // 0x65
STOP_SOUND, // 0x66
SYSTEM_CHAT, // 0x67
TAB_LIST, // 0x68
NBT_QUERY, // 0x69
COLLECT_ITEM, // 0x6A
ENTITY_TELEPORT, // 0x6B
TICKING_STATE,// 0x6C
TICKING_STEP, // 0x6D
ADVANCEMENTS, // 0x6E
ENTITY_PROPERTIES, // 0x6F
ENTITY_EFFECT, // 0x70
DECLARE_RECIPES, // 0x71
TAGS; // 0x72
RESET_SCORE, // 0x42
RESOURCE_PACK, // 0x43
RESPAWN, // 0x44
ENTITY_HEAD_LOOK, // 0x45
MULTI_BLOCK_CHANGE, // 0x46
SELECT_ADVANCEMENTS_TAB, // 0x47
SERVER_DATA, // 0x48
ACTIONBAR, // 0x49
WORLD_BORDER_CENTER, // 0x4A
WORLD_BORDER_LERP_SIZE, // 0x4B
WORLD_BORDER_SIZE, // 0x4C
WORLD_BORDER_WARNING_DELAY, // 0x4D
WORLD_BORDER_WARNING_DISTANCE, // 0x4E
CAMERA, // 0x4F
HELD_ITEM_CHANGE, // 0x50
UPDATE_VIEW_POSITION, // 0x51
UPDATE_VIEW_DISTANCE, // 0x52
SPAWN_POSITION, // 0x53
DISPLAY_SCOREBOARD, // 0x54
ENTITY_METADATA, // 0x55
ATTACH_ENTITY, // 0x56
ENTITY_VELOCITY, // 0x57
ENTITY_EQUIPMENT, // 0x58
SET_EXPERIENCE, // 0x59
UPDATE_HEALTH, // 0x5A
SCOREBOARD_OBJECTIVE, // 0x5B
SET_PASSENGERS, // 0x5C
TEAMS, // 0x5D
UPDATE_SCORE, // 0x5E
SET_SIMULATION_DISTANCE, // 0x5F
TITLE_SUBTITLE, // 0x60
TIME_UPDATE, // 0x61
TITLE_TEXT, // 0x62
TITLE_TIMES, // 0x63
ENTITY_SOUND, // 0x64
SOUND, // 0x65
START_CONFIGURATION, // 0x66
STOP_SOUND, // 0x67
SYSTEM_CHAT, // 0x68
TAB_LIST, // 0x69
NBT_QUERY, // 0x6A
COLLECT_ITEM, // 0x6B
ENTITY_TELEPORT, // 0x6C
TICKING_STATE, // 0x6D
TICKING_STEP, // 0x6E
ADVANCEMENTS, // 0x6F
ENTITY_PROPERTIES, // 0x70
ENTITY_EFFECT, // 0x71
DECLARE_RECIPES, // 0x72
TAGS; // 0x73
@Override
public int getId() {

BIN
common/src/main/resources/assets/viaversion/data/identifiers-1.20.3.nbt
View File

Binary file not shown.

BIN
common/src/main/resources/assets/viaversion/data/mappings-1.20.2to1.20.3.nbt
View File

Binary file not shown.

2
gradle.properties
View File

@ -1,5 +1,5 @@
# Project properties - we put these here so they can be modified without causing a recompile of the build scripts
projectVersion=4.9.0-23w45a-SNAPSHOT
projectVersion=4.9.0-23w46a-SNAPSHOT
# Smile emoji
mcVersions=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