Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-09-19 02:20:04 +02:00
Ursprung
47af0d634f
Commit
257eea5b04
@ -38,12 +38,7 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.InventoryPac
|
|||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.PlayerPackets;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.PlayerPackets;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.SpawnPackets;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.SpawnPackets;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.WorldPackets;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.WorldPackets;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.*;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider;
|
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
|
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
|
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
|
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
|
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.CommandBlockStorage;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.CommandBlockStorage;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
|
||||||
@ -141,6 +136,7 @@ public class Protocol1_9To1_8 extends AbstractProtocol<ClientboundPackets1_8, Cl
|
|||||||
providers.register(EntityIdProvider.class, new EntityIdProvider());
|
providers.register(EntityIdProvider.class, new EntityIdProvider());
|
||||||
providers.register(BossBarProvider.class, new BossBarProvider());
|
providers.register(BossBarProvider.class, new BossBarProvider());
|
||||||
providers.register(MainHandProvider.class, new MainHandProvider());
|
providers.register(MainHandProvider.class, new MainHandProvider());
|
||||||
|
providers.register(CompressionProvider.class, new CompressionProvider());
|
||||||
providers.require(MovementTransmitterProvider.class);
|
providers.require(MovementTransmitterProvider.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_
|
|||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.ChatRewriter;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.ChatRewriter;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.GameMode;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.GameMode;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider;
|
||||||
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CompressionProvider;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
|
import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
|
||||||
@ -45,16 +46,13 @@ public class PlayerPackets {
|
|||||||
map(Type.STRING, Protocol1_9To1_8.FIX_JSON); // 0 - Chat Message (json)
|
map(Type.STRING, Protocol1_9To1_8.FIX_JSON); // 0 - Chat Message (json)
|
||||||
map(Type.BYTE); // 1 - Chat Positon
|
map(Type.BYTE); // 1 - Chat Positon
|
||||||
|
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
try {
|
try {
|
||||||
JsonObject obj = (JsonObject) wrapper.get(Type.COMPONENT, 0);
|
JsonObject obj = (JsonObject) wrapper.get(Type.COMPONENT, 0);
|
||||||
ChatRewriter.toClient(obj, wrapper.user());
|
ChatRewriter.toClient(obj, wrapper.user());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -79,14 +77,11 @@ public class PlayerPackets {
|
|||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.VAR_INT); // 0 - Action
|
map(Type.VAR_INT); // 0 - Action
|
||||||
// We only handle if the title or subtitle is set then just write through.
|
// We only handle if the title or subtitle is set then just write through.
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
int action = wrapper.get(Type.VAR_INT, 0);
|
int action = wrapper.get(Type.VAR_INT, 0);
|
||||||
if (action == 0 || action == 1) {
|
if (action == 0 || action == 1) {
|
||||||
Protocol1_9To1_8.FIX_JSON.write(wrapper, wrapper.read(Type.STRING));
|
Protocol1_9To1_8.FIX_JSON.write(wrapper, wrapper.read(Type.STRING));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
// Everything else is handled.
|
// Everything else is handled.
|
||||||
}
|
}
|
||||||
@ -104,11 +99,8 @@ public class PlayerPackets {
|
|||||||
|
|
||||||
map(Type.BYTE); // 5 - Player Flags
|
map(Type.BYTE); // 5 - Player Flags
|
||||||
|
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) {
|
|
||||||
wrapper.write(Type.VAR_INT, 0); // 6 - Teleport ID was added
|
wrapper.write(Type.VAR_INT, 0); // 6 - Teleport ID was added
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -118,9 +110,7 @@ public class PlayerPackets {
|
|||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.STRING); // 0 - Team Name
|
map(Type.STRING); // 0 - Team Name
|
||||||
map(Type.BYTE); // 1 - Mode
|
map(Type.BYTE); // 1 - Mode
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
byte mode = wrapper.get(Type.BYTE, 0); // Mode
|
byte mode = wrapper.get(Type.BYTE, 0); // Mode
|
||||||
if (mode == 0 || mode == 2) {
|
if (mode == 0 || mode == 2) {
|
||||||
wrapper.passthrough(Type.STRING); // Display Name
|
wrapper.passthrough(Type.STRING); // Display Name
|
||||||
@ -172,7 +162,6 @@ public class PlayerPackets {
|
|||||||
entityTracker.setCurrentTeam("viaversion");
|
entityTracker.setCurrentTeam("viaversion");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -182,14 +171,11 @@ public class PlayerPackets {
|
|||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.INT); // 0 - Player ID
|
map(Type.INT); // 0 - Player ID
|
||||||
// Parse this info
|
// Parse this info
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
int entityId = wrapper.get(Type.INT, 0);
|
int entityId = wrapper.get(Type.INT, 0);
|
||||||
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
||||||
tracker.addEntity(entityId, Entity1_10Types.EntityType.PLAYER);
|
tracker.addEntity(entityId, Entity1_10Types.EntityType.PLAYER);
|
||||||
tracker.setClientEntityId(entityId);
|
tracker.setClientEntityId(entityId);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
map(Type.UNSIGNED_BYTE); // 1 - Player Gamemode
|
map(Type.UNSIGNED_BYTE); // 1 - Player Gamemode
|
||||||
map(Type.BYTE); // 2 - Player Dimension
|
map(Type.BYTE); // 2 - Player Dimension
|
||||||
@ -198,28 +184,20 @@ public class PlayerPackets {
|
|||||||
map(Type.STRING); // 5 - Level Type
|
map(Type.STRING); // 5 - Level Type
|
||||||
map(Type.BOOLEAN); // 6 - Reduced Debug info
|
map(Type.BOOLEAN); // 6 - Reduced Debug info
|
||||||
|
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
||||||
tracker.setGameMode(GameMode.getById(wrapper.get(Type.UNSIGNED_BYTE, 0))); //Set player gamemode
|
tracker.setGameMode(GameMode.getById(wrapper.get(Type.UNSIGNED_BYTE, 0))); //Set player gamemode
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Gotta fake their op
|
// Gotta fake their op
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
CommandBlockProvider provider = Via.getManager().getProviders().get(CommandBlockProvider.class);
|
CommandBlockProvider provider = Via.getManager().getProviders().get(CommandBlockProvider.class);
|
||||||
provider.sendPermission(wrapper.user());
|
provider.sendPermission(wrapper.user());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// Scoreboard will be cleared when join game is received
|
// Scoreboard will be cleared when join game is received
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
||||||
if (Via.getConfig().isAutoTeam()) {
|
if (Via.getConfig().isAutoTeam()) {
|
||||||
entityTracker.setAutoTeam(true);
|
entityTracker.setAutoTeam(true);
|
||||||
@ -231,7 +209,6 @@ public class PlayerPackets {
|
|||||||
} else {
|
} else {
|
||||||
entityTracker.setAutoTeam(false);
|
entityTracker.setAutoTeam(false);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -243,10 +220,7 @@ public class PlayerPackets {
|
|||||||
map(Type.VAR_INT); // 1 - Player Count
|
map(Type.VAR_INT); // 1 - Player Count
|
||||||
|
|
||||||
// Due to this being a complex data structure we just use a handler.
|
// Due to this being a complex data structure we just use a handler.
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
|
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
int action = wrapper.get(Type.VAR_INT, 0);
|
int action = wrapper.get(Type.VAR_INT, 0);
|
||||||
int count = wrapper.get(Type.VAR_INT, 1);
|
int count = wrapper.get(Type.VAR_INT, 1);
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
@ -283,7 +257,6 @@ public class PlayerPackets {
|
|||||||
// no fields
|
// no fields
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -292,9 +265,7 @@ public class PlayerPackets {
|
|||||||
@Override
|
@Override
|
||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.STRING); // 0 - Channel Name
|
map(Type.STRING); // 0 - Channel Name
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
String name = wrapper.get(Type.STRING, 0);
|
String name = wrapper.get(Type.STRING, 0);
|
||||||
if (name.equalsIgnoreCase("MC|BOpen")) {
|
if (name.equalsIgnoreCase("MC|BOpen")) {
|
||||||
wrapper.read(Type.REMAINING_BYTES); // Not used anymore
|
wrapper.read(Type.REMAINING_BYTES); // Not used anymore
|
||||||
@ -325,7 +296,6 @@ public class PlayerPackets {
|
|||||||
wrapper.passthrough(Type.INT);
|
wrapper.passthrough(Type.INT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -334,9 +304,7 @@ public class PlayerPackets {
|
|||||||
@Override
|
@Override
|
||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.FLOAT); // 0 - Health
|
map(Type.FLOAT); // 0 - Health
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
float health = wrapper.get(Type.FLOAT, 0);
|
float health = wrapper.get(Type.FLOAT, 0);
|
||||||
if (health <= 0) {
|
if (health <= 0) {
|
||||||
// Client unloads chunks on respawn, take note
|
// Client unloads chunks on respawn, take note
|
||||||
@ -344,7 +312,6 @@ public class PlayerPackets {
|
|||||||
cc.getBulkChunks().clear();
|
cc.getBulkChunks().clear();
|
||||||
cc.getLoadedChunks().clear();
|
cc.getLoadedChunks().clear();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -357,9 +324,7 @@ public class PlayerPackets {
|
|||||||
map(Type.UNSIGNED_BYTE); // 2 - GameMode
|
map(Type.UNSIGNED_BYTE); // 2 - GameMode
|
||||||
map(Type.STRING); // 3 - Level Type
|
map(Type.STRING); // 3 - Level Type
|
||||||
|
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
// Client unloads chunks on respawn, take note
|
// Client unloads chunks on respawn, take note
|
||||||
ClientChunks cc = wrapper.user().get(ClientChunks.class);
|
ClientChunks cc = wrapper.user().get(ClientChunks.class);
|
||||||
cc.getBulkChunks().clear();
|
cc.getBulkChunks().clear();
|
||||||
@ -368,17 +333,13 @@ public class PlayerPackets {
|
|||||||
int gamemode = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
int gamemode = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||||
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
||||||
tracker.setGameMode(GameMode.getById(gamemode));
|
tracker.setGameMode(GameMode.getById(gamemode));
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fake permissions to get Commandblocks working
|
// Fake permissions to get Commandblocks working
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
CommandBlockProvider provider = Via.getManager().getProviders().get(CommandBlockProvider.class);
|
CommandBlockProvider provider = Via.getManager().getProviders().get(CommandBlockProvider.class);
|
||||||
provider.sendPermission(wrapper.user());
|
provider.sendPermission(wrapper.user());
|
||||||
provider.unloadChunks(wrapper.user());
|
provider.unloadChunks(wrapper.user());
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -389,21 +350,28 @@ public class PlayerPackets {
|
|||||||
map(Type.UNSIGNED_BYTE); //0 - Reason
|
map(Type.UNSIGNED_BYTE); //0 - Reason
|
||||||
map(Type.FLOAT); //1 - Value
|
map(Type.FLOAT); //1 - Value
|
||||||
|
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 3) { //Change gamemode
|
if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 3) { //Change gamemode
|
||||||
int gamemode = wrapper.get(Type.FLOAT, 0).intValue();
|
int gamemode = wrapper.get(Type.FLOAT, 0).intValue();
|
||||||
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
|
||||||
tracker.setGameMode(GameMode.getById(gamemode));
|
tracker.setGameMode(GameMode.getById(gamemode));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/* Removed packets */
|
/* Removed packets */
|
||||||
protocol.cancelClientbound(ClientboundPackets1_8.SET_COMPRESSION);
|
protocol.registerClientbound(ClientboundPackets1_8.SET_COMPRESSION, null, new PacketRemapper() {
|
||||||
|
@Override
|
||||||
|
public void registerMap() {
|
||||||
|
handler(wrapper -> {
|
||||||
|
wrapper.cancel();
|
||||||
|
CompressionProvider provider = Via.getManager().getProviders().get(CompressionProvider.class);
|
||||||
|
|
||||||
|
provider.handlePlayCompression(wrapper.user(), wrapper.read(Type.VAR_INT));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
/* Incoming Packets */
|
/* Incoming Packets */
|
||||||
@ -424,9 +392,7 @@ public class PlayerPackets {
|
|||||||
map(Type.BOOLEAN); // 3 - If Chat Colours on
|
map(Type.BOOLEAN); // 3 - If Chat Colours on
|
||||||
map(Type.UNSIGNED_BYTE); // 4 - Skin Parts
|
map(Type.UNSIGNED_BYTE); // 4 - Skin Parts
|
||||||
|
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
int hand = wrapper.read(Type.VAR_INT);
|
int hand = wrapper.read(Type.VAR_INT);
|
||||||
|
|
||||||
if (Via.getConfig().isLeftHandedHandling()) {
|
if (Via.getConfig().isLeftHandedHandling()) {
|
||||||
@ -438,7 +404,6 @@ public class PlayerPackets {
|
|||||||
wrapper.sendToServer(Protocol1_9To1_8.class);
|
wrapper.sendToServer(Protocol1_9To1_8.class);
|
||||||
wrapper.cancel();
|
wrapper.cancel();
|
||||||
Via.getManager().getProviders().get(MainHandProvider.class).setMainHand(wrapper.user(), hand);
|
Via.getManager().getProviders().get(MainHandProvider.class).setMainHand(wrapper.user(), hand);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -458,9 +423,7 @@ public class PlayerPackets {
|
|||||||
@Override
|
@Override
|
||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.STRING); // 0 - Channel Name
|
map(Type.STRING); // 0 - Channel Name
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
String name = wrapper.get(Type.STRING, 0);
|
String name = wrapper.get(Type.STRING, 0);
|
||||||
if (name.equalsIgnoreCase("MC|BSign")) {
|
if (name.equalsIgnoreCase("MC|BSign")) {
|
||||||
Item item = wrapper.passthrough(Type.ITEM);
|
Item item = wrapper.passthrough(Type.ITEM);
|
||||||
@ -482,7 +445,6 @@ public class PlayerPackets {
|
|||||||
if (name.equalsIgnoreCase("MC|AdvCmd")) {
|
if (name.equalsIgnoreCase("MC|AdvCmd")) {
|
||||||
wrapper.set(Type.STRING, 0, "MC|AdvCdm");
|
wrapper.set(Type.STRING, 0, "MC|AdvCdm");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -491,9 +453,7 @@ public class PlayerPackets {
|
|||||||
@Override
|
@Override
|
||||||
public void registerMap() {
|
public void registerMap() {
|
||||||
map(Type.VAR_INT); // 0 - Action ID
|
map(Type.VAR_INT); // 0 - Action ID
|
||||||
handler(new PacketHandler() {
|
handler(wrapper -> {
|
||||||
@Override
|
|
||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
|
||||||
int action = wrapper.get(Type.VAR_INT, 0);
|
int action = wrapper.get(Type.VAR_INT, 0);
|
||||||
if (action == 2) {
|
if (action == 2) {
|
||||||
// cancel any blocking >.>
|
// cancel any blocking >.>
|
||||||
@ -505,7 +465,6 @@ public class PlayerPackets {
|
|||||||
tracker.setBlocking(false);
|
tracker.setBlocking(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -0,0 +1,153 @@
|
|||||||
|
package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
|
||||||
|
|
||||||
|
import com.viaversion.viaversion.api.Via;
|
||||||
|
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||||
|
import com.viaversion.viaversion.api.platform.providers.Provider;
|
||||||
|
import com.viaversion.viaversion.api.type.Type;
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
import io.netty.channel.ChannelHandler;
|
||||||
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
import io.netty.channel.ChannelPipeline;
|
||||||
|
import io.netty.handler.codec.DecoderException;
|
||||||
|
import io.netty.handler.codec.MessageToByteEncoder;
|
||||||
|
import io.netty.handler.codec.MessageToMessageDecoder;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.zip.Deflater;
|
||||||
|
import java.util.zip.Inflater;
|
||||||
|
|
||||||
|
public class CompressionProvider implements Provider {
|
||||||
|
public void handlePlayCompression(UserConnection user, int threshold) {
|
||||||
|
if (!user.isClientSide()) throw new IllegalStateException("PLAY state Compression packet is unsupported");
|
||||||
|
|
||||||
|
ChannelPipeline pipe = user.getChannel().pipeline();
|
||||||
|
|
||||||
|
if (threshold < 0) {
|
||||||
|
if (pipe.get("compress") != null) {
|
||||||
|
pipe.remove("compress");
|
||||||
|
pipe.remove("decompress");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (pipe.get("compress") == null) {
|
||||||
|
pipe.addBefore(Via.getManager().getInjector().getEncoderName(), "compress", getEncoder(threshold));
|
||||||
|
pipe.addBefore(Via.getManager().getInjector().getDecoderName(), "decompress", getDecoder(threshold));
|
||||||
|
} else {
|
||||||
|
((CompressionHandler) pipe.get("compress")).setCompressionThreshold(threshold);
|
||||||
|
((CompressionHandler) pipe.get("decompress")).setCompressionThreshold(threshold);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected CompressionHandler getEncoder(int threshold) {
|
||||||
|
return new Compressor(threshold);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected CompressionHandler getDecoder(int threshold) {
|
||||||
|
return new Decompressor(threshold);
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface CompressionHandler extends ChannelHandler {
|
||||||
|
void setCompressionThreshold(int threshold);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class Decompressor extends MessageToMessageDecoder<ByteBuf> implements CompressionHandler {
|
||||||
|
// https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/netty/CompressionEncoder.java
|
||||||
|
private final Inflater inflater;
|
||||||
|
private int threshold;
|
||||||
|
|
||||||
|
public Decompressor(int var1) {
|
||||||
|
this.threshold = var1;
|
||||||
|
this.inflater = new Inflater();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
|
if (!in.isReadable()) return;
|
||||||
|
|
||||||
|
int outLength = Type.VAR_INT.readPrimitive(in);
|
||||||
|
if (outLength == 0) {
|
||||||
|
out.add(in.readBytes(in.readableBytes()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (outLength < this.threshold) {
|
||||||
|
throw new DecoderException("Badly compressed packet - size of " + outLength + " is below server threshold of " + this.threshold);
|
||||||
|
} else if (outLength > 2097152) {
|
||||||
|
throw new DecoderException("Badly compressed packet - size of " + outLength + " is larger than protocol maximum of " + 2097152);
|
||||||
|
}
|
||||||
|
|
||||||
|
ByteBuf temp = in;
|
||||||
|
if (!in.hasArray()) {
|
||||||
|
temp = ctx.alloc().heapBuffer().writeBytes(in);
|
||||||
|
} else {
|
||||||
|
in.retain();
|
||||||
|
}
|
||||||
|
ByteBuf output = ctx.alloc().heapBuffer(outLength, outLength);
|
||||||
|
try {
|
||||||
|
this.inflater.setInput(temp.array(), temp.arrayOffset() + temp.readerIndex(), temp.readableBytes());
|
||||||
|
output.writerIndex(output.writerIndex() + this.inflater.inflate(
|
||||||
|
output.array(), output.arrayOffset(), outLength));
|
||||||
|
out.add(output.retain());
|
||||||
|
} finally {
|
||||||
|
output.release();
|
||||||
|
temp.release();
|
||||||
|
this.inflater.reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCompressionThreshold(int threshold) {
|
||||||
|
this.threshold = threshold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class Compressor extends MessageToByteEncoder<ByteBuf> implements CompressionHandler {
|
||||||
|
// https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/netty/CompressionEncoder.java
|
||||||
|
private final Deflater deflater;
|
||||||
|
private int threshold;
|
||||||
|
|
||||||
|
public Compressor(int var1) {
|
||||||
|
this.threshold = var1;
|
||||||
|
this.deflater = new Deflater();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception {
|
||||||
|
int frameLength = in.readableBytes();
|
||||||
|
if (frameLength < this.threshold) {
|
||||||
|
out.writeByte(0); // varint
|
||||||
|
out.writeBytes(in);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Type.VAR_INT.writePrimitive(out, frameLength);
|
||||||
|
|
||||||
|
ByteBuf temp = in;
|
||||||
|
if (!in.hasArray()) {
|
||||||
|
temp = ctx.alloc().heapBuffer().writeBytes(in);
|
||||||
|
} else {
|
||||||
|
in.retain();
|
||||||
|
}
|
||||||
|
ByteBuf output = ctx.alloc().heapBuffer();
|
||||||
|
try {
|
||||||
|
this.deflater.setInput(temp.array(), temp.arrayOffset() + temp.readerIndex(), temp.readableBytes());
|
||||||
|
deflater.finish();
|
||||||
|
|
||||||
|
while (!deflater.finished()) {
|
||||||
|
output.ensureWritable(4096);
|
||||||
|
output.writerIndex(output.writerIndex() + this.deflater.deflate(output.array(),
|
||||||
|
output.arrayOffset() + output.writerIndex(), output.writableBytes()));
|
||||||
|
}
|
||||||
|
out.writeBytes(output);
|
||||||
|
} finally {
|
||||||
|
output.release();
|
||||||
|
temp.release();
|
||||||
|
this.deflater.reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCompressionThreshold(int threshold) {
|
||||||
|
this.threshold = threshold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren