Skip to content

Commit ae60e2f

Browse files
kennytvkennytv
committed
Update template protocol
1 parent 17a73df commit ae60e2f

File tree

4 files changed

+103
-102
lines changed

4 files changed

+103
-102
lines changed

‎common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
package com.viaversion.viaversion.protocols.template;
1919

2020
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
21-
import com.viaversion.viaversion.api.type.types.version.Types1_21;
22-
import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5;
23-
import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5;
24-
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPacket1_21;
25-
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_21;
21+
import com.viaversion.viaversion.api.type.types.version.Types1_21_4;
22+
import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPacket1_21_4;
23+
import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
24+
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
25+
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
2626
import com.viaversion.viaversion.rewriter.BlockRewriter;
2727
import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
2828
import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
2929

3030
// To replace if needed:
3131
// ChunkType1_20_2
32-
// RecipeRewriter1_20_3
33-
// Types1_21, Types1_OLD
34-
final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<ClientboundPacket1_21, ServerboundPacket1_20_5, Protocol1_99To_98> {
32+
// RecipeDisplayRewriter
33+
// Types1_21_4, Types1_OLD
34+
final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<ClientboundPacket1_21_2, ServerboundPacket1_21_4, Protocol1_99To_98> {
3535

3636
public BlockItemPacketRewriter1_99(final Protocol1_99To_98 protocol) {
37-
super(protocol, Types1_21.ITEM, Types1_21.ITEM_ARRAY);
37+
super(protocol, Types1_21_4.ITEM, Types1_21_4.ITEM_ARRAY);
3838
/*super(protocol,
39-
Types1_OLD.ITEM, Types1_OLD.ITEM_ARRAY, Types1_21.ITEM, Types1_21.ITEM_ARRAY,
40-
Types1_OLD.ITEM_COST, Types1_OLD.OPTIONAL_ITEM_COST, Types1_21.ITEM_COST, Types1_21.OPTIONAL_ITEM_COST
39+
Types1_OLD.ITEM, Types1_OLD.ITEM_ARRAY, Types1_21_4.ITEM, Types1_21_4.ITEM_ARRAY,
40+
Types1_OLD.ITEM_COST, Types1_OLD.OPTIONAL_ITEM_COST, Types1_21_4.ITEM_COST, Types1_21_4.OPTIONAL_ITEM_COST
4141
);*/
4242
}
4343

@@ -46,31 +46,32 @@ public void registerPackets() {
4646
// Register block and block state id changes
4747
// Other places using block state id mappings: Spawn particle, entity data, entity spawn (falling blocks)
4848
// Tags and statistics use block (!) ids
49-
final BlockRewriter<ClientboundPacket1_21> blockRewriter = BlockRewriter.for1_20_2(protocol);
50-
blockRewriter.registerBlockEvent(ClientboundPackets1_21.BLOCK_EVENT);
51-
blockRewriter.registerBlockUpdate(ClientboundPackets1_21.BLOCK_UPDATE);
52-
blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21.SECTION_BLOCKS_UPDATE);
53-
blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21.LEVEL_EVENT, 2001);
54-
blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
55-
blockRewriter.registerBlockEntityData(ClientboundPackets1_21.BLOCK_ENTITY_DATA);
49+
final BlockRewriter<ClientboundPacket1_21_2> blockRewriter = BlockRewriter.for1_20_2(protocol);
50+
blockRewriter.registerBlockEvent(ClientboundPackets1_21_2.BLOCK_EVENT);
51+
blockRewriter.registerBlockUpdate(ClientboundPackets1_21_2.BLOCK_UPDATE);
52+
blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_2.SECTION_BLOCKS_UPDATE);
53+
blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_2.LEVEL_EVENT, 2001);
54+
blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
55+
blockRewriter.registerBlockEntityData(ClientboundPackets1_21_2.BLOCK_ENTITY_DATA);
5656

