Merge pull request #3 from alyssaruth/gradle-server

Gradle - server
alyssaruth · Nov 15, 2023 · 7955ce3 · 7955ce3
2 parents 3618b64 + 3f2db28
commit 7955ce3
Show file tree

Hide file tree

Showing 46 changed files with 32 additions and 116 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,3 +14,5 @@ jobs:
         run: ./gradlew :core:build
       - name: Build Client
         run: ./gradlew :client:build
+      - name: Build Server
+        run: ./gradlew :server:build
diff --git a/client/src/main/java/online/util/AccountUtil.java b/client/src/main/java/online/util/AccountUtil.java
@@ -1,7 +1,5 @@
 package online.util;
 
-import javax.mail.internet.InternetAddress;
-
 import util.DialogUtil;
 import util.EncryptionUtil;
 
@@ -23,15 +21,16 @@ public static boolean validateEmail(String email)
 			return false;
 		}
 
-		try
-		{
-			InternetAddress.parse(email, true);
-		}
-		catch (Throwable t)
-		{
-			DialogUtil.showError("The email address you have entered is not valid.");
-			return false;
-		}
+//		try
+//		{
+//			InternetAddress.parse(email, true);
+//		}
+//		catch (Throwable t)
+//		{
+//			Debug.stackTraceSilently(t);
+//			DialogUtil.showError("The email address you have entered is not valid.");
+//			return false;
+//		}
 
 		return true;
 	}

