Wools

Author: minecraft server

packet_decoder.py

@@ -10,10 +10,12 @@
 PROTOCOL_VERSION = 28
 
 class Packet:
-	def __init__(self):
+	def __init__(self, packet_type=0, **data):
 		self.direction = 0
-		self.ident = 0
-		self.data = {}
+		if type(packet_type) == str:
+			packet_type = dict((v,k) for k,v in names.items())[packet_type] # Reverse lookup
+		self.ident = packet_type
+		self.data = data
 
 	def name(self):
 		return names[self.ident]

plugins.py

@@ -7,7 +7,7 @@
 import acls, dotstrip
 import player_cmd as cmd
 import menu_test, testing
-import zone_create_menu, zone_cmds, acl_cmds, zone_confirm
+import zone_create_menu, zone_cmds, acl_cmds, zone_confirm, long_operations
 
 # Set ordering here
 
@@ -20,7 +20,8 @@
 # utility
 plugins.append(usernames) # The earlier the better, name the login packets sooner.
 plugins.append(schedule) # Should probably be before anything that depends on it
-plugins.append(persistent_store) # MUST be before anything that uses it
+plugins.append(persistent_store) # MUST be before anything that uses it in on_start
+plugins.append(long_operations)
 plugins.append(plugin_helpers) # Lots of things depend on this. Do it early.
 plugins.append(zones) # The earlier, the more up to date positions are
 plugins.append(cmd) # Should probably be before anything that depends on it

plugins/testing.py

@@ -2,51 +2,20 @@
 """ Only ever used for temp testing of features. """
 
 import player_cmd as cmd
-from zones import new_zone_hooks, new_zone, get_zones
 from plugin_helpers import tell
+from long_operations import long_operation
+import time
 
 def on_start():
-	cmd.register('/testzone new ([^ ]+)', on_cmd)
-	cmd.register('/testzone view', on_cmd2)
-	re_name = r'(?:[^"][^ ]+|"(?:[^"]|\\")+")'
-	cmd.register(r'/testacl (%s) ((?:add)|(?:rm)) ([^ ]+) ([^ ]+)' % re_name, on_cmd3)
+	cmd.register('/test', on_cmd)
 
-def on_cmd(message, user, name):
-	offset = user.position
-	offset = [axis+5 for axis in offset]
-	if new_zone(name, ('cube', user.dimension, user.position, offset), user.username):
-		tell(user, "Success")
-	else:
-		tell(user, "Failure")
+def on_cmd(message, user):
+	tell(user, test(user))
 
-def on_cmd2(message, user):
-	flag = False
-	for zone in user.zones:
-		flag = True
-		tell(user, "In zone: %s%s" % (zone['name'], zone['acls']))
-	if not flag:
-		tell(user, "In no zones.")
 
-
-def on_cmd3(message, user, zone, add_or_rm, username, rule):
-	zone = zone.strip('"')
-	try:
-		acls = get_zones()[zone]['acls']
-	except KeyError:
-		tell(user, "No such zone")
-		return
-	user_acls = acls.setdefault(username, acls['EVERYONE'])
-	if add_or_rm == 'add':
-		if rule not in user_acls:
-			user_acls.append(rule)
-	elif add_or_rm == 'rm':
-		try:
-			user_acls.remove(rule)
-		except ValueError:
-			tell(user, "Rule not in list")
-			return
-	else:
-		assert False
-
-	tell(user, 'Success')
-	return
+@long_operation
+def test(user):
+	yield "Hello"
+	while 1:
+		tell(user, time.time())
+		yield

plugins/zone_confirm.py

