Upstream/ViaLegacy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaLegacy.git synced 2025-02-01 23:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Via*

Browse Source
This commit is contained in:
RaphiMC 2023-02-12 14:42:08 +01:00
parent 5b463dd3ec
commit 15e8c09963
32 changed files with 765 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -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

6
src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java
View File

@ -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<P extends Protocol> extends RewriterBas
public void registerCreativeInventoryAction(final ServerboundPacketType packetType, final Type<Item> 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));

6
src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_0_16_2toa1_0_15/Protocola1_0_16_2toa1_0_15.java
View File

@ -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<ClientboundPack
@Override
protected void registerPackets() {
this.registerServerbound(State.LOGIN, -1, ServerboundPacketsa1_0_17.HANDSHAKE.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, -1, ServerboundPacketsa1_0_17.HANDSHAKE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final PacketWrapper handshake = PacketWrapper.create(ClientboundPacketsa1_0_16.HANDSHAKE, wrapper.user());

6
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
View File

@ -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<Client
@Override
protected void registerPackets() {
this.registerServerbound(ServerboundPacketsa1_0_17.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_17.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT); // item id
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction

10
src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_2_0_1_2_1_1toa1_1_0_1_1_2_1/Protocola1_2_0_1_2_1_1toa1_1_0_1_1_2_1.java
View File

@ -20,7 +20,7 @@ package net.raphimc.vialegacy.protocols.alpha.protocola1_2_0_1_2_1_1toa1_1_0_1_1
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.alpha.protocola1_2_2toa1_2_0_1_2_1_1.ClientboundPacketsa1_2_0;
@ -35,9 +35,9 @@ public class Protocola1_2_0_1_2_1_1toa1_1_0_1_1_2_1 extends AbstractProtocol<Cli
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsa1_1_0.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_1_0.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Typesb1_7_0_3.STRING); // username
map(Typesb1_7_0_3.STRING); // password
@ -46,9 +46,9 @@ public class Protocola1_2_0_1_2_1_1toa1_1_0_1_1_2_1 extends AbstractProtocol<Cli
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsa1_1_0.LOGIN.getId(), ServerboundPacketsa1_2_0.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsa1_1_0.LOGIN.getId(), ServerboundPacketsa1_2_0.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // protocol id
map(Typesb1_7_0_3.STRING); // username
map(Typesb1_7_0_3.STRING); // password

6
src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_2_2toa1_2_0_1_2_1_1/Protocola1_2_2toa1_2_0_1_2_1_1.java
View File

@ -19,7 +19,7 @@ package net.raphimc.vialegacy.protocols.alpha.protocola1_2_2toa1_2_0_1_2_1_1;
import com.viaversion.viaversion.api.connection.UserConnection;
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_2_3_1_2_3_4toa1_2_2.ClientboundPacketsa1_2_2;
@ -33,9 +33,9 @@ public class Protocola1_2_2toa1_2_0_1_2_1_1 extends AbstractProtocol<Clientbound
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsa1_2_0.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_0.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

10
src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_2_3_1_2_3_4toa1_2_2/Protocola1_2_3_1_2_3_4toa1_2_2.java
View File

@ -20,7 +20,7 @@ package net.raphimc.vialegacy.protocols.alpha.protocola1_2_3_1_2_3_4toa1_2_2;
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.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_2_3_5_1_2_6toa1_2_3_1_2_3_4.ClientboundPacketsa1_2_3;
@ -34,9 +34,9 @@ public class Protocola1_2_3_1_2_3_4toa1_2_2 extends AbstractProtocol<Clientbound
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsa1_2_2.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_2.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientbound
}
});
this.registerServerbound(ServerboundPacketsa1_2_6.INTERACT_ENTITY, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_2_6.INTERACT_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // player id
map(Type.INT); // entity id
read(Type.BYTE); // mode

6
src/main/java/net/raphimc/vialegacy/protocols/alpha/protocola1_2_3_5_1_2_6toa1_2_3_1_2_3_4/Protocola1_2_3_5_1_2_6toa1_2_3_1_2_3_4.java
View File

@ -19,7 +19,7 @@ package net.raphimc.vialegacy.protocols.alpha.protocola1_2_3_5_1_2_6toa1_2_3_1_2
import com.viaversion.viaversion.api.connection.UserConnection;
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.protocolb1_0_1_1_1toa1_2_3_5_1_2_6.ClientboundPacketsa1_2_6;
@ -33,9 +33,9 @@ public class Protocola1_2_3_5_1_2_6toa1_2_3_1_2_3_4 extends AbstractProtocol<Cli
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsa1_2_3.ENTITY_VELOCITY, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_3.ENTITY_VELOCITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.SHORT, Type.SHORT, v -> (short) (v / 4.0F)); // velocity x
map(Type.SHORT, Type.SHORT, v -> (short) (v / 4.0F)); // velocity y

54
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
View File

@ -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<Clientb
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsa1_2_6.PLAYER_INVENTORY, ClientboundPacketsb1_1.WINDOW_ITEMS, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.PLAYER_INVENTORY, ClientboundPacketsb1_1.WINDOW_ITEMS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerClientbound(ClientboundPacketsa1_2_6.UPDATE_HEALTH, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.UPDATE_HEALTH, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.SHORT); // health
}
});
this.registerClientbound(ClientboundPacketsa1_2_6.RESPAWN, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.RESPAWN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerClientbound(ClientboundPacketsa1_2_6.HELD_ITEM_CHANGE, ClientboundPacketsb1_1.ENTITY_EQUIPMENT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.HELD_ITEM_CHANGE, ClientboundPacketsb1_1.ENTITY_EQUIPMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
create(Type.SHORT, (short) 0); // slot (hand)
map(Type.SHORT); // item id
@ -132,9 +132,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol<Clientb
});
}
});
this.registerClientbound(ClientboundPacketsa1_2_6.ADD_TO_INVENTORY, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.ADD_TO_INVENTORY, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerClientbound(ClientboundPacketsa1_2_6.PRE_CHUNK, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.PRE_CHUNK, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // chunkX
map(Type.INT); // chunkZ
map(Type.UNSIGNED_BYTE); // mode
@ -153,9 +153,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol<Clientb
});
}
});
this.registerClientbound(ClientboundPacketsa1_2_6.COMPLEX_ENTITY, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsa1_2_6.COMPLEX_ENTITY, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
}
});
this.registerServerbound(ServerboundPacketsb1_1.PLAYER_DIGGING, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_1.PLAYER_DIGGING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // status
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
@ -234,9 +234,9 @@ public class Protocolb1_0_1_1_1toa1_2_3_5_1_2_6 extends AbstractProtocol<Clientb
});
}
});
this.registerServerbound(ServerboundPacketsb1_1.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_1.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerServerbound(ServerboundPacketsb1_1.HELD_ITEM_CHANGE, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_1.HELD_ITEM_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerServerbound(ServerboundPacketsb1_1.CLOSE_WINDOW, null, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_1.CLOSE_WINDOW, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerServerbound(ServerboundPacketsb1_1.CLICK_WINDOW, ServerboundPacketsa1_2_6.COMPLEX_ENTITY, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_1.CLICK_WINDOW, ServerboundPacketsa1_2_6.COMPLEX_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<Clientb
});
}
});
this.registerServerbound(ServerboundPacketsb1_1.UPDATE_SIGN, ServerboundPacketsa1_2_6.COMPLEX_ENTITY, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_1.UPDATE_SIGN, ServerboundPacketsa1_2_6.COMPLEX_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
final Position pos = wrapper.passthrough(Types1_7_6.POSITION_SHORT); // position

26
src/main/java/net/raphimc/vialegacy/protocols/beta/protocol1_0_0_1tob1_8_0_1/Protocol1_0_0_1tob1_8_0_1.java
View File

@ -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<ClientboundPacke
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(ClientboundPacketsb1_8.SET_EXPERIENCE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_8.SET_EXPERIENCE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacke
});
}
});
this.registerClientbound(ClientboundPacketsb1_8.SET_SLOT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_8.SET_SLOT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Type.SHORT); // slot
map(Types1_4_2.NBTLESS_ITEM, Types1_2_4.COMPRESSED_NBT_ITEM); // item
}
});
this.registerClientbound(ClientboundPacketsb1_8.WINDOW_ITEMS, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_8.WINDOW_ITEMS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Types1_4_2.NBTLESS_ITEM_ARRAY, Types1_2_4.COMPRESSED_NBT_ITEM_ARRAY); // item
}
});
this.registerServerbound(ServerboundPackets1_0.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_0.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_2_4.COMPRESSED_NBT_ITEM, Types1_4_2.NBTLESS_ITEM);
}
});
this.registerServerbound(ServerboundPackets1_0.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_0.CLICK_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Type.SHORT); // slot
map(Type.BYTE); // button
@ -96,9 +96,9 @@ public class Protocol1_0_0_1tob1_8_0_1 extends AbstractProtocol<ClientboundPacke
map(Types1_2_4.COMPRESSED_NBT_ITEM, Types1_4_2.NBTLESS_ITEM); // item
}
});
this.registerServerbound(ServerboundPackets1_0.CREATIVE_INVENTORY_ACTION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_0.CREATIVE_INVENTORY_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT); // slot
map(Types1_2_4.COMPRESSED_NBT_ITEM, Typesb1_8_0_1.CREATIVE_ITEM); // item
handler(wrapper -> itemRewriter.handleItemToServer(wrapper.get(Typesb1_8_0_1.CREATIVE_ITEM, 0)));

