MainScreenComponent renamed to VerboseLoader

Note: else it breaks 317 providers

parabotv2/src/org/parabot/core/classpath/ClassPath.java

@@ -26,7 +26,7 @@ import org.parabot.core.Directories;
 import org.parabot.core.asm.ClassRemapper;
 import org.parabot.core.build.BuildPath;
 import org.parabot.core.io.SizeInputStream;
-import org.parabot.core.ui.components.MainScreenComponent;
+import org.parabot.core.ui.components.VerboseLoader;
 
 /**
  * 
@@ -85,7 +85,7 @@ public class ClassPath {
 		try {
 			final int size = connection.getContentLength();
 			final SizeInputStream sizeInputStream = new SizeInputStream(
-					connection.getInputStream(), size, MainScreenComponent.get());
+					connection.getInputStream(), size, VerboseLoader.get());
 			final ZipInputStream zin = new ZipInputStream(sizeInputStream);
 			ZipEntry e;
 			while ((e = zin.getNextEntry()) != null) {
@@ -96,13 +96,13 @@ public class ClassPath {
 				} else {
 					loadResource(e.getName(), zin);
 				}
-				MainScreenComponent.setState("Downloading: " + e.getName());
+				VerboseLoader.setState("Downloading: " + e.getName());
 			}
 			zin.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		MainScreenComponent.get().onProgressUpdate(100);
+		VerboseLoader.get().onProgressUpdate(100);
 	}
 
 

parabotv2/src/org/parabot/core/forum/AccountManager.java

@@ -8,7 +8,7 @@ import org.parabot.core.Configuration;
 import org.parabot.core.Core;
 import org.parabot.core.parsers.scripts.SDNScripts;
 import org.parabot.core.parsers.servers.PublicServers;
-import org.parabot.core.ui.components.MainScreenComponent;
+import org.parabot.core.ui.components.VerboseLoader;
 import org.parabot.environment.api.utils.WebUtil;
 import org.parabot.environment.scripts.executers.SDNScriptExecuter;
 import org.parabot.environment.servers.executers.PublicServerExecuter;
@@ -39,7 +39,7 @@ public final class AccountManager {
 		Core.verbose("Initializing account manager accessors...");
 		final ArrayList<AccountManagerAccess> accessors = new ArrayList<AccountManagerAccess>();
 		accessors.add(SDNScripts.MANAGER_FETCHER);
-		accessors.add(MainScreenComponent.MANAGER_FETCHER);
+		accessors.add(VerboseLoader.MANAGER_FETCHER);
 		accessors.add(SDNScriptExecuter.MANAGER_FETCHER);
 		accessors.add(PublicServers.MANAGER_FETCHER);
 		accessors.add(PublicServerExecuter.MANAGER_FETCHER);

parabotv2/src/org/parabot/core/ui/BotUI.java

@@ -20,7 +20,7 @@ import javax.swing.JPopupMenu;
 
 import org.parabot.core.Context;
 import org.parabot.core.ui.components.GamePanel;
-import org.parabot.core.ui.components.MainScreenComponent;
+import org.parabot.core.ui.components.VerboseLoader;
 import org.parabot.core.ui.images.Images;
 import org.parabot.core.ui.utils.SwingUtil;
 import org.parabot.environment.scripts.Script;
@@ -62,7 +62,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
 		addWindowListener(this);
 
 		add(GamePanel.getInstance());
-		GamePanel.getInstance().add(MainScreenComponent.get(username, password), BorderLayout.CENTER);
+		GamePanel.getInstance().add(VerboseLoader.get(username, password), BorderLayout.CENTER);
 		
 		SwingUtil.setParabotIcons(this);
 

parabotv2/src/org/parabot/core/ui/components/ServerComponent.java

@@ -78,7 +78,7 @@ public class ServerComponent extends JPanel implements MouseListener,
 	}
 
 	public void load(final ServerDescription desc) {
-		MainScreenComponent.get().switchState(MainScreenComponent.STATE_LOADING);
+		VerboseLoader.get().switchState(VerboseLoader.STATE_LOADING);
 		new Thread(new Runnable() {
 			@Override
 			public void run() {

parabotv2/src/org/parabot/core/ui/components/VerboseLoader.java

@@ -33,9 +33,9 @@ import org.parabot.core.ui.images.Images;
  * @author Everel
  *
  */
