= Iterative step towards combined config file

file shall be config.config, because config.
This commit is contained in:
Matthew Cech
2019-06-19 23:50:45 -07:00
parent 091e06e4ff
commit 8ae6d4adc3
15 changed files with 91 additions and 112 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
package commands;
import core.Command;
import core.Config;
import core.Constants;
import core.DatabaseManager;
import core.LocStrings;
import dataStructures.KittyChannel;
@@ -28,7 +28,7 @@ public class CommandDBFlush extends Command
KittyEmbed embed = new KittyEmbed();
embed.title = "Database queue flushed";
embed.descriptionText = "**Dirty:** " + numUpdated;
embed.color = Config.ColorDefault;
embed.color = Constants.ColorDefault;
res.send(embed);
}
+2 -2
View File
@@ -4,7 +4,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import core.Command;
import core.Config;
import core.Constants;
import core.DatabaseManager;
import core.LocStrings;
import dataStructures.KittyChannel;
@@ -36,7 +36,7 @@ public class CommandDBStats extends Command
embed.descriptionText = "**Tracked Items:** " + DatabaseManager.instance.getTrackedObjectsSize();
embed.descriptionText += "\n";
embed.descriptionText += "**Last Upkeep:** " + dateFormat.format(DatabaseManager.instance.getLastUpkeep()) + " UTC-7";
embed.color = Config.ColorDefault;
embed.color = Constants.ColorDefault;
res.send(embed);
}
+2 -2
View File
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import core.Command;
import core.Config;
import core.Constants;
import core.DatabaseManager;
import core.LocStrings;
import core.ObjectBuilderFactory;
@@ -79,7 +79,7 @@ public class CommandLeaderboard extends Command
// Configure output
final int listSize = 10;
KittyEmbed embed = new KittyEmbed();
embed.color = Config.ColorDefault;
embed.color = Constants.ColorDefault;
embed.title = LocStrings.stub("LeaderboardTitle");
embed.descriptionText = "";
+2 -2
View File
@@ -3,7 +3,7 @@ package commands;
import core.Command;
import core.LocStrings;
import core.CommandManager.ThreadData;
import core.Config;
import core.Constants;
import dataStructures.KittyChannel;
import dataStructures.KittyEmbed;
import dataStructures.KittyGuild;
@@ -82,7 +82,7 @@ public class CommandStats extends Command
KittyEmbed embed = new KittyEmbed();
embed.title = "Bot Stats";
embed.descriptionText = out;
embed.color = Config.ColorDefault;
embed.color = Constants.ColorDefault;
res.send(embed);
}
+2 -2
View File
@@ -4,7 +4,7 @@ import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
import core.Command;
import core.Config;
import core.Constants;
import core.LocStrings;
import dataStructures.KittyChannel;
import dataStructures.KittyGuild;
@@ -54,7 +54,7 @@ public class CommandTeey extends Command
return;
teeyeeFile = new File(yeeteeFilename);
ImageOverlayBuilder builder = new ImageOverlayBuilder(Config.AssetDirectory + "teey/frames/", "teey ", 24, 18);
ImageOverlayBuilder builder = new ImageOverlayBuilder(Constants.AssetDirectory + "teey/frames/", "teey ", 24, 18);
builder.overlay(ImageIO.read(teeyeeFile), name);
}
catch (IOException e)
+2 -2
View File
@@ -4,7 +4,7 @@ import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
import core.Command;
import core.Config;
import core.Constants;
import core.LocStrings;
import dataStructures.KittyChannel;
import dataStructures.KittyGuild;
@@ -54,7 +54,7 @@ public class CommandYeet extends Command
return;
yeeteeFile = new File(yeeteeFilename);
ImageOverlayBuilder builder = new ImageOverlayBuilder(Config.AssetDirectory + "yeet/frames/", "yeet ", 24, 18);
ImageOverlayBuilder builder = new ImageOverlayBuilder(Constants.AssetDirectory + "yeet/frames/", "yeet ", 24, 18);
builder.overlay(ImageIO.read(yeeteeFile), name);
}
catch (IOException e)