fucking gay latptop type shit fuck

.gitignore

@@ -10,6 +10,8 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 
+workspace/settings/
+
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar
 

pom.xml

@@ -19,9 +19,18 @@
             <id>strezz</id>
             <url>https://nexus.hexeption.dev/repository/strezz-central/</url>
         </repository>
+        <repository>
+            <id>litarvan</id>
+            <url>https://litarvan.github.io/maven</url>
+        </repository>
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>fr.litarvan</groupId>
+            <artifactId>openauth</artifactId>
+            <version>1.1.3</version>
+        </dependency>
         <dependency>
             <groupId>net.minecraft</groupId>
             <artifactId>minecraft</artifactId>

src/main/java/net/minecraft/client/Minecraft.java

@@ -196,6 +196,8 @@ import rip.athena.client.events.types.render.RenderEvent;
 import rip.athena.client.events.types.render.RenderType;
 import rip.athena.client.gui.menu.AthenaMenu;
 import rip.athena.client.modules.impl.fpssettings.OptimizerMod;
+import rip.athena.client.modules.impl.mods.HitDelayFix;
+import rip.athena.client.modules.impl.render.MotionBlur;
 
 public class Minecraft implements IThreadListener, IPlayerUsage
 {
@@ -324,7 +326,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage
     private IReloadableResourceManager mcResourceManager;
     public final IMetadataSerializer metadataSerializer_ = new IMetadataSerializer();
     private final List<IResourcePack> defaultResourcePacks = Lists.<IResourcePack>newArrayList();
-    private final DefaultResourcePack mcDefaultResourcePack;
+    public final DefaultResourcePack mcDefaultResourcePack;
     private ResourcePackRepository mcResourcePackRepository;
     private LanguageManager mcLanguageManager;
     private IStream stream;
@@ -1223,6 +1225,11 @@ public class Minecraft implements IThreadListener, IPlayerUsage
 
     public void updateDisplay()
     {
+        if(Athena.INSTANCE.getModuleManager().get(MotionBlur.class).isToggled()) {
+            if(Minecraft.getMinecraft().thePlayer != null) {
+                MotionBlur.createAccumulation();
+            }
+        }
         this.mcProfiler.startSection("display_update");
         Display.update();
         this.mcProfiler.endSection();
@@ -1536,7 +1543,11 @@ public class Minecraft implements IThreadListener, IPlayerUsage
 
                 if (this.playerController.isNotCreative())
                 {
-                    this.leftClickCounter = 10;
+                    if(Athena.INSTANCE.getModuleManager().get(HitDelayFix.class).isToggled()) {
+                        this.leftClickCounter = 0;
+                    } else {
+                        this.leftClickCounter = 10;
+                    }
                 }
             }
             else
@@ -3182,7 +3193,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage
                         }
                         else
                         {
-                            GuiStreamUnavailable.func_152321_a(this.currentScreen);
+                            //GuiStreamUnavailable.func_152321_a(this.currentScreen);
                         }
                     }
                     else if (i == this.gameSettings.keyBindStreamPauseUnpause.getKeyCode())

src/main/java/net/minecraft/client/entity/AbstractClientPlayer.java

@@ -21,6 +21,7 @@ import optifine.CapeUtils;
 import optifine.Config;
 import optifine.PlayerConfigurations;
 import optifine.Reflector;