46
src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_2_0_2tob1_1_2/Protocolb1_2_0_2tob1_1_2.java
View File

@ -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<ClientboundPacket
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsb1_1.ENTITY_EQUIPMENT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_1.ENTITY_EQUIPMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.SHORT); // slot
map(Type.SHORT); // item id
create(Type.SHORT, (short) 0); // item damage
}
});
this.registerClientbound(ClientboundPacketsb1_1.ENTITY_ANIMATION, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_1.ENTITY_ANIMATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE); // animation id
handler(wrapper -> {
@ -105,9 +105,9 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPacketsb1_1.SPAWN_ITEM, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_1.SPAWN_ITEM, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
handler(wrapper -> {
final short itemId = wrapper.read(Type.SHORT); // item id
@ -122,9 +122,9 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol<ClientboundPacket
map(Type.BYTE); // velocity z
}
});
this.registerClientbound(ClientboundPacketsb1_1.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_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
@ -135,9 +135,9 @@ public class Protocolb1_2_0_2tob1_1_2 extends AbstractProtocol<ClientboundPacket
create(Typesb1_2.METADATA_LIST, new ArrayList<>()); // 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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPacketsb1_1.MULTI_BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_1.MULTI_BLOCK_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // chunkX
map(Type.INT); // chunkZ
map(Types1_1.BLOCK_CHANGE_RECORD_ARRAY); // blockChangeRecords
handler(wrapper -> 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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPacketsb1_1.SET_SLOT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_1.SET_SLOT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Type.SHORT); // slot
map(Typesb1_1.NBTLESS_ITEM, Types1_4_2.NBTLESS_ITEM); // item
}
});
this.registerServerbound(ServerboundPacketsb1_2.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_2.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_4_2.NBTLESS_ITEM, Typesb1_1.NBTLESS_ITEM); // item
}
});
this.registerServerbound(ServerboundPacketsb1_2.ENTITY_ACTION, ServerboundPacketsb1_1.ANIMATION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_2.ENTITY_ACTION, ServerboundPacketsb1_1.ANIMATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE, Type.UNSIGNED_BYTE, i -> (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

18
src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_3_0_1tob1_2_0_2/Protocolb1_3_0_1tob1_2_0_2.java
View File

@ -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<ClientboundPack
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsb1_2.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_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
@ -63,18 +63,18 @@ public class Protocolb1_3_0_1tob1_2_0_2 extends AbstractProtocol<ClientboundPack
handler(wrapper -> 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<ClientboundPack
});
}
});
this.registerServerbound(ServerboundPacketsb1_4.ENTITY_ACTION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_4.ENTITY_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE); // action id
handler(wrapper -> {

66
src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_5_0_2tob1_4_0_1/Protocolb1_5_0_2tob1_4_0_1.java
View File

@ -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<ClientboundPack
@Override
protected void registerPackets() {
this.registerClientbound(State.LOGIN, ClientboundPacketsb1_4.HANDSHAKE.getId(), ClientboundPacketsb1_5.HANDSHAKE.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPacketsb1_4.HANDSHAKE.getId(), ClientboundPacketsb1_5.HANDSHAKE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // server hash
}
});
this.registerClientbound(State.LOGIN, ClientboundPacketsb1_4.DISCONNECT.getId(), ClientboundPacketsb1_5.DISCONNECT.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPacketsb1_4.DISCONNECT.getId(), ClientboundPacketsb1_5.DISCONNECT.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // reason
}
});
this.registerClientbound(ClientboundPacketsb1_4.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_4.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // username
read(Typesb1_7_0_3.STRING); // password
@ -66,15 +66,15 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
map(Type.BYTE); // dimension id
}
});
this.registerClientbound(ClientboundPacketsb1_4.CHAT_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_4.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // message
}
});
this.registerClientbound(ClientboundPacketsb1_4.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_4.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // username
handler(wrapper -> {
@ -90,9 +90,9 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
map(Type.UNSIGNED_SHORT); // item
}
});
this.registerClientbound(ClientboundPacketsb1_4.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_4.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
@ -104,26 +104,26 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
handler(wrapper -> 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<ClientboundPack
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // line 4
}
});
this.registerClientbound(ClientboundPacketsb1_4.DISCONNECT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_4.DISCONNECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // reason
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsb1_5.HANDSHAKE.getId(), ServerboundPacketsb1_4.HANDSHAKE.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsb1_5.HANDSHAKE.getId(), ServerboundPacketsb1_4.HANDSHAKE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // username
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsb1_4.LOGIN.getId(), ServerboundPacketsb1_5.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsb1_4.LOGIN.getId(), ServerboundPacketsb1_5.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // protocol id
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // username
create(Typesb1_7_0_3.STRING, "Password"); // password
@ -154,15 +154,15 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
map(Type.BYTE); // dimension id
}
});
this.registerServerbound(ServerboundPacketsb1_5.CHAT_MESSAGE, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_5.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // message
}
});
this.registerServerbound(ServerboundPacketsb1_5.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_5.CLICK_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Type.SHORT); // slot
map(Type.BYTE); // button
@ -171,9 +171,9 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
map(Types1_4_2.NBTLESS_ITEM); // item
}
});
this.registerServerbound(ServerboundPacketsb1_5.UPDATE_SIGN, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_5.UPDATE_SIGN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // line 1
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // line 2
@ -181,9 +181,9 @@ public class Protocolb1_5_0_2tob1_4_0_1 extends AbstractProtocol<ClientboundPack
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // line 4
}
});
this.registerServerbound(ServerboundPacketsb1_5.DISCONNECT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_5.DISCONNECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Typesb1_7_0_3.STRING); // reason
}
});

22
src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_6_0_6tob1_5_0_2/Protocolb1_6_0_6tob1_5_0_2.java
View File

@ -24,7 +24,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 net.raphimc.vialegacy.api.data.BlockList1_6;
import net.raphimc.vialegacy.api.data.ItemList1_6;
@ -48,22 +48,22 @@ public class Protocolb1_6_0_6tob1_5_0_2 extends AbstractProtocol<ClientboundPack
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsb1_5.TIME_UPDATE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_5.TIME_UPDATE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.LONG); // time
handler(wrapper -> 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<ClientboundPack
}
});
this.registerServerbound(ServerboundPacketsb1_7.RESPAWN, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_7.RESPAWN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
read(Type.BYTE); // dimension id
}
});
this.registerServerbound(ServerboundPacketsb1_7.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_7.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_4_2.NBTLESS_ITEM); // item

76
src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/Protocolb1_8_0_1tob1_7_0_3.java
View File

