Skip to content

Commit e10c731

Browse files
kennytvkennytv
committed
25w37a
1 parent e0892fa commit e10c731

File tree

3 files changed

+59
-51
lines changed

3 files changed

+59
-51
lines changed

‎common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.Protocol1_21_7To1_21_9;
5050
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundConfigurationPackets1_21_9;
5151
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPacket1_21_9;
52+
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
5253
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundConfigurationPackets1_21_9;
5354
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPacket1_21_9;
5455
import com.viaversion.viaversion.rewriter.ParticleRewriter;
@@ -75,31 +76,31 @@ public Protocol1_21_9To1_21_7() {
7576
protected void registerPackets() {
7677
super.registerPackets();
7778

78-
tagRewriter.registerGeneric(ClientboundPackets1_21_6.UPDATE_TAGS);
79+
tagRewriter.registerGeneric(ClientboundPackets1_21_9.UPDATE_TAGS);
7980
tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21_9.UPDATE_TAGS);
8081

8182
final SoundRewriter<ClientboundPacket1_21_9> soundRewriter = new SoundRewriter<>(this);
82-
soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND);
83-
soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND_ENTITY);
84-
soundRewriter.registerStopSound(ClientboundPackets1_21_6.STOP_SOUND);
85-
86-
new StatisticsRewriter<>(this).register(ClientboundPackets1_21_6.AWARD_STATS);
87-
88-
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_ACTION_BAR_TEXT);
89-
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_TITLE_TEXT);
90-
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SET_SUBTITLE_TEXT);
91-
translatableRewriter.registerBossEvent(ClientboundPackets1_21_6.BOSS_EVENT);
92-
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.DISCONNECT);
93-
translatableRewriter.registerTabList(ClientboundPackets1_21_6.TAB_LIST);
94-
translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_6.PLAYER_COMBAT_KILL);
95-
translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_6.PLAYER_INFO_UPDATE);
96-
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_6.SYSTEM_CHAT);
97-
translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_6.DISGUISED_CHAT);
98-
translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_6.PLAYER_CHAT);
83+
soundRewriter.registerSound1_19_3(ClientboundPackets1_21_9.SOUND);
84+
soundRewriter.registerSound1_19_3(ClientboundPackets1_21_9.SOUND_ENTITY);
85+
soundRewriter.registerStopSound(ClientboundPackets1_21_9.STOP_SOUND);
86+
87+
new StatisticsRewriter<>(this).register(ClientboundPackets1_21_9.AWARD_STATS);
88+
89+
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SET_ACTION_BAR_TEXT);
90+
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SET_TITLE_TEXT);
91+
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SET_SUBTITLE_TEXT);
92+
translatableRewriter.registerBossEvent(ClientboundPackets1_21_9.BOSS_EVENT);
93+
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.DISCONNECT);
94+
translatableRewriter.registerTabList(ClientboundPackets1_21_9.TAB_LIST);
95+
translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_9.PLAYER_COMBAT_KILL);
96+
translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_9.PLAYER_INFO_UPDATE);
97+
translatableRewriter.registerComponentPacket(ClientboundPackets1_21_9.SYSTEM_CHAT);
98+
translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_9.DISGUISED_CHAT);
99+
translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_9.PLAYER_CHAT);
99100
translatableRewriter.registerPing();
100101

101-
particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_6.LEVEL_PARTICLES);
102-
registerClientbound(ClientboundPackets1_21_6.EXPLODE, wrapper -> {
102+
particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_9.LEVEL_PARTICLES);
103+
registerClientbound(ClientboundPackets1_21_9.EXPLODE, wrapper -> {
103104
wrapper.passthrough(Types.DOUBLE); // X
104105
wrapper.passthrough(Types.DOUBLE); // Y
105106
wrapper.passthrough(Types.DOUBLE); // Z
@@ -178,6 +179,13 @@ protected void registerPackets() {
178179
wrapper.user().disconnect("Disconnected by user");
179180
}
180181
});
182+
183+
cancelClientbound(ClientboundPackets1_21_9.DEBUG_BLOCK_VALUE);
184+
cancelClientbound(ClientboundPackets1_21_9.DEBUG_CHUNK_VALUE);
185+
cancelClientbound(ClientboundPackets1_21_9.DEBUG_ENTITY_VALUE);
186+
cancelClientbound(ClientboundPackets1_21_9.DEBUG_EVENT);
187+
cancelClientbound(ClientboundPackets1_21_9.GAME_EVENT_TEST_HIGHLIGHT_POS);
188+
cancelServerbound(ServerboundPackets1_21_6.DEBUG_SAMPLE_SUBSCRIPTION);
181189
}
182190