+import rip.athena.client.Athena;
 
 public abstract class AbstractClientPlayer extends EntityPlayer
 {
@@ -90,6 +91,7 @@ public abstract class AbstractClientPlayer extends EntityPlayer
 
     public ResourceLocation getLocationCape()
     {
+
         if (!Config.isShowCapes())
         {
             return null;

src/main/java/net/minecraft/client/entity/EntityPlayerSP.java

@@ -42,15 +42,11 @@ import net.minecraft.potion.Potion;
 import net.minecraft.stats.StatBase;
 import net.minecraft.stats.StatFileWriter;
 import net.minecraft.tileentity.TileEntitySign;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.MovementInput;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.*;
 import net.minecraft.world.IInteractionObject;
 import net.minecraft.world.World;
+import rip.athena.client.Athena;
+import rip.athena.client.modules.impl.mods.ToggleSprint;
 
 public class EntityPlayerSP extends AbstractClientPlayer
 {
@@ -783,7 +779,12 @@ public class EntityPlayerSP extends AbstractClientPlayer
         boolean flag1 = this.movementInput.sneak;
         float f = 0.8F;
         boolean flag2 = this.movementInput.moveForward >= f;
-        this.movementInput.updatePlayerMoveState();
+
+        if(Athena.INSTANCE.getModuleManager().get(ToggleSprint.class).isToggled()) {
+            ToggleSprint.update(mc, (MovementInputFromOptions) this.movementInput, this);
+        } else {
+            this.movementInput.updatePlayerMoveState();
+        }
 
         if (this.isUsingItem() && !this.isRiding())
         {
@@ -796,17 +797,93 @@ public class EntityPlayerSP extends AbstractClientPlayer
         this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.getEntityBoundingBox().minY + 0.5D, this.posZ - (double)this.width * 0.35D);
         this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.getEntityBoundingBox().minY + 0.5D, this.posZ - (double)this.width * 0.35D);
         this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.getEntityBoundingBox().minY + 0.5D, this.posZ + (double)this.width * 0.35D);
+
         boolean flag3 = (float)this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying;
 
-        if (this.onGround && !flag1 && !flag2 && this.movementInput.moveForward >= f && !this.isSprinting() && flag3 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness))
-        {
-            if (this.sprintToggleTimer <= 0 && !this.mc.gameSettings.keyBindSprint.isKeyDown())
+        if(Athena.INSTANCE.getModuleManager().get(ToggleSprint.class).isToggled()) {
+
+            boolean isSprintDisabled = !ToggleSprint.optionToggleSprint;
+            boolean canDoubleTap = ToggleSprint.optionDoubleTap;
+
+            // Detect when ToggleSprint was disabled in the in-game options menu
+            if(ToggleSprint.wasSprintDisabled)
             {
-                this.sprintToggleTimer = 7;
+                this.setSprinting(false);
+                ToggleSprint.UpdateSprint(false, false);
+                ToggleSprint.wasSprintDisabled = false;
+
+            }
+
+            // Default Sprint routine converted to PlayerAPI, use if ToggleSprint is disabled
+            if(isSprintDisabled)
+            {
+                if(ToggleSprint.optionDoubleTap && this.onGround && !flag2 && this.movementInput.moveForward >= f && !this.isSprinting() && flag3 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness))
+                {
+                    if(this.sprintToggleTimer <= 0 && !this.mc.gameSettings.keyBindSprint.isKeyDown())
+                    {
+                        this.sprintToggleTimer = 7;
+                    }
+                    else
+                    {
+                        this.setSprinting(true);
+
+                        ToggleSprint.UpdateSprint(true, false);
+                    }
+                }
+
+                if(!this.isSprinting() && this.movementInput.moveForward >= f && flag3 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness) && this.mc.gameSettings.keyBindSprint.isKeyDown())
+                {
+                    this.setSprinting(true);
+
+                    ToggleSprint.UpdateSprint(true, false);
+                }
             }
             else
             {
-                this.setSprinting(true);
+                boolean state = ToggleSprint.sprint;
+
+                if(flag3 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness) && !ToggleSprint.sprintHeldAndReleased)
+                {
+                    if(canDoubleTap && !this.isSprinting() || !canDoubleTap)
+                    {
+                        this.setSprinting(state);
+                    }
+                }
+
+                if(canDoubleTap && !state && this.onGround && !flag2 && this.movementInput.moveForward >= f && !this.isSprinting() && flag3 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness))
+                {
+                    if(this.sprintToggleTimer == 0)
+                    {
+                        this.sprintToggleTimer = 7;
+                    }
+                    else
+                    {
+                        this.setSprinting(true);
+                        ToggleSprint.UpdateSprint(true, true);
+                        this.sprintToggleTimer = 0;
+                    }
+                }
+            }
+
+            // If sprinting, break the sprint in appropriate circumstances:
+            // Player stops moving forward, runs into something, or gets too hungry
+            if (isSprinting() && (movementInput.moveForward < f || mc.thePlayer.isCollidedHorizontally || !flag3 || isUsingItem() || isPotionActive(Potion.blindness)))
+            {
+                this.setSprinting(false);
+                // Undo toggle if we resumed vanilla operation due to Hold&Release, DoubleTap, Fly, Ride
+                if (ToggleSprint.sprintHeldAndReleased || isSprintDisabled || ToggleSprint.sprintDoubleTapped || this.isRiding() || (!ToggleSprint.optionEnableFlyBoost ? this.capabilities.isFlying : false) )
+                {
+                    ToggleSprint.UpdateSprint(false, false);
+                }
+            }
+
+        } else {
+            if (this.onGround && !flag1 && !flag2 && this.movementInput.moveForward >= f && !this.isSprinting() && flag3 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness)) {
+                if (this.sprintToggleTimer <= 0 && !this.mc.gameSettings.keyBindSprint.isKeyDown()) {
+                    this.sprintToggleTimer = 7;
+                } else {
+                    this.setSprinting(true);
+                }
             }
         }
 
