Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

make dicode DRY and more readable

Browse Source
This commit is contained in:
jomo
2014-07-17 21:36:05 +02:00
parent a53957e888
commit 69f6423028
2 changed files with 99 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
forcefield.py
View File

@@ -1,9 +1,11 @@
#pylint: disable = F0401
from helpers import * from helpers import *
from java.util.UUID import fromString as id_to_player from java.util.UUID import fromString as id_to_player
from org.bukkit.util import Vector from org.bukkit.util import Vector
from math import sin from math import sin
ff_perms = ["utils.forcefield", "utils.forcefield.ignore"] ff_perm = "utils.forcefield"
pass_perm = "utils.forcefield.pass"
ff_prefix = "&8[&aFF&8]" ff_prefix = "&8[&aFF&8]"
ff_users = [] ff_users = []
whitelists = {} # {ff_owner_id: [white, listed, ids]} whitelists = {} # {ff_owner_id: [white, listed, ids]}
@@ -12,84 +14,100 @@ Xv = 3.05 / fd # used in set_velocity_away(), this is more efficient.
# /ff admin is a future option I might implement # /ff admin is a future option I might implement
@hook.command("forcefield") @hook.command("forcefield")
def on_forcefield_command(sender, args): def on_forcefield_command(sender, args):
if not is_player(sender) or not sender.hasPermission(ff_perms[0]): if not is_player(sender) or not sender.hasPermission(ff_perm):
noperm(sender) noperm(sender)
return True return True
sender_id = str(sender.getUniqueId())
if not args or args[0].lower() == "toggle": #Toggle cmd = args[0].lower()
if not args or cmd == "toggle": # Toggle
forcefield_toggle(sender) forcefield_toggle(sender)
elif args[0].lower() in ["whitelist", "wl", "wlist"]: #Whitelist commands elif cmd in ["whitelist", "wl", "wlist"]: # Whitelist commands
if not args[1:] or args[1].lower() == "list":
if len(args) >= 2:
arg = args[1].lower()
if arg == "list":
whitelist_list(sender) whitelist_list(sender)
elif args[1].lower() == "clear": elif arg == "clear":
whitelist_clear(sender) whitelist_clear(sender)
elif args[1].lower() in ["add", "+"]: elif arg in ["add", "+"]:
whitelist_add(sender, True, args[2:]) change_whitelist(sender, True, args[2:])
elif args[1].lower() in ["remove", "delete", "rem", "del", "-"]: elif arg in ["remove", "delete", "rem", "del", "-"]:
whitelist_add(sender, False, args[2:]) change_whitelist(sender, False, args[2:])
else:
invalid_syntax(sender)
else: else:
invalid_syntax(sender) invalid_syntax(sender)
elif args[0].lower() in ["help", "?"]: #/forcefield help elif cmd in ["help", "?"]: # /forcefield help
forcefield_help(sender) forcefield_help(sender)
else: else:
invalid_syntax(sender) invalid_syntax(sender)
return True return True
def whitelist_add(sender, add, players): def change_whitelist(sender, add, names):
if not players: msg(sender, "%s &cGive space-separated playernames." % ff_prefix) if names:
else:
sender_id = str(sender.getUniqueId()) sender_id = str(sender.getUniqueId())
whitelists[sender_id] = [] if sender_id not in whitelists else whitelists[sender_id] if sender_id not in whitelists:
for name in players: whitelists[sender_id] = []
for name in names:
player = server.getOfflinePlayer(name) player = server.getOfflinePlayer(name)
if player: if player:
player_id = str(player.getUniqueId()) player_id = str(player.getUniqueId())
pname = player.getName() pname = player.getName()
sname = stripcolors(sender.getDisplayName()) sname = sender.getDisplayName()
online = True if player in list(server.getOnlinePlayers()) else False
if add == True and player_id not in whitelists[sender_id]: # add player to whitelist if not already added
if not sender == player: if add and player_id not in whitelists[sender_id]:
if sender != player:
whitelists[sender_id].append(player_id) whitelists[sender_id].append(player_id)
msg(sender, "%s &aAdded %s to your forcefield whitelist." % (ff_prefix, pname)) msg(sender, "%s &aAdded %s to your forcefield whitelist." % (ff_prefix, pname))
if online == True: msg(player, "%s &a%s &aadded you to his forcefield whitelist." % (ff_prefix, sname)) msg(player, "%s &a%s &aadded you to his forcefield whitelist." % (ff_prefix, sname))
else: msg(sender, "%s &cYou can't whitelist yourself." % ff_prefix) else:
elif add == False and player_id in whitelists[sender_id]: msg(sender, "%s &cYou can't whitelist yourself." % ff_prefix)
# remove player from whitelist if whitelisted
elif not add and player_id in whitelists[sender_id]:
whitelists[sender_id].remove(player_id) whitelists[sender_id].remove(player_id)
msg(sender, "%s &cRemoved %s from your forcefield whitelist." % (ff_prefix, pname)) msg(sender, "%s &cRemoved %s from your forcefield whitelist." % (ff_prefix, pname))
if online == True: msg(player, "%s &c%s &cremoved you from his forcefield whitelist." % (ff_prefix, sname)) msg(player, "%s &c%s &cremoved you from his forcefield whitelist." % (ff_prefix, sname))
elif add == True: msg(sender, "%s &c%s &cwas already in your forcefield whitelist." % (ff_prefix, pname))
else: msg(sender, "%s &c%s &cwas not in your forcefield whitelist." % (ff_prefix, pname)) else:
else: msg(sender, "%s &cplayer %s &cwas not found." % (ff_prefix, name)) msg(sender, "%s &cplayer %s &cwas not found." % (ff_prefix, name))
else:
msg(sender, "%s &cGive space-separated playernames." % ff_prefix)
def whitelist_list(sender): def whitelist_list(sender):
sender_id = str(sender.getUniqueId()) sender_id = str(sender.getUniqueId())
msg(sender, "%s &aForceField Whitelist:" % ff_prefix)
count = 0 count = 0
msg(sender, "%s &aForceField Whitelist:" % ff_prefix)
for player_id in whitelists.get(sender_id, []): for player_id in whitelists.get(sender_id, []):
count += 1 count += 1
msg(sender, "&a %s. &f%s" % (count, server.getOfflinePlayer(id_to_player(player_id)).getName())) msg(sender, "&a%s. &f%s" % (count, server.getOfflinePlayer(id_to_player(player_id)).getName()))
if count == 0: if count == 0:
msg(sender, "&c Your whitelist has no entries.") msg(sender, "&cYour whitelist has no entries.")
def whitelist_clear(sender): def whitelist_clear(sender):
sender_id = str(sender.getUniqueId()) sender_id = str(sender.getUniqueId())
if len(whitelists[sender_id]) == 0: if whitelists.get(sender_id):
msg(sender, "%s &cYou had no players whitelisted." % ff_prefix)
else:
whitelists.pop(sender_id) whitelists.pop(sender_id)
msg(sender, "%s &aForceField Whitelist cleared." % ff_prefix) msg(sender, "%s &aForceField Whitelist cleared." % ff_prefix)
else:
msg(sender, "%s &cYou had no players whitelisted." % ff_prefix)
def forcefield_help(sender): def forcefield_help(sender):
msg(sender, "%s &a&l/ForceField Help: \n&aYou can use the forcefield to keep players on distance." % ff_prefix) msg(sender, "%s &a&l/ForceField Help:" % ff_prefix)
msg(sender, "&aYou can use the forcefield to keep players on distance.")
msg(sender, "&2Commands:") msg(sender, "&2Commands:")
msg(sender, "&a1. &6/ff &ohelp &a: aliases: ?") msg(sender, "&a1. &6/ff &ohelp &a: aliases: ?")
msg(sender, "&a2. &6/ff &o(toggle)") msg(sender, "&a2. &6/ff &o(toggle)")
@@ -110,7 +128,25 @@ def forcefield_toggle(sender):
def invalid_syntax(sender): def invalid_syntax(sender):
msg(sender, "%s &cInvalid syntax. Use &o/ff ? &cfor info." % ff_prefix) msg(sender, "%s &cInvalid syntax. Use &e/ff ? &cfor info." % ff_prefix)
def move_away(player, entity):
"""
Pushes entity away from player
"""
player_loc = player.getLocation()
entity_loc = entity.getLocation()
dx = entity_loc.getX() - player_loc.getX()
vx = sin(Xv * dx)
dy = entity_loc.getY() - player_loc.getY()
vy = sin(Xv * dy)
dz = entity_loc.getZ() - player_loc.getZ()
vz = sin(Xv * dz)
entity.setVelocity(Vector(vx , vy, vz))
# We don't want to go above max_speed, and we dont want to divide by 0.
#--------------------------------------------------------------------------------------------------------# #--------------------------------------------------------------------------------------------------------#
@@ -121,34 +157,24 @@ def on_move(event):
player = event.getPlayer() player = event.getPlayer()
if is_creative(player): if is_creative(player):
player_id = str(player.getUniqueId()) player_id = str(player.getUniqueId())
if player_id in ff_users: # player has forcefield, entity should be blocked
log("1") # moving player has forcefield, nerby player should be moved away
if player_id in ff_users:
for entity in player.getNearbyEntities(fd, fd, fd): for entity in player.getNearbyEntities(fd, fd, fd):
if is_player(entity) and is_creative(entity) and not entity.hasPermission(ff_perms[1]) and not (str(entity.getUniqueId()) in whitelists.get(player_id, [])): whitelisted = (str(entity.getUniqueId()) in whitelists.get(player_id, []))
#if not whitelists[entity_id], check in blank list e.g. False if is_player(entity) and not entity.hasPermission(pass_perm) and not whitelisted:
move_away(player, entity) move_away(player, entity)
if player.hasPermission(ff_perms[1]): # player should be blocked, entity has forcefield # nerby player has forcefield, moving player should be moved away
if player.hasPermission(pass_perm):
for entity in player.getNearbyEntities(fd, fd, fd): for entity in player.getNearbyEntities(fd, fd, fd):
entity_id = str(entity.getUniqueId()) entity_id = str(entity.getUniqueId())
if is_player(entity) and is_creative(entity) and (entity_id in ff_users) and not (player_id in whitelists.get(entity_id, [])): ff_enabled = (entity_id in ff_users)
#if not whitelists[entity_id], check in blank list e.g. False whitelisted = (player_id in whitelists.get(entity_id, []))
if is_player(entity) and is_creative(entity) and ff_enabled and not whitelisted:
move_away(entity, player) move_away(entity, player)
def move_away(player, entity): #Moves entity away from player
player_loc = player.getLocation()
entity_loc = entity.getLocation()
dx = entity_loc.getX() - player_loc.getX()
vx = sin(Xv * dx)
dy = entity_loc.getY() - player_loc.getY()
vy = sin(Xv * dy)
dz = entity_loc.getZ() - player_loc.getZ()
vz = sin(Xv * dz)
entity.setVelocity(Vector(vx , vy, vz))
#We don't want to go above max_speed, and we dont want to divide by 0.
#--------------------------------------------------------------------------------------------------------# #--------------------------------------------------------------------------------------------------------#

