GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Shade some dependencies

Browse Source
This commit is contained in:
Tim203
2021-07-23 17:44:01 +02:00
parent 3bcdd98c25
commit b66f10ae6d
7 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bungee/pom.xml
View File

@@ -24,6 +24,7 @@
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- following dependencies are relocated -->
<dependency> <dependency>
<groupId>cloud.commandframework</groupId> <groupId>cloud.commandframework</groupId>
<artifactId>cloud-bungee</artifactId> <artifactId>cloud-bungee</artifactId>
@@ -89,6 +90,18 @@
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration>
<relocations>
<relocation>
<pattern>cloud.commandframework</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.cloud.commandframework</shadedPattern>
</relocation>
<relocation>
<pattern>net.kyori</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.net.kyori</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>

2
common/pom.xml
View File

@@ -58,7 +58,7 @@
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId> <artifactId>adventure-api</artifactId>
<version>4.1.1</version> <version>${adventure-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cloud.commandframework</groupId> <groupId>cloud.commandframework</groupId>

8
database/mysql/pom.xml
View File

@@ -45,6 +45,14 @@
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration>
<relocations>
<relocation>
<pattern>org.mariadb</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.org.mariadb</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>

8
database/sqlite/pom.xml
View File

@@ -45,6 +45,14 @@
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration>
<relocations>
<relocation>
<pattern>org.sqlite</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.org.sqlite</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>

2
database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
View File

@@ -59,7 +59,7 @@ public class SqliteDatabase extends CommonPlayerLink {
Path databasePath = dataDirectory.resolve("linked-players.db"); Path databasePath = dataDirectory.resolve("linked-players.db");
try { try {
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");
connection = DriverManager.getConnection("jdbc:sqlite:" + databasePath.toString()); connection = DriverManager.getConnection("jdbc:sqlite:" + databasePath);
try (Statement statement = connection.createStatement()) { try (Statement statement = connection.createStatement()) {
statement.executeUpdate( statement.executeUpdate(
"create table if not exists LinkedPlayers (bedrockId string, javaUniqueId string, javaUsername string)" "create table if not exists LinkedPlayers (bedrockId string, javaUniqueId string, javaUsername string)"

9
spigot/pom.xml
View File

@@ -50,6 +50,7 @@
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- the following dependencies are (also) relocated -->
<dependency> <dependency>
<groupId>cloud.commandframework</groupId> <groupId>cloud.commandframework</groupId>
<artifactId>cloud-bukkit</artifactId> <artifactId>cloud-bukkit</artifactId>
@@ -111,6 +112,14 @@
</goals> </goals>
<configuration> <configuration>
<relocations> <relocations>
<relocation>
<pattern>cloud.commandframework</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.cloud.commandframework</shadedPattern>
</relocation>
<relocation>
<pattern>net.kyori</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.net.kyori</shadedPattern>
</relocation>
<!-- hack to make pre 1.12 work --> <!-- hack to make pre 1.12 work -->
<relocation> <relocation>
<pattern>com.google.common</pattern> <pattern>com.google.common</pattern>

14
velocity/pom.xml
View File

@@ -52,6 +52,12 @@
<version>${cloud.version}</version> <version>${cloud.version}</version>
</dependency> </dependency>
<!-- the following common dependencies are already present on the platform --> <!-- the following common dependencies are already present on the platform -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>${adventure-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
@@ -107,6 +113,14 @@
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration>
<relocations>
<relocation>
<pattern>cloud.commandframework</pattern>
<shadedPattern>org.geysermc.floodgate.shaded.cloud.commandframework</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>