Commit Graph

5049 Commits

Author SHA1 Message Date
Fuzzlemann
0064664c9c Merge branch 'master' of https://github.com/Fuzzlemann/Plan-PlayerAnalytics 2017-07-29 21:57:08 +02:00
Fuzzlemann
1903b94288 Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-29 21:47:45 +02:00
Fuzzlemann
d1be610e96 Merge branch '3.6.0' into master 2017-07-29 21:44:53 +02:00
Rsl1122
50e3d839e3 Buffer the Outputstream for response
Add html header to /players
2017-07-29 22:30:15 +03:00
Rsl1122
dd299cd8ee Fix Http Server Start when Certificate is not found. 2017-07-29 21:36:30 +03:00
Rsl1122
0b0ef2941d Fix Webserver root redirect for perm level 0 2017-07-29 21:18:41 +03:00
Rsl1122
a84632686d Fix hashCode NPE
Attempt to fix "issued command: /plan register" filtering from console output - failed
2017-07-29 21:13:08 +03:00
Rsl1122
e6d7428c7f Fix WebServer responses for users with permission level 1 2017-07-29 20:35:49 +03:00
Rsl1122
74dd2261c9 Removed Todo for protocol upgrade http server 2017-07-29 20:02:09 +03:00
Rsl1122
e6fca61a59 Finished writing webserver functionality:
- Http server if cert not found
- Automatic path based on level
- Cleaned Responses a bit
- Using own Authentication
- Commands notify about missing user only when using auth
- New settings: UsingExternalWebserver, ExternalWebServerLinkProtocol (renamed LinkProtocol)

Removed TODO note from NicknamesTable
2017-07-29 20:01:08 +03:00
Fuzzlemann
505d2a9058 Recodes the sum(int[][]) method
Adds one double cast to an Integer operand to prevent a rounded Integer from returning
Removes outdated test
Performance improvements
2017-07-29 17:23:52 +02:00
Fuzzlemann
c1ba6a47ba Add a multithread executor 2017-07-29 11:47:40 +02:00
Rsl1122
ed555cce76 WebServer functionality restored. (Https instead of http)
TODO:
- Bump Http requests to Https
- Http server if certificate load fails
- No path automatic redirection based on permission level
  - Move to manual authentication instead of Authenticator
    - 403 Page
    - 401 Unauthorized Page
- Tutorial for Keystore creation
2017-07-29 12:40:39 +03:00
Rsl1122
a2f7587b8d Renamed WebSocketServer to WebServer 2017-07-29 12:16:19 +03:00
Rsl1122
75af8b58f8 Fixes mistakes not caught in the review of pull request. 2017-07-29 12:11:04 +03:00
Rsl1122
f7f0a3f141 Add few more Error cases 2017-07-29 11:31:32 +03:00
Rsl1122
00d91ea140 Merge pull request #204 from Fuzzlemann/master
PR for 3.6.0 (Fuzzlemann) (4)
2017-07-29 11:27:51 +03:00
Fuzzlemann
fb4225a377 Fixed some bugs resulting of my changes 2017-07-29 10:26:58 +02:00
Fuzzlemann
d7f4168aa6 Fixes some memory leaks by closing Scanner, FileWriter, FileOutputStreams...
Fixes some other in-depth command help
Fixes equality tests with floating point values
Adds hashCode() for UserData
Fixes some equals methods for checking if doubles are equals -> Using Double.compare(x1, x2) == 0 instead of x1 == x2
Replaces Throwable in Catch blocks with Exception to prevent catching Errors like OutOfMemoryError or InternalError.
Removes <T extends RawData> in RawData (unused)
Changes the abstract class DBCallableProcessor to an interface
Changes try to try-with-resource
Removes some parentheses
Changes some HashMap returns to Map
Changes some HashSet returns to Set
Removes unused variables
Further conversion to String.valueOf(Primitive) to save memory and CPU cycles
Changes all .values() or .keySet() calls to .entrySet() when both values are being used, that saves memory and CPU cycles
Fixes some JavaDoc comments
Corrects some Enum names to match the Java Convention Naming Scheme for them
Removes unused methods which aren't going to be used in the future
Removes unnecessary thrown Exceptions
Converts some variables to local variables
Add @Override annotation
Removed some commented-out code
Changed some method names to be more meaningful and match the Java Naming Conventions
Converts the local variable "df" in MathUtils to a global one
Changes some access-level modifiers
More little performance fixes and code cleanups
2017-07-29 04:42:13 +02:00
Fuzzlemann
afe1679b68 Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-28 23:19:55 +02:00
Rsl1122
ce4bb0836d Got something working on Edge. 2017-07-28 23:58:09 +03:00
Fuzzlemann
c684019b4e Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-28 21:30:09 +02:00
Rsl1122
6e821c8899 Attempts at debugging the issue of Webserver returning nothing 2017-07-28 22:29:05 +03:00
Rsl1122
24a360d8f2 Start of HttpsServer. #175 2017-07-28 21:53:24 +03:00
Fuzzlemann
ce8c6bb169 Fixing DouglasPeuckerAlgorithm Typo 2017-07-28 19:37:25 +02:00
Fuzzlemann
4f63640c97 Fixed InDepthHelp 2017-07-28 19:12:46 +02:00
Fuzzlemann
718c4d4fd4 Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-28 17:53:16 +02:00
Rsl1122
1a71ef12a3 Fix HighCharts opening late 2017-07-28 18:53:02 +03:00
Fuzzlemann
93022b09c6 Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-28 17:20:47 +02:00
Rsl1122
c4ece3eec5 Changed default config values for GM Pie colors 2017-07-28 17:23:14 +03:00
Rsl1122
7aa3d6807f Added HighCharts,
Replaced Pie Graphs with Highcharts version
2017-07-28 17:15:07 +03:00
Rsl1122
de4a024e79 Fix 0 Filter 2017-07-28 14:56:58 +03:00
Rsl1122
36373968a7 Add Chunk & Entity Graphs
Remove New Players Graph from visualization

