From 74a57508247f992fc487d3d895c5d66c570af77e Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Sat, 2 Nov 2019 19:29:02 -0800 Subject: [PATCH] = Updated config --- assets/config.csv | 2 ++ src/core/ConfigGlobals.java | 8 ++++---- src/core/ObjectBuilderFactory.java | 11 +++++++++-- src/dataStructures/KittyStartupMode.java | 8 ++++---- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/assets/config.csv b/assets/config.csv index 686c012..b515996 100644 --- a/assets/config.csv +++ b/assets/config.csv @@ -1,4 +1,5 @@ "Type","Key","Value" +"Globals","mode","dev" "Localized Commands","beans","" "Localized Commands","benchmark, bench","" "Localized Commands","bet","" @@ -61,6 +62,7 @@ "Localized Strings","BetBeansInfo","Allows you to bet your beans, set your amount after the command! Warning! House always wins!nSets of 3 will get 2x, 4 will get 10x, and 5 will get 1000x" "Localized Strings","BetBeansLose","Sorry, you didn't win, try again!" "Localized Strings","BetBeansLowBet","Please bet with at least 20 beans!" +"Localized Strings","BetBeansMinThreshold","" "Localized Strings","BetBeansNotEnough","You don't have enough beans!" "Localized Strings","BetBeansNotValid","That's not a valid bet!" "Localized Strings","BetBeansWin","You won %s beans!" diff --git a/src/core/ConfigGlobals.java b/src/core/ConfigGlobals.java index f7b7ce7..1828d70 100644 --- a/src/core/ConfigGlobals.java +++ b/src/core/ConfigGlobals.java @@ -16,7 +16,7 @@ public class ConfigGlobals implements IConfigSection // A pile of variables being manually tracked/serialized to the config file private static final String startupStyleKey = "mode"; - private KittyStartupMode startupStyleValue = KittyStartupMode.Development; + private KittyStartupMode startupStyleValue = KittyStartupMode.Dev; // Constructor public ConfigGlobals() @@ -49,9 +49,9 @@ public class ConfigGlobals implements IConfigSection // Parse startup style if(key.equalsIgnoreCase(startupStyleKey)) { - startupStyleValue = KittyStartupMode.Development; + startupStyleValue = KittyStartupMode.Dev; - if(value.equalsIgnoreCase(KittyStartupMode.Release.getValue())) + if(value.equalsIgnoreCase(KittyStartupMode.Release.name())) startupStyleValue = KittyStartupMode.Release; } } @@ -61,7 +61,7 @@ public class ConfigGlobals implements IConfigSection public List produce() { List items = new ArrayList(); - items.add(new ConfigItem(getSectionTitle(), startupStyleKey, startupStyleValue.getValue())); + items.add(new ConfigItem(getSectionTitle(), startupStyleKey, startupStyleValue.name().toLowerCase())); return items; } diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index fd5d592..a17d2ed 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -20,6 +20,7 @@ import dataStructures.KittyCore; import dataStructures.KittyGuild; import dataStructures.KittyRating; import dataStructures.KittyRole; +import dataStructures.KittyStartupMode; import dataStructures.KittyUser; import main.Main; import net.dv8tion.jda.core.AccountType; @@ -382,9 +383,15 @@ public class ObjectBuilderFactory { lazyInit(); + // Determine token based on config. Default to test token. + String tokenToUse = Ref.TestToken; + if(ConfigGlobals.getStartupMode() == KittyStartupMode.Release) + tokenToUse = Ref.Token; + + // Construct bot based on token kitty = new JDABuilder(AccountType.BOT) - .setToken(Ref.TestToken).buildBlocking(); - kitty.getPresence().setGame(Game.playing("with digital yarn")); + .setToken(tokenToUse).buildBlocking(); + kitty.getPresence().setGame(Game.playing("with a laser pointer")); kitty.addEventListener(new Main()); return new KittyCore(kitty); diff --git a/src/dataStructures/KittyStartupMode.java b/src/dataStructures/KittyStartupMode.java index 3d9e67d..3f9f8a7 100644 --- a/src/dataStructures/KittyStartupMode.java +++ b/src/dataStructures/KittyStartupMode.java @@ -2,15 +2,15 @@ package dataStructures; public enum KittyStartupMode { - Development("dev"), Release("release"); + Dev(1), Release(2); - private final String value; - private KittyStartupMode(String value) + private final int value; + private KittyStartupMode(int value) { this.value = value; } - public String getValue() + public int getValue() { return value; }