diff --git a/src/main/java/malte0811/industrialWires/client/ClientEventHandler.java b/src/main/java/malte0811/industrialWires/client/ClientEventHandler.java index d0ce6e4..3eae544 100644 --- a/src/main/java/malte0811/industrialWires/client/ClientEventHandler.java +++ b/src/main/java/malte0811/industrialWires/client/ClientEventHandler.java @@ -65,7 +65,7 @@ import java.util.Map; @Mod.EventBusSubscriber(modid = IndustrialWires.MODID, value = Side.CLIENT) public class ClientEventHandler { public static boolean shouldScreenshot = false; - @SubscribeEvent + @SubscribeEvent(priority = EventPriority.LOW) public static void renderOverlayPost(RenderGameOverlayEvent.Post e) { if (ClientUtils.mc().player != null && e.getType() == RenderGameOverlayEvent.ElementType.TEXT) { EntityPlayer player = ClientUtils.mc().player; @@ -76,8 +76,15 @@ public class ClientEventHandler { if (OreDictionary.itemMatches(new ItemStack(IndustrialWires.coil, 1, OreDictionary.WILDCARD_VALUE), equipped, false)) { IC2Wiretype type = IC2Wiretype.ALL[equipped.getItemDamage()]; int color = type.getColour(null); + final int threshold = 0x40-1; + for (int i = 0;i<3;i++) { + if (((color>>(8*i))&255) 3) { @@ -93,7 +100,8 @@ public class ClientEventHandler { if (length * length < distSquared) { color = 0xdd3333; } - ClientUtils.font().drawString(s, e.getResolution().getScaledWidth() / 2 - ClientUtils.font().getStringWidth(s) / 2, e.getResolution().getScaledHeight() - GuiIngameForge.left_height - 20, color, true); + ClientUtils.font().drawString(s, e.getResolution().getScaledWidth() / 2 - ClientUtils.font().getStringWidth(s) / 2, + e.getResolution().getScaledHeight() - GuiIngameForge.left_height - 20, color, true); } } } diff --git a/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java b/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java index cc16d99..f5b37bf 100644 --- a/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java +++ b/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java @@ -223,8 +223,11 @@ public class ItemIC2Coil extends Item implements IWireCoil { world.addBlockEvent(linkPos, ((TileEntity) nodeLink).getBlockType(), -1, 0); state = world.getBlockState(linkPos); world.notifyBlockUpdate(linkPos, state, state, 3); - } else - player.sendMessage(new TextComponentTranslation(Lib.CHAT_WARN + "cantSee")); + } else { + player.sendMessage(new TextComponentTranslation(Lib.CHAT_WARN + "tooFar")); + } + } else { + player.sendMessage(new TextComponentTranslation(Lib.CHAT_WARN + "cantSee")); } } } diff --git a/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/copper_ins.json b/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/copper_ins.json new file mode 100644 index 0000000..9cbe0d7 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/copper_ins.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0": "industrialwires:items/ic2_wire_copper_ins" + } +} diff --git a/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/gold_ins.json b/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/gold_ins.json new file mode 100644 index 0000000..bdb69b4 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/gold_ins.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0": "industrialwires:items/ic2_wire_gold_ins" + } +} diff --git a/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/tin_ins.json b/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/tin_ins.json new file mode 100644 index 0000000..07f1b7f --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/item/ic2_wire_coil/tin_ins.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0": "industrialwires:items/ic2_wire_tin_ins" + } +} diff --git a/src/main/resources/assets/industrialwires/textures/items/ic2_wire_copper_ins.png b/src/main/resources/assets/industrialwires/textures/items/ic2_wire_copper_ins.png new file mode 100644 index 0000000..aeafaad Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/items/ic2_wire_copper_ins.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/ic2_wire_gold_ins.png b/src/main/resources/assets/industrialwires/textures/items/ic2_wire_gold_ins.png new file mode 100644 index 0000000..385a51e Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/items/ic2_wire_gold_ins.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/ic2_wire_tin_ins.png b/src/main/resources/assets/industrialwires/textures/items/ic2_wire_tin_ins.png new file mode 100644 index 0000000..afe7b32 Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/items/ic2_wire_tin_ins.png differ