* fix jumpto command

* imports

* Formatting

Co-authored-by: Aurora <aurora@relanet.eu>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Dieser Commit ist enthalten in:
weaondara 2020-10-08 17:38:31 +02:00 committet von MattBDev
Ursprung cf0ff72524
Commit 62fa6d255c
3 geänderte Dateien mit 93 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -0,0 +1,88 @@
/*
* 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 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.command.argument;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.World;
import org.enginehub.piston.CommandManager;
import org.enginehub.piston.converter.ArgumentConverter;
import org.enginehub.piston.converter.ConversionResult;
import org.enginehub.piston.converter.FailedConversion;
import org.enginehub.piston.converter.SuccessfulConversion;
import org.enginehub.piston.inject.InjectedValueAccess;
import org.enginehub.piston.inject.Key;
import java.util.Collections;
import java.util.List;
public class LocationConverter implements ArgumentConverter<Location> {
public static void register(CommandManager commandManager) {
commandManager.registerConverter(Key.of(Location.class), LOCATION_CONVERTER);
}
public static final LocationConverter LOCATION_CONVERTER = new LocationConverter();
private final WorldConverter worldConverter = WorldConverter.WORLD_CONVERTER;
private final VectorConverter<Integer, BlockVector3> vectorConverter = VectorConverter.BLOCK_VECTOR_3_CONVERTER;
private final Component desc = TextComponent.of("any world, x, y, and z");
private LocationConverter() {
}
@Override
public Component describeAcceptableArguments() {
return desc;
}
@Override
public List<String> getSuggestions(String input, InjectedValueAccess context) {
if (input.contains(",")) {
return Collections.emptyList();
}
return worldConverter.getSuggestions(input, context);
}
@Override
public ConversionResult<Location> convert(String s, InjectedValueAccess injectedValueAccess) {
String[] split4 = s.split(",", 4);
if (split4.length != 4) {
return FailedConversion.from(new IllegalArgumentException(
"Must have exactly 1 world and 3 vector components"));
}
String[] split2 = s.split(",", 2);
ConversionResult<World> world = worldConverter.convert(split2[0], injectedValueAccess);
if (!world.isSuccessful()) {
return (FailedConversion) world;
}
ConversionResult<BlockVector3> vector = vectorConverter.convert(split2[1], injectedValueAccess);
if (!vector.isSuccessful()) {
return (FailedConversion) vector;
}
Location location = new Location(world.get().iterator().next(), vector.get().iterator().next().toVector3());
return SuccessfulConversion.fromSingle(location);
}
}

Datei anzeigen

@ -39,11 +39,11 @@ import java.util.stream.Stream;
public class WorldConverter implements ArgumentConverter<World> { public class WorldConverter implements ArgumentConverter<World> {
public static void register(CommandManager commandManager) { public static void register(CommandManager commandManager) {
commandManager.registerConverter(Key.of(World.class), commandManager.registerConverter(Key.of(World.class), WORLD_CONVERTER);
new WorldConverter()
);
} }
public static final WorldConverter WORLD_CONVERTER = new WorldConverter();
private final TextComponent choices; private final TextComponent choices;
private WorldConverter() { private WorldConverter() {

Datei anzeigen

@ -90,6 +90,7 @@ import com.sk89q.worldedit.command.argument.EntityRemoverConverter;
import com.sk89q.worldedit.command.argument.EnumConverter; import com.sk89q.worldedit.command.argument.EnumConverter;
import com.sk89q.worldedit.command.argument.ExpressionConverter; import com.sk89q.worldedit.command.argument.ExpressionConverter;
import com.sk89q.worldedit.command.argument.FactoryConverter; import com.sk89q.worldedit.command.argument.FactoryConverter;
import com.sk89q.worldedit.command.argument.LocationConverter;
import com.sk89q.worldedit.command.argument.RegionFactoryConverter; import com.sk89q.worldedit.command.argument.RegionFactoryConverter;
import com.sk89q.worldedit.command.argument.RegistryConverter; import com.sk89q.worldedit.command.argument.RegistryConverter;
import com.sk89q.worldedit.command.argument.SideEffectConverter; import com.sk89q.worldedit.command.argument.SideEffectConverter;
@ -256,6 +257,7 @@ public final class PlatformCommandManager {
EntityRemoverConverter.register(commandManager); EntityRemoverConverter.register(commandManager);
RegionFactoryConverter.register(commandManager); RegionFactoryConverter.register(commandManager);
WorldConverter.register(commandManager); WorldConverter.register(commandManager);
LocationConverter.register(commandManager);
ExpressionConverter.register(commandManager); ExpressionConverter.register(commandManager);
SideEffectConverter.register(commandManager); SideEffectConverter.register(commandManager);