From 08696839dcd79f64fb4e06dd69a7a79f457c3e7e Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Sat, 9 Mar 2019 22:52:24 +0700
Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=9F=D0=BE=D0=B4=D0=BA=D1=80?=
 =?UTF-8?q?=D1=83=D1=87=D0=B5=D0=BD=D1=8B=20=D1=87=D0=B8=D1=81=D0=BB=D0=B0?=
 =?UTF-8?q?=20HWID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../launcher/hwid/OshiHWIDProvider.java       |  1 +
 .../java/ru/gravit/launcher/OshiHWID.java     | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
index 2f147063..4c2ea950 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
@@ -137,6 +137,7 @@ public HWID getHWID() {
         hwid.totalMemory = getTotalMemory();
         hwid.HWDiskSerial = getHWDisk();
         hwid.processorID = getProcessorID();
+        hwid.macAddr = getMacAddr();
         printHardwareInformation();
         return hwid;
     }
diff --git a/libLauncher/src/main/java/ru/gravit/launcher/OshiHWID.java b/libLauncher/src/main/java/ru/gravit/launcher/OshiHWID.java
index a6877ae3..4911d294 100644
--- a/libLauncher/src/main/java/ru/gravit/launcher/OshiHWID.java
+++ b/libLauncher/src/main/java/ru/gravit/launcher/OshiHWID.java
@@ -12,6 +12,8 @@ public class OshiHWID implements HWID {
     public String HWDiskSerial;
     @LauncherAPI
     public String processorID;
+    @LauncherAPI
+    public String macAddr;
 
     @Override
     public String getSerializeString() {
@@ -22,10 +24,11 @@ public String getSerializeString() {
     public int getLevel() //Уровень доверия, насколько уникальные значения
     {
         int result = 0;
-        if (totalMemory != 0) result++;
-        if (serialNumber != null && !serialNumber.equals("unknown")) result += 4;
-        if (HWDiskSerial != null && !HWDiskSerial.equals("unknown")) result += 15;
-        if (processorID != null && !processorID.equals("unknown")) result += 6;
+        if (totalMemory != 0) result+=8;
+        if (serialNumber != null && !serialNumber.equals("unknown")) result += 12;
+        if (HWDiskSerial != null && !HWDiskSerial.equals("unknown")) result += 30;
+        if (processorID != null && !processorID.equals("unknown")) result += 10;
+        if (macAddr != null && !macAddr.equals("00:00:00:00:00:00")) result += 15;
         return result;
     }
 
@@ -35,10 +38,12 @@ public int compare(HWID hwid) {
         {
             int rate = 0;
             OshiHWID oshi = (OshiHWID) hwid;
-            if(Math.abs(oshi.totalMemory - totalMemory) < 1024*1024) rate+=10;
-            if(oshi.HWDiskSerial.equals(HWDiskSerial)) rate+=50;
-            if(oshi.processorID.equals(processorID)) rate+=26;
+            if(Math.abs(oshi.totalMemory - totalMemory) < 1024*1024) rate+=5;
+            if(oshi.totalMemory == totalMemory) rate+=15;
+            if(oshi.HWDiskSerial.equals(HWDiskSerial)) rate+=45;
+            if(oshi.processorID.equals(processorID)) rate+=18;
             if(oshi.serialNumber.equals(serialNumber)) rate+=15;
+            if(oshi.macAddr.equals(macAddr)) rate+=19;
             return rate;
         }
         return 0;
@@ -46,6 +51,6 @@ public int compare(HWID hwid) {
 
     @Override
     public boolean isNull() {
-        return getLevel() < 2;
+        return getLevel() < 15;
     }
 }