Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tab complete error for single property states

Browse Source
This commit is contained in:
Jesse Boyd 2019-04-23 15:08:05 +10:00
parent 48bc4015c2
commit 290f047f6a
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-core/src/main/java/com/boydti/fawe/command/SuggestInputParseException.java
View File

@ -11,6 +11,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -52,6 +53,14 @@ public class SuggestInputParseException extends InputParseException {
return null; return null;
} }
public static SuggestInputParseException of(String input, List<Object> values) {
throw new SuggestInputParseException("No value: " + input, input, () ->
values.stream()
.map(v -> v.toString())
.filter(v -> v.startsWith(input))
.collect(Collectors.toList()));
}
@Override @Override
public synchronized Throwable getCause() { public synchronized Throwable getCause() {
return cause.getCause(); return cause.getCause();

9
worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/BooleanProperty.java
View File

@ -48,7 +48,14 @@ public class BooleanProperty extends AbstractProperty<Boolean> {
@Override @Override
public int getIndexFor(CharSequence string) throws IllegalArgumentException { public int getIndexFor(CharSequence string) throws IllegalArgumentException {
return string.charAt(0) == 't' ? defaultIndex : 1 - defaultIndex; switch (string.charAt(0)) {
case 't':
return defaultIndex;
case 'f':
return 1 - defaultIndex;
default:
return -1;
}
} }
@Nullable @Nullable

14
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -145,8 +145,10 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
String name = property.getName(); String name = property.getName();
charSequence.setSubstring(propStrStart + name.length() + 2, state.length() - 1); charSequence.setSubstring(propStrStart + name.length() + 2, state.length() - 1);
int index = charSequence.length() <= 0 ? -1 : property.getIndexFor(charSequence);
return type.withPropertyId(property.getIndexFor(charSequence)); if (index != -1) {
return type.withPropertyId(index);
}
} }
int stateId; int stateId;
if (defaultState != null) { if (defaultState != null) {
@ -167,13 +169,7 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
if (property != null) { if (property != null) {
int index = property.getIndexFor(charSequence); int index = property.getIndexFor(charSequence);
if (index == -1) { if (index == -1) {
String input = charSequence.toString(); throw SuggestInputParseException.of(charSequence.toString(), property.getValues());
List<Object> values = property.getValues();
throw new SuggestInputParseException("No value: " + input + " for " + type, input, () ->
values.stream()
.map(v -> v.toString())
.filter(v -> v.startsWith(input))
.collect(Collectors.toList()));
} }
stateId = property.modifyIndex(stateId, index); stateId = property.modifyIndex(stateId, index);
} else { } else {