diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/CoinCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/random/CoinCommand.java similarity index 95% rename from src/main/java/creator/loki/command/impl/entertainment/games/CoinCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/random/CoinCommand.java index c57a1f3..c6d0555 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/CoinCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/random/CoinCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.random; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/DiceCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/random/DiceCommand.java similarity index 96% rename from src/main/java/creator/loki/command/impl/entertainment/games/DiceCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/random/DiceCommand.java index 6478932..fa66c81 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/DiceCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/random/DiceCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.random; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/EightBallCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/random/EightBallCommand.java similarity index 100% rename from src/main/java/creator/loki/command/impl/entertainment/games/EightBallCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/random/EightBallCommand.java diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/GlazbobaCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/random/GlazbobaCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/GlazbobaCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/random/GlazbobaCommand.java index 7d664a8..2a3a4db 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/GlazbobaCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/random/GlazbobaCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.random; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/MemeCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/random/MemeCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/games/MemeCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/random/MemeCommand.java index 8a98360..90d40b1 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/MemeCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/random/MemeCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.random; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/RateCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/random/RateCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/RateCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/random/RateCommand.java index ad317e6..5d13fae 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/RateCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/random/RateCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.random; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/BoykisserCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/rating/BoykisserCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/BoykisserCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/rating/BoykisserCommand.java index fa9f34d..e2f3936 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/BoykisserCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/rating/BoykisserCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.rating; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/FatCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/rating/FatCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/FatCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/rating/FatCommand.java index 1c9e6c4..ef84065 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/FatCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/rating/FatCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.rating; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/GayCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/rating/GayCommand.java similarity index 100% rename from src/main/java/creator/loki/command/impl/entertainment/games/GayCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/rating/GayCommand.java diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/IqCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/rating/IqCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/IqCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/rating/IqCommand.java index dc0df82..cb8508c 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/IqCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/rating/IqCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.rating; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/MustacheCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/rating/MustacheCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/MustacheCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/rating/MustacheCommand.java index afde8f0..2765473 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/MustacheCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/rating/MustacheCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.rating; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/games/PpCommand.java b/src/main/java/creator/loki/command/impl/entertainment/games/rating/PpCommand.java similarity index 98% rename from src/main/java/creator/loki/command/impl/entertainment/games/PpCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/games/rating/PpCommand.java index b6fcb82..bc6cfa5 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/games/PpCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/games/rating/PpCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.games; +package creator.loki.command.impl.entertainment.games.rating; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/PokeCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/PokeCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/PokeCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/negative/PokeCommand.java index b3685bb..bdf2f4c 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/PokeCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/PokeCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.negative; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/RoastCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/RoastCommand.java similarity index 100% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/RoastCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/negative/RoastCommand.java diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/SlapCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/SlapCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/SlapCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/negative/SlapCommand.java index 82c373e..bebb731 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/SlapCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/SlapCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.negative; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/TickleCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/TickleCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/TickleCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/negative/TickleCommand.java index f6fb767..426d28f 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/TickleCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/negative/TickleCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.negative; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/ComplimentCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/ComplimentCommand.java similarity index 100% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/ComplimentCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/positive/ComplimentCommand.java diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/CuddleCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/CuddleCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/CuddleCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/positive/CuddleCommand.java index 5367a1a..a4c070d 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/CuddleCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/CuddleCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.positive; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/FeedCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/FeedCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/FeedCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/positive/FeedCommand.java index 777440e..1a267a3 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/FeedCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/FeedCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.positive; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/HugCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/HugCommand.java similarity index 96% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/HugCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/positive/HugCommand.java index c484efe..4558073 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/HugCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/HugCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.positive; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/KissCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/KissCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/KissCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/positive/KissCommand.java index 91b0f97..6a175f5 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/KissCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/KissCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.positive; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/PatCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/PatCommand.java similarity index 97% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/PatCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/positive/PatCommand.java index bb2415a..955dd26 100644 --- a/src/main/java/creator/loki/command/impl/entertainment/interaction/PatCommand.java +++ b/src/main/java/creator/loki/command/impl/entertainment/interaction/positive/PatCommand.java @@ -1,4 +1,4 @@ -package creator.loki.command.impl.entertainment.interaction; +package creator.loki.command.impl.entertainment.interaction.positive; import creator.loki.command.Command; import creator.loki.command.CommandContext; diff --git a/src/main/java/creator/loki/command/impl/entertainment/interaction/ShipCommand.java b/src/main/java/creator/loki/command/impl/entertainment/interaction/social/ShipCommand.java similarity index 100% rename from src/main/java/creator/loki/command/impl/entertainment/interaction/ShipCommand.java rename to src/main/java/creator/loki/command/impl/entertainment/interaction/social/ShipCommand.java diff --git a/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java b/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java index 57b0c36..71b6d14 100644 --- a/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java +++ b/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java @@ -1,7 +1,25 @@ package creator.loki.core.registry; import creator.loki.command.impl.entertainment.games.*; +import creator.loki.command.impl.entertainment.games.random.CoinCommand; +import creator.loki.command.impl.entertainment.games.random.DiceCommand; +import creator.loki.command.impl.entertainment.games.random.GlazbobaCommand; +import creator.loki.command.impl.entertainment.games.random.MemeCommand; +import creator.loki.command.impl.entertainment.games.random.RateCommand; +import creator.loki.command.impl.entertainment.games.rating.BoykisserCommand; +import creator.loki.command.impl.entertainment.games.rating.FatCommand; +import creator.loki.command.impl.entertainment.games.rating.IqCommand; +import creator.loki.command.impl.entertainment.games.rating.MustacheCommand; +import creator.loki.command.impl.entertainment.games.rating.PpCommand; import creator.loki.command.impl.entertainment.interaction.*; +import creator.loki.command.impl.entertainment.interaction.negative.PokeCommand; +import creator.loki.command.impl.entertainment.interaction.negative.SlapCommand; +import creator.loki.command.impl.entertainment.interaction.negative.TickleCommand; +import creator.loki.command.impl.entertainment.interaction.positive.CuddleCommand; +import creator.loki.command.impl.entertainment.interaction.positive.FeedCommand; +import creator.loki.command.impl.entertainment.interaction.positive.HugCommand; +import creator.loki.command.impl.entertainment.interaction.positive.KissCommand; +import creator.loki.command.impl.entertainment.interaction.positive.PatCommand; import creator.loki.command.impl.moderation.*; import creator.loki.command.impl.roles.*; import creator.loki.command.impl.stats.*;