Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-27 18:59:10 +00:00
Code Issues Releases Activity

Update dependencies

Browse Source
This commit is contained in:
SamB440
2021-06-11 21:45:28 +01:00
parent 69f2cb38e3
commit 21452d28fe
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rpgregions/build.gradle
View File

@@ -59,8 +59,8 @@ dependencies {
implementation 'co.aikar:idb-core:1.0.0-SNAPSHOT' // database
implementation 'com.zaxxer:HikariCP:2.4.1' // database
implementation 'org.apache.commons:commons-lang3:3.6' // apache commons (included as it has changed in versions)
implementation 'com.github.stefvanschie.inventoryframework:IF:0.9.7' // inventory framework
implementation 'org.bstats:bstats-bukkit:1.7' // plugin stats
implementation 'com.github.stefvanschie.inventoryframework:IF:0.9.8' // inventory framework
implementation 'org.bstats:bstats-bukkit:2.2.1' // plugin stats
implementation 'io.papermc:paperlib:1.0.4' // paperlib - async teleport on Paper
compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT') {

35
rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
View File

@@ -27,6 +27,7 @@ import net.islandearth.rpgregions.listener.ConnectionListener;
import net.islandearth.rpgregions.listener.MoveListener;
import net.islandearth.rpgregions.listener.RegionListener;
import net.islandearth.rpgregions.managers.RPGRegionsManagers;
import net.islandearth.rpgregions.managers.data.account.RPGRegionsAccount;
import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
import net.islandearth.rpgregions.managers.registry.RPGRegionsRegistry;
import net.islandearth.rpgregions.requirements.AlonsoLevelRequirement;
@@ -55,6 +56,8 @@ import net.islandearth.rpgregions.translation.Translations;
import net.islandearth.rpgregions.utils.XMaterial;
import net.islandearth.rpgregions.utils.XSound;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
import org.bstats.charts.SingleLineChart;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
@@ -163,7 +166,9 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI, Lang
header += "See wiki for more detailed information." + eol;
header += " search-offline-players: Tab complete will list offline players where possible. This can cause lag with lots of offline players due to Bukkit loading all of their data." + eol;
header += " worlds.forceload: Forcefully load worlds on startup to ensure RPGRegions recognises them. ONLY ENABLE IF YOU KNOW WHAT YOU ARE DOING!" + eol;
header += " settings.metrics.send_custom_info: Disable if experiencing bStats lag spikes.";
config.options().header(header);
config.addDefault("settings.metrics.send_custom_info", true);
config.addDefault("settings.dev.debug", false);
config.addDefault("settings.integration.name", getIntegration());
config.addDefault("settings.external.dynmap", true);
@@ -385,19 +390,23 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI, Lang
private void registerMetrics() {
Metrics metrics = new Metrics(this, 2066);
// regions_discovered chart currently causes lag due to bStats not running it async :(
/*metrics.addCustomChart(new Metrics.SingleLineChart("regions_discovered", () -> {
int discoveries = 0;
for (OfflinePlayer offlinePlayer : Bukkit.getOfflinePlayers()) {
RPGRegionsAccount account = getManagers().getStorageManager().getAccount(offlinePlayer.getUniqueId()).get();
discoveries = discoveries + account.getDiscoveredRegions().values().size();
Player player = Bukkit.getPlayer(offlinePlayer.getUniqueId());
if (player == null) getManagers().getStorageManager().removeCachedAccount(offlinePlayer.getUniqueId()); // Cleanup so we don't use memory
}
return discoveries;
}));*/
metrics.addCustomChart(new Metrics.SingleLineChart("regions_configured", () -> getManagers().getRegionsCache().getConfiguredRegions().size()));
metrics.addCustomChart(new Metrics.SimplePie("storage_mode", () -> getConfig().getString("settings.storage.mode")));
metrics.addCustomChart(new Metrics.SimplePie("integration_type", () -> getConfig().getString("settings.integration.name")));
if (getConfig().getBoolean("settings.metrics.send_custom_info")) {
metrics.addCustomChart(new SingleLineChart("regions_discovered", () -> {
debug("Submitting custom metrics on thread: " + Thread.currentThread().getName());
int discoveries = 0;
for (OfflinePlayer offlinePlayer : Bukkit.getOfflinePlayers()) {
RPGRegionsAccount account = getManagers().getStorageManager().getAccount(offlinePlayer.getUniqueId()).get();
discoveries = discoveries + account.getDiscoveredRegions().values().size();
Player player = Bukkit.getPlayer(offlinePlayer.getUniqueId());
if (player == null)
getManagers().getStorageManager().removeCachedAccount(offlinePlayer.getUniqueId()); // Cleanup so we don't use memory
}
return discoveries;
}));
}
metrics.addCustomChart(new SingleLineChart("regions_configured", () -> getManagers().getRegionsCache().getConfiguredRegions().size()));
metrics.addCustomChart(new SimplePie("storage_mode", () -> getConfig().getString("settings.storage.mode")));
metrics.addCustomChart(new SimplePie("integration_type", () -> getConfig().getString("settings.integration.name")));
}
@Override