Redstoner/Modules
Archived
0
Fork 0
Code Activity

Undid the change from chat to actionbar for messages

Browse Source
This commit is contained in:
Minenash
2018-11-07 20:53:51 -05:00
parent 0f3e1cf2cc
commit 959c7a2f84
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/redstoner/modules/damnspam/DamnSpam.java
View File

@@ -37,11 +37,9 @@ import com.redstoner.misc.CommandHolderType;
import com.redstoner.misc.Main; import com.redstoner.misc.Main;
import com.redstoner.modules.Module; import com.redstoner.modules.Module;
import net.nemez.chatapi.ChatAPI;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@AutoRegisterListener @AutoRegisterListener
@Version(major = 4, minor = 1, revision = 1, compatible = 4) @Version(major = 4, minor = 1, revision = 0, compatible = 4)
public class DamnSpam implements Module, Listener public class DamnSpam implements Module, Listener
{ {
File configFile = new File(Main.plugin.getDataFolder(), "DamnSpam.json"); File configFile = new File(Main.plugin.getDataFolder(), "DamnSpam.json");
@@ -145,10 +143,10 @@ public class DamnSpam implements Module, Listener
destroyingInput = true; destroyingInput = true;
else if (!isAcceptableTimeout(seconds)) else if (!isAcceptableTimeout(seconds))
{ {
ChatAPI.sendActionBar(sender, "&cThe timeout must be &e-1&c or within &e0&c and &e" + maxTimeout); getLogger().message(sender, true, "The timeout must be -1 or within 0 and " + maxTimeout);
return; return;
} }
ChatAPI.sendActionBar(sender, "&7Please click the input you would like to set."); getLogger().message(sender, "Please click the input you would like to set.");
setPlayer((Player) sender, destroyingInput, seconds, seconds); setPlayer((Player) sender, destroyingInput, seconds, seconds);
} }
@@ -164,10 +162,10 @@ public class DamnSpam implements Module, Listener
} }
else if (!(isAcceptableTimeout(secondsOn) && isAcceptableTimeout(secondsOff))) else if (!(isAcceptableTimeout(secondsOn) && isAcceptableTimeout(secondsOff)))
{ {
ChatAPI.sendActionBar(sender, "&cThe timeout must be &e-1&c or within &e0&c and &e" + maxTimeout); getLogger().message(sender, true, "The timeout must be -1 or within 0 and " + maxTimeout);
return; return;
} }
ChatAPI.sendActionBar(sender, "Please click the input you would like to set."); getLogger().message(sender, "Please click the input you would like to set.");
setPlayer((Player) sender, destroyingInput, secondsOff, secondsOn); setPlayer((Player) sender, destroyingInput, secondsOff, secondsOn);
} }
@@ -187,7 +185,7 @@ public class DamnSpam implements Module, Listener
{ {
if (!acceptedInputs.contains(block.getType())) if (!acceptedInputs.contains(block.getType()))
{ {
ChatAPI.sendActionBar(player, "&cThat block is not an acceptable input!"); getLogger().message(player, true, "That block is not an acceptable input!");
return true; return true;
} }
String typeStr = block.getType().toString().toLowerCase().replace("_", " "); String typeStr = block.getType().toString().toLowerCase().replace("_", " ");
@@ -197,8 +195,8 @@ public class DamnSpam implements Module, Listener
changingInput = false; changingInput = false;
if (!buildCheck) if (!buildCheck)
{ {
ChatAPI.sendActionBar(player, getLogger().message(player, true,
"&cSomething went wrong trying to change the timeout of the " + typeStr + "!"); "Something went wrong trying to change the timeout on this " + typeStr + "!");
event.setCancelled(true); event.setCancelled(true);
return true; return true;
} }
@@ -207,18 +205,18 @@ public class DamnSpam implements Module, Listener
{ {
if (!inputs.containsKey(locationStr)) if (!inputs.containsKey(locationStr))
{ {
ChatAPI.sendActionBar(player, getLogger().message(player, true,
"&cSomething went wrong trying to change the timeout of the" + typeStr + "!"); "Something went wrong trying to change the timeout on this " + typeStr + "!");
event.setCancelled(true); event.setCancelled(true);
return true; return true;
} }
inputs.remove(locationStr); inputs.remove(locationStr);
ChatAPI.sendActionBar(player, "&7Successfully removed the timeout for the " + typeStr); getLogger().message(player, "Successfully removed the timeout for this " + typeStr);
} }
else else
{ {
inputs.put(locationStr, players.get(player)); inputs.put(locationStr, players.get(player));
ChatAPI.sendActionBar(player, "&7Successfully removed the timeout for the " + typeStr); getLogger().message(player, "Successfully set a timeout for this " + typeStr);
} }
event.setCancelled(true); event.setCancelled(true);
players.remove(player); players.remove(player);
@@ -242,7 +240,8 @@ public class DamnSpam implements Module, Listener
: "the " + typeStr + " attached to that block"); : "the " + typeStr + " attached to that block");
if (!sender.isSneaking()) if (!sender.isSneaking())
{ {
ChatAPI.sendActionBar(sender, "&7To destroy " + inputStr + ", hold &esneak&7 while breaking it."); getLogger().message(sender, true, "You cannot destroy " + inputStr);
getLogger().message(sender, true, "Sneak and break or set the timeout to 0 if you want to remove it.");
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@@ -250,11 +249,11 @@ public class DamnSpam implements Module, Listener
{ {
inputs.remove(posStr); inputs.remove(posStr);
saveInputs(); saveInputs();
ChatAPI.sendActionBar(sender, "&7Succesfully destroyed the" + typeStr + "."); getLogger().message(sender, "Succesfully removed " + inputStr);
} }
else else
{ {
ChatAPI.sendActionBar(sender, "You are not allowed to remove " + inputStr); getLogger().message(sender, true, "You are not allowed to remove " + inputStr);
event.setCancelled(true); event.setCancelled(true);
} }
} }
@@ -331,13 +330,13 @@ public class DamnSpam implements Module, Listener
if (checktime == -1) if (checktime == -1)
{ {
event.setCancelled(true); event.setCancelled(true);
ChatAPI.sendActionBar(sender, "&7This " + btype + " is locked permanently by /damnspam."); getLogger().message(sender, "This " + btype + " is locked permanently by /damnspam.");
} }
else if (timeLeft > 0) else if (timeLeft > 0)
{ {
event.setCancelled(true); event.setCancelled(true);
ChatAPI.sendActionBar(sender, "&7This " + btype + " has a damnspam timeout of &e" + checktime + "&7, with &e" getLogger().message(sender, "This " + btype + " has a damnspam timeout of " + checktime + ", with "
+ timeLeft + "&7 left."); + timeLeft + " left.");
} }
else else
{ {
@@ -347,4 +346,4 @@ public class DamnSpam implements Module, Listener
} }
} }
} }
} }