Commit the Big GUI Update: V2

.gitignore

@@ -21,3 +21,18 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+*.bat
+*.sh
+runtime/
+eclipse/
+src/
+jars/
+conf/
+docs/
+LICENSE.txt
+CHANGELOG
+reobf/
+lib/
+bin/
+temp/

minecraft/me/wavelength/baseclient/BaseClient.java

@@ -1,5 +1,6 @@
 package me.wavelength.baseclient;
 
+import java.awt.Color;
 import java.io.File;
 
 import org.lwjgl.opengl.Display;
@@ -13,6 +14,7 @@
 import me.wavelength.baseclient.friends.FriendsManager;
 import me.wavelength.baseclient.gui.altmanager.GuiAltManager;
 import me.wavelength.baseclient.gui.clickgui.ClickGui;
+import me.wavelength.baseclient.hooks.HookManager;
 import me.wavelength.baseclient.irc.IRCClient;
 import me.wavelength.baseclient.module.ModuleManager;
 import me.wavelength.baseclient.overlay.HotbarOverlay;
@@ -34,12 +36,13 @@ public class BaseClient {
 	 * Fonts: Slick's font manager edited by Russian412 and color system by me
 	 * Alt Manager: Russian412's Alt Manager with some small bug-fixes by me
 	 * The Altening Implementation: Russian412
+	 * ZeroDay b21 colored ClickGUI, epic arraylist and client module group: AcaiBerii
 	 * 
 	 * Everything else is made by me
 	 * @formatter:on
 	 **/
 
-	private final String clientName = "BaseClient";
+	private String clientName = "BaseClient";
 	private final String clientVersion = "0.1";
 	private final String author = "WaveLength";
 
@@ -77,6 +80,9 @@ public BaseClient() {
 	}
 
 	public void initialize() {
+		printStartup();
+		setupShutdownHook();
+
 		Display.setTitle(String.format("%1$s - %2$s | Loading...", clientName, clientVersion));
 
 		this.englishLocale = new Locale();
@@ -113,7 +119,7 @@ public void initialize() {
 		switchToMojang();
 
 		this.genericConfig = new Config(new File(clientFolder + Strings.getSplitter() + "config.cfg"));
-		genericConfig.addDefault("tabguicolor", "5556190");
+		genericConfig.addDefault("tabguicolor", String.valueOf(new Color(100, 100, 100).getRGB()));
 
 		/** Setting a custom icon */
 
@@ -128,7 +134,7 @@ public void initialize() {
 	public void afterMinecraft() {
 		Display.setTitle(String.format("%1$s - %2$s", clientName, clientVersion));
 
-		this.font = new Font(packageBase + ".font.fonts", "BwModelicaSS01-RegularCondensed", 50, 25, 30, 33);
+		this.font = new Font(packageBase + ".font.fonts", "BwModelicaSS01-RegularCondensed", 25, 30, 33, 50);
 
 		registerHuds();
 	}
@@ -211,6 +217,10 @@ public ClickGui getClickGui() {
 	public Locale getEnglishLocale() {
 		return englishLocale;
 	}
+
+	public void setClientName(String clientName) {
+		this.clientName = clientName;
+	}
 
 	public void switchToMojang() {
 		try {
@@ -231,5 +241,17 @@ public void switchToTheAltening() {
 			System.out.println("Couldn't switch to altening altservice -2");
 		}
 	}
+
+	public void setupShutdownHook() {
+		boolean shutdownHookInit = HookManager.installShutdownHook(new Thread(() -> {
+			System.out.println(String.format("%s %s shutting down.", this.clientName, this.clientVersion));
+		}));
+
+		System.out.println(String.format("Shutdown hook %s initialized.", shutdownHookInit ? "successfully" : "unsuccessfully"));
+	}
+
+	public void printStartup() {
+		System.out.println(String.format("%s %s starting up.", this.clientName, this.clientVersion));
+	}
 
 }

minecraft/me/wavelength/baseclient/command/CommandManager.java

@@ -9,6 +9,7 @@
 
 import me.wavelength.baseclient.BaseClient;
 import me.wavelength.baseclient.command.commands.BindCommand;
+import me.wavelength.baseclient.command.commands.ClientNameCommand;
 import me.wavelength.baseclient.command.commands.ColorCommand;
 import me.wavelength.baseclient.command.commands.FontCommand;
 import me.wavelength.baseclient.command.commands.FriendsCommand;
@@ -64,6 +65,7 @@ public void registerCommands() {
 		registerCommand(new XRayCommand());
 		registerCommand(new FontCommand());
 		registerCommand(new ToggleCommand());
+		registerCommand(new ClientNameCommand());
 	}
 
 	public List<Command> getCommands() {

minecraft/me/wavelength/baseclient/command/commands/ClientNameCommand.java

@@ -0,0 +1,27 @@
+package me.wavelength.baseclient.command.commands;
+
+import java.awt.Color;
+
+import me.wavelength.baseclient.BaseClient;
+import me.wavelength.baseclient.command.Command;
+import me.wavelength.baseclient.utils.Config;
+import me.wavelength.baseclient.utils.Integers;
+import me.wavelength.baseclient.utils.Lists;
+import me.wavelength.baseclient.utils.Random;
+import me.wavelength.baseclient.utils.Strings;
+
+public class ClientNameCommand extends Command {
+	public ClientNameCommand() {
+		super("clientname", "clientname <name>", "Changes the client name");
+	}
+
+	@Override
+	public String executeCommand(String line, String[] args) {
+		if (args.length < 1)
+			return getSyntax("&c");
+
+		BaseClient.instance.setClientName(args[0]);
+
+		return String.format("&aThe client's name has been succesfully changed to &e%1$s&a.", args[0]);
+	}
+}

minecraft/me/wavelength/baseclient/font/Font.java

@@ -15,10 +15,10 @@ public class Font {
 	private String packageName;
 	private String fontName;
 
-	private int fontSizeSmall;
-	private int fontSizeNormal;
-	private int fontSizeLarge;
-	private int fontSizeLargest;
+	public int fontSizeSmall;
+	public int fontSizeNormal;
+	public int fontSizeLarge;
+	public int fontSizeLargest;
 
 	public static Map<String, List<UnicodeFontRenderer>> getRegisteredRenderers() {
 		return REGISTERED_RENDERERS;

minecraft/me/wavelength/baseclient/gui/clickgui/ClickGui.java

@@ -5,32 +5,41 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.lwjgl.input.Mouse;
+
+import me.wavelength.baseclient.BaseClient;
 import me.wavelength.baseclient.gui.clickgui.components.Dropdown;
 import me.wavelength.baseclient.gui.clickgui.components.ModuleButton;
+import me.wavelength.baseclient.event.events.MouseScrollEvent;
 import me.wavelength.baseclient.module.Category;
+import me.wavelength.baseclient.utils.Colors;
 import me.wavelength.baseclient.utils.RenderUtils;
 import me.wavelength.baseclient.utils.Strings;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.settings.GameSettings.Options;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ResourceLocation;
 
 public class ClickGui extends GuiScreen {
 
 	private List<Dropdown> dropdowns;
-
+
+	public me.wavelength.baseclient.module.Module clickGuiMod; 
+
 	private boolean fastRender;
 	private boolean showDebugInfo;
+
+	private int scroll = 5;
 
 	public ClickGui() {
 	}
 
-	/** Credits for the Blur: MrTheShy */
 	@Override
 	public void initGui() {
+		this.clickGuiMod = BaseClient.instance.getModuleManager()
+				.getModule(me.wavelength.baseclient.module.modules.client.ClickGui.class);
+		int clickGuiSpacing = clickGuiMod.getModuleSettings().getInt("spacing");
+
 		if (fastRender = mc.gameSettings.ofFastRender)
 			mc.gameSettings.setOptionValue(Options.FAST_RENDER, 1);
 
@@ -44,32 +53,27 @@ public void initGui() {
 			if (category.equals(Category.SEMI_HIDDEN) || category.equals(Category.HIDDEN))
 				continue;
 
-			int x = 5 + (previousDropdown == null ? 0 : 10 + previousDropdown.getX() + previousDropdown.getWidth());
-			int y = (previousDropdown == null ? 5 : previousDropdown.getY());
-			Dropdown dropdown = new Dropdown(this, category, x, y, false);
-			if (x + dropdown.getWidth() > RenderUtils.getScaledResolution().getScaledWidth() && previousDropdown != null) {
+			Dropdown dropdown = new Dropdown(this, category, 0, 0, true);
+
+			int x = (previousDropdown == null ? 5
+					: clickGuiSpacing + (previousDropdown.getX() + previousDropdown.getWidth()));
+			int y = scroll;
+
+			dropdown.setX(x);
+			dropdown.setY(y);
+
+			if (x + dropdown.getWidth() > RenderUtils.getScaledResolution().getScaledWidth()
+					&& previousDropdown != null) {
 				dropdown.setX(5);
 				dropdown.setY(previousDropdown.getY() + previousDropdown.getHeight() + 30);
 			}
 			dropdowns.add(dropdown);
 			previousDropdown = dropdown;
 		}
-
-		if (!(mc.gameSettings.ofFastRender) && OpenGlHelper.shadersSupported && this.mc.getRenderViewEntity() instanceof EntityPlayer) {
-			if (this.mc.entityRenderer.theShaderGroup != null)
-				this.mc.entityRenderer.theShaderGroup.deleteShaderGroup();
-
-			this.mc.entityRenderer.loadShader(new ResourceLocation("shaders/post/blur.json"));
-		}
 	}
 
 	@Override
 	public void onGuiClosed() {
-		if (!(mc.gameSettings.ofFastRender) && this.mc.entityRenderer.theShaderGroup != null) {
-			this.mc.entityRenderer.theShaderGroup.deleteShaderGroup();
-			this.mc.entityRenderer.theShaderGroup = null;
-		}
-
 		if (fastRender)
 			mc.gameSettings.setOptionValue(Options.FAST_RENDER, 1);
 
@@ -78,12 +82,25 @@ public void onGuiClosed() {
 
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-		int contentColor = new Color(0, 0, 0, 200).getRGB();
-		int headerColor = new Color(30, 150, 10, 200).getRGB();
-		int textColor = Color.WHITE.getRGB();
+		handleScrolling();
+		boolean isRainbow = clickGuiMod.getModuleSettings().getBoolean("rainbow");
+		int rainbowOffset = clickGuiMod.getModuleSettings().getInt("offset");
+		int rainbowSpeed = clickGuiMod.getModuleSettings().getInt("speed");
+
+		int screenHeight = mc.displayHeight;
+		int screenWidth = mc.displayWidth;
+
+		int textColor = new Color(255, 255, 255).getRGB();
 
 		for (int i = 0; i < dropdowns.size(); i++) {
 			Dropdown dropdown = dropdowns.get(i);
+
+			dropdown.setY(this.scroll);
+
+			int contentColor = isRainbow
+					? Colors.getRGBWave(rainbowSpeed, 1, 0.5f,
+							(i * ((dropdown.getWidth() + dropdown.getX()) / 2) * rainbowOffset))
+					: me.wavelength.baseclient.module.Color.getColor(dropdown.getCategory()).getRGB();
 
 			Category category = dropdown.getCategory();
 			int x = dropdown.getX();
@@ -92,14 +109,14 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 			int height = dropdown.getHeight();
 			List<ModuleButton> moduleButtons = dropdown.getModuleButtons();
 
-			if (dropdown.isExtended())
+			if (dropdown.isExtended()) {
 				RenderUtils.drawModalRectFromTopLeft(x, y + dropdown.getHeaderHeight(), width, height, contentColor);
-
-			if (dropdown.isExtended())
 				moduleButtons.forEach(button -> button.drawButton(Minecraft.getMinecraft(), mouseX, mouseY));
+			}
 
-			RenderUtils.drawModalRectFromTopLeft(x, y, width, dropdown.getHeaderHeight(), headerColor);
-			RenderUtils.drawString(Strings.capitalizeOnlyFirstLetter(category.name()), x + 3, y + 1, textColor);
+			RenderUtils.drawModalRectFromTopLeft(x, y, width, dropdown.getHeaderHeight(), contentColor);
+			RenderUtils.drawString(Strings.capitalizeOnlyFirstLetter(category.name()), x + 3, y + 1, textColor,
+					BaseClient.instance.getFontRenderer().fontSizeNormal, true);
 		}
 	}
 
@@ -156,5 +173,14 @@ public List<GuiButton> getButtonList() {
 	public void setButtonList(List<GuiButton> buttonList) {
 		this.buttonList = buttonList;
 	}
+
+	public void handleScrolling() {
+	    if (Mouse.hasWheel()) {
+	        this.scroll += -(Mouse.getDWheel() / clickGuiMod.getModuleSettings().getInt("scroll speed"));
+
+	        if (this.scroll < 5)
+	            this.scroll = 5;
+	    }
+	}
 
 }

minecraft/me/wavelength/baseclient/gui/clickgui/GuiBind.java

@@ -2,6 +2,7 @@
 
 import java.awt.Color;
 import java.io.IOException;
+import java.util.Comparator;
 
 import org.lwjgl.input.Keyboard;
 
@@ -35,34 +36,22 @@ public GuiBind(Module module, ClickGui clickGui) {
 	public void initGui() {
 		if (fastRender = mc.gameSettings.ofFastRender)
 			mc.gameSettings.setOptionValue(Options.FAST_RENDER, 1);
-
-		if (!(mc.gameSettings.ofFastRender) && OpenGlHelper.shadersSupported && this.mc.getRenderViewEntity() instanceof EntityPlayer) {
-			if (this.mc.entityRenderer.theShaderGroup != null)
-				this.mc.entityRenderer.theShaderGroup.deleteShaderGroup();
-
-			this.mc.entityRenderer.loadShader(new ResourceLocation("shaders/post/blur.json"));
-		}
-
-		if (fastRender)
-			mc.gameSettings.setOptionValue(Options.FAST_RENDER, 1);
 	}
 
 	@Override
 	public void onGuiClosed() {
-		if (!(mc.gameSettings.ofFastRender) && this.mc.entityRenderer.theShaderGroup != null) {
-			this.mc.entityRenderer.theShaderGroup.deleteShaderGroup();
-			this.mc.entityRenderer.theShaderGroup = null;
-		}
+		if (fastRender)
+			mc.gameSettings.setOptionValue(Options.FAST_RENDER, 1);
 	}
 
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 		ScaledResolution scaledResolution = RenderUtils.getScaledResolution();
-		RenderUtils.drawModalRect(0, 0, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight(), new Color(0, 0, 0, 110).getRGB());
+
 
 		String bindText = String.format("Bind the module %s", Strings.capitalizeFirstLetter(module.getName()));
 		String currentBoundText = (module.getKey() == 0 ? "Currently not bound" : String.format("Currently bound to %s", KeyUtils.getKeyName(module.getKey())));
-		String escapeText = "Press Escape to cancel and Back or Delete to unbind";
+		String escapeText = "Escape to cancel - Back or Delete to unbind";
 
 		int currentBoundTextFontSize = BaseClient.instance.getFontRenderer().getFontSize() - 3;
 		int escapeTextFontSize = BaseClient.instance.getFontRenderer().getFontSize() - 8;