@ -25,7 +25,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
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.api.data.BlockList1_6;
@ -56,15 +56,15 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsb1_7.KEEP_ALIVE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.KEEP_ALIVE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
create(Type.INT, ThreadLocalRandom.current().nextInt(Short.MAX_VALUE)); // key
}
});
this.registerClientbound(ClientboundPacketsb1_7.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // username
map(Type.LONG); // seed
@ -85,18 +85,18 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
});
}
});
this.registerClientbound(ClientboundPacketsb1_7.UPDATE_HEALTH, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.UPDATE_HEALTH, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT); // health
create(Type.SHORT, (short) 6); // food
create(Type.FLOAT, 0F); // saturation
handler(wrapper -> 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<ClientboundPack
handler(wrapper -> 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<ClientboundPack
});
}
});
this.registerClientbound(ClientboundPacketsb1_7.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.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
@ -163,13 +163,13 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
});
}
});
this.registerClientbound(ClientboundPacketsb1_7.DESTROY_ENTITIES, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.DESTROY_ENTITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
handler(wrapper -> {
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<ClientboundPack
});
}
});
this.registerClientbound(ClientboundPacketsb1_7.CHUNK_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.CHUNK_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPack
});
}
});
this.registerClientbound(ClientboundPacketsb1_7.GAME_EVENT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.GAME_EVENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // reason
create(Type.BYTE, (byte) 0); // value
}
});
this.registerClientbound(ClientboundPacketsb1_7.OPEN_WINDOW, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsb1_7.OPEN_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // window id
map(Type.UNSIGNED_BYTE); // window type
map(Typesb1_7_0_3.STRING, Types1_6_4.STRING); // title
@ -224,9 +224,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
}
});
this.registerServerbound(State.STATUS, -1, ServerboundPacketsb1_8.SERVER_PING.getId(), new PacketRemapper() {
this.registerServerbound(State.STATUS, -1, ServerboundPacketsb1_8.SERVER_PING.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPack
}
});
this.cancelServerbound(ServerboundPacketsb1_8.SERVER_PING);
this.registerServerbound(State.LOGIN, ServerboundPacketsb1_7.LOGIN.getId(), ServerboundPacketsb1_8.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsb1_7.LOGIN.getId(), ServerboundPacketsb1_8.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // protocol id
map(Types1_6_4.STRING); // username
map(Type.LONG); // seed
@ -249,9 +249,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
read(Type.BYTE); // max players
}
});
this.registerServerbound(ServerboundPacketsb1_8.RESPAWN, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_8.RESPAWN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // dimension id
read(Type.BYTE); // difficulty
read(Type.BYTE); // game mode
@ -259,9 +259,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
read(Type.LONG); // seed
}
});
this.registerServerbound(ServerboundPacketsb1_8.PLAYER_DIGGING, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_8.PLAYER_DIGGING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // status
handler(wrapper -> {
final short status = wrapper.get(Type.UNSIGNED_BYTE, 0);
@ -271,9 +271,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
map(Type.UNSIGNED_BYTE); // direction
}
});
this.registerServerbound(ServerboundPacketsb1_8.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_8.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_4_2.NBTLESS_ITEM); // item
@ -289,9 +289,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
});
}
});
this.registerServerbound(ServerboundPacketsb1_8.ENTITY_ACTION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_8.ENTITY_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE); // action id
handler(wrapper -> {
@ -299,9 +299,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
});
}
});
this.registerServerbound(ServerboundPacketsb1_8.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_8.CLICK_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
handler(wrapper -> {
if (wrapper.passthrough(Type.SHORT) /*slot*/ == -1) wrapper.cancel();
@ -312,9 +312,9 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
map(Types1_4_2.NBTLESS_ITEM); // item
}
});
this.registerServerbound(ServerboundPacketsb1_8.CREATIVE_INVENTORY_ACTION, null, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsb1_8.CREATIVE_INVENTORY_ACTION, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
// Track the item for later use in classic protocols

94
src/main/java/net/raphimc/vialegacy/protocols/classic/protocola1_0_15toc0_28_30/Protocola1_0_15toc0_30.java
View File

@ -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<ClientboundPacketsc
@Override
protected void registerPackets() {
this.registerClientbound(State.LOGIN, ClientboundPacketsc0_28.DISCONNECT.getId(), ClientboundPacketsa1_0_15.DISCONNECT.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPacketsc0_28.DISCONNECT.getId(), ClientboundPacketsa1_0_15.DISCONNECT.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesc0_30.STRING, Typesb1_7_0_3.STRING, s -> 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<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.LEVEL_INIT, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.LEVEL_INIT, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
@ -139,9 +139,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.LEVEL_DATA, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.LEVEL_DATA, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final short partSize = wrapper.read(Type.SHORT); // part size
@ -157,9 +157,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.LEVEL_FINALIZE, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.LEVEL_FINALIZE, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final short sizeX = wrapper.read(Type.SHORT);
@ -200,9 +200,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.BLOCK_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesc0_30.POSITION, Types1_7_6.POSITION_UBYTE); // position
handler(wrapper -> {
final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class);
@ -224,9 +224,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.INT); // entity id
map(Typesc0_30.STRING, Typesb1_7_0_3.STRING, n -> n.replace("&", "§")); // username
map(Type.SHORT, Type.INT); // x
@ -278,9 +278,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_TELEPORT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_TELEPORT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.INT); // entity id
map(Type.SHORT, Type.INT); // x
map(Type.SHORT, Type.INT); // y
@ -297,9 +297,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.INT); // entity id
map(Type.BYTE); // x
map(Type.BYTE); // y
@ -308,32 +308,32 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
map(Type.BYTE); // pitch
}
});
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.INT); // entity id
map(Type.BYTE); // x
map(Type.BYTE); // y
map(Type.BYTE); // z
}
});
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_ROTATION, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.ENTITY_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.INT); // entity id
map(Type.BYTE, Type.BYTE, yaw -> (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<ClientboundPacketsc
});
}
});
this.registerClientbound(ClientboundPacketsc0_28.DISCONNECT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_28.DISCONNECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesc0_30.STRING, Typesb1_7_0_3.STRING, s -> 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<ClientboundPacketsc
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_28.LOGIN.getId(), ServerboundPacketsa1_0_15.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_28.LOGIN.getId(), ServerboundPacketsa1_0_15.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.BYTE); // protocol id
map(Typesb1_7_0_3.STRING, Typesc0_30.STRING); // username
read(Typesb1_7_0_3.STRING); // password
@ -377,9 +377,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.CHAT_MESSAGE, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_MOVEMENT, ServerboundPacketsc0_28.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_MOVEMENT, ServerboundPacketsc0_28.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
read(Type.BOOLEAN); // onGround
handler(wrapper -> {
final ClassicPositionTracker positionTracker = wrapper.user().get(ClassicPositionTracker.class);
@ -402,9 +402,9 @@ public class Protocola1_0_15toc0_30 extends AbstractProtocol<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_POSITION, ServerboundPacketsc0_28.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_POSITION, ServerboundPacketsc0_28.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_ROTATION, ServerboundPacketsc0_28.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_ROTATION, ServerboundPacketsc0_28.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_DIGGING, ServerboundPacketsc0_28.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_DIGGING, ServerboundPacketsc0_28.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacketsc
});
}
});
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsa1_0_15.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
final ClassicLevel level = wrapper.user().get(ClassicLevelStorage.class).getClassicLevel();
final ClassicBlockRemapper remapper = wrapper.user().get(ClassicBlockRemapper.class);

14
src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_16a_02to0_0_15a_1/Protocolc0_0_16a_02to0_0_15a_1.java
View File

@ -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<Clientbound
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsc0_15a.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_15a.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
final String username = wrapper.read(Typesc0_30.STRING); // username
@ -48,9 +48,9 @@ public class Protocolc0_0_16a_02to0_0_15a_1 extends AbstractProtocol<Clientbound
});
}
});
this.registerClientbound(ClientboundPacketsc0_15a.ENTITY_TELEPORT, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_15a.ENTITY_TELEPORT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // entity id
map(Type.SHORT); // x
map(Type.SHORT); // y
@ -74,9 +74,9 @@ public class Protocolc0_0_16a_02to0_0_15a_1 extends AbstractProtocol<Clientbound
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_15a.LOGIN.getId(), ServerboundPacketsc0_19a.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_15a.LOGIN.getId(), ServerboundPacketsc0_19a.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.clearPacket();
wrapper.write(Typesc0_30.STRING, wrapper.user().getProtocolInfo().getUsername()); // username

10
src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_0_20a_27toc0_0_19a_06/Protocolc0_27toc0_0_19a_06.java
View File

@ -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<ClientboundPack
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsc0_19a.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_19a.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // protocol id
map(Typesc0_30.STRING); // title
map(Typesc0_30.STRING); // motd
@ -48,9 +48,9 @@ public class Protocolc0_27toc0_0_19a_06 extends AbstractProtocol<ClientboundPack
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_19a.LOGIN.getId(), ServerboundPacketsc0_28.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_19a.LOGIN.getId(), ServerboundPacketsc0_28.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // protocol id
map(Typesc0_30.STRING); // username
map(Typesc0_30.STRING); // mp pass

46
src/main/java/net/raphimc/vialegacy/protocols/classic/protocolc0_28_30toc0_28_30cpe/Protocolc0_30toc0_30cpe.java
View File

@ -26,7 +26,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.api.type.types.CustomByteType;
import net.raphimc.vialegacy.ViaLegacy;
@ -69,9 +69,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPacketsc0_30cpe.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXTENSION_PROTOCOL_INFO, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXTENSION_PROTOCOL_INFO, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final ExtensionProtocolMetadataStorage protocolMetadataStorage = wrapper.user().get(ExtensionProtocolMetadataStorage.class);
@ -104,9 +104,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXTENSION_PROTOCOL_ENTRY, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXTENSION_PROTOCOL_ENTRY, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final ExtensionProtocolMetadataStorage protocolMetadataStorage = wrapper.user().get(ExtensionProtocolMetadataStorage.class);
@ -156,9 +156,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_CUSTOM_BLOCKS_SUPPORT_LEVEL, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_CUSTOM_BLOCKS_SUPPORT_LEVEL, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final byte level = wrapper.read(Type.BYTE); // support level
@ -171,9 +171,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_HACK_CONTROL, ClientboundPacketsc0_28.CHAT_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_HACK_CONTROL, ClientboundPacketsc0_28.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_SET_BLOCK_PERMISSION, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_SET_BLOCK_PERMISSION, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final ExtBlockPermissionsStorage blockPermissionsStorage = wrapper.user().get(ExtBlockPermissionsStorage.class);
@ -228,9 +228,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_BULK_BLOCK_UPDATE, null, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_BULK_BLOCK_UPDATE, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final ClassicLevelStorage levelStorage = wrapper.user().get(ClassicLevelStorage.class);
@ -267,9 +267,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_TWO_WAY_PING, ClientboundPacketsc0_28.KEEP_ALIVE, new PacketRemapper() {
this.registerClientbound(ClientboundPacketsc0_30cpe.EXT_TWO_WAY_PING, ClientboundPacketsc0_28.KEEP_ALIVE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets
}
});
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_30cpe.LOGIN.getId(), ServerboundPacketsc0_28.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPacketsc0_30cpe.LOGIN.getId(), ServerboundPacketsc0_28.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // protocol id
map(Typesc0_30.STRING); // username
map(Typesc0_30.STRING); // mp pass
@ -296,9 +296,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerServerbound(ServerboundPacketsc0_28.CHAT_MESSAGE, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsc0_28.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // sender id
map(Typesc0_30.STRING); // message
handler(wrapper -> {
@ -319,9 +319,9 @@ public class Protocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPackets
});
}
});
this.registerServerbound(ServerboundPacketsc0_28.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPacketsc0_28.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Typesc0_30.POSITION); // position
map(Type.BOOLEAN); // place block
map(Type.BYTE); // block id

