From a12742b498d927d057ce0a5d44b332c430f0ca09 Mon Sep 17 00:00:00 2001
From: Frederikam <frogkr@gmail.com>
Date: Sun, 16 Jul 2017 18:08:49 +0200
Subject: [PATCH] Added client module

---
 .gitignore                                    |  1 +
 LavalinkClient/.gitignore                     |  1 +
 LavalinkClient/pom.xml                        | 58 +++++++++++++
 .../main/java/lavalink/client/Lavalink.java   | 10 +++
 .../src/test}/resources/logback.xml           |  0
 LavalinkServer/pom.xml                        |  6 --
 LavalinkServer/target/classes/logback.xml     | 87 -------------------
 pom.xml                                       |  7 ++
 8 files changed, 77 insertions(+), 93 deletions(-)
 create mode 100644 LavalinkClient/.gitignore
 create mode 100644 LavalinkClient/pom.xml
 create mode 100644 LavalinkClient/src/main/java/lavalink/client/Lavalink.java
 rename {LavalinkServer/src/main => LavalinkClient/src/test}/resources/logback.xml (100%)
 delete mode 100644 LavalinkServer/target/classes/logback.xml

diff --git a/.gitignore b/.gitignore
index 85e7c1dfc..c749986c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /.idea/
+*.iml
diff --git a/LavalinkClient/.gitignore b/LavalinkClient/.gitignore
new file mode 100644
index 000000000..bff2d7629
--- /dev/null
+++ b/LavalinkClient/.gitignore
@@ -0,0 +1 @@
+*.iml
diff --git a/LavalinkClient/pom.xml b/LavalinkClient/pom.xml
new file mode 100644
index 000000000..4c843daf1
--- /dev/null
+++ b/LavalinkClient/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>Lavalink-Parent</artifactId>
+        <groupId>lavalink</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>Lavalink-Client</artifactId>
+    <version>1.0</version>
+
+    <dependencies>
+        <dependency>
+            <!-- audio player for discord -->
+            <groupId>com.sedmelluq</groupId>
+            <artifactId>lavaplayer</artifactId>
+            <version>1.2.39</version>
+        </dependency>
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+            <version>1.3.4</version>
+        </dependency>
+        <dependency>
+            <!-- logging framework -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20170516</version>
+        </dependency>
+        <dependency>
+            <groupId>net.dv8tion</groupId>
+            <artifactId>JDA</artifactId>
+            <version>3.2.0_226</version>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <name>jcenter-bintray</name>
+            <url>http://jcenter.bintray.com</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
+
+</project>
diff --git a/LavalinkClient/src/main/java/lavalink/client/Lavalink.java b/LavalinkClient/src/main/java/lavalink/client/Lavalink.java
new file mode 100644
index 000000000..c1dae762a
--- /dev/null
+++ b/LavalinkClient/src/main/java/lavalink/client/Lavalink.java
@@ -0,0 +1,10 @@
+package lavalink.client;
+
+public class Lavalink {
+
+    private final String host;
+
+    public Lavalink(String host) {
+        this.host = host;
+    }
+}
diff --git a/LavalinkServer/src/main/resources/logback.xml b/LavalinkClient/src/test/resources/logback.xml
similarity index 100%
rename from LavalinkServer/src/main/resources/logback.xml
rename to LavalinkClient/src/test/resources/logback.xml
diff --git a/LavalinkServer/pom.xml b/LavalinkServer/pom.xml
index 76ad7c1fd..d27a4e67f 100644
--- a/LavalinkServer/pom.xml
+++ b/LavalinkServer/pom.xml
@@ -9,12 +9,6 @@
     <packaging>pom</packaging>
     <version>1.0</version>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <dependency>
             <!-- audio player for discord -->
diff --git a/LavalinkServer/target/classes/logback.xml b/LavalinkServer/target/classes/logback.xml
deleted file mode 100644
index 88e4bf00d..000000000
--- a/LavalinkServer/target/classes/logback.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2017 Frederik Ar. Mikkelsen
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  ~
-  -->
-
-<configuration debug="false">
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <file>logs/fredboat.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/fredboat.%d{yyyyMMdd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%date{HH:mm:ss}] [ %-5level] [%logger{0}] %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/debug.log</file>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/debug.%d{yyyyMMdd}.log.gz</fileNamePattern>
-            <maxHistory>5</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%d] [ %-5level] [%thread] %logger{35}: %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/error.log</file>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/error.%d{yyyyMMdd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%date{HH:mm:ss}] [%thread] [%logger{0}] %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <encoder>
-            <pattern>[%date{HH:mm:ss}] [ %-5level] [%logger{0}] %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="fredboat" level="DEBUG" additivity="true">
-        <appender-ref ref="DEBUG"/>
-        <appender-ref ref="ERROR"/>
-    </logger>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FILE"/>
-    </root>
-</configuration>
diff --git a/pom.xml b/pom.xml
index 2204a6e27..78151cd1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,13 @@
     <version>1.0</version>
     <modules>
         <module>LavalinkServer</module>
+        <module>LavalinkClient</module>
     </modules>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
 </project>