From a562e5addbde12f030dd8ad3a7bd719d31f0ca70 Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Wed, 19 Jun 2019 22:40:04 -0700 Subject: [PATCH 1/4] = Updating benchmark formatting --- src/commands/benchmark/BenchmarkCommandInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/benchmark/BenchmarkCommandInfo.java b/src/commands/benchmark/BenchmarkCommandInfo.java index 08f2af2..676f288 100644 --- a/src/commands/benchmark/BenchmarkCommandInfo.java +++ b/src/commands/benchmark/BenchmarkCommandInfo.java @@ -24,7 +24,7 @@ public class BenchmarkCommandInfo extends BenchmarkCommand return output; } - public static KittyEmbed FormatInfoEmbed(BenchmarkEntry entry) + public static KittyEmbed formatInfoEmbed(BenchmarkEntry entry) { // Populate general embed info KittyEmbed embed = new KittyEmbed(); @@ -85,7 +85,7 @@ public class BenchmarkCommandInfo extends BenchmarkCommand List sortedEntries = manager.evaluateLevenshteinDistance(entries, searchString); BenchmarkEntry entry = sortedEntries.get(0); - KittyEmbed embed = FormatInfoEmbed(entry); + KittyEmbed embed = formatInfoEmbed(entry); if(entries.size() > 1) embed.footerText += " (Chose the " + entry.model + " from " + entries.size() + " potential components. To see others, try the command 'benchmark find " + searchString +"')"; From 06c9f00e62ecb5a202a1f303c2a28d0e21a80a04 Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Wed, 19 Jun 2019 22:51:17 -0700 Subject: [PATCH 2/4] = Directory adjustment --- src/core/CommandEnabler.java | 3 ++- src/core/Config.java | 1 + src/core/LocCommands.java | 2 +- src/core/LocStrings.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/CommandEnabler.java b/src/core/CommandEnabler.java index b249655..1bba27e 100644 --- a/src/core/CommandEnabler.java +++ b/src/core/CommandEnabler.java @@ -23,8 +23,9 @@ public class CommandEnabler extends BaseKeyValueFile // Local variables private HashMap enabledMap; // Quick lookup private ArrayList keyList; // Tracking ordering for later - private final static String name = "commands.config"; + private final static String name = Config.AssetDirectory + "commands.config"; + // Constructor public CommandEnabler() { super(name); diff --git a/src/core/Config.java b/src/core/Config.java index b202650..a34b8e2 100644 --- a/src/core/Config.java +++ b/src/core/Config.java @@ -5,4 +5,5 @@ import java.awt.Color; public final class Config { public static final Color ColorDefault = new Color(7*16, 8*16, 9*16); // A slate-grey + public static final String AssetDirectory = "./assets/"; } diff --git a/src/core/LocCommands.java b/src/core/LocCommands.java index 86bfc1d..b32e690 100644 --- a/src/core/LocCommands.java +++ b/src/core/LocCommands.java @@ -10,7 +10,7 @@ import dataStructures.Pair; // is performed with general strings in the application public class LocCommands extends BaseLocFile { - public static final String fileName = "locCommands.config"; + public static final String fileName = Config.AssetDirectory + "locCommands.config"; public static final String function = "LocCommands.stub"; private static LocCommands instance; diff --git a/src/core/LocStrings.java b/src/core/LocStrings.java index c95d363..d3c6ad6 100644 --- a/src/core/LocStrings.java +++ b/src/core/LocStrings.java @@ -9,7 +9,7 @@ import utils.io.FileMonitor; // can then be localized. public class LocStrings extends BaseLocFile { - public static final String fileName = "locStrings.config"; + public static final String fileName = Config.AssetDirectory + "locStrings.config"; public static final String function = "LocStrings.stub"; private static LocStrings instance; From 29972ff2fc3bf25f1e918d42ee47ac4ade7c5ee4 Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Wed, 19 Jun 2019 22:52:00 -0700 Subject: [PATCH 3/4] = Updated RPG commands --- src/commands/rpg/RPGCommandInfo.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/commands/rpg/RPGCommandInfo.java b/src/commands/rpg/RPGCommandInfo.java index 5fbaf7e..3741809 100644 --- a/src/commands/rpg/RPGCommandInfo.java +++ b/src/commands/rpg/RPGCommandInfo.java @@ -8,7 +8,6 @@ import core.rpg.RPGWeapon; public class RPGCommandInfo extends RPGCommand { - @Override public String onRun(RPGState state, RPGInput input) { @@ -27,7 +26,7 @@ public class RPGCommandInfo extends RPGCommand case "hand": case "att": case "attack": - out = WeaponStats(state.player.getWeapon()); + out = weaponStats(state.player.getWeapon()); break; case "armour": @@ -44,7 +43,7 @@ public class RPGCommandInfo extends RPGCommand case "dress": case "wear": case "outfit": - out = ArmorStats(state.player.getArmor()); + out = armorStats(state.player.getArmor()); break; } @@ -54,7 +53,7 @@ public class RPGCommandInfo extends RPGCommand return out; } - private String WeaponStats(RPGWeapon weapon) + private String weaponStats(RPGWeapon weapon) { if(weapon == null) return null; @@ -72,7 +71,7 @@ public class RPGCommandInfo extends RPGCommand return out; } - private String ArmorStats(RPGArmor armor) + private String armorStats(RPGArmor armor) { if(armor == null) return null; From 091e06e4fff2f387d2eb7daf7510bc40edee5e0a Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Wed, 19 Jun 2019 23:00:21 -0700 Subject: [PATCH 4/4] = moved plugins and localization --- commands.config => assets/commands.config | 0 .../locCommands.config | 2 +- locStrings.config => assets/locStrings.config | 0 {plugins => assets/plugins}/example.lua | 0 {plugins => assets/plugins}/forbiddenword.lua | 36 +++++++++---------- src/commands/CommandTeey.java | 3 +- src/commands/CommandYeet.java | 3 +- .../benchmark/BenchmarkCommandCompare.java | 2 +- .../benchmark/BenchmarkCommandInfo.java | 2 +- src/core/ObjectBuilderFactory.java | 2 +- src/core/benchmark/BenchmarkManager.java | 3 +- 11 files changed, 28 insertions(+), 25 deletions(-) rename commands.config => assets/commands.config (100%) rename locCommands.config => assets/locCommands.config (99%) rename locStrings.config => assets/locStrings.config (100%) rename {plugins => assets/plugins}/example.lua (100%) rename {plugins => assets/plugins}/forbiddenword.lua (97%) diff --git a/commands.config b/assets/commands.config similarity index 100% rename from commands.config rename to assets/commands.config diff --git a/locCommands.config b/assets/locCommands.config similarity index 99% rename from locCommands.config rename to assets/locCommands.config index 3a35955..75cb78a 100644 --- a/locCommands.config +++ b/assets/locCommands.config @@ -58,4 +58,4 @@ fetch= crouton= invite= - + diff --git a/locStrings.config b/assets/locStrings.config similarity index 100% rename from locStrings.config rename to assets/locStrings.config diff --git a/plugins/example.lua b/assets/plugins/example.lua similarity index 100% rename from plugins/example.lua rename to assets/plugins/example.lua diff --git a/plugins/forbiddenword.lua b/assets/plugins/forbiddenword.lua similarity index 97% rename from plugins/forbiddenword.lua rename to assets/plugins/forbiddenword.lua index c6dd63c..d9417c3 100644 --- a/plugins/forbiddenword.lua +++ b/assets/plugins/forbiddenword.lua @@ -1,19 +1,19 @@ -local time = os.time(); - -function plugin(message, user) - if(string.match(string.lower(message), "purple"))then - local timedif = os.time() - time; - time = os.time(); - days = (timedif / (60*60*24)); - hours = ((timedif / (60*60)) % 24); - mins = ((timedif / (60)) % 60); - secs = timedif % 60; - return "*GASP!!!* \n" .. user.name .. " said **THE** word! It's been " .. round(days) .. " days, " .. round(hours) .. " hours, " .. round(mins) .. " minutes, and " .. round(secs) .. " seconds since the last time!"; - end - - return nil; -end - -function round(num) - return math.floor(num + 0.5) +local time = os.time(); + +function plugin(message, user) + if(string.match(string.lower(message), "purple"))then + local timedif = os.time() - time; + time = os.time(); + days = (timedif / (60*60*24)); + hours = ((timedif / (60*60)) % 24); + mins = ((timedif / (60)) % 60); + secs = timedif % 60; + return "*GASP!!!* \n" .. user.name .. " said **THE** word! It's been " .. round(days) .. " days, " .. round(hours) .. " hours, " .. round(mins) .. " minutes, and " .. round(secs) .. " seconds since the last time!"; + end + + return nil; +end + +function round(num) + return math.floor(num + 0.5) end \ No newline at end of file diff --git a/src/commands/CommandTeey.java b/src/commands/CommandTeey.java index c98d0b2..e25a9b8 100644 --- a/src/commands/CommandTeey.java +++ b/src/commands/CommandTeey.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import javax.imageio.ImageIO; import core.Command; +import core.Config; import core.LocStrings; import dataStructures.KittyChannel; import dataStructures.KittyGuild; @@ -53,7 +54,7 @@ public class CommandTeey extends Command return; teeyeeFile = new File(yeeteeFilename); - ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/teey/frames/", "teey ", 24, 18); + ImageOverlayBuilder builder = new ImageOverlayBuilder(Config.AssetDirectory + "teey/frames/", "teey ", 24, 18); builder.overlay(ImageIO.read(teeyeeFile), name); } catch (IOException e) diff --git a/src/commands/CommandYeet.java b/src/commands/CommandYeet.java index 71c5a63..ecfc18a 100644 --- a/src/commands/CommandYeet.java +++ b/src/commands/CommandYeet.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import javax.imageio.ImageIO; import core.Command; +import core.Config; import core.LocStrings; import dataStructures.KittyChannel; import dataStructures.KittyGuild; @@ -53,7 +54,7 @@ public class CommandYeet extends Command return; yeeteeFile = new File(yeeteeFilename); - ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/yeet/frames/", "yeet ", 24, 18); + ImageOverlayBuilder builder = new ImageOverlayBuilder(Config.AssetDirectory + "yeet/frames/", "yeet ", 24, 18); builder.overlay(ImageIO.read(yeeteeFile), name); } catch (IOException e) diff --git a/src/commands/benchmark/BenchmarkCommandCompare.java b/src/commands/benchmark/BenchmarkCommandCompare.java index 1052091..6870a87 100644 --- a/src/commands/benchmark/BenchmarkCommandCompare.java +++ b/src/commands/benchmark/BenchmarkCommandCompare.java @@ -29,7 +29,7 @@ public class BenchmarkCommandCompare extends BenchmarkCommand if(entries.size() < 1) output += "Couldn't find any models containing `" + inputSplit[i] + "`!"; - output += BenchmarkCommandInfo.FormatInfo(entries.get(0)); + output += BenchmarkCommandInfo.formatInfo(entries.get(0)); output += lineDelimiter; if(entries.size() > 1) diff --git a/src/commands/benchmark/BenchmarkCommandInfo.java b/src/commands/benchmark/BenchmarkCommandInfo.java index 676f288..62d08c9 100644 --- a/src/commands/benchmark/BenchmarkCommandInfo.java +++ b/src/commands/benchmark/BenchmarkCommandInfo.java @@ -14,7 +14,7 @@ public class BenchmarkCommandInfo extends BenchmarkCommand { static final String lineDelimiter = "\n"; - public static String FormatInfo(BenchmarkEntry entry) + public static String formatInfo(BenchmarkEntry entry) { String output = ""; diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index 640157b..986187f 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -492,7 +492,7 @@ public class ObjectBuilderFactory lazyInit(); if(pluginManager == null) - pluginManager = new PluginManager("./plugins/"); + pluginManager = new PluginManager(Config.AssetDirectory + "plugins/"); return pluginManager; } diff --git a/src/core/benchmark/BenchmarkManager.java b/src/core/benchmark/BenchmarkManager.java index 04e9909..bb9711e 100644 --- a/src/core/benchmark/BenchmarkManager.java +++ b/src/core/benchmark/BenchmarkManager.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import core.Config; import dataStructures.Pair; import utils.io.DirectoryMonitor; import utils.io.FileUtils; @@ -16,7 +17,7 @@ import utils.io.MonitoredFile; public class BenchmarkManager { // Variables - public final String directory = "assets/userbench/"; + public final String directory = Config.AssetDirectory + "userbench/"; public final String extension = ".csv"; public final String lineDelimiter = "\n";