diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/ProviderInformation.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/ProviderInformation.java index b6fabe078..4ca642e15 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/ProviderInformation.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/ProviderInformation.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.extension.implementation; import com.djrapitops.plan.extension.annotation.Conditional; import com.djrapitops.plan.extension.icon.Icon; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionDescriptive; +import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; import org.apache.commons.lang3.StringUtils; import java.util.Optional; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/BooleanProviderValueGatherer.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/BooleanProviderValueGatherer.java index 097a90ab1..2d73be796 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/BooleanProviderValueGatherer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/BooleanProviderValueGatherer.java @@ -24,7 +24,6 @@ import com.djrapitops.plan.extension.implementation.providers.BooleanDataProvide import com.djrapitops.plan.extension.implementation.providers.DataProvider; import com.djrapitops.plan.extension.implementation.providers.DataProviders; import com.djrapitops.plan.extension.implementation.providers.MethodWrapper; -import com.djrapitops.plan.extension.implementation.results.player.Conditions; import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreBooleanProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerBooleanResultTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/Conditions.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/Conditions.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/Conditions.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/Conditions.java index 26b9df5ef..2f8e6ccdf 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/Conditions.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/Conditions.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.providers.gathering; import java.util.HashSet; import java.util.Set; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/DoubleAndPercentageProviderValueGatherer.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/DoubleAndPercentageProviderValueGatherer.java index 1a87ba3a9..6f2ffcab4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/DoubleAndPercentageProviderValueGatherer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/DoubleAndPercentageProviderValueGatherer.java @@ -24,7 +24,6 @@ import com.djrapitops.plan.extension.implementation.providers.DataProvider; import com.djrapitops.plan.extension.implementation.providers.DataProviders; import com.djrapitops.plan.extension.implementation.providers.MethodWrapper; import com.djrapitops.plan.extension.implementation.providers.PercentageDataProvider; -import com.djrapitops.plan.extension.implementation.results.player.Conditions; import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreDoubleProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerDoubleResultTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/NumberProviderValueGatherer.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/NumberProviderValueGatherer.java index 8eda32281..ef599841d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/NumberProviderValueGatherer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/NumberProviderValueGatherer.java @@ -25,7 +25,6 @@ import com.djrapitops.plan.extension.implementation.providers.DataProvider; import com.djrapitops.plan.extension.implementation.providers.DataProviders; import com.djrapitops.plan.extension.implementation.providers.MethodWrapper; import com.djrapitops.plan.extension.implementation.providers.NumberDataProvider; -import com.djrapitops.plan.extension.implementation.results.player.Conditions; import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreNumberProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerNumberResultTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/ProviderValueGatherer.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/ProviderValueGatherer.java index da3c2ef04..f06c6b7d4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/ProviderValueGatherer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/ProviderValueGatherer.java @@ -21,7 +21,6 @@ import com.djrapitops.plan.extension.DataExtension; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.DataProviderExtractor; import com.djrapitops.plan.extension.implementation.TabInformation; -import com.djrapitops.plan.extension.implementation.results.player.Conditions; import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.StorePluginTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.StoreTabInformationTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/StringProviderValueGatherer.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/StringProviderValueGatherer.java index 73d82e192..dc5932a6d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/StringProviderValueGatherer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/StringProviderValueGatherer.java @@ -24,7 +24,6 @@ import com.djrapitops.plan.extension.implementation.providers.DataProvider; import com.djrapitops.plan.extension.implementation.providers.DataProviders; import com.djrapitops.plan.extension.implementation.providers.MethodWrapper; import com.djrapitops.plan.extension.implementation.providers.StringDataProvider; -import com.djrapitops.plan.extension.implementation.results.player.Conditions; import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreStringProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerStringResultTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionBooleanData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionBooleanData.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionBooleanData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionBooleanData.java index 50f31f5ca..ba0820410 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionBooleanData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionBooleanData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; /** * Represents boolean data returned by a BooleanProvider method. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionData.java similarity index 93% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionData.java index 9fb914f01..4b7634d1b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; /** * Represents a data-point given by a Provider method of a DataExtension. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionDescriptive.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDescriptive.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionDescriptive.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDescriptive.java index 3fa0c78b1..f3ad7a503 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionDescriptive.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDescriptive.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; import com.djrapitops.plan.extension.icon.Icon; import org.apache.commons.lang3.StringUtils; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionDoubleData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionDoubleData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java index 31025a93a..29b0e305a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionDoubleData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; import com.djrapitops.plan.utilities.formatting.Formatter; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionInformation.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionInformation.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionInformation.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionInformation.java index edcde477f..e93a13318 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionInformation.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionInformation.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; import com.djrapitops.plan.extension.icon.Icon; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionNumberData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionNumberData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java index 60dbd8680..a4907b7ac 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionNumberData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; import com.djrapitops.plan.extension.FormatType; import com.djrapitops.plan.utilities.formatting.Formatter; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionStringData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionStringData.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionStringData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionStringData.java index 05a83d903..c2e3274f0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionStringData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionStringData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; import com.djrapitops.plan.api.PlanAPI; import com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionTabData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionTabData.java similarity index 80% rename from Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionTabData.java rename to Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionTabData.java index a1dfcfc93..13b5b531a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionTabData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionTabData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.extension.implementation.results.player; +package com.djrapitops.plan.extension.implementation.results; import com.djrapitops.plan.extension.implementation.TabInformation; @@ -78,20 +78,6 @@ public class ExtensionTabData implements Comparable { return Optional.ofNullable(stringData.get(providerName)); } - private void createOrderingList() { - List descriptives = new ArrayList<>(); - booleanData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); - doubleData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); - percentageData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); - numberData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); - stringData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); - - order = descriptives.stream().sorted() - .map(ExtensionDescriptive::getName) - .distinct()// Method names are usually different, but in case someone had same method name with different parameters. - .collect(Collectors.toList()); - } - @Override public int compareTo(ExtensionTabData other) { return Integer.compare(this.tabInformation.getTabPriority(), other.tabInformation.getTabPriority()); // Lower is first @@ -130,8 +116,22 @@ public class ExtensionTabData implements Comparable { return this; } + private void createOrderingList() { + List descriptives = new ArrayList<>(); + data.booleanData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); + data.doubleData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); + data.percentageData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); + data.numberData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); + data.stringData.values().stream().map(ExtensionData::getDescriptive).forEach(descriptives::add); + + data.order = descriptives.stream().sorted() + .map(ExtensionDescriptive::getName) + .distinct()// Method names are usually different, but in case someone had same method name with different parameters. + .collect(Collectors.toList()); + } + public ExtensionTabData build() { - data.createOrderingList(); + createOrderingList(); return data; } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java index 94be2a636..796225aa0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/player/ExtensionPlayerData.java @@ -16,6 +16,9 @@ */ package com.djrapitops.plan.extension.implementation.results.player; +import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java index 0eebfc229..cf2969a25 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java @@ -24,7 +24,7 @@ import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable; import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java index 7a92480a0..2216917fb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java @@ -29,7 +29,8 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.implementation.TabInformation; -import com.djrapitops.plan.extension.implementation.results.player.*; +import com.djrapitops.plan.extension.implementation.results.*; +import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPluginTab.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPluginTab.java index 3f5486ec8..976ee469b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPluginTab.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPluginTab.java @@ -18,10 +18,10 @@ package com.djrapitops.plan.utilities.html.pages; import com.djrapitops.plan.extension.FormatType; import com.djrapitops.plan.extension.implementation.TabInformation; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionDescriptive; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive; +import com.djrapitops.plan.extension.implementation.results.ExtensionInformation; +import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionTabData; import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java index 09fd2de8a..528efcc29 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java @@ -47,10 +47,10 @@ import com.djrapitops.plan.db.patches.Patch; import com.djrapitops.plan.extension.DataExtension; import com.djrapitops.plan.extension.ExtensionServiceImplementation; import com.djrapitops.plan.extension.annotation.*; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionBooleanData; +import com.djrapitops.plan.extension.implementation.results.ExtensionBooleanData; +import com.djrapitops.plan.extension.implementation.results.ExtensionStringData; +import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; import com.djrapitops.plan.extension.implementation.results.player.ExtensionPlayerData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionStringData; -import com.djrapitops.plan.extension.implementation.results.player.ExtensionTabData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionPlayerDataQuery; import com.djrapitops.plan.extension.implementation.storage.transactions.results.RemoveUnsatisfiedConditionalResultsTransaction; import com.djrapitops.plan.system.PlanSystem;