diff --git a/gradle.properties b/gradle.properties index 6aa0f65..0814076 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ org.gradle.configureondemand=true # Project properties maven_name=ViaLegacy maven_group=net.raphimc -maven_version=2.2.4 +maven_version=2.2.5 diff --git a/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java b/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java index 26c690d..cbbd5fa 100644 --- a/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java +++ b/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.rewriter.ItemRewriter; import com.viaversion.viaversion.api.rewriter.RewriterBase; import com.viaversion.viaversion.api.type.Type; @@ -80,9 +80,9 @@ public abstract class LegacyItemRewriter

extends RewriterBas public void registerCreativeInventoryAction(final ServerboundPacketType packetType, final Type type) { - this.protocol.registerServerbound(packetType, new PacketRemapper() { + this.protocol.registerServerbound(packetType, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.SHORT); // slot map(type); // item handler(itemToServerHandler(type)); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_16_2toa1_0_15/Protocola1_0_16_2toa1_0_15.java b/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_16_2toa1_0_15/Protocola1_0_16_2toa1_0_15.java index d4bd556..fb3927e 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_16_2toa1_0_15/Protocola1_0_16_2toa1_0_15.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_16_2toa1_0_15/Protocola1_0_16_2toa1_0_15.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; import net.raphimc.vialegacy.protocols.alpha.protocola1_0_17_1_0_17_4toa1_0_16_2.ClientboundPacketsa1_0_16; import net.raphimc.vialegacy.protocols.alpha.protocola1_1_0_1_1_2_1toa1_0_17_1_0_17_4.ServerboundPacketsa1_0_17; @@ -35,9 +35,9 @@ public class Protocola1_0_16_2toa1_0_15 extends AbstractProtocol { wrapper.cancel(); final PacketWrapper handshake = PacketWrapper.create(ClientboundPacketsa1_0_16.HANDSHAKE, wrapper.user()); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_17_1_0_17_4toa1_0_16_2/Protocola1_0_17_1_0_17_4toa1_0_16_2.java b/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_17_1_0_17_4toa1_0_16_2/Protocola1_0_17_1_0_17_4toa1_0_16_2.java index f441054..c4e6d5b 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_17_1_0_17_4toa1_0_16_2/Protocola1_0_17_1_0_17_4toa1_0_16_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_17_1_0_17_4toa1_0_16_2/Protocola1_0_17_1_0_17_4toa1_0_16_2.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; import net.raphimc.vialegacy.protocols.alpha.protocola1_0_17_1_0_17_4toa1_0_16_2.storage.TimeLockStorage; @@ -38,9 +38,9 @@ public class Protocola1_0_17_1_0_17_4toa1_0_16_2 extends AbstractProtocol { final PacketWrapper updateHealth = PacketWrapper.create(ClientboundPacketsa1_2_3.UPDATE_HEALTH, wrapper.user()); updateHealth.write(Type.BYTE, (byte) 20); // health @@ -48,9 +48,9 @@ public class Protocola1_2_3_1_2_3_4toa1_2_2 extends AbstractProtocol (short) (v / 4.0F)); // velocity x map(Type.SHORT, Type.SHORT, v -> (short) (v / 4.0F)); // velocity y diff --git a/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocolb1_0_1_1_1toa1_2_3_5_1_2_6/Protocolb1_0_1_1_1toa1_2_3_5_1_2_6.java b/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocolb1_0_1_1_1toa1_2_3_5_1_2_6/Protocolb1_0_1_1_1toa1_2_3_5_1_2_6.java index 2c6ab90..bdf1608 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocolb1_0_1_1_1toa1_2_3_5_1_2_6/Protocolb1_0_1_1_1toa1_2_3_5_1_2_6.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/alpha/protocolb1_0_1_1_1toa1_2_3_5_1_2_6/Protocolb1_0_1_1_1toa1_2_3_5_1_2_6.java @@ -25,7 +25,7 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.libs.opennbt.tag.builtin.*; import net.raphimc.vialegacy.ViaLegacy; @@ -64,9 +64,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { final InventoryStorage inventoryStorage = wrapper.user().get(InventoryStorage.class); final AlphaInventoryTracker inventoryTracker = wrapper.user().get(AlphaInventoryTracker.class); @@ -102,15 +102,15 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { wrapper.user().get(InventoryStorage.class).resetPlayerInventory(); @@ -119,9 +119,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { wrapper.cancel(); final Item item = wrapper.read(Types1_3_1.NBTLESS_ITEM); // item @@ -142,9 +142,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { wrapper.cancel(); final InventoryStorage tracker = wrapper.user().get(InventoryStorage.class); @@ -209,9 +209,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { final InventoryStorage tracker = wrapper.user().get(InventoryStorage.class); final AlphaInventoryTracker inventoryTracker = wrapper.user().get(AlphaInventoryTracker.class); @@ -298,9 +298,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { final InventoryStorage inventoryStorage = wrapper.user().get(InventoryStorage.class); short slot = wrapper.read(Type.SHORT); // slot @@ -318,9 +318,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { wrapper.cancel(); wrapper.user().get(InventoryStorage.class).openContainerPos = null; @@ -330,9 +330,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { final InventoryStorage tracker = wrapper.user().get(InventoryStorage.class); final AlphaInventoryTracker inventoryTracker = wrapper.user().get(AlphaInventoryTracker.class); @@ -369,9 +369,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol { final Position pos = wrapper.passthrough(Types1_7_6.POSITION_SHORT); // position diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/Protocol1_0_0_1tob1_8_0_1.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/Protocol1_0_0_1tob1_8_0_1.java index c6cf1fd..edbd5cb 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/Protocol1_0_0_1tob1_8_0_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/Protocol1_0_0_1tob1_8_0_1.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.remapper.LegacyItemRewriter; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; @@ -47,9 +47,9 @@ public class Protocol1_0_0_1tob1_8_0_1 extends AbstractProtocol { float experience = (float) wrapper.read(Type.BYTE); final byte experienceLevel = wrapper.read(Type.BYTE); @@ -61,33 +61,33 @@ public class Protocol1_0_0_1tob1_8_0_1 extends AbstractProtocol itemRewriter.handleItemToServer(wrapper.get(Typesb1_8_0_1.CREATIVE_ITEM, 0))); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_2_0_2tob1_1_2/Protocolb1_2_0_2tob1_1_2.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_2_0_2tob1_1_2/Protocolb1_2_0_2tob1_1_2.java index c8ec1ea..12e9117 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_2_0_2tob1_1_2/Protocolb1_2_0_2tob1_1_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_2_0_2tob1_1_2/Protocolb1_2_0_2tob1_1_2.java @@ -23,7 +23,7 @@ import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import net.raphimc.vialegacy.api.model.IdAndData; @@ -53,18 +53,18 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol { @@ -105,9 +105,9 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol { final short itemId = wrapper.read(Type.SHORT); // item id @@ -122,9 +122,9 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol()); // metadata } }); - this.registerClientbound(ClientboundPacketsb1_1.CHUNK_DATA, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_1.CHUNK_DATA, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { final ClientWorld clientWorld = new ClientWorld(wrapper.user()); clientWorld.setEnvironment(0); @@ -145,18 +145,18 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol BLOCK_DATA_REWRITER.remapBlockChangeRecords(wrapper.get(Types1_1.BLOCK_CHANGE_RECORD_ARRAY, 0))); } }); - this.registerClientbound(ClientboundPacketsb1_1.BLOCK_CHANGE, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_1.BLOCK_CHANGE, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Types1_7_6.POSITION_UBYTE); // position map(Type.UNSIGNED_BYTE); // block id map(Type.UNSIGNED_BYTE); // block data @@ -168,33 +168,33 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol (short) (i + 103)); // action id | start/stop sneaking (1/2) -> 104/105 } }); - this.registerServerbound(ServerboundPacketsb1_2.CLICK_WINDOW, new PacketRemapper() { + this.registerServerbound(ServerboundPacketsb1_2.CLICK_WINDOW, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BYTE); // window id map(Type.SHORT); // slot map(Type.BYTE); // button diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_3_0_1tob1_2_0_2/Protocolb1_3_0_1tob1_2_0_2.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_3_0_1tob1_2_0_2/Protocolb1_3_0_1tob1_2_0_2.java index d212ba2..49d2603 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_3_0_1tob1_2_0_2/Protocolb1_3_0_1tob1_2_0_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_3_0_1tob1_2_0_2/Protocolb1_3_0_1tob1_2_0_2.java @@ -24,7 +24,7 @@ import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.model.IdAndData; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; @@ -49,9 +49,9 @@ public class Protocolb1_3_0_1tob1_2_0_2 extends AbstractProtocol rewriteMetadata(wrapper.get(Typesb1_4.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPacketsb1_2.ENTITY_METADATA, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_2.ENTITY_METADATA, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Typesb1_2.METADATA_LIST, Typesb1_4.METADATA_LIST); // metadata handler(wrapper -> rewriteMetadata(wrapper.get(Typesb1_4.METADATA_LIST, 0))); } }); - this.registerServerbound(ServerboundPacketsb1_4.PLAYER_DIGGING, new PacketRemapper() { + this.registerServerbound(ServerboundPacketsb1_4.PLAYER_DIGGING, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { wrapper.cancel(); final short status = wrapper.read(Type.UNSIGNED_BYTE); // status @@ -114,9 +114,9 @@ public class Protocolb1_3_0_1tob1_2_0_2 extends AbstractProtocol { diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java index 158eb9f..4dcd7d3 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; import net.raphimc.vialegacy.protocols.beta.protocolb1_5_0_2tob1_4_0_1.types.Typesb1_4; @@ -44,21 +44,21 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol { @@ -90,9 +90,9 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_3_1.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPacketsb1_4.SPAWN_PAINTING, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_4.SPAWN_PAINTING, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // motive map(Types1_7_6.POSITION_INT); // position map(Type.INT); // rotation } }); - this.registerClientbound(ClientboundPacketsb1_4.ENTITY_METADATA, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_4.ENTITY_METADATA, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Typesb1_4.METADATA_LIST, Types1_3_1.METADATA_LIST); // metadata handler(wrapper -> rewriteMetadata(wrapper.get(Types1_3_1.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPacketsb1_4.UPDATE_SIGN, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_4.UPDATE_SIGN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Types1_7_6.POSITION_SHORT); // position map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // line 1 map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // line 2 @@ -131,22 +131,22 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol wrapper.user().get(WorldTimeStorage.class).time = wrapper.get(Type.LONG, 0)); } }); - this.registerClientbound(ClientboundPacketsb1_5.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_5.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { create(Type.BYTE, (byte) 0); // dimension id } }); - this.registerClientbound(ClientboundPacketsb1_5.SPAWN_ENTITY, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_5.SPAWN_ENTITY, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.BYTE); // type id map(Type.INT); // x @@ -73,15 +73,15 @@ public class Protocolb1_6_0_6tob1_5_0_2 extends AbstractProtocol wrapper.user().get(PlayerHealthTracker.class).setHealth(wrapper.get(Type.SHORT, 0))); } }); - this.registerClientbound(ClientboundPacketsb1_7.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_7.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BYTE); // dimension id create(Type.BYTE, (byte) 1); // difficulty create(Type.BYTE, (byte) 0); // game mode @@ -104,9 +104,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol wrapper.write(Type.LONG, wrapper.user().get(SeedStorage.class).seed)); // seed } }); - this.registerClientbound(ClientboundPacketsb1_7.SPAWN_PLAYER, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsb1_7.SPAWN_PLAYER, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Types1_6_4.STRING); // username map(Type.INT); // x @@ -128,9 +128,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { final PlayerNameTracker playerNameTracker = wrapper.user().get(PlayerNameTracker.class); - final String name = playerNameTracker.names.get(wrapper.get(Type.INT, 0)); + final String name = playerNameTracker.names.get(wrapper.get(Type.INT, 0).intValue()); if (name != null) { final PacketWrapper playerListEntry = PacketWrapper.create(ClientboundPacketsb1_8.PLAYER_INFO, wrapper.user()); playerListEntry.write(Types1_6_4.STRING, name); // name @@ -180,9 +180,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { final Chunk chunk = wrapper.passthrough(new Chunk1_1Type(wrapper.user().get(ClientWorld.class))); @@ -207,16 +207,16 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { wrapper.cancel(); final PacketWrapper pingResponse = PacketWrapper.create(ClientboundPacketsb1_8.DISCONNECT, wrapper.user()); @@ -236,9 +236,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { final short status = wrapper.get(Type.UNSIGNED_BYTE, 0); @@ -271,9 +271,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { @@ -299,9 +299,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { if (wrapper.passthrough(Type.SHORT) /*slot*/ == -1) wrapper.cancel(); @@ -312,9 +312,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol { wrapper.cancel(); // Track the item for later use in classic protocols diff --git a/src/main/java/net/raphimc/vialegacy/protocols/classic/protocola1_0_15toc0_28_30/Protocola1_0_15toc0_30.java b/src/main/java/net/raphimc/vialegacy/protocols/classic/protocola1_0_15toc0_28_30/Protocola1_0_15toc0_30.java index 46f8467..72988c3 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/classic/protocola1_0_15toc0_28_30/Protocola1_0_15toc0_30.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/classic/protocola1_0_15toc0_28_30/Protocola1_0_15toc0_30.java @@ -25,7 +25,7 @@ import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; import net.raphimc.vialegacy.api.data.BlockList1_6; @@ -66,16 +66,16 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol s.replace("&", "§")); // reason } }); - this.registerClientbound(ClientboundPacketsc0_28.JOIN_GAME, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsc0_28.JOIN_GAME, new PacketHandlers() { @Override - public void registerMap() { + public void register() { read(Type.BYTE); // protocol id handler(wrapper -> { final String title = wrapper.read(Typesc0_30.STRING).replace("&", "§"); // title @@ -106,9 +106,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { wrapper.cancel(); @@ -139,9 +139,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { wrapper.cancel(); final short partSize = wrapper.read(Type.SHORT); // part size @@ -157,9 +157,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { wrapper.cancel(); final short sizeX = wrapper.read(Type.SHORT); @@ -200,9 +200,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class); @@ -224,9 +224,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol n.replace("&", "§")); // username map(Type.SHORT, Type.INT); // x @@ -278,9 +278,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol (byte) (yaw + 128)); // yaw map(Type.BYTE); // pitch } }); - this.registerClientbound(ClientboundPacketsc0_28.DESTROY_ENTITIES, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsc0_28.DESTROY_ENTITIES, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BYTE, Type.INT); // entity id } }); - this.registerClientbound(ClientboundPacketsc0_28.CHAT_MESSAGE, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsc0_28.CHAT_MESSAGE, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(packetWrapper -> { final byte senderId = packetWrapper.read(Type.BYTE); // sender id String message = packetWrapper.read(Typesc0_30.STRING).replace("&", "§"); // message @@ -344,15 +344,15 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol s.replace("&", "§")); // reason } }); - this.registerClientbound(ClientboundPacketsc0_28.OP_LEVEL_UPDATE, null, new PacketRemapper() { + this.registerClientbound(ClientboundPacketsc0_28.OP_LEVEL_UPDATE, null, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { wrapper.cancel(); final byte opLevel = wrapper.read(Type.BYTE); // op level @@ -361,9 +361,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final String message = wrapper.read(Typesb1_7_0_3.STRING); // message wrapper.write(Type.BYTE, (byte) 0); // sender id @@ -390,9 +390,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final ClassicPositionTracker positionTracker = wrapper.user().get(ClassicPositionTracker.class); @@ -402,9 +402,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final ClassicPositionTracker positionTracker = wrapper.user().get(ClassicPositionTracker.class); final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class); @@ -419,9 +419,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final ClassicPositionTracker positionTracker = wrapper.user().get(ClassicPositionTracker.class); final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class); @@ -434,9 +434,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final ClassicPositionTracker positionTracker = wrapper.user().get(ClassicPositionTracker.class); final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class); @@ -453,9 +453,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { wrapper.user().getStoredObjects().remove(BlockDigStorage.class); final ClassicLevel level = wrapper.user().get(ClassicLevelStorage.class).getClassicLevel(); @@ -489,9 +489,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol { final ClassicLevel level = wrapper.user().get(ClassicLevelStorage.class).getClassicLevel(); final ClassicBlockRemapper remapper = wrapper.user().get(ClassicBlockRemapper.class); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_16a_02to0_0_15a_1/Protocolc0_0_16a_02to0_0_15a_1.java b/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_16a_02to0_0_15a_1/Protocolc0_0_16a_02to0_0_15a_1.java index f6f0632..5caabbb 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_16a_02to0_0_15a_1/Protocolc0_0_16a_02to0_0_15a_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_16a_02to0_0_15a_1/Protocolc0_0_16a_02to0_0_15a_1.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.types.Typesc0_30; @@ -36,9 +36,9 @@ public class Protocolc0_0_16a_02to0_0_15a_1 extends AbstractProtocol { final String username = wrapper.read(Typesc0_30.STRING); // username @@ -48,9 +48,9 @@ public class Protocolc0_0_16a_02to0_0_15a_1 extends AbstractProtocol { wrapper.clearPacket(); wrapper.write(Typesc0_30.STRING, wrapper.user().getProtocolInfo().getUsername()); // username diff --git a/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_20a_27toc0_0_19a_06/Protocolc0_27toc0_0_19a_06.java b/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_20a_27toc0_0_19a_06/Protocolc0_27toc0_0_19a_06.java index 0e907c6..65c482f 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_20a_27toc0_0_19a_06/Protocolc0_27toc0_0_19a_06.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_20a_27toc0_0_19a_06/Protocolc0_27toc0_0_19a_06.java @@ -20,7 +20,7 @@ package net.raphimc.vialegacy.protocols.classic.protocolc0_0_20a_27toc0_0_19a_06 import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ServerboundPacketsc0_28; @@ -38,9 +38,9 @@ public class Protocolc0_27toc0_0_19a_06 extends AbstractProtocol { if (wrapper.user().getProtocolInfo().getPipeline().contains(Protocol1_6_2to1_6_1.class)) { final ExtensionProtocolMetadataStorage protocolMetadataStorage = wrapper.user().get(ExtensionProtocolMetadataStorage.class); @@ -88,9 +88,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { wrapper.cancel(); final ExtensionProtocolMetadataStorage protocolMetadataStorage = wrapper.user().get(ExtensionProtocolMetadataStorage.class); @@ -104,9 +104,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { wrapper.cancel(); final ExtensionProtocolMetadataStorage protocolMetadataStorage = wrapper.user().get(ExtensionProtocolMetadataStorage.class); @@ -156,9 +156,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { wrapper.cancel(); final byte level = wrapper.read(Type.BYTE); // support level @@ -171,9 +171,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { final ExtHackControlStorage hackControlStorage = wrapper.user().get(ExtHackControlStorage.class); final boolean flying = wrapper.read(Type.BOOLEAN); // flying @@ -205,9 +205,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { wrapper.cancel(); final ExtBlockPermissionsStorage blockPermissionsStorage = wrapper.user().get(ExtBlockPermissionsStorage.class); @@ -228,9 +228,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { wrapper.cancel(); final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class); @@ -267,9 +267,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { final byte direction = wrapper.read(Type.BYTE); // direction final short data = wrapper.read(Type.SHORT); // data @@ -284,9 +284,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol { @@ -319,9 +319,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol msg.replace("\u00C2", "")); // message } }); - this.registerClientbound(ClientboundPackets1_0.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_0.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BYTE); // dimension id map(Type.BYTE); // difficulty map(Type.BYTE); // game mode @@ -107,9 +107,9 @@ public class Protocol1_1to1_0_0_1 extends AbstractProtocol msg.replace("\u00C2", "")); // line 1 map(Types1_6_4.STRING, Types1_6_4.STRING, msg -> msg.replace("\u00C2", "")); // line 2 @@ -117,9 +117,9 @@ public class Protocol1_1to1_0_0_1 extends AbstractProtocol msg.replace("\u00C2", "")); // line 4 } }); - this.registerClientbound(ClientboundPackets1_0.DISCONNECT, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_0.DISCONNECT, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Types1_6_4.STRING, Types1_6_4.STRING, reason -> reason.replace("\u00C2", "")); // reason } }); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/Protocol1_2_1_3to1_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/Protocol1_2_1_3to1_1.java index a5b66f6..abe1aea 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/Protocol1_2_1_3to1_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/Protocol1_2_1_3to1_1.java @@ -28,7 +28,7 @@ import com.viaversion.viaversion.api.platform.providers.ViaProviders; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import net.raphimc.vialegacy.ViaLegacy; @@ -73,9 +73,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol wrapper.user().get(SeedStorage.class).seed = wrapper.read(Type.LONG)); // seed @@ -88,9 +88,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol handleRespawn(wrapper.get(Type.INT, 2), wrapper.user())); } }); - this.registerClientbound(ClientboundPackets1_1.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_1.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BYTE, Type.INT); // dimension id map(Type.BYTE); // difficulty map(Type.BYTE); // game mode @@ -100,9 +100,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol handleRespawn(wrapper.get(Type.INT, 0), wrapper.user())); } }); - this.registerClientbound(ClientboundPackets1_1.SPAWN_MOB, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_1.SPAWN_MOB, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.UNSIGNED_BYTE); // type id map(Type.INT); // x @@ -114,18 +114,18 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol sendEntityHeadLook(wrapper.get(Type.INT, 0), wrapper.get(Type.BYTE, 0), wrapper)); } }); - this.registerClientbound(ClientboundPackets1_1.ENTITY_POSITION_AND_ROTATION, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_1.ENTITY_POSITION_AND_ROTATION, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.BYTE); // x map(Type.BYTE); // y @@ -135,9 +135,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol sendEntityHeadLook(wrapper.get(Type.INT, 0), wrapper.get(Type.BYTE, 3), wrapper)); } }); - this.registerClientbound(ClientboundPackets1_1.ENTITY_TELEPORT, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_1.ENTITY_TELEPORT, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.INT); // x map(Type.INT); // y @@ -147,9 +147,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol sendEntityHeadLook(wrapper.get(Type.INT, 0), wrapper.get(Type.BYTE, 0), wrapper)); } }); - this.registerClientbound(ClientboundPackets1_1.CHUNK_DATA, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_1.CHUNK_DATA, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { final ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); final ChunkTracker chunkTracker = wrapper.user().get(ChunkTracker.class); @@ -220,9 +220,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol wrapper.user().get(PendingBlocksTracker.class).markReceived(wrapper.get(Types1_7_6.POSITION_UBYTE, 0))); } }); - this.registerClientbound(ClientboundPackets1_1.EXPLOSION, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_1.EXPLOSION, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.DOUBLE); // x map(Type.DOUBLE); // y map(Type.DOUBLE); // z @@ -274,9 +274,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol s.split(";")[0]); // info } }); - this.registerServerbound(State.LOGIN, ServerboundPackets1_1.LOGIN.getId(), ServerboundPackets1_2_1.LOGIN.getId(), new PacketRemapper() { + this.registerServerbound(State.LOGIN, ServerboundPackets1_1.LOGIN.getId(), ServerboundPackets1_2_1.LOGIN.getId(), new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // protocol id map(Types1_6_4.STRING); // username create(Type.LONG, 0L); // seed @@ -314,9 +314,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol { handleHandshake(wrapper); wrapper.write(Type.SHORT_BYTE_ARRAY, new byte[0]); @@ -97,18 +97,18 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { handleHandshake(wrapper); // Very hacky but some servers expect the client to send back a Packet1Login wrapper.cancel(); }); } }); - this.registerClientbound(ClientboundPackets1_2_4.JOIN_GAME, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_2_4.JOIN_GAME, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id read(Types1_6_4.STRING); // username map(Types1_6_4.STRING); // level type @@ -126,9 +126,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { @@ -138,9 +138,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { @@ -213,9 +213,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol new int[]{i}); handler(wrapper -> { final EntityTracker tracker = wrapper.user().get(EntityTracker.class); @@ -331,9 +331,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { @@ -404,9 +404,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { @@ -423,9 +423,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { final int chunkX = wrapper.read(Type.INT); // x final int chunkZ = wrapper.read(Type.INT); // z @@ -443,9 +443,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { final ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); Chunk chunk = wrapper.read(new Chunk1_2_4Type(clientWorld)); @@ -470,17 +470,17 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { @@ -614,9 +614,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { final boolean disableDamage = wrapper.read(Type.BOOLEAN); // invulnerable final boolean flying = wrapper.read(Type.BOOLEAN); // flying @@ -636,9 +636,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { wrapper.read(Type.UNSIGNED_BYTE); // protocol id final String userName = wrapper.read(Types1_6_4.STRING); // user name @@ -650,9 +650,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol itemRewriter.handleItemToServer(wrapper.get(Types1_2_4.COMPRESSED_NBT_ITEM, 0))); } }); - this.registerServerbound(ServerboundPackets1_3_1.PLAYER_ABILITIES, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_3_1.PLAYER_ABILITIES, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { final byte mask = wrapper.read(Type.BYTE); // flags wrapper.read(Type.BYTE); // fly speed @@ -746,9 +746,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol { final byte action = wrapper.read(Type.BYTE); // force respawn if (action != 1) { diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/Protocol1_4_2to1_3_1_2.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/Protocol1_4_2to1_3_1_2.java index 3d81b49..b416d0d 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/Protocol1_4_2to1_3_1_2.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/Protocol1_4_2to1_3_1_2.java @@ -26,7 +26,7 @@ import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.ViaLegacy; @@ -59,9 +59,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol { final String reason = wrapper.read(Types1_6_4.STRING); // reason try { @@ -76,18 +76,18 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol { final long time = wrapper.passthrough(Type.LONG); // time wrapper.write(Type.LONG, time % 24_000); // time of day }); } }); - this.registerClientbound(ClientboundPackets1_3_1.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_3_1.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // dimension id map(Type.BYTE); // difficulty map(Type.BYTE); // game mode @@ -105,9 +105,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_4_2.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_3_1.SPAWN_ITEM, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_3_1.SPAWN_ITEM, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Types1_3_1.NBTLESS_ITEM, Types1_7_6.COMPRESSED_ITEM); map(Type.INT); // x @@ -133,9 +133,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_4_2.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_3_1.EFFECT, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_3_1.EFFECT, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // effect id map(Types1_7_6.POSITION_UBYTE); // position map(Type.INT); // data create(Type.BOOLEAN, false); // server wide } }); - this.registerClientbound(ClientboundPackets1_3_1.NAMED_SOUND, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_3_1.NAMED_SOUND, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { final String oldSound = wrapper.read(Types1_6_4.STRING); // sound String newSound = SoundRewriter.map(oldSound); @@ -222,9 +222,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol { final String channel = wrapper.get(Types1_6_4.STRING, 0); @@ -267,15 +267,15 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_6_4.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_4_2.SPAWN_MOB, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_4_2.SPAWN_MOB, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.UNSIGNED_BYTE); // type id map(Type.INT); // x @@ -86,9 +86,9 @@ public class Protocol1_4_4_5to1_4_2 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_6_4.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_4_2.ENTITY_METADATA, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_4_2.ENTITY_METADATA, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Types1_4_2.METADATA_LIST, Types1_6_4.METADATA_LIST); // metadata handler(wrapper -> rewriteMetadata(wrapper.get(Types1_6_4.METADATA_LIST, 0))); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/Protocol1_4_6_7to1_4_4_5.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/Protocol1_4_6_7to1_4_4_5.java index 51d1390..1fc6a60 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/Protocol1_4_6_7to1_4_4_5.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/Protocol1_4_6_7to1_4_4_5.java @@ -24,7 +24,7 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import net.raphimc.vialegacy.api.remapper.LegacyItemRewriter; @@ -51,9 +51,9 @@ public class Protocol1_4_6_7to1_4_4_5 extends AbstractProtocol wrapper.user().get(ClientWorld.class).setEnvironment(wrapper.get(Type.BYTE, 1))); } }); - this.registerClientbound(ClientboundPackets1_4_4.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_4_4.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // dimension id map(Type.BYTE); // difficulty map(Type.BYTE); // game mode @@ -75,9 +75,9 @@ public class Protocol1_4_6_7to1_4_4_5 extends AbstractProtocol wrapper.user().get(ClientWorld.class).setEnvironment(wrapper.get(Type.INT, 0))); } }); - this.registerClientbound(ClientboundPackets1_4_4.SPAWN_ITEM, ClientboundPackets1_4_6.SPAWN_ENTITY, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_4_4.SPAWN_ITEM, ClientboundPackets1_4_6.SPAWN_ENTITY, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { final int entityId = wrapper.read(Type.INT); // entity id final Item item = wrapper.read(Types1_7_6.COMPRESSED_ITEM); // item @@ -110,9 +110,9 @@ public class Protocol1_4_6_7to1_4_4_5 extends AbstractProtocol { final ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); wrapper.write(new ChunkBulk1_7_6Type(clientWorld), wrapper.read(new ChunkBulk1_4_4Type(clientWorld))); @@ -134,9 +134,9 @@ public class Protocol1_4_6_7to1_4_4_5 extends AbstractProtocol { final short status = wrapper.get(Type.UNSIGNED_BYTE, 0); diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/Protocol1_5_0_1to1_4_6_7.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/Protocol1_5_0_1to1_4_6_7.java index 6664e00..1fea4e9 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/Protocol1_5_0_1to1_4_6_7.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/Protocol1_5_0_1to1_4_6_7.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.remapper.LegacyItemRewriter; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; @@ -44,9 +44,9 @@ public class Protocol1_5_0_1to1_4_6_7 extends AbstractProtocol { @@ -108,9 +108,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol { final EntityTracker tracker = wrapper.user().get(EntityTracker.class); @@ -195,9 +195,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol { @@ -212,9 +212,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol { @@ -235,9 +235,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol { final String oldSound = wrapper.read(Types1_6_4.STRING); // sound String newSound = SoundRewriter.map(oldSound); @@ -259,34 +259,34 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol b / 255F); // fly speed map(Type.BYTE, Type.FLOAT, b -> b / 255F); // walk speed } }); - this.registerServerbound(State.STATUS, ServerboundPackets1_5_2.SERVER_PING.getId(), ServerboundPackets1_6_4.SERVER_PING.getId(), new PacketRemapper() { + this.registerServerbound(State.STATUS, ServerboundPackets1_5_2.SERVER_PING.getId(), ServerboundPackets1_6_4.SERVER_PING.getId(), new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { wrapper.clearPacket(); wrapper.write(Type.BYTE, (byte) 1); // readSuccessfully }); } }); - this.registerServerbound(ServerboundPackets1_6_4.ENTITY_ACTION, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_6_4.ENTITY_ACTION, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.BYTE); // action id read(Type.INT); // action parameter @@ -295,9 +295,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol { final AttachTracker attachTracker = wrapper.user().get(AttachTracker.class); final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class); @@ -319,9 +319,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol (byte) (f * 255F)); // fly speed map(Type.FLOAT, Type.BYTE, f -> (byte) (f * 255F)); // walk speed diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/Protocol1_6_2to1_6_1.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/Protocol1_6_2to1_6_1.java index f55b4a2..1221f4c 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/Protocol1_6_2to1_6_1.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/Protocol1_6_2to1_6_1.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import net.raphimc.vialegacy.api.data.ItemList1_6; import net.raphimc.vialegacy.api.splitter.PreNettySplitter; @@ -42,9 +42,9 @@ public class Protocol1_6_2to1_6_1 extends AbstractProtocol { final PacketWrapper brand = PacketWrapper.create(ClientboundPackets1_6_4.PLUGIN_MESSAGE, wrapper.user()); brand.write(Types1_6_4.STRING, "MC|Brand"); @@ -58,9 +58,9 @@ public class Protocol1_6_2to1_6_1 extends AbstractProtocol { final int amount = wrapper.passthrough(Type.INT); // count @@ -73,9 +73,9 @@ public class Protocol1_6_2to1_6_1 extends AbstractProtocol { final String reason = wrapper.read(Types1_6_4.STRING); // reason try { @@ -108,9 +108,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final ProtocolInfo info = wrapper.user().getProtocolInfo(); final ProtocolMetadataStorage protocolMetadata = wrapper.user().get(ProtocolMetadataStorage.class); @@ -138,9 +138,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { ViaLegacy.getPlatform().getLogger().warning("Server skipped LOGIN state"); final PacketWrapper sharedKey = PacketWrapper.create(ClientboundPackets1_6_4.SHARED_KEY, wrapper.user()); @@ -176,9 +176,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { wrapper.user().get(PlayerInfoStorage.class).entityId = wrapper.get(Type.INT, 0); @@ -204,24 +204,24 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol TranslationRewriter.toClient(ChatComponentRewriter.toClient(msg))); // message } }); - this.registerClientbound(ClientboundPackets1_6_4.ENTITY_EQUIPMENT, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.ENTITY_EQUIPMENT, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id map(Type.SHORT); // slot map(Types1_7_6.COMPRESSED_ITEM); // item handler(wrapper -> itemRewriter.handleItemToClient(wrapper.get(Types1_7_6.COMPRESSED_ITEM, 0))); } }); - this.registerClientbound(ClientboundPackets1_6_4.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // dimension id map(Type.BYTE, Type.UNSIGNED_BYTE); // difficulty map(Type.BYTE, Type.UNSIGNED_BYTE); // gamemode @@ -238,9 +238,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final PlayerInfoStorage playerInfoStorage = wrapper.user().get(PlayerInfoStorage.class); final boolean supportsFlags = wrapper.user().getProtocolInfo().getPipeline().contains(Protocol1_8to1_7_6_10.class); @@ -273,9 +273,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final PlayerInfoStorage playerInfoStorage = wrapper.user().get(PlayerInfoStorage.class); final boolean supportsFlags = wrapper.user().getProtocolInfo().getPipeline().contains(Protocol1_8to1_7_6_10.class); @@ -299,9 +299,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final PlayerInfoStorage playerInfoStorage = wrapper.user().get(PlayerInfoStorage.class); final boolean supportsFlags = wrapper.user().getProtocolInfo().getPipeline().contains(Protocol1_8to1_7_6_10.class); @@ -334,9 +334,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { if (wrapper.read(Type.BYTE) != 0) wrapper.cancel(); @@ -362,9 +362,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { short animate = wrapper.read(Type.BYTE); // animation @@ -378,9 +378,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final String name = wrapper.read(Types1_6_4.STRING); // name @@ -402,9 +402,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_7_6.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_6_4.SPAWN_ENTITY, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.SPAWN_ENTITY, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT, Type.VAR_INT); // entity id map(Type.BYTE); // type id map(Type.INT); // x @@ -426,9 +426,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_7_6.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_6_4.SPAWN_PAINTING, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.SPAWN_PAINTING, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT, Type.VAR_INT); // entity id map(Types1_6_4.STRING, Type.STRING); // motive map(Types1_7_6.POSITION_INT); // position map(Type.INT); // rotation } }); - this.registerClientbound(ClientboundPackets1_6_4.SPAWN_EXPERIENCE_ORB, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.SPAWN_EXPERIENCE_ORB, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT, Type.VAR_INT); // entity id map(Type.INT); // x map(Type.INT); // y @@ -463,17 +463,17 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol rewriteMetadata(wrapper.get(Types1_7_6.METADATA_LIST, 0))); } }); - this.registerClientbound(ClientboundPackets1_6_4.ENTITY_PROPERTIES, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.ENTITY_PROPERTIES, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // entity id handler(wrapper -> { final int amount = wrapper.passthrough(Type.INT); // count @@ -490,18 +490,18 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final Chunk chunk = wrapper.passthrough(new Chunk1_7_6Type(wrapper.user().get(ClientWorld.class))); wrapper.user().get(ChunkTracker.class).trackAndRemap(chunk); }); } }); - this.registerClientbound(ClientboundPackets1_6_4.MULTI_BLOCK_CHANGE, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.MULTI_BLOCK_CHANGE, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // chunkX map(Type.INT); // chunkZ map(Types1_7_6.BLOCK_CHANGE_RECORD_ARRAY); // blockChangeRecords @@ -521,9 +521,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final Chunk[] chunks = wrapper.passthrough(new ChunkBulk1_7_6Type(wrapper.user().get(ClientWorld.class))); for (Chunk chunk : chunks) { @@ -566,9 +566,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final String oldSound = wrapper.read(Types1_6_4.STRING); // sound String newSound = SoundRewriter.map(oldSound); @@ -614,9 +614,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { @@ -696,9 +696,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol itemRewriter.handleItemToClient(wrapper.get(Types1_7_6.COMPRESSED_ITEM, 0))); } }); - this.registerClientbound(ClientboundPackets1_6_4.WINDOW_ITEMS, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_6_4.WINDOW_ITEMS, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BYTE, Type.UNSIGNED_BYTE); // window id handler(wrapper -> { final Item[] items = wrapper.passthrough(Types1_7_6.COMPRESSED_ITEM_ARRAY); // items @@ -744,9 +744,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { wrapper.cancel(); final StatisticsStorage statisticsStorage = wrapper.user().get(StatisticsStorage.class); @@ -789,17 +789,17 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final String completions = wrapper.read(Types1_6_4.STRING); // completions final String[] completionsArray = completions.split("\0"); @@ -810,17 +810,17 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { wrapper.write(Type.STRING, wrapper.read(Types1_6_4.STRING)); // name final byte mode = wrapper.passthrough(Type.BYTE); // mode @@ -831,16 +831,16 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final byte mode = wrapper.passthrough(Type.BYTE); // mode @@ -859,9 +859,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final String channel = wrapper.get(Type.STRING, 0); @@ -881,17 +881,17 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final HandshakeStorage handshakeStorage = wrapper.user().get(HandshakeStorage.class); final String ip = handshakeStorage.getHostname(); @@ -906,9 +906,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { wrapper.cancel(); final PacketWrapper pong = PacketWrapper.create(ClientboundStatusPackets.PONG_RESPONSE, wrapper.user()); @@ -917,9 +917,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final String name = wrapper.read(Type.STRING); // user name final ProtocolInfo info = wrapper.user().getProtocolInfo(); @@ -936,30 +936,30 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol wrapper.write(Type.INT, wrapper.user().get(PlayerInfoStorage.class).entityId)); // player id map(Type.INT); // entity id map(Type.BYTE); // mode } }); - this.registerServerbound(ServerboundPackets1_7_2.PLAYER_MOVEMENT, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_7_2.PLAYER_MOVEMENT, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.BOOLEAN); // onGround handler(wrapper -> wrapper.user().get(PlayerInfoStorage.class).onGround = wrapper.get(Type.BOOLEAN, 0)); } }); - this.registerServerbound(ServerboundPackets1_7_2.PLAYER_POSITION, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_7_2.PLAYER_POSITION, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.DOUBLE); // x map(Type.DOUBLE); // y map(Type.DOUBLE); // stance @@ -974,9 +974,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol itemRewriter.handleItemToServer(wrapper.get(Types1_7_6.COMPRESSED_ITEM, 0))); } }); - this.registerServerbound(ServerboundPackets1_7_2.UPDATE_SIGN, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_7_2.UPDATE_SIGN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Types1_7_6.POSITION_SHORT); // position map(Type.STRING, Types1_6_4.STRING); // line 1 map(Type.STRING, Types1_6_4.STRING); // line 2 @@ -1043,15 +1043,15 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { byte renderDistance = wrapper.read(Type.BYTE); // render distance @@ -1078,9 +1078,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { final int action = wrapper.read(Type.VAR_INT); // action @@ -1108,9 +1108,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol { diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java index 4a7bc84..d51556d 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java @@ -20,7 +20,7 @@ package net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.baseproto import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.base.ServerboundHandshakePackets; import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.HandshakeStorage; @@ -36,9 +36,9 @@ public class PreNettyBaseProtocol extends AbstractSimpleProtocol { @Override protected void registerPackets() { - this.registerServerbound(State.HANDSHAKE, ServerboundHandshakePackets.CLIENT_INTENTION.getId(), ServerboundHandshakePackets.CLIENT_INTENTION.getId(), new PacketRemapper() { + this.registerServerbound(State.HANDSHAKE, ServerboundHandshakePackets.CLIENT_INTENTION.getId(), ServerboundHandshakePackets.CLIENT_INTENTION.getId(), new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { wrapper.cancel(); wrapper.read(Type.VAR_INT); // protocolVersion diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_6_10to1_7_2_5/Protocol1_7_6_10to1_7_2_5.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_6_10to1_7_2_5/Protocol1_7_6_10to1_7_2_5.java index 8bed0cf..c004d8a 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_6_10to1_7_2_5/Protocol1_7_6_10to1_7_2_5.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_6_10to1_7_2_5/Protocol1_7_6_10to1_7_2_5.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; @@ -48,16 +48,16 @@ public class Protocol1_7_6_10to1_7_2_5 extends AbstractProtocol TranslationRewriter.toClient(chatItemRewriter.remapShowItem(msg))); // message create(Type.BYTE, (byte) 0); // position } }); - this.registerClientbound(ClientboundPackets1_7_2.ENTITY_EQUIPMENT, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_7_2.ENTITY_EQUIPMENT, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT, Type.VAR_INT); // entity id map(Type.SHORT); // slot map(Types1_7_6.COMPRESSED_ITEM, Type.ITEM); // item handler(wrapper -> itemRewriter.handleItemToClient(wrapper.get(Type.ITEM, 0))); } }); - this.registerClientbound(ClientboundPackets1_7_2.SPAWN_POSITION, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_7_2.SPAWN_POSITION, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Types1_7_6.POSITION_INT, Type.POSITION); // position } }); - this.registerClientbound(ClientboundPackets1_7_2.UPDATE_HEALTH, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_7_2.UPDATE_HEALTH, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.FLOAT); // health map(Type.SHORT, Type.VAR_INT); // food map(Type.FLOAT); // saturation } }); - this.registerClientbound(ClientboundPackets1_7_2.RESPAWN, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_7_2.RESPAWN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.INT); // dimension id map(Type.UNSIGNED_BYTE); // difficulty map(Type.UNSIGNED_BYTE); // gamemode @@ -193,9 +193,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol stance - 1.62F); // y map(Type.DOUBLE); // z @@ -205,16 +205,16 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { wrapper.passthrough(Type.VAR_INT); // entity id final UUID uuid = UUID.fromString(wrapper.read(Type.STRING)); // uuid @@ -255,9 +255,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { @@ -265,9 +265,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final EntityTracker tracker = wrapper.user().get(EntityTracker.class); @@ -434,15 +434,15 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { @@ -581,9 +581,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final int amount = wrapper.passthrough(Type.INT); // count @@ -626,9 +626,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final Chunk chunk = wrapper.read(new Chunk1_7_6Type(wrapper.user().get(ClientWorld.class))); wrapper.user().get(ChunkTracker.class).trackAndRemap(chunk); @@ -636,9 +636,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final int blockId = wrapper.read(Type.VAR_INT); // block id @@ -672,26 +672,26 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final Chunk[] chunks = wrapper.read(new ChunkBulk1_7_6Type(wrapper.user().get(ClientWorld.class))); for (Chunk chunk : chunks) { @@ -701,9 +701,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { int effectId = wrapper.read(Type.INT); // effect id final Position pos = wrapper.read(Types1_7_6.POSITION_UBYTE); // position @@ -786,9 +786,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final String[] parts = wrapper.read(Type.STRING).split("_", 3); Particle particle = Particle.find(parts[0]); @@ -827,9 +827,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { @@ -842,9 +842,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE); // window id final short windowType = wrapper.read(Type.UNSIGNED_BYTE); // window type @@ -917,9 +917,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final short windowId = wrapper.read(Type.BYTE); // window id wrapper.write(Type.UNSIGNED_BYTE, windowId); // actually wrong, should by BYTE but Via uses U_BYTE @@ -932,9 +932,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol itemRewriter.handleItemToClient(wrapper.get(Type.ITEM, 0))); } }); - this.registerClientbound(ClientboundPackets1_7_2.WINDOW_ITEMS, new PacketRemapper() { + this.registerClientbound(ClientboundPackets1_7_2.WINDOW_ITEMS, new PacketHandlers() { @Override - public void registerMap() { + public void register() { handler(wrapper -> { final short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE); // window id final short windowType = wrapper.user().get(WindowTracker.class).get(windowId); @@ -953,9 +953,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final int id = wrapper.passthrough(Type.VAR_INT); // map id final byte[] data = wrapper.read(Type.SHORT_BYTE_ARRAY); // data @@ -1046,23 +1046,23 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final String name = wrapper.read(Type.STRING); // name final boolean online = wrapper.read(Type.BOOLEAN); // online @@ -1098,9 +1098,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final String value = wrapper.read(Type.STRING); // value @@ -1113,9 +1113,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final byte mode = wrapper.passthrough(Type.BYTE); // mode @@ -1128,9 +1128,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final byte mode = wrapper.passthrough(Type.BYTE); // mode @@ -1153,9 +1153,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final String channel = wrapper.get(Type.STRING, 0); @@ -1206,22 +1206,22 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final int mode = wrapper.read(Type.VAR_INT); // mode @@ -1241,9 +1241,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol wrapper.write(Type.DOUBLE, wrapper.get(Type.DOUBLE, 1) + 1.62)); // stance @@ -1251,9 +1251,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol wrapper.write(Type.DOUBLE, wrapper.get(Type.DOUBLE, 1) + 1.62)); // stance @@ -1263,17 +1263,17 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class); wrapper.write(Type.INT, entityTracker.getPlayerID()); // entity id @@ -1305,17 +1305,17 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol (byte) (action + 1)); // action id map(Type.VAR_INT, Type.INT); // action parameter } }); - this.registerServerbound(ServerboundPackets1_8.STEER_VEHICLE, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_8.STEER_VEHICLE, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.FLOAT); // sideways map(Type.FLOAT); // forwards handler(wrapper -> { @@ -1325,9 +1325,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final short windowId = wrapper.read(Type.UNSIGNED_BYTE); // window id wrapper.write(Type.BYTE, (byte) windowId); // actually wrong, should be BYTE but Via uses U_BYTE @@ -1359,17 +1359,17 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol itemRewriter.handleItemToServer(wrapper.get(Types1_7_6.COMPRESSED_ITEM, 0))); } }); - this.registerServerbound(ServerboundPackets1_8.CREATIVE_INVENTORY_ACTION, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_8.CREATIVE_INVENTORY_ACTION, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.SHORT); // slot map(Type.ITEM, Types1_7_6.COMPRESSED_ITEM); // item handler(wrapper -> itemRewriter.handleItemToServer(wrapper.get(Types1_7_6.COMPRESSED_ITEM, 0))); } }); - this.registerServerbound(ServerboundPackets1_8.UPDATE_SIGN, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_8.UPDATE_SIGN, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.POSITION, Types1_7_6.POSITION_SHORT); // position handler(wrapper -> { for (int i = 0; i < 4; i++) { @@ -1381,9 +1381,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol { final String text = wrapper.read(Type.STRING); // text wrapper.clearPacket(); // remove optional blockpos @@ -1391,9 +1391,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol (flags & 1) == 1); // skin flags -> show cape } }); - this.registerServerbound(ServerboundPackets1_8.PLUGIN_MESSAGE, new PacketRemapper() { + this.registerServerbound(ServerboundPackets1_8.PLUGIN_MESSAGE, new PacketHandlers() { @Override - public void registerMap() { + public void register() { map(Type.STRING); // channel handler(wrapper -> { final String channel = wrapper.get(Type.STRING, 0);