B69 Updated

Aspw-w · Sep 30, 2023 · 948426c · 948426c
1 parent cbb90f5
commit 948426c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 41 deletions.
diff --git a/NightX.iws b/NightX.iws
@@ -6,8 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="af093b99-5942-419c-869b-8b2d7cb4dd2a" name="変更" comment="">
       <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/Client.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/Client.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/injection/forge/mixins/item/MixinItemRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/injection/forge/mixins/item/MixinItemRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/MovementUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/MovementUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/MovementUtilsFix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/MovementUtilsFix.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -191,7 +191,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" />
@@ -251,7 +251,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" />
@@ -293,7 +293,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" />
@@ -308,7 +308,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" />
@@ -383,7 +383,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" />
@@ -398,7 +398,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/Client.kt b/src/main/java/net/aspw/client/Client.kt
@@ -24,10 +24,10 @@ import kotlin.concurrent.thread
 object Client {
 
     // Client information
-    val clientVersion = ListValue("ClientVersion", arrayOf("Release", "Beta", "Developer"), "Beta")
+    val clientVersion = ListValue("ClientVersion", arrayOf("Release", "Beta", "Developer"), "Release")
     const val CLIENT_BEST = "NightX"
     const val CLIENT_FOLDER = "NightX-Reloaded"
-    const val CLIENT_VERSION = "Beta B69"
+    const val CLIENT_VERSION = "Release B69"
     const val CLIENT_CREATOR = "As_pw, outaokura"
     const val CLIENT_WEBSITE = "https://aspw-w.github.io/NightX-Web"
     const val CLIENT_CONFIG = "$CLIENT_WEBSITE/data/configs.txt"

diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/item/MixinItemRenderer.java b/src/main/java/net/aspw/client/injection/forge/mixins/item/MixinItemRenderer.java
@@ -6,7 +6,6 @@
 import net.aspw.client.features.module.impl.visual.Animations;
 import net.aspw.client.features.module.impl.visual.AntiBlind;
 import net.aspw.client.util.MinecraftInstance;
-import net.aspw.client.util.MovementUtilsFix;
 import net.aspw.client.util.timer.MSTimer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
@@ -214,11 +213,6 @@ public void renderItemInFirstPerson(float partialTicks) {
                 GlStateManager.scale(0.93F, 1.0F, 1.0F);
             }
 
-            if (MovementUtilsFix.INSTANCE.isVisualBlocking() && f1 != 0.0F) {
-                GlStateManager.scale(0.85F, 0.85F, 0.85F);
-                GlStateManager.translate(-0.06F, 0.003F, 0.05F);
-            }
-
             if (this.itemToRender.getItem() instanceof ItemMap) {
                 this.renderItemMap(abstractclientplayer, f2, f, f1);
             } else if (abstractclientplayer.getItemInUseCount() > 0
@@ -652,6 +646,10 @@ public void renderItemInFirstPerson(float partialTicks) {
                 }
             } else {
                 if (Animations.swingAnimValue.get().equals("1.7")) {
+                    if (f1 != 0.0F) {
+                        GlStateManager.scale(0.85F, 0.85F, 0.85F);
+                        GlStateManager.translate(-0.06F, 0.003F, 0.05F);
+                    }
                     this.doItemUsedTransformations(f1);
                     if (Animations.cancelEquip.get() && !Animations.blockingOnly.get())
                         this.transformFirstPersonItem(0.0F, f1);

diff --git a/src/main/java/net/aspw/client/util/MovementUtilsFix.kt b/src/main/java/net/aspw/client/util/MovementUtilsFix.kt
@@ -1,12 +1,6 @@
 package net.aspw.client.util
 
-import net.aspw.client.Client
-import net.aspw.client.features.module.impl.combat.KillAura
-import net.aspw.client.features.module.impl.combat.TPAura
-import net.aspw.client.features.module.impl.visual.Animations
-import net.minecraft.item.ItemSword
 import net.minecraft.util.MathHelper
-import java.util.*
 
 object MovementUtilsFix : MinecraftInstance() {
     val direction: Double
@@ -21,26 +15,6 @@ object MovementUtilsFix : MinecraftInstance() {
             return Math.toRadians(rotationYaw.toDouble())
         }
 
-    fun isVisualBlocking(): Boolean {
-        return Animations.swingAnimValue.get() == "1.7" && !mc.thePlayer.isEating && !mc.thePlayer.isUsingItem && !Objects.requireNonNull(
-            Client.moduleManager.getModule(
-                TPAura::class.java
-            )
-        )?.isBlocking!! && !mc.thePlayer.isBlocking && (Objects.requireNonNull(
-            Client.moduleManager.getModule(
-                KillAura::class.java
-            )
-        )?.target != null && (Objects.requireNonNull(
-            Client.moduleManager.getModule(
-                KillAura::class.java
-            )
-        )?.autoBlockModeValue?.get() == "None" || mc.thePlayer.heldItem.item !is ItemSword) || Objects.requireNonNull(
-            Client.moduleManager.getModule(
-                KillAura::class.java
-            )
-        )?.target == null)
-    }
-
     private val funDirection: Double
         get() {
             var rotationYaw: Float = mc.thePlayer.rotationYaw