34
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_1to1_0_0_1/Protocol1_1to1_0_0_1.java
View File

@ -20,7 +20,7 @@ package net.raphimc.vialegacy.protocols.release.protocol1_1to1_0_0_1;
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.remapper.LegacyItemRewriter;
import net.raphimc.vialegacy.api.splitter.PreNettySplitter;
@ -43,9 +43,9 @@ public class Protocol1_1to1_0_0_1 extends AbstractProtocol<ClientboundPackets1_0
protected void registerPackets() {
this.itemRewriter.register();
this.registerServerbound(State.LOGIN, ServerboundPackets1_0.LOGIN.getId(), ServerboundPackets1_1.LOGIN.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPackets1_0.LOGIN.getId(), ServerboundPackets1_1.LOGIN.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // protocol id
map(Types1_6_4.STRING); // username
map(Type.LONG); // seed
@ -57,15 +57,15 @@ public class Protocol1_1to1_0_0_1 extends AbstractProtocol<ClientboundPackets1_0
map(Type.BYTE); // max players
}
});
this.registerServerbound(ServerboundPackets1_1.CHAT_MESSAGE, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_1.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Types1_6_4.STRING, ChatFilter::filter); // message
}
});
this.registerServerbound(ServerboundPackets1_1.RESPAWN, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_1.RESPAWN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // dimension id
map(Type.BYTE); // difficulty
map(Type.BYTE); // game mode
@ -76,9 +76,9 @@ public class Protocol1_1to1_0_0_1 extends AbstractProtocol<ClientboundPackets1_0
});
this.cancelServerbound(ServerboundPackets1_1.PLUGIN_MESSAGE);
this.registerClientbound(ClientboundPackets1_0.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_0.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // username
map(Type.LONG); // seed
@ -90,15 +90,15 @@ public class Protocol1_1to1_0_0_1 extends AbstractProtocol<ClientboundPackets1_0
map(Type.BYTE); // max players
}
});
this.registerClientbound(ClientboundPackets1_0.CHAT_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_0.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Types1_6_4.STRING, msg -> 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<ClientboundPackets1_0
create(Types1_6_4.STRING, "default_1_1"); // level type
}
});
this.registerClientbound(ClientboundPackets1_0.UPDATE_SIGN, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_0.UPDATE_SIGN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Types1_6_4.STRING, Types1_6_4.STRING, msg -> 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<ClientboundPackets1_0
map(Types1_6_4.STRING, Types1_6_4.STRING, msg -> 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
}
});

58
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_2_1_3to1_1/Protocol1_2_1_3to1_1.java
View File

@ -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<ClientboundPackets1_1
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(ClientboundPackets1_1.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_1.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // username
handler(wrapper -> wrapper.user().get(SeedStorage.class).seed = wrapper.read(Type.LONG)); // seed
@ -88,9 +88,9 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol<ClientboundPackets1_1
handler(wrapper -> 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<ClientboundPackets1_1
handler(wrapper -> 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<ClientboundPackets1_1
map(Types1_3_1.METADATA_LIST); // metadata
}
});
this.registerClientbound(ClientboundPackets1_1.ENTITY_ROTATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_1.ENTITY_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE); // yaw
map(Type.BYTE); // pitch
handler(wrapper -> 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<ClientboundPackets1_1
handler(wrapper -> 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<ClientboundPackets1_1
handler(wrapper -> 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<ClientboundPackets1_1
});
}
});
this.registerClientbound(ClientboundPackets1_1.MULTI_BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_1.MULTI_BLOCK_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // chunkX
map(Type.INT); // chunkZ
map(Types1_1.BLOCK_CHANGE_RECORD_ARRAY, Types1_7_6.BLOCK_CHANGE_RECORD_ARRAY); // blockChangeRecords
@ -240,18 +240,18 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol<ClientboundPackets1_1
});
}
});
this.registerClientbound(ClientboundPackets1_1.BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_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
handler(wrapper -> 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<ClientboundPackets1_1
});
}
});
this.registerClientbound(ClientboundPackets1_1.EFFECT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_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
@ -294,15 +294,15 @@ public class Protocol1_2_1_3to1_1 extends AbstractProtocol<ClientboundPackets1_1
}
});
this.registerServerbound(State.LOGIN, ServerboundPackets1_1.HANDSHAKE.getId(), ServerboundPackets1_2_1.HANDSHAKE.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPackets1_1.HANDSHAKE.getId(), ServerboundPackets1_2_1.HANDSHAKE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Types1_6_4.STRING, s -> 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<ClientboundPackets1_1
map(Type.BYTE); // max players
}
});
this.registerServerbound(ServerboundPackets1_2_1.RESPAWN, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_2_1.RESPAWN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.BYTE); // dimension id
map(Type.BYTE); // difficulty
map(Type.BYTE); // game mode

134
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_3_1_2to1_2_4_5/Protocol1_3_1_2to1_2_4_5.java
View File

