Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/JMaNGOS/JMaNGOS.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@dee-kryvenko
dee-kryvenko committed Aug 9, 2012
2 parents efeffd9 + aa0f306 commit 19dba14
Show file tree
Hide file tree
Showing 34 changed files with 468 additions and 357 deletions.
26 changes: 13 additions & 13 deletions Auth/conf/packetData/lc-packets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
xsi:noNamespaceSchemaLocation="packets.xsd">
<opcodelist direction="DOWNSTREAM"
package="org.jmangos.auth.network.netty.packet.client.">
<packet id="00" name="CMD_AUTH_LOGON_CHALLENGE" state="CONNECTED"/>
<packet id="01" name="CMD_AUTH_LOGON_PROOF" state="CONNECTED"/>
<packet id="10" name="CMD_REALM_LIST" state="AUTHED"/>
<packet id="50" name="CMD_AUTH_ENABLE_CRYPT" state="AUTHED"/>
<packet id="00" name="CMD_AUTH_LOGON_CHALLENGE" state="CONNECTED" />
<packet id="01" name="CMD_AUTH_LOGON_PROOF" state="CONNECTED" />
<packet id="02" name="CMD_RECONNECT_CHALLENGE" state="CONNECTED" />
<packet name="CMD_RECONNECT_PROOF" id="3" ></packet>
<packet id="51" name="CMD_TEST_CRYPT" state="AUTHED"/>
<packet id="03" name="CMD_RECONNECT_PROOF" state="CONNECTED" />
<packet id="10" name="CMD_REALM_LIST" state="AUTHED" />
<packet id="50" name="CMD_AUTH_ENABLE_CRYPT" state="AUTHED" />
<packet id="51" name="CMD_TEST_CRYPT" state="AUTHED" />
</opcodelist>
<opcodelist direction="UPSTREAM"
package="org.jmangos.auth.network.netty.packet.server.">
<packet id="00" name="TCMD_AUTH_LOGON_CHALLENGE"/>
<packet id="01" name="TCMD_AUTH_LOGON_PROOF"/>
<packet id="10" name="TCMD_REALM_LIST"/>
<packet name="TCMD_RECONNECT_CHALLENGE" id="2" />
<packet name="TCMD_RECONNECT_PROOF" id="3" />
<packet name="TCMD_AUTH_ENABLE_CRYPT" id="50" />
<packet id="00" name="TCMD_AUTH_LOGON_CHALLENGE" />
<packet id="01" name="TCMD_AUTH_LOGON_PROOF" />
<packet id="02" name="TCMD_RECONNECT_CHALLENGE" />
<packet id="03" name="TCMD_RECONNECT_PROOF" />
<packet id="10" name="TCMD_REALM_LIST" />
<packet id="50" name="TCMD_AUTH_ENABLE_CRYPT" />
</opcodelist>
</opcodes>
</opcodes>
35 changes: 0 additions & 35 deletions Auth/conf/packetData/lr-packets.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Tools/src/main/java/org/jmangos/tools/adt/chunks/ADTChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public BaseChunk readChunkByHeader(ByteBuffer bb, int offset) {
return new UNKChunk().setChunkType(ch.toString()).reads(bb, offset, tch.ChunkSize.get());
}
}
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
return this;
}
}
47 changes: 29 additions & 18 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MCINChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,47 @@

import org.jmangos.tools.adt.chunks.ADTChunk;

