a

NightX.iws

@@ -6,8 +6,23 @@
   <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$/downloads.json" beforeDir="false" afterPath="$PROJECT_DIR$/downloads.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/visual/SilentView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/visual/SilentView.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/Jenisuke.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/Jenisuke.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/KeepChest.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/KeepChest.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/BowLongJump.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/BowLongJump.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/visual/BlockOverlay.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/visual/BlockOverlay.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/newfont/CFont.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/newfont/CFont.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/newfont/CFontRenderer.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/newfont/CFontRenderer.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/newfont/FontLoaders.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/util/newfont/FontLoaders.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/NewUi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/NewUi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/CategoryElement.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/CategoryElement.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/ModuleElement.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/ModuleElement.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/SearchBox.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/SearchBox.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/BooleanElement.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/BooleanElement.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/FloatElement.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/FloatElement.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/IntElement.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/IntElement.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/ListElement.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/ListElement.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/hud/designer/EditorPanel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/visual/hud/designer/EditorPanel.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -164,7 +179,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" />
@@ -179,7 +194,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" />
@@ -254,7 +269,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" />
@@ -269,7 +284,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" />
@@ -326,7 +341,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" />
@@ -341,7 +356,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" />
@@ -416,7 +431,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" />
@@ -431,7 +446,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" />

src/main/java/net/aspw/client/features/module/impl/other/Jenisuke.kt

@@ -7,7 +7,6 @@ import net.aspw.client.event.WorldEvent
 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.util.connection.LoginID
 import net.aspw.client.util.misc.RandomUtils
 import net.aspw.client.value.IntegerValue
 import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement

src/main/java/net/aspw/client/features/module/impl/other/KeepChest.kt

@@ -1,11 +1,13 @@
 package net.aspw.client.features.module.impl.other
 
-import net.aspw.client.event.*
+import net.aspw.client.event.EventTarget
+import net.aspw.client.event.KeyEvent
+import net.aspw.client.event.PacketEvent
+import net.aspw.client.event.ScreenEvent
 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.util.PacketUtils
-import net.aspw.client.util.connection.LoginID
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.client.gui.inventory.GuiInventory
 import net.minecraft.network.play.client.C0DPacketCloseWindow

src/main/java/net/aspw/client/features/module/impl/player/BowLongJump.kt

@@ -12,7 +12,6 @@ import net.aspw.client.util.render.RenderUtils
 import net.aspw.client.value.BoolValue
 import net.aspw.client.value.FloatValue
 import net.aspw.client.value.IntegerValue
-import net.aspw.client.visual.font.Fonts
 import net.aspw.client.visual.hud.element.elements.Notification
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.init.Items

src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt

@@ -158,8 +158,10 @@ class Scaffold : Module() {
             }
         }
 
-    private val watchdogYaw: IntegerValue = object : IntegerValue("WatchdogYaw", 180, 0, 360, { rotationModeValue.get().equals("watchdog", true) }) {}
-    private val watchdogPitch: IntegerValue = object : IntegerValue("WatchdogPitch", 84, 0, 90, { rotationModeValue.get().equals("watchdog", true) }) {}
+    private val watchdogYaw: IntegerValue =
+        object : IntegerValue("WatchdogYaw", 180, 0, 360, { rotationModeValue.get().equals("watchdog", true) }) {}
+    private val watchdogPitch: IntegerValue =
+        object : IntegerValue("WatchdogPitch", 84, 0, 90, { rotationModeValue.get().equals("watchdog", true) }) {}
 
     private val timerValue = FloatValue("Timer", 1f, 0.1f, 1.4f)
     private val placeSlowDownValue = BoolValue("Place-SlowDown", false)

src/main/java/net/aspw/client/features/module/impl/visual/BlockOverlay.kt

@@ -13,7 +13,6 @@ import net.aspw.client.util.render.ColorUtils.rainbow
 import net.aspw.client.util.render.RenderUtils
 import net.aspw.client.value.BoolValue
 import net.aspw.client.value.IntegerValue
-import net.aspw.client.visual.font.Fonts
 import net.minecraft.block.Block
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager

src/main/java/net/aspw/client/util/newfont/CFont.java

@@ -96,18 +96,18 @@ protected void drawQuad(float x, float y, float width, float height, float srcX,
         float renderSRCY = srcY / 512.0f;
         float renderSRCWidth = srcWidth / 512.0f;
         float renderSRCHeight = srcHeight / 512.0f;
-        GL11.glTexCoord2f((float) (renderSRCX + renderSRCWidth), (float) renderSRCY);
-        GL11.glVertex2d((double) (x + width), (double) y);
-        GL11.glTexCoord2f((float) renderSRCX, (float) renderSRCY);
-        GL11.glVertex2d((double) x, (double) y);
-        GL11.glTexCoord2f((float) renderSRCX, (float) (renderSRCY + renderSRCHeight));
-        GL11.glVertex2d((double) x, (double) (y + height));
-        GL11.glTexCoord2f((float) renderSRCX, (float) (renderSRCY + renderSRCHeight));
-        GL11.glVertex2d((double) x, (double) (y + height));
-        GL11.glTexCoord2f((float) (renderSRCX + renderSRCWidth), (float) (renderSRCY + renderSRCHeight));
-        GL11.glVertex2d((double) (x + width), (double) (y + height));
-        GL11.glTexCoord2f((float) (renderSRCX + renderSRCWidth), (float) renderSRCY);
-        GL11.glVertex2d((double) (x + width), (double) y);
+        GL11.glTexCoord2f(renderSRCX + renderSRCWidth, renderSRCY);
+        GL11.glVertex2d(x + width, y);
+        GL11.glTexCoord2f(renderSRCX, renderSRCY);
+        GL11.glVertex2d(x, y);
+        GL11.glTexCoord2f(renderSRCX, renderSRCY + renderSRCHeight);
+        GL11.glVertex2d(x, y + height);
+        GL11.glTexCoord2f(renderSRCX, renderSRCY + renderSRCHeight);
+        GL11.glVertex2d(x, y + height);
+        GL11.glTexCoord2f(renderSRCX + renderSRCWidth, renderSRCY + renderSRCHeight);
+        GL11.glVertex2d(x + width, y + height);
+        GL11.glTexCoord2f(renderSRCX + renderSRCWidth, renderSRCY);
+        GL11.glVertex2d(x + width, y);
     }
 
     public int getStringHeight(String text) {

src/main/java/net/aspw/client/util/newfont/CFontRenderer.kt

@@ -1,9 +1,6 @@
 package net.aspw.client.util.newfont
 
 import net.aspw.client.util.render.ColorUtils.stripColor
-import net.aspw.client.visual.font.AWTFontRenderer
-import net.aspw.client.visual.font.CachedFont
-import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.client.renderer.texture.DynamicTexture
 import org.lwjgl.opengl.GL11

src/main/java/net/aspw/client/util/newfont/FontLoaders.java

@@ -56,7 +56,7 @@ public abstract class FontLoaders {
     public static CFontRenderer logog38 = new CFontRenderer(FontLoaders.getLoggo(38), true, true);
 
     // Tahoma2
-    public static CFontRenderer Tahoma9= new CFontRenderer(FontLoaders.getTahoma(9), true, true);
+    public static CFontRenderer Tahoma9 = new CFontRenderer(FontLoaders.getTahoma(9), true, true);
     public static CFontRenderer Tahoma11 = new CFontRenderer(FontLoaders.getTahoma(11), true, true);
     public static CFontRenderer Tahoma13 = new CFontRenderer(FontLoaders.getTahoma(13), true, true);
     public static CFontRenderer Tahoma14 = new CFontRenderer(FontLoaders.getTahoma(14), true, true);

src/main/java/net/aspw/client/visual/client/clickgui/tab/NewUi.java

@@ -11,7 +11,6 @@
 import net.aspw.client.visual.client.clickgui.tab.elements.CategoryElement;
 import net.aspw.client.visual.client.clickgui.tab.elements.ModuleElement;
 import net.aspw.client.visual.client.clickgui.tab.elements.SearchElement;
-import net.aspw.client.visual.font.Fonts;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.MathHelper;

src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/CategoryElement.kt

@@ -8,7 +8,6 @@ import net.aspw.client.util.newfont.FontLoaders
 import net.aspw.client.util.render.RenderUtils
 import net.aspw.client.visual.client.clickgui.tab.ColorManager
 import net.aspw.client.visual.client.clickgui.tab.extensions.animSmooth
-import net.aspw.client.visual.font.Fonts
 import org.lwjgl.opengl.GL11
 import java.awt.Color
 import kotlin.math.abs

src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/ModuleElement.kt

@@ -19,7 +19,6 @@ import net.aspw.client.visual.client.clickgui.tab.value.impl.BooleanElement
 import net.aspw.client.visual.client.clickgui.tab.value.impl.FloatElement
 import net.aspw.client.visual.client.clickgui.tab.value.impl.IntElement
 import net.aspw.client.visual.client.clickgui.tab.value.impl.ListElement
-import net.aspw.client.visual.font.Fonts
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.ResourceLocation
 import org.lwjgl.input.Keyboard

src/main/java/net/aspw/client/visual/client/clickgui/tab/elements/SearchBox.kt

@@ -1,8 +1,6 @@
 package net.aspw.client.visual.client.clickgui.tab.elements
 
-import net.aspw.client.util.newfont.FontLoaders
 import net.aspw.client.visual.font.Fonts
-import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiTextField
 
 class SearchBox(componentId: Int, x: Int, y: Int, width: Int, height: Int) :

src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/BooleanElement.kt

@@ -5,7 +5,6 @@ import net.aspw.client.util.newfont.FontLoaders
 import net.aspw.client.value.BoolValue
 import net.aspw.client.visual.client.clickgui.tab.components.Checkbox
 import net.aspw.client.visual.client.clickgui.tab.value.ValueElement
-import net.aspw.client.visual.font.Fonts
 import java.awt.Color
 
 class BooleanElement(value: BoolValue) : ValueElement<Boolean>(value) {

src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/FloatElement.kt

@@ -7,7 +7,6 @@ import net.aspw.client.value.FloatValue
 import net.aspw.client.visual.client.clickgui.tab.ColorManager
 import net.aspw.client.visual.client.clickgui.tab.components.Slider
 import net.aspw.client.visual.client.clickgui.tab.value.ValueElement
-import net.aspw.client.visual.font.Fonts
 import java.awt.Color
 import java.math.BigDecimal
 

src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/IntElement.kt

@@ -7,7 +7,6 @@ import net.aspw.client.value.IntegerValue
 import net.aspw.client.visual.client.clickgui.tab.ColorManager
 import net.aspw.client.visual.client.clickgui.tab.components.Slider
 import net.aspw.client.visual.client.clickgui.tab.value.ValueElement
-import net.aspw.client.visual.font.Fonts
 import java.awt.Color
 
 class IntElement(val savedValue: IntegerValue) : ValueElement<Int>(savedValue) {

src/main/java/net/aspw/client/visual/client/clickgui/tab/value/impl/ListElement.kt

@@ -7,7 +7,6 @@ import net.aspw.client.value.ListValue
 import net.aspw.client.visual.client.clickgui.tab.ColorManager
 import net.aspw.client.visual.client.clickgui.tab.extensions.animSmooth
 import net.aspw.client.visual.client.clickgui.tab.value.ValueElement
-import net.aspw.client.visual.font.Fonts
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.ResourceLocation
 import org.lwjgl.opengl.GL11.*

src/main/java/net/aspw/client/visual/hud/designer/EditorPanel.kt

@@ -234,7 +234,12 @@ class EditorPanel(private val hudDesigner: GuiHudDesigner, var x: Int, var y: In
         realHeight += 10
 
         // Scale
-        FontLoaders.SF18.drawString("Scale: ${"%.2f".format(element.scale)}", x + 2f, y + height.toFloat(), Color.WHITE.rgb)
+        FontLoaders.SF18.drawString(
+            "Scale: ${"%.2f".format(element.scale)}",
+            x + 2f,
+            y + height.toFloat(),
+            Color.WHITE.rgb
+        )
         height += 10
         realHeight += 10