From 1a4fcaabfb886f9d72e331852c1a7d6e8c30f873 Mon Sep 17 00:00:00 2001 From: Edith Boles Date: Mon, 4 Oct 2021 18:14:56 -0700 Subject: [PATCH] Changes to commands --- src/main/java/top/penowl/quidproquo/Commands.java | 3 ++- src/main/java/top/penowl/quidproquo/Ritual.java | 3 +++ src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/BlockShiftRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/CreeperHissRitual.java | 1 + .../top/penowl/quidproquo/rituals/CrystalizationRtiual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/FakePlayerRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/FeedingRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/GetLuckyRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/HardPenorRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/HealRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/HerobrineRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/HitRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java | 1 + .../top/penowl/quidproquo/rituals/LightQuicktimeRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/LightningRitual.java | 2 ++ src/main/java/top/penowl/quidproquo/rituals/MidasRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/QuicktimeRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/RandomItemRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/SoftPenorRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java | 1 + .../java/top/penowl/quidproquo/rituals/SummoningRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java | 1 + src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java | 1 + 34 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/top/penowl/quidproquo/Commands.java b/src/main/java/top/penowl/quidproquo/Commands.java index 9d507c5..b6af55e 100644 --- a/src/main/java/top/penowl/quidproquo/Commands.java +++ b/src/main/java/top/penowl/quidproquo/Commands.java @@ -35,7 +35,7 @@ public class Commands implements CommandExecutor, TabCompleter { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - String key = String.join(" ", Arrays.asList(args).stream().map(string -> string.replace("_", " ")).collect(Collectors.toSet())).toLowerCase(); + String key = String.join(" ", Arrays.asList(args).stream().map(string -> string.replace("_", " ")).collect(Collectors.toList())).toLowerCase(); if (args.length < 1 || args[0].toLowerCase().equals("list")) { List ritualNames = new ArrayList(recipes.keySet()); Collections.sort(ritualNames); @@ -96,6 +96,7 @@ public class Commands implements CommandExecutor, TabCompleter { builder.append(" [Back]"); builder.color(net.md_5.bungee.api.ChatColor.GOLD); builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rt list 1 d")); + builder.append("\n" +ChatColor.DARK_PURPLE + ChatColor.ITALIC + ritual.description); builder.append("\n\n" + ChatColor.GREEN + "" + ChatColor.BOLD + "Ingredients:\n"); for (Map.Entry entry : ritual.ingredients.entrySet()) { builder.append(WordUtils.capitalizeFully(entry.getKey().toString().replace('_', ' ').toLowerCase())); diff --git a/src/main/java/top/penowl/quidproquo/Ritual.java b/src/main/java/top/penowl/quidproquo/Ritual.java index d4f0a34..149be0e 100644 --- a/src/main/java/top/penowl/quidproquo/Ritual.java +++ b/src/main/java/top/penowl/quidproquo/Ritual.java @@ -31,6 +31,9 @@ public abstract class Ritual { // name of ritual, should be a gerund public String name = "unnamed"; + + // short description of ritual + public String description = ""; // whether you want a lightning effect public Boolean lightning = false; diff --git a/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java b/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java index 76db828..232e5c3 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java @@ -20,6 +20,7 @@ public class AnvilRitual extends Ritual { health = 5; backfire = 0.5; notify = false; + description = "Drop an anvil over your foe."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java index d843a73..a96811d 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java @@ -16,6 +16,7 @@ public class BatSpewRitual extends Ritual { addSacrifice(EntityType.CHICKEN, 1); name = "bat spew"; backfire = 0.1; + description = "Summon a cauldron of bats to strike fear into your enemy."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java b/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java index 503b1c1..5e3683e 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/BlockShiftRitual.java @@ -37,6 +37,7 @@ public class BlockShiftRitual extends Ritual { addIngredient(Material.ENDER_PEARL, 1); name = "block shift"; health = 3; + description = "Shift reality around you."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java index cfb1936..655e53c 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java @@ -17,6 +17,7 @@ public class ChickenSpewRitual extends Ritual { health = 3; name = "chicken spew"; backfire = 0.1; + description = "Summon a flock of chickens to floof your enemy's mental state."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java index 3cdc3d5..bf70785 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java @@ -22,6 +22,7 @@ public class ChugJugRitual extends Ritual { addSacrifice(EntityType.WITCH, 1); health = 10; name = "chug jug"; + description = "Summon a chug-jug'ed witch to poison your enemy!"; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java b/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java index 4b81f0e..526e988 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java @@ -17,6 +17,7 @@ public class CreeperHissRitual extends Ritual { name = "creeper hissing"; health = 1; notify = false; + description = "Play a creeper hiss to your enemy."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/CrystalizationRtiual.java b/src/main/java/top/penowl/quidproquo/rituals/CrystalizationRtiual.java index 6adeaab..0d1df29 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/CrystalizationRtiual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/CrystalizationRtiual.java @@ -18,6 +18,7 @@ public class CrystalizationRtiual extends Ritual { name = "crystalization"; health = 2; notify = false; + description = "Combine ingredients into a ender crystal."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java b/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java index 473a87a..2fa4374 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java @@ -22,6 +22,7 @@ public class DragonRitual extends Ritual { name = "dragon summoning"; health = 3; lightning = true; + description = "Summon the fearsome Ender Dragon."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/FakePlayerRitual.java b/src/main/java/top/penowl/quidproquo/rituals/FakePlayerRitual.java index 4f5c4a1..2493407 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/FakePlayerRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/FakePlayerRitual.java @@ -23,6 +23,7 @@ public class FakePlayerRitual extends Ritual { name = "player illusion"; notify = false; health = 4; + description = "Summon a ghost nametag to spook your foe."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/FeedingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/FeedingRitual.java index 30ac10d..8ae9f59 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/FeedingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/FeedingRitual.java @@ -14,6 +14,7 @@ public class FeedingRitual extends Ritual { addIngredient(Material.WHEAT, 16); health = 1; name = "feeding"; + description = "Restore you and your target's food levels to maximum."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java index 5172355..f2fbb3f 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java @@ -19,6 +19,7 @@ public class FillerRitual extends Ritual { name = "trolling"; health = 2; backfire = 0.2; + description = "Fill your foe's inventory with junk!"; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java b/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java index 57d8827..c70b1af 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java @@ -17,6 +17,7 @@ public class GBJRitual extends Ritual { name = "caging"; health = 5; backfire = 0.2; + description = "Trap your foe in the wagie cage!"; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/GetLuckyRitual.java b/src/main/java/top/penowl/quidproquo/rituals/GetLuckyRitual.java index 5b1d098..19d3a6e 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/GetLuckyRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/GetLuckyRitual.java @@ -18,6 +18,7 @@ public class GetLuckyRitual extends Ritual { lightning = true; name = "daring"; notify = false; + description = "Flip a coin and either nuke your base or get mountains of gold."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java index 6cbedbb..682b3d3 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java @@ -16,6 +16,7 @@ public class HardPenorRitual extends Ritual { addIngredient(Material.REDSTONE, 16); addIngredient(Material.WHEAT, 32); name = "erection"; + description = "Encase your foe in a hard penor."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java index 761cc3b..cc8f1d9 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java @@ -14,6 +14,7 @@ public class HealRitual extends Ritual { addIngredient(Material.WHEAT, 16); addIngredient(Material.GOLD_NUGGET, 1); name = "healing"; + description = "Heal both you and your target for two hearts."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java index cb91c9e..39cda11 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java @@ -29,6 +29,7 @@ public class HerobrineRitual extends Ritual { health = 10; name = "herobrine"; backfire = 0.1; + description = "Summon Herobrine to vanquish your foe!"; } @Override public void execute(Player caster, Player target, Location location) { diff --git a/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java index 23ce8d5..044adfe 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HitRitual.java @@ -16,6 +16,7 @@ public class HitRitual extends Ritual { name = "shadow hit"; health = 1; notify = false; + description = "Play a fake hit noise to someone."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java index 892e27f..3e1a02e 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java @@ -17,6 +17,7 @@ public class KickingRitual extends Ritual { health = 3; name = "kicking"; backfire = 0.4; + description = "Kick your enemy from the server!"; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java b/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java index 624c30a..0a48eb9 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java @@ -14,6 +14,7 @@ public class LavaRitual extends Ritual { addIngredient(Material.WHEAT, 64); backfire = 0.10; name = "combustion"; + description = "Light your enemy on fire for a short period."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/LightQuicktimeRitual.java b/src/main/java/top/penowl/quidproquo/rituals/LightQuicktimeRitual.java index 3edd6f5..f6c51c5 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/LightQuicktimeRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/LightQuicktimeRitual.java @@ -19,6 +19,7 @@ public class LightQuicktimeRitual extends Ritual { name = "quicktime lite"; health = 4; backfire = 0.3; + description = "Force your enemy to undergo a quicktime event."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java b/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java index c4926ba..33314a7 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/LightningRitual.java @@ -16,6 +16,8 @@ public class LightningRitual extends Ritual { addIngredient(Material.WHEAT, 64); addIngredient(Material.GLOWSTONE, 16); name = "lightning location"; + description = "Send a bolt of locating lightning to all players."; + notify = false; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/MidasRitual.java b/src/main/java/top/penowl/quidproquo/rituals/MidasRitual.java index 199e462..9ca5c23 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/MidasRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/MidasRitual.java @@ -20,6 +20,7 @@ public class MidasRitual extends Ritual { addIngredient(Material.WHEAT, 64*3); name = "midas"; health = 5; + description = "Turn the block your enemy is looking at to gold."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/QuicktimeRitual.java b/src/main/java/top/penowl/quidproquo/rituals/QuicktimeRitual.java index 69d8113..dda1810 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/QuicktimeRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/QuicktimeRitual.java @@ -21,6 +21,7 @@ public class QuicktimeRitual extends Ritual { name = "quicktime"; health = 4; backfire = 0.15; + description = "Force your enemy to undergo a quicktime event."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java b/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java index 807ae70..66f1444 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java @@ -29,6 +29,7 @@ public class RSpawnEggRitual extends Ritual { addIngredient(Material.WHEAT, 64); name = "egging"; health = 2; + description = "Summon a random spawn egg."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java b/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java index 0205c35..47ce9e8 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java @@ -23,6 +23,7 @@ public class RandomItemRitual extends Ritual { health = 2; name = "itemization"; notify = false; + description = "Summon a random item. ANY item."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java b/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java index 44c6b36..f8ba0ca 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/RotateRitual.java @@ -18,6 +18,7 @@ public class RotateRitual extends Ritual { backfire = 0.05; name = "rotation"; notify = false; + description = "Rotate your target by 180 degrees."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java index 63a41ce..0f29328 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java @@ -17,6 +17,7 @@ public class SnowmanRitual extends Ritual { addIngredient(Material.WHEAT, 32); health = 10; name = "snowing"; + description = "Cause a snowman invasion at the location of your enemy."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java index 8ceca7f..a96303b 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java @@ -17,6 +17,7 @@ public class SoftPenorRitual extends Ritual { addIngredient(Material.WHEAT, 32); backfire = 0.10; name = "disfunction"; + description = "Encase your enemy in a sand penor."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java index d454b29..43cb643 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java @@ -15,6 +15,7 @@ public class SoundRitual extends Ritual { name = "shadow sound"; health = 1; notify = false; + description = "Plays a random sound to your target."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java index 27198fd..d8bf12d 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java @@ -18,6 +18,7 @@ public class SummoningRitual extends Ritual { health = 6; name = "summoning"; backfire = 0.04; + description = "Summons a player to the altar."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java b/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java index 306945a..26b8f42 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java @@ -20,6 +20,7 @@ public class WitherRitual extends Ritual { health = 2; notify = false; lightning = true; + description = "Summons a wither."; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java index 529eecf..8012f47 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/WoolingRitual.java @@ -18,6 +18,7 @@ public class WoolingRitual extends Ritual { health = 2; byproducts.add(new ItemStack(Material.WOOL, 100)); notify = false; + description = "Summons a ton of wool."; } @Override