-public class MainScreenComponent extends JPanel implements ProgressListener {
+public class VerboseLoader extends JPanel implements ProgressListener {
 	private static final long serialVersionUID = 7412412644921803896L;
-	private static MainScreenComponent current;
+	private static VerboseLoader current;
 	private static String state = "Initializing loader...";
 	
 	public static final int STATE_AUTHENTICATION = 0;
@@ -54,12 +54,12 @@ public class MainScreenComponent extends JPanel implements ProgressListener {
 
 		@Override
 		public final void setManager(AccountManager manager) {
-			MainScreenComponent.manager = manager;
+			VerboseLoader.manager = manager;
 		}
 
 	};
 
-	private MainScreenComponent(String username, String password) {
+	private VerboseLoader(String username, String password) {
 		if(current != null) {
 			throw new IllegalStateException("MainScreenComponent already made.");
 		}
@@ -205,16 +205,16 @@ public class MainScreenComponent extends JPanel implements ProgressListener {
 	 * Gets instance of this panel
 	 * @return instance of this panel
 	 */
-	public static MainScreenComponent get(String username, String password) {
+	public static VerboseLoader get(String username, String password) {
-		return current == null ? new MainScreenComponent(username, password) : current;
+		return current == null ? new VerboseLoader(username, password) : current;
 	}
 	
 	/**
 	 * Gets instance of this panel
 	 * @return instance of this panel
 	 */
-	public static MainScreenComponent get() {
+	public static VerboseLoader get() {
-		return current == null ? new MainScreenComponent(null, null) : current;
+		return current == null ? new VerboseLoader(null, null) : current;
 	}
 	
 

parabotv2/src/org/parabot/environment/Environment.java

@@ -7,7 +7,7 @@ import org.parabot.core.desc.ServerDescription;
 import org.parabot.core.lib.Library;
 import org.parabot.core.lib.javafx.JavaFX;
 import org.parabot.core.parsers.servers.ServerParser;
-import org.parabot.core.ui.components.MainScreenComponent;
+import org.parabot.core.ui.components.VerboseLoader;
 import org.parabot.environment.api.utils.WebUtil;
 
 
@@ -33,8 +33,8 @@ public class Environment {
 		for(Library lib : libs) {
 			if(!lib.hasJar()) {
 				Core.verbose("Downloading " + lib.getLibraryName() + "...");
-				MainScreenComponent.setState("Downloading " + lib.getLibraryName() + "...");
+				VerboseLoader.setState("Downloading " + lib.getLibraryName() + "...");
-				WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), MainScreenComponent.get());
+				WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get());
 				Core.verbose("Downloaded " + lib.getLibraryName() + ".");
 			}
 			Core.verbose("Initializing " + lib.getLibraryName());

parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java

@@ -9,7 +9,7 @@ import org.parabot.core.classpath.ClassPath;
 import org.parabot.core.desc.ServerProviderInfo;
 import org.parabot.core.forum.AccountManager;
 import org.parabot.core.forum.AccountManagerAccess;
-import org.parabot.core.ui.components.MainScreenComponent;
+import org.parabot.core.ui.components.VerboseLoader;
 import org.parabot.core.ui.utils.UILog;
 import org.parabot.environment.api.utils.WebUtil;
 import org.parabot.environment.servers.ServerProvider;
@@ -76,7 +76,7 @@ public class PublicServerExecuter extends ServerExecuter {
 				Core.verbose("Found cached server provider [CRC32: " + serverProviderInfo.getCRC32() + "]");
 			} else {
 				WebUtil.downloadFile(new URL(jarUrl), destination,
-						MainScreenComponent.get(), manager.getAccount().getUsername(), manager.getAccount().getPassword());
+						VerboseLoader.get(), manager.getAccount().getUsername(), manager.getAccount().getPassword());
 				Core.verbose("Server provider downloaded...");
 			}