183191
@Override
@@ -229,7 +237,7 @@ public Types1_20_5<StructuredDataKeys1_21_5, EntityDataTypes1_21_5> mappedTypes(
229237
@Override
230238
protected PacketTypesProvider<ClientboundPacket1_21_9, ClientboundPacket1_21_6, ServerboundPacket1_21_9, ServerboundPacket1_21_6> createPacketTypesProvider() {
231239
return new SimplePacketTypesProvider<>(
232-
packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_21_6.class, ClientboundConfigurationPackets1_21_9.class),
240+
packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_21_9.class, ClientboundConfigurationPackets1_21_9.class),
233241
packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_21_6.class, ClientboundConfigurationPackets1_21_6.class),
234242
packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_21_6.class, ServerboundConfigurationPackets1_21_9.class),
235243
packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_21_6.class, ServerboundConfigurationPackets1_21_6.class)

‎common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/BlockItemPacketRewriter1_21_9.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.viaversion.viaversion.api.minecraft.item.Item;
2525
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
2626
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
27-
import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
2827
import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPacket1_21_6;
2928
import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
3029
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPacket1_21_9;
30+
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
3131
import com.viaversion.viaversion.rewriter.BlockRewriter;
3232
import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
3333

@@ -43,29 +43,29 @@ public BlockItemPacketRewriter1_21_9(final Protocol1_21_9To1_21_7 protocol) {
4343
@Override
4444
public void registerPackets() {
4545
final BlockRewriter<ClientboundPacket1_21_9> blockRewriter = BlockRewriter.for1_20_2(protocol);
46-
blockRewriter.registerBlockEvent(ClientboundPackets1_21_6.BLOCK_EVENT);
47-
blockRewriter.registerBlockUpdate(ClientboundPackets1_21_6.BLOCK_UPDATE);
48-
blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_6.SECTION_BLOCKS_UPDATE);
49-
blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_6.LEVEL_EVENT, 2001);
50-
blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_6.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
51-
blockRewriter.registerBlockEntityData(ClientboundPackets1_21_6.BLOCK_ENTITY_DATA);
46+
blockRewriter.registerBlockEvent(ClientboundPackets1_21_9.BLOCK_EVENT);
47+
blockRewriter.registerBlockUpdate(ClientboundPackets1_21_9.BLOCK_UPDATE);
48+
blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_9.SECTION_BLOCKS_UPDATE);
49+
blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_9.LEVEL_EVENT, 2001);
50+
blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_9.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
51+
blockRewriter.registerBlockEntityData(ClientboundPackets1_21_9.BLOCK_ENTITY_DATA);
5252

53-
registerOpenScreen(ClientboundPackets1_21_6.OPEN_SCREEN);
54-
registerSetCursorItem(ClientboundPackets1_21_6.SET_CURSOR_ITEM);
55-
registerSetPlayerInventory(ClientboundPackets1_21_6.SET_PLAYER_INVENTORY);
56-
registerCooldown1_21_2(ClientboundPackets1_21_6.COOLDOWN);
57-
registerSetContent1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_CONTENT);
58-
registerSetSlot1_21_2(ClientboundPackets1_21_6.CONTAINER_SET_SLOT);
59-
registerAdvancements1_20_3(ClientboundPackets1_21_6.UPDATE_ADVANCEMENTS);
60-
registerSetEquipment(ClientboundPackets1_21_6.SET_EQUIPMENT);
61-
registerMerchantOffers1_20_5(ClientboundPackets1_21_6.MERCHANT_OFFERS);
53+
registerOpenScreen(ClientboundPackets1_21_9.OPEN_SCREEN);
54+
registerSetCursorItem(ClientboundPackets1_21_9.SET_CURSOR_ITEM);
55+
registerSetPlayerInventory(ClientboundPackets1_21_9.SET_PLAYER_INVENTORY);
56+
registerCooldown1_21_2(ClientboundPackets1_21_9.COOLDOWN);
57+
registerSetContent1_21_2(ClientboundPackets1_21_9.CONTAINER_SET_CONTENT);
58+
registerSetSlot1_21_2(ClientboundPackets1_21_9.CONTAINER_SET_SLOT);
59+
registerAdvancements1_20_3(ClientboundPackets1_21_9.UPDATE_ADVANCEMENTS);
60+
registerSetEquipment(ClientboundPackets1_21_9.SET_EQUIPMENT);
61+
registerMerchantOffers1_20_5(ClientboundPackets1_21_9.MERCHANT_OFFERS);
6262
registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
6363
registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);
6464