@ -30,7 +30,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.libs.opennbt.tag.builtin.CompoundTag;
import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag;
@ -86,9 +86,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(State.LOGIN, ClientboundPackets1_2_4.HANDSHAKE.getId(), ClientboundPackets1_3_1.SHARED_KEY.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPackets1_2_4.HANDSHAKE.getId(), ClientboundPackets1_3_1.SHARED_KEY.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.HANDSHAKE, null, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.HANDSHAKE, null, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_EQUIPMENT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_EQUIPMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.SHORT); // slot
handler(wrapper -> {
@ -138,9 +138,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.RESPAWN, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_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
@ -160,9 +160,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // name
map(Type.INT); // x
@ -182,9 +182,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.SPAWN_ITEM, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.SPAWN_ITEM, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_3_1.NBTLESS_ITEM); // item
map(Type.INT); // x
@ -203,9 +203,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.COLLECT_ITEM, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.COLLECT_ITEM, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // collected entity id
map(Type.INT); // collector entity id
handler(wrapper -> {
@ -213,9 +213,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.SPAWN_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.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
@ -289,9 +289,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.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
@ -319,9 +319,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.DESTROY_ENTITIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.DESTROY_ENTITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Types1_7_6.INT_ARRAY, i -> 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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE); // x
map(Type.BYTE); // y
@ -348,9 +348,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.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
@ -367,9 +367,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_TELEPORT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_TELEPORT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.INT); // x
map(Type.INT); // y
@ -386,9 +386,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_STATUS, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_STATUS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.BYTE); // status
handler(wrapper -> {
@ -404,9 +404,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_METADATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.ENTITY_METADATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_3_1.METADATA_LIST); // metadata
handler(wrapper -> {
@ -423,9 +423,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.PRE_CHUNK, ClientboundPackets1_3_1.CHUNK_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.PRE_CHUNK, ClientboundPackets1_3_1.CHUNK_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.CHUNK_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.CHUNK_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.BLOCK_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE, Type.UNSIGNED_SHORT); // block id
map(Type.UNSIGNED_BYTE); // block data
}
});
this.registerClientbound(ClientboundPackets1_2_4.BLOCK_ACTION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.BLOCK_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Type.BYTE); // type
map(Type.BYTE); // data
@ -552,9 +552,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.EXPLOSION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.EXPLOSION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // y
map(Type.DOUBLE); // z
@ -574,24 +574,24 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.SET_SLOT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.SET_SLOT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Type.SHORT); // slot
map(Types1_2_4.COMPRESSED_NBT_ITEM, Types1_7_6.COMPRESSED_ITEM); // item
}
});
this.registerClientbound(ClientboundPackets1_2_4.WINDOW_ITEMS, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.WINDOW_ITEMS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Types1_2_4.COMPRESSED_NBT_ITEM_ARRAY, Types1_7_6.COMPRESSED_ITEM_ARRAY); // items
}
});
this.registerClientbound(ClientboundPackets1_2_4.BLOCK_ENTITY_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.BLOCK_ENTITY_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Type.BYTE); // type
handler(wrapper -> {
@ -614,9 +614,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_2_4.PLAYER_ABILITIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_2_4.PLAYER_ABILITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
}
});
this.registerServerbound(State.LOGIN, ServerboundPackets1_2_4.HANDSHAKE.getId(), ServerboundPackets1_3_1.CLIENT_PROTOCOL.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPackets1_2_4.HANDSHAKE.getId(), ServerboundPackets1_3_1.CLIENT_PROTOCOL.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
});
this.cancelServerbound(ServerboundPackets1_3_1.CLIENT_PROTOCOL);
this.cancelServerbound(ServerboundPackets1_3_1.SHARED_KEY);
this.registerServerbound(ServerboundPackets1_3_1.PLAYER_POSITION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_3_1.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // y
map(Type.DOUBLE); // stance
@ -672,9 +672,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerServerbound(ServerboundPackets1_3_1.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_3_1.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // y
map(Type.DOUBLE); // stance
@ -696,9 +696,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerServerbound(ServerboundPackets1_3_1.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_3_1.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_7_6.COMPRESSED_ITEM, Types1_2_4.COMPRESSED_NBT_ITEM); // item
@ -707,9 +707,9 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
read(Type.UNSIGNED_BYTE); // offset z
}
});
this.registerServerbound(ServerboundPackets1_3_1.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_3_1.CLICK_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window id
map(Type.SHORT); // slot
map(Type.BYTE); // button
@ -718,17 +718,17 @@ public class Protocol1_3_1_2to1_2_4_5 extends AbstractProtocol<ClientboundPacket
map(Types1_7_6.COMPRESSED_ITEM, Types1_2_4.COMPRESSED_NBT_ITEM); // item
}
});
this.registerServerbound(ServerboundPackets1_3_1.CREATIVE_INVENTORY_ACTION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_3_1.CREATIVE_INVENTORY_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT); // slot
map(Types1_7_6.COMPRESSED_ITEM, Types1_2_4.COMPRESSED_NBT_ITEM); // item
handler(wrapper -> 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<ClientboundPacket
});
}
});
this.registerServerbound(ServerboundPackets1_3_1.CLIENT_STATUS, ServerboundPackets1_2_4.RESPAWN, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_3_1.CLIENT_STATUS, ServerboundPackets1_2_4.RESPAWN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
final byte action = wrapper.read(Type.BYTE); // force respawn
if (action != 1) {

58
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_2to1_3_1_2/Protocol1_4_2to1_3_1_2.java
View File

@ -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<ClientboundPackets1
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(State.STATUS, ClientboundPackets1_3_1.DISCONNECT.getId(), ClientboundPackets1_4_2.DISCONNECT.getId(), new PacketRemapper() {
this.registerClientbound(State.STATUS, ClientboundPackets1_3_1.DISCONNECT.getId(), ClientboundPackets1_4_2.DISCONNECT.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_3_1.TIME_UPDATE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_1.TIME_UPDATE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_3_1.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_1.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // name
map(Type.INT); // x
@ -120,9 +120,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol<ClientboundPackets1
handler(wrapper -> 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<ClientboundPackets1
map(Type.BYTE); // velocity z
}
});
this.registerClientbound(ClientboundPackets1_3_1.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_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
@ -160,9 +160,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_3_1.SPAWN_PAINTING, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_1.SPAWN_PAINTING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // motive
map(Types1_7_6.POSITION_INT); // position
@ -181,26 +181,26 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_3_1.ENTITY_METADATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_1.ENTITY_METADATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_3_1.METADATA_LIST, Types1_4_2.METADATA_LIST); // metadata
handler(wrapper -> 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<ClientboundPackets1
map(Type.UNSIGNED_BYTE); // pitch
}
});
this.registerClientbound(ClientboundPackets1_3_1.MAP_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_1.MAP_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT); // item id
map(Type.SHORT); // map id
map(Types1_4_2.UNSIGNED_BYTE_BYTE_ARRAY); // data
@ -244,9 +244,9 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_3_1.PLUGIN_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_3_1.PLUGIN_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING); // channel
handler(wrapper -> {
final String channel = wrapper.get(Types1_6_4.STRING, 0);
@ -267,15 +267,15 @@ public class Protocol1_4_2to1_3_1_2 extends AbstractProtocol<ClientboundPackets1
}
});
this.registerServerbound(State.STATUS, ServerboundPackets1_3_1.SERVER_PING.getId(), ServerboundPackets1_5_2.SERVER_PING.getId(), new PacketRemapper() {
this.registerServerbound(State.STATUS, ServerboundPackets1_3_1.SERVER_PING.getId(), ServerboundPackets1_5_2.SERVER_PING.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(PacketWrapper::clearPacket);
}
});
this.registerServerbound(ServerboundPackets1_5_2.CLIENT_SETTINGS, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_5_2.CLIENT_SETTINGS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING); // language
map(Type.BYTE); // view distance
map(Type.BYTE); // mask

18
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_4_5to1_4_2/Protocol1_4_4_5to1_4_2.java
View File

@ -20,7 +20,7 @@ package net.raphimc.vialegacy.protocols.release.protocol1_4_4_5to1_4_2;
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.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;
@ -45,17 +45,17 @@ public class Protocol1_4_4_5to1_4_2 extends AbstractProtocol<ClientboundPackets1
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(ClientboundPackets1_4_2.MAP_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_2.MAP_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT); // item id
map(Type.SHORT); // map id
map(Types1_4_2.UNSIGNED_BYTE_BYTE_ARRAY, Type.SHORT_BYTE_ARRAY); // data
}
});
this.registerClientbound(ClientboundPackets1_4_2.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_2.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // name
map(Type.INT); // x
@ -68,9 +68,9 @@ public class Protocol1_4_4_5to1_4_2 extends AbstractProtocol<ClientboundPackets1
handler(wrapper -> 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<ClientboundPackets1
handler(wrapper -> 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)));

26
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_4_6_7to1_4_4_5/Protocol1_4_6_7to1_4_4_5.java
View File

