Commit the Big GUI Update: V2

.gitignore

@@ -20,4 +20,4 @@
 *.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+hs_err_pid*

Readme.md

@@ -1,11 +1,7 @@
-# Minecraft Base Hacked Client 1.8.8 (with Optifine)
+# Oxide's 1.8.8 Base Hacked Client (OptiFine included)
 
 ## Welcome!
-We have a FAQ (Q&A) section! If you are interested you can click [here](https://github.com/OxideWaveLength/Minecraft-Hack-BaseClient/wiki/FAQ-(Q&A))
-
-We also have a Discord server! Click [here](https://discord.gg/pDweRGz) to join
-
-If you don't have Discord, but have Twitter and need help or want to stay updated, you can follow me [here](https://twitter.com/OxideWaveLength)
+This is a hacked client made for Minecraft 1.8.8.
 
 ------------
 
@@ -18,11 +14,11 @@ If you don't have Discord, but have Twitter and need help or want to stay update
 - Java JRE (1.8)
 - An IDE (The setup is for Eclipse, but MCP can also be setup on [IntelliJ Idea](https://www.youtube.com/watch?v=CtMhtp6QQoY))
 
-#### Video!
+#### Video by OxideWaveLength
 Now a [video](https://www.youtube.com/watch?v=LSKu_zhPKc8) is available, showing how to set up the client. - The video is not up to date and a step is missing. Until that is updated you can watch that video and then come back and do the last step (adding javaws to your build path)
 
-#### Let's get started
-_Note: the instructions in italic apply ONLY to Eclipse, if you have a different IDE, [search how to set the project up on Google](https://lmgtfy.com/?q=How+to+setup+Minecraft+Coders+Pack+in+%5BMY+IDE%5D)_
+#### Let's get started!
+_Note: the instructions in italic apply ONLY to Eclipse, if you have a different IDE, [Search how to set the project up on Google](https://lmgtfy.com/?q=How+to+setup+Minecraft+Coders+Pack+in+%5BMY+IDE%5D)_
 
 - Download [Minecraft Coders Pack 918 (1.8.8)](http://www.modcoderpack.com/files/mcp918.zip) _(or MCP)_
 - Unzip the MCP into a folder and enter it
@@ -36,46 +32,9 @@ _Note: the instructions in italic apply ONLY to Eclipse, if you have a different
 - Optionally delete the Server project (it is safe to do so)
 - _Optionally enable the @formatting tags (Window -> Preferences -> Java -> Code Style -> Formatter -> Edit -> Expand "Off/On tags" -> Tick the "Enable Off/On tags" -> Change the Profile Name (or you will not be able to save) -> OK -> Apply and Close)_
 - Change the JRE version from JRE1\_6 to JRE1\_8 _(Right click on "Client" -> Build Path -> Libraries -> Scroll to the bottom -> Double click "JRE System" -> Choose a JRE1\_8 -> Finish -> Apply and Close)_
-- Add the javaws.jar to your project buildpath (the file is located here: "JAVA_PATH\jre1.8.0_VERSION\lib\javaws.jar", where "JAVA_PATH" is where your java is installed ("C:\Program Files\Java\", or "C:\Program Files (x86)\Java\" for 64-bit computers, is the default path on Windows) and "VERSION" is the java version you have installed.
-
-------------
-
-### Features
-
-- CommandManager (with four commands, "irc", "set", "help", "bind" (added in the commit #41 / 0be34e4), "friend" and "names" (both added in the commit #78 / aa78114)
-- ModuleManager (with module settings, four example module (Fly, TestModule, Friends and NameProtect) and the "AdvancedTabGUI" module)
-- [EventManager](https://github.com/OxideWaveLength/Minecraft-Hack-BaseClient/wiki/EventManager)
-- FileManager
-- ConfigManager
-- [TabGUI](https://github.com/OxideWaveLength/Minecraft-Hack-BaseClient/wiki/Tab-GUI)
-- [Module ArrayList](https://github.com/OxideWaveLength/Minecraft-Hack-BaseClient/wiki/Modules-ArrayList-(or-%22ToggledModules%22))
-- [Hotbar Overlay](https://github.com/OxideWaveLength/Minecraft-Hack-BaseClient/wiki/Hotbar-Overlay)
-- Alt Manager (By Russian412)
-- Slick's FontManager (Edited by Russian412 and me) - Updated in the commit #77 / a0bfdf7
-- IRC Client
-- FriendsManager - manages friends and enemies. Added in the commit #95 / d5e1270 by [@evrec](https://github.com/evrec)
-- ClickGui - This is not completely finished yet, but it's working and will be completed in the future. Added in the commit #112 / 0cded5b
-
-------------
-
-### Coming Soon / TODO
-
-- ~~Better hotbar overlay~~ (Added in commit #44 / 7634127)
-- ~~Better module arraylist~~ (Added in commit #29 / 070586b!)
-- ~~Better font manager~~ (Added in commit #77 / a0bfdf7)
-- ~~Help command~~ (Done)
-- ~~Better FileManager / ConfigManager~~ (Not needed as of now)
-- Enhance some code
-- Multi Versioning! Exactly, joining 1.12 servers in 1.8.8...
-
-------------
-
-### Most Important TODOs
-
-- Create a wiki for every part of the client
-- ~~Finish all of the event handlers~~ (Done! Added in the commit #38 / a2c72e1)
-- ~~Finish the TabGui, so that the module settings can be changed from there (they can be seen already, but not changed)~~ (Done, added in the commit #55 / 26c5f09)
-
-------------
+- Add the javaws.jar to your project buildpath (the file is located here: "JAVA_PATH\jre1.8.0_VERSION\lib\javaws.jar", if you can't find it, the program should still run without it).
 
-##### Any help is highly appreciated, I cannot put all of my time into this project, but expect updates to be coming pretty soon
+#### Let's build it!
+Here are videos showing how to export your client in Eclipse:
+- [Minecraft Launcher (full tutorial)](https://www.youtube.com/watch?v=nlZKdifpoUA)
+- [MultiMC (requires JSON file)](https://www.youtube.com/watch?v=TjJz9Iisg-Y)

minecraft/me/wavelength/baseclient/BaseClient.java

@@ -4,18 +4,16 @@
 
 import org.lwjgl.opengl.Display;
 
-import com.google.common.collect.Lists;
-
 import me.wavelength.baseclient.account.AccountManager;
 import me.wavelength.baseclient.command.CommandManager;
 import me.wavelength.baseclient.event.EventManager;
 import me.wavelength.baseclient.font.Font;
 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;
 import me.wavelength.baseclient.overlay.TabGui1;
 import me.wavelength.baseclient.overlay.ToggledModules1;
 import me.wavelength.baseclient.thealtening.AltService;
@@ -34,13 +32,14 @@ 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 final String clientVersion = "0.1";
+	private String clientName = "BaseClient";
+	private String clientVersion = "0.1";
 	private final String author = "WaveLength";
 
 	public static BaseClient instance;
@@ -64,30 +63,38 @@ public class BaseClient {
 
 	private String packageBase = "me.wavelength.baseclient";
 
-	private boolean defaultHotbar = false;
-
 	private Config genericConfig;
 
 	private ClickGui clickGui;
 
 	private Locale englishLocale;
 
+	private ClassLoader loader = ClassLoader.getSystemClassLoader();
+
 	public BaseClient() {
 		instance = this;
 	}
 
 	public void initialize() {
+		instance = this;
+
+		printStartup();
+		setupShutdownHook();
+
 		Display.setTitle(String.format("%1$s - %2$s | Loading...", clientName, clientVersion));
 
 		this.englishLocale = new Locale();
 
-		this.ircClient = new IRCClient("chat.freenode.net", 6667, Minecraft.getMinecraft().getSession().getUsername(), "#WaveLengthBaseClient");
+		this.ircClient = new IRCClient("chat.freenode.net", 6667, Minecraft.getMinecraft().getSession().getUsername(),
+				"#WaveLengthBaseClient");
 
 		new GuiAltManager(); // We create the instance.
 
 		String clientFolder = new File(".").getAbsolutePath();
 
-		clientFolder = (clientFolder.contains("jars") ? new File(".").getAbsolutePath().substring(0, clientFolder.length() - 2) : new File(".").getAbsolutePath()) + Strings.getSplitter() + clientName;
+		clientFolder = (clientFolder.contains("jars")
+				? new File(".").getAbsolutePath().substring(0, clientFolder.length() - 2)
+				: new File(".").getAbsolutePath()) + Strings.getSplitter() + clientName;
 
 		String accountManagerFolder = clientFolder + Strings.getSplitter() + "alts";
 
@@ -101,19 +108,20 @@ public void initialize() {
 
 		this.friendsManager = new FriendsManager();
 
-		this.moduleManager = new ModuleManager();
 		this.commandManager = new CommandManager(".");
 
+		this.moduleManager = new ModuleManager();
+
 		commandManager.registerCommands(); // Moved here to make sure the CommandManager instance is created, else the
-											// "commandManager" variable in the Command class would be null (since we are
+											// "commandManager" variable in the Command class would be null (since we
+											// are
 											// getting the CommandManager instance from this class)
 
 		this.altService = new AltService();
 
 		switchToMojang();
 
 		this.genericConfig = new Config(new File(clientFolder + Strings.getSplitter() + "config.cfg"));
-		genericConfig.addDefault("tabguicolor", "5556190");
 
 		/** Setting a custom icon */
 
@@ -128,13 +136,12 @@ 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", "jellolight", 25, 30, 33, 50, 55);
 
 		registerHuds();
 	}
 
 	private void registerHuds() {
-		new HotbarOverlay();
 		new ToggledModules1();
 		new TabGui1();
 	}
@@ -196,10 +203,6 @@ public String getPackageBase() {
 		return packageBase;
 	}
 
-	public boolean isDefaultHotbar() {
-		return defaultHotbar;
-	}
-
 	public Config getGenericConfig() {
 		return genericConfig;
 	}
@@ -212,6 +215,18 @@ public Locale getEnglishLocale() {
 		return englishLocale;
 	}
 
+	public void setClientName(String clientName) {
+		this.clientName = clientName;
+	}
+
+	public void setClientVersion(String clientVersion) {
+		this.clientVersion = clientVersion;
+	}
+
+	public ClassLoader getLoader() {
+		return this.loader;
+	}
+
 	public void switchToMojang() {
 		try {
 			this.altService.switchService(AltService.EnumAltService.MOJANG);
@@ -232,4 +247,21 @@ public void switchToTheAltening() {
 		}
 	}
 
+	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));
+	}
+
+	public static BaseClient getInstance() {
+		return BaseClient.instance;
+	}
+
 }

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

@@ -8,16 +8,7 @@
 import org.lwjgl.input.Keyboard;
 
 import me.wavelength.baseclient.BaseClient;
-import me.wavelength.baseclient.command.commands.BindCommand;
-import me.wavelength.baseclient.command.commands.ColorCommand;
-import me.wavelength.baseclient.command.commands.FontCommand;
-import me.wavelength.baseclient.command.commands.FriendsCommand;
-import me.wavelength.baseclient.command.commands.HelpCommand;
-import me.wavelength.baseclient.command.commands.IRCCommand;
-import me.wavelength.baseclient.command.commands.NamesCommand;
-import me.wavelength.baseclient.command.commands.SetCommand;
-import me.wavelength.baseclient.command.commands.ToggleCommand;
-import me.wavelength.baseclient.command.commands.XRayCommand;
+import me.wavelength.baseclient.command.commands.*;
 import me.wavelength.baseclient.event.EventListener;
 import me.wavelength.baseclient.event.events.KeyPressedEvent;
 import me.wavelength.baseclient.event.events.MessageSentEvent;
@@ -58,12 +49,13 @@ public void registerCommands() {
 		registerCommand(new IRCCommand());
 		registerCommand(new SetCommand());
 		registerCommand(new BindCommand());
-		registerCommand(new ColorCommand());
 		registerCommand(new FriendsCommand(BaseClient.instance.getFriendsManager()));
 		registerCommand(new NamesCommand());
 		registerCommand(new XRayCommand());
+		registerCommand(new VClipCommand());
 		registerCommand(new FontCommand());
 		registerCommand(new ToggleCommand());
+		registerCommand(new ClientCommand());
 	}
 
 	public List<Command> getCommands() {
@@ -81,7 +73,8 @@ public String getHelpMessage(String command) {
 	public Command getCommand(String name) {
 		for (int i = 0; i < commands.size(); i++) {
 			Command command = commands.get(i);
-			if (command.getName().equalsIgnoreCase(name) || Arrays.stream(command.getAliases()).anyMatch(name::equalsIgnoreCase))
+			if (command.getName().equalsIgnoreCase(name)
+					|| Arrays.stream(command.getAliases()).anyMatch(name::equalsIgnoreCase))
 				return command;
 		}
 
@@ -120,10 +113,12 @@ public void onMessageSent(MessageSentEvent event) {
 				if (ircClient != null && ircClient.isActive()) {
 					try {
 						ircClient.sendMessage(ircClient.getChannel(), commandLine.substring(1));
-						Player.sendMessage(String.format("%1$s&6YOU &7(&e&o%2$s&7)&7: &e%3$s", ircClient.getPrefix(), ircClient.getUsername(), commandLine.substring(1)));
+						Player.sendMessage(String.format("%1$s&6YOU &7(&e&o%2$s&7)&7: &e%3$s", ircClient.getPrefix(),
+								ircClient.getUsername(), commandLine.substring(1)));
 					} catch (IOException e) {
 						e.printStackTrace();
-						Player.sendMessage(String.format("%1$sCan't send the chat message. (%2$s)", ircClient.getPrefix(), e.getMessage()));
+						Player.sendMessage(String.format("%1$sCan't send the chat message. (%2$s)",
+								ircClient.getPrefix(), e.getMessage()));
 					}
 					event.setCancelled(true);
 				}

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

@@ -0,0 +1,27 @@
+package me.wavelength.baseclient.command.commands;
+
+import me.wavelength.baseclient.BaseClient;
+import me.wavelength.baseclient.command.Command;
+
+public class ClientCommand extends Command {
+	public ClientCommand() {
+		super("client", "client <version|name> <value>", "Changes the client version/name");
+	}
+
+	@Override
+	public String executeCommand(String line, String[] args) {
+		if (args.length < 2)
+			return getSyntax("&c");
+
+		switch (args[0].toLowerCase()) {
+		case ("name"):
+			BaseClient.instance.setClientName(args[1]);
+			return String.format("&aThe client's name has been succesfully changed to &e%1$s&a.", args[1]);
+		case ("version"):
+			BaseClient.instance.setClientVersion(args[1]);
+			return String.format("&aThe client's version has been succesfully changed to &e%1$s&a.", args[1]);
+		default:
+			return getSyntax("&c");
+		}
+	}
+}

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

@@ -0,0 +1,20 @@
+package me.wavelength.baseclient.command.commands;
+
+import me.wavelength.baseclient.BaseClient;
+import me.wavelength.baseclient.command.Command;
+
+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]);
+	}
+}