Removed unnessecary debug outputs

blockplacemods.py

@@ -150,8 +150,7 @@ def toggle_command(sender, command, label, args):
         if arg2 == "clear":
             if enabled:
                 del values[uuid]
-                return " &aDisabled " + details[1]
-            return " &cAlready disabled: " + details[1]
+            return " &aDisabled " + details[1]
 
         if arg2 == "details":
             return " &aSetting %s:\n &9%s \n&6Accepted arguments: [<slot>|clear|details]" % (setting, details[2])

chatalias.py

@@ -11,7 +11,6 @@
 ############################################
 
 import os
-import mysqlhack
 import org.bukkit as bukkit
 from org.bukkit import *
 from helpers import *
@@ -27,7 +26,6 @@ error = colorify("&cUnspecified error")
 commands_per_page = 5
 global_aliases = {"./":"/"}
 data = {}
-# DON'T SET THIS TO TRUE! MySQL requestst are NOT ASYNC yet! (And for some reason it doesn't want to store any data ._.)
 use_mysql = False
 
 # Permissions:
@@ -55,6 +53,11 @@ permission_FINFO = "utils.alias.finfo"
 # CODE #
 ########
 
+enabled = helpers_version in helpers_versions
+if not enabled:
+    error = colorify("&6Incompatible versions detected (&chelpers.py&6)")
+
+
 def safe_open_json(uuid):
     if not os.path.exists("plugins/redstoner-utils.py.dir/files/aliases"):
         os.makedirs("plugins/redstoner-utils.py.dir/files/aliases")
@@ -113,19 +116,22 @@ def help(sender, args):
     for message in to_display:
         msg(sender, message)
     if page+1 < pages:
-        msg(sender, colorify("&6To display the next page, type &c/alias help " + str(page+2)))
+        msg(sender, colorify("&6To display the next page, type &c/help " + str(page+2)))
     return True
 
 
 @hook.event("player.PlayerJoinEvent", "high")
 def on_join(event):
-    if enabled:
-        t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), ))
-        t.daemon = True
-        t.start()
-    else:
-        if event.getPlayer().hasPermission(permission_FINFO):
-            disabled_fallback(event.getPlayer())
+    try:
+        if enabled:
+            t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), ))
+            t.daemon = True
+            t.start()
+        else:
+            if event.getPlayer().hasPermission(permission_FINFO):
+                disabled_fallback(event.getPlayer())
+    except:
+        print(trace())
 
 
 @hook.event("player.AsyncPlayerChatEvent", "high")
@@ -147,8 +153,7 @@ def on_player_chat(event):
                 else:
                     event.setMessage(event.getMessage().replace(alias, value))
     except:
-        print(trace())
-
+        return
 
 def hasPerm(player, permission):
     return (player.hasPermission(permission)) or (player.hasPermission(permission_ALL))
@@ -173,64 +178,39 @@ def add(sender, args):
         msg(sender, "&cCould not create alias: Max_limit reached!")
         return True
     args = [args[0]] + [" ".join(args[1:])]
-    if not add_alias_data(uid(sender), str(args[0]), args[1]):
-        msg(sender, colorify("&c") + "Could not add this alias because it would cause some sequences to be replaced multiple times", usecolor = False)
-        return True
+    data[str(uid(sender))][str(args[0])] = args[1]
+    save_data(uid(sender))
     msg(sender, colorify("&7Alias: ") + args[0] + colorify("&7 -> " + args[1] + colorify("&7 was succesfully created!")), usecolor=sender.hasPermission("essentials.chat.color"))
     return True
 
 
 def radd(sender, args):
+    args = [args[0:1]] + [" ".join([args[2:len(args)-2]])] + [args[len(args)-1]]
     plugin_header(sender, "Alias")
-    args = args[0:2] + [" ".join(args[2:len(args)-1])] + [args[len(args)-1]]
-    if is_player(sender):
-        sender_name = colorify(sender.getDisplayName())
-    else:
-        sender_name = colorify("&6Console")
-    target = get_player(args[0])
     if args[3].lower() == "false":
         plugin_header(target, "Alias")
         msg(target, "&cPlayer " + sender_name + " &cis creating an alias for you!")
-    elif args[3].lower() != "true":
-        args[2] += " " + args[3]
     if not sender.hasPermission(permission_ALL) and len(data[uid(sender)]) >= int(get_permission_content(target, permission_AMOUNT)):
         msg(sender, "&cCould not create alias: Max_limit reached!")
         if args[3].lower() == "false":
             msg(target, "&cCould not create alias: Max_limit reached!")
         return True
+    
+    target = get_player(args[0])
+    if is_player(sender):
+        sender_name = colorify(sender.getDisplayName)
+    else:
+        sender_name = colorify("&6Console")
     if len(args) == 3:
         args += ["true"]
-    if not add_alias_data(uid(target), str(args[1]), str(args[2])):
-        message = colorify("&c") + "Could not add this alias because it would cause some sequences to be replaced multiple times"
-        msg(sender, message)
-        if args[3].lower() == "false":
-            msg(target, message)
-        return True
+    data[str(uid(target))][str(args[1])] = str(args[2])
+    save_data(uid(target))
     msg(sender, colorify("&7Alias: ") + args[1] + colorify("&7 -> " + args[2] + colorify("&7 was succesfully created!")), usecolor=target.hasPermission("essentials.chat.color"))
     if args[3].lower() == "false":
         msg(target, colorify("&7Alias: ") + args[1] + colorify("&7 -> " + args[2] + colorify("&7 was succesfully created!")), usecolor=target.hasPermission("essentials.chat.color"))
     return True
 
 
-def add_alias_data(puuid, aliased, new_alias):
-    prior = data[puuid]
-
-    # prevent 2 -> 3 if there is 1 -> 2
-    if aliased not in prior:
-        for alias in prior.values():
-            if aliased in alias:
-                return False
-
-    # prevent 1 -> 2 if there is 2 -> 3
-    for sequence in prior:
-        if sequence in new_alias:
-            return False
-
-    prior[aliased] = new_alias
-    save_data(puuid)
-    return True
-
-
 def remove(sender, args):
     plugin_header(sender, "Alias")
     try:
@@ -245,10 +225,11 @@ def rremove(sender, args):
     plugin_header(sender, "Alias")
     target = get_player(args[0])
     if is_player(sender):
-        sender_name = colorify(sender.getDisplayName())
+        sender_name = colorify(sender.getDisplayName)
     else:
         sender_name = colorify("&6Console")
     if args[2].lower() == "false":
+        print("WTF")
         plugin_header(target, "Alias")
         msg(target, "&cPlayer " + sender_name + " &cis removing an alias for you!")
     try:
@@ -276,7 +257,7 @@ def rlist_alias(sender, args):
     plugin_header(sender, "Alias")
     target = get_player(args[0])
     if is_player(sender):
-        sender_name = colorify(sender.getDisplayName())
+        sender_name = colorify(sender.getDisplayName)
     else:
         sender_name = colorify("&6Console")
     if len(args) == 1:
@@ -284,29 +265,22 @@ def rlist_alias(sender, args):
     msg(sender, "Player " + args[0] + " has following aliases (" + str(len(data[uid(target)])) + " in total):")
     if args[1].lower() == "false":
         plugin_header(target, "Alias")
-        msg(target, "&cPlayer " + sender_name + " &cis listing your aliases")
+        msg(target, "&cPlayer " + sender_name + " &cis listing your aliases (" + str(len(data[uid(target)])) + " in total):")
     for word, alias in data[str(uid(target))].items():
         msg(sender, colorify("&7") + word + colorify("&7 -> ") + alias, usecolor=target.hasPermission("essentials.chat.color"))
+        if args[1].lower() == "false":
+            msg(target, colorify("&7") + word + colorify("&7 -> ") + alias, usecolor=target.hasPermission("essentials.chat.color"))
     return True
 
 
 def remote(sender, args):
     try:
-        return remotes[args[1].lower()](sender, [args[0]] + args[2:])
+        return remotes[args[1].lower()](sender, [args[0]] + [args[2:]])
     except:
         return subcommands["help"](sender, ["2"])
 
 
 def load_data(uuid):
