More rs-client refactoring

This commit is contained in:
Lucas
2019-07-06 14:26:03 +02:00
parent 1f984a81ca
commit 5d506e9bda
66 changed files with 519 additions and 493 deletions

View File

@@ -359,22 +359,22 @@ public class ItemDefinition extends DualNode {
@Export("readNext")
void readNext(Buffer var1, int var2) {
if (var2 == 1) {
this.field435 = var1.method43();
this.field435 = var1.readUnsignedShort();
} else if (var2 == 2) {
this.name = var1.readStringCp1252NullTerminated();
} else if (var2 == 4) {
this.zoom2d = var1.method43();
this.zoom2d = var1.readUnsignedShort();
} else if (var2 == 5) {
this.xan2d = var1.method43();
this.xan2d = var1.readUnsignedShort();
} else if (var2 == 6) {
this.yan2d = var1.method43();
this.yan2d = var1.readUnsignedShort();
} else if (var2 == 7) {
this.offsetX2d = var1.method43();
this.offsetX2d = var1.readUnsignedShort();
if (this.offsetX2d > 32767) {
this.offsetX2d -= 65536;
}
} else if (var2 == 8) {
this.offsetY2d = var1.method43();
this.offsetY2d = var1.readUnsignedShort();
if (this.offsetY2d > 32767) {
this.offsetY2d -= 65536;
}
@@ -385,15 +385,15 @@ public class ItemDefinition extends DualNode {
} else if (var2 == 16) {
this.isMembersOnly = true;
} else if (var2 == 23) {
this.maleModel = var1.method43();
this.maleModel = var1.readUnsignedShort();
this.maleOffset = var1.readUnsignedByte();
} else if (var2 == 24) {
this.maleModel1 = var1.method43();
this.maleModel1 = var1.readUnsignedShort();
} else if (var2 == 25) {
this.femaleModel = var1.method43();
this.femaleModel = var1.readUnsignedShort();
this.femaleOffset = var1.readUnsignedByte();
} else if (var2 == 26) {
this.femaleModel1 = var1.method43();
this.femaleModel1 = var1.readUnsignedShort();
} else if (var2 >= 30 && var2 < 35) {
this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated();
if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) {
@@ -410,8 +410,8 @@ public class ItemDefinition extends DualNode {
this.recolorTo = new short[var3];
for (var4 = 0; var4 < var3; ++var4) {
this.recolorFrom[var4] = (short)var1.method43();
this.recolorTo[var4] = (short)var1.method43();
this.recolorFrom[var4] = (short)var1.readUnsignedShort();
this.recolorTo[var4] = (short)var1.readUnsignedShort();
}
} else if (var2 == 41) {
var3 = var1.readUnsignedByte();
@@ -419,45 +419,45 @@ public class ItemDefinition extends DualNode {
this.retextureTo = new short[var3];
for (var4 = 0; var4 < var3; ++var4) {
this.retextureFrom[var4] = (short)var1.method43();
this.retextureTo[var4] = (short)var1.method43();
this.retextureFrom[var4] = (short)var1.readUnsignedShort();
this.retextureTo[var4] = (short)var1.readUnsignedShort();
}
} else if (var2 == 42) {
this.shiftClickIndex0 = var1.readByte();
} else if (var2 == 65) {
this.isTradable = true;
} else if (var2 == 78) {
this.maleModel2 = var1.method43();
this.maleModel2 = var1.readUnsignedShort();
} else if (var2 == 79) {
this.femaleModel2 = var1.method43();
this.femaleModel2 = var1.readUnsignedShort();
} else if (var2 == 90) {
this.maleHeadModel = var1.method43();
this.maleHeadModel = var1.readUnsignedShort();
} else if (var2 == 91) {
this.femaleHeadModel = var1.method43();
this.femaleHeadModel = var1.readUnsignedShort();
} else if (var2 == 92) {
this.maleHeadModel2 = var1.method43();
this.maleHeadModel2 = var1.readUnsignedShort();
} else if (var2 == 93) {
this.femaleHeadModel2 = var1.method43();
this.femaleHeadModel2 = var1.readUnsignedShort();
} else if (var2 == 95) {
this.zan2d = var1.method43();
this.zan2d = var1.readUnsignedShort();
} else if (var2 == 97) {
this.note = var1.method43();
this.note = var1.readUnsignedShort();
} else if (var2 == 98) {
this.noteTemplate = var1.method43();
this.noteTemplate = var1.readUnsignedShort();
} else if (var2 >= 100 && var2 < 110) {
if (this.field436 == null) {
this.field436 = new int[10];
this.field437 = new int[10];
}
this.field436[var2 - 100] = var1.method43();
this.field437[var2 - 100] = var1.method43();
this.field436[var2 - 100] = var1.readUnsignedShort();
this.field437[var2 - 100] = var1.readUnsignedShort();
} else if (var2 == 110) {
this.resizeX = var1.method43();
this.resizeX = var1.readUnsignedShort();
} else if (var2 == 111) {
this.resizeY = var1.method43();
this.resizeY = var1.readUnsignedShort();
} else if (var2 == 112) {
this.resizeZ = var1.method43();
this.resizeZ = var1.readUnsignedShort();
} else if (var2 == 113) {
this.ambient = var1.readByte();
} else if (var2 == 114) {
@@ -465,13 +465,13 @@ public class ItemDefinition extends DualNode {
} else if (var2 == 115) {
this.int1 = var1.readUnsignedByte();
} else if (var2 == 139) {
this.unnotedId = var1.method43();
this.unnotedId = var1.readUnsignedShort();
} else if (var2 == 140) {
this.notedId = var1.method43();
this.notedId = var1.readUnsignedShort();
} else if (var2 == 148) {
this.placeholder = var1.method43();
this.placeholder = var1.readUnsignedShort();
} else if (var2 == 149) {
this.placeholderTemplate = var1.method43();
this.placeholderTemplate = var1.readUnsignedShort();
} else if (var2 == 249) {
this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
}