Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-11-29 13:25:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use commands from Declare Commands packet for tab-completion on 1.12 (#353)

Browse Source
This commit is contained in:
MrMicky 2021-04-10 09:56:55 +02:00 committed by GitHub
parent f7bd440a96
commit ad48770606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 87 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
View File

@ -81,7 +81,6 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
new PlayerPacket1_13(this).register(); new PlayerPacket1_13(this).register();
new SoundPackets1_13(this).register(); new SoundPackets1_13(this).register();
cancelOutgoing(ClientboundPackets1_13.DECLARE_COMMANDS); //TODO
cancelOutgoing(ClientboundPackets1_13.NBT_QUERY); cancelOutgoing(ClientboundPackets1_13.NBT_QUERY);
cancelOutgoing(ClientboundPackets1_13.CRAFT_RECIPE_RESPONSE); cancelOutgoing(ClientboundPackets1_13.CRAFT_RECIPE_RESPONSE);
cancelOutgoing(ClientboundPackets1_13.UNLOCK_RECIPES); cancelOutgoing(ClientboundPackets1_13.UNLOCK_RECIPES);

102
common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
View File

@ -31,8 +31,10 @@ import us.myles.ViaVersion.api.minecraft.item.Item;
import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketHandler;
import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.PacketRemapper;
import us.myles.ViaVersion.api.remapper.ValueCreator; import us.myles.ViaVersion.api.remapper.ValueCreator;
import us.myles.ViaVersion.api.rewriters.CommandRewriter;
import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.packets.State;
import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
@ -47,6 +49,8 @@ import java.util.concurrent.ThreadLocalRandom;
public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> { public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
private final CommandRewriter commandRewriter = new CommandRewriter(protocol) {};
public PlayerPacket1_13(Protocol1_12_2To1_13 protocol) { public PlayerPacket1_13(Protocol1_12_2To1_13 protocol) {
super(protocol); super(protocol);
} }
@ -301,6 +305,47 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
} }
}); });
protocol.registerOutgoing(ClientboundPackets1_13.DECLARE_COMMANDS, null, new PacketRemapper() {
@Override
public void registerMap() {
handler(wrapper -> {
wrapper.cancel();
TabCompleteStorage storage = wrapper.user().get(TabCompleteStorage.class);
if (!storage.commands.isEmpty()) {
storage.commands.clear();
}
int size = wrapper.read(Type.VAR_INT);
for (int i = 0; i < size; i++) {
byte flags = wrapper.read(Type.BYTE);
wrapper.read(Type.VAR_INT_ARRAY_PRIMITIVE); // Children indices
if ((flags & 0x08) != 0) {
wrapper.read(Type.VAR_INT); // Redirect node index
}
byte nodeType = (byte) (flags & 0x03);
if (nodeType == 1 || nodeType == 2) { // Literal/argument node
String name = wrapper.read(Type.STRING);
if (nodeType == 1) {
storage.commands.add('/' + name);
}
}
if (nodeType == 2) { // Argument node
commandRewriter.handleArgument(wrapper, wrapper.read(Type.STRING));
}
if ((flags & 0x10) != 0) {
wrapper.read(Type.STRING); // Suggestion type
}
}
});
}
});
protocol.registerOutgoing(ClientboundPackets1_13.TAB_COMPLETE, new PacketRemapper() { protocol.registerOutgoing(ClientboundPackets1_13.TAB_COMPLETE, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
@ -342,34 +387,49 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
public void registerMap() { public void registerMap() {
handler(wrapper -> { handler(wrapper -> {
TabCompleteStorage storage = wrapper.user().get(TabCompleteStorage.class); TabCompleteStorage storage = wrapper.user().get(TabCompleteStorage.class);
int id = ThreadLocalRandom.current().nextInt(); List<String> suggestions = new ArrayList<>();
wrapper.write(Type.VAR_INT, id);
String command = wrapper.read(Type.STRING); String command = wrapper.read(Type.STRING);
boolean assumeCommand = wrapper.read(Type.BOOLEAN); boolean assumeCommand = wrapper.read(Type.BOOLEAN);
wrapper.read(Type.OPTIONAL_POSITION); wrapper.read(Type.OPTIONAL_POSITION);
if (!assumeCommand) { if (!assumeCommand && !command.startsWith("/")) {
if (command.startsWith("/")) { // Complete usernames for non-commands
command = command.substring(1); String buffer = command.substring(command.lastIndexOf(' ') + 1);
} else { for (String value : storage.usernames.values()) {
wrapper.cancel(); if (startsWithIgnoreCase(value, buffer)) {
PacketWrapper response = wrapper.create(0xE); suggestions.add(value);
List<String> usernames = new ArrayList<>();
for (String value : storage.usernames.values()) {
if (value.toLowerCase().startsWith(command.substring(command.lastIndexOf(' ') + 1).toLowerCase())) {
usernames.add(value);
}
} }
response.write(Type.VAR_INT, usernames.size()); }
for (String value : usernames) { } else if (!storage.commands.isEmpty() && !command.contains(" ")) {
response.write(Type.STRING, value); // Complete commands names with values from 'Declare Commands' packet
for (String value : storage.commands) {
if (startsWithIgnoreCase(value, command)) {
suggestions.add(value);
} }
response.send(protocol.getClass());
} }
} }
if (!suggestions.isEmpty()) {
wrapper.cancel();
PacketWrapper response = wrapper.create(ClientboundPackets1_12_1.TAB_COMPLETE);
response.write(Type.VAR_INT, suggestions.size());
for (String value : suggestions) {
response.write(Type.STRING, value);
}
response.send(Protocol1_12_2To1_13.class);
storage.lastRequest = null;
return;
}
if (!assumeCommand && command.startsWith("/")) {
command = command.substring(1);
}
int id = ThreadLocalRandom.current().nextInt();
wrapper.write(Type.VAR_INT, id);
wrapper.write(Type.STRING, command); wrapper.write(Type.STRING, command);
storage.lastId = id; storage.lastId = id;
storage.lastAssumeCommand = assumeCommand; storage.lastAssumeCommand = assumeCommand;
storage.lastRequest = command; storage.lastRequest = command;
@ -424,7 +484,6 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
wrapper.passthrough(Type.STRING); //Command wrapper.passthrough(Type.STRING); //Command
byte flags = 0; byte flags = 0;
if (wrapper.read(Type.BOOLEAN)) flags |= 0x01; //Track Output if (wrapper.read(Type.BOOLEAN)) flags |= 0x01; //Track Output
@ -579,4 +638,11 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
} }
}); });
} }
private static boolean startsWithIgnoreCase(String string, String prefix) {
if (string.length() < prefix.length()) {
return false;
}
return string.regionMatches(true, 0, prefix, 0, prefix.length());
}
} }

3
common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java
View File

@ -21,7 +21,9 @@ import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.data.UserConnection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
public class TabCompleteStorage extends StoredObject { public class TabCompleteStorage extends StoredObject {
@ -29,6 +31,7 @@ public class TabCompleteStorage extends StoredObject {
public String lastRequest; public String lastRequest;
public boolean lastAssumeCommand; public boolean lastAssumeCommand;
public Map<UUID, String> usernames = new HashMap<>(); public Map<UUID, String> usernames = new HashMap<>();
public Set<String> commands = new HashSet<>();
public TabCompleteStorage(UserConnection user) { public TabCompleteStorage(UserConnection user) {
super(user); super(user);