From b2a41c11b3169eb6e356bca3934a9e55cd5cd1d5 Mon Sep 17 00:00:00 2001
From: Aspw-w <0kcabtuo0@gmail.com>
Date: Fri, 8 Sep 2023 17:10:31 +0900
Subject: [PATCH] WEBCORD

---
 NightX.iws                                     | 18 +++++++++---------
 .../net/aspw/client/features/api/DiscordRPC.kt |  2 +-
 .../module/impl/exploit/PacketPosTracker.kt    |  6 +++---
 .../client/util/network/CheckConnection.kt     |  6 ++++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/NightX.iws b/NightX.iws
index ecd1145a..6c9e00f1 100644
--- a/NightX.iws
+++ b/NightX.iws
@@ -5,10 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="af093b99-5942-419c-869b-8b2d7cb4dd2a" name="変更" comment="">
-      <change beforePath="$PROJECT_DIR$/NightX.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/NightX.ipr" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/NightX.iws" beforeDir="false" afterPath="$PROJECT_DIR$/NightX.iws" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/api/PacketManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/api/PacketManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/ClientSpoof.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/ClientSpoof.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/api/DiscordRPC.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/api/DiscordRPC.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/exploit/PacketPosTracker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/exploit/PacketPosTracker.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/network/CheckConnection.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/network/CheckConnection.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -156,7 +156,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStart" />
       <option name="VM_PARAMETERS" value="-Dfml.coreMods.load=net.aspw.client.injection.forge.TransformerLoader -Ddev-mode" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -231,7 +231,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStart" />
       <option name="VM_PARAMETERS" value="-Dfml.coreMods.load=net.aspw.client.injection.forge.TransformerLoader -Ddev-mode" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -318,7 +318,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -333,7 +333,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -408,7 +408,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -423,7 +423,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
diff --git a/src/main/java/net/aspw/client/features/api/DiscordRPC.kt b/src/main/java/net/aspw/client/features/api/DiscordRPC.kt
index b591d8be..9edf07a1 100644
--- a/src/main/java/net/aspw/client/features/api/DiscordRPC.kt
+++ b/src/main/java/net/aspw/client/features/api/DiscordRPC.kt
@@ -113,7 +113,7 @@ class DiscordRPC : MinecraftInstance() {
     }
 
     private fun loadConfiguration() {
-        appID = 1130780572604702821L
+        appID = CheckConnection.discordApp.toLong()
         assets["logo"] = "logo"
         assets["mahiro"] = "mahiro"
     }
diff --git a/src/main/java/net/aspw/client/features/module/impl/exploit/PacketPosTracker.kt b/src/main/java/net/aspw/client/features/module/impl/exploit/PacketPosTracker.kt
index 4f55eb5b..8401b310 100644
--- a/src/main/java/net/aspw/client/features/module/impl/exploit/PacketPosTracker.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/exploit/PacketPosTracker.kt
@@ -74,11 +74,11 @@ class PacketPosTracker : Module() {
     private val hurtTimeWithPing = BoolValue("CalculateHurtTimeWithPing", true)
     private val minAttackReleaseRange = FloatValue("MinAttackReleaseRange", 3.2F, 2f, 6f)
 
-    private val onlyKillAura = BoolValue("OnlyKillAura", true)
-    private val onlyPlayer = BoolValue("OnlyPlayer", true)
+    private val onlyKillAura = BoolValue("Only-KillAura", false)
+    private val onlyPlayer = BoolValue("Only-Player", true)
     private val resetOnVelocity = BoolValue("ResetOnVelocity", true)
     private val resetOnLagging = BoolValue("ResetOnLagging", true)
-    private val rangeCheckMode = ListValue("RangeCheckMode", arrayOf("DirectDistance", "RayCast"), "DirectDistance")
+    private val rangeCheckMode = ListValue("RangeCheck", arrayOf("DirectDistance", "RayCast"), "DirectDistance")
 
     private val espMode = ListValue(
         "ESPMode",
diff --git a/src/main/java/net/aspw/client/util/network/CheckConnection.kt b/src/main/java/net/aspw/client/util/network/CheckConnection.kt
index 8603cf50..b8f4258d 100644
--- a/src/main/java/net/aspw/client/util/network/CheckConnection.kt
+++ b/src/main/java/net/aspw/client/util/network/CheckConnection.kt
@@ -14,6 +14,7 @@ object CheckConnection {
     var canConnect = false
     var announcement = ""
     var discord = ""
+    var discordApp = ""
     var apiKey = ""
     var appClientID = ""
     var appClientSecret = ""
@@ -112,7 +113,8 @@ object CheckConnection {
             response.close()
             httpClient.close()
             val details = content.split("///")
-            discord = details[5]
+            discord = details[6]
+            discordApp = details[5]
             appClientSecret = details[4]
             appClientID = details[3]
             apiKey = details[2]
@@ -120,7 +122,7 @@ object CheckConnection {
                 isLatest = true
             if (details[0] == "True")
                 isAvailable = true
-            val slashLog = details[6].split("---")
+            val slashLog = details[7].split("---")
             changeLog1 = slashLog[0]
             changeLog2 = slashLog[1]
             changeLog3 = slashLog[2]