5757
// Registers item id changes
5858
// Other places using item ids are: Entity data, tags, statistics, effect
59-
// registerOpenScreen(ClientboundPackets1_21.OPEN_SCREEN); If a new container type was added; also remove from the component rewriter registration
60-
//protocol.registerClientbound(ClientboundPackets1_21_2.SET_CURSOR_ITEM, this::passthroughClientboundItem);
61-
registerCooldown1_21_2(ClientboundPackets1_21.COOLDOWN);
62-
registerSetContent1_21_2(ClientboundPackets1_21.CONTAINER_SET_CONTENT);
63-
registerSetSlot1_21_2(ClientboundPackets1_21.CONTAINER_SET_SLOT);
64-
registerAdvancements1_20_3(ClientboundPackets1_21.UPDATE_ADVANCEMENTS);
65-
registerSetEquipment(ClientboundPackets1_21.SET_EQUIPMENT);
66-
registerContainerClick1_21_2(ServerboundPackets1_20_5.CONTAINER_CLICK);
67-
registerMerchantOffers1_20_5(ClientboundPackets1_21.MERCHANT_OFFERS);
68-
registerSetCreativeModeSlot(ServerboundPackets1_20_5.SET_CREATIVE_MODE_SLOT);
59+
// registerOpenScreen(ClientboundPackets1_21_2.OPEN_SCREEN); If a new container type was added; also remove from the component rewriter registration
60+
protocol.registerClientbound(ClientboundPackets1_21_2.SET_CURSOR_ITEM, this::passthroughClientboundItem);
61+
registerSetPlayerInventory(ClientboundPackets1_21_2.SET_PLAYER_INVENTORY);
62+
registerCooldown1_21_2(ClientboundPackets1_21_2.COOLDOWN);
63+
registerSetContent1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT);
64+
registerSetSlot1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_SLOT);
65+
registerAdvancements1_20_3(ClientboundPackets1_21_2.UPDATE_ADVANCEMENTS);
66+
registerSetEquipment(ClientboundPackets1_21_2.SET_EQUIPMENT);
67+
registerMerchantOffers1_20_5(ClientboundPackets1_21_2.MERCHANT_OFFERS);
68+
registerContainerClick1_21_2(ServerboundPackets1_21_4.CONTAINER_CLICK);
69+
registerSetCreativeModeSlot(ServerboundPackets1_21_4.SET_CREATIVE_MODE_SLOT);
6970

70-
final RecipeDisplayRewriter<ClientboundPacket1_21> recipeRewriter = new RecipeDisplayRewriter<>(protocol);
71-
recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21.UPDATE_RECIPES);
72-
//recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21.RECIPE_BOOK_ADD);
73-
recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21.PLACE_GHOST_RECIPE);
71+
final RecipeDisplayRewriter<ClientboundPacket1_21_2> recipeRewriter = new RecipeDisplayRewriter<>(protocol);
72+
recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_2.UPDATE_RECIPES);
73+
recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_2.RECIPE_BOOK_ADD);
74+
recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_2.PLACE_GHOST_RECIPE);
7475
// OR do this if serialization of recipes changed and override the relevant method
7576
// Add new serializers to RecipeDisplayRewriter, or extend the last one for changes
7677
}

‎common/src/main/java/com/viaversion/viaversion/protocols/template/ComponentRewriter1_99.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import com.viaversion.nbt.tag.CompoundTag;
2121
import com.viaversion.viaversion.api.connection.UserConnection;
22-
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPacket1_21;
22+
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
2323
import com.viaversion.viaversion.rewriter.ComponentRewriter;
2424
import com.viaversion.viaversion.util.SerializerVersion;
2525