diff --git a/client/src/main/java/screen/DebugConsoleAdv.java b/client/src/main/java/screen/DebugConsoleAdv.java
diff --git a/...nt/src/main/java/screen/DebugConsole.java → core/src/main/java/screen/DebugConsole.java b/...nt/src/main/java/screen/DebugConsole.java → core/src/main/java/screen/DebugConsole.java
diff --git a/client/src/main/java/util/Base64Desktop.java → core/src/main/java/util/Base64Desktop.java b/client/src/main/java/util/Base64Desktop.java → core/src/main/java/util/Base64Desktop.java
diff --git a/client/src/main/java/util/DateUtil.java → core/src/main/java/util/DateUtil.java b/client/src/main/java/util/DateUtil.java → core/src/main/java/util/DateUtil.java
diff --git a/core/src/main/java/util/MessageUtil.java b/core/src/main/java/util/MessageUtil.java
@@ -21,11 +21,11 @@
 
 public class MessageUtil implements OnlineConstants
 {	
-	public static final String LIVE_IP = "54.149.26.201"; //Live
-	public static final String LAPTOP_IP = "82.3.206.177"; //Laptop (in Leeds)
+	// public static final String LIVE_IP = "54.149.26.201"; //Live
+	// public static final String LAPTOP_IP = "82.3.206.177"; //Laptop (in Leeds)
 	public static final String LOCAL_IP = "localhost";
 
-	public static final String SERVER_IP = LIVE_IP;
+	public static final String SERVER_IP = LOCAL_IP;
 
 	private static final Random RAND = new Random();
 

diff --git a/core/src/main/java/util/OnlineConstants.java b/core/src/main/java/util/OnlineConstants.java
@@ -7,7 +7,6 @@ public interface OnlineConstants
 
 	//Used in the AboutDialog and for sending logs
 	public static final String ENTROPY_VERSION_NUMBER = "v7.0.0";
-	public static final String DARTS_VERSION_NUMBER = "v2.4.0";
 
 	//Filenames - for automatic updates
 	public static final String FILE_NAME_DARTS = "Dartzee.jar";

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("Entropy.kotlin-common-conventions")
+    application
+}
+
+dependencies {
+    implementation("javax.mail:javax.mail-api:1.6.2")
+    implementation(project(":core"))
+}
+
+application {
+    // Define the main class for the application.
+    mainClass.set("server.EntropyServer")
+}
diff --git a/server/src/object/BidHistory.java → server/src/main/java/object/BidHistory.java b/server/src/object/BidHistory.java → server/src/main/java/object/BidHistory.java
diff --git a/server/src/object/BlacklistEntry.java → .../src/main/java/object/BlacklistEntry.java b/server/src/object/BlacklistEntry.java → .../src/main/java/object/BlacklistEntry.java
diff --git a/server/src/object/GameWrapper.java → server/src/main/java/object/GameWrapper.java b/server/src/object/GameWrapper.java → server/src/main/java/object/GameWrapper.java
diff --git a/server/src/object/HandDetails.java → server/src/main/java/object/HandDetails.java b/server/src/object/HandDetails.java → server/src/main/java/object/HandDetails.java
diff --git a/server/src/object/NotificationSocket.java → .../main/java/object/NotificationSocket.java b/server/src/object/NotificationSocket.java → .../main/java/object/NotificationSocket.java
diff --git a/server/src/object/Room.java → server/src/main/java/object/Room.java b/server/src/object/Room.java → server/src/main/java/object/Room.java
diff --git a/server/src/object/ServerRunnable.java → .../src/main/java/object/ServerRunnable.java b/server/src/object/ServerRunnable.java → .../src/main/java/object/ServerRunnable.java
diff --git a/server/src/object/ServerThread.java → ...er/src/main/java/object/ServerThread.java b/server/src/object/ServerThread.java → ...er/src/main/java/object/ServerThread.java
diff --git a/server/src/object/UserConnection.java → .../src/main/java/object/UserConnection.java b/server/src/object/UserConnection.java → .../src/main/java/object/UserConnection.java
diff --git a/server/src/server/BlacklistRunnable.java → ...c/main/java/server/BlacklistRunnable.java b/server/src/server/BlacklistRunnable.java → ...c/main/java/server/BlacklistRunnable.java
diff --git a/server/src/server/DownloadHandler.java → ...src/main/java/server/DownloadHandler.java b/server/src/server/DownloadHandler.java → ...src/main/java/server/DownloadHandler.java
diff --git a/server/src/server/DownloadListener.java → ...rc/main/java/server/DownloadListener.java b/server/src/server/DownloadListener.java → ...rc/main/java/server/DownloadListener.java
diff --git a/server/src/server/EntropyServer.java → ...r/src/main/java/server/EntropyServer.java b/server/src/server/EntropyServer.java → ...r/src/main/java/server/EntropyServer.java
@@ -216,9 +216,6 @@ public EntropyServer()
 
 	public static void main(String args[])
 	{
-		//Need to initialise the xml-security library so we can use Base64 encoding and decoding
-		com.sun.org.apache.xml.internal.security.Init.init();
-
 		EntropyServer server = new EntropyServer();
 		Thread.setDefaultUncaughtExceptionHandler(new DebugUncaughtExceptionHandler());
 

diff --git a/server/src/server/InactiveCheckRunnable.java → ...in/java/server/InactiveCheckRunnable.java b/server/src/server/InactiveCheckRunnable.java → ...in/java/server/InactiveCheckRunnable.java
diff --git a/server/src/server/ListenerRunnable.java → ...rc/main/java/server/ListenerRunnable.java b/server/src/server/ListenerRunnable.java → ...rc/main/java/server/ListenerRunnable.java
diff --git a/...er/src/server/MessageHandlerRunnable.java → ...n/java/server/MessageHandlerRunnable.java b/...er/src/server/MessageHandlerRunnable.java → ...n/java/server/MessageHandlerRunnable.java
diff --git a/server/src/server/MessageListener.java → ...src/main/java/server/MessageListener.java b/server/src/server/MessageListener.java → ...src/main/java/server/MessageListener.java
diff --git a/server/src/server/NotificationRunnable.java → ...ain/java/server/NotificationRunnable.java b/server/src/server/NotificationRunnable.java → ...ain/java/server/NotificationRunnable.java
diff --git a/server/src/server/ServerCommands.java → .../src/main/java/server/ServerCommands.java b/server/src/server/ServerCommands.java → .../src/main/java/server/ServerCommands.java
diff --git a/...rc/server/ToggleAvailabilityRunnable.java → ...va/server/ToggleAvailabilityRunnable.java b/...rc/server/ToggleAvailabilityRunnable.java → ...va/server/ToggleAvailabilityRunnable.java
diff --git a/server/src/util/AccountUtil.java → server/src/main/java/util/AccountUtil.java b/server/src/util/AccountUtil.java → server/src/main/java/util/AccountUtil.java
@@ -30,7 +30,7 @@ else if (emailExists(email))
 				String body = "Hi " + username + "! This is a quick test message to check that the email you entered is valid.";
 				body += "\nIf you forget your password, the 'Reset Password' option will generate a new one";
 				body += " and send it to this address. \n\nEnjoy the game!";
-				EntropyEmailUtil.sendEmailNoReply(title, body, email);
+				// EntropyEmailUtil.sendEmailNoReply(title, body, email);
 				emailData.put(username, email);
 			}
 			catch (Throwable t)