@ -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<ClientboundPacket
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(ClientboundPackets1_4_4.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_4.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // level type
map(Type.BYTE); // game mode
@ -64,9 +64,9 @@ public class Protocol1_4_6_7to1_4_4_5 extends AbstractProtocol<ClientboundPacket
handler(wrapper -> 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<ClientboundPacket
handler(wrapper -> 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<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_4_4.SPAWN_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_4.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
@ -124,9 +124,9 @@ public class Protocol1_4_6_7to1_4_4_5 extends AbstractProtocol<ClientboundPacket
// more conditional data
}
});
this.registerClientbound(ClientboundPackets1_4_4.MAP_BULK_CHUNK, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_4.MAP_BULK_CHUNK, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPacket
}
});
this.registerServerbound(ServerboundPackets1_5_2.PLAYER_DIGGING, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_5_2.PLAYER_DIGGING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // status
handler(wrapper -> {
final short status = wrapper.get(Type.UNSIGNED_BYTE, 0);

14
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_5_0_1to1_4_6_7/Protocol1_5_0_1to1_4_6_7.java
View File

@ -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<ClientboundPacket
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(ClientboundPackets1_4_6.SPAWN_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_6.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
@ -81,9 +81,9 @@ public class Protocol1_5_0_1to1_4_6_7 extends AbstractProtocol<ClientboundPacket
});
}
});
this.registerClientbound(ClientboundPackets1_4_6.OPEN_WINDOW, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_4_6.OPEN_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // window id
map(Type.UNSIGNED_BYTE); // window type
map(Types1_6_4.STRING); // title
@ -92,9 +92,9 @@ public class Protocol1_5_0_1to1_4_6_7 extends AbstractProtocol<ClientboundPacket
}
});
this.registerServerbound(ServerboundPackets1_5_2.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_5_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

74
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_1to1_5_2/Protocol1_6_1to1_5_2.java
View File

@ -23,7 +23,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.type.Type;
import net.raphimc.vialegacy.ViaLegacy;
import net.raphimc.vialegacy.api.remapper.LegacyItemRewriter;
@ -53,9 +53,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(ClientboundPackets1_5_2.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // level type
map(Type.BYTE); // game mode
@ -71,17 +71,17 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.UPDATE_HEALTH, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.UPDATE_HEALTH, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT, Type.FLOAT); // health
map(Type.SHORT); // food
map(Type.FLOAT); // saturation
}
});
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // name
map(Type.INT); // x
@ -98,9 +98,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.COLLECT_ITEM, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.COLLECT_ITEM, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // collected entity id
map(Type.INT); // collector entity id
handler(wrapper -> {
@ -108,9 +108,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.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
@ -127,9 +127,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_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
@ -156,9 +156,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_PAINTING, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_PAINTING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.STRING); // motive
map(Types1_7_6.POSITION_INT); // position
@ -169,9 +169,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_EXPERIENCE_ORB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.SPAWN_EXPERIENCE_ORB, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.INT); // x
map(Type.INT); // y
@ -183,9 +183,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.DESTROY_ENTITIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.DESTROY_ENTITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.INT_ARRAY); // entity ids
handler(wrapper -> {
final EntityTracker tracker = wrapper.user().get(EntityTracker.class);
@ -195,9 +195,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.ATTACH_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.ATTACH_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // riding entity id
map(Type.INT); // vehicle entity id
handler(wrapper -> {
@ -212,9 +212,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
create(Type.UNSIGNED_BYTE, (short) 0); // leash state
}
});
this.registerClientbound(ClientboundPackets1_5_2.ENTITY_METADATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.ENTITY_METADATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.METADATA_LIST); // metadata
handler(wrapper -> {
@ -235,9 +235,9 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
});
}
});
this.registerClientbound(ClientboundPackets1_5_2.NAMED_SOUND, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.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);
@ -259,34 +259,34 @@ public class Protocol1_6_1to1_5_2 extends AbstractProtocol<ClientboundPackets1_5
map(Type.UNSIGNED_BYTE); // pitch
}
});
this.registerClientbound(ClientboundPackets1_5_2.STATISTICS, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.STATISTICS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // statistic id
map(Type.BYTE, Type.INT); // increment
}
});
this.registerClientbound(ClientboundPackets1_5_2.PLAYER_ABILITIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_5_2.PLAYER_ABILITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // flags
map(Type.BYTE, Type.FLOAT, b -> 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<ClientboundPackets1_5
});
}
});
this.registerServerbound(ServerboundPackets1_6_4.STEER_VEHICLE, ServerboundPackets1_5_2.INTERACT_ENTITY, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_6_4.STEER_VEHICLE, ServerboundPackets1_5_2.INTERACT_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_5
});
}
});
this.registerServerbound(ServerboundPackets1_6_4.PLAYER_ABILITIES, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_6_4.PLAYER_ABILITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // flags
map(Type.FLOAT, Type.BYTE, f -> (byte) (f * 255F)); // fly speed
map(Type.FLOAT, Type.BYTE, f -> (byte) (f * 255F)); // walk speed

14
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_6_2to1_6_1/Protocol1_6_2to1_6_1.java
View File

@ -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<ClientboundPackets1_6
@Override
protected void registerPackets() {
this.registerClientbound(ClientboundPackets1_6_1.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_1.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_6
});
}
});
this.registerClientbound(ClientboundPackets1_6_1.ENTITY_PROPERTIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_1.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
@ -73,9 +73,9 @@ public class Protocol1_6_2to1_6_1 extends AbstractProtocol<ClientboundPackets1_6
}
});
this.registerServerbound(ServerboundPackets1_6_4.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_6_4.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_7_6.COMPRESSED_ITEM); // item

274
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/Protocol1_7_2_5to1_6_4.java
View File

