Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 19:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Fixed maven shading

Browse Source
This commit is contained in:
Rsl1122 2018-01-28 14:21:45 +02:00
parent da95ed2583
commit b3ac110dfe
8 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/dependency-reduced-pom.xml
View File

@ -47,7 +47,6 @@
</execution>
</executions>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<excludes>
<exclude>org.powermock:*</exclude>

7
Plan/pom.xml
View File

@ -26,14 +26,12 @@
<groupId>com.djrapitops</groupId>
<artifactId>AbstractPluginFramework</artifactId>
<version>3.0.1</version>
<scope>compile</scope>
</dependency>
<!-- SoftDepended Plugins -->
<dependency>
<groupId>com.djrapitops</groupId>
<artifactId>PlanPluginBridge</artifactId>
<version>4.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Paper API -->
<dependency>
@ -69,7 +67,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.6</version>
<scope>compile</scope>
</dependency>
<!-- Geo IP -->
<dependency>
@ -82,19 +79,16 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.4.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency>
<!-- Mockito (Test Dependency) -->
@ -171,7 +165,6 @@
</execution>
</executions>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<excludes>
<exclude>org.powermock:*</exclude>

2
Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java
View File

@ -53,6 +53,8 @@ public class ShutdownHook extends Thread {
saveFirstSessionInformation(db, now);
saveActiveSessions(db, activeSessions, now);
} catch (IllegalStateException ignored) {
/* Database is not initialized */
} catch (DBInitException e) {
Log.toLog(this.getClass().getName(), e);
} finally {

10
Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java
View File

@ -2,7 +2,6 @@ package com.djrapitops.plan.data.container;
import com.djrapitops.plan.data.Actions;
import com.djrapitops.plan.system.cache.DataCache;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.Objects;
import java.util.UUID;
@ -81,10 +80,9 @@ public class PlayerKill {
@Override
public String toString() {
return new ToStringBuilder(this)
.append("victim", victim)
.append("time", time)
.append("weapon", weapon)
.toString();
return "PlayerKill{" +
"victim=" + victim + ", " +
"time=" + time + ", " +
"weapon='" + weapon + "'}";
}
}

18
Plan/src/main/java/com/djrapitops/plan/data/container/Session.java
View File

@ -2,7 +2,6 @@ package com.djrapitops.plan.data.container;
import com.djrapitops.plan.data.time.WorldTimes;
import com.djrapitops.plan.utilities.MiscUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.ArrayList;
import java.util.HashMap;
@ -194,14 +193,13 @@ public class Session {
@Override
public String toString() {
return new ToStringBuilder(this)
.append("sessionStart", sessionStart)
.append("sessionID", sessionID)
.append("worldTimes", worldTimes)
.append("sessionEnd", sessionEnd)
.append("playerKills", playerKills)
.append("mobKills", mobKills)
.append("deaths", deaths)
.toString();
return "Session{" +
"sessionStart=" + sessionStart + ", " +
"sessionID=" + sessionID + ", " +
"worldTimes=" + worldTimes + ", " +
"sessionEnd=" + sessionEnd + ", " +
"playerKills=" + playerKills + ", " +
"mobKills=" + mobKills + ", " +
"deaths=" + deaths + '}';
}
}

19
Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java
View File

@ -5,8 +5,6 @@
*/
package com.djrapitops.plan.data.container;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.Objects;
/**
@ -130,14 +128,13 @@ public class TPS {
@Override
public String toString() {
return new ToStringBuilder(this)
.append("date", date)
.append("ticksPerSecond", ticksPerSecond)
.append("players", players)
.append("cpuUsage", cpuUsage)
.append("usedMemory", usedMemory)
.append("entityCount", entityCount)
.append("chunksLoaded", chunksLoaded)
.toString();
return "TPS{" +
"date=" + date + ", " +
"ticksPerSecond=" + ticksPerSecond + ", " +
"players=" + players + ", " +
"cpuUsage=" + cpuUsage + ", " +
"usedMemory=" + usedMemory + ", " +
"entityCount=" + entityCount + ", " +
"chunksLoaded=" + chunksLoaded + '}';
}
}

8
Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
View File

@ -1,7 +1,6 @@
package com.djrapitops.plan.data.time;
import com.djrapitops.plugin.utilities.Verify;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.HashMap;
import java.util.Map;
@ -155,10 +154,7 @@ public abstract class TimeKeeper {
@Override
public String toString() {
return new ToStringBuilder(this)
.append("times", times)
.append("state", state)
.append("lastStateChange", lastStateChange)
.toString();
return "TimeKeeper{" + "times=" + times +
", state='" + state + "', lastStateChange=" + lastStateChange + '}';
}
}

9
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Point.java
View File

@ -1,7 +1,5 @@
package com.djrapitops.plan.utilities.analysis;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.Objects;
/**
@ -41,9 +39,8 @@ public class Point {
@Override
public String toString() {
return new ToStringBuilder(this)
.append("x", x)
.append("y", y)
.toString();
return "Point{" +
"x=" + x + ", " +
"y=" + y + '}';
}
}