Update Piston to fix bugs

Closes #1292 via Piston fixes.

(cherry picked from commit dc56b602c0367fbd24f954de2b8be4e864add59f)
This commit is contained in:
Octavia Togami
2020-04-11 22:38:46 -04:00
committed by MattBDev
parent 3426e0103b
commit 864d160102
12 changed files with 47 additions and 42 deletions

View File

@ -111,7 +111,7 @@ public abstract class AbstractDirectionConverter<D> implements ArgumentConverter
}
@Override
public List<String> getSuggestions(String input) {
public List<String> getSuggestions(String input, InjectedValueAccess context) {
return limitByPrefix(suggestions.stream(), input);
}

View File

@ -70,9 +70,10 @@ public class CommaSeparatedValuesConverter<T> implements ArgumentConverter<T> {
}
@Override
public List<String> getSuggestions(String input) {
public List<String> getSuggestions(String input, InjectedValueAccess context) {
String lastInput = Iterables.getLast(COMMA.split(input), "");
return delegate.getSuggestions(lastInput);
assert lastInput != null;
return delegate.getSuggestions(lastInput, context);
}
@Override

View File

@ -55,7 +55,7 @@ public class EntityRemoverConverter implements ArgumentConverter<EntityRemover>
}
@Override
public List<String> getSuggestions(String input) {
public List<String> getSuggestions(String input, InjectedValueAccess context) {
return limitByPrefix(suggestions.stream(), input);
}

View File

@ -133,7 +133,7 @@ public class FactoryConverter<T> implements ArgumentConverter<T> {
}
@Override
public List<String> getSuggestions(String input) {
public List<String> getSuggestions(String input, InjectedValueAccess context) {
return factoryExtractor.apply(worldEdit).getSuggestions(input);
}

View File

@ -104,7 +104,8 @@ public final class RegistryConverter<V extends Keyed> implements ArgumentConvert
: SuccessfulConversion.fromSingle(result);
}
public List<String> getSuggestions(String input) {
@Override
public List<String> getSuggestions(String input, InjectedValueAccess context) {
return SuggestionHelper.getRegistrySuggestions(registry, input).collect(Collectors.toList());
}
}

View File

@ -61,7 +61,7 @@ public class WorldConverter implements ArgumentConverter<World> {
}
@Override
public List<String> getSuggestions(String input) {
public List<String> getSuggestions(String input, InjectedValueAccess context) {
return getWorlds()
.map(World::getId)
.filter(world -> world.startsWith(input))