22
helpers.py
View File

@@ -21,7 +21,7 @@ def error(text):
def msg(player, text, usecolor = True, basecolor = None): def msg(player, text, usecolor = True, basecolor = None):
if player and (player == server.getConsoleSender() or player.getPlayer()): #getPlayer() returns None when offline if player and (player == server.getConsoleSender() or player.getPlayer()): # getPlayer() returns None when offline
if basecolor: if basecolor:
player.sendMessage(colorify("&%s" % basecolor) + (colorify(text) if usecolor else text)) player.sendMessage(colorify("&%s" % basecolor) + (colorify(text) if usecolor else text))
else: else:
@@ -54,15 +54,13 @@ def safetp(player, world, x, y, z, yaw = 0, pitch = 0):
safetp(player, world, x, y+1, z, yaw, pitch) safetp(player, world, x, y+1, z, yaw, pitch)
def plugin_header(sender = None, name="Redstoner Utils"): def plugin_header(recipient = None, name="Redstoner Utils"):
""" """
sends the recipient a "Plugin Header", in the format of: sends the recipient a "Plugin Header", in the format of: --=[ PluginName ]=--
--=[ PluginName ]=--
""" """
head = "\n&2--=[ %s ]=--" % name head = "\n&2--=[ %s ]=--" % name
msg(sender, head) msg(recipient, head)
return head return head
@@ -74,8 +72,8 @@ def runas(player, cmd):
server.dispatchCommand(player, cmd) server.dispatchCommand(player, cmd)
def is_player(sender): def is_player(obj):
return (isinstance(sender, Player)) return (isinstance(obj, Player))
def checkargs(sender, args, amin, amax): def checkargs(sender, args, amin, amax):
@@ -92,12 +90,12 @@ def checkargs(sender, args, amin, amax):
return True return True
def warp(sender, args, warpname): def warp(player, args, warpname):
if not checkargs(sender, args, 0, 1): if not checkargs(player, args, 0, 1):
return True return True
runas(sender, " ".join(["warp", warpname, sender.getName()])) runas(player, " ".join(["warp", warpname, player.getName()]))
return True return True
def is_creative(player): def is_creative(player):
return True if str(player.getGameMode()) == "CREATIVE" else False return str(player.getGameMode()) == "CREATIVE"