mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-02 10:02:59 +00:00
f9e13ca67a
Look, I originally had this split into several commits, but lots of
other cleanups got mixed in. I then backported some of the cleanups to
1.12, did other tidy ups there, and eventually the web of merges was
unreadable.
Yes, this is a horrible mess, but it's still nicer than it was. Anyway,
changes:
- Flatten everything. For instance, there are now three instances of
BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no
more BlockPeripheral (thank heavens) - there's separate block classes
for each peripheral type.
- Remove pretty much all legacy code. As we're breaking world
compatibility anyway, we can remove all the code to load worlds from
1.4 days.
- The command system is largely rewriten to take advantage of 1.13's
new system. It's very fancy!
- WidgetTerminal now uses Minecraft's "GUI listener" system.
- BREAKING CHANGE: All the codes in keys.lua are different, due to the
move to LWJGL 3. Hopefully this won't have too much of an impact.
I don't want to map to the old key codes on the Java side, as there
always ends up being small but slight inconsistencies. IMO it's
better to make a clean break - people should be using keys rather
than hard coding the constants anyway.
- commands.list now allows fetching sub-commands. The ROM has already
been updated to allow fancy usage such as commands.time.set("noon").
- Turtles, modems and cables can be waterlogged.
95 lines
3.1 KiB
Java
95 lines
3.1 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
|
|
package dan200.computercraft.shared.command.arguments;
|
|
|
|
import com.mojang.brigadier.StringReader;
|
|
import com.mojang.brigadier.arguments.ArgumentType;
|
|
import com.mojang.brigadier.context.CommandContext;
|
|
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
|
import com.mojang.brigadier.suggestion.Suggestions;
|
|
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
|
import dan200.computercraft.shared.command.arguments.ComputersArgumentType.ComputersSupplier;
|
|
import dan200.computercraft.shared.computer.core.ServerComputer;
|
|
import net.minecraft.command.CommandSource;
|
|
|
|
import java.util.Collection;
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
import static dan200.computercraft.shared.command.Exceptions.COMPUTER_ARG_MANY;
|
|
|
|
public final class ComputerArgumentType implements ArgumentType<ComputerArgumentType.ComputerSupplier>
|
|
{
|
|
private static final ComputerArgumentType INSTANCE = new ComputerArgumentType();
|
|
|
|
public static ComputerArgumentType oneComputer()
|
|
{
|
|
return INSTANCE;
|
|
}
|
|
|
|
public static ServerComputer getComputerArgument( CommandContext<CommandSource> context, String name ) throws CommandSyntaxException
|
|
{
|
|
return context.getArgument( name, ComputerSupplier.class ).unwrap( context.getSource() );
|
|
}
|
|
|
|
private ComputerArgumentType()
|
|
{
|
|
}
|
|
|
|
@Override
|
|
public ComputerSupplier parse( StringReader reader ) throws CommandSyntaxException
|
|
{
|
|
int start = reader.getCursor();
|
|
ComputersSupplier supplier = ComputersArgumentType.someComputers().parse( reader );
|
|
String selector = reader.getString().substring( start, reader.getCursor() );
|
|
|
|
return s -> {
|
|
Collection<ServerComputer> computers = supplier.unwrap( s );
|
|
|
|
if( computers.size() == 1 ) return computers.iterator().next();
|
|
|
|
StringBuilder builder = new StringBuilder();
|
|
boolean first = true;
|
|
for( ServerComputer computer : computers )
|
|
{
|
|
if( first )
|
|
{
|
|
first = false;
|
|
}
|
|
else
|
|
{
|
|
builder.append( ", " );
|
|
}
|
|
|
|
builder.append( computer.getInstanceID() );
|
|
}
|
|
|
|
|
|
// We have an incorrect number of computers: reset and throw an error
|
|
reader.setCursor( start );
|
|
throw COMPUTER_ARG_MANY.createWithContext( reader, selector, builder.toString() );
|
|
};
|
|
}
|
|
|
|
@Override
|
|
public <S> CompletableFuture<Suggestions> listSuggestions( CommandContext<S> context, SuggestionsBuilder builder )
|
|
{
|
|
return ComputersArgumentType.someComputers().listSuggestions( context, builder );
|
|
}
|
|
|
|
@Override
|
|
public Collection<String> getExamples()
|
|
{
|
|
return ComputersArgumentType.someComputers().getExamples();
|
|
}
|
|
|
|
@FunctionalInterface
|
|
public interface ComputerSupplier
|
|
{
|
|
ServerComputer unwrap( CommandSource source ) throws CommandSyntaxException;
|
|
}
|
|
}
|