mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-08 04:52:52 +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.
71 lines
2.5 KiB
Java
71 lines
2.5 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;
|
|
|
|
import com.mojang.brigadier.context.CommandContext;
|
|
import com.mojang.brigadier.suggestion.Suggestions;
|
|
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
|
import net.minecraft.command.CommandSource;
|
|
import net.minecraft.command.ISuggestionProvider;
|
|
import net.minecraft.entity.Entity;
|
|
import net.minecraft.entity.player.EntityPlayerMP;
|
|
import net.minecraftforge.common.util.FakePlayer;
|
|
|
|
import java.util.Arrays;
|
|
import java.util.Locale;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.function.Function;
|
|
|
|
public final class CommandUtils
|
|
{
|
|
private CommandUtils() {}
|
|
|
|
public static boolean isPlayer( CommandSource output )
|
|
{
|
|
Entity sender = output.getEntity();
|
|
return sender instanceof EntityPlayerMP
|
|
&& !(sender instanceof FakePlayer)
|
|
&& ((EntityPlayerMP) sender).connection != null;
|
|
}
|
|
|
|
@SuppressWarnings( "unchecked" )
|
|
public static CompletableFuture<Suggestions> suggestOnServer( CommandContext<?> context, SuggestionsBuilder builder, Function<CommandContext<CommandSource>, CompletableFuture<Suggestions>> supplier )
|
|
{
|
|
Object source = context.getSource();
|
|
if( !(source instanceof ISuggestionProvider) )
|
|
{
|
|
return Suggestions.empty();
|
|
}
|
|
else if( source instanceof CommandSource )
|
|
{
|
|
return supplier.apply( (CommandContext<CommandSource>) context );
|
|
}
|
|
else
|
|
{
|
|
return ((ISuggestionProvider) source).getSuggestionsFromServer( (CommandContext<ISuggestionProvider>) context, builder );
|
|
}
|
|
}
|
|
|
|
public static <T> CompletableFuture<Suggestions> suggest( SuggestionsBuilder builder, Iterable<T> candidates, Function<T, String> toString )
|
|
{
|
|
String remaining = builder.getRemaining().toLowerCase( Locale.ROOT );
|
|
for( T choice : candidates )
|
|
{
|
|
String name = toString.apply( choice );
|
|
if( !name.toLowerCase( Locale.ROOT ).startsWith( remaining ) ) continue;
|
|
builder.suggest( name );
|
|
}
|
|
|
|
return builder.buildFuture();
|
|
}
|
|
|
|
public static <T> CompletableFuture<Suggestions> suggest( SuggestionsBuilder builder, T[] candidates, Function<T, String> toString )
|
|
{
|
|
return suggest( builder, Arrays.asList( candidates ), toString );
|
|
}
|
|
}
|