diff --git a/Plan/pom.xml b/Plan/pom.xml index ceae9c82b..1616c17fc 100644 --- a/Plan/pom.xml +++ b/Plan/pom.xml @@ -70,7 +70,7 @@ com.djrapitops PlanPluginBridge - 4.0.3 + 4.0.5 compile diff --git a/Plan/src/main/resources/js/healthGauge.js b/Plan/src/main/resources/js/healthGauge.js new file mode 100644 index 000000000..96e6251f6 --- /dev/null +++ b/Plan/src/main/resources/js/healthGauge.js @@ -0,0 +1,81 @@ +var gaugeOptions = { + + chart: { + type: 'solidgauge' + }, + + title: null, + + pane: { + center: ['50%', '85%'], + size: '140%', + startAngle: -90, + endAngle: 90, + background: { + backgroundColor: (Highcharts.theme && Highcharts.theme.background2) || '#EEE', + innerRadius: '60%', + outerRadius: '100%', + shape: 'arc' + } + }, + + tooltip: { + enabled: false + }, + + // the value axis + yAxis: { + stops: [ + [0.1, '#DF5353'], // red + [0.5, '#DDDF0D'], // yellow + [0.9, '#55BF3B'] // green + ], + lineWidth: 0, + minorTickInterval: null, + tickAmount: 2, + title: { + y: -70 + }, + labels: { + y: 16 + } + }, + + plotOptions: { + solidgauge: { + dataLabels: { + y: 5, + borderWidth: 0, + useHTML: true + } + } + } +}; + +var chartSpeed = Highcharts.chart('container-speed', Highcharts.merge(gaugeOptions, { + yAxis: { + min: 0, + max: 100, + title: { + text: 'Server Health' + }, + visible: false + }, + + credits: { + enabled: false + }, + + series: [{ + name: 'health', + data: [95.73], + dataLabels: { + formatter: function() { + return '
'+(this.y).toFixed(2)+'
' + + 'Very Healthy
'; + } + } + }] + +})); diff --git a/PlanPluginBridge/PlanPluginBridge-4.0.5.jar b/PlanPluginBridge/PlanPluginBridge-4.0.5.jar new file mode 100644 index 000000000..66ecf82f2 Binary files /dev/null and b/PlanPluginBridge/PlanPluginBridge-4.0.5.jar differ diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml index 8ca2327c6..efa52f54d 100644 --- a/PlanPluginBridge/pom.xml +++ b/PlanPluginBridge/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops PlanPluginBridge - 4.0.3 + 4.0.5 jar @@ -24,7 +24,7 @@ com.djrapitops Plan - 4.0.0 + 4.0.5 provided diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java index 00741cd4c..dfa41bc01 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java @@ -1,5 +1,6 @@ package com.djrapitops.pluginbridge.plan; +import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.advancedachievements.AdvancedAchievementsHook; import com.djrapitops.pluginbridge.plan.askyblock.ASkyBlockHook; import com.djrapitops.pluginbridge.plan.essentials.EssentialsHook; @@ -13,7 +14,6 @@ import com.djrapitops.pluginbridge.plan.superbvote.SuperbVoteHook; import com.djrapitops.pluginbridge.plan.towny.TownyHook; import com.djrapitops.pluginbridge.plan.vault.VaultHook; import com.djrapitops.pluginbridge.plan.viaversion.ViaVersionHook; -import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.Settings; import main.java.com.djrapitops.plan.data.additional.HookHandler; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaimTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaimTable.java index 3ab91e287..589342d0a 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaimTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaimTable.java @@ -1,6 +1,6 @@ package com.djrapitops.pluginbridge.plan.griefprevention; -import com.djrapitops.plugin.utilities.FormattingUtils; +import com.djrapitops.plugin.utilities.FormatUtils; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.utilities.html.Html; @@ -52,7 +52,7 @@ public class GriefPreventionClaimTable extends PluginData { .filter(Objects::nonNull) .filter(claim -> uuid.equals(claim.ownerID)) .forEach(claim -> { - String location = FormattingUtils.formatLocation(claim.getGreaterBoundaryCorner()); + String location = FormatUtils.formatLocation(claim.getGreaterBoundaryCorner()); int area = claim.getArea(); html.append(Html.TABLELINE_2.parse(location, area)); }); diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java index a05a4c71c..c282d6f08 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java @@ -5,7 +5,8 @@ */ package com.djrapitops.pluginbridge.plan.viaversion; -import main.java.com.djrapitops.plan.Log; + +import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.systems.processing.Processor; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java index cb836cad2..41ed35da0 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java @@ -1,7 +1,7 @@ package com.djrapitops.pluginbridge.plan.viaversion; +import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.API; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionVersion.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionVersion.java index ae435046c..2e7b27b50 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionVersion.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionVersion.java @@ -1,14 +1,13 @@ package com.djrapitops.pluginbridge.plan.viaversion; -import com.djrapitops.pluginbridge.plan.vault.*; +import com.djrapitops.plugin.api.utility.log.Log; +import com.djrapitops.pluginbridge.plan.vault.VaultHook; +import main.java.com.djrapitops.plan.data.additional.PluginData; import java.io.Serializable; import java.sql.SQLException; import java.util.UUID; -import main.java.com.djrapitops.plan.Log; -import main.java.com.djrapitops.plan.data.additional.PluginData; - /** * PluginData class for Vault-plugin. *