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

24w06a

This commit is contained in:
Nassim Jahnke 2024-02-07 18:29:19 +01:00
parent 0fcb764652
commit 4a8bd2cca2
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
17 changed files with 187 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryEntry.java
View File

@ -23,12 +23,13 @@
package com.viaversion.viaversion.api.minecraft; package com.viaversion.viaversion.api.minecraft;
import com.github.steveice10.opennbt.tag.builtin.Tag; import com.github.steveice10.opennbt.tag.builtin.Tag;
import org.checkerframework.checker.nullness.qual.Nullable;
public final class RegistryEntry { public final class RegistryEntry {
private final String key; private final String key;
private final Tag tag; private final Tag tag;
public RegistryEntry(String key, Tag tag) { public RegistryEntry(String key, @Nullable Tag tag) {
this.key = key; this.key = key;
this.tag = tag; this.tag = tag;
} }
@ -37,11 +38,11 @@ public final class RegistryEntry {
return key; return key;
} }
public Tag tag() { public @Nullable Tag tag() {
return tag; return tag;
} }
public RegistryEntry withKey(final String key) { public RegistryEntry withKey(final String key) {
return new RegistryEntry(key, tag.copy()); return new RegistryEntry(key, tag != null ? tag.copy() : null);
} }
} }

6
api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_5.java
View File

