Skip to content

Commit c0fe279

Browse files
committed
more refactoring
1 parent 72d68ee commit c0fe279

8 files changed

+390
-385
lines changed

src/a/Utility.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ public static String method_454(String var0, int var1) {
195195
}
196196

197197
// $FF: renamed from: a (int) java.lang.String
198-
public static String method_455(int var0) {
199-
return (var0 >> 24 & 255) + "." + (var0 >> 16 & 255) + "." + (var0 >> 8 & 255) + "." + (var0 & 255);
198+
public static String translateIpAddress(int ipInt) {
199+
return (ipInt >> 24 & 255) + "." + (ipInt >> 16 & 255) + "." + (ipInt >> 8 & 255) + "." + (ipInt & 255);
200200
}
201201

202202
// $FF: renamed from: b (java.lang.String) long

src/a/a/GameApplet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ public void method_32(int opcode, int packetLength) {
393393
this.field_62 = this.incomingBytes[3];
394394
this.field_63 = this.incomingBytes[4];
395395
} else if(opcode == 28) {
396-
var10 = Utility.getUnsignedLong(this.incomingBytes, 1);
396+
var10 = Utility.getUnsignedLong(this.incomingBytes, 1); // username hash
397397
String var11 = class_20.formatChat(class_22.readChatString(this.incomingBytes, 9, packetLength - 9));
398398
this.displayMessage("@pri@" + Utility.unhashUsername(var10) + ": tells you " + var11);
399399
} else {
@@ -607,10 +607,10 @@ public void friendRemove(long var1) {
607607
}
608608

609609
// $FF: renamed from: a (long, byte[], int) void
610-
public void sendPrivateChat(long var1, byte[] var3, int var4) {
610+
public void sendPrivateChat(long username, byte[] message, int length) {
611611
this.clientStream.newPacket(28, 185);
612-
this.clientStream.putLong(var1);
613-
this.clientStream.put177RSCString(var3, 0, var4);
612+
this.clientStream.putLong(username);
613+
this.clientStream.put177RSCString(message, 0, length);
614614
this.clientStream.flushPacket_();
615615
}
616616

src/a/a/class_0.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public class class_0 extends Applet implements Runnable {
110110
// $FF: renamed from: P java.lang.String
111111
public String field_42;
112112
// $FF: renamed from: Q java.lang.String
113-
public String field_43;
113+
public String pmToSend;
114114

115115

116116
// $FF: renamed from: a () void
@@ -242,7 +242,7 @@ public synchronized boolean keyDown(Event var1, int var2) {
242242

243243
if(var2 == 10 || var2 == 13) {
244244
this.inputTextFinal = this.inputTextCurrent;
245-
this.field_43 = this.field_42;
245+
this.pmToSend = this.field_42;
246246
}
247247

248248
return true;
@@ -842,7 +842,7 @@ public class_0() {
842842
this.inputTextCurrent = "";
843843
this.inputTextFinal = "";
844844
this.field_42 = "";
845-
this.field_43 = "";
845+
this.pmToSend = "";
846846
}
847847

848848
// $FF: renamed from: <clinit> () void

src/a/class_22.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class class_22 {
77

88
// $FF: renamed from: a byte[]
9-
public static byte[] field_1010;
9+
public static byte[] pmMessage;
1010
// $FF: renamed from: b char[]
1111
public static char[] stringBuilder;
1212
// $FF: renamed from: c char[]
@@ -100,25 +100,25 @@ public static String readChatString(byte[] data, int dataIndex, int strLength) {
100100
}
101101

102102
// $FF: renamed from: a (java.lang.String) int
103-
public static int prepareToSendChat(String var0) {
103+
public static int prepareToSendChat(String messageToSend) {
104104
int var7 = class_5.field_597;
105-
if(var0.length() > 80) {
106-
var0 = var0.substring(0, 80);
105+
if(messageToSend.length() > 80) {
106+
messageToSend = messageToSend.substring(0, 80);
107107
}
108108

109-
var0 = var0.toLowerCase();
110-
int var1 = 0;
109+
messageToSend = messageToSend.toLowerCase();
110+
int messageLength = 0;
111111
int var2 = -1;
112112
int var3 = 0;
113-
if(var7 == 0 && var3 >= var0.length()) {
113+
if(var7 == 0 && var3 >= messageToSend.length()) {
114114
if(var2 != -1) {
115-
field_1010[var1++] = (byte)(var2 << 4);
115+
pmMessage[messageLength++] = (byte)(var2 << 4);
116116
}
117117

118-
return var1;
118+
return messageLength;
119119
} else {
120120
do {
121-
char var4 = var0.charAt(var3);
121+
char var4 = messageToSend.charAt(var3);
122122
int var5 = 0;
123123
int var6 = 0;
124124
if(var7 != 0 || var6 < characterDictionary.length) {
@@ -147,38 +147,38 @@ public static int prepareToSendChat(String var0) {
147147
}
148148
}
149149

150-
field_1010[var1++] = (byte)var5;
150+
pmMessage[messageLength++] = (byte)var5;
151151
if(var7 == 0) {
152152
break label79;
153153
}
154154
}
155155

156156
if(var5 < 13) {
157-
field_1010[var1++] = (byte)((var2 << 4) + var5);
157+
pmMessage[messageLength++] = (byte)((var2 << 4) + var5);
158158
var2 = -1;
159159
if(var7 == 0) {
160160
break label79;
161161
}
162162
}
163163

164-
field_1010[var1++] = (byte)((var2 << 4) + (var5 >> 4));
164+
pmMessage[messageLength++] = (byte)((var2 << 4) + (var5 >> 4));
165165
var2 = var5 & 15;
166166
}
167167

168168
++var3;
169-
} while(var3 < var0.length());
169+
} while(var3 < messageToSend.length());
170170

171171
if(var2 != -1) {
172-
field_1010[var1++] = (byte)(var2 << 4);
172+
pmMessage[messageLength++] = (byte)(var2 << 4);
173173
}
174174

175-
return var1;
175+
return messageLength;
176176
}
177177
}
178178

179179
// $FF: renamed from: <clinit> () void
180180
static {
181-
field_1010 = new byte[100];
181+
pmMessage = new byte[100];
182182
stringBuilder = new char[100];
183183
characterDictionary = new char[]{' ', 'e', 't', 'a', 'o', 'i', 'h', 'n', 's', 'r', 'd', 'l', 'u', 'm', 'w', 'c', 'y', 'f', 'g', 'p', 'b', 'v', 'k', 'x', 'j', 'q', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' ', '!', '?', '.', ',', ':', ';', '(', ')', '-', '&', '*', '\\', '\'', '@', '#', '+', '=', '\u00a3', '$', '%', '\"', '[', ']'};
184184
}

src/a/class_5.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@ public void putUnterminatedString(String var1) {
225225
}
226226

227227
// $FF: renamed from: b (byte[], int, int) void
228-
public void put177RSCString(byte[] var1, int var2, int var3) {
229-
int var4 = 0;
230-
if(field_597 != 0 || var4 < var3) {
228+
public void put177RSCString(byte[] message, int begin, int length) {
229+
int offset = 0;
230+
if(field_597 != 0 || offset < length) {
231231
do {
232-
this.outgoingData[this.outgoingOffsetTotal++] = var1[var2 + var4];
233-
++var4;
234-
} while(var4 < var3);
232+
this.outgoingData[this.outgoingOffsetTotal++] = message[begin + offset];
233+
++offset;
234+
} while(offset < length);
235235

236236
}
237237
}

src/class_4.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class class_4 {
1616
// $FF: renamed from: f int[]
1717
public static int[] field_477;
1818
// $FF: renamed from: g int[]
19-
public static int[] field_478;
19+
public static int[] itemBasePrice;
2020
// $FF: renamed from: h int[]
2121
public static int[] itemStackable;
2222
// $FF: renamed from: i int[]
@@ -269,7 +269,7 @@ public static void method_140(byte[] var0, boolean var1) {
269269
field_475 = new String[field_472];
270270
field_476 = new String[field_472];
271271
field_477 = new int[field_472];
272-
field_478 = new int[field_472];
272+
itemBasePrice = new int[field_472];
273273
itemStackable = new int[field_472];
274274
field_480 = new int[field_472];
275275
field_481 = new int[field_472];
@@ -323,7 +323,7 @@ public static void method_140(byte[] var0, boolean var1) {
323323
int var6 = 0;
324324
if(var74 != 0 || var6 < field_472) {
325325
do {
326-
field_478[var6] = method_138();
326+
itemBasePrice[var6] = method_138();
327327
++var6;
328328
} while(var6 < field_472);
329329
}
@@ -390,7 +390,7 @@ public static void method_140(byte[] var0, boolean var1) {
390390
if(!var1 && field_484[var13] == 1) {
391391
field_474[var13] = "Members object";
392392
field_475[var13] = "You need to be a member to use this object";
393-
field_478[var13] = 0;
393+
itemBasePrice[var13] = 0;
394394
field_476[var13] = "";
395395
field_480[0] = 0;
396396
field_481[var13] = 0;
@@ -404,7 +404,7 @@ public static void method_140(byte[] var0, boolean var1) {
404404
if(!var1 && field_484[var13] == 1) {
405405
field_474[var13] = "Members object";
406406
field_475[var13] = "You need to be a member to use this object";
407-
field_478[var13] = 0;
407+
itemBasePrice[var13] = 0;
408408
field_476[var13] = "";
409409
field_480[0] = 0;
410410
field_481[var13] = 0;

src/class_7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class class_7 {
77
// $FF: renamed from: b java.lang.String
88
public String username;
99
// $FF: renamed from: c int
10-
public int field_608;
10+
public int pid;
1111
// $FF: renamed from: d int
1212
public int appearanceId;
1313
// $FF: renamed from: e int

0 commit comments

Comments
 (0)