test

Aspw-w · Aug 22, 2023 · b0ecee1 · b0ecee1
1 parent a4030cf
commit b0ecee1
Show file tree

Hide file tree

Showing 53 changed files with 867 additions and 1,053 deletions.
diff --git a/NightX.ipr b/NightX.ipr
@@ -373,10 +373,6 @@
       <module fileurl="file://$PROJECT_DIR$/AvoidWare.api.iml" filepath="$PROJECT_DIR$/AvoidWare.api.iml" />
       <module fileurl="file://$PROJECT_DIR$/AvoidWare.main.iml" filepath="$PROJECT_DIR$/AvoidWare.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/AvoidWare.test.iml" filepath="$PROJECT_DIR$/AvoidWare.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/NightX.iml" filepath="$PROJECT_DIR$/NightX.iml" />
-      <module fileurl="file://$PROJECT_DIR$/NightX-Client.NightX.api.iml" filepath="$PROJECT_DIR$/NightX-Client.NightX.api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/NightX-Client.NightX.main.iml" filepath="$PROJECT_DIR$/NightX-Client.NightX.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/NightX-Client.NightX.test.iml" filepath="$PROJECT_DIR$/NightX-Client.NightX.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/NightX-master.NightX.iml" filepath="$PROJECT_DIR$/NightX-master.NightX.iml" />
       <module fileurl="file://$PROJECT_DIR$/NightX.api.iml" filepath="$PROJECT_DIR$/NightX.api.iml" />
       <module fileurl="file://$PROJECT_DIR$/NightX.main.iml" filepath="$PROJECT_DIR$/NightX.main.iml" />

diff --git a/NightX.iws b/NightX.iws
diff --git a/src/main/java/net/aspw/client/Client.kt b/src/main/java/net/aspw/client/Client.kt
@@ -13,7 +13,6 @@ import net.aspw.client.util.ClassUtils.hasForge
 import net.aspw.client.util.connection.CheckConnection
 import net.aspw.client.util.misc.sound.TipSoundManager
 import net.aspw.client.visual.client.clickgui.dropdown.ClickGui
-import net.aspw.client.visual.font.Fonts
 import net.aspw.client.visual.hud.HUD
 import net.aspw.client.visual.hud.HUD.Companion.createDefault
 import net.minecraft.util.ResourceLocation
