From 687e1f4f4320b36f30627bf91dbd04d618fa4fba Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 28 Apr 2021 13:08:07 +0200 Subject: [PATCH] Update VV --- .../api/rewriters/EntityRewriter.java | 6 ++-- .../api/rewriters/EntityRewriterBase.java | 4 +-- .../api/rewriters/LegacyEntityRewriter.java | 6 ++-- .../api/rewriters/SoundRewriter.java | 4 +-- .../api/rewriters/TranslatableRewriter.java | 12 +++---- .../packets/BlockItemPackets1_11.java | 22 ++++++------ .../packets/EntityPackets1_11.java | 10 +++--- .../packets/PlayerPackets1_11.java | 6 ++-- .../Protocol1_11_1To1_12.java | 8 ++--- .../packets/BlockItemPackets1_12.java | 16 ++++----- .../packets/ChatPackets1_12.java | 2 +- .../packets/EntityPackets1_12.java | 10 +++--- .../packets/SoundPackets1_12.java | 4 +-- .../packets/EntityPackets1_11_1.java | 6 ++-- .../packets/ItemPackets1_11_1.java | 2 +- .../Protocol1_12_1To1_12_2.java | 4 +-- .../Protocol1_12_2To1_13.java | 16 ++++----- .../packets/BlockItemPackets1_13.java | 30 ++++++++-------- .../packets/EntityPackets1_13.java | 20 +++++------ .../packets/PlayerPacket1_13.java | 22 ++++++------ .../packets/SoundPackets1_13.java | 6 ++-- .../Protocol1_12To1_12_1.java | 4 +-- .../Protocol1_13_1To1_13_2.java | 4 +-- .../packets/EntityPackets1_13_2.java | 6 ++-- .../packets/InventoryPackets1_13_2.java | 14 ++++---- .../packets/WorldPackets1_13_2.java | 2 +- .../Protocol1_13_2To1_14.java | 10 +++--- .../packets/BlockItemPackets1_14.java | 34 +++++++++---------- .../packets/EntityPackets1_14.java | 24 ++++++------- .../packets/PlayerPackets1_14.java | 18 +++++----- .../packets/SoundPackets1_14.java | 2 +- .../Protocol1_13To1_13_1.java | 12 +++---- .../packets/EntityPackets1_13_1.java | 6 ++-- .../packets/InventoryPackets1_13_1.java | 2 +- .../packets/WorldPackets1_13_1.java | 2 +- .../Protocol1_14_2To1_14_3.java | 4 +-- .../Protocol1_14_3To1_14_4.java | 4 +-- .../Protocol1_14_4To1_15.java | 2 +- .../packets/BlockItemPackets1_15.java | 6 ++-- .../packets/EntityPackets1_15.java | 14 ++++---- .../packets/EntityPackets1_14_1.java | 4 +-- .../Protocol1_15_2To1_16.java | 16 ++++----- .../packets/BlockItemPackets1_16.java | 16 ++++----- .../packets/EntityPackets1_16.java | 10 +++--- .../Protocol1_16_1To1_16_2.java | 4 +-- .../packets/BlockItemPackets1_16_2.java | 10 +++--- .../packets/EntityPackets1_16_2.java | 4 +-- .../Protocol1_16_3To1_16_4.java | 4 +-- .../Protocol1_16_4To1_17.java | 18 +++++----- .../packets/BlockItemPackets1_17.java | 20 +++++------ .../packets/EntityPackets1_17.java | 8 ++--- .../Protocol1_9_4To1_10.java | 6 ++-- .../packets/BlockItemPackets1_10.java | 10 +++--- .../packets/EntityPackets1_10.java | 6 ++-- 54 files changed, 261 insertions(+), 261 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java index bad760cd..75be1538 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java @@ -43,7 +43,7 @@ public abstract class EntityRewriter extends Entity } public void registerSpawnTrackerWithData(ClientboundPacketType packetType, EntityType fallingBlockType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity id @@ -71,7 +71,7 @@ public abstract class EntityRewriter extends Entity } public void registerSpawnTracker(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID @@ -99,7 +99,7 @@ public abstract class EntityRewriter extends Entity * Helper method to handle a metadata list packet and its full initial meta rewrite. */ protected void registerMetadataRewriter(ClientboundPacketType packetType, Type> oldMetaType, Type> newMetaType) { - getProtocol().registerOutgoing(packetType, new PacketRemapper() { + getProtocol().registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java index bf19cee0..b7b3dbd8 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java @@ -232,7 +232,7 @@ public abstract class EntityRewriterBase extends Re * Helper method to handle player, painting, or xp orb trackers without meta changes. */ protected void registerExtraTracker(ClientboundPacketType packetType, EntityType entityType, Type intType) { - getProtocol().registerOutgoing(packetType, new PacketRemapper() { + getProtocol().registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(intType); // 0 - Entity id @@ -246,7 +246,7 @@ public abstract class EntityRewriterBase extends Re } protected void registerEntityDestroy(ClientboundPacketType packetType) { - getProtocol().registerOutgoing(packetType, new PacketRemapper() { + getProtocol().registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT_ARRAY_PRIMITIVE); // 0 - Entity ids diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java index 3b448952..059e8517 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java @@ -61,7 +61,7 @@ public abstract class LegacyEntityRewriter extends } protected void registerRespawn(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); @@ -74,7 +74,7 @@ public abstract class LegacyEntityRewriter extends } protected void registerJoinGame(ClientboundPacketType packetType, EntityType playerType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // 0 - Entity ID @@ -90,7 +90,7 @@ public abstract class LegacyEntityRewriter extends } protected void registerMetadataRewriter(ClientboundPacketType packetType, Type> oldMetaType, Type> newMetaType) { - getProtocol().registerOutgoing(packetType, new PacketRemapper() { + getProtocol().registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/SoundRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/SoundRewriter.java index fc57c7f1..c04e68ea 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/SoundRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/SoundRewriter.java @@ -33,7 +33,7 @@ public class SoundRewriter extends com.viaversion.viaversion.rewriter.SoundRewri } public void registerNamedSound(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); // Sound identifier @@ -43,7 +43,7 @@ public class SoundRewriter extends com.viaversion.viaversion.rewriter.SoundRewri } public void registerStopSound(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { handler(getStopSoundHandler()); diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java index 7fdb8f94..e7da6e67 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java @@ -63,7 +63,7 @@ public class TranslatableRewriter extends ComponentRewriter { } public void registerPing() { - protocol.registerOutgoing(State.LOGIN, 0x00, 0x00, new PacketRemapper() { + protocol.registerClientbound(State.LOGIN, 0x00, 0x00, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT))); @@ -72,7 +72,7 @@ public class TranslatableRewriter extends ComponentRewriter { } public void registerDisconnect(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT))); @@ -81,7 +81,7 @@ public class TranslatableRewriter extends ComponentRewriter { } public void registerChatMessage(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT))); @@ -90,7 +90,7 @@ public class TranslatableRewriter extends ComponentRewriter { } public void registerLegacyOpenWindow(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); // Id @@ -101,7 +101,7 @@ public class TranslatableRewriter extends ComponentRewriter { } public void registerOpenWindow(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // Id @@ -112,7 +112,7 @@ public class TranslatableRewriter extends ComponentRewriter { } public void registerTabList(ClientboundPacketType packetType) { - protocol.registerOutgoing(packetType, new PacketRemapper() { + protocol.registerClientbound(packetType, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index 1b8309cf..5c42a3cf 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -61,7 +61,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter Trading - protocol.registerOutgoing(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); // 0 - Channel @@ -153,7 +153,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_9_3.EFFECT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.EFFECT, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); @@ -71,7 +71,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter } }); - protocol.registerOutgoing(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity id @@ -112,7 +112,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter registerExtraTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, Entity1_11Types.EntityType.EXPERIENCE_ORB); registerExtraTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, Entity1_11Types.EntityType.WEATHER); - protocol.registerOutgoing(ClientboundPackets1_9_3.SPAWN_MOB, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_MOB, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity id @@ -169,7 +169,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, Entity1_11Types.EntityType.PLAYER); registerRespawn(ClientboundPackets1_9_3.RESPAWN); - protocol.registerOutgoing(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID @@ -188,7 +188,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter registerEntityDestroy(ClientboundPackets1_9_3.DESTROY_ENTITIES); registerMetadataRewriter(ClientboundPackets1_9_3.ENTITY_METADATA, Types1_9.METADATA_LIST); - protocol.registerOutgoing(ClientboundPackets1_9_3.ENTITY_STATUS, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.ENTITY_STATUS, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // 0 - Entity ID diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java index 3d37c1d5..f7dbfed3 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java @@ -39,7 +39,7 @@ public class PlayerPackets1_11 { }; public void register(Protocol1_10To1_11 protocol) { - protocol.registerOutgoing(ClientboundPackets1_9_3.TITLE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.TITLE, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Action @@ -67,7 +67,7 @@ public class PlayerPackets1_11 { } }); - protocol.registerOutgoing(ClientboundPackets1_9_3.COLLECT_ITEM, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.COLLECT_ITEM, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Collected entity id @@ -78,7 +78,7 @@ public class PlayerPackets1_11 { }); - protocol.registerIncoming(ServerboundPackets1_9_3.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_9_3.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION); // 0 - Location diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java index 04c932d9..d2d2028f 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java @@ -51,7 +51,7 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol { @@ -64,9 +64,9 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol Trading - protocol.registerOutgoing(ClientboundPackets1_12.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_12.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); // 0 - Channel @@ -126,7 +126,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter { @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_12.CHAT_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_12.CHAT_MESSAGE, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java index 7bb7e5df..b4c10134 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java @@ -46,7 +46,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_12.NAMED_SOUND, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_12.NAMED_SOUND, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); // 0 - Sound name @@ -47,7 +47,7 @@ public class SoundPackets1_12 extends LegacySoundRewriter } }); - protocol.registerOutgoing(ClientboundPackets1_12.SOUND, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_12.SOUND, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Sound name diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java index 2079840c..48edd134 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java @@ -35,7 +35,7 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter Trading - protocol.registerOutgoing(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); // 0 - Channel diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java index 3765a305..2b0cfc77 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java @@ -35,7 +35,7 @@ public class Protocol1_12_1To1_12_2 extends BackwardsProtocol { @@ -396,7 +396,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_13.EFFECT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.EFFECT, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // Effect Id @@ -420,7 +420,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_13.MAP_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.MAP_DATA, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -451,7 +451,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_13.ENTITY_EQUIPMENT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.ENTITY_EQUIPMENT, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -462,7 +462,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_13.WINDOW_PROPERTY, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.WINDOW_PROPERTY, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); // Window Id @@ -480,7 +480,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit }); - protocol.registerIncoming(ServerboundPackets1_12_1.CREATIVE_INVENTORY_ACTION, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_12_1.CREATIVE_INVENTORY_ACTION, new PacketRemapper() { @Override public void registerMap() { map(Type.SHORT); @@ -490,7 +490,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerIncoming(ServerboundPackets1_12_1.CLICK_WINDOW, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_12_1.CLICK_WINDOW, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java index 9ad6282d..2757f4f8 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java @@ -53,7 +53,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter wrapper.user().get(PlayerPositionStorage1_13.class).setCoordinates(wrapper, false)); } }; - protocol.registerIncoming(ServerboundPackets1_12_1.PLAYER_POSITION, movementRemapper); // Player Position - protocol.registerIncoming(ServerboundPackets1_12_1.PLAYER_POSITION_AND_ROTATION, movementRemapper); // Player Position And Look (serverbound) - protocol.registerIncoming(ServerboundPackets1_12_1.VEHICLE_MOVE, movementRemapper); // Vehicle Move (serverbound) + protocol.registerServerbound(ServerboundPackets1_12_1.PLAYER_POSITION, movementRemapper); // Player Position + protocol.registerServerbound(ServerboundPackets1_12_1.PLAYER_POSITION_AND_ROTATION, movementRemapper); // Player Position And Look (serverbound) + protocol.registerServerbound(ServerboundPackets1_12_1.VEHICLE_MOVE, movementRemapper); // Vehicle Move (serverbound) } } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java index c80a8850..74c0f3a0 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java @@ -59,7 +59,7 @@ public class PlayerPacket1_13 extends Rewriter { @Override protected void registerPackets() { // Login Plugin Request - protocol.registerOutgoing(State.LOGIN, 0x04, -1, new PacketRemapper() { + protocol.registerClientbound(State.LOGIN, 0x04, -1, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -78,7 +78,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -139,7 +139,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.SPAWN_PARTICLE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PARTICLE, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // 0 - Particle ID @@ -175,7 +175,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.PLAYER_INFO, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.PLAYER_INFO, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -219,7 +219,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.SCOREBOARD_OBJECTIVE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.SCOREBOARD_OBJECTIVE, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); @@ -244,7 +244,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.TEAMS, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.TEAMS, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); @@ -306,7 +306,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.DECLARE_COMMANDS, null, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.DECLARE_COMMANDS, null, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -347,7 +347,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.TAB_COMPLETE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.TAB_COMPLETE, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -383,7 +383,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerIncoming(ServerboundPackets1_12_1.TAB_COMPLETE, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_12_1.TAB_COMPLETE, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -438,7 +438,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerIncoming(ServerboundPackets1_12_1.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_12_1.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -590,7 +590,7 @@ public class PlayerPacket1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.STATISTICS, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.STATISTICS, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java index ae21777e..043b4506 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java @@ -36,7 +36,7 @@ public class SoundPackets1_13 extends Rewriter { @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_13.NAMED_SOUND, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.NAMED_SOUND, new PacketRemapper() { @Override public void registerMap() { map(Type.STRING); @@ -53,7 +53,7 @@ public class SoundPackets1_13 extends Rewriter { }); // Stop Sound -> Plugin Message - protocol.registerOutgoing(ClientboundPackets1_13.STOP_SOUND, ClientboundPackets1_12_1.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.STOP_SOUND, ClientboundPackets1_12_1.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -83,7 +83,7 @@ public class SoundPackets1_13 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_13.SOUND, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_13.SOUND, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java index a6e948c1..cc786cb7 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java @@ -31,7 +31,7 @@ public class Protocol1_12To1_12_1 extends BackwardsProtocol handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM))); } }); - protocol.registerOutgoing(ClientboundPackets1_14.OPEN_WINDOW, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.OPEN_WINDOW, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -172,7 +172,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit }); // Horse window -> Open Window - protocol.registerOutgoing(ClientboundPackets1_14.OPEN_HORSE_WINDOW, ClientboundPackets1_13.OPEN_WINDOW, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.OPEN_HORSE_WINDOW, ClientboundPackets1_13.OPEN_WINDOW, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -199,7 +199,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit itemRewriter.registerAdvancements(ClientboundPackets1_14.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM); // Trade List -> Plugin Message - protocol.registerOutgoing(ClientboundPackets1_14.TRADE_LIST, ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.TRADE_LIST, ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -248,7 +248,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit }); // Open Book -> Plugin Message - protocol.registerOutgoing(ClientboundPackets1_14.OPEN_BOOK, ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.OPEN_BOOK, ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -261,7 +261,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.ENTITY_EQUIPMENT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.ENTITY_EQUIPMENT, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID @@ -299,7 +299,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit }); RecipeRewriter recipeHandler = new RecipeRewriter1_13_2(protocol, this::handleItemToClient); - protocol.registerOutgoing(ClientboundPackets1_14.DECLARE_RECIPES, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.DECLARE_RECIPES, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -349,7 +349,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit itemRewriter.registerClickWindow(ServerboundPackets1_13.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM); itemRewriter.registerCreativeInvAction(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM); - protocol.registerOutgoing(ClientboundPackets1_14.BLOCK_BREAK_ANIMATION, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.BLOCK_BREAK_ANIMATION, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -358,14 +358,14 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.BLOCK_ENTITY_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ENTITY_DATA, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); } }); - protocol.registerOutgoing(ClientboundPackets1_14.BLOCK_ACTION, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ACTION, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); // Location @@ -383,7 +383,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.BLOCK_CHANGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.BLOCK_CHANGE, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); @@ -401,7 +401,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit blockRewriter.registerMultiBlockChange(ClientboundPackets1_14.MULTI_BLOCK_CHANGE); - protocol.registerOutgoing(ClientboundPackets1_14.EXPLOSION, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.EXPLOSION, new PacketRemapper() { @Override public void registerMap() { map(Type.FLOAT); // X @@ -424,7 +424,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.CHUNK_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.CHUNK_DATA, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -477,7 +477,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.UNLOAD_CHUNK, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.UNLOAD_CHUNK, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -491,7 +491,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.EFFECT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.EFFECT, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // Effect Id @@ -514,7 +514,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit itemRewriter.registerSpawnParticle(ClientboundPackets1_14.SPAWN_PARTICLE, Type.FLAT_VAR_INT_ITEM, Type.FLOAT); - protocol.registerOutgoing(ClientboundPackets1_14.MAP_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.MAP_DATA, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -524,7 +524,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_14.SPAWN_POSITION, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.SPAWN_POSITION, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java index 51076ea0..35397baa 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java @@ -71,7 +71,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter { @@ -96,7 +96,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter { @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_14.SERVER_DIFFICULTY, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.SERVER_DIFFICULTY, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); @@ -43,20 +43,20 @@ public class PlayerPackets1_14 extends Rewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_14.OPEN_SIGN_EDITOR, new PacketRemapper() { // c + protocol.registerClientbound(ClientboundPackets1_14.OPEN_SIGN_EDITOR, new PacketRemapper() { // c @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); } }); - protocol.registerIncoming(ServerboundPackets1_13.QUERY_BLOCK_NBT, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.QUERY_BLOCK_NBT, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); map(Type.POSITION, Type.POSITION1_14); } }); - protocol.registerIncoming(ServerboundPackets1_13.PLAYER_DIGGING, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.PLAYER_DIGGING, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -65,7 +65,7 @@ public class PlayerPackets1_14 extends Rewriter { } }); - protocol.registerIncoming(ServerboundPackets1_13.RECIPE_BOOK_DATA, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.RECIPE_BOOK_DATA, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -92,26 +92,26 @@ public class PlayerPackets1_14 extends Rewriter { } }); - protocol.registerIncoming(ServerboundPackets1_13.UPDATE_COMMAND_BLOCK, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.UPDATE_COMMAND_BLOCK, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION, Type.POSITION1_14); } }); - protocol.registerIncoming(ServerboundPackets1_13.UPDATE_STRUCTURE_BLOCK, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.UPDATE_STRUCTURE_BLOCK, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION, Type.POSITION1_14); } }); - protocol.registerIncoming(ServerboundPackets1_13.UPDATE_SIGN, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.UPDATE_SIGN, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION, Type.POSITION1_14); } }); - protocol.registerIncoming(ServerboundPackets1_13.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_13.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java index a2077595..acbf2ce1 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java @@ -42,7 +42,7 @@ public class SoundPackets1_14 extends Rewriter { soundRewriter.registerStopSound(ClientboundPackets1_14.STOP_SOUND); // Entity Sound Effect - protocol.registerOutgoing(ClientboundPackets1_14.ENTITY_SOUND, null, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_14.ENTITY_SOUND, null, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java index b26fe7e0..501498c9 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java @@ -69,7 +69,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { }); - registerOutgoing(ClientboundPackets1_14.DECLARE_RECIPES, new PacketRemapper() { + registerClientbound(ClientboundPackets1_14.DECLARE_RECIPES, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java index 9a10de42..b36299ee 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java @@ -34,7 +34,7 @@ public class Protocol1_14_3To1_14_4 extends BackwardsProtocol handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM))); @@ -68,7 +68,7 @@ public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewrit blockRewriter.registerBlockChange(ClientboundPackets1_15.BLOCK_CHANGE); blockRewriter.registerMultiBlockChange(ClientboundPackets1_15.MULTI_BLOCK_CHANGE); - protocol.registerOutgoing(ClientboundPackets1_15.CHUNK_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.CHUNK_DATA, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -116,7 +116,7 @@ public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewrit blockRewriter.registerEffect(ClientboundPackets1_15.EFFECT, 1010, 2001); - protocol.registerOutgoing(ClientboundPackets1_15.SPAWN_PARTICLE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.SPAWN_PARTICLE, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // 0 - Particle ID diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java index 85e3beb1..2cf5154d 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java @@ -45,7 +45,7 @@ public class EntityPackets1_15 extends EntityRewriter { @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_15.UPDATE_HEALTH, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.UPDATE_HEALTH, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -61,7 +61,7 @@ public class EntityPackets1_15 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_15.GAME_EVENT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.GAME_EVENT, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); @@ -76,7 +76,7 @@ public class EntityPackets1_15 extends EntityRewriter { registerSpawnTrackerWithData(ClientboundPackets1_15.SPAWN_ENTITY, Entity1_15Types.FALLING_BLOCK); - protocol.registerOutgoing(ClientboundPackets1_15.SPAWN_MOB, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.SPAWN_MOB, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID @@ -102,7 +102,7 @@ public class EntityPackets1_15 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_15.RESPAWN, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.RESPAWN, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); @@ -110,7 +110,7 @@ public class EntityPackets1_15 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_15.JOIN_GAME, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.JOIN_GAME, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // 0 - Entity ID @@ -134,7 +134,7 @@ public class EntityPackets1_15 extends EntityRewriter { registerExtraTracker(ClientboundPackets1_15.SPAWN_GLOBAL_ENTITY, Entity1_15Types.LIGHTNING_BOLT); registerExtraTracker(ClientboundPackets1_15.SPAWN_PAINTING, Entity1_15Types.PAINTING); - protocol.registerOutgoing(ClientboundPackets1_15.SPAWN_PLAYER, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.SPAWN_PLAYER, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID @@ -154,7 +154,7 @@ public class EntityPackets1_15 extends EntityRewriter { registerMetadataRewriter(ClientboundPackets1_15.ENTITY_METADATA, Types1_14.METADATA_LIST); // Attributes (get rid of generic.flyingSpeed for the Bee remap) - protocol.registerOutgoing(ClientboundPackets1_15.ENTITY_PROPERTIES, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_15.ENTITY_PROPERTIES, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java index 1d813d19..d190016a 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java @@ -44,7 +44,7 @@ public class EntityPackets1_14_1 extends LegacyEntityRewriter { @@ -89,7 +89,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT))); @@ -98,7 +98,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol { @@ -137,7 +137,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol { @@ -152,7 +152,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol { @@ -175,7 +175,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol { @@ -189,7 +189,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol { @@ -105,7 +105,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit blockRewriter.registerBlockChange(ClientboundPackets1_16.BLOCK_CHANGE); blockRewriter.registerMultiBlockChange(ClientboundPackets1_16.MULTI_BLOCK_CHANGE); - protocol.registerOutgoing(ClientboundPackets1_16.ENTITY_EQUIPMENT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.ENTITY_EQUIPMENT, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -138,7 +138,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_16.UPDATE_LIGHT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.UPDATE_LIGHT, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // x @@ -147,7 +147,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_16.CHUNK_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.CHUNK_DATA, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -197,7 +197,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit itemRewriter.registerSpawnParticle(ClientboundPackets1_16.SPAWN_PARTICLE, Type.FLAT_VAR_INT_ITEM, Type.DOUBLE); - protocol.registerOutgoing(ClientboundPackets1_16.WINDOW_PROPERTY, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.WINDOW_PROPERTY, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); // Window id @@ -217,7 +217,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_16.MAP_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.MAP_DATA, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // Map ID @@ -254,7 +254,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_16.BLOCK_ENTITY_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.BLOCK_ENTITY_DATA, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -269,7 +269,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit itemRewriter.registerClickWindow(ServerboundPackets1_14.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM); itemRewriter.registerCreativeInvAction(ServerboundPackets1_14.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM); - protocol.registerIncoming(ServerboundPackets1_14.EDIT_BOOK, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM))); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java index 07fa0a84..42bd72b6 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java @@ -62,7 +62,7 @@ public class EntityPackets1_16 extends EntityRewriter { @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_16.SPAWN_ENTITY, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.SPAWN_ENTITY, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity id @@ -95,7 +95,7 @@ public class EntityPackets1_16 extends EntityRewriter { registerSpawnTracker(ClientboundPackets1_16.SPAWN_MOB); - protocol.registerOutgoing(ClientboundPackets1_16.RESPAWN, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.RESPAWN, new PacketRemapper() { @Override public void registerMap() { map(dimensionTransformer); // Dimension Type @@ -138,7 +138,7 @@ public class EntityPackets1_16 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_16.JOIN_GAME, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.JOIN_GAME, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // Entity ID @@ -179,7 +179,7 @@ public class EntityPackets1_16 extends EntityRewriter { registerEntityDestroy(ClientboundPackets1_16.DESTROY_ENTITIES); registerMetadataRewriter(ClientboundPackets1_16.ENTITY_METADATA, Types1_14.METADATA_LIST); - protocol.registerOutgoing(ClientboundPackets1_16.ENTITY_PROPERTIES, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.ENTITY_PROPERTIES, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -202,7 +202,7 @@ public class EntityPackets1_16 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_16.PLAYER_INFO, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16.PLAYER_INFO, new PacketRemapper() { @Override public void registerMap() { handler(packetWrapper -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java index 991072b2..f1e7af3a 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java @@ -74,7 +74,7 @@ public class Protocol1_16_1To1_16_2 extends BackwardsProtocol { @@ -92,7 +92,7 @@ public class Protocol1_16_1To1_16_2 extends BackwardsProtocol { @@ -82,7 +82,7 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr blockRewriter.registerBlockAction(ClientboundPackets1_16_2.BLOCK_ACTION); blockRewriter.registerBlockChange(ClientboundPackets1_16_2.BLOCK_CHANGE); - protocol.registerOutgoing(ClientboundPackets1_16_2.CHUNK_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16_2.CHUNK_DATA, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -113,7 +113,7 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr } }); - protocol.registerOutgoing(ClientboundPackets1_16_2.BLOCK_ENTITY_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16_2.BLOCK_ENTITY_DATA, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -124,7 +124,7 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr } }); - protocol.registerOutgoing(ClientboundPackets1_16_2.MULTI_BLOCK_CHANGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16_2.MULTI_BLOCK_CHANGE, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -155,7 +155,7 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr itemRewriter.registerClickWindow(ServerboundPackets1_16.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM); itemRewriter.registerCreativeInvAction(ServerboundPackets1_16.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM); - protocol.registerIncoming(ServerboundPackets1_16.EDIT_BOOK, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_16.EDIT_BOOK, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM))); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java index 98f6201d..c81706cf 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java @@ -57,7 +57,7 @@ public class EntityPackets1_16_2 extends EntityRewriter registerEntityDestroy(ClientboundPackets1_16_2.DESTROY_ENTITIES); registerMetadataRewriter(ClientboundPackets1_16_2.ENTITY_METADATA, Types1_14.METADATA_LIST); - protocol.registerOutgoing(ClientboundPackets1_16_2.JOIN_GAME, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16_2.JOIN_GAME, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // Entity ID @@ -90,7 +90,7 @@ public class EntityPackets1_16_2 extends EntityRewriter } }); - protocol.registerOutgoing(ClientboundPackets1_16_2.RESPAWN, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_16_2.RESPAWN, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java index 59ab096c..122a8355 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java @@ -33,7 +33,7 @@ public class Protocol1_16_3To1_16_4 extends BackwardsProtocol { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java index 6a75e335..06034913 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java @@ -78,7 +78,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol { @@ -137,7 +137,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol { @@ -149,7 +149,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol { @@ -166,7 +166,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol { @@ -222,7 +222,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java index dc01cfd5..41231179 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java @@ -66,7 +66,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit itemRewriter.registerCreativeInvAction(ServerboundPackets1_16_2.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM); - protocol.registerIncoming(ServerboundPackets1_16_2.EDIT_BOOK, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_16_2.EDIT_BOOK, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM))); @@ -74,7 +74,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit }); // This will cause desync issues for players with a high latency, but works:tm: - protocol.registerIncoming(ServerboundPackets1_16_2.CLICK_WINDOW, new PacketRemapper() { + protocol.registerServerbound(ServerboundPackets1_16_2.CLICK_WINDOW, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); // Window Id @@ -89,9 +89,9 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit }); } }); - protocol.cancelIncoming(ServerboundPackets1_16_2.WINDOW_CONFIRMATION); + protocol.cancelServerbound(ServerboundPackets1_16_2.WINDOW_CONFIRMATION); - protocol.registerOutgoing(ClientboundPackets1_17.SPAWN_PARTICLE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.SPAWN_PARTICLE, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // Particle id @@ -134,7 +134,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit // The Great Shrunkening // Chunk sections *will* be lost ¯\_(ツ)_/¯ - protocol.registerOutgoing(ClientboundPackets1_17.UPDATE_LIGHT, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.UPDATE_LIGHT, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // X @@ -199,7 +199,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_17.MULTI_BLOCK_CHANGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.MULTI_BLOCK_CHANGE, new PacketRemapper() { public void registerMap() { map(Type.LONG); // Chunk pos map(Type.BOOLEAN); // Suppress light updates @@ -220,7 +220,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_17.BLOCK_CHANGE, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.BLOCK_CHANGE, new PacketRemapper() { public void registerMap() { map(Type.POSITION1_14); map(Type.VAR_INT); @@ -236,7 +236,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_17.CHUNK_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.CHUNK_DATA, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -268,7 +268,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_17.BLOCK_ENTITY_DATA, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.BLOCK_ENTITY_DATA, new PacketRemapper() { @Override public void registerMap() { handler(wrapper -> { @@ -280,7 +280,7 @@ public class BlockItemPackets1_17 extends com.viaversion.viabackwards.api.rewrit } }); - protocol.registerOutgoing(ClientboundPackets1_17.BLOCK_BREAK_ANIMATION, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.BLOCK_BREAK_ANIMATION, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java index fbf3d05a..0a8362ef 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java @@ -56,7 +56,7 @@ public class EntityPackets1_17 extends EntityRewriter { registerExtraTracker(ClientboundPackets1_17.SPAWN_PLAYER, Entity1_16_2Types.PLAYER); registerEntityDestroy(ClientboundPackets1_17.DESTROY_ENTITIES); registerMetadataRewriter(ClientboundPackets1_17.ENTITY_METADATA, Types1_17.METADATA_LIST, Types1_14.METADATA_LIST); - protocol.registerOutgoing(ClientboundPackets1_17.JOIN_GAME, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.JOIN_GAME, new PacketRemapper() { @Override public void registerMap() { map(Type.INT); // Entity ID @@ -97,7 +97,7 @@ public class EntityPackets1_17 extends EntityRewriter { }); } }); - protocol.registerOutgoing(ClientboundPackets1_17.RESPAWN, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.RESPAWN, new PacketRemapper() { @Override public void registerMap() { map(Type.NBT); // Dimension data @@ -108,7 +108,7 @@ public class EntityPackets1_17 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_17.PLAYER_POSITION, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.PLAYER_POSITION, new PacketRemapper() { @Override public void registerMap() { map(Type.DOUBLE); @@ -125,7 +125,7 @@ public class EntityPackets1_17 extends EntityRewriter { } }); - protocol.registerOutgoing(ClientboundPackets1_17.ENTITY_PROPERTIES, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_17.ENTITY_PROPERTIES, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // Entity id diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java index fd2fab39..aedd32b7 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java @@ -52,7 +52,7 @@ public class Protocol1_9_4To1_10 extends BackwardsProtocol @Override protected void registerPackets() { - protocol.registerOutgoing(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity id @@ -88,7 +88,7 @@ public class EntityPackets1_10 extends LegacyEntityRewriter registerExtraTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, Entity1_10Types.EntityType.EXPERIENCE_ORB); registerExtraTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, Entity1_10Types.EntityType.WEATHER); - protocol.registerOutgoing(ClientboundPackets1_9_3.SPAWN_MOB, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_MOB, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity id @@ -145,7 +145,7 @@ public class EntityPackets1_10 extends LegacyEntityRewriter registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, Entity1_10Types.EntityType.PLAYER); registerRespawn(ClientboundPackets1_9_3.RESPAWN); - protocol.registerOutgoing(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketRemapper() { + protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); // 0 - Entity ID