PATCHPATCHPATCH

Aspw-w · Mar 26, 2024 · 0a66084 · 0a66084
1 parent a7ed8c5
commit 0a66084
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 39 deletions.
diff --git a/src/main/java/net/aspw/client/Launch.kt b/src/main/java/net/aspw/client/Launch.kt
@@ -31,7 +31,7 @@ object Launch {
     // Client information
     const val CLIENT_BEST = "NightX"
     const val CLIENT_FOLDER = "NightX-Client"
-    const val CLIENT_VERSION = "B101"
+    const val CLIENT_VERSION = "B102"
     const val CLIENT_PROTOCOL_RANGE = "1.8 to 1.20.5"
     const val CLIENT_WEBSITE = "https://aspw-w.github.io/AspieAPI/NightX"
     const val CLIENT_CHAT = "§c$CLIENT_BEST: §r"

diff --git a/src/main/java/net/aspw/client/features/api/PacketManager.java b/src/main/java/net/aspw/client/features/api/PacketManager.java
@@ -174,7 +174,7 @@ public static boolean shouldStopRender(Entity entity) {
                 entity instanceof EntityItemFrame ||
                 entity instanceof EntityTNTPrimed ||
                 entity instanceof EntityArmorStand) &&
-                entity != mc.thePlayer && mc.thePlayer.getDistanceToEntity(entity) > 45.0f;
+                entity != mc.thePlayer && mc.thePlayer.getDistanceToEntity(entity) > 35.0f;
     }
 
     @Override

diff --git a/...main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogGround.kt b/...main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogGround.kt
@@ -23,27 +23,28 @@ class WatchdogGround : SpeedMode("WatchdogGround") {
             Speed::class.java
         )
         if (speed == null || eventMotion.eventState !== EventState.PRE || mc.thePlayer.isInWater) return
-        if (MovementUtils.isMoving()) {
-            if (mc.thePlayer.onGround) {
+        if (mc.thePlayer.onGround) {
+            if (MovementUtils.isMoving()) {
                 mc.thePlayer.motionY = 0.41999998688698
                 if (mc.thePlayer.isPotionActive(Potion.jump))
                     mc.thePlayer.motionY += ((mc.thePlayer.getActivePotionEffect(Potion.jump).amplifier + 1).toFloat() * 0.1f).toDouble()
                 mc.thePlayer.isAirBorne = true
                 mc.thePlayer.triggerAchievement(StatList.jumpStat)
-                val baseSpeed = 0.48f
+                val baseSpeed = 0.482f
                 if (mc.thePlayer.isPotionActive(Potion.moveSpeed))
-                    MovementUtils.strafe(baseSpeed + ((mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).amplifier + 1).toFloat() * 0.12f))
+                    MovementUtils.strafe(baseSpeed + ((mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).amplifier + 1).toFloat() * 0.0575f))
                 else MovementUtils.strafe(baseSpeed)
             }
+        } else {
+            if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) {
+                mc.thePlayer.motionX *= (1.0002 + 0.0008 * (mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).amplifier + 1))
+                mc.thePlayer.motionZ *= (1.0002 + 0.0008 * (mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).amplifier + 1))
+                mc.thePlayer.speedInAir =
+                    0.02f + 0.0003f * (mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).amplifier + 1).toFloat()
+            }
         }
     }
 
-    override fun onEnable() {
-        Launch.moduleManager.getModule(
-            Speed::class.java
-        ) ?: return
-    }
-
     override fun onUpdate() {}
     override fun onMotion() {}
     override fun onMove(event: MoveEvent) {}

diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/ESP.java b/src/main/java/net/aspw/client/features/module/impl/visual/ESP.java
@@ -123,7 +123,10 @@ public void onRender2D(Render2DEvent event) {
                         } else {
                             entName = entityLivingBase.getDisplayName().getFormattedText();
                         }
-                        drawScaledCenteredString(entName, posX + (endPosX - posX) / 2F, posY - 1F - FontLoaders.SF21.getHeight() * 1F);
+                        try {
+                            drawScaledCenteredString(entName, posX + (endPosX - posX) / 2F, posY - 1F - FontLoaders.SF21.getHeight() * 1F);
+                        } catch (Exception ignored) {
+                        }
                     }
                 }
             }

diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Gui.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Gui.kt
@@ -37,7 +37,7 @@ class Gui : Module() {
     val guiBlur = BoolValue("Blur", true)
 
     @JvmField
-    val pictureValue = BoolValue("Pictures", true) { styleValue.get() == "Smooth" }
+    val picturesValue = BoolValue("Pictures", true) { styleValue.get() == "Smooth" }
 
     @JvmField
     val animationValue = ListValue("Animation", arrayOf("None", "Zoom"), "Zoom") { styleValue.get() == "DropDown" }

diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Interface.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Interface.kt
@@ -187,6 +187,10 @@ class Interface : Module() {
                     }
 
                     val healthLength = (entity.health / entity.maxHealth).coerceIn(0F, 1F)
+
+                    if (healthColor > 255)
+                        healthColor = 255
+
                     RenderUtils.drawRect(
                         xPos + 36F,
                         yPos + 26.5F,
@@ -195,14 +199,10 @@ class Interface : Module() {
                             entity.maxHealth
                         ) * (healthLength + 74F)),
                         yPos + 36F,
-                        Color(
-                            245,
-                            healthColor,
-                            1
-                        ).rgb
+                        Color(245, healthColor, 1).rgb
                     )
