diff --git a/src/main/java/me/runescapejon/CrazyFeet/Commands/Util/CrazyCheckCommands.java b/src/main/java/me/runescapejon/CrazyFeet/Commands/Util/CrazyCheckCommands.java deleted file mode 100644 index 511ce2c..0000000 --- a/src/main/java/me/runescapejon/CrazyFeet/Commands/Util/CrazyCheckCommands.java +++ /dev/null @@ -1,185 +0,0 @@ -package me.runescapejon.CrazyFeet.Commands.Util; - -import me.runescapejon.CrazyFeet.CrazyFeet; -import me.runescapejon.CrazyFeet.utils.LanguageUtils; -import me.runescapejon.CrazyFeet.utils.Pair; -import org.spongepowered.api.command.CommandResult; -import org.spongepowered.api.command.CommandSource; -import org.spongepowered.api.command.args.CommandContext; -import org.spongepowered.api.command.spec.CommandExecutor; -import org.spongepowered.api.entity.living.player.Player; -import org.spongepowered.api.text.Text; - -import java.util.ArrayList; -import java.util.Optional; -import java.util.UUID; - -public class CrazyCheckCommands implements CommandExecutor { - - @SuppressWarnings("unchecked") - public CommandResult execute(CommandSource sender, CommandContext args) { - Optional target = args.getOne("target"); - Optional targets = args.getOne("targets"); - final ArrayList cFire = CrazyFeet.getInstance().getCrazyFire(); - final ArrayList cSmoke = CrazyFeet.getInstance().getCrazySmoke(); - final ArrayList cMagic = CrazyFeet.getInstance().getCrazyMagic(); - final ArrayList cPearl = CrazyFeet.getInstance().getCrazyPearl(); - final ArrayList cnote = CrazyFeet.getInstance().getCrazyNote(); - final ArrayList cWitch = CrazyFeet.getInstance().getCrazyWitch(); - final ArrayList cFireh = CrazyFeet.getInstance().getCrazyFireHead(); - final ArrayList cSmokeh = CrazyFeet.getInstance().getCrazySmokeHead(); - final ArrayList cMagich = CrazyFeet.getInstance().getCrazyMagicHead(); - final ArrayList cPearlh = CrazyFeet.getInstance().getCrazyPearlHead(); - final ArrayList cnoteh = CrazyFeet.getInstance().getCrazyNoteHead(); - final ArrayList cHearth = CrazyFeet.getInstance().getCrazyHeartHead(); - final ArrayList cWitchh = CrazyFeet.getInstance().getCrazyWitchHead(); - final ArrayList cglobe = CrazyFeet.getInstance().getCrazyGlobe(); - final ArrayList cstorm = CrazyFeet.getInstance().getCrazyStorm(); - - if (!target.isPresent() && !targets.isPresent()) { - Player player = (Player) sender; - if (player.hasPermission("crazyfeet.crazyfirehead") || player.hasPermission("crazyfeet.crazysmokeheaed") - || player.hasPermission("crazyfeet.crazymagichead") - || player.hasPermission("crazyfeet.crazywitchhead") - || player.hasPermission("crazyfeet.crazynotehead") - || player.hasPermission("crazyfeet.crazyredhelix") - || player.hasPermission("crazyfeet.crazybluehelix") - || player.hasPermission("crazyfeet.crazybrownhelix") - || player.hasPermission("crazyfeet.crazygreenhelix") - || player.hasPermission("crazyfeet.crazyorangehelix") - || player.hasPermission("crazyfeet.crazypurplehelix") - || player.hasPermission("crazyfeet.crazywhitehelix") - || player.hasPermission("crazyfeet.crazyyellowhelix") - || player.hasPermission("crazyfeet.crazyhearthead") || player.hasPermission("crazyfeet.crazyhelix") - || player.hasPermission("crazyfeet.crazypearlhead") || player.hasPermission("crazyfeet.crazyfire") - || player.hasPermission("crazyfeet.crazysmoke") || player.hasPermission("crazyfeet.crazymagic") - || player.hasPermission("crazyfeet.crazywitch") || player.hasPermission("crazyfeet.crazynote") - || player.hasPermission("crazyfeet.crazyheart") || player.hasPermission("crazyfeet.crazypearl")) { - player.sendMessage(LanguageUtils.getText("crazyFeetModes")); - if (cglobe.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyGlobe")); - } - if (cstorm.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyStorm")); - } - if (cFireh.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyFireHead")); - } - if (cSmokeh.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazySmokeHead")); - } - if (cHearth.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyHeartHead")); - } - if (cMagich.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyMagicHead")); - } - if (cWitchh.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyWitchHead")); - } - if (cnoteh.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazynoteHead")); - } - if (cPearlh.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyPearlHead")); - } - if (cFire.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyFire")); - } - if (cSmoke.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazySmoke")); - } - if (cMagic.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyMagic")); - } - if (cWitch.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyWitch")); - } - if (cnote.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyNote")); - } - if (cPearl.contains(player.getUniqueId())) { - player.sendMessage(Text.of("- CrazyPearl")); - } - if (!cFireh.contains(player.getUniqueId()) && !cHearth.contains(player.getUniqueId()) - && !cstorm.contains(player.getUniqueId()) && !cnoteh.contains(player.getUniqueId()) - && !cglobe.contains(player.getUniqueId()) - && !cWitchh.contains(player.getUniqueId()) && !cSmokeh.contains(player.getUniqueId()) - && !cMagich.contains(player.getUniqueId()) - && !cPearlh.contains(player.getUniqueId()) - && !cFire.contains(player.getUniqueId()) - && !cnote.contains(player.getUniqueId()) && !cWitch.contains(player.getUniqueId()) - && !cSmoke.contains(player.getUniqueId()) && !cMagic.contains(player.getUniqueId()) - && !cPearl.contains(player.getUniqueId())) { - player.sendMessage(LanguageUtils.getText("crazyFeetModesEmpty")); - // return CommandResult.success(); - } - } - } else if (target.isPresent() && sender.hasPermission("crazyfeet.checkothers")) { - Player targ = target.get(); - sender.sendMessage( - LanguageUtils.getText("crazyFeetOtherPlayerModes", new Pair<>("%PLAYER%", targ.getName()))); - // System.out.println("It's being called crazycheck other"); - if (cglobe.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyGlobe")); - } - if (cstorm.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyStorm")); - } - if (cFireh.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyFireHead")); - } - if (cSmokeh.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazySmokeHead")); - } - if (cMagich.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyMagicHead")); - } - if (cWitchh.contains(targ.getUniqueId())) { - targ.sendMessage(Text.of("- CrazyWitchHead")); - } - if (cnoteh.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazynoteHead")); - } - if (cHearth.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyHeartHead")); - } - if (cPearlh.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyPearlHead")); - } - if (cFire.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyFire")); - } - if (cSmoke.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazySmoke")); - } - if (cMagic.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyMagic")); - } - if (cWitch.contains(targ.getUniqueId())) { - targ.sendMessage(Text.of("- CrazyWitch")); - } - if (cnote.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- Crazynote")); - } - if (cPearl.contains(targ.getUniqueId())) { - sender.sendMessage(Text.of("- CrazyPearl")); - } - if (!cFireh.contains(targ.getUniqueId()) && !cHearth.contains(targ.getUniqueId()) - && !cstorm.contains(targ.getUniqueId()) && !cnoteh.contains(targ.getUniqueId()) - && !cglobe.contains(targ.getUniqueId()) - && !cWitchh.contains(targ.getUniqueId()) && !cSmokeh.contains(targ.getUniqueId()) - && !cMagich.contains(targ.getUniqueId()) - && !cPearlh.contains(targ.getUniqueId()) - && !cFire.contains(targ.getUniqueId()) - && !cnote.contains(targ.getUniqueId()) && !cWitch.contains(targ.getUniqueId()) - && !cSmoke.contains(targ.getUniqueId()) && !cMagic.contains(targ.getUniqueId()) - && !cPearl.contains(targ.getUniqueId())) { - sender.sendMessage(LanguageUtils.getText("crazyFeetOtherPlayerModesEmpty", - new Pair<>("%PLAYER%", targ.getName()))); - } - } - - return CommandResult.success(); - } -} diff --git a/src/main/java/me/runescapejon/CrazyFeet/Commands/Util/CrazyDisableCmds.java b/src/main/java/me/runescapejon/CrazyFeet/Commands/Util/CrazyDisableCmds.java deleted file mode 100644 index dafc4b7..0000000 --- a/src/main/java/me/runescapejon/CrazyFeet/Commands/Util/CrazyDisableCmds.java +++ /dev/null @@ -1,162 +0,0 @@ -package me.runescapejon.CrazyFeet.Commands.Util; - -import me.runescapejon.CrazyFeet.CrazyFeet; -import me.runescapejon.CrazyFeet.utils.LanguageUtils; -import me.runescapejon.CrazyFeet.utils.Pair; -import org.spongepowered.api.command.CommandResult; -import org.spongepowered.api.command.CommandSource; -import org.spongepowered.api.command.args.CommandContext; -import org.spongepowered.api.command.spec.CommandExecutor; -import org.spongepowered.api.entity.living.player.Player; - -import java.util.ArrayList; -import java.util.Optional; -import java.util.UUID; - -public class CrazyDisableCmds implements CommandExecutor { - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public CommandResult execute(CommandSource sender, CommandContext args) { - Optional target = args.getOne("target"); - - final ArrayList cFire = CrazyFeet.getInstance().getCrazyFire(); - final ArrayList cSmoke = CrazyFeet.getInstance().getCrazySmoke(); - final ArrayList cMagic = CrazyFeet.getInstance().getCrazyMagic(); - final ArrayList cPearl = CrazyFeet.getInstance().getCrazyPearl(); - final ArrayList cnote = CrazyFeet.getInstance().getCrazyNote(); - final ArrayList cWitch = CrazyFeet.getInstance().getCrazyWitch(); - final ArrayList cFireh = CrazyFeet.getInstance().getCrazyFireHead(); - final ArrayList cSmokeh = CrazyFeet.getInstance().getCrazySmokeHead(); - final ArrayList cMagich = CrazyFeet.getInstance().getCrazyMagicHead(); - final ArrayList cPearlh = CrazyFeet.getInstance().getCrazyPearlHead(); - final ArrayList cnoteh = CrazyFeet.getInstance().getCrazyNoteHead(); - final ArrayList cHearth = CrazyFeet.getInstance().getCrazyHeartHead(); - final ArrayList cWitchh = CrazyFeet.getInstance().getCrazyWitchHead(); - final ArrayList cglobe = CrazyFeet.getInstance().getCrazyGlobe(); - final ArrayList cstorm = CrazyFeet.getInstance().getCrazyStorm(); - - if (!target.isPresent()) { - // if (sender instanceof Player) { - Player player = (Player) sender; - if (player.hasPermission("crazyfeet.crazyfirehead") || player.hasPermission("crazyfeet.crazysmokeheaed") - || player.hasPermission("crazyfeet.crazymagichead") - || player.hasPermission("crazyfeet.crazywitchhead") - || player.hasPermission("crazyfeet.crazynotehead") - || player.hasPermission("crazyfeet.crazystorm") - || player.hasPermission("crazyfeet.crazyredhelix") - || player.hasPermission("crazyfeet.crazybluehelix") - || player.hasPermission("crazyfeet.crazybrownhelix") - || player.hasPermission("crazyfeet.crazygreenhelix") - || player.hasPermission("crazyfeet.crazyorangehelix") - || player.hasPermission("crazyfeet.crazypurplehelix") - || player.hasPermission("crazyfeet.crazywhitehelix") - || player.hasPermission("crazyfeet.crazyyellowhelix") - || player.hasPermission("crazyfeet.crazyhearthead") - || player.hasPermission("crazyfeet.crazypearlhead") || player.hasPermission("crazyfeet.crazyfire") - || player.hasPermission("crazyfeet.crazysmoke") || player.hasPermission("crazyfeet.crazymagic") - || player.hasPermission("crazyfeet.crazywitch") || player.hasPermission("crazyfeet.crazynote") - || player.hasPermission("crazyfeet.crazyhelix") | player.hasPermission("crazyfeet.crazyheart") - || player.hasPermission("crazyfeet.crazypearl")) { - if (cFireh.contains(player.getUniqueId())) { - cFireh.remove(player.getUniqueId()); - } - if (cstorm.contains(player.getUniqueId())) { - cstorm.remove(player.getUniqueId()); - } - if (cglobe.contains(player.getUniqueId())) { - cglobe.remove(player.getUniqueId()); - } - if (cSmokeh.contains(player.getUniqueId())) { - cSmokeh.remove(player.getUniqueId()); - } - if (cHearth.contains(player.getUniqueId())) { - cHearth.remove(player.getUniqueId()); - } - if (cWitchh.contains(player.getUniqueId())) { - cWitchh.remove(player.getUniqueId()); - } - if (cnoteh.contains(player.getUniqueId())) { - cnoteh.remove(player.getUniqueId()); - } - if (cMagich.contains(player.getUniqueId())) { - cMagich.remove(player.getUniqueId()); - } - if (cPearlh.contains(player.getUniqueId())) { - cPearlh.remove(player.getUniqueId()); - } - if (cFire.contains(player.getUniqueId())) { - cFire.remove(player.getUniqueId()); - } - if (cSmoke.contains(player.getUniqueId())) { - cSmoke.remove(player.getUniqueId()); - } - if (cWitch.contains(player.getUniqueId())) { - cWitch.remove(player.getUniqueId()); - } - if (cnote.contains(player.getUniqueId())) { - cnote.remove(player.getUniqueId()); - } - if (cMagic.contains(player.getUniqueId())) { - cMagic.remove(player.getUniqueId()); - } - if (cPearl.contains(player.getUniqueId())) { - cPearl.remove(player.getUniqueId()); - } - player.sendMessage(LanguageUtils.getText("crazyFeetModesCleared")); - } - } else if (sender.hasPermission("crazyfeet.disableothers")) { - Player targ = target.get(); - if (cglobe.contains(targ.getUniqueId())) { - cglobe.remove(targ.getUniqueId()); - } - if (cstorm.contains(targ.getUniqueId())) { - cstorm.remove(targ.getUniqueId()); - } - if (cFireh.contains(targ.getUniqueId())) { - cFireh.remove(targ.getUniqueId()); - } - if (cSmokeh.contains(targ.getUniqueId())) { - cSmokeh.remove(targ.getUniqueId()); - } - if (cMagich.contains(targ.getUniqueId())) { - cMagich.remove(targ.getUniqueId()); - } - if (cHearth.contains(targ.getUniqueId())) { - cHearth.remove(targ.getUniqueId()); - } - if (cWitchh.contains(targ.getUniqueId())) { - cWitchh.remove(targ.getUniqueId()); - } - if (cnoteh.contains(targ.getUniqueId())) { - cnoteh.remove(targ.getUniqueId()); - } - if (cPearlh.contains(targ.getUniqueId())) { - cPearlh.remove(targ.getUniqueId()); - } - if (cFire.contains(targ.getUniqueId())) { - cFire.remove(targ.getUniqueId()); - } - if (cSmoke.contains(targ.getUniqueId())) { - cSmoke.remove(targ.getUniqueId()); - } - if (cMagic.contains(targ.getUniqueId())) { - cMagic.remove(targ.getUniqueId()); - } - if (cWitch.contains(targ.getUniqueId())) { - cWitch.remove(targ.getUniqueId()); - } - if (cnote.contains(targ.getUniqueId())) { - cnote.remove(targ.getUniqueId()); - } - if (cPearl.contains(targ.getUniqueId())) { - cPearl.remove(targ.getUniqueId()); - } - targ.sendMessage( - LanguageUtils.getText("crazyFeetModesClearedByPlayer", new Pair("%PLAYER%", sender.getName()))); - sender.sendMessage( - LanguageUtils.getText("crazyFeetModesClearedForPlayer", new Pair("%PLAYER%", targ.getName()))); - } - return CommandResult.success(); - - } -} diff --git a/src/main/java/me/runescapejon/CrazyFeet/Commands/commandLoader.java b/src/main/java/me/runescapejon/CrazyFeet/Commands/commandLoader.java index e8e31d6..baeaabc 100644 --- a/src/main/java/me/runescapejon/CrazyFeet/Commands/commandLoader.java +++ b/src/main/java/me/runescapejon/CrazyFeet/Commands/commandLoader.java @@ -1,6 +1,5 @@ package me.runescapejon.CrazyFeet.Commands; -import me.runescapejon.CrazyFeet.Commands.Util.CrazyCheckCommands; import me.runescapejon.CrazyFeet.messages; import org.spongepowered.api.command.args.GenericArguments; import org.spongepowered.api.command.spec.CommandSpec; @@ -64,15 +63,6 @@ public class commandLoader { .executor(new witch()) .build(); - private CommandSpec CrazyCheckSpec = CommandSpec.builder() - .description(Text.of("crazycheck your particles status - helpful to see what enabled")) - .permission("crazyfeet.crazycheck") - .arguments(GenericArguments.firstParsing(GenericArguments.flags() - .buildWith(GenericArguments.firstParsing( - GenericArguments.optional(GenericArguments.player(Text.of("target"))), - GenericArguments.optional(GenericArguments.string(Text.of("targets"))))))) - .executor(new CrazyCheckCommands()).build(); - private CommandSpec CrazyhelixmenuSpec = CommandSpec.builder() .description(Text.of("crazyguihelix access Gui for helixes colors")).executor(new HelixGUICommand()) .build(); @@ -118,7 +108,6 @@ public class commandLoader { .executor(new help()) .permission("crazyfeet.base") .child(CrazystormSpec,"storm") - .child(CrazyCheckSpec,"check") .child(fire,"fire") .child(hearts,"hearts","heart") .child(CrazyGui2Spec,"gui2") @@ -132,6 +121,6 @@ public class commandLoader { .child(reload,"reload") .child(gui,"gui") .child(Helix,"helix") - .child(disable,"disable","remove","stop","none","off") + .child(disable,"disable","remove","stop","none","off","clear") .build(); } diff --git a/src/main/java/me/runescapejon/CrazyFeet/Commands/commandUtil.java b/src/main/java/me/runescapejon/CrazyFeet/Commands/commandUtil.java index 9265a05..aca33b9 100644 --- a/src/main/java/me/runescapejon/CrazyFeet/Commands/commandUtil.java +++ b/src/main/java/me/runescapejon/CrazyFeet/Commands/commandUtil.java @@ -18,14 +18,15 @@ public class commandUtil { private static HashMap uuidStringMap = new HashMap<>(); private static HashMap uuidDoubleHashMap = new HashMap<>(); private static HashMap, ParticleType> particleTypeHashMap = new HashMap<>(); + private static HashMap, String> stringHashMap = new HashMap<>(); private static boolean identityExists (UUID identity,HashMap map) { return map.containsKey(identity); } - private static boolean stringExists (UUID identity,String arg,HashMap map) { - return map.containsKey(identity) && map.containsValue(arg); + private static boolean stringNotExist (UUID identity,String arg,HashMap map) { + return !map.containsKey(identity) || !map.containsValue(arg); } @@ -56,7 +57,7 @@ static boolean invalidCommand (CommandSource src,String argument,ParticleType pa if (!getClearType().contains(argument)) { if (!identityExists(identity,getUuidDoubleHashMap())) { applyTrail(src,arg,particleType); - } else if (identityExists(identity,getUuidDoubleHashMap()) && !stringExists(identity,argument,getUuidDoubleHashMap())) { + } else if (identityExists(identity,getUuidDoubleHashMap()) && stringNotExist(identity,argument,getUuidDoubleHashMap())) { if (getUuidDoubleHashMap().containsKey(identity)) { getUuidDoubleHashMap().remove(identity); applyTrail(src,arg,particleType); @@ -74,18 +75,26 @@ static boolean invalidCommand (CommandSource src,String argument,ParticleType pa } - static boolean invalidCommand (CommandSource src,String argument) { + static boolean invalidCommand (CommandSource src,String argument,String effect) { Player player = (Player) src; UUID identity = player.getUniqueId(); - if (!getClearType().contains(argument)) { - if (!identityExists(identity,getUuidStringMap())) { - applyTrail(src,argument); - } else if (identityExists(identity,getUuidStringMap()) && !stringExists(identity,argument,getUuidStringMap())) { + HashMap, String> map = commandUtil.getStringHashMap(); + String innerMap = map.get(commandUtil.getUuidStringMap()); + + + if (!getClearType().contains(argument)) { //If not clearing + if (!identityExists(identity,getUuidStringMap())) { //if Identity is not in Map + applyTrail(src,argument,effect); + //If identity is in Map, but color is not + } else if (identityExists(identity,getUuidStringMap()) && stringNotExist(identity,argument,getUuidStringMap())) { if (getUuidStringMap().containsKey(identity)) { getUuidStringMap().remove(identity); - applyTrail(src,argument); + applyTrail(src,argument,effect); } + } else if (!innerMap.equals(effect)) { + getUuidStringMap().remove(identity); + applyTrail(src,argument,effect); } return false; } else if (getClearType().contains(argument)) { @@ -98,12 +107,13 @@ static boolean invalidCommand (CommandSource src,String argument) { return false; } - private static void applyTrail (CommandSource src,String argument) { + private static void applyTrail (CommandSource src,String argument,String effect) { Player player = (Player) src; UUID identity = player.getUniqueId(); removeTrails(player,getUuidStringMap()); getUuidStringMap().put(identity,argument); + getStringHashMap().put(getUuidStringMap(),effect); } private static void applyTrail (CommandSource src,Double argument,ParticleType particleType) { @@ -151,5 +161,9 @@ public static HashMap, ParticleType> getParticleTypeHashMa return particleTypeHashMap; } + public static HashMap, String> getStringHashMap () { + return stringHashMap; + } + } diff --git a/src/main/java/me/runescapejon/CrazyFeet/Commands/globe.java b/src/main/java/me/runescapejon/CrazyFeet/Commands/globe.java index ed8cd36..1aadc83 100644 --- a/src/main/java/me/runescapejon/CrazyFeet/Commands/globe.java +++ b/src/main/java/me/runescapejon/CrazyFeet/Commands/globe.java @@ -15,7 +15,7 @@ public CommandResult execute (CommandSource src,CommandContext args) { String color = args.requireOne(messages.colorCommandKey); if (src instanceof Player) { - if (commandUtil.invalidCommand(src,color)) { + if (commandUtil.invalidCommand(src,color,"globe")) { src.sendMessage(Text.of(TextColors.RED,"Invalid Choice! Available colors are\n" + commandUtil.getColors().toString())); } } diff --git a/src/main/java/me/runescapejon/CrazyFeet/Commands/helix.java b/src/main/java/me/runescapejon/CrazyFeet/Commands/helix.java index f1f9f07..d8dfdd4 100644 --- a/src/main/java/me/runescapejon/CrazyFeet/Commands/helix.java +++ b/src/main/java/me/runescapejon/CrazyFeet/Commands/helix.java @@ -14,7 +14,7 @@ public class helix implements CommandExecutor { public CommandResult execute (CommandSource src,CommandContext args) { String color = args.requireOne(messages.colorCommandKey); if (src instanceof Player) { - if (commandUtil.invalidCommand(src,color)) { + if (commandUtil.invalidCommand(src,color,"helix")) { src.sendMessage(Text.of(TextColors.RED,messages.colorError)); } } diff --git a/src/main/java/me/runescapejon/CrazyFeet/CrazyFeet.java b/src/main/java/me/runescapejon/CrazyFeet/CrazyFeet.java index 3130f4f..42ccd95 100644 --- a/src/main/java/me/runescapejon/CrazyFeet/CrazyFeet.java +++ b/src/main/java/me/runescapejon/CrazyFeet/CrazyFeet.java @@ -24,6 +24,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.Optional; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -185,7 +186,12 @@ public void onServerStart (GameStartedServerEvent event) { .execute(() -> { for (UUID uuid : commandUtil.getUuidStringMap().keySet()) { if (Sponge.getServer().getPlayer(uuid).isPresent()) { - helix(Sponge.getServer().getPlayer(uuid),colorChoice(commandUtil.getUuidStringMap().get(uuid))); + HashMap, String> map = commandUtil.getStringHashMap(); + String innerMap = map.get(commandUtil.getUuidStringMap()); + String color = commandUtil.getUuidStringMap().get(uuid); + if (innerMap.equals("helix")) { + helix(Sponge.getServer().getPlayer(uuid),colorChoice(color)); + } } } }) @@ -198,7 +204,12 @@ public void onServerStart (GameStartedServerEvent event) { .execute(() -> { for (UUID uuid : commandUtil.getUuidStringMap().keySet()) { if (Sponge.getServer().getPlayer(uuid).isPresent()) { - StyleGlobe(Sponge.getServer().getPlayer(uuid),colorChoice(commandUtil.getUuidStringMap().get(uuid))); + HashMap, String> map = commandUtil.getStringHashMap(); + String innerMap = map.get(commandUtil.getUuidStringMap()); + String color = commandUtil.getUuidStringMap().get(uuid); + if (innerMap.equals("globe")) { + StyleGlobe(Sponge.getServer().getPlayer(uuid),colorChoice(color)); + } } } })