server
Clone or download
Modified Files
--- 'a/src/main/java/com/stream_pi/server/Main.java'
+++ b/src/main/java/com/stream_pi/server/Main.java
@@ -18,6 +18,7 @@ package com.stream_pi.server;
import com.stream_pi.server.controller.Controller;
import com.stream_pi.server.info.ServerInfo;
+import com.stream_pi.server.info.StartupFlags;
import javafx.application.Application;
import javafx.scene.Scene;
import javafx.stage.Stage;
@@ -40,9 +41,9 @@ public class Main extends Application {
String val = r[1];
if(arg.equals("-DStream-Pi.startupRunnerFileName"))
- ServerInfo.getInstance().setRunnerFileName(val);
+ StartupFlags.RUNNER_FILE_NAME = val;
else if(arg.equals("-DStream-Pi.startupMode"))
- ServerInfo.getInstance().setStartMinimised(val.equals("min"));
+ StartupFlags.START_MINIMISED = val.equals("min");
}
Controller d = new Controller();
--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -14,6 +14,7 @@ import com.stream_pi.server.connection.C
import com.stream_pi.server.connection.ClientConnections;
import com.stream_pi.server.connection.MainServer;
import com.stream_pi.server.info.ServerInfo;
+import com.stream_pi.server.info.StartupFlags;
import com.stream_pi.server.io.Config;
import com.stream_pi.server.window.Base;
import com.stream_pi.server.window.dashboard.DashboardBase;
@@ -141,7 +142,7 @@ public class Controller extends Base imp
{
try
{
- if(ServerInfo.getInstance().isStartMinimised() && SystemTray.isSupported())
+ if(StartupFlags.START_MINIMISED && SystemTray.isSupported())
minimiseApp();
else
getStage().show();
--- 'a/src/main/java/com/stream_pi/server/info/ServerInfo.java'
+++ b/src/main/java/com/stream_pi/server/info/ServerInfo.java
@@ -24,9 +24,7 @@ public class ServerInfo {
private Version commStandardVersion;
private static ServerInfo instance = null;
-
- private String runnerFileName = null;
- private boolean startMinimised = false;
+
private ServerInfo()
{
@@ -56,26 +54,6 @@ public class ServerInfo {
return prePath;
}
- public void setStartMinimised(boolean startMinimised)
- {
- this.startMinimised = startMinimised;
- }
-
- public boolean isStartMinimised()
- {
- return startMinimised;
- }
-
- public void setRunnerFileName(String runnerFileName)
- {
- this.runnerFileName = runnerFileName;
- }
-
- public String getRunnerFileName()
- {
- return runnerFileName;
- }
-
public static synchronized ServerInfo getInstance()
{
if(instance == null)
--- /dev/null
+++ b/src/main/java/com/stream_pi/server/info/StartupFlags.java
@@ -0,0 +1,7 @@
+package com.stream_pi.server.info;
+
+public class StartupFlags
+{
+ public static String RUNNER_FILE_NAME = null;
+ public static boolean START_MINIMISED = false;
+}
--- 'a/src/main/java/com/stream_pi/server/window/settings/About/ContactTab.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/About/ContactTab.java
@@ -1,5 +1,6 @@
package com.stream_pi.server.window.settings.About;
+import com.stream_pi.util.contactlinks.ContactLinks;
import javafx.application.HostServices;
import javafx.geometry.Insets;
import javafx.scene.control.Hyperlink;
@@ -19,20 +20,19 @@ public class ContactTab extends ScrollPa
getStyleClass().add("about_contact_tab_scroll_pane");
Hyperlink github = new Hyperlink("GitHub");
- github.setOnAction(event -> openWebpage("https://github.com/Stream-Pi"));
+ github.setOnAction(event -> openWebpage(ContactLinks.getGitHub()));
Hyperlink discord = new Hyperlink("Discord");
- discord.setOnAction(event -> openWebpage("https://discord.gg/BExqGmk"));
+ discord.setOnAction(event -> openWebpage(ContactLinks.getDiscord()));
Hyperlink website = new Hyperlink("Website");
- website.setOnAction(event -> openWebpage("https://stream-pi.com"));
+ website.setOnAction(event -> openWebpage(ContactLinks.getWebsite()));
Hyperlink twitter = new Hyperlink("Twitter");
- twitter.setOnAction(event -> openWebpage("https://twitter.com/Stream_Pi"));
+ twitter.setOnAction(event -> openWebpage(ContactLinks.getTwitter()));
Hyperlink matrix = new Hyperlink("Matrix");
- matrix.setOnAction(event -> openWebpage("https://matrix.to/#/#stream-pi_general:matrix.org"));
-
+ matrix.setOnAction(event -> openWebpage(ContactLinks.getMatrix()));
VBox vBox = new VBox(github, discord, website, twitter, matrix);
vBox.setSpacing(10.0);
--- 'a/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java
@@ -1,6 +1,7 @@
package com.stream_pi.server.window.settings;
import com.stream_pi.server.connection.ServerListener;
+import com.stream_pi.server.info.StartupFlags;
import com.stream_pi.server.io.Config;
import com.stream_pi.server.window.ExceptionAndAlertHandler;
import com.stream_pi.server.info.ServerInfo;
@@ -332,7 +333,7 @@ public class GeneralSettings extends VBo
if(config.getStartOnBoot() != startOnBoot)
{
- if(ServerInfo.getInstance().getRunnerFileName() == null)
+ if(StartupFlags.RUNNER_FILE_NAME == null)
{
new StreamPiAlert("Uh Oh", "No Runner File Name Specified as startup arguments. Cant set run at boot.", StreamPiAlertType.ERROR).show();
startOnBoot = false;
@@ -342,7 +343,7 @@ public class GeneralSettings extends VBo
StartAtBoot startAtBoot = new StartAtBoot(PlatformType.SERVER, ServerInfo.getInstance().getPlatform());
if(startOnBoot)
{
- startAtBoot.create(new File(ServerInfo.getInstance().getRunnerFileName()));
+ startAtBoot.create(new File(StartupFlags.RUNNER_FILE_NAME));
}
else
{