-    try:
-        load_data_thread(uuid)
-#        t = threading.Thread(target=load_data_thread, args=(uuid))
-#        t.daemon = True
-#        t.start()
-    except:
-        print(trace())
-
-def load_data_thread(uuid):
     if use_mysql:
         conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
         curs = conn.cursor()
@@ -321,15 +295,6 @@ def load_data_thread(uuid):
 
 
 def save_data(uuid):
-    try:
-        save_data_thread(uuid)
-#        t = threading.Thread(target=save_data_thread, args=(uuid))
-#        t.daemon = True
-#        t.start()
-    except:
-        print(trace())
-
-def save_data_thread(uuid):
     if use_mysql:
         conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
         curs = conn.cursor()
@@ -337,38 +302,18 @@ def save_data_thread(uuid):
     else:
         save_json_file("aliases/" + uuid, data[uuid])
 
-
 # Subcommands:
+
 subcommands = {
     "help": help,
-    "?": help,
     "add": add,
     "remove": remove,
-    "del": remove,
-    "delete": remove,
     "player": remote,
-    "remote": remote,
     "list": list_alias
 }
 
 remotes = {
     "add": radd,
     "remove": rremove,
-    "del": rremove,
-    "delete": rremove,
     "list": rlist_alias,
 }
-
-# OnModuleLoad
-
-enabled = helpers_version in helpers_versions
-if not enabled:
-    error = colorify("&6Incompatible versions detected (&chelpers.py&6)")
-for player in server.getOnlinePlayers():
-    if enabled:
-        t = threading.Thread(target=load_data, args=(uid(player), ))
-        t.daemon = True
-        t.start()
-    else:
-        if player.hasPermission(permission_FINFO):
-            disabled_fallback(player)

chatgroups.py

@@ -89,7 +89,7 @@ def groupchat(sender, message, ann = False):
 def do_for_chatgroup(group, func, *args, **kwargs):
     for receiver in server.getOnlinePlayers():
         if groups.get(uid(receiver)) == group:
-            func(receiver, *args, **kwargs)
+            func(receiver, args, kwargs)
 
 def send_tpa_request(receiver, sender):
     if not receiver == sender:

damnspam.py

@@ -47,6 +47,8 @@ def on_dammnspam_command(sender, command, label, args):
             timeout_on  = round(float(timeout_on), 2)
             timeout_off = timeout_on
             if 60 >= timeout_on <= -2 or timeout_on == 0:
+                timeout_on = False
+            if timeout_on == False:
                 msg(sender, "&cThe timeout must be within 0-60 or -1.")
                 return True
         except ValueError:

helpers.py

@@ -314,13 +314,3 @@ def array_to_list(array):
     for a in array:
         return_list += [a]
     return return_list
-
-
-#debug wrapper
-def debug(func):
-    def wrap(*args, **kwargs):
-        try:
-            func(*args, **kwargs)
-        except:
-            print(trace())
-    return wrap

imbusy.py

@@ -13,14 +13,12 @@
 
 from helpers import *
 from basecommands import simplecommand
-import org.bukkit.command.Command as Command
 from traceback import format_exc as trace
-
 busy_players = []
 
 
