Upstream/PlayerBalancer
1
0
Fork 0
mirror of https://github.com/BGHDDevelopment/PlayerBalancer.git synced 2024-11-22 18:55:20 +01:00
Code Issues Projects Releases Wiki Activity

Project cleanup

Browse Source
This commit is contained in:
sgdc3 2018-03-03 17:15:39 +01:00
parent 4506aca323
commit c70c897763
67 changed files with 166 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Spigot Addon/pom.xml → addon/pom.xml
View File

@ -1,31 +1,18 @@
<?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"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>playerbalancer</artifactId>
<groupId>com.jaimemartz</groupId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>PlayerBalancer Addon</name>
<artifactId>playerbalancer-addon</artifactId>
<version>1.3 for 2.1.4+</version>
<parent>
<groupId>com.jaimemartz</groupId>
<version>2.1.5.5-SNAPSHOT</version>
<artifactId>playerbalancer-parent</artifactId>
</parent>
<build>
<finalName>PlayerBalancerAddon</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<outputDirectory>../target</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<artifactId>playerbalancer-addon</artifactId>
<name>PlayerBalancerAddon</name>
<repositories>
<repository>

0
Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java → addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java
View File

0
Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlaceholderHandler.java → addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlaceholderHandler.java
View File

0
Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java → addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java
View File

0
Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java → addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
View File

0
Spigot Addon/src/main/resources/plugin.yml → addon/src/main/resources/plugin.yml
View File

59
Main Plugin/pom.xml → balancer/pom.xml
View File

@ -1,31 +1,38 @@
<?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"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>playerbalancer</artifactId>
<groupId>com.jaimemartz</groupId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>PlayerBalancer Plugin</name>
<artifactId>playerbalancer-plugin</artifactId>
<version>2.1.5.4</version>
<parent>
<groupId>com.jaimemartz</groupId>
<version>2.1.5.5-SNAPSHOT</version>
<artifactId>playerbalancer-parent</artifactId>
</parent>
<artifactId>playerbalancer</artifactId>
<name>PlayerBalancer</name>
<build>
<finalName>PlayerBalancer</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>com.jaimemartz.playerbalancer.metrics</shadedPattern>
</relocation>
<relocation>
<pattern>ninja.leaping.configurate</pattern>
<shadedPattern>com.jaimemartz.playerbalancer.libs.ninja.leaping.configurate</shadedPattern>
</relocation>
<relocation>
<pattern>com.typesafe.config</pattern>
<shadedPattern>com.jaimemartz.playerbalancer.libs.com.typesafe.config</shadedPattern>
</relocation>
</relocations>
</configuration>
<executions>
@ -37,30 +44,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<outputDirectory>../target</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>md_5-snapshots</id>
<url>http://repo.md-5.net/content/repositories/snapshots/</url>
</repository>
<repository>
<id>inventive-repo</id>
<url>https://repo.inventivetalent.org/content/groups/public/</url>
</repository>
<repository>
<id>bstats-repo</id>
<url>http://repo.bstats.org/content/repositories/releases/</url>
@ -103,17 +94,5 @@
<version>1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.16</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java → balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java → balancer/src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java → balancer/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java → balancer/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ProviderType.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ProviderType.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ServerAssignRegistry.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ServerAssignRegistry.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/AbstractProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/AbstractProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/NullProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/NullProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveFillerProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveFillerProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveLowestProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveLowestProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomFillerProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomFillerProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomLowestProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomLowestProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomProvider.java → balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomProvider.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java → balancer/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java → balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PlayerLocker.java → balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PlayerLocker.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PlayerDisconnectListener.java → balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PlayerDisconnectListener.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java → balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ProxyReloadListener.java → balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ProxyReloadListener.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java → balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java → balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java → balancer/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/ServerStatus.java → balancer/src/main/java/com/jaimemartz/playerbalancer/ping/ServerStatus.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java → balancer/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionCommand.java → balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionCommand.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java → balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java → balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java → balancer/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/SettingsHolder.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/SettingsHolder.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/FeaturesProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/FeaturesProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/GeneralProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/GeneralProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/MessagesProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/MessagesProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/BalancerProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/BalancerProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/FallbackCommandProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/FallbackCommandProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/KickHandlerProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/KickHandlerProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/PermissionRouterProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/PermissionRouterProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/ServerCheckerProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/ServerCheckerProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/ServerRefreshProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/ServerRefreshProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/shared/CommandProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/shared/CommandProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/shared/SectionProps.java → balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/shared/SectionProps.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/AdapterWrapper.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AdapterWrapper.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/AlphanumComparator.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AlphanumComparator.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/BuildInfo.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/BuildInfo.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/CustomFormatter.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/CustomFormatter.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/DigitUtils.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/DigitUtils.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/FixedAdapter.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/FixedAdapter.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/GuestPaste.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/GuestPaste.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/HastebinPaste.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/HastebinPaste.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/LevenshteinDistance.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/LevenshteinDistance.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/MessageUtils.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/MessageUtils.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/RandomUtils.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/RandomUtils.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/RegExUtils.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/RegExUtils.java
View File

0
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/ServerListPing.java → balancer/src/main/java/com/jaimemartz/playerbalancer/utils/ServerListPing.java
View File

0
Main Plugin/src/main/resources/default.conf → balancer/src/main/resources/default.conf
View File

0
Main Plugin/src/main/resources/plugin.yml → balancer/src/main/resources/plugin.yml
View File

0
Main Plugin/src/test/java/DefaultConfigLoadTest.java → balancer/src/test/java/DefaultConfigLoadTest.java
View File

0
Main Plugin/src/test/java/HastebinPasteTest.java → balancer/src/test/java/HastebinPasteTest.java
View File

151
pom.xml
View File

@ -1,29 +1,67 @@
<?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"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
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>
<groupId>com.jaimemartz</groupId>
<artifactId>playerbalancer</artifactId>
<artifactId>playerbalancer-parent</artifactId>
<version>2.1.5.5-SNAPSHOT</version>
<packaging>pom</packaging>
<version>1</version>
<name>PlayerBalancer Parent</name>
<modules>
<module>balancer</module>
<module>addon</module>
</modules>
<name>PlayerBalancerParent</name>
<description>PlayerBalancer is a BungeeCord plugin for setting up a network with multiple lobbies of different types.</description>
<inceptionYear>2015</inceptionYear>
<url>https://www.spigotmc.org/resources/bungeecord-playerbalancer.10788/</url>
<scm>
<connection>scm:git:https://github.com/jamezrin/PlayerBalancer.git</connection>
<developerConnection>scm:git:git@github.com:jamezrin/PlayerBalancer.git</developerConnection>
<url>https://github.com/jamezrin/PlayerBalancer</url>
</scm>
<ciManagement>
<system>jenkins</system>
<url>http://ci.codemc.org/job/PlayerBalancer/</url>
</ciManagement>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/jamezrin/PlayerBalancer/issues</url>
</issueManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<modules>
<module>Spigot Addon</module>
<module>Main Plugin</module>
</modules>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>${project.name}-${project.version}</finalName>
<resources>
<resource>
<directory>src/main/resources/</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<version>3.3</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<version>3.7.0</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@ -31,12 +69,91 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<!-- Not used ATM
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>aggregate</goal>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<show>public</show>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>