@ -100,7 +100,7 @@ public enum EntityTypes1_20_5 implements EntityType {
DONKEY(CHESTED_HORSE), DONKEY(CHESTED_HORSE),
MULE(CHESTED_HORSE), MULE(CHESTED_HORSE),
LLAMA(CHESTED_HORSE), LLAMA(CHESTED_HORSE),
TRADER_LLAMA(CHESTED_HORSE), TRADER_LLAMA(LLAMA),
HORSE(ABSTRACT_HORSE), HORSE(ABSTRACT_HORSE),
SKELETON_HORSE(ABSTRACT_HORSE), SKELETON_HORSE(ABSTRACT_HORSE),
ZOMBIE_HORSE(ABSTRACT_HORSE), ZOMBIE_HORSE(ABSTRACT_HORSE),
@ -220,7 +220,9 @@ public enum EntityTypes1_20_5 implements EntityType {
EGG(PROJECTILE_ABSTRACT), EGG(PROJECTILE_ABSTRACT),
POTION(PROJECTILE_ABSTRACT), POTION(PROJECTILE_ABSTRACT),
EXPERIENCE_BOTTLE(PROJECTILE_ABSTRACT), EXPERIENCE_BOTTLE(PROJECTILE_ABSTRACT),
WIND_CHARGE(PROJECTILE_ABSTRACT), ABSTRACT_WIND_CHARGE(PROJECTILE_ABSTRACT, null),
WIND_CHARGE(ABSTRACT_WIND_CHARGE),
BREEZE_WIND_CHARGE(ABSTRACT_WIND_CHARGE),
// Vehicles // Vehicles
MINECART_ABSTRACT(ENTITY, null), MINECART_ABSTRACT(ENTITY, null),

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

@ -86,7 +86,7 @@ public class ProtocolVersion {
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 = 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_2 = register(764, "1.20.2");
public static final ProtocolVersion v1_20_3 = register(765, "1.20.3/1.20.4", new VersionRange("1.20", 3, 4)); public static final ProtocolVersion v1_20_3 = register(765, "1.20.3/1.20.4", new VersionRange("1.20", 3, 4));
public static final ProtocolVersion v1_20_5 = register(766, 175, "1.20.5"); public static final ProtocolVersion v1_20_5 = register(766, 176, "1.20.5");
public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
public static ProtocolVersion register(int version, String name) { public static ProtocolVersion register(int version, String name) {

4
api/src/main/java/com/viaversion/viaversion/api/type/types/RegistryEntryType.java
View File

@ -34,12 +34,12 @@ public class RegistryEntryType extends Type<RegistryEntry> {
@Override @Override
public RegistryEntry read(final ByteBuf buffer) throws Exception { public RegistryEntry read(final ByteBuf buffer) throws Exception {
return new RegistryEntry(Type.STRING.read(buffer), Type.TAG.read(buffer)); return new RegistryEntry(Type.STRING.read(buffer), Type.OPTIONAL_TAG.read(buffer));
} }
@Override @Override
public void write(final ByteBuf buffer, final RegistryEntry entry) throws Exception { public void write(final ByteBuf buffer, final RegistryEntry entry) throws Exception {
Type.STRING.write(buffer, entry.key()); Type.STRING.write(buffer, entry.key());
Type.TAG.write(buffer, entry.tag()); Type.OPTIONAL_TAG.write(buffer, entry.tag());
} }
} }

4
api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_5.java
View File

@ -27,11 +27,13 @@ import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_20_5;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.metadata.MetaListType; import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
import com.viaversion.viaversion.api.type.types.metadata.MetadataType; import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
import java.util.List; import java.util.List;
public final class Types1_20_5 { public final class Types1_20_5 {
public static final MetaTypes1_20_5 META_TYPES = new MetaTypes1_20_5(Types1_20_3.PARTICLE); public static final ParticleType PARTICLE = new ParticleType(); // Only safe to use after protocol loading
public static final MetaTypes1_20_5 META_TYPES = new MetaTypes1_20_5(PARTICLE);
public static final Type<Metadata> METADATA = new MetadataType(META_TYPES); public static final Type<Metadata> METADATA = new MetadataType(META_TYPES);
public static final Type<List<Metadata>> METADATA_LIST = new MetaListType(METADATA); public static final Type<List<Metadata>> METADATA_LIST = new MetaListType(METADATA);
} }

9
common/src/main/java/com/viaversion/viaversion/data/entity/TrackedEntityImpl.java
View File

@ -57,4 +57,13 @@ public final class TrackedEntityImpl implements TrackedEntity {
public void sentMetadata(final boolean sentMetadata) { public void sentMetadata(final boolean sentMetadata) {
this.sentMetadata = sentMetadata; this.sentMetadata = sentMetadata;
} }
@Override
public String toString() {
return "TrackedEntityImpl{" +
"entityType=" + entityType +
", data=" + data +
", sentMetadata=" + sentMetadata +
'}';
}
} }

13
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
View File

@ -26,6 +26,8 @@ import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider; import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider; import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.data.entity.EntityTrackerBase;
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
@ -86,6 +88,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
cancelServerbound(State.LOGIN, ServerboundLoginPackets.COOKIE_RESPONSE.getId()); cancelServerbound(State.LOGIN, ServerboundLoginPackets.COOKIE_RESPONSE.getId());
cancelServerbound(ServerboundConfigurationPackets1_20_5.COOKIE_RESPONSE); cancelServerbound(ServerboundConfigurationPackets1_20_5.COOKIE_RESPONSE);
cancelServerbound(ServerboundConfigurationPackets1_20_5.SELECT_KNOWN_PACKS);
cancelServerbound(ServerboundPackets1_20_5.COOKIE_RESPONSE); cancelServerbound(ServerboundPackets1_20_5.COOKIE_RESPONSE);
cancelServerbound(ServerboundPackets1_20_5.DEBUG_SAMPLE_SUBSCRIPTION); cancelServerbound(ServerboundPackets1_20_5.DEBUG_SAMPLE_SUBSCRIPTION);
} }
@ -95,6 +98,16 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
super.onMappingDataLoaded(); super.onMappingDataLoaded();
EntityTypes1_20_5.initialize(this); EntityTypes1_20_5.initialize(this);
Types1_20_5.PARTICLE.filler(this)
.reader("block", ParticleType.Readers.BLOCK)
.reader("block_marker", ParticleType.Readers.BLOCK)
.reader("dust", ParticleType.Readers.DUST)
.reader("falling_dust", ParticleType.Readers.BLOCK)
.reader("dust_color_transition", ParticleType.Readers.DUST_TRANSITION)
.reader("item", ParticleType.Readers.ITEM1_20_2)
.reader("vibration", ParticleType.Readers.VIBRATION1_20_3)
.reader("sculk_charge", ParticleType.Readers.SCULK_CHARGE)
.reader("shriek", ParticleType.Readers.SHRIEK);
} }
@Override @Override

3
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundConfigurationPackets1_20_5.java
View File

