fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start of part registration.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-08 21:27:22 +02:00
parent b2afa0398c
commit 4b11b8857b
23 changed files with 220 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/java/appeng/api/definitions/IParts.java
-8
View File
@@ -42,14 +42,6 @@ public interface IParts
AEColoredItemDefinition cableDenseSmart();
AEColoredItemDefinition lumenCableSmart();
AEColoredItemDefinition lumenCableCovered();
AEColoredItemDefinition lumenCableGlass();
AEColoredItemDefinition lumenDenseCableSmart();
IItemDefinition quartzFiber();
IItemDefinition toggleBus();
src/api/java/appeng/api/parts/IPartItem.java
+3 -4
View File
@@ -53,13 +53,12 @@ public interface IPartItem<P extends IPart>
{
/**
* create a new part INSTANCE, from the item stack.
* create a new part INSTANCE
*
* @param is item
* @param is ItemStack of this item, may have additional properties.
*
* @return part from item
*/
@Nullable
P createPartFromItemStack( ItemStack is );
P createPart(ItemStack is);
}
src/api/java/appeng/api/util/AEColor.java
+24 -18
View File
@@ -39,39 +39,39 @@ import net.minecraft.item.DyeColor;
public enum AEColor
{
WHITE( "gui.appliedenergistics2.White", DyeColor.WHITE, 0xBEBEBE, 0xDBDBDB, 0xFAFAFA ),
WHITE( "gui.appliedenergistics2.White", "white_", DyeColor.WHITE, 0xBEBEBE, 0xDBDBDB, 0xFAFAFA ),
ORANGE( "gui.appliedenergistics2.Orange", DyeColor.ORANGE, 0xF99739, 0xFAAE44, 0xF4DEC3 ),
ORANGE( "gui.appliedenergistics2.Orange", "orange_", DyeColor.ORANGE, 0xF99739, 0xFAAE44, 0xF4DEC3 ),
MAGENTA( "gui.appliedenergistics2.Magenta", DyeColor.MAGENTA, 0x821E82, 0xB82AB8, 0xC598C8 ),
MAGENTA( "gui.appliedenergistics2.Magenta", "magenta_", DyeColor.MAGENTA, 0x821E82, 0xB82AB8, 0xC598C8 ),
LIGHT_BLUE( "gui.appliedenergistics2.LightBlue", DyeColor.LIGHT_BLUE, 0x628DCB, 0x82ACE7, 0xD8F6FF ),
LIGHT_BLUE( "gui.appliedenergistics2.LightBlue", "light_blue_", DyeColor.LIGHT_BLUE, 0x628DCB, 0x82ACE7, 0xD8F6FF ),
YELLOW( "gui.appliedenergistics2.Yellow", DyeColor.YELLOW, 0xFFF7AA, 0xF8FF4A, 0xFFFFE8 ),
YELLOW( "gui.appliedenergistics2.Yellow", "yellow_", DyeColor.YELLOW, 0xFFF7AA, 0xF8FF4A, 0xFFFFE8 ),
LIME( "gui.appliedenergistics2.Lime", DyeColor.LIME, 0x7CFF4A, 0xBBFF51, 0xE7F7D7 ),
LIME( "gui.appliedenergistics2.Lime", "lime_", DyeColor.LIME, 0x7CFF4A, 0xBBFF51, 0xE7F7D7 ),
PINK( "gui.appliedenergistics2.Pink", DyeColor.PINK, 0xDC8DB5, 0xF8B5D7, 0xF7DEEB ),
PINK( "gui.appliedenergistics2.Pink", "pink_", DyeColor.PINK, 0xDC8DB5, 0xF8B5D7, 0xF7DEEB ),
GRAY( "gui.appliedenergistics2.Gray", DyeColor.GRAY, 0x7C7C7C, 0xA0A0A0, 0xC9C9C9 ),
GRAY( "gui.appliedenergistics2.Gray", "gray_", DyeColor.GRAY, 0x7C7C7C, 0xA0A0A0, 0xC9C9C9 ),
LIGHT_GRAY( "gui.appliedenergistics2.LightGray", DyeColor.LIGHT_GRAY, 0x9D9D9D, 0xCDCDCD, 0xEFEFEF ),
LIGHT_GRAY( "gui.appliedenergistics2.LightGray", "light_gray_", DyeColor.LIGHT_GRAY, 0x9D9D9D, 0xCDCDCD, 0xEFEFEF ),
CYAN( "gui.appliedenergistics2.Cyan", DyeColor.CYAN, 0x2F9BA5, 0x51AAC6, 0xAEDDF4 ),
CYAN( "gui.appliedenergistics2.Cyan", "cyan_", DyeColor.CYAN, 0x2F9BA5, 0x51AAC6, 0xAEDDF4 ),
PURPLE( "gui.appliedenergistics2.Purple", DyeColor.PURPLE, 0x8230B2, 0xA453CE, 0xC7A3CC ),
PURPLE( "gui.appliedenergistics2.Purple", "purple_", DyeColor.PURPLE, 0x8230B2, 0xA453CE, 0xC7A3CC ),
BLUE( "gui.appliedenergistics2.Blue", DyeColor.BLUE, 0x2D29A0, 0x514AFF, 0xDDE6FF ),
BLUE( "gui.appliedenergistics2.Blue", "blue_", DyeColor.BLUE, 0x2D29A0, 0x514AFF, 0xDDE6FF ),
BROWN( "gui.appliedenergistics2.Brown", DyeColor.BROWN, 0x724E35, 0xB7967F, 0xE0D2C8 ),
BROWN( "gui.appliedenergistics2.Brown", "brown_", DyeColor.BROWN, 0x724E35, 0xB7967F, 0xE0D2C8 ),
GREEN( "gui.appliedenergistics2.Green", DyeColor.GREEN, 0x45A021, 0x60E32E, 0xE3F2E3 ),
GREEN( "gui.appliedenergistics2.Green", "green_", DyeColor.GREEN, 0x45A021, 0x60E32E, 0xE3F2E3 ),
RED( "gui.appliedenergistics2.Red", DyeColor.RED, 0xA50029, 0xFF003C, 0xFFE6ED ),
RED( "gui.appliedenergistics2.Red", "red_", DyeColor.RED, 0xA50029, 0xFF003C, 0xFFE6ED ),
BLACK( "gui.appliedenergistics2.Black", DyeColor.BLACK, 0x2B2B2B, 0x565656, 0x848484 ),
BLACK( "gui.appliedenergistics2.Black", "black_", DyeColor.BLACK, 0x2B2B2B, 0x565656, 0x848484 ),
TRANSPARENT( "gui.appliedenergistics2.Fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC );
TRANSPARENT( "gui.appliedenergistics2.Fluix", "", null, 0x1B2344, 0x895CA8, 0xD7BBEC );
public static final List<AEColor> VALID_COLORS = Arrays.asList( WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE,
BLUE, BROWN, GREEN, RED, BLACK );
@@ -126,9 +126,15 @@ public enum AEColor
*/
public final DyeColor dye;
AEColor(final String translationKey, final DyeColor dye, final int blackHex, final int medHex, final int whiteHex )
/**
* A convenient ID prefix for use with registering color variants of items and blocks.
*/
public final String registryPrefix;
AEColor(final String translationKey, final String registryPrefix, final DyeColor dye, final int blackHex, final int medHex, final int whiteHex )
{
this.translationKey = translationKey;
this.registryPrefix = registryPrefix;
this.blackVariant = blackHex;
this.mediumVariant = medHex;
this.whiteVariant = whiteHex;