zontreck/ACLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: organise all imports in com namespace

Browse source
This commit is contained in:
Ryan Dowling 2019-06-10 08:18:25 +10:00
parent 6fb19eb622
commit bb8d52ed2b
No known key found for this signature in database
GPG key ID: 5539FCDB88950EFD
110 changed files with 730 additions and 694 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -7,4 +7,4 @@ charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
max_line_length=120
max_line_length = 120

8
src/main/java/com/atlauncher/Gsons.java
View file

@ -17,6 +17,10 @@
*/
package com.atlauncher;
import java.awt.Color;
import java.io.File;
import java.util.Date;
import com.atlauncher.adapter.ColorTypeAdapter;
import com.atlauncher.data.mojang.DateTypeAdapter;
import com.atlauncher.data.mojang.Downloads;
@ -30,10 +34,6 @@ import com.atlauncher.data.mojang.MojangStatusTypeAdapter;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.awt.Color;
import java.io.File;
import java.util.Date;
public final class Gsons {
public static final Gson DEFAULT = new GsonBuilder().setPrettyPrinting().create();

10
src/main/java/com/atlauncher/LogManager.java
View file

@ -17,16 +17,16 @@
*/
package com.atlauncher;
import com.atlauncher.evnt.LogEvent;
import com.atlauncher.evnt.LogEvent.LogType;
import com.atlauncher.thread.LoggingThread;
import com.atlauncher.utils.Utils;
import java.io.CharArrayWriter;
import java.io.PrintWriter;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import com.atlauncher.evnt.LogEvent;
import com.atlauncher.evnt.LogEvent.LogType;
import com.atlauncher.thread.LoggingThread;
import com.atlauncher.utils.Utils;
public final class LogManager {
private static final BlockingQueue<LogEvent> queue = new ArrayBlockingQueue<LogEvent>(128);
public static boolean showDebug = false;

6
src/main/java/com/atlauncher/Update.java
View file

@ -17,13 +17,13 @@
*/
package com.atlauncher;
import com.atlauncher.utils.Utils;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import com.atlauncher.utils.Utils;
public class Update {
public static void main(String[] args) {
String launcherPath = args[0];
@ -60,4 +60,4 @@ public class Update {
e.printStackTrace();
}
}
}
}

6
src/main/java/com/atlauncher/adapter/ColorTypeAdapter.java
View file

@ -17,14 +17,14 @@
*/
package com.atlauncher.adapter;
import java.awt.Color;
import java.io.IOException;
import com.google.gson.JsonParseException;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import java.awt.Color;
import java.io.IOException;
/**
* This class will ensure that colors are serialized to a hex value for easy editing
*/

43
src/main/java/com/atlauncher/data/Account.java
View file

@ -17,27 +17,6 @@
*/
package com.atlauncher.data;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.mojang.api.MinecraftProfileResponse;
import com.atlauncher.data.mojang.api.ProfileTexture;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.gui.tabs.InstancesTab;
import com.atlauncher.gui.tabs.PacksTab;
import com.atlauncher.utils.Authentication;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.MojangAPIUtils;
import com.atlauncher.utils.Utils;
import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
import com.mojang.util.UUIDTypeAdapter;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
import java.awt.BorderLayout;
import java.awt.Graphics;
import java.awt.Image;
@ -56,6 +35,28 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.mojang.api.MinecraftProfileResponse;
import com.atlauncher.data.mojang.api.ProfileTexture;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.gui.tabs.InstancesTab;
import com.atlauncher.gui.tabs.PacksTab;
import com.atlauncher.utils.Authentication;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.MojangAPIUtils;
import com.atlauncher.utils.Utils;
import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
import com.mojang.util.UUIDTypeAdapter;
/**
* This class deals with the Accounts in the launcher.
*/

8
src/main/java/com/atlauncher/data/DisableableMod.java
View file

@ -17,10 +17,6 @@
*/
package com.atlauncher.data;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
import java.awt.Color;
import java.io.File;
import java.io.FileInputStream;
@ -31,6 +27,10 @@ import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
public class DisableableMod implements Serializable {
private static final long serialVersionUID = 8429405767313518704L;
private String name;

10
src/main/java/com/atlauncher/data/Downloadable.java
View file

@ -17,11 +17,6 @@
*/
package com.atlauncher.data;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@ -35,6 +30,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPInputStream;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
public class Downloadable {
private String beforeURL;
protected String url;

4
src/main/java/com/atlauncher/data/DownloadableFile.java
View file

@ -17,10 +17,10 @@
*/
package com.atlauncher.data;
import com.atlauncher.App;
import java.io.File;
import com.atlauncher.App;
public class DownloadableFile {
private String name;
private String folder;

27
src/main/java/com/atlauncher/data/DropboxSync.java
View file

@ -17,19 +17,6 @@
*/
package com.atlauncher.data;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.gui.components.CollapsiblePanel;
import com.atlauncher.utils.Base64;
import com.atlauncher.utils.Utils;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.SwingConstants;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -40,6 +27,20 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.SwingConstants;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.gui.components.CollapsiblePanel;
import com.atlauncher.utils.Base64;
import com.atlauncher.utils.Utils;
/**
* @author Kihira
*/

4
src/main/java/com/atlauncher/data/ForgeXzDownloadable.java
View file

@ -17,11 +17,11 @@
*/
package com.atlauncher.data;
import java.io.File;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import java.io.File;
public class ForgeXzDownloadable extends HashableDownloadable {
private File packXzFile;
private File packFile;

13
src/main/java/com/atlauncher/data/HashableDownloadable.java
View file

@ -17,13 +17,6 @@
*/
package com.atlauncher.data;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import com.google.gson.reflect.TypeToken;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
@ -33,6 +26,12 @@ import java.net.HttpURLConnection;
import java.util.HashMap;
import java.util.Map;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import com.google.gson.reflect.TypeToken;
public class HashableDownloadable extends Downloadable {
public HashableDownloadable(String url, File file, InstanceInstaller instanceInstaller, File copyTo) {
super(url, file, null, -1, instanceInstaller, false, copyTo, copyTo != null ? true : false);

3
src/main/java/com/atlauncher/data/Instance.java
View file

@ -41,13 +41,12 @@ import com.atlauncher.LogManager;
import com.atlauncher.data.json.Java;
import com.atlauncher.data.mojang.LoggingClient;
import com.atlauncher.data.openmods.OpenEyeReportResponse;
import com.atlauncher.exceptions.InvalidMinecraftVersion;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.mclauncher.MCLauncher;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import com.atlauncher.exceptions.InvalidMinecraftVersion;
/**
* This class handles contains information about a single Instance in the
* Launcher. An Instance being an installed version of a ModPack separate to

6
src/main/java/com/atlauncher/data/MinecraftError.java
View file

@ -17,13 +17,11 @@
*/
package com.atlauncher.data;
import javax.swing.JOptionPane;
import com.atlauncher.App;
import com.atlauncher.utils.HTMLUtils;
import java.io.File;
import javax.swing.JOptionPane;
public class MinecraftError {
static final int OUT_OF_MEMORY = 1;
static final int CONCURRENT_MODIFICATION_ERROR_1_6 = 2;

7
src/main/java/com/atlauncher/data/MinecraftServer.java
View file

@ -17,13 +17,14 @@
*/
package com.atlauncher.data;
import java.text.DecimalFormat;
import java.util.List;
import com.atlauncher.App;
import com.atlauncher.utils.MCQuery;
import com.google.gson.reflect.TypeToken;
import de.zh32.pingtest.QueryVersion;
import java.text.DecimalFormat;
import java.util.List;
import de.zh32.pingtest.QueryVersion;
public class MinecraftServer {
/**

15
src/main/java/com/atlauncher/data/Pack.java
View file

@ -17,13 +17,6 @@
*/
package com.atlauncher.data;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.json.Version;
import com.atlauncher.utils.Utils;
import javax.swing.ImageIcon;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@ -31,6 +24,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.swing.ImageIcon;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.json.Version;
import com.atlauncher.utils.Utils;
public class Pack {
private int id;
private int position;

6
src/main/java/com/atlauncher/data/PackUsers.java
View file

@ -17,13 +17,13 @@
*/
package com.atlauncher.data;
import java.util.List;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
import com.atlauncher.exceptions.InvalidPack;
import java.util.List;
@Json
public class PackUsers {
private int pack;
@ -45,4 +45,4 @@ public class PackUsers {
pack.addAllowedPlayers(allowedPlayers);
}
}
}
}

2
src/main/java/com/atlauncher/data/Settings.java
View file

@ -49,7 +49,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -82,7 +81,6 @@ import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.MojangAPIUtils;
import com.atlauncher.utils.Timestamper;
import com.atlauncher.utils.Utils;
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;
import com.google.gson.reflect.TypeToken;

4
src/main/java/com/atlauncher/data/SyncAbstract.java
View file

@ -17,12 +17,12 @@
*/
package com.atlauncher.data;
import com.atlauncher.gui.components.CollapsiblePanel;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import com.atlauncher.gui.components.CollapsiblePanel;
/**
* Extend this class if you wish to add a backup/sync method. You will need to track any backups you make yourself.
*

8
src/main/java/com/atlauncher/data/json/Action.java
View file

@ -17,13 +17,13 @@
*/
package com.atlauncher.data.json;
import java.io.File;
import java.util.List;
import com.atlauncher.annot.Json;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import java.io.File;
import java.util.List;
@Json
public class Action {
private List<String> mod;
@ -124,4 +124,4 @@ public class Action {
}
}
}
}
}

6
src/main/java/com/atlauncher/data/json/Deletes.java
View file

@ -17,10 +17,10 @@
*/
package com.atlauncher.data.json;
import com.atlauncher.annot.Json;
import java.util.List;
import com.atlauncher.annot.Json;
@Json
public class Deletes {
private List<Delete> files;
@ -33,4 +33,4 @@ public class Deletes {
public List<Delete> getFolders() {
return this.folders;
}
}
}

4
src/main/java/com/atlauncher/data/json/Library.java
View file

@ -17,11 +17,11 @@
*/
package com.atlauncher.data.json;
import java.io.File;
import com.atlauncher.App;
import com.atlauncher.annot.Json;
import java.io.File;
@Json
public class Library {
private String url;

6
src/main/java/com/atlauncher/data/json/Loader.java
View file

@ -17,12 +17,12 @@
*/
package com.atlauncher.data.json;
import com.atlauncher.annot.Json;
import com.atlauncher.workers.InstanceInstaller;
import java.io.File;
import java.util.Map;
import com.atlauncher.annot.Json;
import com.atlauncher.workers.InstanceInstaller;
@Json
public class Loader {
private String type;

10
src/main/java/com/atlauncher/data/json/Messages.java
View file

@ -17,17 +17,17 @@
*/
package com.atlauncher.data.json;
import javax.swing.JEditorPane;
import javax.swing.JOptionPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import com.atlauncher.App;
import com.atlauncher.annot.Json;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
import com.atlauncher.utils.Utils;
import javax.swing.JEditorPane;
import javax.swing.JOptionPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
@Json
public class Messages {
private String install;

13
src/main/java/com/atlauncher/data/json/Mod.java
View file

@ -17,6 +17,13 @@
*/
package com.atlauncher.data.json;
import java.awt.Color;
import java.io.File;
import java.io.FilenameFilter;
import java.util.List;
import javax.swing.JOptionPane;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
@ -26,12 +33,6 @@ import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import javax.swing.JOptionPane;
import java.awt.Color;
import java.io.File;
import java.io.FilenameFilter;
import java.util.List;
@Json
public class Mod {
private String name;

6
src/main/java/com/atlauncher/data/json/Version.java
View file

@ -17,15 +17,15 @@
*/
package com.atlauncher.data.json;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
import java.awt.Color;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
/**
* This class contains information about a pack's version. This is a singular
* version and contains all the information necessary to install the pack.

2
src/main/java/com/atlauncher/data/loaders/Loader.java
View file

@ -17,9 +17,9 @@
*/
package com.atlauncher.data.loaders;
import java.io.File;
import java.util.List;
import java.util.Map;
import java.io.File;
import com.atlauncher.data.Downloadable;
import com.atlauncher.workers.InstanceInstaller;

4
src/main/java/com/atlauncher/data/loaders/fabric/FabricInstallProfile.java
View file

@ -17,11 +17,11 @@
*/
package com.atlauncher.data.loaders.fabric;
import com.atlauncher.annot.Json;
import java.util.List;
import java.util.Map;
import com.atlauncher.annot.Json;
@Json
public class FabricInstallProfile {
private Map<String, List<String>> arguments;

13
src/main/java/com/atlauncher/data/loaders/fabric/FabricLoader.java
View file

@ -31,13 +31,6 @@ import java.util.Map;
import javax.xml.parsers.DocumentBuilderFactory;
import com.google.gson.reflect.TypeToken;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
@ -46,6 +39,12 @@ import com.atlauncher.data.HashableDownloadable;
import com.atlauncher.data.loaders.Loader;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import com.google.gson.reflect.TypeToken;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
public class FabricLoader implements Loader {
protected String yarn;

4
src/main/java/com/atlauncher/data/loaders/forge/DownloadsTypeAdapter.java
View file

@ -17,6 +17,8 @@
*/
package com.atlauncher.data.loaders.forge;
import java.lang.reflect.Type;
import com.atlauncher.Gsons;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
@ -24,8 +26,6 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
public class DownloadsTypeAdapter implements JsonDeserializer<Downloads> {
@Override
public Downloads deserialize(JsonElement json, Type type, JsonDeserializationContext context)

10
src/main/java/com/atlauncher/data/loaders/forge/Forge113Loader.java
View file

@ -17,23 +17,17 @@
*/
package com.atlauncher.data.loaders.forge;
import java.util.List;
import java.util.ArrayList;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.Downloadable;
import com.atlauncher.data.loaders.forge.Data;
import com.atlauncher.data.loaders.forge.DownloadsItem;
import com.atlauncher.data.loaders.forge.ForgeInstallProfile;
import com.atlauncher.data.loaders.forge.Version;
import com.atlauncher.data.loaders.forge.Library;
import com.atlauncher.data.loaders.forge.Processor;
import com.atlauncher.utils.Utils;
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;

4
src/main/java/com/atlauncher/data/loaders/forge/ForgeInstallProfile.java
View file

@ -17,11 +17,11 @@
*/
package com.atlauncher.data.loaders.forge;
import com.atlauncher.annot.Json;
import java.util.List;
import java.util.Map;
import com.atlauncher.annot.Json;
@Json
public class ForgeInstallProfile {
private String version;

4
src/main/java/com/atlauncher/data/loaders/forge/Version.java
View file

@ -17,11 +17,11 @@
*/
package com.atlauncher.data.loaders.forge;
import com.atlauncher.annot.Json;
import java.util.List;
import java.util.Map;
import com.atlauncher.annot.Json;
@Json
public class Version {
private String id;

1
src/main/java/com/atlauncher/data/mojang/ArgumentRule.java
View file

@ -18,6 +18,7 @@
package com.atlauncher.data.mojang;
import java.util.List;
import com.atlauncher.annot.Json;
@Json

4
src/main/java/com/atlauncher/data/mojang/AssetObject.java
View file

@ -17,10 +17,10 @@
*/
package com.atlauncher.data.mojang;
import com.atlauncher.utils.Utils;
import java.io.File;
import com.atlauncher.utils.Utils;
public class AssetObject {
private String hash;
private long size;

16
src/main/java/com/atlauncher/data/mojang/DateTypeAdapter.java
View file

@ -17,6 +17,13 @@
*/
package com.atlauncher.data.mojang;
import java.lang.reflect.Type;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
@ -26,13 +33,6 @@ import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.google.gson.JsonSyntaxException;
import java.lang.reflect.Type;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
public class DateTypeAdapter implements JsonDeserializer<Date>, JsonSerializer<Date> {
private final DateFormat enUsFormat = DateFormat.getDateTimeInstance(2, 2, Locale.US);
private final DateFormat iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
@ -71,4 +71,4 @@ public class DateTypeAdapter implements JsonDeserializer<Date>, JsonSerializer<D
return new JsonPrimitive(ret.substring(0, 22) + ":" + ret.substring(22));
}
}
}
}

13
src/main/java/com/atlauncher/data/mojang/DownloadsTypeAdapter.java
View file

@ -17,20 +17,19 @@
*/
package com.atlauncher.data.mojang;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.atlauncher.Gsons;
import com.atlauncher.data.mojang.Downloads;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
public class DownloadsTypeAdapter implements JsonDeserializer<Downloads> {
@Override
public Downloads deserialize(JsonElement json, Type type, JsonDeserializationContext context)

10
src/main/java/com/atlauncher/data/mojang/EnumTypeAdapterFactory.java
View file

@ -17,6 +17,11 @@
*/
package com.atlauncher.data.mojang;
import java.io.IOException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
@ -25,11 +30,6 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
public class EnumTypeAdapterFactory implements TypeAdapterFactory {
@SuppressWarnings("unchecked")

8
src/main/java/com/atlauncher/data/mojang/FileTypeAdapter.java
View file

@ -17,13 +17,13 @@
*/
package com.atlauncher.data.mojang;
import java.io.File;
import java.io.IOException;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import java.io.File;
import java.io.IOException;
public class FileTypeAdapter extends TypeAdapter<File> {
@Override
@ -43,4 +43,4 @@ public class FileTypeAdapter extends TypeAdapter<File> {
json.value(value.getAbsolutePath());
}
}
}
}

6
src/main/java/com/atlauncher/data/mojang/Library.java
View file

@ -17,13 +17,13 @@
*/
package com.atlauncher.data.mojang;
import com.atlauncher.App;
import com.atlauncher.utils.Utils;
import java.io.File;
import java.util.List;
import java.util.Map;
import com.atlauncher.App;
import com.atlauncher.utils.Utils;
public class Library {
private String name;

1
src/main/java/com/atlauncher/data/mojang/MojangArguments.java
View file

@ -18,6 +18,7 @@
package com.atlauncher.data.mojang;
import java.util.List;
import com.atlauncher.annot.Json;
@Json

10
src/main/java/com/atlauncher/data/mojang/MojangArgumentsTypeAdapter.java
View file

@ -17,9 +17,11 @@
*/
package com.atlauncher.data.mojang;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import com.atlauncher.Gsons;
import com.atlauncher.data.mojang.ArgumentRule;
import com.atlauncher.data.mojang.MojangArguments;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
@ -27,10 +29,6 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
public class MojangArgumentsTypeAdapter implements JsonDeserializer<MojangArguments> {
@Override
public MojangArguments deserialize(JsonElement json, Type type, JsonDeserializationContext context)

4
src/main/java/com/atlauncher/data/mojang/MojangVersion.java
View file

@ -17,10 +17,10 @@
*/
package com.atlauncher.data.mojang;
import com.atlauncher.annot.Json;
import java.util.List;
import com.atlauncher.annot.Json;
@Json
public class MojangVersion {
private String id;

4
src/main/java/com/atlauncher/data/mojang/PropertyMapSerializer.java
View file

@ -17,6 +17,8 @@
*/
package com.atlauncher.data.mojang;
import java.lang.reflect.Type;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@ -25,8 +27,6 @@ import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.mojang.authlib.properties.PropertyMap;
import java.lang.reflect.Type;
public class PropertyMapSerializer implements JsonSerializer<PropertyMap> {
@Override

6
src/main/java/com/atlauncher/data/mojang/api/MinecraftProfileResponse.java
View file

@ -17,12 +17,12 @@
*/
package com.atlauncher.data.mojang.api;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
import java.io.IOException;
import java.util.List;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
@Json
public class MinecraftProfileResponse {
private String id;

4
src/main/java/com/atlauncher/data/mojang/api/UserProperty.java
View file

@ -17,11 +17,11 @@
*/
package com.atlauncher.data.mojang.api;
import java.util.Map;
import com.atlauncher.LogManager;
import com.atlauncher.annot.Json;
import java.util.Map;
@Json
public class UserProperty {
private long timestamp;

4
src/main/java/com/atlauncher/data/mojang/api/UserPropertyRaw.java
View file

@ -17,12 +17,12 @@
*/
package com.atlauncher.data.mojang.api;
import java.io.IOException;
import com.atlauncher.Gsons;
import com.atlauncher.annot.Json;
import com.atlauncher.utils.Base64;
import java.io.IOException;
@Json
public class UserPropertyRaw {
private String name;

8
src/main/java/com/atlauncher/evnt/LogEvent.java
View file

@ -17,15 +17,15 @@
*/
package com.atlauncher.evnt;
import java.awt.Color;
import java.io.IOException;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.gui.components.Console;
import com.atlauncher.utils.Timestamper;
import com.atlauncher.writer.LogEventWriter;
import java.awt.Color;
import java.io.IOException;
public final class LogEvent {
public static final int CONSOLE = 0xA;
public static final int FILE = 0xB;
@ -90,4 +90,4 @@ public final class LogEvent {
}
}
}
}

7
src/main/java/com/atlauncher/evnt/manager/ConsoleCloseManager.java
View file

@ -17,12 +17,13 @@
*/
package com.atlauncher.evnt.manager;
import com.atlauncher.evnt.listener.ConsoleCloseListener;
import javax.swing.SwingUtilities;
import java.util.LinkedList;
import java.util.List;
import javax.swing.SwingUtilities;
import com.atlauncher.evnt.listener.ConsoleCloseListener;
public final class ConsoleCloseManager {
private static final List<ConsoleCloseListener> listeners = new LinkedList<ConsoleCloseListener>();

9
src/main/java/com/atlauncher/evnt/manager/ConsoleOpenManager.java
View file

@ -17,12 +17,13 @@
*/
package com.atlauncher.evnt.manager;
import com.atlauncher.evnt.listener.ConsoleOpenListener;
import javax.swing.SwingUtilities;
import java.util.LinkedList;
import java.util.List;
import javax.swing.SwingUtilities;
import com.atlauncher.evnt.listener.ConsoleOpenListener;
public final class ConsoleOpenManager {
private static final List<ConsoleOpenListener> listeners = new LinkedList<ConsoleOpenListener>();
@ -44,4 +45,4 @@ public final class ConsoleOpenManager {
}
});
}
}
}

7
src/main/java/com/atlauncher/evnt/manager/RelocalizationManager.java
View file

@ -17,12 +17,13 @@
*/
package com.atlauncher.evnt.manager;
import com.atlauncher.evnt.listener.RelocalizationListener;
import javax.swing.SwingUtilities;
import java.util.LinkedList;
import java.util.List;
import javax.swing.SwingUtilities;
import com.atlauncher.evnt.listener.RelocalizationListener;
public final class RelocalizationManager {
private static final List<RelocalizationListener> listeners = new LinkedList<RelocalizationListener>();

9
src/main/java/com/atlauncher/evnt/manager/ReskinManager.java
View file

@ -17,12 +17,13 @@
*/
package com.atlauncher.evnt.manager;
import com.atlauncher.evnt.listener.ReskinListener;
import javax.swing.SwingUtilities;
import java.util.LinkedList;
import java.util.List;
import javax.swing.SwingUtilities;
import com.atlauncher.evnt.listener.ReskinListener;
@Deprecated
public final class ReskinManager {
private static final List<ReskinListener> listeners = new LinkedList<ReskinListener>();
@ -41,4 +42,4 @@ public final class ReskinManager {
}
});
}
}
}

7
src/main/java/com/atlauncher/evnt/manager/SettingsManager.java
View file

@ -17,12 +17,13 @@
*/
package com.atlauncher.evnt.manager;
import com.atlauncher.evnt.listener.SettingsListener;
import javax.swing.SwingUtilities;
import java.util.LinkedList;
import java.util.List;
import javax.swing.SwingUtilities;
import com.atlauncher.evnt.listener.SettingsListener;
public final class SettingsManager {
private static final List<SettingsListener> listeners = new LinkedList<SettingsListener>();

7
src/main/java/com/atlauncher/evnt/manager/TabChangeManager.java
View file

@ -17,12 +17,13 @@
*/
package com.atlauncher.evnt.manager;
import com.atlauncher.evnt.listener.TabChangeListener;
import javax.swing.SwingUtilities;
import java.util.LinkedList;
import java.util.List;
import javax.swing.SwingUtilities;
import com.atlauncher.evnt.listener.TabChangeListener;
public final class TabChangeManager {
private static final List<TabChangeListener> listeners = new LinkedList<TabChangeListener>();

7
src/main/java/com/atlauncher/gui/AccountsDropDownRenderer.java
View file

@ -17,14 +17,15 @@
*/
package com.atlauncher.gui;
import com.atlauncher.data.Account;
import java.awt.Component;
import java.awt.Dimension;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.ListCellRenderer;
import java.awt.Component;
import java.awt.Dimension;
import com.atlauncher.data.Account;
@SuppressWarnings("serial")
public class AccountsDropDownRenderer extends JLabel implements ListCellRenderer<Account> {

3
src/main/java/com/atlauncher/gui/CustomLineBorder.java
View file

@ -17,11 +17,12 @@
*/
package com.atlauncher.gui;
import javax.swing.border.LineBorder;
import java.awt.Color;
import java.awt.Component;
import java.awt.Insets;
import javax.swing.border.LineBorder;
public class CustomLineBorder extends LineBorder {
private int insets = 0;

31
src/main/java/com/atlauncher/gui/LauncherConsole.java
View file

@ -17,6 +17,21 @@
*/
package com.atlauncher.gui;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JFrame;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Constants;
@ -29,20 +44,6 @@ import com.atlauncher.gui.components.Console;
import com.atlauncher.gui.components.ConsoleBottomBar;
import com.atlauncher.utils.Utils;
import javax.swing.JFrame;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class LauncherConsole extends JFrame implements RelocalizationListener {
private static final long serialVersionUID = -3538990021922025818L;
@ -143,4 +144,4 @@ public class LauncherConsole extends JFrame implements RelocalizationListener {
copy.setText(Language.INSTANCE.localize("common.copy"));
bottomBar.setupLanguage();
}
}
}

23
src/main/java/com/atlauncher/gui/LauncherFrame.java
View file

@ -17,6 +17,18 @@
*/
package com.atlauncher.gui;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.Arrays;
import java.util.List;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Constants;
@ -36,17 +48,6 @@ import com.atlauncher.gui.tabs.Tab;
import com.atlauncher.gui.tabs.ToolsTab;
import com.atlauncher.utils.Utils;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.Arrays;
import java.util.List;
@SuppressWarnings("serial")
public final class LauncherFrame extends JFrame implements RelocalizationListener {
private JTabbedPane tabbedPane;

15
src/main/java/com/atlauncher/gui/SplashScreen.java
View file

@ -17,12 +17,6 @@
*/
package com.atlauncher.gui;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JWindow;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -30,6 +24,13 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JWindow;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
/**
* The splash screen which shows when the launcher is started up and is loading it's stuff.
*/
@ -83,4 +84,4 @@ public class SplashScreen extends JWindow {
this.add(this.FORCE_QUIT);
}
}
}
}

15
src/main/java/com/atlauncher/gui/TrayMenu.java
View file

@ -17,6 +17,14 @@
*/
package com.atlauncher.gui;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.ConsoleCloseListener;
@ -27,13 +35,6 @@ import com.atlauncher.evnt.manager.ConsoleOpenManager;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.utils.HTMLUtils;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public final class TrayMenu extends JPopupMenu implements RelocalizationListener, ConsoleCloseListener,
ConsoleOpenListener {

2
src/main/java/com/atlauncher/gui/card/InstanceCard.java
View file

@ -63,8 +63,8 @@ import com.atlauncher.gui.components.CollapsiblePanel;
import com.atlauncher.gui.components.ImagePanel;
import com.atlauncher.gui.dialogs.BackupDialog;
import com.atlauncher.gui.dialogs.EditModsDialog;
import com.atlauncher.gui.dialogs.InstanceSettingsDialog;
import com.atlauncher.gui.dialogs.InstanceInstallerDialog;
import com.atlauncher.gui.dialogs.InstanceSettingsDialog;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.gui.dialogs.RenameInstanceDialog;
import com.atlauncher.utils.HTMLUtils;

21
src/main/java/com/atlauncher/gui/card/NilCard.java
View file

@ -17,22 +17,23 @@
*/
package com.atlauncher.gui.card;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.ImagePanel;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.Font;
import java.awt.Image;
import java.io.File;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import javax.swing.border.TitledBorder;
import java.awt.BorderLayout;
import java.awt.Font;
import java.awt.Image;
import java.io.File;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.ImagePanel;
import com.atlauncher.utils.Utils;
/**
* Class for displaying packs in the Pack Tab.

27
src/main/java/com/atlauncher/gui/card/PackCard.java
View file

@ -17,6 +17,19 @@
*/
package com.atlauncher.gui.card;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
@ -28,18 +41,6 @@ import com.atlauncher.gui.dialogs.InstanceInstallerDialog;
import com.atlauncher.gui.dialogs.ViewModsDialog;
import com.atlauncher.utils.Utils;
import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* Class for displaying packs in the Pack Tab
*
@ -206,4 +207,4 @@ public class PackCard extends CollapsiblePanel implements RelocalizationListener
this.modsButton.setText(Language.INSTANCE.localize("pack.viewmods"));
this.removePackButton.setText(Language.INSTANCE.localize("pack.removepack"));
}
}
}

13
src/main/java/com/atlauncher/gui/components/AbstractToolPanel.java
View file

@ -17,14 +17,15 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.Font;
import javax.swing.JButton;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Font;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
public abstract class AbstractToolPanel extends JPanel {
/**
@ -46,4 +47,4 @@ public abstract class AbstractToolPanel extends JPanel {
add(MIDDLE_PANEL, BorderLayout.CENTER);
add(BOTTOM_PANEL, BorderLayout.SOUTH);
}
}
}

15
src/main/java/com/atlauncher/gui/components/BottomBar.java
View file

@ -17,18 +17,19 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JPanel;
import com.atlauncher.LogManager;
import com.atlauncher.utils.Utils;
public abstract class BottomBar extends JPanel {
private static final long serialVersionUID = -7488195680365431776L;
@ -94,4 +95,4 @@ public abstract class BottomBar extends JPanel {
}
});
}
}
}

33
src/main/java/com/atlauncher/gui/components/CollapsiblePanel.java
View file

@ -17,22 +17,6 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Pack;
import com.atlauncher.utils.Utils;
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@ -47,6 +31,23 @@ import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Pack;
import com.atlauncher.utils.Utils;
/**
* TODO: Rewrite this for easier OOP
* <p/>

5
src/main/java/com/atlauncher/gui/components/ImagePanel.java
View file

@ -17,13 +17,14 @@
*/
package com.atlauncher.gui.components;
import javax.swing.JPanel;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import javax.swing.JPanel;
public final class ImagePanel extends JPanel {
private static final Cursor HAND = new Cursor(Cursor.HAND_CURSOR);
@ -45,4 +46,4 @@ public final class ImagePanel extends JPanel {
Graphics2D g2 = (Graphics2D) g;
g2.drawImage(this.image, 0, (this.getHeight() - 150) / 2, 300, 150, null);
}
}
}

6
src/main/java/com/atlauncher/gui/components/JLabelWithHover.java
View file

@ -17,14 +17,14 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.App;
import com.atlauncher.gui.CustomLineBorder;
import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JToolTip;
import javax.swing.border.Border;
import com.atlauncher.App;
import com.atlauncher.gui.CustomLineBorder;
public class JLabelWithHover extends JLabel {
private static final long serialVersionUID = -4371080285355832166L;
private static final Border HOVER_BORDER = new CustomLineBorder(5, App.THEME.getHoverBorderColor(), 2);

35
src/main/java/com/atlauncher/gui/components/LauncherBottomBar.java
View file

@ -17,6 +17,24 @@
*/
package com.atlauncher.gui.components;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JToolTip;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import com.atlauncher.App;
import com.atlauncher.data.Account;
import com.atlauncher.data.Language;
@ -33,23 +51,6 @@ import com.atlauncher.gui.dialogs.GithubIssueReporterDialog;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.utils.Utils;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JToolTip;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
/**
* TODO: Rewrite with the other @link BottomBar classes
*/

15
src/main/java/com/atlauncher/gui/components/LogClearerToolPanel.java
View file

@ -17,16 +17,17 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.border.BevelBorder;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
public class LogClearerToolPanel extends AbstractToolPanel implements ActionListener {
/**
@ -54,4 +55,4 @@ public class LogClearerToolPanel extends AbstractToolPanel implements ActionList
App.settings.clearAllLogs();
}
}
}
}

8
src/main/java/com/atlauncher/gui/components/ModsJCheckBox.java
View file

@ -17,6 +17,10 @@
*/
package com.atlauncher.gui.components;
import javax.swing.JCheckBox;
import javax.swing.JToolTip;
import javax.swing.border.Border;
import com.atlauncher.App;
import com.atlauncher.data.DisableableMod;
import com.atlauncher.data.json.Mod;
@ -25,10 +29,6 @@ import com.atlauncher.gui.dialogs.EditModsDialog;
import com.atlauncher.gui.dialogs.ModsChooser;
import com.atlauncher.utils.Utils;
import javax.swing.JCheckBox;
import javax.swing.JToolTip;
import javax.swing.border.Border;
/**
* This class extends {@link JCheckBox} and overrides the need to use JCheckBox in the {@link ModsChooser}, {@link
* ModsChooser} and {@link EditModsDialog}, providing specific functionality for those two components. Mainly providing

17
src/main/java/com/atlauncher/gui/components/NetworkCheckerToolPanel.java
View file

@ -17,6 +17,15 @@
*/
package com.atlauncher.gui.components;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.border.BevelBorder;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Constants;
@ -29,14 +38,6 @@ import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.border.BevelBorder;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
public class NetworkCheckerToolPanel extends AbstractToolPanel implements ActionListener, SettingsListener {
/**
* Auto generated serial.

13
src/main/java/com/atlauncher/gui/components/PackImagePanel.java
View file

@ -17,17 +17,18 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
import javax.swing.JPanel;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import javax.swing.JPanel;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
public final class PackImagePanel extends JPanel {
private final Image image;
private final Pack pack;
@ -70,4 +71,4 @@ public final class PackImagePanel extends JPanel {
g2.drawString(text, 5, y + g2.getFontMetrics().getHeight());
}
}
}
}

11
src/main/java/com/atlauncher/gui/components/SMButton.java
View file

@ -17,16 +17,17 @@
*/
package com.atlauncher.gui.components;
import com.atlauncher.App;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.utils.Utils;
import java.awt.Cursor;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JToolTip;
import javax.swing.border.Border;
import java.awt.Cursor;
import com.atlauncher.App;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.utils.Utils;
public class SMButton extends JButton {
private static final Cursor hand = new Cursor(Cursor.HAND_CURSOR);
@ -49,4 +50,4 @@ public class SMButton extends JButton {
tip.setBorder(border);
return tip;
}
}
}

15
src/main/java/com/atlauncher/gui/components/ServerCheckerToolPanel.java
View file

@ -17,6 +17,13 @@
*/
package com.atlauncher.gui.components;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.border.BevelBorder;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.SettingsListener;
@ -25,12 +32,6 @@ import com.atlauncher.gui.dialogs.ServerListForCheckerDialog;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.border.BevelBorder;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class ServerCheckerToolPanel extends AbstractToolPanel implements ActionListener, SettingsListener {
/**
* Auto generated serial.
@ -68,4 +69,4 @@ public class ServerCheckerToolPanel extends AbstractToolPanel implements ActionL
public void onSettingsSaved() {
this.checkLaunchButtonEnabled();
}
}
}

5
src/main/java/com/atlauncher/gui/components/ToolsPanel.java
View file

@ -17,9 +17,10 @@
*/
package com.atlauncher.gui.components;
import java.awt.FlowLayout;
import javax.swing.JButton;
import javax.swing.JPanel;
import java.awt.FlowLayout;
public final class ToolsPanel extends JPanel {
/**
@ -35,4 +36,4 @@ public final class ToolsPanel extends JPanel {
super.add(button);
return this;
}
}
}

28
src/main/java/com/atlauncher/gui/dialogs/AddEditServerForCheckerDialog.java
View file

@ -17,12 +17,12 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.MinecraftServer;
import com.atlauncher.utils.MCQuery;
import com.atlauncher.utils.Utils;
import de.zh32.pingtest.QueryVersion;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JDialog;
@ -31,12 +31,14 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.MinecraftServer;
import com.atlauncher.utils.MCQuery;
import com.atlauncher.utils.Utils;
import de.zh32.pingtest.QueryVersion;
public class AddEditServerForCheckerDialog extends JDialog implements ActionListener {
/**
@ -212,4 +214,4 @@ public class AddEditServerForCheckerDialog extends JDialog implements ActionList
dispose();
}
}
}

23
src/main/java/com/atlauncher/gui/dialogs/AddPackDialog.java
View file

@ -17,17 +17,6 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
@ -37,6 +26,18 @@ import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
public class AddPackDialog extends JDialog {
private JPanel top;
private JPanel middle;

47
src/main/java/com/atlauncher/gui/dialogs/BackupDialog.java
View file

@ -17,13 +17,22 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.data.SyncAbstract;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.gui.components.CollapsiblePanel;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
@ -46,22 +55,14 @@ import javax.swing.border.BevelBorder;
import javax.swing.border.Border;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.data.SyncAbstract;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.gui.components.CollapsiblePanel;
import com.atlauncher.utils.Utils;
/**
* @author Kihira

27
src/main/java/com/atlauncher/gui/dialogs/FileChooserDialog.java
View file

@ -17,19 +17,6 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.filechooser.FileFilter;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
@ -41,6 +28,20 @@ import java.awt.event.WindowEvent;
import java.io.File;
import java.util.ArrayList;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.filechooser.FileFilter;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
public class FileChooserDialog extends JDialog {
private JPanel top;
private JPanel middle;

2
src/main/java/com/atlauncher/gui/dialogs/InstanceSettingsDialog.java
View file

@ -41,8 +41,8 @@ import javax.swing.border.Border;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.data.InstanceSettings;
import com.atlauncher.data.Language;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.utils.Utils;

40
src/main/java/com/atlauncher/gui/dialogs/ModsChooser.java
View file

@ -17,25 +17,6 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.Language;
import com.atlauncher.data.json.Mod;
import com.atlauncher.gui.components.ModsJCheckBox;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import com.google.gson.reflect.TypeToken;
import io.github.asyncronous.toast.Toaster;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.SwingConstants;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
@ -46,6 +27,27 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.SwingConstants;
import com.atlauncher.App;
import com.atlauncher.Gsons;
import com.atlauncher.LogManager;
import com.atlauncher.data.Language;
import com.atlauncher.data.json.Mod;
import com.atlauncher.gui.components.ModsJCheckBox;
import com.atlauncher.utils.Utils;
import com.atlauncher.workers.InstanceInstaller;
import com.google.gson.reflect.TypeToken;
import io.github.asyncronous.toast.Toaster;
public class ModsChooser extends JDialog {
private static final long serialVersionUID = -5309108183485463434L;
private InstanceInstaller installer;

15
src/main/java/com/atlauncher/gui/dialogs/ProgressDialog.java
View file

@ -17,18 +17,19 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JProgressBar;
import javax.swing.SwingConstants;
import java.awt.BorderLayout;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
public class ProgressDialog extends JDialog {
private static final long serialVersionUID = -4665490255300884927L;

27
src/main/java/com/atlauncher/gui/dialogs/RenameInstanceDialog.java
View file

@ -17,19 +17,6 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
@ -39,6 +26,20 @@ import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
public class RenameInstanceDialog extends JDialog {
private JPanel top;
private JPanel middle;

19
src/main/java/com/atlauncher/gui/dialogs/ServerListForCheckerDialog.java
View file

@ -17,9 +17,12 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.data.Language;
import com.atlauncher.gui.tabs.ServersForCheckerTab;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.BorderFactory;
import javax.swing.JButton;
@ -31,12 +34,10 @@ import javax.swing.JTabbedPane;
import javax.swing.border.BevelBorder;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import com.atlauncher.data.Language;
import com.atlauncher.gui.tabs.ServersForCheckerTab;
import com.atlauncher.utils.Utils;
public class ServerListForCheckerDialog extends JDialog implements ActionListener, ListSelectionListener {
/**

27
src/main/java/com/atlauncher/gui/dialogs/SetupDialog.java
View file

@ -17,18 +17,6 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.data.Constants;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
@ -38,6 +26,19 @@ import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import com.atlauncher.App;
import com.atlauncher.data.Constants;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Utils;
public class SetupDialog extends JDialog {
/**
* Auto generated serial.
@ -126,4 +127,4 @@ public class SetupDialog extends JDialog {
setVisible(true);
}
}
}

23
src/main/java/com/atlauncher/gui/dialogs/ViewModsDialog.java
View file

@ -17,17 +17,6 @@
*/
package com.atlauncher.gui.dialogs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.json.Mod;
import com.atlauncher.data.Pack;
import com.atlauncher.gui.card.ModCard;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
@ -41,6 +30,18 @@ import java.util.LinkedList;
import java.util.List;
import java.util.regex.Pattern;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
import com.atlauncher.data.json.Mod;
import com.atlauncher.gui.card.ModCard;
public final class ViewModsDialog extends JDialog {
private final Pack pack;
private final JPanel contentPanel = new JPanel(new GridBagLayout());

11
src/main/java/com/atlauncher/gui/layer/BlurLayer.java
View file

@ -17,16 +17,17 @@
*/
package com.atlauncher.gui.layer;
import javax.swing.JComponent;
import javax.swing.JLayer;
import javax.swing.JPanel;
import javax.swing.plaf.LayerUI;
import java.awt.AlphaComposite;
import java.awt.Composite;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.beans.PropertyChangeEvent;
import javax.swing.JComponent;
import javax.swing.JLayer;
import javax.swing.JPanel;
import javax.swing.plaf.LayerUI;
public final class BlurLayer extends LayerUI<JPanel> {
private boolean blur = false;
@ -56,4 +57,4 @@ public final class BlurLayer extends LayerUI<JPanel> {
private Composite alpha(float f) {
return AlphaComposite.getInstance(AlphaComposite.SRC_OVER, f);
}
}
}

48
src/main/java/com/atlauncher/gui/tabs/AccountsTab.java
View file

@ -17,17 +17,19 @@
*/
package com.atlauncher.gui.tabs;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Account;
import com.atlauncher.data.Language;
import com.atlauncher.data.LoginResponse;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.utils.Authentication;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.BorderFactory;
import javax.swing.JButton;
@ -44,19 +46,17 @@ import javax.swing.JTextField;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import com.atlauncher.App;
import com.atlauncher.LogManager;
import com.atlauncher.data.Account;
import com.atlauncher.data.Language;
import com.atlauncher.data.LoginResponse;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.utils.Authentication;
import com.atlauncher.utils.HTMLUtils;
import com.atlauncher.utils.Utils;
public class AccountsTab extends JPanel implements Tab, RelocalizationListener {
private static final long serialVersionUID = 2493791137600123223L;

37
src/main/java/com/atlauncher/gui/tabs/InstancesTab.java
View file

@ -17,21 +17,6 @@
*/
package com.atlauncher.gui.tabs;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.card.InstanceCard;
import com.atlauncher.gui.card.NilCard;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
@ -42,6 +27,22 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.util.regex.Pattern;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import com.atlauncher.App;
import com.atlauncher.data.Instance;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.card.InstanceCard;
import com.atlauncher.gui.card.NilCard;
/**
* TODO: Rewrite this for better loading
*/
@ -60,7 +61,7 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
private JPanel panel;
private JScrollPane scrollPane;
private int currentPosition = 0;
private NilCard nilCard;
public InstancesTab() {
@ -197,9 +198,9 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
clearButton.setText(Language.INSTANCE.localize("common.clear"));
searchButton.setText(Language.INSTANCE.localize("common.search"));
hasUpdateLabel.setText(Language.INSTANCE.localize("instance.hasupdate"));
if (nilCard != null) {
nilCard.setMessage(Language.INSTANCE.localizeWithReplace("instance.nodisplay", "\n\n"));
}
}
}
}

23
src/main/java/com/atlauncher/gui/tabs/NewsTab.java
View file

@ -17,10 +17,13 @@
*/
package com.atlauncher.gui.tabs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Resources;
import com.atlauncher.utils.Utils;
import java.awt.BorderLayout;
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JEditorPane;
import javax.swing.JMenuItem;
@ -30,13 +33,11 @@ import javax.swing.JScrollPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import javax.swing.text.html.HTMLEditorKit;
import java.awt.BorderLayout;
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.utils.Resources;
import com.atlauncher.utils.Utils;
/**
* This class extends {@link JPanel} and provides a Panel for displaying the latest news.

35
src/main/java/com/atlauncher/gui/tabs/PacksTab.java
View file

@ -17,23 +17,6 @@
*/
package com.atlauncher.gui.tabs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.listener.TabChangeListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.evnt.manager.TabChangeManager;
import com.atlauncher.gui.LauncherFrame;
import com.atlauncher.gui.card.NilCard;
import com.atlauncher.gui.card.PackCard;
import com.atlauncher.gui.dialogs.AddPackDialog;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FlowLayout;
@ -49,6 +32,24 @@ import java.util.LinkedList;
import java.util.List;
import java.util.regex.Pattern;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Pack;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.listener.TabChangeListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.evnt.manager.TabChangeManager;
import com.atlauncher.gui.LauncherFrame;
import com.atlauncher.gui.card.NilCard;
import com.atlauncher.gui.card.PackCard;
import com.atlauncher.gui.dialogs.AddPackDialog;
public final class PacksTab extends JPanel implements Tab, RelocalizationListener {
private final JPanel topPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
private final JPanel contentPanel = new JPanel(new GridBagLayout());

23
src/main/java/com/atlauncher/gui/tabs/ServersForCheckerTab.java
View file

@ -17,10 +17,13 @@
*/
package com.atlauncher.gui.tabs;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.MinecraftServer;
import com.atlauncher.gui.dialogs.AddEditServerForCheckerDialog;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.DefaultListModel;
import javax.swing.DefaultListSelectionModel;
@ -30,13 +33,11 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionListener;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.MinecraftServer;
import com.atlauncher.gui.dialogs.AddEditServerForCheckerDialog;
@SuppressWarnings({"rawtypes", "unchecked"})
public class ServersForCheckerTab extends JPanel implements ActionListener {

21
src/main/java/com/atlauncher/gui/tabs/SettingsTab.java
View file

@ -17,6 +17,16 @@
*/
package com.atlauncher.gui.tabs;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.List;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
@ -28,15 +38,6 @@ import com.atlauncher.gui.tabs.settings.LoggingSettingsTab;
import com.atlauncher.gui.tabs.settings.NetworkSettingsTab;
import com.atlauncher.gui.tabs.settings.ToolsSettingsTab;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.List;
@SuppressWarnings("serial")
public class SettingsTab extends JPanel implements Tab, RelocalizationListener {
@ -118,4 +119,4 @@ public class SettingsTab extends JPanel implements Tab, RelocalizationListener {
this.saveButton.setText(Language.INSTANCE.localize("common.save"));
}
}
}

11
src/main/java/com/atlauncher/gui/tabs/ToolsTab.java
View file

@ -17,16 +17,17 @@
*/
package com.atlauncher.gui.tabs;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import javax.swing.JPanel;
import com.atlauncher.data.Language;
import com.atlauncher.gui.components.BlankToolPanel;
import com.atlauncher.gui.components.LogClearerToolPanel;
import com.atlauncher.gui.components.NetworkCheckerToolPanel;
import com.atlauncher.gui.components.ServerCheckerToolPanel;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@SuppressWarnings("serial")
public class ToolsTab extends JPanel implements Tab {
private JPanel mainPanel;
@ -52,4 +53,4 @@ public class ToolsTab extends JPanel implements Tab {
public String getTitle() {
return Language.INSTANCE.localize("tabs.tools");
}
}
}

15
src/main/java/com/atlauncher/gui/tabs/settings/AbstractSettingsTab.java
View file

@ -17,18 +17,19 @@
*/
package com.atlauncher.gui.tabs.settings;
import com.atlauncher.App;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.gui.tabs.Tab;
import com.atlauncher.utils.Utils;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JPanel;
import javax.swing.border.Border;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import com.atlauncher.App;
import com.atlauncher.gui.CustomLineBorder;
import com.atlauncher.gui.tabs.Tab;
import com.atlauncher.utils.Utils;
@SuppressWarnings("serial")
public abstract class AbstractSettingsTab extends JPanel implements Tab {

13
src/main/java/com/atlauncher/gui/tabs/settings/GeneralSettingsTab.java
View file

@ -17,6 +17,13 @@
*/
package com.atlauncher.gui.tabs.settings;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
@ -24,12 +31,6 @@ import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.utils.Utils;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
@SuppressWarnings("serial")
public class GeneralSettingsTab extends AbstractSettingsTab implements RelocalizationListener {
private JLabelWithHover languageLabel;

27
src/main/java/com/atlauncher/gui/tabs/settings/JavaSettingsTab.java
View file

@ -17,12 +17,12 @@
*/
package com.atlauncher.gui.tabs.settings;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.utils.Utils;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import javax.swing.JButton;
import javax.swing.JCheckBox;
@ -33,17 +33,14 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.JTextField;
import javax.swing.SpinnerModel;
import javax.swing.SpinnerNumberModel;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.io.File;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.utils.Utils;
@SuppressWarnings("serial")
public class JavaSettingsTab extends AbstractSettingsTab implements RelocalizationListener {

19
src/main/java/com/atlauncher/gui/tabs/settings/LoggingSettingsTab.java
View file

@ -17,21 +17,22 @@
*/
package com.atlauncher.gui.tabs.settings;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.utils.Utils;
import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JSpinner;
import javax.swing.SpinnerModel;
import javax.swing.SpinnerNumberModel;
import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.utils.Utils;
@SuppressWarnings("serial")
public class LoggingSettingsTab extends AbstractSettingsTab implements RelocalizationListener {

23
src/main/java/com/atlauncher/gui/tabs/settings/NetworkSettingsTab.java
View file

@ -17,6 +17,18 @@
*/
package com.atlauncher.gui.tabs.settings;
import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Proxy.Type;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JOptionPane;
import javax.swing.JTextField;
import com.atlauncher.App;
import com.atlauncher.data.Language;
import com.atlauncher.data.Server;
@ -26,17 +38,6 @@ import com.atlauncher.gui.components.JLabelWithHover;
import com.atlauncher.gui.dialogs.ProgressDialog;
import com.atlauncher.utils.Utils;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JOptionPane;
import javax.swing.JTextField;
import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Proxy.Type;
@SuppressWarnings("serial")
public class NetworkSettingsTab extends AbstractSettingsTab implements RelocalizationListener {
private JLabelWithHover downloadServerLabel;

Some files were not shown because too many files have changed in this diff Show more