Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-29 23:17:28 +02:00
Code Issues Projects Releases Wiki Activity

Simplified TPSBuilder

Browse Source 
Removed nested classes that created an inheritance tree 9 deep.
This commit is contained in:
Rsl1122 2018-11-11 21:14:49 +02:00
parent bdd4d4c333
commit 9801aa584b
4 changed files with 26 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/tasks/bungee/BungeeTPSCountTimer.java
View File

@ -50,7 +50,6 @@ public class BungeeTPSCountTimer extends TPSCountTimer {
int onlineCount = serverProperties.getOnlinePlayers();
TPS tps = TPSBuilder.get()
.date(now)
.skipTPS()
.playersOnline(onlineCount)
.usedCPU(getCPUUsage())
.usedMemory(getUsedMemory())

79
Plan/common/src/main/java/com/djrapitops/plan/data/container/builders/TPSBuilder.java
View File

@ -40,78 +40,51 @@ public class TPSBuilder {
private TPSBuilder() {
}
public static TPSBuilder.Date get() {
return new TPSBuilder.DiskSpace();
public static TPSBuilder get() {
return new TPSBuilder();
}
public TPS toTPS() {
return new TPS(date, ticksPerSecond, players, cpuUsage, usedMemory, entityCount, chunksLoaded, freeDiskSpace);
}
public static class Date extends TPSBuilder {
public Ticks date(long date) {
this.date = date;
return (Ticks) this;
}
public TPSBuilder date(long date) {
this.date = date;
return this;
}
public static class Ticks extends Date {
public Players tps(double tps) {
ticksPerSecond = tps;
return (Players) this;
}
public Players skipTPS() {
return (Players) this;
}
public TPSBuilder tps(double tps) {
ticksPerSecond = tps;
return this;
}
public static class Players extends Ticks {
public CPU playersOnline(int online) {
players = online;
return (CPU) this;
}
public TPSBuilder playersOnline(int online) {
players = online;
return this;
}
public static class CPU extends Players {
public Memory usedCPU(double cpu) {
cpuUsage = cpu;
return (Memory) this;
}
public TPSBuilder usedCPU(double cpu) {
cpuUsage = cpu;
return this;
}
public static class Memory extends CPU {
public Entities usedMemory(long ram) {
usedMemory = ram;
return (Entities) this;
}
public TPSBuilder usedMemory(long ram) {
usedMemory = ram;
return this;
}
public static class Entities extends Memory {
public Chunks entities(int count) {
entityCount = count;
return (Chunks) this;
}
public TPSBuilder entities(int count) {
entityCount = count;
return this;
}
public static class Chunks extends Entities {
public DiskSpace chunksLoaded(int chunksLoaded) {
this.chunksLoaded = chunksLoaded;
return (DiskSpace) this;
}
public TPSBuilder chunksLoaded(int chunksLoaded) {
this.chunksLoaded = chunksLoaded;
return this;
}
public static class DiskSpace extends Chunks {
public TPSBuilder freeDiskSpace(long freeDiskSpace) {
this.freeDiskSpace = freeDiskSpace;
return this;
}
public TPSBuilder freeDiskSpace(long freeDiskSpace) {
this.freeDiskSpace = freeDiskSpace;
return this;
}
}

2
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java
View File

@ -294,7 +294,6 @@ public class TPSTable extends Table {
TPS tps = TPSBuilder.get()
.date(set.getLong(Col.DATE.get()))
.skipTPS()
.playersOnline(set.getInt(Col.PLAYERS_ONLINE.get()))
.toTPS();
@ -359,7 +358,6 @@ public class TPSTable extends Table {
List<TPS> tpsList = map.getOrDefault(serverID, new ArrayList<>());
TPS tps = TPSBuilder.get().date(date)
.skipTPS()
.playersOnline(playersOnline)
.toTPS();
tpsList.add(tps);

1
Plan/velocity/src/main/java/com/djrapitops/plan/system/tasks/velocity/VelocityTPSCountTimer.java
View File

@ -50,7 +50,6 @@ public class VelocityTPSCountTimer extends TPSCountTimer {
int onlineCount = serverProperties.getOnlinePlayers();
TPS tps = TPSBuilder.get()
.date(now)
.skipTPS()
.playersOnline(onlineCount)
.usedCPU(getCPUUsage())
.usedMemory(getUsedMemory())