@ -32,7 +32,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.libs.fastutil.ints.Int2IntMap;
import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
@ -79,9 +79,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(State.STATUS, ClientboundPackets1_6_4.DISCONNECT.getId(), ClientboundStatusPackets.STATUS_RESPONSE.getId(), new PacketRemapper() {
this.registerClientbound(State.STATUS, ClientboundPackets1_6_4.DISCONNECT.getId(), ClientboundStatusPackets.STATUS_RESPONSE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.SHARED_KEY.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.SHARED_KEY.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
}
});
this.cancelClientbound(ClientboundPackets1_6_4.SHARED_KEY);
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.SERVER_AUTH_DATA.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.SERVER_AUTH_DATA.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING); // server hash
map(Type.SHORT_BYTE_ARRAY); // public key
map(Type.SHORT_BYTE_ARRAY); // verify token
@ -152,16 +152,16 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
}
});
this.cancelClientbound(ClientboundPackets1_6_4.SERVER_AUTH_DATA);
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.DISCONNECT.getId(), ClientboundLoginPackets.LOGIN_DISCONNECT.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.DISCONNECT.getId(), ClientboundLoginPackets.LOGIN_DISCONNECT.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING, ChatComponentRewriter::toClient); // reason
}
});
this.cancelClientbound(State.LOGIN, ClientboundPackets1_6_4.PLUGIN_MESSAGE.getId());
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.JOIN_GAME.getId(), ClientboundPackets1_6_4.JOIN_GAME.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundPackets1_6_4.JOIN_GAME.getId(), ClientboundPackets1_6_4.JOIN_GAME.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.CHAT_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING, msg -> 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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION_ONLY_ONGROUND, ClientboundPackets1_7_2.PLAYER_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION_ONLY_ONGROUND, ClientboundPackets1_7_2.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION_ONLY_POSITION, ClientboundPackets1_7_2.PLAYER_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION_ONLY_POSITION, ClientboundPackets1_7_2.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION_ONLY_LOOK, ClientboundPackets1_7_2.PLAYER_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION_ONLY_LOOK, ClientboundPackets1_7_2.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // stance
read(Type.DOUBLE); // y
@ -346,15 +346,15 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Type.BOOLEAN); // onGround
}
});
this.registerClientbound(ClientboundPackets1_6_4.HELD_ITEM_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.HELD_ITEM_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.SHORT, Type.BYTE); // slot
}
});
this.registerClientbound(ClientboundPackets1_6_4.USE_BED, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.USE_BED, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
handler(wrapper -> {
if (wrapper.read(Type.BYTE) != 0) wrapper.cancel();
@ -362,9 +362,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Types1_7_6.POSITION_BYTE); // position
}
});
this.registerClientbound(ClientboundPackets1_6_4.ENTITY_ANIMATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.ENTITY_ANIMATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
handler(wrapper -> {
short animate = wrapper.read(Type.BYTE); // animation
@ -378,9 +378,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
handler(wrapper -> {
final String name = wrapper.read(Types1_6_4.STRING); // name
@ -402,9 +402,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
handler(wrapper -> 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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_MOB, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.UNSIGNED_BYTE); // type id
map(Type.INT); // x
@ -444,18 +444,18 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
handler(wrapper -> 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<ClientboundPackets1
map(Type.SHORT); // count
}
});
this.registerClientbound(ClientboundPackets1_6_4.ENTITY_METADATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.ENTITY_METADATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Types1_6_4.METADATA_LIST, Types1_7_6.METADATA_LIST); // metadata
handler(wrapper -> 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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.CHUNK_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.CHUNK_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_SHORT, Type.VAR_INT); // block id
map(Type.UNSIGNED_BYTE); // block data
@ -538,26 +538,26 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_ACTION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Type.BYTE, Type.UNSIGNED_BYTE); // type
map(Type.BYTE, Type.UNSIGNED_BYTE); // data
map(Type.SHORT, Type.VAR_INT); // block id
}
});
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_BREAK_ANIMATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_BREAK_ANIMATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Types1_7_6.POSITION_INT); // position
map(Type.BYTE); // progress
}
});
this.registerClientbound(ClientboundPackets1_6_4.MAP_BULK_CHUNK, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.MAP_BULK_CHUNK, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.EXPLOSION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.EXPLOSION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE, Type.FLOAT); // x
map(Type.DOUBLE, Type.FLOAT); // y
map(Type.DOUBLE, Type.FLOAT); // z
@ -590,9 +590,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Type.FLOAT); // velocity z
}
});
this.registerClientbound(ClientboundPackets1_6_4.NAMED_SOUND, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.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);
@ -614,9 +614,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Type.UNSIGNED_BYTE); // pitch
}
});
this.registerClientbound(ClientboundPackets1_6_4.EFFECT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.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
@ -639,9 +639,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_PARTICLE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_PARTICLE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING); // particle
map(Type.FLOAT); // x
map(Type.FLOAT); // y
@ -669,9 +669,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.GAME_EVENT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.GAME_EVENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.UNSIGNED_BYTE); // reason
map(Type.BYTE, Type.FLOAT); // value
handler(wrapper -> {
@ -696,9 +696,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_GLOBAL_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.SPAWN_GLOBAL_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
@ -706,9 +706,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Type.INT); // z
}
});
this.registerClientbound(ClientboundPackets1_6_4.OPEN_WINDOW, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.OPEN_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // window id
map(Type.UNSIGNED_BYTE); // window type
map(Types1_6_4.STRING, Type.STRING); // title
@ -717,24 +717,24 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
// more conditional data
}
});
this.registerClientbound(ClientboundPackets1_6_4.CLOSE_WINDOW, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.CLOSE_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE, Type.UNSIGNED_BYTE); // window id
}
});
this.registerClientbound(ClientboundPackets1_6_4.SET_SLOT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.SET_SLOT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // window 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.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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.UPDATE_SIGN, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.UPDATE_SIGN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Types1_6_4.STRING, Type.STRING); // line 1
map(Types1_6_4.STRING, Type.STRING); // line 2
@ -754,32 +754,32 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Types1_6_4.STRING, Type.STRING); // line 4
}
});
this.registerClientbound(ClientboundPackets1_6_4.MAP_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.MAP_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
read(Type.SHORT); // item id
map(Type.SHORT, Type.VAR_INT); // map id
map(Type.SHORT_BYTE_ARRAY); // data
}
});
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_ENTITY_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.BLOCK_ENTITY_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Type.BYTE, Type.UNSIGNED_BYTE); // type
map(Types1_7_6.COMPRESSED_NBT); // data
}
});
this.registerClientbound(ClientboundPackets1_6_4.OPEN_SIGN_EDITOR, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.OPEN_SIGN_EDITOR, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
read(Type.BYTE); // always 0
map(Types1_7_6.POSITION_INT); // position
}
});
this.registerClientbound(ClientboundPackets1_6_4.STATISTICS, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.STATISTICS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
wrapper.cancel();
final StatisticsStorage statisticsStorage = wrapper.user().get(StatisticsStorage.class);
@ -789,17 +789,17 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_INFO, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.PLAYER_INFO, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING); // name
map(Type.BOOLEAN); // online
map(Type.SHORT); // ping
}
});
this.registerClientbound(ClientboundPackets1_6_4.TAB_COMPLETE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.TAB_COMPLETE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.SCOREBOARD_OBJECTIVE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.SCOREBOARD_OBJECTIVE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING); // name
map(Types1_6_4.STRING, Type.STRING); // value
map(Type.BYTE); // mode
}
});
this.registerClientbound(ClientboundPackets1_6_4.UPDATE_SCORE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.UPDATE_SCORE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.DISPLAY_SCOREBOARD, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.DISPLAY_SCOREBOARD, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // position
map(Types1_6_4.STRING, Type.STRING); // name
}
});
this.registerClientbound(ClientboundPackets1_6_4.TEAMS, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.TEAMS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING); // name
handler(wrapper -> {
final byte mode = wrapper.passthrough(Type.BYTE); // mode
@ -859,9 +859,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.PLUGIN_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.PLUGIN_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING); // channel
handler(wrapper -> {
final String channel = wrapper.get(Type.STRING, 0);
@ -881,17 +881,17 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerClientbound(ClientboundPackets1_6_4.DISCONNECT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_6_4.DISCONNECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_6_4.STRING, Type.STRING, ChatComponentRewriter::toClient);
}
});
this.cancelClientbound(ClientboundPackets1_6_4.CREATIVE_INVENTORY_ACTION);
this.registerServerbound(State.STATUS, ServerboundPackets1_6_4.SERVER_PING.getId(), ServerboundStatusPackets.STATUS_REQUEST.getId(), new PacketRemapper() {
this.registerServerbound(State.STATUS, ServerboundPackets1_6_4.SERVER_PING.getId(), ServerboundStatusPackets.STATUS_REQUEST.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerServerbound(State.STATUS, -1, ServerboundStatusPackets.PING_REQUEST.getId(), new PacketRemapper() {
this.registerServerbound(State.STATUS, -1, ServerboundStatusPackets.PING_REQUEST.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
});
}
});
this.registerServerbound(State.LOGIN, ServerboundPackets1_6_4.CLIENT_PROTOCOL.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundPackets1_6_4.CLIENT_PROTOCOL.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1
}
});
this.registerServerbound(State.LOGIN, ServerboundPackets1_6_4.SHARED_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId());
this.registerServerbound(ServerboundPackets1_7_2.CHAT_MESSAGE, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Types1_6_4.STRING); // message
}
});
this.registerServerbound(ServerboundPackets1_7_2.INTERACT_ENTITY, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.INTERACT_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> 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<ClientboundPackets1
});
}
});
this.registerServerbound(ServerboundPackets1_7_2.PLAYER_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.PLAYER_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.FLOAT); // yaw
map(Type.FLOAT); // pitch
map(Type.BOOLEAN); // onGround
@ -988,9 +988,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerServerbound(ServerboundPackets1_7_2.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // y
map(Type.DOUBLE); // stance
@ -1009,9 +1009,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerServerbound(ServerboundPackets1_7_2.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Types1_7_6.COMPRESSED_ITEM); // item
@ -1021,9 +1021,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Type.UNSIGNED_BYTE); // offset z
}
});
this.registerServerbound(ServerboundPackets1_7_2.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.CLICK_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE); // windowId
map(Type.SHORT); // slot
map(Type.BYTE); // button
@ -1033,9 +1033,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
handler(wrapper -> 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<ClientboundPackets1
map(Type.STRING, Types1_6_4.STRING); // line 4
}
});
this.registerServerbound(ServerboundPackets1_7_2.TAB_COMPLETE, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.TAB_COMPLETE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Types1_6_4.STRING); // text
}
});
this.registerServerbound(ServerboundPackets1_7_2.CLIENT_SETTINGS, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.CLIENT_SETTINGS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Types1_6_4.STRING); // language
handler(wrapper -> {
byte renderDistance = wrapper.read(Type.BYTE); // render distance
@ -1078,9 +1078,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
map(Type.BOOLEAN); // show cape
}
});
this.registerServerbound(ServerboundPackets1_7_2.CLIENT_STATUS, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.CLIENT_STATUS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
final int action = wrapper.read(Type.VAR_INT); // action
@ -1108,9 +1108,9 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
});
}
});
this.registerServerbound(ServerboundPackets1_7_2.PLUGIN_MESSAGE, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_7_2.PLUGIN_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Types1_6_4.STRING); // channel
map(Type.SHORT); // length
handler(wrapper -> {

6
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/baseprotocols/PreNettyBaseProtocol.java
View File

@ -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

18
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_6_10to1_7_2_5/Protocol1_7_6_10to1_7_2_5.java
View File

@ -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<ClientboundPacke
@Override
protected void registerPackets() {
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.GAME_PROFILE.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.GAME_PROFILE.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Type.STRING, BaseProtocol1_7::addDashes); // uuid
map(Type.STRING); // name
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT); // entity id
map(Type.STRING, Type.STRING, BaseProtocol1_7::addDashes); // uuid
map(Type.STRING); // name
@ -71,15 +71,15 @@ public class Protocol1_7_6_10to1_7_2_5 extends AbstractProtocol<ClientboundPacke
map(Types1_7_6.METADATA_LIST); // metadata
}
});
this.registerClientbound(ClientboundPackets1_7_2.CHAT_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Type.STRING, TranslationRewriter::toClient); // message
}
});
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_ENTITY_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_ENTITY_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT); // position
map(Type.UNSIGNED_BYTE); // type
map(Types1_7_6.COMPRESSED_NBT); // data

278
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/Protocol1_8to1_7_6_10.java
View File

