mirror of
https://github.com/ammaraskar/pyCraft.git
synced 2024-11-16 07:15:24 +01:00
Maintains connection for a second, needs moar parsing.
This commit is contained in:
Ammar Askar
parent
d4a47f41a6
commit
e7f1e5da54
@ -84,7 +84,7 @@ class PacketListener(threading.Thread):
|
||||
if(response[0] == "\x03"):
|
||||
PacketManager.handle03(self.socket)
|
||||
if(response[0] == "\x04"):
|
||||
PacketManager.handle04(self.socket)
|
||||
print PacketManager.handle04(self.socket)
|
||||
if(response[0] == "\x05"):
|
||||
PacketManager.handle05(self.socket)
|
||||
if(response[0] == "\x06"):
|
||||
@ -119,8 +119,34 @@ class PacketListener(threading.Thread):
|
||||
PacketManager.handle1D(self.socket)
|
||||
if(response[0] == "\x1E"):
|
||||
PacketManager.handle1E(self.socket)
|
||||
if(response[0] == "\x20"):
|
||||
PacketManager.handle20(self.socket)
|
||||
if(response[0] == "\x21"):
|
||||
PacketManager.handle21(self.socket)
|
||||
if(response[0] == "\x22"):
|
||||
PacketManager.handle22(self.socket)
|
||||
if(response[0] == "\x23"):
|
||||
PacketManager.handle23(self.socket)
|
||||
if(response[0] == "\x26"):
|
||||
PacketManager.handle26(self.socket)
|
||||
if(response[0] == "\x27"):
|
||||
PacketManager.handle27(self.socket)
|
||||
if(response[0] == "\x28"):
|
||||
PacketManager.handle28(self.socket)
|
||||
if(response[0] == "\x29"):
|
||||
PacketManager.handle29(self.socket)
|
||||
if(response[0] == "\x2A"):
|
||||
PacketManager.handle2A(self.socket)
|
||||
if(response[0] == "\x2B"):
|
||||
PacketManager.handle2B(self.socket)
|
||||
if(response[0] == "\x32"):
|
||||
PacketManager.handle32(self.socket)
|
||||
if(response[0] == "\xCA"):
|
||||
print PacketManager.handleCA(self.socket)
|
||||
if(response[0] == "\xFA"):
|
||||
print PacketManager.handleFA(self.socket)
|
||||
if(response[0] == "\xFF"):
|
||||
DisconMessage = PacketManager.handleFF(self.socket, response)
|
||||
DisconMessage = PacketManager.handleFF(self.socket)
|
||||
if(self.NoGUI == False):
|
||||
"Disconnected: " + DisconMessage
|
||||
else:
|
||||
|
||||
@ -12,7 +12,6 @@ def loginToMinecraft(username, password):
|
||||
opener = urllib2.build_opener()
|
||||
response = opener.open(req)
|
||||
response = response.read()
|
||||
print response
|
||||
except urllib2.URLError:
|
||||
toReturn = {'Response' : "Can't connect to minecraft.net"}
|
||||
return toReturn
|
||||
|
||||
177
PacketManager.py
177
PacketManager.py
@ -61,7 +61,7 @@ def handle03(socket):
|
||||
return message
|
||||
|
||||
def handle04(socket):
|
||||
time = struct.unpack('!l', socket.recv(4))[0]
|
||||
time = struct.unpack('!q', socket.recv(8))[0]
|
||||
return time
|
||||
|
||||
def handle05(socket):
|
||||
@ -243,26 +243,28 @@ def handle18(socket):
|
||||
Pitch = struct.unpack('!b', socket.recv(1))[0]
|
||||
HeadYaw = struct.unpack('!b', socket.recv(1))[0]
|
||||
metadata = {}
|
||||
x = socket.unpack('byte')
|
||||
x = struct.unpack('!b', socket.recv(1))[0]
|
||||
while x != 127:
|
||||
index = x & 0x1F # Lower 5 bits
|
||||
ty = x >> 5 # Upper 3 bits
|
||||
if ty == 0: val = socket.unpack('byte')
|
||||
if ty == 1: val = socket.unpack('short')
|
||||
if ty == 2: val = socket.unpack('int')
|
||||
if ty == 3: val = socket.unpack('float')
|
||||
if ty == 4: val = socket.unpack('string16')
|
||||
if ty == 0: val = struct.unpack('!b', socket.recv(1))[0]
|
||||
if ty == 1: val = struct.unpack('!h', socket.recv(2))[0]
|
||||
if ty == 2: val = struct.unpack('!i', socket.recv(4))[0]
|
||||
if ty == 3: val = struct.unpack('!f', socket.recv(4))[0]
|
||||
if ty == 4:
|
||||
length = struct.unpack('!h', socket.recv(2))[0] * 2
|
||||
val = socket.recv(length).decode('utf-16be')
|
||||
if ty == 5:
|
||||
val = {}
|
||||
val["id"] = socket.unpack('short')
|
||||
val["count"] = socket.unpack('byte')
|
||||
val["damage"] = socket.unpack('short')
|
||||
val["id"] = struct.unpack('!h', socket.recv(2))[0]
|
||||
val["count"] = struct.unpack('!b', socket.recv(1))[0]
|
||||
val["damage"] = struct.unpack('!h', socket.recv(2))[0]
|
||||
if ty == 6:
|
||||
val = []
|
||||
for i in range(3):
|
||||
val.append(socket.unpack('int'))
|
||||
val.append(struct.unpack('!i', socket.recv(4))[0])
|
||||
metadata[index] = (ty, val)
|
||||
x = socket.unpack('byte')
|
||||
x = struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'Type' : Type,
|
||||
'x' : x,
|
||||
@ -341,14 +343,151 @@ def handle20(socket):
|
||||
'Yaw' : Yaw,
|
||||
'Pitch' : Pitch
|
||||
}
|
||||
|
||||
def handle21(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
x = struct.unpack('!b', socket.recv(1))[0]
|
||||
y = struct.unpack('!b', socket.recv(1))[0]
|
||||
z = struct.unpack('!b', socket.recv(1))[0]
|
||||
Yaw = struct.unpack('!b', socket.recv(1))[0]
|
||||
Pitch = struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'x' : x,
|
||||
'y' : y,
|
||||
'z' : z,
|
||||
'Yaw' : Yaw,
|
||||
'Pitch' : Pitch
|
||||
}
|
||||
|
||||
def handle22(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
x = struct.unpack('!i', socket.recv(4))[0]
|
||||
y = struct.unpack('!i', socket.recv(4))[0]
|
||||
z = struct.unpack('!i', socket.recv(4))[0]
|
||||
Yaw = struct.unpack('!b', socket.recv(1))[0]
|
||||
Pitch = struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'x' : x,
|
||||
'y' : y,
|
||||
'z' : z,
|
||||
'Yaw' : Yaw,
|
||||
'Pitch' : Pitch
|
||||
}
|
||||
|
||||
def handle23(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
HeadYaw = struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'HeadYaw' : HeadYaw
|
||||
}
|
||||
|
||||
def handle26(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
Status = struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'Status' : Status
|
||||
}
|
||||
|
||||
def handle27(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
VehicleID = struct.unpack('!i', socket.recv(4))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'VehicleID' : VehicleID
|
||||
}
|
||||
|
||||
def handle28(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
metadata = {}
|
||||
x = struct.unpack('!b', socket.recv(1))[0]
|
||||
while x != 127:
|
||||
index = x & 0x1F # Lower 5 bits
|
||||
ty = x >> 5 # Upper 3 bits
|
||||
if ty == 0: val = struct.unpack('!b', socket.recv(1))[0]
|
||||
if ty == 1: val = struct.unpack('!h', socket.recv(2))[0]
|
||||
if ty == 2: val = struct.unpack('!i', socket.recv(4))[0]
|
||||
if ty == 3: val = struct.unpack('!f', socket.recv(4))[0]
|
||||
if ty == 4:
|
||||
length = struct.unpack('!h', socket.recv(2))[0] * 2
|
||||
val = socket.recv(length).decode('utf-16be')
|
||||
if ty == 5:
|
||||
val = {}
|
||||
val["id"] = struct.unpack('!h', socket.recv(2))[0]
|
||||
val["count"] = struct.unpack('!b', socket.recv(1))[0]
|
||||
val["damage"] = struct.unpack('!h', socket.recv(2))[0]
|
||||
if ty == 6:
|
||||
val = []
|
||||
for i in range(3):
|
||||
val.append(struct.unpack('!i', socket.recv(4))[0])
|
||||
metadata[index] = (ty, val)
|
||||
struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'MetaData' : metadata
|
||||
}
|
||||
|
||||
def handle29(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
EffectID = struct.unpack('!b', socket.recv(1))[0]
|
||||
Amplifier = struct.unpack('!b', socket.recv(1))[0]
|
||||
Duration = struct.unpack('!h', socket.recv(2))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'EffectID' : EffectID,
|
||||
'Amplifier' : Amplifier,
|
||||
'Duration' : Duration
|
||||
}
|
||||
|
||||
def handle2A(socket):
|
||||
EntityID = struct.unpack('!i', socket.recv(4))[0]
|
||||
EffectID = struct.unpack('!b', socket.recv(1))[0]
|
||||
return {'EntityID' : EntityID,
|
||||
'EffectID' : EffectID
|
||||
}
|
||||
|
||||
def handle2B(socket):
|
||||
ExperienceBar = struct.unpack('!f', socket.recv(4))[0]
|
||||
Level = struct.unpack('!h', socket.recv(2))[0]
|
||||
TotalExp = struct.unpack('!h', socket.recv(2))[0]
|
||||
return {'ExpBar' : ExperienceBar,
|
||||
'Level' : Level,
|
||||
'TotalExp' : TotalExp
|
||||
}
|
||||
|
||||
def handle32(socket):
|
||||
X = struct.unpack('!i', socket.recv(4))[0]
|
||||
Z = struct.unpack('!i', socket.recv(4))[0]
|
||||
Mode = struct.unpack('?', socket.recv(1))[0]
|
||||
return {'x' : X,
|
||||
'z' : Z,
|
||||
'Mode' : Mode
|
||||
}
|
||||
|
||||
def handleCA(socket):
|
||||
Invulnerable = struct.unpack('?', socket.recv(1))[0]
|
||||
IsFlying = struct.unpack('?', socket.recv(1))[0]
|
||||
CanFly = struct.unpack('?', socket.recv(1))[0]
|
||||
InstantDestroy = struct.unpack('?', socket.recv(1))[0]
|
||||
return {'Invulnerable' : Invulnerable,
|
||||
'IsFlying' : IsFlying,
|
||||
'CanFly' : CanFly,
|
||||
'InstantDestroy' : InstantDestroy
|
||||
}
|
||||
|
||||
def handleFA(socket):
|
||||
length = struct.unpack('!h', socket.recv(2))[0] * 2
|
||||
Channel = socket.recv(length)
|
||||
length = struct.unpack('!h', socket.recv(2))[0]
|
||||
raw = socket.recv(length)
|
||||
print raw
|
||||
message = struct.unpack(str(length) + 's', raw)
|
||||
return {'Channel' : Channel,
|
||||
'message' : message
|
||||
}
|
||||
|
||||
def handleFF(socket, response):
|
||||
response = socket.recv(2)
|
||||
length = struct.unpack('!h', response)[0] * 2
|
||||
response = socket.recv(length)
|
||||
response = response.decode("utf-16be", 'strict')
|
||||
print response
|
||||
return response
|
||||
def handleFF(socket):
|
||||
length = struct.unpack('!h', socket.recv(2))[0] * 2
|
||||
Reason = socket.recv(length)
|
||||
Reason = Reason.decode("utf-16be", 'strict')
|
||||
print Reason
|
||||
return Reason
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user