@@ -33,7 +32,6 @@ object Client {
     const val CLIENT_CONFIG = "jnx2umqrkh"
     // Old Auth System
     // const val CLIENT_USER = "Username:Password:HWID:UID"
-    const val CLIENT_FONTS = "52e4wz1ovk"
     const val CLIENT_SRG = "6bl91v1egh"
     const val CLIENT_CHAT = "§c§l>> §r"
     val CLIENT_STATUS =
@@ -101,9 +99,6 @@ object Client {
         // Create command manager
         commandManager = CommandManager()
 
-        // Load client fonts
-        Fonts.loadFonts()
-
         // Init SoundManager
         tipSoundManager = TipSoundManager()
 

diff --git a/src/main/java/net/aspw/client/features/command/impl/ReloadCommand.kt b/src/main/java/net/aspw/client/features/command/impl/ReloadCommand.kt
@@ -22,7 +22,6 @@ class ReloadCommand : Command("reload", emptyArray()) {
             Client.moduleManager.generateCommand(module)
         Client.scriptManager.loadScripts()
         Client.scriptManager.enableScripts()
-        Fonts.loadFonts()
         Client.tipSoundManager = TipSoundManager()
         Client.fileManager.loadConfig(Client.fileManager.modulesConfig)
         Client.fileManager.loadConfig(Client.fileManager.valuesConfig)

diff --git a/src/main/java/net/aspw/client/features/module/impl/exploit/Disabler.kt b/src/main/java/net/aspw/client/features/module/impl/exploit/Disabler.kt
@@ -12,6 +12,7 @@ import net.aspw.client.features.module.impl.movement.Speed
 import net.aspw.client.features.module.impl.player.Scaffold
 import net.aspw.client.util.*
 import net.aspw.client.util.misc.RandomUtils
+import net.aspw.client.util.newfont.FontLoaders
 import net.aspw.client.util.render.RenderUtils
 import net.aspw.client.util.render.Stencil
 import net.aspw.client.util.timer.MSTimer
@@ -463,7 +464,7 @@ class Disabler : Module() {
                     Color(0, 111, 255, 70).rgb
                 )
                 Stencil.dispose()
-                Fonts.fontSFUI40?.drawCenteredString(
+                FontLoaders.SF20.drawCenteredString(
                     "${
                         (msTimer.hasTimeLeft(psfWorldDelay.get().toLong()).toFloat() / 1000F).toInt()
                     }s left...", sc.scaledWidth / 2F, 41F, -1

diff --git a/src/main/java/net/aspw/client/features/module/impl/player/BowLongJump.kt b/src/main/java/net/aspw/client/features/module/impl/player/BowLongJump.kt
@@ -7,6 +7,7 @@ import net.aspw.client.features.module.ModuleCategory
 import net.aspw.client.features.module.ModuleInfo
 import net.aspw.client.util.MovementUtils
 import net.aspw.client.util.PacketUtils
+import net.aspw.client.util.newfont.FontLoaders
 import net.aspw.client.util.render.RenderUtils
 import net.aspw.client.value.BoolValue
 import net.aspw.client.value.FloatValue
@@ -179,12 +180,11 @@ class BowLongJump : Module() {
         if (!renderValue.get()) return
         val scaledRes = ScaledResolution(mc)
         val width = bowState.toFloat() / 5f * 60f
-        Fonts.fontSFUI40.drawCenteredString(
+        FontLoaders.SF20.drawCenteredStringWithShadow(
             bowStatus,
             scaledRes.scaledWidth / 2f,
             scaledRes.scaledHeight / 2f + 14f,
-            -1,
-            true
+            -1
         )
         RenderUtils.drawRect(
             scaledRes.scaledWidth / 2f - 31f,

diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/BlockOverlay.kt b/src/main/java/net/aspw/client/features/module/impl/visual/BlockOverlay.kt
@@ -8,6 +8,7 @@ import net.aspw.client.features.module.ModuleCategory
 import net.aspw.client.features.module.ModuleInfo
 import net.aspw.client.util.block.BlockUtils.canBeClicked
 import net.aspw.client.util.block.BlockUtils.getBlock
+import net.aspw.client.util.newfont.FontLoaders
 import net.aspw.client.util.render.ColorUtils.rainbow
 import net.aspw.client.util.render.RenderUtils
 import net.aspw.client.value.BoolValue
@@ -83,7 +84,7 @@ class BlockOverlay : Module() {
             val scaledResolution = ScaledResolution(mc)
 
             GlStateManager.resetColor()
-            Fonts.fontSFUI40.drawCenteredString(
+            FontLoaders.SF20.drawCenteredString(
                 info,
                 scaledResolution.scaledWidth / 2F,
                 scaledResolution.scaledHeight / 2F + 6F,

diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Hud.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Hud.kt
@@ -33,7 +33,7 @@ class Hud : Module() {
     val customFov = BoolValue("CustomFov", false)
     val customFovModifier = FloatValue("Fov", 1.3F, 0.8F, 1.5F, { customFov.get() })
     val fontChatValue = BoolValue("FontChat", false)
-    val fontType = FontValue("Font", Fonts.fontSFUI37, { fontChatValue.get() })
+    val fontType = FontValue("Font", Fonts.minecraftFont, { fontChatValue.get() })
     val chatRectValue = BoolValue("ChatRect", true)
     val chatAnimationValue = BoolValue("Chat-Animation", true)
     val chatAnimationSpeedValue = FloatValue("Chat-AnimationSpeed", 0.06F, 0.01F, 0.5F, { chatAnimationValue.get() })

diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/gui/MixinGuiButton.java b/src/main/java/net/aspw/client/injection/forge/mixins/gui/MixinGuiButton.java
@@ -2,6 +2,7 @@
 
 import net.aspw.client.Client;
 import net.aspw.client.features.module.impl.visual.Hud;
+import net.aspw.client.util.newfont.FontLoaders;
 import net.aspw.client.util.render.RenderUtils;
 import net.aspw.client.visual.client.GuiMainMenu;
 import net.aspw.client.visual.font.AWTFontRenderer;
@@ -141,7 +142,7 @@ public void drawButton(Minecraft mc, int mouseX, int mouseY) {
             }
 
             if (mc.currentScreen instanceof GuiMainMenu)
-                Fonts.fontSFUI40.drawCenteredString(this.displayString, this.xPosition + this.width / 2F, this.yPosition + (this.height - 8) / 2F, j);
+                FontLoaders.SF20.drawCenteredString(this.displayString, this.xPosition + this.width / 2F, this.yPosition + (this.height - 8) / 2F, j);
             else {
                 mc.getTextureManager().bindTexture(buttonTextures);
                 mouseDragged(mc, mouseX, mouseY);

diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/gui/MixinGuiButtonExt.java b/src/main/java/net/aspw/client/injection/forge/mixins/gui/MixinGuiButtonExt.java
@@ -2,6 +2,7 @@
 
 import net.aspw.client.Client;
 import net.aspw.client.features.module.impl.visual.Hud;
+import net.aspw.client.util.newfont.FontLoaders;
 import net.aspw.client.util.render.RenderUtils;
 import net.aspw.client.visual.client.GuiMainMenu;
 import net.aspw.client.visual.font.Fonts;
@@ -81,7 +82,7 @@ public void drawButton(Minecraft mc, int mouseX, int mouseY) {
             }
 
             if (mc.currentScreen instanceof GuiMainMenu)
-                Fonts.fontSFUI40.drawCenteredString(this.displayString, this.xPosition + this.width / 2F, this.yPosition + (this.height - 8) / 2F, j);
+                FontLoaders.SF20.drawCenteredString(this.displayString, this.xPosition + this.width / 2F, this.yPosition + (this.height - 8) / 2F, j);
             else {
                 mc.getTextureManager().bindTexture(buttonTextures);
                 mouseDragged(mc, mouseX, mouseY);