Cleanup RuneLite class (use Lombok)

- Use Lombok for creating setters and getters for variables in RuneLite
- Use correct spacing and final modifiers

Signed-off-by: Tomas Slusny <[email protected]>

runelite-client/src/main/java/net/runelite/client/RuneLite.java

@@ -40,6 +40,7 @@
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.util.EnumConverter;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.client.account.SessionManager;
@@ -68,7 +69,10 @@ public class RuneLite
 	private static final File LOGS_DIR = new File(RUNELITE_DIR, "logs");
 	private static final File LOGS_FILE_NAME = new File(LOGS_DIR, "application");
 
+	@Getter
 	private static Injector injector;
+
+	@Getter
 	private static OptionSet options;
 
 	@Inject
@@ -122,10 +126,12 @@ public static void main(String[] args) throws Exception
 	{
 		Locale.setDefault(Locale.ENGLISH);
 
-		OptionParser parser = new OptionParser();
+		final OptionParser parser = new OptionParser();
 		parser.accepts("developer-mode", "Enable developer tools");
 		parser.accepts("debug", "Show extra debugging output");
-		ArgumentAcceptingOptionSpec<UpdateCheckMode> updateMode = parser.accepts("rs", "Select client type")
+
+		final ArgumentAcceptingOptionSpec<UpdateCheckMode> updateMode = parser
+			.accepts("rs", "Select client type")
 			.withRequiredArg()
 			.ofType(UpdateCheckMode.class)
 			.defaultsTo(UpdateCheckMode.AUTO)
@@ -137,8 +143,9 @@ public UpdateCheckMode convert(String v)
 					return super.convert(v.toUpperCase());
 				}
 			});
+
 		parser.accepts("help", "Show this text").forHelp();
-		setOptions(parser.parse(args));
+		options = parser.parse(args);
 
 		if (getOptions().has("help"))
 		{
@@ -176,7 +183,7 @@ public UpdateCheckMode convert(String v)
 			}
 		});
 
-		setInjector(Guice.createInjector(new RuneLiteModule()));
+		injector = Guice.createInjector(new RuneLiteModule());
 		injector.getInstance(RuneLite.class).start(getOptions().valueOf(updateMode));
 	}
 
@@ -207,6 +214,7 @@ public void start(UpdateCheckMode updateMode) throws Exception
 		eventBus.register(commandManager);
 		eventBus.register(pluginManager);
 		eventBus.register(clanManager);
+
 		if (this.client != null)
 		{
 			eventBus.register(itemManager.get());
@@ -249,28 +257,20 @@ public void shutdown()
 	}
 
 	@VisibleForTesting
-	public void setClient(Client client)
-	{
-		this.client = client;
-	}
-
-	public static Injector getInjector()
-	{
-		return injector;
-	}
-
 	public static void setInjector(Injector injector)
 	{
 		RuneLite.injector = injector;
 	}
 
-	public static OptionSet getOptions()
+	@VisibleForTesting
+	public static void setOptions(OptionSet options)
 	{
-		return options;
+		RuneLite.options = options;
 	}
 
-	public static void setOptions(OptionSet options)
+	@VisibleForTesting
+	public void setClient(Client client)
 	{
-		RuneLite.options = options;
+		this.client = client;
 	}
 }