@@ -820,19 +897,27 @@ public class EntityPlayerSP extends AbstractClientPlayer
             this.setSprinting(false);
         }
 
-        if (this.capabilities.allowFlying)
-        {
-            if (this.mc.playerController.isSpectatorMode())
+        if(Athena.INSTANCE.getModuleManager().get(ToggleSprint.class).isToggled()) {
+
+            if(ToggleSprint.optionEnableFlyBoost && this.capabilities.isFlying && ToggleSprint.sprint)
             {
-                if (!this.capabilities.isFlying)
-                {
-                    this.capabilities.isFlying = true;
-                    this.sendPlayerAbilities();
+                if(ToggleSprint.sprint && ToggleSprint.optionEnableFlyBoost) {
+                    this.capabilities.setFlySpeed(0.05F * (float) ToggleSprint.flyboostspeedHorizontal);
+                    if(this.movementInput.sneak)	this.motionY -= 0.15D * (double) ToggleSprint.flyboostspeedVertical;
+                    if(this.movementInput.jump)	this.motionY += 0.15D * (double) ToggleSprint.flyboostspeedVertical;
+                } else if(!ToggleSprint.optionEnableFlyBoost && this.mc.gameSettings.keyBindSprint.isKeyDown()) {
+                    this.capabilities.setFlySpeed(0.05F * (float) ToggleSprint.flyboostspeedHorizontal);
+                    if(this.movementInput.sneak)	this.motionY -= 0.15D * (double) ToggleSprint.flyboostspeedVertical;
+                    if(this.movementInput.jump)	this.motionY += 0.15D * (double) ToggleSprint.flyboostspeedVertical;
                 }
             }
-            else if (!flag && this.movementInput.jump)
+            else if(this.capabilities.getFlySpeed() != 0.05F)
             {
-                if (this.flyToggleTimer == 0)
+                this.capabilities.setFlySpeed(0.05F);
+            }
+            if(this.capabilities.allowFlying && !isJumping && this.movementInput.jump)
+            {
+                if(this.flyToggleTimer == 0)
                 {
                     this.flyToggleTimer = 7;
                 }
@@ -843,18 +928,44 @@ public class EntityPlayerSP extends AbstractClientPlayer
                     this.flyToggleTimer = 0;
                 }
             }
-        }
 
-        if (this.capabilities.isFlying && this.isCurrentViewEntity())
-        {
-            if (this.movementInput.sneak)
+            if(this.capabilities.isFlying)
             {
-                this.motionY -= (double)(this.capabilities.getFlySpeed() * 3.0F);
+                if(this.movementInput.sneak)
+                {
+                    this.motionY -= 0.15D;
+                }
+                if(this.movementInput.jump)
+                {
+                    this.motionY += 0.15D;
+                }
+            }
+        } else {
+            if (this.capabilities.allowFlying) {
+                if (this.mc.playerController.isSpectatorMode()) {
+                    if (!this.capabilities.isFlying) {
+                        this.capabilities.isFlying = true;
+                        this.sendPlayerAbilities();
+                    }
+                } else if (!flag && this.movementInput.jump) {
+                    if (this.flyToggleTimer == 0) {
+                        this.flyToggleTimer = 7;
+                    } else {
+                        this.capabilities.isFlying = !this.capabilities.isFlying;
+                        this.sendPlayerAbilities();
+                        this.flyToggleTimer = 0;
+                    }
+                }
             }
 
-            if (this.movementInput.jump)
-            {
-                this.motionY += (double)(this.capabilities.getFlySpeed() * 3.0F);
+            if (this.capabilities.isFlying && this.isCurrentViewEntity()) {
+                if (this.movementInput.sneak) {
+                    this.motionY -= (double) (this.capabilities.getFlySpeed() * 3.0F);
+                }
+
+                if (this.movementInput.jump) {
+                    this.motionY += (double) (this.capabilities.getFlySpeed() * 3.0F);
+                }
             }
         }
 

src/main/java/net/minecraft/client/gui/FontRenderer.java

@@ -27,6 +27,8 @@ import optifine.FontUtils;
 
 import org.apache.commons.io.IOUtils;
 import org.lwjgl.opengl.GL11;
+import rip.athena.client.Athena;
+import rip.athena.client.modules.impl.other.NickHider;
 
 public class FontRenderer implements IResourceManagerReloadListener
 {
@@ -433,6 +435,16 @@ public class FontRenderer implements IResourceManagerReloadListener
      */
     private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_)
     {
+        NickHider mod = (NickHider) Athena.INSTANCE.getModuleManager().get(NickHider.class);
+
+        if(Athena.INSTANCE.getModuleManager().get(NickHider.class).isToggled()) {
+            if(Minecraft.getMinecraft().thePlayer != null) {
+                if (p_78255_1_.contains(Minecraft.getMinecraft().thePlayer.getName())) {
+                    p_78255_1_ = p_78255_1_.replace(Minecraft.getMinecraft().thePlayer.getName(), mod.nick);
+                }
+            }
+        }
+
         for (int i = 0; i < p_78255_1_.length(); ++i)
         {
             char c0 = p_78255_1_.charAt(i);
@@ -654,6 +666,16 @@ public class FontRenderer implements IResourceManagerReloadListener
      */
     public int getStringWidth(String text)
     {
+        NickHider mod = (NickHider) Athena.INSTANCE.getModuleManager().get(NickHider.class);
+
+        if (Athena.INSTANCE.getModuleManager().get(NickHider.class).isToggled()) {
+            if (Minecraft.getMinecraft().thePlayer != null) {
+                if (text.contains(Minecraft.getMinecraft().thePlayer.getName())) {
+                    text = text.replace(Minecraft.getMinecraft().thePlayer.getName(), mod.nick);
+                }
+            }
+        }
+
         if (text == null)
         {
             return 0;

src/main/java/net/minecraft/client/gui/Gui.java

@@ -7,6 +7,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
 
+import static org.lwjgl.opengl.GL11.*;
+
 public class Gui
 {
     public static final ResourceLocation optionsBackground = new ResourceLocation("textures/gui/options_background.png");
@@ -17,7 +19,7 @@ public class Gui
     /**
      * Draw a 1 pixel wide horizontal line. Args: x1, x2, y, color
      */
-    protected void drawHorizontalLine(int startX, int endX, int y, int color)
+    public static void drawHorizontalLine(int startX, int endX, int y, int color)
     {
         if (endX < startX)
         {
@@ -44,6 +46,28 @@ public class Gui
         drawRect(x, startY + 1, x + 1, endY, color);
     }
 
+    public static void drawRect2(double x, double y, double width, double height, int color) {
+        GlStateManager.color(1,1,1,1);
+        GlStateManager.enableAlpha();
+        GlStateManager.alphaFunc(GL_GREATER, (float) (0 * .01));
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        GlStateManager.disableTexture2D();
+
+        Tessellator tessellator = Tessellator.getInstance();
+        WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+
+        worldrenderer.begin(GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
+        worldrenderer.pos(x, y, 0.0D).color(color).endVertex();
+        worldrenderer.pos(x, y + height, 0.0D).color(color).endVertex();
+        worldrenderer.pos(x + width, y + height, 0.0D).color(color).endVertex();
+        worldrenderer.pos(x + width, y, 0.0D).color(color).endVertex();
+        tessellator.draw();
+
+        GlStateManager.enableTexture2D();
+        GlStateManager.disableBlend();
+    }
+
     /**
      * Draws a solid color rectangle with the specified coordinates and color (ARGB format). Args: x1, y1, x2, y2, color
      */

src/main/java/net/minecraft/client/gui/GuiButton.java

@@ -5,7 +5,10 @@ import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
+import rip.athena.client.Athena;
 import rip.athena.client.font.FontManager;
+import rip.athena.client.utils.animations.simple.SimpleAnimation;
+import rip.athena.client.utils.render.ColorUtil;
 import rip.athena.client.utils.render.DrawUtils;
 import rip.athena.client.utils.render.RoundedUtils;
 
@@ -13,8 +16,13 @@ import java.awt.*;
 
 public class GuiButton extends Gui
 {
-    protected static final ResourceLocation buttonTextures = new ResourceLocation("textures/gui/widgets.png");
 
+    private SimpleAnimation lineHoverAnimation = new SimpleAnimation(0.0F);
+    private SimpleAnimation rectHoverAnimation = new SimpleAnimation(100);
+
+    protected static final ResourceLocation buttonTextures = new ResourceLocation("textures/gui/widgets.png");
+    //    The animations crashed the entire fucking game.
+    int opacity;
     /** Button width in pixels */
     protected int width;
 
@@ -84,33 +92,65 @@ public class GuiButton extends Gui
     {
         if (this.visible)
         {
-            FontRenderer fontrenderer = mc.fontRendererObj;
             mc.getTextureManager().bindTexture(buttonTextures);
             GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
             this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
-            int i = this.getHoverState(this.hovered);
+
             GlStateManager.enableBlend();
             GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
             GlStateManager.blendFunc(770, 771);
-            //this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + i * 20, this.width / 2, this.height);
-            //this.drawTexturedModalRect(this.xPosition + this.width / 2, this.yPosition, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+
             this.mouseDragged(mc, mouseX, mouseY);
-            int j = 14737632;
+            if (hovered) {
+                opacity += 25;
+                if(opacity > 150) opacity = 150;
+            } else {
+                opacity -= 25;
+                if(opacity < 100) opacity = 100;
+            }
 
-            RoundedUtils.drawRoundedRect(this.xPosition, this.yPosition, this.xPosition +  this.width, this.yPosition + this.height, 12, hovered ? new Color(200,200,200,100).getRGB() : new Color(100,100,100,100).getRGB());
-            RoundedUtils.drawRoundedRect(this.xPosition + 1, this.yPosition + 1, (this.xPosition +  this.width) - 1, (this.yPosition + this.height) - 1, 12, new Color(22, 24, 27,100).getRGB());
+            Color rectCol;
+            if(!this.enabled)
+                rectCol = new Color(10, 10, 10, 120);
+            else
+                rectCol = new Color(150, 150, 150, opacity);
 
+            //Gui.drawRect(this.xPosition, this.yPosition, this.xPosition +  this.width, this.yPosition + this.height, rectCol.getRGB());
+            RoundedUtils.drawRound(this.xPosition + 1, this.yPosition + 1, this.width - 1, (this.height) - 2, 4, rectCol);
+            RoundedUtils.drawRoundedGradientOutlineCorner(this.xPosition, this.yPosition + 1, (this.width + xPosition), (this.height + yPosition) - 1, 1, 6, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB());
+
+            if(this.hovered && this.enabled) {
+                if (!(lineHoverAnimation.getValue() > (float) width / 2 - 2)) {
+                    lineHoverAnimation.setAnimation((float) width / 2 - 2, 10);
+
+                    drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
+                    drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
+
+
+                }
+                else if(lineHoverAnimation.getValue() >= (float) width / 2) {
+                    drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
+                    drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
+
+                }
+
+            }
+            else if(!hovered){
+                lineHoverAnimation.setAnimation(0, 4);
+                if(!(lineHoverAnimation.getValue() <= 0 || lineHoverAnimation.getValue() <= 2)) {
+                    drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue() - 1), this.yPosition + height - 1, -1);
+                    drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue() + 1), this.yPosition + height - 1, -1);
+                }
+
+            }
+
+            rip.athena.client.utils.font.FontManager.getProductSansBold(19).drawCenteredString(displayString.toUpperCase(),
+                    xPosition + (float) (width / 2), this.enabled ? yPosition + (float) (height / 2) - 3 : yPosition + (float) (height / 2) - 6, -1);
 
             if (!this.enabled)
-            {
-                j = 10526880;
-            }
-            else if (this.hovered)
-            {
-                j = 16777120;
-            }
+                rip.athena.client.utils.font.FontManager.getProductSansBold(10).drawCenteredString("DISABLED",
+                        xPosition + (float) (width / 2), yPosition + (float) (height / 2) + 4, -1);
 
-            FontManager.baloo17.drawCenteredString(this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height - 12) / 2, -1);
         }
     }
 

src/main/java/net/minecraft/client/gui/GuiChat.java

@@ -1,6 +1,8 @@
 package net.minecraft.client.gui;
 
 import com.google.common.collect.Lists;
+
+import java.awt.*;
 import java.io.IOException;
 import java.util.List;
 import net.minecraft.network.play.client.C14PacketTabComplete;
@@ -14,6 +16,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
+import rip.athena.client.Athena;
+import rip.athena.client.modules.impl.render.Chat;
 
 public class GuiChat extends GuiScreen
 {
@@ -300,7 +304,12 @@ public class GuiChat extends GuiScreen
      */
     public void drawScreen(int mouseX, int mouseY, float partialTicks)
     {
-        drawRect(2, this.height - 14, this.width - 2, this.height - 2, Integer.MIN_VALUE);
+        Chat module = (Chat) Athena.INSTANCE.getModuleManager().get(Chat.class); // Get chat module
+
+        int color = (module.isToggled() ? new Color(0, 0, 0, module.transparency).getRGB() : Integer.MIN_VALUE); // If toggled on, take a peak at transparnecy
+
+        drawRect(2, this.height - 14, this.width - 2, this.height - 2, color);
+
         this.inputField.drawTextBox();
         IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY());
 

src/main/java/net/minecraft/client/gui/GuiNewChat.java

@@ -1,6 +1,8 @@
 package net.minecraft.client.gui;
 
 import com.google.common.collect.Lists;
+
+import java.awt.*;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.client.Minecraft;
@@ -11,6 +13,7 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.util.MathHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import rip.athena.client.Athena;
 import rip.athena.client.font.FontManager;
 import rip.athena.client.modules.impl.render.Chat;
 
@@ -81,15 +84,16 @@ public class GuiNewChat extends Gui
                             {
                                 int i2 = 0;
                                 int j2 = -i1 * 9;
-                                drawRect(i2, j2 - 9, i2 + l + 4, j2, l1 / 2 << 24);
+
+                                Chat module = (Chat) Athena.INSTANCE.getModuleManager().get(Chat.class);
+
+
+
+                                drawRect(i2, j2 - 9, i2 + l + 4, j2, new Color(1, 1, 1, module.transparency).getRGB());
                                 String s = chatline.getChatComponent().getFormattedText();
                                 GlStateManager.color(1,1,1);
                                 GlStateManager.enableBlend();
-                                if(Chat.customFont) {
-                                    rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawStringWithShadow(s, (float) i2, (float) (j2 - 10), 16777215 + (l1 << 24));
-                                } else {
-                                    this.mc.fontRendererObj.drawStringWithShadow(s, (float) i2, (float) (j2 - 8), 16777215 + (l1 << 24));
-                                }
+                                this.mc.fontRendererObj.drawStringWithShadow(s, (float) i2, (float) (j2 - 8), 16777215 + (l1 << 24));
                                 GlStateManager.disableAlpha();
                                 GlStateManager.disableBlend();
                             }
@@ -165,19 +169,23 @@ public class GuiNewChat extends Gui
 
             this.field_146253_i.add(0, new ChatLine(p_146237_3_, ichatcomponent, p_146237_2_));
         }
+        Chat mod = (Chat) Athena.INSTANCE.getModuleManager().get(Chat.class);
 
-        while (this.field_146253_i.size() > 100)
-        {
-            this.field_146253_i.remove(this.field_146253_i.size() - 1);
+        if(!mod.isToggled() && !mod.infiniteChat) {
+
+            while (this.field_146253_i.size() > 100) {
+                this.field_146253_i.remove(this.field_146253_i.size() - 1);
+            }
         }
 
         if (!p_146237_4_)
         {
             this.chatLines.add(0, new ChatLine(p_146237_3_, p_146237_1_, p_146237_2_));
 
-            while (this.chatLines.size() > 100)
-            {
-                this.chatLines.remove(this.chatLines.size() - 1);
+            if(!mod.isToggled() && !mod.infiniteChat) {
+                while (this.chatLines.size() > 100) {
+                    this.chatLines.remove(this.chatLines.size() - 1);
+                }
             }
         }
     }

src/main/java/net/minecraft/client/gui/GuiOptions.java

@@ -214,11 +214,11 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback
 
                 if (istream.func_152936_l() && istream.func_152928_D())
                 {
-                    this.mc.displayGuiScreen(new GuiStreamOptions(this, this.game_settings_1));
+                    //this.mc.displayGuiScreen(new GuiStreamOptions(this, this.game_settings_1));
                 }
                 else
                 {
-                    GuiStreamUnavailable.func_152321_a(this);
+                    //GuiStreamUnavailable.func_152321_a(this);
                 }
             }
         }

src/main/java/net/minecraft/client/gui/GuiScreen.java

@@ -660,7 +660,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback
         }
         else
         {
-            DrawUtils.drawImage(new ResourceLocation("Athena/menu/test.png"), 0, 0, width, height);
+            DrawUtils.drawImage(new ResourceLocation("Athena/menu/wallpaper3.png"), 0, 0, width, height);
             //this.drawBackground(tint);
         }
     }