diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java index 9e10f3ee..42273aae 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java @@ -40,6 +40,11 @@ public interface ViaBackwardsConfig { */ boolean isFix1_13FacePlayer(); + /** + * Converts the 1.13 face look-at packet for 1.12- players. Requires a bit of extra caching. + * + * @return true if enabled + */ boolean fix1_13FormattedInventoryTitle(); /** @@ -49,5 +54,11 @@ public interface ViaBackwardsConfig { */ boolean alwaysShowOriginalMobName(); + /** + * Sends inventory acknowledgement packets to act as a replacement for ping packets for sub 1.17 clients. + * This only takes effect for ids in the short range. Useful for anticheat compatibility. + * + * @return true if enabled + */ boolean handlePingsAsInvAcknowledgements(); } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java index 6e1f988e..04d89ce5 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java @@ -52,12 +52,15 @@ import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.Protocol1_19_ import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.Protocol1_19_4To1_20; import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.Protocol1_19To1_19_1; import com.viaversion.viabackwards.protocol.protocol1_20to1_20_2.Protocol1_20To1_20_2; +import com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4; import com.viaversion.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10; +import com.viaversion.viabackwards.protocol.protocol1_9to1_9_1.Protocol1_9To1_9_1; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.ProtocolManager; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.update.Version; import java.io.File; +import java.util.Arrays; import java.util.logging.Logger; public interface ViaBackwardsPlatform { @@ -86,6 +89,8 @@ public interface ViaBackwardsPlatform { getLogger().info("Registering protocols..."); final ProtocolManager protocolManager = Via.getManager().getProtocolManager(); + protocolManager.registerProtocol(new Protocol1_9To1_9_1(), ProtocolVersion.v1_9, ProtocolVersion.v1_9_1); + protocolManager.registerProtocol(new Protocol1_9_1_2To1_9_3_4(), Arrays.asList(ProtocolVersion.v1_9_1.getVersion(), ProtocolVersion.v1_9_2.getVersion()), ProtocolVersion.v1_9_3.getVersion()); protocolManager.registerProtocol(new Protocol1_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10); protocolManager.registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_10, ProtocolVersion.v1_11); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index 30f49ef1..263908db 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -41,10 +41,11 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter; -import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_3_4Type; + import java.util.Arrays; import java.util.Optional; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java index a53c5bf0..927d0266 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java @@ -33,11 +33,12 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; -import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import java.util.Iterator; import java.util.Map; + +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_3_4Type; import org.checkerframework.checker.nullness.qual.Nullable; public class BlockItemPackets1_12 extends LegacyBlockItemRewriter { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java index 53e65979..6a5b14d2 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java @@ -54,8 +54,8 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.BlockIdData; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SpawnEggRewriter; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; -import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_3_4Type; import com.viaversion.viaversion.util.Key; import java.util.ArrayList; import java.util.HashMap; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java new file mode 100644 index 00000000..8c85a89a --- /dev/null +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java @@ -0,0 +1,120 @@ +/* + * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards + * Copyright (C) 2016-2023 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4; + +import com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4.chunks.BlockEntity; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.protocol.AbstractProtocol; +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.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.protocols.protocol1_9_1to1_9.types.Chunk1_9_1_2Type; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_3_4Type; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; + +public class Protocol1_9_1_2To1_9_3_4 extends AbstractProtocol { + + public Protocol1_9_1_2To1_9_3_4() { + super(ClientboundPackets1_9_3.class, ClientboundPackets1_9.class, ServerboundPackets1_9_3.class, ServerboundPackets1_9.class); + } + + @Override + protected void registerPackets() { + registerClientbound(ClientboundPackets1_9_3.BLOCK_ENTITY_DATA, new PacketHandlers() { + @Override + public void register() { + map(Type.POSITION); //Position + map(Type.UNSIGNED_BYTE); //Type + map(Type.NBT); //NBT + handler(wrapper -> { + if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 9) { + Position position = wrapper.get(Type.POSITION, 0); + CompoundTag tag = wrapper.get(Type.NBT, 0); + + wrapper.clearPacket(); //Clear the packet + + wrapper.setPacketType(ClientboundPackets1_9.UPDATE_SIGN); + wrapper.write(Type.POSITION, position); // Position + for (int i = 1; i < 5; i++) { + // Should technically be written as COMPONENT, but left as String for simplification/to remove redundant wrapping for VR + Tag textTag = tag.get("Text" + i); + String line = textTag instanceof StringTag ? ((StringTag) textTag).getValue() : ""; + wrapper.write(Type.STRING, line); // Sign line + } + } + }); + } + }); + + registerClientbound(ClientboundPackets1_9_3.CHUNK_DATA, wrapper -> { + ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); + + Chunk1_9_3_4Type newType = new Chunk1_9_3_4Type(clientWorld); + Chunk1_9_1_2Type oldType = new Chunk1_9_1_2Type(clientWorld); // Get the old type to not write Block Entities + + Chunk chunk = wrapper.read(newType); + wrapper.write(oldType, chunk); + BlockEntity.handle(chunk.getBlockEntities(), wrapper.user()); + }); + + registerClientbound(ClientboundPackets1_9_3.JOIN_GAME, new PacketHandlers() { + @Override + public void register() { + map(Type.INT); // 0 - Entity ID + map(Type.UNSIGNED_BYTE); // 1 - Gamemode + map(Type.INT); // 2 - Dimension + + handler(wrapper -> { + ClientWorld clientChunks = wrapper.user().get(ClientWorld.class); + + int dimensionId = wrapper.get(Type.INT, 1); + clientChunks.setEnvironment(dimensionId); + }); + } + }); + + registerClientbound(ClientboundPackets1_9_3.RESPAWN, new PacketHandlers() { + @Override + public void register() { + map(Type.INT); // 0 - Dimension ID + + handler(wrapper -> { + ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); + + int dimensionId = wrapper.get(Type.INT, 0); + clientWorld.setEnvironment(dimensionId); + }); + } + }); + } + + @Override + public void init(UserConnection userConnection) { + if (!userConnection.has(ClientWorld.class)) { + userConnection.put(new ClientWorld(userConnection)); + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java new file mode 100644 index 00000000..66d03ac8 --- /dev/null +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java @@ -0,0 +1,85 @@ +/* + * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards + * Copyright (C) 2016-2023 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4.chunks; + +import com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class BlockEntity { + private static final Map types = new HashMap<>(); + + static { + types.put("MobSpawner", 1); + types.put("Control", 2); + types.put("Beacon", 3); + types.put("Skull", 4); + types.put("FlowerPot", 5); + types.put("Banner", 6); + types.put("UNKNOWN", 7); + types.put("EndGateway", 8); + types.put("Sign", 9); + } + + public static void handle(List tags, UserConnection connection) { + for (CompoundTag tag : tags) { + try { + if (!tag.contains("id")) + throw new Exception("NBT tag not handled because the id key is missing"); + + String id = (String) tag.get("id").getValue(); + if (!types.containsKey(id)) + throw new Exception("Not handled id: " + id); + + int newId = types.get(id); + if (newId == -1) + continue; + + int x = ((NumberTag) tag.get("x")).asInt(); + int y = ((NumberTag) tag.get("y")).asInt(); + int z = ((NumberTag) tag.get("z")).asInt(); + + Position pos = new Position(x, (short) y, z); + + updateBlockEntity(pos, (short) newId, tag, connection); + } catch (Exception e) { + if (Via.getManager().isDebug()) { + Via.getPlatform().getLogger().warning("Block Entity: " + e.getMessage() + ": " + tag); + } + } + } + } + + private static void updateBlockEntity(Position pos, short id, CompoundTag tag, UserConnection connection) throws Exception { + PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_9_3.BLOCK_ENTITY_DATA, null, connection); + wrapper.write(Type.POSITION, pos); + wrapper.write(Type.UNSIGNED_BYTE, id); + wrapper.write(Type.NBT, tag); + wrapper.scheduleSend(Protocol1_9_1_2To1_9_3_4.class, false); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java index 5d1de09b..55d9920b 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java @@ -25,10 +25,10 @@ import com.viaversion.viaversion.api.minecraft.chunks.Chunk; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_3_4Type; public class BlockItemPackets1_10 extends LegacyBlockItemRewriter { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9to1_9_1/Protocol1_9To1_9_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9to1_9_1/Protocol1_9To1_9_1.java new file mode 100644 index 00000000..060876b7 --- /dev/null +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_9to1_9_1/Protocol1_9To1_9_1.java @@ -0,0 +1,64 @@ +/* + * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards + * Copyright (C) 2016-2023 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.viabackwards.protocol.protocol1_9to1_9_1; + +import com.viaversion.viaversion.api.protocol.AbstractProtocol; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; + +public class Protocol1_9To1_9_1 extends AbstractProtocol { + + public Protocol1_9To1_9_1() { + super(ClientboundPackets1_9.class, ClientboundPackets1_9.class, ServerboundPackets1_9.class, ServerboundPackets1_9.class); + } + + @Override + protected void registerPackets() { + registerClientbound(ClientboundPackets1_9.JOIN_GAME, new PacketHandlers() { + @Override + public void register() { + map(Type.INT); // 0 - Player ID + map(Type.UNSIGNED_BYTE); // 1 - Player Gamemode + // 1.9.1 PRE 2 Changed this + map(Type.INT, Type.BYTE); // 2 - Player Dimension + map(Type.UNSIGNED_BYTE); // 3 - World Difficulty + map(Type.UNSIGNED_BYTE); // 4 - Max Players (Tab) + map(Type.STRING); // 5 - Level Type + map(Type.BOOLEAN); // 6 - Reduced Debug info + } + }); + + registerClientbound(ClientboundPackets1_9.SOUND, new PacketHandlers() { + @Override + public void register() { + map(Type.VAR_INT); // 0 - Sound ID + + handler(wrapper -> { + int sound = wrapper.get(Type.VAR_INT, 0); + + if (sound == 415) // Stop the Elytra sound for 1.9 (It's introduced in 1.9.2) + wrapper.cancel(); + else if (sound >= 416) // Act like the Elytra sound never existed + wrapper.set(Type.VAR_INT, 0, sound - 1); + }); + } + }); + } +} \ No newline at end of file