From 74218f90cb13fd2dde31b9f19d95f67eab4b99e5 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Mon, 18 Mar 2019 12:52:00 +0200 Subject: [PATCH] Storage of Provider icons --- .../providers/gathering/BooleanProviderValueGatherer.java | 2 ++ .../gathering/DoubleAndPercentageProviderValueGatherer.java | 2 ++ .../providers/gathering/NumberProviderValueGatherer.java | 2 ++ .../providers/gathering/ProviderValueGatherer.java | 2 +- .../providers/gathering/StringProviderValueGatherer.java | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) 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 d7e9eef6e..ce66a114e 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 @@ -22,6 +22,7 @@ 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.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreBooleanProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerBooleanResultTransaction; import com.djrapitops.plugin.logging.console.PluginLogger; @@ -92,6 +93,7 @@ class BooleanProviderValueGatherer { } satisfied.add(booleanProvider); // Prevents further attempts to call this provider for this player. + database.executeTransaction(new StoreIconTransaction(booleanProvider.getProviderInformation().getIcon())); database.executeTransaction(new StoreBooleanProviderTransaction(booleanProvider, providedCondition.orElse(null), serverUUID)); database.executeTransaction(new StorePlayerBooleanResultTransaction(pluginName, serverUUID, method.getMethodName(), playerUUID, result)); } 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 20cc4754e..8585a2fdd 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 @@ -22,6 +22,7 @@ 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.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreDataProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerDoubleResultTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerPercentageResultTransaction; @@ -78,6 +79,7 @@ class DoubleAndPercentageProviderValueGatherer { continue; } + database.executeTransaction(new StoreIconTransaction(doubleProvider.getProviderInformation().getIcon())); database.executeTransaction(new StoreDataProviderTransaction<>(doubleProvider, serverUUID)); if (doubleProvider instanceof PercentageDataProvider) { 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 262419079..d1047bb01 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 @@ -23,6 +23,7 @@ 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.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreNumberProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerNumberResultTransaction; import com.djrapitops.plugin.logging.console.PluginLogger; @@ -80,6 +81,7 @@ class NumberProviderValueGatherer { FormatType formatType = NumberDataProvider.getFormatType(numberProvider); + database.executeTransaction(new StoreIconTransaction(numberProvider.getProviderInformation().getIcon())); database.executeTransaction(new StoreNumberProviderTransaction(numberProvider, formatType, serverUUID)); database.executeTransaction(new StorePlayerNumberResultTransaction(pluginName, serverUUID, method.getMethodName(), playerUUID, result)); } 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 ab2431218..a5ee64f8d 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 @@ -59,7 +59,7 @@ public class ProviderValueGatherer { this.logger = logger; } - public void storeProviderInformation() { + public void storeExtensionInformation() { String pluginName = extractor.getPluginName(); Icon pluginIcon = extractor.getPluginIcon(); 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 f9f629753..2f32a05d2 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 @@ -21,6 +21,7 @@ import com.djrapitops.plan.extension.DataExtension; 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.storage.transactions.StoreIconTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreDataProviderTransaction; import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerStringResultTransaction; import com.djrapitops.plugin.logging.console.PluginLogger; @@ -76,6 +77,7 @@ class StringProviderValueGatherer { continue; } + database.executeTransaction(new StoreIconTransaction(stringProvider.getProviderInformation().getIcon())); database.executeTransaction(new StoreDataProviderTransaction<>(stringProvider, serverUUID)); database.executeTransaction(new StorePlayerStringResultTransaction(pluginName, serverUUID, method.getMethodName(), playerUUID, result)); }