Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 03:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix //expand, improve //help

Browse Source
This commit is contained in:
Kenzie Togami
2019-05-17 22:24:14 -07:00
parent 71df3716dd
commit 3173e26109
14 changed files with 209 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ExpandAmount.java
View File

@ -1,51 +0,0 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.command.argument;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
public final class ExpandAmount {
public static ExpandAmount vert() {
return new ExpandAmount(null);
}
public static ExpandAmount from(int amount) {
return new ExpandAmount(amount);
}
@Nullable
private final Integer amount;
private ExpandAmount(@Nullable Integer amount) {
this.amount = amount;
}
public boolean isVert() {
return amount == null;
}
public int getAmount() {
return checkNotNull(amount, "This amount is vertical, i.e. undefined");
}
}

70
worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ExpandAmountConverter.java
View File

@ -1,70 +0,0 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.command.argument;
import com.google.common.reflect.TypeToken;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import org.enginehub.piston.CommandManager;
import org.enginehub.piston.converter.ArgumentConverter;
import org.enginehub.piston.converter.ArgumentConverters;
import org.enginehub.piston.converter.ConversionResult;
import org.enginehub.piston.converter.SuccessfulConversion;
import org.enginehub.piston.inject.InjectedValueAccess;
import org.enginehub.piston.inject.Key;
import java.util.List;
import java.util.stream.Stream;
import static org.enginehub.piston.converter.SuggestionHelper.limitByPrefix;
public class ExpandAmountConverter implements ArgumentConverter<ExpandAmount> {
public static void register(CommandManager commandManager) {
commandManager.registerConverter(Key.of(ExpandAmount.class), new ExpandAmountConverter());
}
private final ArgumentConverter<Integer> integerConverter =
ArgumentConverters.get(TypeToken.of(int.class));
private ExpandAmountConverter() {
}
@Override
public Component describeAcceptableArguments() {
return TextComponent.of("`vert` or ").append(integerConverter.describeAcceptableArguments());
}
@Override
public List<String> getSuggestions(String input) {
return limitByPrefix(Stream.concat(
Stream.of("vert"), integerConverter.getSuggestions(input).stream()
), input);
}
@Override
public ConversionResult<ExpandAmount> convert(String argument, InjectedValueAccess context) {
if (argument.equalsIgnoreCase("vert")
|| argument.equalsIgnoreCase("vertical")) {
return SuccessfulConversion.fromSingle(ExpandAmount.vert());
}
return integerConverter.convert(argument, context).mapSingle(ExpandAmount::from);
}
}