26-
final class ComponentRewriter1_99 extends ComponentRewriter<ClientboundPacket1_21> {
26+
final class ComponentRewriter1_99 extends ComponentRewriter<ClientboundPacket1_21_2> {
2727

2828
public ComponentRewriter1_99(final Protocol1_99To_98 protocol) {
2929
super(protocol, ReadType.NBT);
@@ -41,6 +41,6 @@ protected void handleShowItem(final UserConnection connection, final CompoundTag
4141

4242
@Override
4343
protected SerializerVersion inputSerializerVersion() {
44-
return SerializerVersion.V1_20_5;
44+
return SerializerVersion.V1_21_4;
4545
}
4646
}

‎common/src/main/java/com/viaversion/viaversion/protocols/template/EntityPacketRewriter1_99.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
package com.viaversion.viaversion.protocols.template;
1919

2020
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
21-
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
21+
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
2222
import com.viaversion.viaversion.api.type.Types;
23-
import com.viaversion.viaversion.api.type.types.version.Types1_21;
23+
import com.viaversion.viaversion.api.type.types.version.Types1_21_4;
2424
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
25-
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPacket1_21;
26-
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_21;
25+
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
26+
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
2727
import com.viaversion.viaversion.rewriter.EntityRewriter;
2828
import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
2929

3030
// Replace if needed
3131
// Types1_OLD
32-
// Types1_21
33-
final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_21, Protocol1_99To_98> {
32+
// Types1_21_4
33+
final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_21_2, Protocol1_99To_98> {
3434

3535
public EntityPacketRewriter1_99(final Protocol1_99To_98 protocol) {
3636
super(protocol);
@@ -39,14 +39,14 @@ public EntityPacketRewriter1_99(final Protocol1_99To_98 protocol) {
3939
@Override
4040
public void registerPackets() {
4141
// Tracks entities, applies entity data rewrites registered below, untracks entities
42-
registerTrackerWithData1_19(ClientboundPackets1_21.ADD_ENTITY, EntityTypes1_20_5.FALLING_BLOCK);
43-
registerSetEntityData(ClientboundPackets1_21.SET_ENTITY_DATA, /*Types1_OLD_ENTITY_DATA_LIST, */Types1_21.ENTITY_DATA_LIST); // Specify old and new entity data list if changed
44-
registerRemoveEntities(ClientboundPackets1_21.REMOVE_ENTITIES);
42+
registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
43+
registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA, /*Types1_OLD_ENTITY_DATA_LIST, */Types1_21_4.ENTITY_DATA_LIST); // Specify old and new entity data list if changed
44+
registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);
4545

4646
final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter(protocol);
4747
protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, registryDataRewriter::handle);
4848

49-
protocol.registerClientbound(ClientboundPackets1_21.LOGIN, wrapper -> {
49+
protocol.registerClientbound(ClientboundPackets1_21_2.LOGIN, wrapper -> {
5050
final int entityId = wrapper.passthrough(Types.INT); // Entity id
5151
wrapper.passthrough(Types.BOOLEAN); // Hardcore
5252
wrapper.passthrough(Types.STRING_ARRAY); // World List
@@ -64,7 +64,7 @@ public void registerPackets() {
6464
trackPlayer(wrapper.user(), entityId);
6565
});
6666

67-
protocol.registerClientbound(ClientboundPackets1_21.RESPAWN, wrapper -> {
67+
protocol.registerClientbound(ClientboundPackets1_21_2.RESPAWN, wrapper -> {
6868
final int dimensionId = wrapper.passthrough(Types.VAR_INT);
6969
final String world = wrapper.passthrough(Types.STRING);
7070
trackWorldDataByKey1_20_5(wrapper.user(), dimensionId, world); // Tracks world height and name for chunk data and entity (un)tracking
@@ -79,20 +79,20 @@ protected void registerRewrites() {
7979
if (id >= SomeAddedIndex) {
8080
id++;
8181
}
82-
return Types1_21.ENTITY_DATA_TYPES.byId(id);
82+
return Types1_21_4.ENTITY_DATA_TYPES.byId(id);
8383
});*/
8484

8585
// Registers registry type id changes
8686
registerEntityDataTypeHandler(
87-
Types1_21.ENTITY_DATA_TYPES.itemType,
88-
Types1_21.ENTITY_DATA_TYPES.blockStateType,
89-
Types1_21.ENTITY_DATA_TYPES.optionalBlockStateType,
90-
Types1_21.ENTITY_DATA_TYPES.particleType,
91-
Types1_21.ENTITY_DATA_TYPES.particlesType,
92-
Types1_21.ENTITY_DATA_TYPES.componentType,
93-
Types1_21.ENTITY_DATA_TYPES.optionalComponentType
87+
Types1_21_4.ENTITY_DATA_TYPES.itemType,
88+
Types1_21_4.ENTITY_DATA_TYPES.blockStateType,
89+
Types1_21_4.ENTITY_DATA_TYPES.optionalBlockStateType,
90+
Types1_21_4.ENTITY_DATA_TYPES.particleType,
91+
Types1_21_4.ENTITY_DATA_TYPES.particlesType,
92+
Types1_21_4.ENTITY_DATA_TYPES.componentType,
93+
Types1_21_4.ENTITY_DATA_TYPES.optionalComponentType
9494
);
95-
registerBlockStateHandler(EntityTypes1_20_5.ABSTRACT_MINECART, 11);
95+
registerBlockStateHandler(EntityTypes1_21_4.ABSTRACT_MINECART, 11);
9696
}
9797

9898
@Override
@@ -103,6 +103,6 @@ public void onMappingDataLoaded() {
103103

104104
@Override
105105
public EntityType typeFromId(final int type) {
106-
return EntityTypes1_20_5.getTypeFromId(type);
106+
return EntityTypes1_21_4.getTypeFromId(type);
107107
}
108108
}

0 commit comments

Comments
 (0)