mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-28 08:03:21 +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.
53 lines
1.4 KiB
Java
53 lines
1.4 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.util;
|
|
|
|
import net.minecraft.item.EnumDyeColor;
|
|
import net.minecraft.item.Item;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.tags.Tag;
|
|
import net.minecraftforge.common.Tags;
|
|
|
|
import javax.annotation.Nullable;
|
|
|
|
public final class ColourUtils
|
|
{
|
|
@SuppressWarnings( { "unchecked", "rawtypes" } )
|
|
private static final Tag<Item>[] DYES = new Tag[] {
|
|
Tags.Items.DYES_WHITE,
|
|
Tags.Items.DYES_ORANGE,
|
|
Tags.Items.DYES_MAGENTA,
|
|
Tags.Items.DYES_LIGHT_BLUE,
|
|
Tags.Items.DYES_YELLOW,
|
|
Tags.Items.DYES_LIME,
|
|
Tags.Items.DYES_PINK,
|
|
Tags.Items.DYES_GRAY,
|
|
Tags.Items.DYES_LIGHT_GRAY,
|
|
Tags.Items.DYES_CYAN,
|
|
Tags.Items.DYES_PURPLE,
|
|
Tags.Items.DYES_BLUE,
|
|
Tags.Items.DYES_BROWN,
|
|
Tags.Items.DYES_GREEN,
|
|
Tags.Items.DYES_RED,
|
|
Tags.Items.DYES_BLACK,
|
|
};
|
|
|
|
@Nullable
|
|
private ColourUtils() {}
|
|
|
|
public static EnumDyeColor getStackColour( ItemStack stack )
|
|
{
|
|
for( int i = 0; i < DYES.length; i++ )
|
|
{
|
|
Tag<Item> dye = DYES[i];
|
|
if( dye.contains( stack.getItem() ) ) return EnumDyeColor.byId( i );
|
|
}
|
|
|
|
return null;
|
|
}
|
|
}
|