mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-25 06:33:23 +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.
84 lines
2.6 KiB
Java
84 lines
2.6 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.peripheral.modem.wired;
|
|
|
|
import net.minecraft.util.EnumFacing;
|
|
import net.minecraft.util.IStringSerializable;
|
|
|
|
import javax.annotation.Nonnull;
|
|
|
|
public enum CableModemVariant implements IStringSerializable
|
|
{
|
|
None( "none", null ),
|
|
DownOff( "down_off", EnumFacing.DOWN ),
|
|
UpOff( "up_off", EnumFacing.UP ),
|
|
NorthOff( "north_off", EnumFacing.NORTH ),
|
|
SouthOff( "south_off", EnumFacing.SOUTH ),
|
|
WestOff( "west_off", EnumFacing.WEST ),
|
|
EastOff( "east_off", EnumFacing.EAST ),
|
|
DownOn( "down_on", EnumFacing.DOWN ),
|
|
UpOn( "up_on", EnumFacing.UP ),
|
|
NorthOn( "north_on", EnumFacing.NORTH ),
|
|
SouthOn( "south_on", EnumFacing.SOUTH ),
|
|
WestOn( "west_on", EnumFacing.WEST ),
|
|
EastOn( "east_on", EnumFacing.EAST ),
|
|
DownOffPeripheral( "down_off_peripheral", EnumFacing.DOWN ),
|
|
UpOffPeripheral( "up_off_peripheral", EnumFacing.UP ),
|
|
NorthOffPeripheral( "north_off_peripheral", EnumFacing.NORTH ),
|
|
SouthOffPeripheral( "south_off_peripheral", EnumFacing.SOUTH ),
|
|
WestOffPeripheral( "west_off_peripheral", EnumFacing.WEST ),
|
|
EastOffPeripheral( "east_off_peripheral", EnumFacing.EAST ),
|
|
DownOnPeripheral( "down_on_peripheral", EnumFacing.DOWN ),
|
|
UpOnPeripheral( "up_on_peripheral", EnumFacing.UP ),
|
|
NorthOnPeripheral( "north_on_peripheral", EnumFacing.NORTH ),
|
|
SouthOnPeripheral( "south_on_peripheral", EnumFacing.SOUTH ),
|
|
WestOnPeripheral( "west_on_peripheral", EnumFacing.WEST ),
|
|
EastOnPeripheral( "east_on_peripheral", EnumFacing.EAST );
|
|
|
|
private static final CableModemVariant[] VALUES = values();
|
|
|
|
private final String name;
|
|
private final EnumFacing facing;
|
|
|
|
CableModemVariant( String name, EnumFacing facing )
|
|
{
|
|
this.name = name;
|
|
this.facing = facing;
|
|
}
|
|
|
|
@Nonnull
|
|
public static CableModemVariant from( EnumFacing facing )
|
|
{
|
|
return facing == null ? None : VALUES[1 + facing.getIndex()];
|
|
}
|
|
|
|
@Nonnull
|
|
public static CableModemVariant from( EnumFacing facing, boolean modem, boolean peripheral )
|
|
{
|
|
int state = (modem ? 2 : 0) + (peripheral ? 1 : 0);
|
|
return facing == null ? None : VALUES[1 + 6 * state + facing.getIndex()];
|
|
}
|
|
|
|
@Nonnull
|
|
@Override
|
|
public String getName()
|
|
{
|
|
return name;
|
|
}
|
|
|
|
public EnumFacing getFacing()
|
|
{
|
|
return facing;
|
|
}
|
|
|
|
@Override
|
|
public String toString()
|
|
{
|
|
return name;
|
|
}
|
|
}
|