+                    font.drawStringWithShadow(healthString, xPos + 64.5F, yPos + 27F, Color(245, healthColor, 1).rgb)
 
-                    RenderUtils.newDrawRect(xPos - 1, yPos + 3, xPos + 33F, yPos + 37F, Color(150, 150, 150).rgb)
                     RenderUtils.newDrawRect(xPos - 1, yPos + 3, xPos + 33F, yPos + 37F, Color(0, 0, 0).rgb)
 
                     if (mc.netHandler.getPlayerInfo(entity.uniqueID) != null)
@@ -211,6 +211,11 @@ class Interface : Module() {
                             xPos.toInt(),
                             yPos.toInt() + 4
                         )
+                    else {
+                        font.drawStringWithShadow("No", xPos + 9, yPos + 7F, Color(120, 120, 120).rgb)
+                        font.drawStringWithShadow("Image", xPos + 2, yPos + 16F, Color(120, 120, 120).rgb)
+                        font.drawStringWithShadow("Found", xPos + 1, yPos + 25F, Color(120, 120, 120).rgb)
+                    }
 
                     updateAnim(entity.health)
 
@@ -221,17 +226,6 @@ class Interface : Module() {
                         yPos + 15F,
                         Color(255, 255, 255).rgb
                     )
-
-                    font.drawStringWithShadow(
-                        healthString,
-                        xPos + 64.5F,
-                        yPos + 27F,
-                        Color(
-                            245,
-                            healthColor,
-                            1
-                        ).rgb
-                    )
                 } else if (easingHealth != 0F) easingHealth = 0F
             }
 

diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Trajectories.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Trajectories.kt
@@ -5,7 +5,6 @@ import net.aspw.client.event.Render3DEvent
 import net.aspw.client.features.module.Module
 import net.aspw.client.features.module.ModuleCategory
 import net.aspw.client.features.module.ModuleInfo
-import net.aspw.client.utils.RotationUtils
 import net.aspw.client.utils.render.RenderUtils
 import net.minecraft.block.material.Material
 import net.minecraft.client.renderer.Tessellator
@@ -66,8 +65,8 @@ class Trajectories : Module() {
         }
 
         // Yaw and pitch of player
-        val yaw = RotationUtils.cameraYaw
-        val pitch = RotationUtils.cameraPitch
+        val yaw = mc.thePlayer.rotationYaw
+        val pitch = mc.thePlayer.rotationPitch
 
         // Positions
         var posX = renderManager.renderPosX - MathHelper.cos(yaw / 180F * 3.1415927F) * 0.16F

diff --git a/src/main/java/net/aspw/client/visual/client/clickgui/smooth/SmoothClickGui.kt b/src/main/java/net/aspw/client/visual/client/clickgui/smooth/SmoothClickGui.kt
@@ -74,15 +74,15 @@ class SmoothClickGui : GuiScreen() {
             "3" -> {
                 pictureX = width - 140f
                 pictureY = height - 160f
-                pictureWidth = 60 + 50
-                pictureHeight = 65 + 50
+                pictureWidth = 110
+                pictureHeight = 115
             }
 
             "4" -> {
                 pictureX = width - 140f
                 pictureY = height - 160f
-                pictureWidth = 81 + 40
-                pictureHeight = 70 + 40
+                pictureWidth = 121
+                pictureHeight = 110
             }
 
             else -> {
@@ -93,7 +93,7 @@ class SmoothClickGui : GuiScreen() {
             }
         }
 
-        if (Launch.moduleManager.getModule(Gui::class.java)?.pictureValue?.get()!!)
+        if (Launch.moduleManager.getModule(Gui::class.java)?.picturesValue?.get()!!)
             RenderUtils.drawImage2(
                 ResourceLocation("client/clickgui/pictures/$randomPicture.png"),
                 pictureX,

diff --git a/src/main/resources/assets/minecraft/client/clickgui/pictures/1.png b/src/main/resources/assets/minecraft/client/clickgui/pictures/1.png
diff --git a/src/main/resources/assets/minecraft/client/clickgui/pictures/2.png b/src/main/resources/assets/minecraft/client/clickgui/pictures/2.png
diff --git a/src/main/resources/assets/minecraft/client/clickgui/pictures/3.png b/src/main/resources/assets/minecraft/client/clickgui/pictures/3.png
diff --git a/src/main/resources/assets/minecraft/client/clickgui/pictures/4.png b/src/main/resources/assets/minecraft/client/clickgui/pictures/4.png