mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-06 20:12: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.
42 lines
1.8 KiB
Java
42 lines
1.8 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.arguments.ArgumentType;
|
|
import dan200.computercraft.ComputerCraft;
|
|
import net.minecraft.command.arguments.ArgumentSerializer;
|
|
import net.minecraft.command.arguments.ArgumentTypes;
|
|
import net.minecraft.command.arguments.IArgumentSerializer;
|
|
import net.minecraft.util.ResourceLocation;
|
|
|
|
public final class ArgumentSerializers
|
|
{
|
|
@SuppressWarnings( "unchecked" )
|
|
private static <T extends ArgumentType<?>> void registerUnsafe( ResourceLocation id, Class<T> type, IArgumentSerializer<?> serializer )
|
|
{
|
|
ArgumentTypes.register( id, type, (IArgumentSerializer<T>) serializer );
|
|
}
|
|
|
|
private static <T extends ArgumentType<?>> void register( ResourceLocation id, Class<T> type, IArgumentSerializer<T> serializer )
|
|
{
|
|
ArgumentTypes.register( id, type, serializer );
|
|
}
|
|
|
|
private static <T extends ArgumentType<?>> void register( ResourceLocation id, T instance )
|
|
{
|
|
registerUnsafe( id, instance.getClass(), new ArgumentSerializer<>( () -> instance ) );
|
|
}
|
|
|
|
public static void register()
|
|
{
|
|
register( new ResourceLocation( ComputerCraft.MOD_ID, "tracking_field" ), TrackingFieldArgumentType.trackingField() );
|
|
register( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ), ComputerArgumentType.oneComputer() );
|
|
register( new ResourceLocation( ComputerCraft.MOD_ID, "computers" ), ComputersArgumentType.class, new ComputersArgumentType.Serializer() );
|
|
registerUnsafe( new ResourceLocation( ComputerCraft.MOD_ID, "repeat" ), RepeatArgumentType.class, new RepeatArgumentType.Serializer() );
|
|
}
|
|
}
|