Filter out 0s from some TPS data averages
2017-07-28 14:42:11 +03:00
Fuzzlemann
77389b5e0c Fixed rounding for TPS and CPU usage 2017-07-28 13:19:48 +02:00
Rsl1122
b371f0fb1e Merge pull request #203 from Fuzzlemann/master
PR for 3.6.0 (Fuzzlemann) (3)
2017-07-28 13:14:10 +03:00
Fuzzlemann
3112b24e17 Fixed error when number isn't long enough 2017-07-27 20:31:39 +02:00
Fuzzlemann
747592d688 Fixes byte to MB conversion at the TPSPart 2017-07-27 20:02:01 +02:00
Fuzzlemann
9e8cbf2787 Fixes byte to MB conversion at the TPSPart 2017-07-27 19:44:44 +02:00
Fuzzlemann
74dfa1c49c Fixes RAM Scatter Creator 2017-07-27 19:43:35 +02:00
Fuzzlemann
2e5c75aede Fixed rounding
Fixed Byte to Megabyte conversion
2017-07-27 19:42:38 +02:00
Fuzzlemann
71f7210a82 Updates HTML files 2017-07-27 19:15:41 +02:00
Fuzzlemann
1f931ed885 Update Upstream 2017-07-27 19:02:33 +02:00
Rsl1122
435dbc17fc RAM Graph 2017-07-27 19:51:26 +03:00
Rsl1122
882fe3dad3 Made Geolocation Map relative of screen width and height
Javadocs
2017-07-27 18:19:19 +03:00
Rsl1122
81a2c26832 Merge remote-tracking branch 'origin/3.6.0' into 3.6.0
# Conflicts:
#	Plan/src/main/resources/analysis.html
2017-07-27 17:54:34 +03:00
Rsl1122
f5274a2069 Add New Players Graphs to Online Activity 2017-07-27 17:44:17 +03:00
Fuzzlemann
fc3f7c96f7 Fixes method terminating in player.html & analysis.html 2017-07-27 15:46:43 +02:00
Fuzzlemann
0f530b6e61 Reformat code 2017-07-27 15:08:34 +02:00
Fuzzlemann
6e2a848a74 Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-27 15:02:46 +02:00
Rsl1122
fbf2a78a91 Add APF Notification prompt to Join Event Listener. 2017-07-27 14:56:17 +02:00