Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-02-16 19:51:35 +01:00
Code Issues Projects Releases Wiki Activity

Call command argument handler with unmapped name

Browse Source
This commit is contained in:
KennyTV 2021-02-05 13:04:57 +01:00
parent bdfaf9a621
commit 59c9018250
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 29 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
common/src/main/java/us/myles/ViaVersion/api/rewriters/CommandRewriter.java
View File

@ -21,55 +21,34 @@ public abstract class CommandRewriter {
this.protocol = protocol;
// Register default parsers
this.parserHandlers.put("brigadier:double", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.DOUBLE); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.DOUBLE); // Max Value
}
this.parserHandlers.put("brigadier:double", wrapper -> {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.DOUBLE); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.DOUBLE); // Max Value
});
this.parserHandlers.put("brigadier:float", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.FLOAT); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.FLOAT); // Max Value
}
this.parserHandlers.put("brigadier:float", wrapper -> {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.FLOAT); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.FLOAT); // Max Value
});
this.parserHandlers.put("brigadier:integer", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.INT); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.INT); // Max Value
}
this.parserHandlers.put("brigadier:integer", wrapper -> {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.INT); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.INT); // Max Value
});
this.parserHandlers.put("brigadier:long", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.LONG); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.LONG); // Max Value
}
this.parserHandlers.put("brigadier:long", wrapper -> {
byte propertyFlags = wrapper.passthrough(Type.BYTE); // Flags
if ((propertyFlags & 0x01) != 0) wrapper.passthrough(Type.LONG); // Min Value
if ((propertyFlags & 0x02) != 0) wrapper.passthrough(Type.LONG); // Max Value
});
this.parserHandlers.put("brigadier:string", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
wrapper.passthrough(Type.VAR_INT); // Flags
}
this.parserHandlers.put("brigadier:string", wrapper -> {
wrapper.passthrough(Type.VAR_INT); // Flags
});
this.parserHandlers.put("minecraft:entity", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
wrapper.passthrough(Type.BYTE); // Flags
}
this.parserHandlers.put("minecraft:entity", wrapper -> {
wrapper.passthrough(Type.BYTE); // Flags
});
this.parserHandlers.put("minecraft:score_holder", new CommandArgumentConsumer() {
@Override
public void accept(PacketWrapper wrapper) throws Exception {
wrapper.passthrough(Type.BYTE); // Flags
}
this.parserHandlers.put("minecraft:score_holder", wrapper -> {
wrapper.passthrough(Type.BYTE); // Flags
});
}
@ -99,11 +78,14 @@ public abstract class CommandRewriter {
}
if (nodeType == 2) { // Argument node
String argumentType = handleArgumentType(wrapper.read(Type.STRING));
if (argumentType != null) {
wrapper.write(Type.STRING, argumentType);
handleArgument(wrapper, argumentType);
String argumentType = wrapper.read(Type.STRING);
String newArgumentType = handleArgumentType(argumentType);
if (newArgumentType != null) {
wrapper.write(Type.STRING, newArgumentType);
}
// Always call the handler using the previous name
handleArgument(wrapper, argumentType);
}
if ((flags & 0x10) != 0) {