Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-12 06:48:50 +02:00
Code Issues Projects Releases Wiki Activity

Added missing settings to Bungee. Added option to hide IPs

Browse Source
This commit is contained in:
Rsl1122 2018-02-23 10:14:12 +02:00
parent 7031a71984
commit c8b846b5df
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/src/main/java/com/djrapitops/plan/system/settings/Settings.java
View File

@ -34,6 +34,7 @@ public enum Settings {
PLAYERTABLE_FOOTER("Customization.Display.PlayerTableFooter"),
WEBSERVER_DISABLED("WebServer.DisableWebServer"),
FORMAT_DATE_RECENT_DAYS("Customization.Formatting.Dates.RecentDays"),
DISPLAY_PLAYER_IPS("Customization.Display.PlayerIPs"),
// Integer
WEBSERVER_PORT("WebServer.Port"),

11
Plan/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettings.java
View File

@ -137,10 +137,17 @@ public class NetworkSettings {
addConfigValue(configValues, Settings.DB_TYPE, "mysql");
Settings[] sameStrings = new Settings[]{
Settings.DB_HOST, Settings.DB_USER, Settings.DB_PASS,
Settings.DB_DATABASE, Settings.FORMAT_DECIMALS, Settings.FORMAT_SECONDS,
Settings.DB_DATABASE, Settings.DB_LAUNCH_OPTIONS,
Settings.FORMAT_DECIMALS, Settings.FORMAT_SECONDS,
Settings.FORMAT_DAY, Settings.FORMAT_DAYS, Settings.FORMAT_HOURS,
Settings.FORMAT_MINUTES, Settings.FORMAT_MONTHS, Settings.FORMAT_MONTH,
Settings.FORMAT_YEAR, Settings.FORMAT_YEARS, Settings.FORMAT_ZERO_SECONDS
Settings.FORMAT_YEAR, Settings.FORMAT_YEARS, Settings.FORMAT_ZERO_SECONDS,
Settings.USE_SERVER_TIME, Settings.DISPLAY_SESSIONS_AS_TABLE, Settings.APPEND_WORLD_PERC,
Settings.ORDER_WORLD_PIE_BY_PERC, Settings.MAX_SESSIONS, Settings.MAX_PLAYERS,
Settings.MAX_PLAYERS_PLAYERS_PAGE, Settings.PLAYERTABLE_FOOTER, Settings.FORMAT_DATE_RECENT_DAYS,
Settings.FORMAT_DATE_RECENT_DAYS_PATTERN, Settings.FORMAT_DATE_CLOCK, Settings.FORMAT_DATE_NO_SECONDS,
Settings.FORMAT_DATE_FULL, Settings.DISPLAY_PLAYER_IPS, Settings.ACTIVE_LOGIN_THRESHOLD,
Settings.ACTIVE_PLAY_THRESHOLD
};
Log.debug("NetworkSettings: Adding Config Values..");
for (Settings setting : sameStrings) {

4
Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/GeoInfoTable.java
View File

@ -6,6 +6,7 @@ package com.djrapitops.plan.utilities.html.tables;
import com.djrapitops.plan.data.container.GeoInfo;
import com.djrapitops.plan.data.element.TableContainer;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.utilities.FormatUtils;
import java.util.List;
@ -28,10 +29,11 @@ public class GeoInfoTable extends TableContainer {
}
private void addValues(List<GeoInfo> geoInfo) {
boolean displayIP = Settings.DISPLAY_PLAYER_IPS.isTrue();
for (GeoInfo info : geoInfo) {
long date = info.getLastUsed();
addRow(
FormatUtils.formatIP(info.getIp()),
displayIP ? FormatUtils.formatIP(info.getIp()) : "Hidden (Config)",
info.getGeolocation(),
date != 0 ? FormatUtils.formatTimeStampYear(date) : "-"
);

24
Plan/src/main/resources/bungeeconfig.yml
View File

@ -48,6 +48,11 @@ Commands:
Analysis:
AutoRefreshPeriod: 60
Active:
# Minutes a player should play per week to be considered active
PlaytimeThreshold: 30
# How many days player should join per week to be considered active
LoginThreshold: 2
Export:
Enabled: false
DestinationFolder: 'Analysis Results'
@ -58,8 +63,27 @@ Data:
CombineCommandAliases: true
# -----------------------------------------------------
Customization:
UseServerTime: true
Display:
SessionsAsTable: false
LargestWorldPercInSessionTitle: false
# By Default WorldPie is ordered alphabetically, colors are still determined alphabetically.
OrderWorldPieByPercentage: false
MaxSessions: 50
MaxPlayers: 2500
MaxPlayersPlayersPage: 25000
PlayerTableFooter: true
PlayerIPs: true
Formatting:
DecimalPoints: '#.##'
Dates:
# RecentDays replaces date with Today, Yesterday, Wednesday etc.
RecentDays: true
# Non-regex pattern to replace
DatePattern: 'MMM d YYYY'
Full: 'MMM d YYYY, HH:mm:ss'
NoSeconds: 'MMM d YYYY, HH:mm'
JustClock: 'HH:mm:ss'
TimeAmount:
Year: '1 year, '
Years: '%years% years, '

1
Plan/src/main/resources/config.yml
View File

@ -87,6 +87,7 @@ Customization:
MaxPlayers: 2500
MaxPlayersPlayersPage: 25000
PlayerTableFooter: true
PlayerIPs: true
Formatting:
DecimalPoints: '#.##'
# Dates settings use Java SimpleDateFormat.