Fix vault integration for new change, promote to release candidate

NickImpact · Mar 18, 2024 · 60fc736 · 60fc736
1 parent 88dc519
commit 60fc736
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -10,5 +10,5 @@ fabric-loader=0.15.7
 fabric-api=0.92.0+1.20.1
 
 # Is the project currently in a snapshot state?
-snapshot = true
-release-candidate = 0
+snapshot = false
+release-candidate = 1
diff --git a/integrations/vault/src/main/java/net/impactdev/impactor/integrations/vault/VaultConfig.java b/integrations/vault/src/main/java/net/impactdev/impactor/integrations/vault/VaultConfig.java
@@ -26,15 +26,20 @@
 package net.impactdev.impactor.integrations.vault;
 
 import net.impactdev.impactor.api.configuration.key.ConfigKey;
+import net.impactdev.impactor.api.economy.currency.Currency;
 
 import static net.impactdev.impactor.api.configuration.key.ConfigKeyFactory.booleanKey;
+import static net.impactdev.impactor.api.configuration.key.ConfigKeyFactory.key;
 import static net.impactdev.impactor.api.configuration.key.ConfigKeyFactory.stringKey;
 
 public final class VaultConfig {
 
     public static final ConfigKey<Boolean> USE_VAULT = booleanKey("use-vault", true);
     public static final ConfigKey<String> VAULT_SYMBOL = stringKey("vault.symbol", "$");
-    public static final ConfigKey<Boolean> VAULT_SYMBOL_PREFIX = booleanKey("vault.symbol-is-prefix", true);
+    public static final ConfigKey<Currency.CurrencyFormatting> VAULT_FORMATTING = key(adapter -> new Currency.CurrencyFormatting(
+            adapter.getString("vault.formatting.condensed", "<symbol><amount>"),
+            adapter.getString("vault.formatting.expanded", "<amount> <name>")
+    ));
 
 
 }
diff --git a/integrations/vault/src/main/java/net/impactdev/impactor/integrations/vault/VaultService.java b/integrations/vault/src/main/java/net/impactdev/impactor/integrations/vault/VaultService.java
@@ -142,7 +142,7 @@ public VaultCurrencyProvider(Economy delegate, Config config) {
                     .name(text(delegate.currencyNameSingular()))
                     .plural(text(delegate.currencyNamePlural()))
                     .symbol(text(config.get(VaultConfig.VAULT_SYMBOL)))
-                    .formatting(config.get(VaultConfig.VAULT_SYMBOL_PREFIX) ? Currency.SymbolFormatting.BEFORE : Currency.SymbolFormatting.AFTER)
+                    .formatting(config.get(VaultConfig.VAULT_FORMATTING))
                     .decimals(delegate.fractionalDigits())
                     .transferable(true)
                     .starting(BigDecimal.ZERO)