Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
51be16a
commit 31486cd
Showing
7 changed files
with
321 additions
and
174 deletions.
There are no files selected for viewing
298 changes: 150 additions & 148 deletions
298
worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
Large diffs are not rendered by default.
Oops, something went wrong.
68 changes: 68 additions & 0 deletions
68
...ore/src/main/java/com/sk89q/worldedit/command/argument/CommaSeparatedValuesConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package com.sk89q.worldedit.command.argument; | ||
|
|
||
| import com.google.common.base.Splitter; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.Iterables; | ||
| import org.enginehub.piston.converter.ArgumentConverter; | ||
| import org.enginehub.piston.converter.ConversionResult; | ||
| import org.enginehub.piston.converter.SuccessfulConversion; | ||
| import org.enginehub.piston.inject.InjectedValueAccess; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkArgument; | ||
|
|
||
| public class CommaSeparatedValuesConverter<T> implements ArgumentConverter<T> { | ||
|
|
||
| public static <T> CommaSeparatedValuesConverter<T> wrap(ArgumentConverter<T> delegate) { | ||
| return wrapAndLimit(delegate, -1); | ||
| } | ||
|
|
||
| public static <T> CommaSeparatedValuesConverter<T> wrapAndLimit(ArgumentConverter<T> delegate, int maximum) { | ||
| return new CommaSeparatedValuesConverter<>(delegate, maximum); | ||
| } | ||
|
|
||
| private static final Splitter COMMA = Splitter.on(','); | ||
|
|
||
| private final ArgumentConverter<T> delegate; | ||
| private final int maximum; | ||
|
|
||
| private CommaSeparatedValuesConverter(ArgumentConverter<T> delegate, int maximum) { | ||
| checkArgument(maximum == -1 || maximum > 1, | ||
| "Maximum must be bigger than 1, or exactly -1"); | ||
| this.delegate = delegate; | ||
| this.maximum = maximum; | ||
| } | ||
|
|
||
| @Override | ||
| public String describeAcceptableArguments() { | ||
| StringBuilder result = new StringBuilder(); | ||
| if (maximum > -1) { | ||
| result.append("up to ").append(maximum).append(' '); | ||
| } | ||
| result.append("comma separated values of ") | ||
| .append(delegate.describeAcceptableArguments()); | ||
| result.setCharAt(0, Character.toUpperCase(result.charAt(0))); | ||
| return result.toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getSuggestions(String input) { | ||
| String lastInput = Iterables.getLast(COMMA.split(input)); | ||
| return delegate.getSuggestions(lastInput); | ||
| } | ||
|
|
||
| @Override | ||
| public ConversionResult<T> convert(String argument, InjectedValueAccess context) { | ||
| ImmutableList.Builder<T> result = ImmutableList.builder(); | ||
| for (String input : COMMA.split(argument)) { | ||
| ConversionResult<T> temp = delegate.convert(input, context); | ||
| if (!temp.isSuccessful()) { | ||
| return temp; | ||
| } | ||
| result.addAll(temp.get()); | ||
| } | ||
| return SuccessfulConversion.from(result.build()); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Annotations.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.sk89q.worldedit.extension.platform; | ||
|
|
||
| import com.google.auto.value.AutoAnnotation; | ||
| import com.sk89q.worldedit.internal.annotation.Radii; | ||
|
|
||
| /** | ||
| * Holder for generated annotation classes. | ||
| */ | ||
| class Annotations { | ||
|
|
||
| @AutoAnnotation | ||
| static Radii radii(int value) { | ||
| return new AutoAnnotation_Annotations_radii(value); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Radii.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * 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.internal.annotation; | ||
|
|
||
| import org.enginehub.piston.inject.InjectAnnotation; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /** | ||
| * Annotates a {@code double} parameter to inject multiple radii values. | ||
| */ | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Target(ElementType.PARAMETER) | ||
| @InjectAnnotation | ||
| public @interface Radii { | ||
| /** | ||
| * Number of radii values to inject at maximum. May inject less. | ||
| */ | ||
| int value(); | ||
| } |