6565
final RecipeDisplayRewriter<ClientboundPacket1_21_9> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
66-
recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_6.UPDATE_RECIPES);
67-
recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_6.RECIPE_BOOK_ADD);
68-
recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_6.PLACE_GHOST_RECIPE);
66+
recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_9.UPDATE_RECIPES);
67+
recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_9.RECIPE_BOOK_ADD);
68+
recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_9.PLACE_GHOST_RECIPE);
6969
}
7070

7171
@Override

‎common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
3030
import com.viaversion.viaversion.api.type.Types;
3131
import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
32-
import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
3332
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundConfigurationPackets1_21_9;
3433
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPacket1_21_9;
34+
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
3535
import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
3636
import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandler;
3737

@@ -43,14 +43,14 @@ public EntityPacketRewriter1_21_9(final Protocol1_21_9To1_21_7 protocol) {
4343

4444
@Override
4545
public void registerPackets() {
46-
registerSetEntityData(ClientboundPackets1_21_6.SET_ENTITY_DATA);
47-
registerRemoveEntities(ClientboundPackets1_21_6.REMOVE_ENTITIES);
48-
registerPlayerAbilities(ClientboundPackets1_21_6.PLAYER_ABILITIES);
49-
registerGameEvent(ClientboundPackets1_21_6.GAME_EVENT);
50-
registerLogin1_20_5(ClientboundPackets1_21_6.LOGIN);
51-
registerRespawn1_20_5(ClientboundPackets1_21_6.RESPAWN);
52-
53-
protocol.registerClientbound(ClientboundPackets1_21_6.ADD_ENTITY, wrapper -> {
46+
registerSetEntityData(ClientboundPackets1_21_9.SET_ENTITY_DATA);
47+
registerRemoveEntities(ClientboundPackets1_21_9.REMOVE_ENTITIES);
48+
registerPlayerAbilities(ClientboundPackets1_21_9.PLAYER_ABILITIES);
49+
registerGameEvent(ClientboundPackets1_21_9.GAME_EVENT);
50+
registerLogin1_20_5(ClientboundPackets1_21_9.LOGIN);
51+
registerRespawn1_20_5(ClientboundPackets1_21_9.RESPAWN);
52+
53+
protocol.registerClientbound(ClientboundPackets1_21_9.ADD_ENTITY, wrapper -> {
5454
final int entityId = wrapper.passthrough(Types.VAR_INT);
5555
wrapper.passthrough(Types.UUID); // Entity UUID
5656
final int entityTypeId = wrapper.passthrough(Types.VAR_INT);
@@ -79,12 +79,12 @@ public void registerPackets() {
7979
writeMovementShorts(wrapper, movement);
8080
});
8181

82-
protocol.registerClientbound(ClientboundPackets1_21_6.SET_ENTITY_MOTION, wrapper -> {
82+
protocol.registerClientbound(ClientboundPackets1_21_9.SET_ENTITY_MOTION, wrapper -> {
8383
wrapper.passthrough(Types.VAR_INT); // Entity ID
8484
writeMovementShorts(wrapper, wrapper.read(Types.MOVEMENT_VECTOR));
8585
});
8686

87-
protocol.registerClientbound(ClientboundPackets1_21_6.PLAYER_ROTATION, wrapper -> {
87+
protocol.registerClientbound(ClientboundPackets1_21_9.PLAYER_ROTATION, wrapper -> {
8888
// TODO track
8989
wrapper.passthrough(Types.FLOAT); // Y rotation
9090
final boolean relativeY = wrapper.read(Types.BOOLEAN);

0 commit comments

Comments
 (0)