From a45c05744d046ccb8925d19c4fba28ab13fb574a Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 2 Jun 2017 10:30:34 +1000 Subject: + Finally added ULV Machine Components --- .../gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 0d9f3b3305..bfff2b2ff7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -55,6 +55,16 @@ public enum GregtechItemList implements GregtechItemContainer { Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX, + + //ULV Components + Electric_Motor_ULV, + Electric_Pump_ULV, + Conveyor_Module_ULV, + Electric_Piston_ULV, + Robot_Arm_ULV, + Field_Generator_ULV, + Emitter_ULV, + Sensor_ULV, //Circuits Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, -- cgit From a42dc8bfc43bf088447db6e4c92d3e1a8bd11a30 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 2 Jun 2017 10:37:29 +1000 Subject: + Added ULV component Textures. --- .../xmod/gregtech/api/items/Gregtech_MetaItem_X32.java | 5 ++++- .../assets/miscutils/textures/items/MU-metaitem.01/32.png | Bin 0 -> 501 bytes .../assets/miscutils/textures/items/MU-metaitem.01/33.png | Bin 0 -> 415 bytes .../assets/miscutils/textures/items/MU-metaitem.01/34.png | Bin 0 -> 358 bytes .../assets/miscutils/textures/items/MU-metaitem.01/35.png | Bin 0 -> 411 bytes .../assets/miscutils/textures/items/MU-metaitem.01/36.png | Bin 0 -> 461 bytes .../assets/miscutils/textures/items/MU-metaitem.01/37.png | Bin 0 -> 617 bytes .../assets/miscutils/textures/items/MU-metaitem.01/38.png | Bin 0 -> 545 bytes .../assets/miscutils/textures/items/MU-metaitem.01/39.png | Bin 0 -> 482 bytes 9 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java index 3ab0ed5544..f06b69a07d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java @@ -185,7 +185,10 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { @Override public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - if (stack.getDisplayName().contains("LuV")){ + if (stack.getDisplayName().contains("ULV")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 180, 180); + } + else if (stack.getDisplayName().contains("LuV")){ HEX_OxFFFFFF = 0xffffcc; } else if (stack.getDisplayName().contains("ZPM")){ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png new file mode 100644 index 0000000000..4a7c1ce427 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png new file mode 100644 index 0000000000..1a3acd9e94 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png new file mode 100644 index 0000000000..bf81a1b4b2 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png new file mode 100644 index 0000000000..051b45e6bc Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png new file mode 100644 index 0000000000..5ddb32de79 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png new file mode 100644 index 0000000000..38f7ec8756 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png new file mode 100644 index 0000000000..a1c2183ee8 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png differ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png new file mode 100644 index 0000000000..5e4886b0f8 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png differ -- cgit