@@ -10,9 +10,12 @@
 """
 
 import zones
+from zones import get_zones
 from player_cmd import register
-from helpers import ops
+from helpers import ops, send_packet
 from plugin_helpers import tell, ops_only
+from packet_decoder import Packet
+from long_operations import long_operation
 
 def set_confirm(zone):
 	zone['confirmed'] = False
@@ -21,6 +24,8 @@ def on_start():
 	zones.new_zone_hooks.append(set_confirm)
 	register("/zone op help", ophelp)
 	register("/zone op wool (.*)", zonewool)
+	register("/zone op wool-all (.*)", zonewoolall)
+	register("/wool", morewool)
 	register("/zone op confirm (.*)", zoneconfirm)
 	register('/zone op modify "([^"]+)" ([^ ]+) (.*)', zonemodify)
 
@@ -31,9 +36,11 @@ def ophelp(message, user):
 	           "/zone op help - Obvious.\n"
 	           "/zone op wool <zone> - 10x10x10 cube below player highlighted as follows:\n"
 	           "__ green: In given zone.\n"
-	           "__ red: In zone besides one given.\n"
-	           "__ yellow: In given zone AND at least one other.\n"
+	           "__ yellow: In zone besides one given.\n"
+	           "__ red: In given zone AND at least one other.\n"
 	           "__ You will need to log out/in to reverse changes.\n"
+	           "/wool - Shortcut to re-run last wool command.\n"
+	           "/zone op wool-all <zone> - Does wool for an entire zone.\n"
 	           "/zone op confirm <zone> - Confirm zone.\n"
 	           '/zone op modify "<zone>" <key> <value> - Advanced use. Quotes required.')
 
@@ -47,9 +54,79 @@ def zoneconfirm(message, user, name):
 	tell(user, "Success")
 
 
+WOOL_ID = 35 # Wool
+IN_ZONE = 5 # green
+OTHER_ZONE = 4 # yellow
+CONFLICT = 14 # red
+
+def wool_point(zone, user, (x,y,z)):
+	block_metadata = None
+	zones_here = zones.get_zones_at_point(user.dimension, (x,y,z))
+	if zones_here == [zone]:
+		block_metadata = IN_ZONE
+	elif zone in zones_here:
+		block_metadata = CONFLICT
+	elif zones_here:
+		block_metadata = OTHER_ZONE
+	if block_metadata is not None:
+		packet = Packet('Block change', x=x, y=y, z=z, id=WOOL_ID, metadata=block_metadata)
+		send_packet(packet, user, False)
+
+
 @ops_only
 def zonewool(message, user, name):
-	pass # TODO
+	user.morewool = name
+	try:
+		zone = zones.get_zones()[name]
+	except KeyError:
+		tell(user, "Bad zone name")
+		return
+	base = [int(axis) for axis in user.position]
+	for x in range(base[0]-5, base[0]+5):
+		for y in range(base[1]-10, base[1]):
+			for z in range(base[2]-5, base[2]+5):
+				wool_point(zone, user, (x,y,z))
+	tell(user, "Complete.")
+
+
+@ops_only
+@long_operation
+def zonewoolall(message, user, name):
+	yield
+	EDGE = 4 # extra blocks beyond edges
+	user.morewool = name
+	try:
+		zone = zones.get_zones()[name]
+	except KeyError:
+		tell(user, "Bad zone name")
+		return
+	if zone['bounds_info'][0] == 'cube':
+		box = zone['bounds_info'][2:]
+		box = zip(*box)
+		box = [sorted(axis) for axis in box]
+	elif zone['bounds_info'][0] == 'cylinder':
+		(x, y, z), r, h = zone['bounds_info'][2:]
+		box = ((x-r, x+r), (y, y+h), (z-r, z+r))
+	else:
+		tell(user, "Unsupported zone type: %s" % zone['bounds_info'][0])
+		return
+	box = [(int(a)-EDGE, int(b)+1+EDGE) for a,b in box]
+	for y in range(*box[1]):
+		for x in range(*box[0]):
+			yield
+			for z in range(*box[2]):
+				wool_point(zone, user, (x,y,z))
+		complete = float(y-box[1][0])/(box[1][1]-box[1][0])
+		if complete < 1:
+			tell(user, 'Wooling %s...%.2f%% complete' % (name, 100 * complete))
+	tell(user, 'Complete.')
+
+
+def morewool(message, user):
+	if hasattr(user, 'morewool'):
+		return zonewool(message, user, user.morewool)
+	else:
+		return False
 
 
 @ops_only