Skip to content

Commit a1f1bc0

Browse files
jamezrinjamezrin
authored
Merge pull request BGHDDevelopment#3 from sgdc3/cleanup
Cleanup
2 parents 4506aca + ca6f541 commit a1f1bc0

File tree

68 files changed

+162
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+162
-80
lines changed

‎README.md‎

Lines changed: 1 addition & 2 deletions

Spigot Addon/pom.xml renamed to addon/pom.xml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
57
<parent>
6-
<artifactId>playerbalancer</artifactId>
78
<groupId>com.jaimemartz</groupId>
8-
<version>1</version>
9+
<version>2.1.5.5-SNAPSHOT</version>
10+
<artifactId>playerbalancer-parent</artifactId>
911
</parent>
10-
<modelVersion>4.0.0</modelVersion>
1112

12-
<name>PlayerBalancer Addon</name>
1313
<artifactId>playerbalancer-addon</artifactId>
14-
<version>1.3 for 2.1.4+</version>
1514

16-
<build>
17-
<finalName>PlayerBalancerAddon</finalName>
18-
<plugins>
19-
<plugin>
20-
<groupId>org.apache.maven.plugins</groupId>
21-
<artifactId>maven-jar-plugin</artifactId>
22-
<version>3.0.2</version>
23-
<configuration>
24-
<outputDirectory>../target</outputDirectory>
25-
</configuration>
26-
</plugin>
27-
</plugins>
28-
</build>
15+
<name>PlayerBalancerAddon</name>
2916

3017
<repositories>
3118
<repository>
@@ -52,4 +39,4 @@
5239
<scope>provided</scope>
5340
</dependency>
5441
</dependencies>
55-
</project>
42+
</project>

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java renamed to addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java

File renamed without changes.

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlaceholderHandler.java renamed to addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlaceholderHandler.java

File renamed without changes.

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java renamed to addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java

File renamed without changes.

Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java renamed to addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java

File renamed without changes.

Spigot Addon/src/main/resources/plugin.yml renamed to addon/src/main/resources/plugin.yml

File renamed without changes.

Main Plugin/pom.xml renamed to balancer/pom.xml

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
57
<parent>
6-
<artifactId>playerbalancer</artifactId>
78
<groupId>com.jaimemartz</groupId>
8-
<version>1</version>
9+
<version>2.1.5.5-SNAPSHOT</version>
10+
<artifactId>playerbalancer-parent</artifactId>
911
</parent>
10-
<modelVersion>4.0.0</modelVersion>
1112

12-
<name>PlayerBalancer Plugin</name>
13-
<artifactId>playerbalancer-plugin</artifactId>
14-
<version>2.1.5.4</version>
13+
<artifactId>playerbalancer</artifactId>
14+
15+
<name>PlayerBalancer</name>
1516

1617
<build>
17-
<finalName>PlayerBalancer</finalName>
1818
<plugins>
1919
<plugin>
2020
<groupId>org.apache.maven.plugins</groupId>
2121
<artifactId>maven-shade-plugin</artifactId>
22-
<version>2.4.3</version>
2322
<configuration>
2423
<relocations>
2524
<relocation>
2625
<pattern>org.bstats</pattern>
2726
<shadedPattern>com.jaimemartz.playerbalancer.metrics</shadedPattern>
2827
</relocation>
28+
<relocation>
29+
<pattern>ninja.leaping.configurate</pattern>
30+
<shadedPattern>com.jaimemartz.playerbalancer.libs.ninja.leaping.configurate</shadedPattern>
31+
</relocation>
32+
<relocation>
33+
<pattern>com.typesafe.config</pattern>
34+
<shadedPattern>com.jaimemartz.playerbalancer.libs.com.typesafe.config</shadedPattern>
35+
</relocation>
2936
</relocations>
3037
</configuration>
3138
<executions>
@@ -37,30 +44,14 @@
3744
</execution>
3845
</executions>
3946
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-jar-plugin</artifactId>
43-
<version>2.3.1</version>
44-
<configuration>
45-
<outputDirectory>../target</outputDirectory>
46-
</configuration>
47-
</plugin>
4847
</plugins>
4948
</build>
5049

5150
<repositories>
52-
<repository>
53-
<id>bungeecord-repo</id>
54-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
55-
</repository>
5651
<repository>
5752
<id>md_5-snapshots</id>
5853
<url>http://repo.md-5.net/content/repositories/snapshots/</url>
5954
</repository>
60-
<repository>
61-
<id>inventive-repo</id>
62-
<url>https://repo.inventivetalent.org/content/groups/public/</url>
63-
</repository>
6455
<repository>
6556
<id>bstats-repo</id>
6657
<url>http://repo.bstats.org/content/repositories/releases/</url>
@@ -103,17 +94,5 @@
10394
<version>1.2</version>
10495
<scope>compile</scope>
10596
</dependency>
106-
<dependency>
107-
<groupId>junit</groupId>
108-
<artifactId>junit</artifactId>
109-
<version>4.12</version>
110-
<scope>test</scope>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.projectlombok</groupId>
114-
<artifactId>lombok</artifactId>
115-
<version>1.16.16</version>
116-
<scope>provided</scope>
117-
</dependency>
11897
</dependencies>
119-
</project>
98+
</project>

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java renamed to balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

File renamed without changes.

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java renamed to balancer/src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java

File renamed without changes.

0 commit comments

Comments
 (0)