@ -32,7 +32,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.protocol.remapper.ValueTransformer;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.version.Types1_8;
@ -104,23 +104,23 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
protected void registerPackets() {
this.itemRewriter.register();
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketRemapper() {
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING); // server hash
map(Type.SHORT_BYTE_ARRAY, Type.BYTE_ARRAY_PRIMITIVE); // public key
map(Type.SHORT_BYTE_ARRAY, Type.BYTE_ARRAY_PRIMITIVE); // verify token
}
});
this.registerClientbound(ClientboundPackets1_7_2.KEEP_ALIVE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.KEEP_ALIVE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // key
}
});
this.registerClientbound(ClientboundPackets1_7_2.JOIN_GAME, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.JOIN_GAME, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // entity id
map(Type.UNSIGNED_BYTE); // gamemode
map(Type.BYTE); // dimension id
@ -144,39 +144,39 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.CHAT_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.CHAT_MESSAGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING, Type.STRING, msg -> 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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.PLAYER_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE, Type.DOUBLE, stance -> stance - 1.62F); // y
map(Type.DOUBLE); // z
@ -205,16 +205,16 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
create(Type.BYTE, (byte) 0); // flags
}
});
this.registerClientbound(ClientboundPackets1_7_2.USE_BED, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.USE_BED, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Types1_7_6.POSITION_BYTE, Type.POSITION); // position
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PLAYER, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PLAYER, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.COLLECT_ITEM, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.COLLECT_ITEM, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // collected entity id
map(Type.INT, Type.VAR_INT); // collector entity id
handler(wrapper -> {
@ -265,9 +265,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT); // entity id
map(Type.BYTE); // type id
map(Type.INT); // x
@ -331,9 +331,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_MOB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_MOB, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT); // entity id
map(Type.UNSIGNED_BYTE); // type id
map(Type.INT); // x
@ -363,9 +363,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PAINTING, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PAINTING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT); // entity id
map(Type.STRING); // motive
map(Types1_7_6.POSITION_INT, Type.POSITION); // position
@ -397,9 +397,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_EXPERIENCE_ORB, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_EXPERIENCE_ORB, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT); // entity id
map(Type.INT); // x
map(Type.INT); // y
@ -413,18 +413,18 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_VELOCITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_VELOCITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.SHORT); // velocity x
map(Type.SHORT); // velocity y
map(Type.SHORT); // velocity z
}
});
this.registerClientbound(ClientboundPackets1_7_2.DESTROY_ENTITIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.DESTROY_ENTITIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.INT_ARRAY, Type.VAR_INT_ARRAY_PRIMITIVE); // entity ids
handler(wrapper -> {
final EntityTracker tracker = wrapper.user().get(EntityTracker.class);
@ -434,15 +434,15 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_MOVEMENT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_MOVEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_POSITION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.BYTE); // x
map(Type.BYTE); // y
@ -467,9 +467,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_ROTATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.BYTE); // yaw
map(Type.BYTE); // pitch
@ -483,9 +483,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.BYTE); // x
map(Type.BYTE); // y
@ -512,9 +512,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_TELEPORT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_TELEPORT, 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
@ -538,16 +538,16 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_HEAD_LOOK, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_HEAD_LOOK, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.BYTE); // head yaw
}
});
this.registerClientbound(ClientboundPackets1_7_2.ATTACH_ENTITY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ATTACH_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT); // riding entity id
map(Type.INT); // vehicle entity id
map(Type.UNSIGNED_BYTE); // leash state
@ -562,9 +562,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_METADATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_METADATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Types1_7_6.METADATA_LIST, Types1_8.METADATA_LIST); // metadata
handler(wrapper -> {
@ -581,9 +581,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_EFFECT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_EFFECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.BYTE); // effect id
map(Type.BYTE); // amplifier
@ -591,24 +591,24 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
create(Type.BOOLEAN, false); // hide particles
}
});
this.registerClientbound(ClientboundPackets1_7_2.REMOVE_ENTITY_EFFECT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.REMOVE_ENTITY_EFFECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
map(Type.BYTE); // effect id
}
});
this.registerClientbound(ClientboundPackets1_7_2.SET_EXPERIENCE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SET_EXPERIENCE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.FLOAT); // experience bar
map(Type.SHORT, Type.VAR_INT); // level
map(Type.SHORT, Type.VAR_INT); // total experience
}
});
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_PROPERTIES, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.ENTITY_PROPERTIES, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.INT, Type.VAR_INT); // entity id
handler(wrapper -> {
final int amount = wrapper.passthrough(Type.INT); // count
@ -626,9 +626,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.CHUNK_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.CHUNK_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.MULTI_BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.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, Type.BLOCK_CHANGE_RECORD_ARRAY); // blockChangeRecords
@ -658,9 +658,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_CHANGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_CHANGE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_UBYTE, Type.POSITION); // position
handler(wrapper -> {
final int blockId = wrapper.read(Type.VAR_INT); // block id
@ -672,26 +672,26 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_ACTION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT, Type.POSITION); // position
map(Type.UNSIGNED_BYTE); // type
map(Type.UNSIGNED_BYTE); // data
map(Type.VAR_INT); // block id
}
});
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_BREAK_ANIMATION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_BREAK_ANIMATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT); // entity id
map(Types1_7_6.POSITION_INT, Type.POSITION); // position
map(Type.BYTE); // progress
}
});
this.registerClientbound(ClientboundPackets1_7_2.MAP_BULK_CHUNK, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.MAP_BULK_CHUNK, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.EXPLOSION, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.EXPLOSION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.FLOAT); // x
map(Type.FLOAT); // y
map(Type.FLOAT); // z
@ -725,9 +725,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
map(Type.FLOAT); // velocity z
}
});
this.registerClientbound(ClientboundPackets1_7_2.EFFECT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.EFFECT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PARTICLE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SPAWN_PARTICLE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.GAME_EVENT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.GAME_EVENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // reason
map(Type.FLOAT); // value
handler(wrapper -> {
@ -842,9 +842,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.OPEN_WINDOW, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.OPEN_WINDOW, 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.read(Type.UNSIGNED_BYTE); // window type
@ -917,9 +917,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SET_SLOT, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SET_SLOT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
handler(wrapper -> 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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.WINDOW_PROPERTY, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.WINDOW_PROPERTY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.UNSIGNED_BYTE); // window id
map(Type.SHORT); // progress bar id
map(Type.SHORT); // progress bar value
@ -988,9 +988,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.UPDATE_SIGN, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.UPDATE_SIGN, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT, Type.POSITION); // position
map(LEGACY_TO_JSON); // line 1
map(LEGACY_TO_JSON); // line 2
@ -998,9 +998,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
map(LEGACY_TO_JSON); // line 4
}
});
this.registerClientbound(ClientboundPackets1_7_2.MAP_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.MAP_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_ENTITY_DATA, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.BLOCK_ENTITY_DATA, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_SHORT, Type.POSITION); // position
map(Type.UNSIGNED_BYTE); // type
map(Types1_7_6.COMPRESSED_NBT, Type.NBT); // data
}
});
this.registerClientbound(ClientboundPackets1_7_2.OPEN_SIGN_EDITOR, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.OPEN_SIGN_EDITOR, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Types1_7_6.POSITION_INT, Type.POSITION); // position
}
});
this.registerClientbound(ClientboundPackets1_7_2.PLAYER_INFO, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.PLAYER_INFO, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.SCOREBOARD_OBJECTIVE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.SCOREBOARD_OBJECTIVE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING); // name
handler(wrapper -> {
final String value = wrapper.read(Type.STRING); // value
@ -1113,9 +1113,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.UPDATE_SCORE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.UPDATE_SCORE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING); // name
handler(wrapper -> {
final byte mode = wrapper.passthrough(Type.BYTE); // mode
@ -1128,9 +1128,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.TEAMS, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.TEAMS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING); // name
handler(wrapper -> {
final byte mode = wrapper.passthrough(Type.BYTE); // mode
@ -1153,9 +1153,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerClientbound(ClientboundPackets1_7_2.PLUGIN_MESSAGE, new PacketRemapper() {
this.registerClientbound(ClientboundPackets1_7_2.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);
@ -1206,22 +1206,22 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
}
});
this.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketRemapper() {
this.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.BYTE_ARRAY_PRIMITIVE, Type.SHORT_BYTE_ARRAY); // shared secret
map(Type.BYTE_ARRAY_PRIMITIVE, Type.SHORT_BYTE_ARRAY); // verify token
}
});
this.registerServerbound(ServerboundPackets1_8.KEEP_ALIVE, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.KEEP_ALIVE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT, Type.INT); // key
}
});
this.registerServerbound(ServerboundPackets1_8.INTERACT_ENTITY, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.INTERACT_ENTITY, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT, Type.INT); // entity id
handler(wrapper -> {
final int mode = wrapper.read(Type.VAR_INT); // mode
@ -1241,9 +1241,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerServerbound(ServerboundPackets1_8.PLAYER_POSITION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.PLAYER_POSITION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // y
handler(wrapper -> 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<ClientboundPackets1_
map(Type.BOOLEAN); // onGround
}
});
this.registerServerbound(ServerboundPackets1_8.PLAYER_POSITION_AND_ROTATION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.DOUBLE); // x
map(Type.DOUBLE); // y
handler(wrapper -> 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<ClientboundPackets1_
map(Type.BOOLEAN); // onGround
}
});
this.registerServerbound(ServerboundPackets1_8.PLAYER_DIGGING, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.PLAYER_DIGGING, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT, Type.UNSIGNED_BYTE); // status
map(Type.POSITION, Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
}
});
this.registerServerbound(ServerboundPackets1_8.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.POSITION, Types1_7_6.POSITION_UBYTE); // position
map(Type.UNSIGNED_BYTE); // direction
map(Type.ITEM, Types1_7_6.COMPRESSED_ITEM); // item
@ -1295,9 +1295,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
});
}
});
this.registerServerbound(ServerboundPackets1_8.ANIMATION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.ANIMATION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerServerbound(ServerboundPackets1_8.ENTITY_ACTION, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.ENTITY_ACTION, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.VAR_INT, Type.INT); // entity id
map(Type.VAR_INT, Type.BYTE, action -> (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<ClientboundPackets1_
});
}
});
this.registerServerbound(ServerboundPackets1_8.CLICK_WINDOW, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.CLICK_WINDOW, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
handler(wrapper -> 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<ClientboundPackets1_
});
}
});
this.registerServerbound(ServerboundPackets1_8.TAB_COMPLETE, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.TAB_COMPLETE, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
handler(wrapper -> {
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<ClientboundPackets1_
});
}
});
this.registerServerbound(ServerboundPackets1_8.CLIENT_SETTINGS, new PacketRemapper() {
this.registerServerbound(ServerboundPackets1_8.CLIENT_SETTINGS, new PacketHandlers() {
@Override
public void registerMap() {
public void register() {
map(Type.STRING); // language
map(Type.BYTE); // view distance
map(Type.BYTE); // chat visibility
@ -1402,9 +1402,9 @@ public class Protocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_
map(Type.UNSIGNED_BYTE, Type.BOOLEAN, flags -> (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);