-def unclear(sender):
-    msg(sender, "Umm, what? Sorry, directions unclear, got head stuck in washing machine")
+def unclear():
+    msg(sender, "Umm, what? Sorry, directions unlclear, got head stuck in washing machine")
 
 
 @hook.command("busy",
@@ -34,191 +32,83 @@ def on_busy_command(sender, cmd, label, args):
        msg(sender, "Sorry, Console cannot be busy")
        return True
 
-    plugin_header(recipient = sender, name = "I'M BUSY!")
-
     if not sender.hasPermission("utils.busy.allowed"):
+        plugin_header(recipient = sender, name = "I'M BUSY!")
         noperm(sender)
         return True
 
     if len(args) == 0:
-        msg(sender, "This plugin allows being busy, and when turned on you will not receive any direct messages or tpa requests.")
+        plugin_header(recipient = sender, name = "I'M BUSY!")
+        msg(sender, "This plugin allows being busy, and when turned on you will not recieve any direct messages or tpa requests.")
         msg(sender, "\nCommands:")
         msg(sender, "/busy on: turns on busy mode")
         msg(sender, "/busy off: turns off busy mode")
         msg(sender, "/busy status [player]: shows your or [player]'s current busy status.")
+        return True
 
     elif len(args) == 1:
         if args[0] == "on":
             if sender.getName() in busy_players:
+                plugin_header(recipient = sender, name = "I'M BUSY!")
                 msg(sender, "You cannot be even more focused than this without being a jedi!")
-            else:
-                busy_players.append(sender.getName())
-                broadcast(None, "&c[&2Busy&c] &fNow busy: %s&r, don't even TRY bothering them!" % sender.getDisplayName())
+                return True
+            busy_players.append(sender.getName())
+            plugin_header(recipient = sender, name = "I'M BUSY!")
+            broadcast(None, "%s is now SUPER busy! Don't even TRY bothering them, it will not work!" % sender.getName())
+            return True
 
         elif args[0] == "off":
+            plugin_header(recipient = sender, name = "I'M BUSY!")
             try:
                 busy_players.remove(sender.getName())
-                msg(sender, "Master has sent /busy command, %s&r is freeee of bothering!" % sender.getDisplayName())
+                msg(sender, "Master has sent /busy command, %s is freeee!" % sender.getName())
+                return True
             except ValueError:
                 msg(sender, "You are not busy! You cannot be even less busy! Are you perhaps bored?")
+                return True
 
         elif args[0] == "status":
+            plugin_header(recipient = sender, name = "I'M BUSY!")
             if sender.getName() in busy_players:
                 msg(sender, "You are super-duper busy and concentrated right now. Think, think, think!")
+                return True
             else:
                 msg(sender, "You are completely unable to focus right now.")
+                return True
 
         else:
-            unclear(sender)
+            plugin_header(recipient = sender, name = "I'M BUSY!")
+            unclear()
             return False
 
     elif len(args) == 2 and args[0] == "status":
-        target = server.getPlayer(args[1])
-        if target is None:
-            msg(sender, "That player is not online, I doubt they are busy.")
-        elif target.getName() in busy_players:
-            msg(sender, "Yes, %s&r is busy. Shhh..." % target.getDisplayName())
+        plugin_header(recipient = sender, name = "I'M BUSY!")        
+        if args[1] in busy_players:
+            msg(sender, "Yes, %s is busy. Shhh..." % args[1])
+            return True
         else:
-            msg(sender, "No, you're good. Feel free to chat with %s&r!" % target.getDisplayName())
+            msg(sender, "No, you're good. Feel free to chat with %s!" % args[1])
+            return True
 
     else:
-        unclear(sender)
+        plugin_header(recipient = sender, name = "I'M BUSY!")
+        unclear()
         return False
-    return True
 
 
+@hook.event("player.PlayerCommandPreprocessEvent", "monitor")
+def on_cmd_preprocess_event(event):
+    message = event.getMessage().split(" ")
+    if message[0] == "/msg" or message[0] == "/w" or message[0] == "/m" or \
+        message[0] == "/tell" or message[0] == "/tpa" or message[0] == "/tpahere":
+        if message[1] in busy_players:
+            plugin_header(recipient = event.getPlayer(), name = "I'M BUSY!")
+            msg(event.getPlayer(), "We are sorry, but %s is currently busy. Please try again later." % message[1])
+            event.setCancelled(True)
+
 @hook.event("player.PlayerQuitEvent", "lowest")
 def on_player_leave(event):
     try:
         busy_players.remove(event.getPlayer().getName())
     except:
         pass
-
-
-#---- Dicode for catching any bothering of busy people ----
-
-
-reply_targets = {}
-override_perm = "utils.imbusy.override"
-
-
-def whisper(sender, target_name):
-    target = server.getPlayer(target_name)
-
-    if target is not None:
-        if target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players:
-            msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName())
-            return False
-
-        reply_targets[sender.getName()] = target.getName()
-
-        # allow the target to reply regardless of sender being busy
-        if target.getName() in reply_targets:
-            del reply_targets[target.getName()]
-    return True
-
-
-def reply(sender):
-    if sender.getName() in reply_targets:
-        target = server.getPlayer(reply_targets[sender.getName()])
-        if target is not None: 
-            if target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players:
-                msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName())
-                return False
-
-            # allow the target to reply regardless of sender being busy
-            if target.getName() in reply_targets:
-                del reply_targets[target.getName()]
-    return True
-
-
-class CommandWrapper(Command):
-
-    def __init__(self, wrapped, checker):
-        Command.__init__(self, wrapped.getName())
-        self.setDescription(wrapped.getDescription())
-        self.setPermission(wrapped.getPermission())
-        self.setUsage(wrapped.getUsage())
-        self.setAliases(wrapped.getAliases())
-        self.wrapped = wrapped
-        self.checker = checker
-
-    def execute(self, sender, label, args):
-        try:
-            if self.checker(sender, args):
-                return self.wrapped.execute(sender, label, args)
-        except:
-            error(trace())
-        return True
-
-    def tabComplete(self, sender, alias, args):
-        return self.wrapped.tabComplete(sender, alias, args)
-
-def msg_command_checker(sender, args):
-    return len(args) <= 1 or whisper(sender, args[0])
-
-def reply_command_checker(sender, args):
-    return len(args) == 0 or reply(sender)
-
-def tpa_command_checker(sender, args):
-    if len(args) == 0:
-        return True
-    target = server.getPlayer(args[0])
-    if target is not None and target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players:
-        msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName())
-        return False
-    return True
-
-def tpahere_command_checker(sender, args):
-    return tpa_command_checker(sender, args)
-
-
-@hook.event("player.PlayerCommandPreprocessEvent", "monitor")
-def on_player_command_preprocess(event):
-    message = event.getMessage().split(" ")
-    if len(message) > 1 and message[0].lower() in ("/tell", "/minecraft:tell") and not whisper(event.getPlayer(), message[1]):
-        event.setCancelled(True)
-
-
-@hook.enable
-def replace_ess_commands():
-
-    try:
-        mapField = server.getPluginManager().getClass().getDeclaredField("commandMap")
-        mapField.setAccessible(True)
-        commandMap = mapField.get(server.getPluginManager())
-
-        commandsField = commandMap.getClass().getDeclaredField("knownCommands")
-        commandsField.setAccessible(True)
-        map = commandsField.get(commandMap)
-
-        essMsgCmd = map.get("essentials:msg")
-        essReplyCmd = map.get("essentials:reply")
-        essTpaCmd = map.get("essentials:tpa")
-        essTpahereCmd = map.get("essentials:tpahere")
-
-        msgCmdWrapper = CommandWrapper(essMsgCmd, msg_command_checker)
-        replyCmdWrapper = CommandWrapper(essReplyCmd, reply_command_checker)
-        tpaCmdWrapper = CommandWrapper(essTpaCmd, tpa_command_checker)
-        tpahereCmdWrapper = CommandWrapper(essTpahereCmd, tpahere_command_checker)
-
-        iterator = map.entrySet().iterator()
-        while iterator.hasNext():
-            entry = iterator.next()
-            value = entry.getValue()
-            if value is essMsgCmd:
-                entry.setValue(msgCmdWrapper)
-                info("[imbusy] wrapped /" + entry.getKey())
-            elif value is essReplyCmd:
-                entry.setValue(replyCmdWrapper)
-                info("[imbusy] wrapped /" + entry.getKey())
-            elif value is essTpaCmd:
-                entry.setValue(tpaCmdWrapper)
-                info("[imbusy] wrapped /" + entry.getKey())
-            elif value is essTpahereCmd:
-                entry.setValue(tpahereCmdWrapper)
-                info("[imbusy] wrapped /" + entry.getKey())
-
-    except:
-        error("[Imbusy] Failed to wrap essentials commands")
-        error(trace())

main.py

@@ -43,7 +43,7 @@ shared["load_modules"] = [
     # Adds /calc, toggles automatic solving of Math expressions in chat
     "calc",
     # Adds aliasing of chat words
-    "chatalias",
+    #"chatalias",
     # Plugin to locate laggy chunks. /lc <n> lists chunks with more than n entities
     "lagchunks",
     # Adds /report and /rp, Stores reports with time and location

plugin.yml

@@ -2,3 +2,4 @@ name: RedstonerUtils
 main: main.py
 version: 3.1.0
 author: redstone_sheep
+