Do you have more plugins? ._.
+
+STYLE:
+
+#267f00 - Theme
+#222 - Punchcard
+#89c471 - Theme (+sessionLength)
+#b58310 - Chunks
+#ac69ef - Entities
+#7dcc24 - RAM
+#e0d264 - CPU
+
+https://fonts.googleapis.com/css?family=Quicksand:300,400 (Font Link)
+
+main.css:
+#fff (white)
+#000 (black)
+
+#e2e2e2 (Table, even)
+#eee (Table, odd)
+
+#348e0f Theme (Header, on hover) Darker
+#5da341 Theme (Main color)
+
+'Quicksand', sans-serif (Font Family)
\ No newline at end of file
diff --git a/Plan/src/main/resources/analysis.html b/Plan/src/main/resources/analysis.html
deleted file mode 100644
index 7237bc077..000000000
--- a/Plan/src/main/resources/analysis.html
+++ /dev/null
@@ -1,1361 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Unique Players: %uniquejoinsday% | Unique/Day: %avguniquejoinsday%
-
-
-
-
-
-
-
Total Playtime: %totalplaytime% | Player Average: %avgplaytime%
- Average Session Length:
- %sessionaverage%
- Total Login times:
- %totallogins%
- Average Unique Players/Day:
- %avguniquejoins% | Average New/Day:
- %newperday%
- Player kills: %playerkills% | Mob kills: %mobkills% | Deaths: %deaths%
-
-
-
-
-
-
-
-
-
-
Month:
- Unique Players: %uniquejoinsmonth%
- Unique/Day: %avguniquejoinsmonth%
-
- New Players: %npmonth%
- New Players / Day: %newperdaymonth%
-
Week:
- Unique Players: %uniquejoinsweek%
- Unique/Day: %avguniquejoinsweek%
- New Players: %npweek%
- New Players / Day: %newperdayweek%
-
Day:
- Unique Players: %uniquejoinsday%
- Unique/Day: %avguniquejoinsday%
- New Players: %npday%
- New Players / Day: %newperdayday%
-
-
-
-
-
-
-
-
-
-
Week:
- Average TPS: %averagetpsweek%
- Average CPU: %averagecpuweek%
- Average RAM: %averagememoryweek%Mb
- Avg. Entities: %averageentitiesweek%
- Average Chunks: %averagechunksweek%
-
-
Day:
- Average TPS: %averagetpsday%
- Average CPU: %averagecpuday%
- Average RAM: %averagememoryday%Mb
- Avg. Entities: %averageentitiesday%
- Average Chunks: %averagechunksday%
-
-
-
-
-
-
-
-
-
-
-
-
-
- Player |
- Active |
- Playtime |
- Login times |
- Registered |
- Last seen |
- Geolocation |
-
-
-
- %sortabletable%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Command |
- Times used |
-
-
-
- %commanduse%
-
-
-
-
-
-
-
-
- %plugins%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Plan/src/main/resources/config.yml b/Plan/src/main/resources/config.yml
index 365bc58ed..78fb1901b 100644
--- a/Plan/src/main/resources/config.yml
+++ b/Plan/src/main/resources/config.yml
@@ -1,108 +1,102 @@
-Settings:
+Server:
+ ServerName: 'Plan'
+
+Plugin:
Debug: false
Locale: default
- WriteNewLocaleFileOnStart: false
- UseTextUI: false
- Data:
- ChatListener: true
- GatherKillData: true
- GatherCommandUsage: true
- Analysis:
- LogProgressOnConsole: false
- NotifyWhenFinished: true
- MinutesPlayedUntilConsidiredActive: 10
- Export:
- Enabled: false
- DestinationFolder: 'Analysis Results'
- Cache:
- Processing:
- GetLimit: 5000
- SaveLimit: 2500
- ClearLimit: 2500
- AnalysisCache:
- RefreshAnalysisCacheOnEnable: true
- RefreshEveryXMinutes: -1
- InspectCache:
- ClearFromInspectCacheAfterXMinutes: 5
- DataCache:
- SaveEveryXMinutes: 2
- ClearCacheEveryXSaves: 5
- WebServer:
- Enabled: true
- Port: 8804
- InternalIP: 0.0.0.0
- ShowAlternativeServerIP: false
- AlternativeIP: your.ip.here:%port%
+ WriteNewLocaleFileOnEnable: false
+ Bungee-Override:
+ StandaloneMode: false
+ CopyBungeeConfig: true
+
+WebServer:
+ Port: 8804
+ InternalIP: 0.0.0.0
+ Security:
+ SSL-Certificate:
+ KeyStorePath: 'SSLCertificate.keystore'
+ KeyPass: 'default'
+ StorePass: 'default'
+ Alias: 'alias'
+
+Database:
+ Type: SQLite
+ MySQL:
+ Host: localhost
+ Port: 3306
+ User: root
+ Password: minecraft
+ Database: Plan
+
+Commands:
+ AlternativeIP:
+ Enabled: false
+ Link: your.domain.here:%port%
+ Colors:
+ Main: '&2'
+ Secondary: '&7'
+ Highlight: '&f'
+
+Analysis:
+ AutoRefreshPeriod: 60
+ Export:
+ Enabled: false
ExternalWebServerLinkProtocol: http
- Security:
- DisplayIPsAndUUIDs: true
- Certificate:
- KeyStorePath: 'SSLCertificate.keystore'
- KeyPass: 'default'
- StorePass: 'default'
- Alias: 'alias'
+ DestinationFolder: 'Analysis Results'
+
+Data:
+ Commands:
+ LogUnknownCommands: false
+ CombineCommandAliases: true
Customization:
- ServerName: 'Plan'
- SmallHeadImagesOnAnalysisPlayerlist: true
- Data:
- DoNotLogUnknownCommands: false
- CombineCommandAliasesToMainCommand: false
- Formats:
+ Formatting:
+ DecimalPoints: '#.##'
TimeAmount:
Year: '1 year, '
Years: '%years% years, '
+ Month: '1 month, '
+ Months: '%months% months, '
Day: '1d '
Days: '%days%d '
Hours: '%hours%h '
Minutes: '%minutes%m '
Seconds: '%seconds%s'
- DecimalPoints: '#.##'
- Colors:
- Commands:
- Main: '&2'
- Secondary: '&7'
- Highlight: '&f'
- HTML:
- UI:
- Main: 348e0f
- MainDark: 267F00
- Secondary: 5cb239
- Tertiary: 89c471
- TertiaryDark: 5da341
- TPSGraph:
- TPSHigh: 18
- TPSMedium: 10
- TPSHighCol: 267F00
- TPSMediumCol: e5cc12
- TPSLowCol: b74343
- ActivityGraph:
- OnlinePlayers: '1E90FF'
- NewPlayers: '228B22'
- GamemodePie:
- Survival: '438c99'
- Creative: '639A67'
- Adventure: 'D8EBB5'
- Spectator: 'D9BF77'
- ActivityPie:
- Active: '228B22'
- Banned: '951800'
- Inactive: 'A9A9A9'
- JoinedOnce: '808080'
- Plugins:
- Factions:
- HideFactions:
- - ExampleFaction
- Towny:
- HideTowns:
- - ExampleTown
-database:
- type: sqlite
-
-mysql:
- host: localhost
- port: 3306
- user: root
- password: minecraft
- database: Plan
+Theme:
+ Base: Default
+ Font:
+ FontStyleSheet: https://fonts.googleapis.com/css?family=Quicksand:300,400
+ FontFamily: "'Quicksand', sans-serif"
+ Color:
+ Dark: Base
+ Light: Base
+ Colors:
+ Main: Base
+ Secondary: Base
+ Secondary-Dark: Base
+ Tertiary: Base
+ Background: Base
+ Table-Light: Base
+ Table-Dark: Base
+ Graphs:
+ PunchCard: Base
+ PlayersOnline: Base
+ TPS:
+ High-Threshold: 18
+ Medium-Threshold: 10
+ High: Base
+ Medium: Base
+ Low: Base
+ CPU: Base
+ RAM: Base
+ Chunks: Base
+ Entities: Base
+
+Plugins:
+ Factions:
+ HideFactions:
+ - ExampleFaction
+ Towny:
+ HideTowns:
+ - ExampleTown
diff --git a/Plan/src/main/resources/html/network – Example.html b/Plan/src/main/resources/html/network – Example.html
new file mode 100644
index 000000000..faaa354aa
--- /dev/null
+++ b/Plan/src/main/resources/html/network – Example.html
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Session Length: 3h 5m
+ Session Ended: Aug 14 2017, 13:12
+ Server: Server 2
+
+ Mob Kills: 0
+ Deaths: 1
+
+
+
+ Time |
+ Killed |
+ With |
+
+
+
+
+ 12:42 |
+ Zubat |
+ Lightning |
+
+
+ 12:53 |
+ Zezima |
+ Iron Sword |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Session Length: 3h 5m
+ Session Ended: Aug 13 2017, 16:28
+ Server: Server 1
+
+ Mob Kills: 45
+ Deaths: 6
+
+
+
+ Time |
+ Killed |
+ With |
+
+
+
+
+ 13:42 |
+ Zubat |
+ Lightning |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Test: 5 / 25
+ Test: 20%
+
More data: Yes
+ Data: 4
+
+
+
+
+
+
Yes
+ Yes
+ Yes
Yes
Yes
Yes
Yes
+ Yes
Yes
Yes
Yes
Yes
+ Yes
Yes
Yes
Yes
Yes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Test |
+ Test2 |
+
+
+
+
+ Data |
+ Data |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plan/src/main/resources/html/player.html b/Plan/src/main/resources/html/player.html
new file mode 100644
index 000000000..ba0a6743c
--- /dev/null
+++ b/Plan/src/main/resources/html/player.html
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Unique Players: 217
+ Unique / Day: 217
+
New Players: 38
+ New / Day: 38
+
+
+
+
+
+
Unique Players: 670
+ Unique / Day: 204
+
New Players: 247
+ New / Day: 35
+
+
+
+
+
+
Unique Players: 812
+ Unique / Day: 196
+
New Players: 463
+ New / Day: 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Test: 5 / 25
+ Test: 20%
+
More data: Yes
+ Data: 4
+
+
+
+
+
+
Yes
+ Yes
+ Yes
Yes
Yes
Yes
Yes
+ Yes
Yes
Yes
Yes
Yes
+ Yes
Yes
Yes
Yes
Yes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Test |
+ Test2 |
+
+
+
+
+ Data |
+ Data |
+
+
+
+
+
+
+
+
+
Do you have more plugins? ._.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plan/src/main/resources/html/server.html b/Plan/src/main/resources/html/server.html
new file mode 100644
index 000000000..ee14fc76f
--- /dev/null
+++ b/Plan/src/main/resources/html/server.html
@@ -0,0 +1,536 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Unique Players: ${playersDay}
+ Unique / Day: ${playersAverageDay}
+
New Players: ${playersNewDay}
+ New / Day: ${playersNewAverageDay}
+
+
+
+
+
+
Unique Players: ${playersWeek}
+ Unique / Day: ${playersAverageWeek}
+
New Players: ${playersNewWeek}
+ New / Day: ${playersNewAverageWeek}
+
+
+
+
+
+
Unique Players: ${playersMonth}
+ Unique / Day: ${playersAverageMonth}
+
New Players: ${playersNewMonth}
+ New / Day: ${playersNewAverageMonth}
+
+
+
+
+
+
+
+
+
+
+ ${tabContentPlugins}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plan/src/main/resources/js/activityPie.js b/Plan/src/main/resources/js/activityPie.js
new file mode 100644
index 000000000..58da2997c
--- /dev/null
+++ b/Plan/src/main/resources/js/activityPie.js
@@ -0,0 +1,26 @@
+function activityPie(id, activitySeries, activityTotal, activityColors) {
+ var myChart = Highcharts.chart(id, {
+ chart: {
+ plotBackgroundColor: null,
+ plotBorderWidth: null,
+ plotShadow: false,
+ type: 'pie'
+ },
+ subtitle: {text: 'Total Players:' + activityTotal},
+ tooltip: {
+ pointFormat: '{series.name}:
-
-
-
-
-
-
-
-
-
%active% %isonline%%banned%
- Nicknames: %nicknames%
- Playtime: %playtime%
- Login times: %logintimes%
- Times kicked: %timeskicked%
- Player kills: %playerkills% | Mob kills: %mobkills% | Deaths: %deaths%
-
- Geolocation: %geoloc%
- UUID: %uuid%
- Has Connected from ips: %ips%
-
-
-
-
-
-
-
-
- %plugins%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java
index 139ea0deb..84a504708 100644
--- a/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java
+++ b/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java
@@ -17,9 +17,7 @@ import test.java.utils.TestInit;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
/**
* @author Rsl1122
@@ -38,12 +36,12 @@ public class SettingsTest {
@Test
public void testIsTrue() {
- assertTrue("Webserver supposed to be enabled by default", Settings.WEBSERVER_ENABLED.isTrue());
+ assertTrue("COMBINE_COMMAND_ALIASES supposed to be true by default", Settings.COMBINE_COMMAND_ALIASES.isTrue());
}
@Test
public void testIsTrue2() {
- Settings gatherCommands = Settings.GATHERCOMMANDS;
+ Settings gatherCommands = Settings.LOG_UNKNOWN_COMMANDS;
gatherCommands.setValue(false);
assertFalse(gatherCommands.isTrue());
@@ -54,7 +52,7 @@ public class SettingsTest {
@Test
public void testToString() {
- assertEquals("sqlite", Settings.DB_TYPE.toString());
+ assertEquals("SQLite", Settings.DB_TYPE.toString());
}
@Test
@@ -72,6 +70,6 @@ public class SettingsTest {
@Test
public void testGetPath() {
- assertEquals("Settings.WebServer.Enabled", Settings.WEBSERVER_ENABLED.getPath());
+ assertEquals("WebServer.Port", Settings.WEBSERVER_PORT.getPath());
}
}
diff --git a/Plan/test/test/java/utils/TestInit.java b/Plan/test/test/java/utils/TestInit.java
index fe6af2826..6b555a71c 100644
--- a/Plan/test/test/java/utils/TestInit.java
+++ b/Plan/test/test/java/utils/TestInit.java
@@ -88,7 +88,7 @@ public class TestInit {
when(planMock.getDataFolder()).thenReturn(testFolder);
// Html Files
- File analysis = new File(getClass().getResource("/analysis.html").getPath());
+ File analysis = new File(getClass().getResource("/server.html").getPath());
when(planMock.getResource("analysis.html")).thenReturn(new FileInputStream(analysis));
File player = new File(getClass().getResource("/player.html").getPath());
when(planMock.getResource("player.html")).thenReturn(new FileInputStream(player));