2021-03-22 23:06:40 +01:00
|
|
|
/*
|
|
|
|
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
|
|
|
|
* Copyright (C) 2016-2021 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 <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
2021-04-26 20:52:34 +02:00
|
|
|
package com.viaversion.viaversion.protocols.protocol1_10to1_9_3;
|
2016-06-08 16:38:59 +02:00
|
|
|
|
2021-04-26 21:35:29 +02:00
|
|
|
import com.viaversion.viaversion.api.connection.UserConnection;
|
2021-04-26 20:52:34 +02:00
|
|
|
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
2021-04-27 18:21:51 +02:00
|
|
|
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
|
2021-04-27 13:41:39 +02:00
|
|
|
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
|
|
|
import com.viaversion.viaversion.api.protocol.packet.State;
|
2021-04-26 21:16:10 +02:00
|
|
|
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
|
|
|
|
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
|
|
|
|
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
|
2021-04-26 20:52:34 +02:00
|
|
|
import com.viaversion.viaversion.api.type.Type;
|
|
|
|
import com.viaversion.viaversion.api.type.types.version.Types1_9;
|
|
|
|
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets.InventoryPackets;
|
|
|
|
import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker;
|
|
|
|
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;
|
2016-06-08 16:38:59 +02:00
|
|
|
|
|
|
|
import java.util.List;
|
2016-07-11 13:48:48 +02:00
|
|
|
import java.util.concurrent.CopyOnWriteArrayList;
|
2016-06-08 16:38:59 +02:00
|
|
|
|
2021-04-27 18:21:51 +02:00
|
|
|
public class Protocol1_10To1_9_3_4 extends AbstractProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {
|
2016-07-11 15:52:06 +02:00
|
|
|
|
2020-06-06 09:45:43 +02:00
|
|
|
public static final ValueTransformer<Short, Float> TO_NEW_PITCH = new ValueTransformer<Short, Float>(Type.FLOAT) {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception {
|
2020-10-18 22:37:30 +02:00
|
|
|
return inputValue / 63.0F;
|
2016-07-11 13:48:48 +02:00
|
|
|
}
|
|
|
|
};
|
2020-06-06 09:45:43 +02:00
|
|
|
public static final ValueTransformer<List<Metadata>, List<Metadata>> TRANSFORM_METADATA = new ValueTransformer<List<Metadata>, List<Metadata>>(Types1_9.METADATA_LIST) {
|
2016-07-11 13:48:48 +02:00
|
|
|
@Override
|
|
|
|
public List<Metadata> transform(PacketWrapper wrapper, List<Metadata> inputValue) throws Exception {
|
|
|
|
List<Metadata> metaList = new CopyOnWriteArrayList<>(inputValue);
|
|
|
|
for (Metadata m : metaList) {
|
Refactor entity tracking and meta handling
This essentially merges the two approaches to the metadata handling from ViaVersion and ViaBackwards and improves on both designs.
ViaVersion did not track every single entity, but only those needed (at least in theory) and can work with untracked entities' metadata. It had a very simple method overridden by metadata rewriter implementations, directly operating on the full metadata list and manually handling meta index changes as well as item/block/particle id changes.
ViaBackwards on the other hand had to track *every single* entity and threw warnings otherwise - while less prone to errors due to giving obvious warnings in the console, it unnecessarily tracks a lot of entities, and those warnings also annoys users when encountering virtual entity plugins (operating asynchronously and sending update packets while already untracked or not yet tracked). Dedicated MetaHandlers made id changes and filtering a lot easier to read and write. However, the actual metadata list handling and its distribution to handlers was not very well implemented and required a lot of list copying and creation as well as exception throws to cancel individual metadata entries.
This version has MetaFilters built with a Builder containing multiple helper functions, and the entity tracking is properly given its own map, hashed by a Protocol's class, to be easily and generically accessible from anywhere with only a Protocol class from the UserConnection, along with more optimized metadata list iteration. The entity tracking is largely unchanged, keeping ViaVersion's approach to not having to track *all* entities (and being able to handle null types in meta handlers).
All of this is by no means absolutely perfect, but is much less prone to errors than both previous systems and takes a lot less effort to actually write. A last possible change would be to use a primitive int to object map that is built to be concurrency save for the EntityTracker, tho that would have to be chosen carefully.
2021-05-24 23:24:50 +02:00
|
|
|
if (m.id() >= 5)
|
|
|
|
m.setId(m.id() + 1);
|
2016-07-11 13:48:48 +02:00
|
|
|
}
|
|
|
|
return metaList;
|
2016-06-08 16:38:59 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2020-06-06 09:45:43 +02:00
|
|
|
public Protocol1_10To1_9_3_4() {
|
|
|
|
super(ClientboundPackets1_9_3.class, ClientboundPackets1_9_3.class, ServerboundPackets1_9_3.class, ServerboundPackets1_9_3.class);
|
|
|
|
}
|
|
|
|
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
protected void registerPackets() {
|
2020-11-13 14:27:29 +01:00
|
|
|
|
|
|
|
InventoryPackets.register(this);
|
|
|
|
|
2016-06-08 16:38:59 +02:00
|
|
|
// Named sound effect
|
2021-04-28 12:59:37 +02:00
|
|
|
registerClientbound(State.PLAY, 0x19, 0x19, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
map(Type.STRING); // 0 - Sound name
|
|
|
|
map(Type.VAR_INT); // 1 - Sound Category
|
|
|
|
map(Type.INT); // 2 - x
|
|
|
|
map(Type.INT); // 3 - y
|
|
|
|
map(Type.INT); // 4 - z
|
|
|
|
map(Type.FLOAT); // 5 - Volume
|
2020-06-06 09:45:43 +02:00
|
|
|
map(Type.UNSIGNED_BYTE, TO_NEW_PITCH); // 6 - Pitch
|
2016-06-08 16:38:59 +02:00
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Sound effect
|
2021-04-28 12:59:37 +02:00
|
|
|
registerClientbound(State.PLAY, 0x46, 0x46, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
map(Type.VAR_INT); // 0 - Sound name
|
|
|
|
map(Type.VAR_INT); // 1 - Sound Category
|
|
|
|
map(Type.INT); // 2 - x
|
|
|
|
map(Type.INT); // 3 - y
|
|
|
|
map(Type.INT); // 4 - z
|
|
|
|
map(Type.FLOAT); // 5 - Volume
|
2020-06-06 09:45:43 +02:00
|
|
|
map(Type.UNSIGNED_BYTE, TO_NEW_PITCH); // 6 - Pitch
|
2016-06-08 16:38:59 +02:00
|
|
|
|
|
|
|
handler(new PacketHandler() {
|
|
|
|
@Override
|
|
|
|
public void handle(PacketWrapper wrapper) throws Exception {
|
|
|
|
int id = wrapper.get(Type.VAR_INT, 0);
|
|
|
|
wrapper.set(Type.VAR_INT, 0, getNewSoundId(id));
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Metadata packet
|
2021-04-28 12:59:37 +02:00
|
|
|
registerClientbound(State.PLAY, 0x39, 0x39, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
map(Type.VAR_INT); // 0 - Entity ID
|
2020-06-06 09:45:43 +02:00
|
|
|
map(Types1_9.METADATA_LIST, TRANSFORM_METADATA); // 1 - Metadata list
|
2016-06-08 16:38:59 +02:00
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Spawn Mob
|
2021-04-28 12:59:37 +02:00
|
|
|
registerClientbound(State.PLAY, 0x03, 0x03, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
map(Type.VAR_INT); // 0 - Entity id
|
|
|
|
map(Type.UUID); // 1 - UUID
|
|
|
|
map(Type.UNSIGNED_BYTE); // 2 - Entity Type
|
|
|
|
map(Type.DOUBLE); // 3 - X
|
|
|
|
map(Type.DOUBLE); // 4 - Y
|
|
|
|
map(Type.DOUBLE); // 5 - Z
|
|
|
|
map(Type.BYTE); // 6 - Yaw
|
|
|
|
map(Type.BYTE); // 7 - Pitch
|
|
|
|
map(Type.BYTE); // 8 - Head Pitch
|
|
|
|
map(Type.SHORT); // 9 - Velocity X
|
|
|
|
map(Type.SHORT); // 10 - Velocity Y
|
|
|
|
map(Type.SHORT); // 11 - Velocity Z
|
2020-06-06 09:45:43 +02:00
|
|
|
map(Types1_9.METADATA_LIST, TRANSFORM_METADATA); // 12 - Metadata
|
2016-06-08 16:38:59 +02:00
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Spawn Player
|
2021-04-28 12:59:37 +02:00
|
|
|
registerClientbound(State.PLAY, 0x05, 0x05, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
map(Type.VAR_INT); // 0 - Entity ID
|
|
|
|
map(Type.UUID); // 1 - Player UUID
|
|
|
|
map(Type.DOUBLE); // 2 - X
|
|
|
|
map(Type.DOUBLE); // 3 - Y
|
|
|
|
map(Type.DOUBLE); // 4 - Z
|
|
|
|
map(Type.BYTE); // 5 - Yaw
|
|
|
|
map(Type.BYTE); // 6 - Pitch
|
2020-06-06 09:45:43 +02:00
|
|
|
map(Types1_9.METADATA_LIST, TRANSFORM_METADATA); // 7 - Metadata list
|
2016-06-08 16:38:59 +02:00
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Packet Send ResourcePack
|
2021-04-28 12:59:37 +02:00
|
|
|
registerClientbound(State.PLAY, 0x32, 0x32, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
map(Type.STRING); // 0 - URL
|
|
|
|
map(Type.STRING); // 1 - Hash
|
|
|
|
|
|
|
|
handler(new PacketHandler() {
|
|
|
|
@Override
|
|
|
|
public void handle(PacketWrapper wrapper) throws Exception {
|
|
|
|
ResourcePackTracker tracker = wrapper.user().get(ResourcePackTracker.class);
|
|
|
|
tracker.setLastHash(wrapper.get(Type.STRING, 1)); // Store the hash for resourcepack status
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Packet ResourcePack status
|
2021-04-28 12:59:37 +02:00
|
|
|
registerServerbound(State.PLAY, 0x16, 0x16, new PacketRemapper() {
|
2016-06-08 16:38:59 +02:00
|
|
|
@Override
|
|
|
|
public void registerMap() {
|
|
|
|
handler(new PacketHandler() {
|
|
|
|
@Override
|
|
|
|
public void handle(PacketWrapper wrapper) throws Exception {
|
|
|
|
ResourcePackTracker tracker = wrapper.user().get(ResourcePackTracker.class);
|
|
|
|
wrapper.write(Type.STRING, tracker.getLastHash());
|
|
|
|
wrapper.write(Type.VAR_INT, wrapper.read(Type.VAR_INT));
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
public int getNewSoundId(int id) { //TODO Make it better, suggestions are welcome. It's ugly and hardcoded now.
|
|
|
|
int newId = id;
|
|
|
|
if (id >= 24) //Blame the enchantment table sound
|
|
|
|
newId += 1;
|
|
|
|
if (id >= 248) //Blame the husk
|
|
|
|
newId += 4;
|
|
|
|
if (id >= 296) //Blame the polar bear
|
|
|
|
newId += 6;
|
|
|
|
if (id >= 354) //Blame the stray
|
|
|
|
newId += 4;
|
|
|
|
if (id >= 372) //Blame the wither skeleton
|
|
|
|
newId += 4;
|
|
|
|
return newId;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void init(UserConnection userConnection) {
|
|
|
|
userConnection.put(new ResourcePackTracker(userConnection));
|
|
|
|
}
|
|
|
|
}
|