diff --git a/server/src/util/ColourGenerator.java → ...r/src/main/java/util/ColourGenerator.java b/server/src/util/ColourGenerator.java → ...r/src/main/java/util/ColourGenerator.java
diff --git a/...r/src/util/DeobfuscatedMethodWrapper.java → .../java/util/DeobfuscatedMethodWrapper.java b/...r/src/util/DeobfuscatedMethodWrapper.java → .../java/util/DeobfuscatedMethodWrapper.java
diff --git a/server/src/util/EntropyEmailUtil.java → .../src/main/java/util/EntropyEmailUtil.java b/server/src/util/EntropyEmailUtil.java → .../src/main/java/util/EntropyEmailUtil.java
diff --git a/...r/src/util/EntropyThreadPoolExecutor.java → .../java/util/EntropyThreadPoolExecutor.java b/...r/src/util/EntropyThreadPoolExecutor.java → .../java/util/EntropyThreadPoolExecutor.java
diff --git a/server/src/util/LogDeobfuscator.java → ...r/src/main/java/util/LogDeobfuscator.java b/server/src/util/LogDeobfuscator.java → ...r/src/main/java/util/LogDeobfuscator.java
diff --git a/server/src/util/MainUtil.java → server/src/main/java/util/MainUtil.java b/server/src/util/MainUtil.java → server/src/main/java/util/MainUtil.java
@@ -7,7 +7,6 @@ public class MainUtil
 	public static void initialise()
 	{
 		Debug.initialise(new DebugConsole());
-		Debug.setVersionNumber(OnlineConstants.VERSION_NUMBER);
 		EncryptionUtil.setBase64Interface(new Base64Desktop());
 	}
 }
diff --git a/server/src/util/PasswordServerUtil.java → ...rc/main/java/util/PasswordServerUtil.java b/server/src/util/PasswordServerUtil.java → ...rc/main/java/util/PasswordServerUtil.java
@@ -4,7 +4,7 @@
 
 public class PasswordServerUtil 
 {
-	private static String passwordCharacters = "abcdefghijklmnopqrstuvwxyz0123456789$%!\"&*()£#@[]?";
+	private static String passwordCharacters = "abcdefghijklmnopqrstuvwxyz0123456789$%!\"&*()#@[]?";
 
 	public static String generateRandomPassword()
 	{

diff --git a/server/src/util/RoomStatsWrapper.java → .../src/main/java/util/RoomStatsWrapper.java b/server/src/util/RoomStatsWrapper.java → .../src/main/java/util/RoomStatsWrapper.java
diff --git a/server/src/util/ServerDebugExtension.java → .../main/java/util/ServerDebugExtension.java b/server/src/util/ServerDebugExtension.java → .../main/java/util/ServerDebugExtension.java
diff --git a/server/src/util/ServerRegistry.java → ...er/src/main/java/util/ServerRegistry.java b/server/src/util/ServerRegistry.java → ...er/src/main/java/util/ServerRegistry.java
diff --git a/server/src/util/StatisticsUtil.java → ...er/src/main/java/util/StatisticsUtil.java b/server/src/util/StatisticsUtil.java → ...er/src/main/java/util/StatisticsUtil.java
diff --git a/server/src/util/XmlBuilderServer.java → .../src/main/java/util/XmlBuilderServer.java b/server/src/util/XmlBuilderServer.java → .../src/main/java/util/XmlBuilderServer.java
diff --git a/server/resources/buttons/key.png → server/src/main/resources/buttons/key.png b/server/resources/buttons/key.png → server/src/main/resources/buttons/key.png
diff --git a/server/resources/buttons/keySelected.png → ...rc/main/resources/buttons/keySelected.png b/server/resources/buttons/keySelected.png → ...rc/main/resources/buttons/keySelected.png
diff --git a/server/resources/private.key → server/src/main/resources/private.key b/server/resources/private.key → server/src/main/resources/private.key
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,4 +8,4 @@
  */
 
 rootProject.name = "Entropy"
-include("core", "client")
+include("core", "client", "server")