From 2bdd051a41b887ad95af48f528e8159f49232bff Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Fri, 16 Feb 2018 12:08:29 +0100
Subject: [PATCH] Remove universal jar building for a smaller jar footprint and
 less conflicts with provided dependencies

---
 README.md                                     |  4 +-
 bukkit/pom.xml                                | 43 +++++++++-
 bungee/pom.xml                                | 40 ++++++++-
 core/pom.xml                                  |  8 +-
 .../core/mojang/UUIDTypeAdapter.java          |  5 +-
 pom.xml                                       |  1 -
 universal/pom.xml                             | 85 -------------------
 7 files changed, 92 insertions(+), 94 deletions(-)
 delete mode 100644 universal/pom.xml

diff --git a/README.md b/README.md
index 4b3507e8..b08654c3 100644
--- a/README.md
+++ b/README.md
@@ -79,5 +79,5 @@ Put your stats id from the BungeeCord config into this file
 6. Check your database settings in the config of FastLogin on BungeeCord
 7. Set your proxy (BungeeCord) in offline mode by setting the value onlinemode in your config.yml to false
 8. You should *always* firewall your Spigot server that it's only accessible through BungeeCord 
-https://www.spigotmc.org/wiki/bungeecord-installation/#post-installation
-9. (BungeeCord doesn't support SQLite per default, so you should change the configuration to MySQL or MariaDB)
+    * https://www.spigotmc.org/wiki/bungeecord-installation/#post-installation
+    * BungeeCord doesn't support SQLite per default, so you should change the configuration to MySQL or MariaDB
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index a9c28597..21e1c1a7 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -15,6 +15,46 @@
 
     <name>FastLoginBukkit</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.zaxxer.hikari</pattern>
+                            <shadedPattern>changeskin.hikari</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>changeskin.slf4j</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.md_5.bungee.config</pattern>
+                            <shadedPattern>changeskin.config</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.google.gson</pattern>
+                            <shadedPattern>changeskin.gson</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <!--Bukkit-Server-API -->
         <repository>
@@ -45,7 +85,7 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-        
+
         <!--PlaceholderAPI -->
         <repository>
             <id>placeholderapi</id>
@@ -58,7 +98,6 @@
             <groupId>com.github.games647</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
         <!--Server API-->
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 56e37698..f2068884 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -16,6 +16,45 @@
     <!--Represents the main plugin-->
     <name>FastLoginBungee</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <artifactSet>
+                        <excludes>
+                            <!--Those classes are already present in BungeeCord version-->
+                            <exclude>net.md-5:bungeecord-config</exclude>
+                            <exclude>com.google.code.gson:gson</exclude>
+                        </excludes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.zaxxer.hikari</pattern>
+                            <shadedPattern>changeskin.hikari</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>changeskin.slf4j</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <repository>
             <id>vik1395-repo</id>
@@ -33,7 +72,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
         <!--BungeeCord with also the part outside the API-->
diff --git a/core/pom.xml b/core/pom.xml
index f68cc10c..1db25c66 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.7.6</version>
+            <version>2.7.7</version>
         </dependency>
 
         <!--Logging framework implements slf4j which is required by hikari-->
@@ -50,6 +50,12 @@
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-config</artifactId>
             <version>1.12-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Cauldron) -->
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/mojang/UUIDTypeAdapter.java b/core/src/main/java/com/github/games647/fastlogin/core/mojang/UUIDTypeAdapter.java
index 4fa4f83e..ec12074f 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/mojang/UUIDTypeAdapter.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/mojang/UUIDTypeAdapter.java
@@ -2,6 +2,7 @@ package com.github.games647.fastlogin.core.mojang;
 
 import com.github.games647.fastlogin.core.CommonUtil;
 import com.google.gson.TypeAdapter;
+import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
@@ -11,10 +12,10 @@ import java.util.UUID;
 public class UUIDTypeAdapter extends TypeAdapter<UUID> {
 
     public void write(JsonWriter out, UUID value) throws IOException {
-        out.value(CommonUtil.toMojangId(value));
+        TypeAdapters.STRING.write(out, CommonUtil.toMojangId(value));
     }
 
     public UUID read(JsonReader in) throws IOException {
-        return CommonUtil.parseId(in.nextString());
+        return CommonUtil.parseId(TypeAdapters.STRING.read(in));
     }
 }
diff --git a/pom.xml b/pom.xml
index f90a5cb3..c8d05e7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
         <module>core</module>
         <module>bukkit</module>
         <module>bungee</module>
-        <module>universal</module>
     </modules>
 
     <build>
diff --git a/universal/pom.xml b/universal/pom.xml
deleted file mode 100644
index 4000a38b..00000000
--- a/universal/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.github.games647</groupId>
-        <artifactId>fastlogin</artifactId>
-        <version>1.11</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>fastlogin-universal</artifactId>
-    <packaging>jar</packaging>
-
-    <name>FastLoginUniversal</name>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <finalName>${project.parent.name}</finalName>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <shadedArtifactAttached>false</shadedArtifactAttached>
-                    <artifactSet>
-                        <includes>
-                            <include>${project.groupId}:*</include>
-                            <include>com.zaxxer:HikariCP</include>
-                            <include>org.slf4j:slf4j-jdk14</include>
-                            <include>org.slf4j:slf4j-api</include>
-                            <include>net.md-5:bungeecord-config</include>
-                            <include>com.google.code.gson:gson</include>
-                        </includes>
-                    </artifactSet>
-                    <relocations>
-                        <relocation>
-                            <pattern>com.google.gson</pattern>
-                            <shadedPattern>fastlogin.gson</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.slf4j</pattern>
-                            <shadedPattern>fastlogin.slf4j</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.zaxxer.hikari</pattern>
-                            <shadedPattern>fastlogin.hikari</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fastlogin.core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fastlogin.bukkit</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fastlogin.bungee</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>