From 1942e249b518d701241693c0df8d430f61523890 Mon Sep 17 00:00:00 2001
From: Simon <simon@bussmann.es>
Date: Mon, 15 Feb 2021 00:54:14 +0100
Subject: [PATCH] Nearly finished client side logging

Client/src/logging/ClientLogger.java:
    -added printConfiramtion method

Client/src/networking/Client.java:
    - swapped out.println with clientLogger.printConfirmation
---
 .idea/artifacts/Client_jar.xml             |  4 ++--
 .idea/artifacts/Server_jar.xml             |  8 ++++++++
 Client/src/META-INF/MANIFEST.MF            |  3 +++
 Client/src/logging/ClientLogger.java       |  8 ++++++++
 Client/src/networking/Client.java          | 12 ++++--------
 Server/src/META-INF/MANIFEST.MF            |  3 +++
 out/production/Client/META-INF/MANIFEST.MF |  3 +++
 out/production/Server/META-INF/MANIFEST.MF |  3 +++
 8 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 .idea/artifacts/Server_jar.xml
 create mode 100644 Client/src/META-INF/MANIFEST.MF
 create mode 100644 Server/src/META-INF/MANIFEST.MF
 create mode 100644 out/production/Client/META-INF/MANIFEST.MF
 create mode 100644 out/production/Server/META-INF/MANIFEST.MF

diff --git a/.idea/artifacts/Client_jar.xml b/.idea/artifacts/Client_jar.xml
index 9b55114..4de7eb1 100644
--- a/.idea/artifacts/Client_jar.xml
+++ b/.idea/artifacts/Client_jar.xml
@@ -1,8 +1,8 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="Client:jar">
     <output-path>$PROJECT_DIR$/out/artifacts/Client_jar</output-path>
-    <root id="archive" name="ArcadeMachine.jar">
-      <element id="module-output" name="ArcadeMachine" />
+    <root id="archive" name="Client.jar">
+      <element id="module-output" name="Client" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/Server_jar.xml b/.idea/artifacts/Server_jar.xml
new file mode 100644
index 0000000..a469dd7
--- /dev/null
+++ b/.idea/artifacts/Server_jar.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="Server:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/Server_jar</output-path>
+    <root id="archive" name="Server.jar">
+      <element id="module-output" name="Server" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/Client/src/META-INF/MANIFEST.MF b/Client/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d3e52b4
--- /dev/null
+++ b/Client/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: networking.Client
+
diff --git a/Client/src/logging/ClientLogger.java b/Client/src/logging/ClientLogger.java
index 96269e3..622f133 100644
--- a/Client/src/logging/ClientLogger.java
+++ b/Client/src/logging/ClientLogger.java
@@ -44,4 +44,12 @@ public class ClientLogger {
     public void printLog(String message, boolean success, LogType logType){
         this.printLog(message, "server", success, logType);
     }
+
+    public void printConfirmation(int code){
+        if (code == 200){
+            printLog(" Status: sent!", true, LogType.Log);
+        } else {
+            printLog(" Status: not sent!", false, LogType.Log);
+        }
+    }
 }
diff --git a/Client/src/networking/Client.java b/Client/src/networking/Client.java
index b987212..cd3ad3e 100644
--- a/Client/src/networking/Client.java
+++ b/Client/src/networking/Client.java
@@ -2,7 +2,6 @@ package networking;
 
 import logging.ClientLogger;
 import logging.LogType;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -18,10 +17,6 @@ public class Client {
     private String serverName;
     private boolean success;
 
-    public static final String ANSI_RESET = "\u001B[0m";
-    public static final String ANSI_CYAN = "\u001B[36m";
-
-
     public Client(String ip, int port, String name) {
         try {
             scanner = new Scanner(System.in);
@@ -39,13 +34,12 @@ public class Client {
 
     public void handshake() {
         try {
-            out.writeInt(15315);
+            out.writeInt(165313125);
             out.flush();
             success = in.readInt() == 200;
             if (success){
                 out.writeUTF(name);
                 serverName = in.readUTF();
-                System.out.println(serverName);
                 clientLogger.printLog("You successfully connected to me", serverName, success, LogType.Log);
             } else {
                 clientLogger.printLog("Connection failed try again", success, LogType.Log);
@@ -62,9 +56,11 @@ public class Client {
             String message = scanner.nextLine();
             try {
                 out.writeUTF(message);
-                System.out.println(in.readInt());
+                clientLogger.printConfirmation(in.readInt());
             } catch (IOException e) {
                 e.printStackTrace();
+            } catch (Exception e){
+
             }
             if(message.equalsIgnoreCase("exit()"))
                 break;
diff --git a/Server/src/META-INF/MANIFEST.MF b/Server/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9ae8574
--- /dev/null
+++ b/Server/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: networking.Server
+
diff --git a/out/production/Client/META-INF/MANIFEST.MF b/out/production/Client/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d3e52b4
--- /dev/null
+++ b/out/production/Client/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: networking.Client
+
diff --git a/out/production/Server/META-INF/MANIFEST.MF b/out/production/Server/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9ae8574
--- /dev/null
+++ b/out/production/Server/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: networking.Server
+