From b1a46ec2343e03bb96347118b5ba1171856d0ce9 Mon Sep 17 00:00:00 2001 From: Detrav Date: Fri, 8 Apr 2016 00:16:11 +0300 Subject: Fix borders on icon --- src/main/java/com/detrav/enums/Textures01.java | 3 ++- .../detrav/items/tools/DetravToolPortableCharger.java | 7 +++---- .../gt.detrav.metatool.01/PORTABE_CHARGER_BORDER.png | Bin 0 -> 171 bytes .../PORTABE_CHARGER_BORDER_OVERLAY.png | Bin 0 -> 921 bytes .../gt.detrav.metatool.01/PORTABE_CHARGER_OVERLAY.png | Bin 171 -> 921 bytes 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER_OVERLAY.png diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java index 49700ad0c2..fb9ba37bc4 100644 --- a/src/main/java/com/detrav/enums/Textures01.java +++ b/src/main/java/com/detrav/enums/Textures01.java @@ -17,6 +17,7 @@ public class Textures01 { new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD"), new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD"), new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER") + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER_BORDER") }; } diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java index dbff619580..36635439fb 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java +++ b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java @@ -160,10 +160,9 @@ public class DetravToolPortableCharger implements IToolStats { } public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[4]; - /*return aIsToolHead ? - Textures01.mTextures[DetravSimpleItems.toolHeadProPick.mTextureIndex] : - GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];*/ + return aIsToolHead ? + Textures01.mTextures[4]: + Textures01.mTextures[5]; } public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER.png new file mode 100644 index 0000000000..ea56c8f578 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER_OVERLAY.png new file mode 100644 index 0000000000..e3a55b747d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_BORDER_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_OVERLAY.png index ea56c8f578..e3a55b747d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PORTABE_CHARGER_OVERLAY.png differ -- cgit