public class MCINChunk extends ADTChunk{
class MCINEntry extends ADTChunk{
public final Unsigned32 mcnk = new Unsigned32(); // absolute offset.
public final Unsigned32 size = new Unsigned32(); // the size of the MCNK chunk, this is refering to.
public final Unsigned32 flags = new Unsigned32(); // these two are always 0. only set in the client.
/**
* Chunk <tt>MCIN</tt><br>
* Pointers to MCNK chunks and their sizes.
*
* @author MinimaJack
*
*/
public class MCINChunk extends ADTChunk {
class MCINEntry extends ADTChunk {
/** Offset */
public final Unsigned32 mcnk = new Unsigned32();
/** Size */
public final Unsigned32 size = new Unsigned32();
public final Unsigned32 flags = new Unsigned32();
public final Unsigned32 asyncId = new Unsigned32();
}
public MCINEntry[] MCINEntrys = new MCINEntry[16*16];

public MCINEntry[] MCINEntrys = new MCINEntry[16 * 16];

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
for (int i = 0; i < 256; i++) {
MCINEntrys[i] = new MCINEntry();
MCINEntrys[i].setByteBuffer(bb, offset + 16*i);
MCINEntrys[i].setByteBuffer(bb, offset + 16 * i);
}
return this;
return this;
}
public String getOffsets(){

public String getOffsets() {
String g = "";
for (int i = 0; i < 16*16; i++) {
g += "\n mcnk:" + MCINEntrys[i].mcnk.get()+" mcnk size:" + MCINEntrys[i].size.get();
}
for (int i = 0; i < 16 * 16; i++) {
g += "\n mcnk:" + MCINEntrys[i].mcnk.get() + " mcnk size:"
+ MCINEntrys[i].size.get();
}
return g;
}

public String toString(){
return "[MCINChunk]" +
"\n offsets count: " + MCINEntrys.length;

public String toString() {
return "[MCINChunk]" + "\n offsets count: " + MCINEntrys.length;
}

}
11 changes: 9 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MCNKChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@

import org.jmangos.tools.adt.chunks.ADTChunk;

/**
* Chunk <tt>MCNK</tt><br>
* Pointers to MCNK chunks and their sizes.
*
* @author MinimaJack
*
*/
public class MCNKChunk extends ADTChunk{
public class MCNKHeader extends ADTChunk{
public MCVT fHeight;
Expand Down Expand Up @@ -59,8 +66,8 @@ public String toString(){
public MCNKHeader fMCNKHeader;

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.size = (int) size;
this.setByteBuffer(bb, offset);
fMCNKHeader = new MCNKHeader();
Expand Down
4 changes: 2 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MDDFChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ class MDDFEntry extends ADTChunk{

private MDDFEntry[] MDDFEntries;
@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
MDDFEntries = new MDDFEntry[(int) (size /36)];
for (int i = 0; i < (size /36); i++) {
MDDFEntries[i] = new MDDFEntry();
MDDFEntries[i].setByteBuffer(bb, offset + 36*i);
}
setGlobalOffcet(offset + size + HEADERSIZE);
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MH2OChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class MH2ORender extends ADTChunk{
public MH2OHeader[] MH2OHeaders = new MH2OHeader[16*16];

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.size = (int) size;
this.setByteBuffer(bb, offset);
for (int i = 0; i < 256; i++) {
Expand Down
100 changes: 48 additions & 52 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MHDRChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,71 +20,67 @@

import org.jmangos.tools.adt.chunks.ADTChunk;

public class MHDRChunk extends ADTChunk{
public enum MHDRFlags { mhdr_MFBO (0),
mhdr_northrend (1);
int value;
MHDRFlags(int value){
this.value = value;
}
};

public class MHDRChunk extends ADTChunk {
public enum MHDRFlags {
mhdr_MFBO(0), mhdr_northrend(1);
int value;

MHDRFlags(int value) {
this.value = value;
}
};

final static int localOffset = new MHDRChunk().size();
public final Enum32<MHDRFlags> MHDRflags = new Enum32<MHDRFlags>(MHDRFlags.values());
Unsigned32 flag = new Unsigned32();
Unsigned32 mcin = new Unsigned32();
Unsigned32 mtex = new Unsigned32();
Unsigned32 mmdx = new Unsigned32();
Unsigned32 mmid = new Unsigned32();
Unsigned32 mwmo = new Unsigned32();
Unsigned32 mwid = new Unsigned32();
Unsigned32 mddf = new Unsigned32();
Unsigned32 mfbo; // this is only set if flags & mhdr_MFBO.
Unsigned32 modf;

Unsigned32 mh2o;
Unsigned32 mtfx;
Unsigned32 uint32_t;
Unsigned32 uint32_t2;
Unsigned32 uint32_t3;
Unsigned32 uint32_t4;
Unsigned32 uint32_t5;
public final Enum32<MHDRFlags> MHDRflags = new Enum32<MHDRFlags>(
MHDRFlags.values());
Unsigned32 flag = new Unsigned32();
Unsigned32 mcin = new Unsigned32();
Unsigned32 mtex = new Unsigned32();
Unsigned32 mmdx = new Unsigned32();
Unsigned32 mmid = new Unsigned32();
Unsigned32 mwmo = new Unsigned32();
Unsigned32 mwid = new Unsigned32();
Unsigned32 mddf = new Unsigned32();
Unsigned32 mfbo; // this is only set if flags & mhdr_MFBO.
Unsigned32 modf;

Unsigned32 mh2o;
Unsigned32 mtfx;
Unsigned32 uint32_t;
Unsigned32 uint32_t2;
Unsigned32 uint32_t3;
Unsigned32 uint32_t4;
Unsigned32 uint32_t5;

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
if(mfboIn()){
if (mfboIn()) {
mfbo = new Unsigned32();
}
modf = new Unsigned32();
mh2o = new Unsigned32();
mtfx = new Unsigned32();
uint32_t= new Unsigned32();
uint32_t2= new Unsigned32();
uint32_t3= new Unsigned32();
uint32_t4= new Unsigned32();
uint32_t5= new Unsigned32();
return this;
uint32_t = new Unsigned32();
uint32_t2 = new Unsigned32();
uint32_t3 = new Unsigned32();
uint32_t4 = new Unsigned32();
uint32_t5 = new Unsigned32();
return this;
}

public String toString(){
return "[MHDRChunk]" +
"\n ENUM: " + MHDRflags.get()+
"\n FLAG: " + flag.get()+
"\n MCIN: " + mcin.get()+
"\n MTEX: " + mtex.get()+
"\n MMDX: " + mmdx.get()+
"\n MMID: " + mmid.get()+
"\n MWMO: " + mwmo.get()+
"\n MWID: " + mwid.get()+
"\n MDDF: " + mddf.get()+
"\n MODF: " + modf.get()+
(mfboIn()?("\n MFBO: " + mfbo.get()):"");

public String toString() {
return "[MHDRChunk]" + "\n ENUM: " + MHDRflags.get() + "\n FLAG: "
+ flag.get() + "\n MCIN: " + mcin.get() + "\n MTEX: "
+ mtex.get() + "\n MMDX: " + mmdx.get() + "\n MMID: "
+ mmid.get() + "\n MWMO: " + mwmo.get() + "\n MWID: "
+ mwid.get() + "\n MDDF: " + mddf.get() + "\n MODF: "
+ modf.get() + (mfboIn() ? ("\n MFBO: " + mfbo.get()) : "");

}
private boolean mfboIn(){

private boolean mfboIn() {
return (1 & flag.get()) > 0;
}

Expand Down
4 changes: 2 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MMDXChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public class MMDXChunk extends ADTChunk {
private int offset;

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
this.offset = offset;
return this;
Expand Down
6 changes: 3 additions & 3 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MMIDChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public class MMIDChunk extends ADTChunk{
public Unsigned32[] offset ;

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
this.offset = array(new Unsigned32[(int) (size/4)]);
this.offset = array(new Unsigned32[size/4]);
return this;
}

Expand Down
4 changes: 2 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MODFChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ class MODFEntry extends ADTChunk{
}
MODFEntry[] MODFEntries;
@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
this.size = (int) size;
MODFEntries = new MODFEntry[(int) (size /64)];
for (int i = 0; i < (size /64); i++) {
MODFEntries[i] = new MODFEntry();
MODFEntries[i].setByteBuffer(bb, offset + 64*i);
}
setGlobalOffcet(offset + size + HEADERSIZE);
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MTEXChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ public class MTEXChunk extends ADTChunk{


@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
byte[] tsring = new byte[2024];
ArrayList<String> tstr = new ArrayList<String>();
CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder();
setGlobalOffcet(offset + size + HEADERSIZE);
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
int reading = 0;
int si = 0;
Expand Down
6 changes: 3 additions & 3 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MWIDChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public class MWIDChunk extends ADTChunk{
public Unsigned32[] offset;

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
this.offset = array(new Unsigned32[(int) (size/4)]);
this.offset = array(new Unsigned32[size/4]);
return this;
}

Expand Down
4 changes: 2 additions & 2 deletions Tools/src/main/java/org/jmangos/tools/adt/chunks/root/MWMOChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public class MWMOChunk extends ADTChunk{
private int offset;

@Override
public ADTChunk reads(ByteBuffer bb, int offset, long size) {
setGlobalOffcet(offset + size + HEADERSIZE);
public ADTChunk reads(ByteBuffer bb, int offset, int size) {
setGlobalOffset(offset + size + HEADERSIZE);
this.setByteBuffer(bb, offset);
this.offset = offset;
return this;
Expand Down

0 comments on commit 19dba14

Please sign in to comment.