@ -33,7 +33,8 @@ public enum ClientboundConfigurationPackets1_20_5 implements ClientboundPacket1_
STORE_COOKIE, // 0x09 STORE_COOKIE, // 0x09
TRANSFER, // 0x0A TRANSFER, // 0x0A
UPDATE_ENABLED_FEATURES, // 0x0B UPDATE_ENABLED_FEATURES, // 0x0B
UPDATE_TAGS; // 0x0C UPDATE_TAGS, // 0x0C
SELECT_KNOWN_PACKS; // 0x0D
@Override @Override
public int getId() { public int getId() {

186
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java
View File

@ -47,99 +47,99 @@ public enum ClientboundPackets1_20_5 implements ClientboundPacket1_20_5 {
PLUGIN_MESSAGE, // 0x19 PLUGIN_MESSAGE, // 0x19
DAMAGE_EVENT, // 0x1A DAMAGE_EVENT, // 0x1A
DEBUG_SAMPLE, // 0x1B DEBUG_SAMPLE, // 0x1B
DELETE_CHAT_MESSAGE, // 0x1B DELETE_CHAT_MESSAGE, // 0x1C
DISCONNECT, // 0x1C DISCONNECT, // 0x1D
DISGUISED_CHAT, // 0x1D DISGUISED_CHAT, // 0x1E
ENTITY_STATUS, // 0x1E ENTITY_STATUS, // 0x1F
EXPLOSION, // 0x1F EXPLOSION, // 0x20
UNLOAD_CHUNK, // 0x20 UNLOAD_CHUNK, // 0x21
GAME_EVENT, // 0x21 GAME_EVENT, // 0x22
OPEN_HORSE_WINDOW, // 0x22 OPEN_HORSE_WINDOW, // 0x23
HIT_ANIMATION, // 0x23 HIT_ANIMATION, // 0x24
WORLD_BORDER_INIT, // 0x24 WORLD_BORDER_INIT, // 0x25
KEEP_ALIVE, // 0x25 KEEP_ALIVE, // 0x26
CHUNK_DATA, // 0x26 CHUNK_DATA, // 0x27
EFFECT, // 0x27 EFFECT, // 0x28
SPAWN_PARTICLE, // 0x28 SPAWN_PARTICLE, // 0x29
UPDATE_LIGHT, // 0x29 UPDATE_LIGHT, // 0x2A
JOIN_GAME, // 0x2A JOIN_GAME, // 0x2B
MAP_DATA, // 0x2B MAP_DATA, // 0x2C
TRADE_LIST, // 0x2C TRADE_LIST, // 0x2D
ENTITY_POSITION, // 0x2D ENTITY_POSITION, // 0x2E
ENTITY_POSITION_AND_ROTATION, // 0x2E ENTITY_POSITION_AND_ROTATION, // 0x2F
ENTITY_ROTATION, // 0x2F ENTITY_ROTATION, // 0x30
VEHICLE_MOVE, // 0x30 VEHICLE_MOVE, // 0x31
OPEN_BOOK, // 0x31 OPEN_BOOK, // 0x32
OPEN_WINDOW, // 0x32 OPEN_WINDOW, // 0x33
OPEN_SIGN_EDITOR, // 0x33 OPEN_SIGN_EDITOR, // 0x34
PING, // 0x34 PING, // 0x35
PONG_RESPONSE, // 0x35 PONG_RESPONSE, // 0x36
CRAFT_RECIPE_RESPONSE, // 0x36 CRAFT_RECIPE_RESPONSE, // 0x37
PLAYER_ABILITIES, // 0x37 PLAYER_ABILITIES, // 0x38
PLAYER_CHAT, // 0x38 PLAYER_CHAT, // 0x39
COMBAT_END, // 0x39 COMBAT_END, // 0x3A
COMBAT_ENTER, // 0x3A COMBAT_ENTER, // 0x3B
COMBAT_KILL, // 0x3B COMBAT_KILL, // 0x3C
PLAYER_INFO_REMOVE, // 0x3C PLAYER_INFO_REMOVE, // 0x3D
PLAYER_INFO_UPDATE, // 0x3D PLAYER_INFO_UPDATE, // 0x3E
FACE_PLAYER, // 0x3E FACE_PLAYER, // 0x3F
PLAYER_POSITION, // 0x3F PLAYER_POSITION, // 0x40
UNLOCK_RECIPES, // 0x40 UNLOCK_RECIPES, // 0x41
REMOVE_ENTITIES, // 0x41 REMOVE_ENTITIES, // 0x42
REMOVE_ENTITY_EFFECT, // 0x42 REMOVE_ENTITY_EFFECT, // 0x43
RESET_SCORE, // 0x43 RESET_SCORE, // 0x44
RESOURCE_PACK_POP, // 0x44 RESOURCE_PACK_POP, // 0x45
RESOURCE_PACK_PUSH, // 0x45 RESOURCE_PACK_PUSH, // 0x46
RESPAWN, // 0x46 RESPAWN, // 0x47
ENTITY_HEAD_LOOK, // 0x47 ENTITY_HEAD_LOOK, // 0x48
MULTI_BLOCK_CHANGE, // 0x48 MULTI_BLOCK_CHANGE, // 0x49
SELECT_ADVANCEMENTS_TAB, // 0x49 SELECT_ADVANCEMENTS_TAB, // 0x4A
SERVER_DATA, // 0x4A SERVER_DATA, // 0x4B
ACTIONBAR, // 0x4B ACTIONBAR, // 0x4C
WORLD_BORDER_CENTER, // 0x4C WORLD_BORDER_CENTER, // 0x4D
WORLD_BORDER_LERP_SIZE, // 0x4D WORLD_BORDER_LERP_SIZE, // 0x4E
WORLD_BORDER_SIZE, // 0x4E WORLD_BORDER_SIZE, // 0x4F
WORLD_BORDER_WARNING_DELAY, // 0x4F WORLD_BORDER_WARNING_DELAY, // 0x50
WORLD_BORDER_WARNING_DISTANCE, // 0x50 WORLD_BORDER_WARNING_DISTANCE, // 0x51
CAMERA, // 0x51 CAMERA, // 0x52
HELD_ITEM_CHANGE, // 0x52 HELD_ITEM_CHANGE, // 0x53
UPDATE_VIEW_POSITION, // 0x53 UPDATE_VIEW_POSITION, // 0x54
UPDATE_VIEW_DISTANCE, // 0x54 UPDATE_VIEW_DISTANCE, // 0x55
SPAWN_POSITION, // 0x55 SPAWN_POSITION, // 0x56
DISPLAY_SCOREBOARD, // 0x56 DISPLAY_SCOREBOARD, // 0x57
ENTITY_METADATA, // 0x57 ENTITY_METADATA, // 0x58
ATTACH_ENTITY, // 0x58 ATTACH_ENTITY, // 0x59
ENTITY_VELOCITY, // 0x59 ENTITY_VELOCITY, // 0x5A
ENTITY_EQUIPMENT, // 0x5A ENTITY_EQUIPMENT, // 0x5B
SET_EXPERIENCE, // 0x5B SET_EXPERIENCE, // 0x5C
UPDATE_HEALTH, // 0x5C UPDATE_HEALTH, // 0x5D
SCOREBOARD_OBJECTIVE, // 0x5D SCOREBOARD_OBJECTIVE, // 0x5E
SET_PASSENGERS, // 0x5E SET_PASSENGERS, // 0x5F
TEAMS, // 0x5F TEAMS, // 0x60
UPDATE_SCORE, // 0x60 UPDATE_SCORE, // 0x61
SET_SIMULATION_DISTANCE, // 0x61 SET_SIMULATION_DISTANCE, // 0x62
TITLE_SUBTITLE, // 0x62 TITLE_SUBTITLE, // 0x63
TIME_UPDATE, // 0x63 TIME_UPDATE, // 0x64
TITLE_TEXT, // 0x64 TITLE_TEXT, // 0x65
TITLE_TIMES, // 0x65 TITLE_TIMES, // 0x66
ENTITY_SOUND, // 0x66 ENTITY_SOUND, // 0x67
SOUND, // 0x67 SOUND, // 0x68
START_CONFIGURATION, // 0x68 START_CONFIGURATION, // 0x69
STOP_SOUND, // 0x69 STOP_SOUND, // 0x6A
STORE_COOKIE, // 0x6A STORE_COOKIE, // 0x6B
SYSTEM_CHAT, // 0x6B SYSTEM_CHAT, // 0x6C
TAB_LIST, // 0x6C TAB_LIST, // 0x6D
NBT_QUERY, // 0x6D NBT_QUERY, // 0x6E
COLLECT_ITEM, // 0x6E COLLECT_ITEM, // 0x6F
ENTITY_TELEPORT, // 0x6F ENTITY_TELEPORT, // 0x70
TICKING_STATE, // 0x70 TICKING_STATE, // 0x71
TICKING_STEP, // 0x71 TICKING_STEP, // 0x72
TRANSFER, // 0x72 TRANSFER, // 0x73
ADVANCEMENTS, // 0x73 ADVANCEMENTS, // 0x74
ENTITY_PROPERTIES, // 0x74 ENTITY_PROPERTIES, // 0x75
ENTITY_EFFECT, // 0x75 ENTITY_EFFECT, // 0x76
DECLARE_RECIPES, // 0x76 DECLARE_RECIPES, // 0x77
TAGS; // 0x77 TAGS; // 0x78
@Override @Override
public int getId() { public int getId() {

3
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundConfigurationPackets1_20_5.java
View File

@ -27,7 +27,8 @@ public enum ServerboundConfigurationPackets1_20_5 implements ServerboundPacket1_
FINISH_CONFIGURATION, // 0x03 FINISH_CONFIGURATION, // 0x03
KEEP_ALIVE, // 0x04 KEEP_ALIVE, // 0x04
PONG, // 0x05 PONG, // 0x05
RESOURCE_PACK; // 0x06 RESOURCE_PACK, // 0x06
SELECT_KNOWN_PACKS; // 0x07
@Override @Override
public int getId() { public int getId() {

76
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java
View File

@ -38,44 +38,44 @@ public enum ServerboundPackets1_20_5 implements ServerboundPacket1_20_5 {
COOKIE_RESPONSE, // 0x10 COOKIE_RESPONSE, // 0x10
PLUGIN_MESSAGE, // 0x11 PLUGIN_MESSAGE, // 0x11
DEBUG_SAMPLE_SUBSCRIPTION, // 0x12 DEBUG_SAMPLE_SUBSCRIPTION, // 0x12
EDIT_BOOK, // 0x12 EDIT_BOOK, // 0x13
ENTITY_NBT_REQUEST, // 0x13 ENTITY_NBT_REQUEST, // 0x14
INTERACT_ENTITY, // 0x14 INTERACT_ENTITY, // 0x15
GENERATE_JIGSAW, // 0x15 GENERATE_JIGSAW, // 0x16
KEEP_ALIVE, // 0x16 KEEP_ALIVE, // 0x17
LOCK_DIFFICULTY, // 0x17 LOCK_DIFFICULTY, // 0x18
PLAYER_POSITION, // 0x18 PLAYER_POSITION, // 0x19
PLAYER_POSITION_AND_ROTATION, // 0x19 PLAYER_POSITION_AND_ROTATION, // 0x1A
PLAYER_ROTATION, // 0x1A PLAYER_ROTATION, // 0x1B
PLAYER_MOVEMENT, // 0x1B PLAYER_MOVEMENT, // 0x1C
VEHICLE_MOVE, // 0x1C VEHICLE_MOVE, // 0x1D
STEER_BOAT, // 0x1D STEER_BOAT, // 0x1E
PICK_ITEM, // 0x1E PICK_ITEM, // 0x1F
PING_REQUEST, // 0x1F PING_REQUEST, // 0x20
CRAFT_RECIPE_REQUEST, // 0x20 CRAFT_RECIPE_REQUEST, // 0x21
PLAYER_ABILITIES, // 0x21 PLAYER_ABILITIES, // 0x22
PLAYER_DIGGING, // 0x22 PLAYER_DIGGING, // 0x23
ENTITY_ACTION, // 0x23 ENTITY_ACTION, // 0x24
STEER_VEHICLE, // 0x24 STEER_VEHICLE, // 0x25
PONG, // 0x25 PONG, // 0x26
RECIPE_BOOK_DATA, // 0x26 RECIPE_BOOK_DATA, // 0x27
SEEN_RECIPE, // 0x27 SEEN_RECIPE, // 0x28
RENAME_ITEM, // 0x28 RENAME_ITEM, // 0x29
RESOURCE_PACK_STATUS, // 0x29 RESOURCE_PACK_STATUS, // 0x2A
ADVANCEMENT_TAB, // 0x2A ADVANCEMENT_TAB, // 0x2B
SELECT_TRADE, // 0x2B SELECT_TRADE, // 0x2C
SET_BEACON_EFFECT, // 0x2C SET_BEACON_EFFECT, // 0x2D
HELD_ITEM_CHANGE, // 0x2D HELD_ITEM_CHANGE, // 0x2E
UPDATE_COMMAND_BLOCK, // 0x2E UPDATE_COMMAND_BLOCK, // 0x2F
UPDATE_COMMAND_BLOCK_MINECART, // 0x2F UPDATE_COMMAND_BLOCK_MINECART, // 0x30
CREATIVE_INVENTORY_ACTION, // 0x30 CREATIVE_INVENTORY_ACTION, // 0x31
UPDATE_JIGSAW_BLOCK, // 0x31 UPDATE_JIGSAW_BLOCK, // 0x32
UPDATE_STRUCTURE_BLOCK, // 0x32 UPDATE_STRUCTURE_BLOCK, // 0x33
UPDATE_SIGN, // 0x33 UPDATE_SIGN, // 0x34
ANIMATION, // 0x34 ANIMATION, // 0x35
SPECTATE, // 0x35 SPECTATE, // 0x36
PLAYER_BLOCK_PLACEMENT, // 0x36 PLAYER_BLOCK_PLACEMENT, // 0x37
USE_ITEM; // 0x37 USE_ITEM; // 0x38
@Override @Override
public int getId() { public int getId() {

9
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
View File

@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
import com.viaversion.viaversion.api.type.types.version.Types1_20_3; import com.viaversion.viaversion.api.type.types.version.Types1_20_3;
import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3;
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3;
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3;
@ -90,7 +91,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
particle.add(Type.ITEM1_20_2, item); particle.add(Type.ITEM1_20_2, item);
} }
wrapper.write(Types1_20_3.PARTICLE, particle); wrapper.write(Types1_20_5.PARTICLE, particle);
}); });
protocol.registerClientbound(ClientboundPackets1_20_3.EXPLOSION, wrapper -> { protocol.registerClientbound(ClientboundPackets1_20_3.EXPLOSION, wrapper -> {
@ -109,10 +110,8 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
wrapper.passthrough(Type.FLOAT); // Knockback Z wrapper.passthrough(Type.FLOAT); // Knockback Z
wrapper.passthrough(Type.VAR_INT); // Block interaction type wrapper.passthrough(Type.VAR_INT); // Block interaction type
final Particle smallExplosionParticle = wrapper.passthrough(Types1_20_3.PARTICLE); protocol.getEntityRewriter().rewriteParticle(wrapper, Types1_20_3.PARTICLE, Types1_20_5.PARTICLE); // Small explosion particle
final Particle largeExplosionParticle = wrapper.passthrough(Types1_20_3.PARTICLE); protocol.getEntityRewriter().rewriteParticle(wrapper, Types1_20_3.PARTICLE, Types1_20_5.PARTICLE); // Large explosion particle
protocol.getEntityRewriter().rewriteParticle(smallExplosionParticle);
protocol.getEntityRewriter().rewriteParticle(largeExplosionParticle);
wrapper.write(Type.VAR_INT, 0); // "Empty" registry id to instead use the resource location that follows after wrapper.write(Type.VAR_INT, 0); // "Empty" registry id to instead use the resource location that follows after
}); });

4
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
View File

@ -56,6 +56,10 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
registerRemoveEntities(ClientboundPackets1_20_3.REMOVE_ENTITIES); registerRemoveEntities(ClientboundPackets1_20_3.REMOVE_ENTITIES);
protocol.registerClientbound(ClientboundConfigurationPackets1_20_3.REGISTRY_DATA, wrapper -> { protocol.registerClientbound(ClientboundConfigurationPackets1_20_3.REGISTRY_DATA, wrapper -> {
final PacketWrapper knownPacksPacket = wrapper.create(ClientboundConfigurationPackets1_20_5.SELECT_KNOWN_PACKS);
knownPacksPacket.write(Type.VAR_INT, 0); // No known packs, everything is sent here
knownPacksPacket.send(Protocol1_20_5To1_20_3.class);
final CompoundTag registryData = wrapper.read(Type.COMPOUND_TAG); final CompoundTag registryData = wrapper.read(Type.COMPOUND_TAG);
cacheDimensionData(wrapper.user(), registryData); cacheDimensionData(wrapper.user(), registryData);
trackBiomeSize(wrapper.user(), registryData); trackBiomeSize(wrapper.user(), registryData);

7
common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
View File

@ -39,6 +39,7 @@ import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.Protocol;
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
import com.viaversion.viaversion.api.rewriter.RewriterBase; import com.viaversion.viaversion.api.rewriter.RewriterBase;
@ -595,6 +596,12 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
particle.setId(protocol.getMappingData().getNewParticleId(id)); particle.setId(protocol.getMappingData().getNewParticleId(id));
} }
public void rewriteParticle(PacketWrapper wrapper, Type<Particle> from, Type<Particle> to) throws Exception {
final Particle particle = wrapper.read(from);
rewriteParticle(particle);
wrapper.write(to, particle);
}
private void logException(Exception e, @Nullable EntityType type, List<Metadata> metadataList, Metadata metadata) { private void logException(Exception e, @Nullable EntityType type, List<Metadata> metadataList, Metadata metadata) {
if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) { if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) {
Logger logger = Via.getPlatform().getLogger(); Logger logger = Via.getPlatform().getLogger();

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

Binary file not shown.

BIN
common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.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 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
projectVersion=4.10.0-24w05b-SNAPSHOT projectVersion=4.10.0-24w06a-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