Skip to content

Commit c385560

Browse files
OrNOrN
committed
Refactoring
1 parent c0fe279 commit c385560

8 files changed

+2055
-2046
lines changed

‎src/class_4.java ‎src/GameData.java

+1,137-1,137
Large diffs are not rendered by default.

‎src/World.java

+454-439
Large diffs are not rendered by default.

‎src/a/a/GameModel.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class GameModel {
7474
// $FF: renamed from: F int
7575
public int field_883;
7676
// $FF: renamed from: G int[]
77-
public int[] field_884;
77+
public int[] faceTag;
7878
// $FF: renamed from: H byte[]
7979
public byte[] field_885;
8080
// $FF: renamed from: I boolean
@@ -270,7 +270,7 @@ private void method_357(int var1, int var2) {
270270

271271
if(!this.field_889) {
272272
this.field_885 = new byte[var2];
273-
this.field_884 = new int[var2];
273+
this.faceTag = new int[var2];
274274
}
275275

276276
label28: {
@@ -324,7 +324,7 @@ public void method_358() {
324324
}
325325

326326
// $FF: renamed from: b () void
327-
public void method_359() {
327+
public void clear() {
328328
this.field_860 = 0;
329329
this.field_852 = 0;
330330
}
@@ -579,7 +579,7 @@ public GameModel(String var1) {
579579
int var7 = this.method_393(var26);
580580
int var8 = this.method_393(var26);
581581
int var9 = this.method_393(var26);
582-
this.method_366(var7, var8, var9);
582+
this.vertexAt(var7, var8, var9);
583583
++var15;
584584
} while(var15 < var27);
585585
}
@@ -621,7 +621,7 @@ public GameModel(String var1) {
621621
}
622622

623623
label37: {
624-
int var21 = this.method_368(var10, var17, var11, var12);
624+
int var21 = this.createFace(var10, var17, var11, var12);
625625
this.field_905[var16] = var19;
626626
if(var29 == 0) {
627627
this.field_867[var21] = 0;
@@ -741,16 +741,16 @@ public void method_365(GameModel[] var1, int var2, boolean var3) {
741741
int[] var11 = var8.field_862[var9];
742742
int var12 = 0;
743743
if(var15) {
744-
var10[var12] = this.method_366(var8.field_898[var11[var12]], var8.field_899[var11[var12]], var8.field_900[var11[var12]]);
744+
var10[var12] = this.vertexAt(var8.field_898[var11[var12]], var8.field_899[var11[var12]], var8.field_900[var11[var12]]);
745745
++var12;
746746
}
747747

748748
while(var12 < var8.field_861[var9]) {
749-
var10[var12] = this.method_366(var8.field_898[var11[var12]], var8.field_899[var11[var12]], var8.field_900[var11[var12]]);
749+
var10[var12] = this.vertexAt(var8.field_898[var11[var12]], var8.field_899[var11[var12]], var8.field_900[var11[var12]]);
750750
++var12;
751751
}
752752

753-
int var13 = this.method_368(var8.field_861[var9], var10, var8.field_863[var9], var8.field_864[var9]);
753+
int var13 = this.createFace(var8.field_861[var9], var10, var8.field_863[var9], var8.field_864[var9]);
754754
this.field_867[var13] = var8.field_867[var9];
755755
this.field_866[var13] = var8.field_866[var9];
756756
this.field_865[var13] = var8.field_865[var9];
@@ -796,7 +796,7 @@ public void method_365(GameModel[] var1, int var2, boolean var3) {
796796
}
797797

798798
// $FF: renamed from: a (int, int, int) int
799-
public int method_366(int var1, int var2, int var3) {
799+
public int vertexAt(int var1, int var2, int var3) {
800800
int var4 = 0;
801801
if(class_9.field_759) {
802802
if(this.field_898[var4] == var1 && this.field_899[var4] == var2 && this.field_900[var4] == var3) {
@@ -837,7 +837,7 @@ public int method_367(int var1, int var2, int var3) {
837837
}
838838

839839
// $FF: renamed from: a (int, int[], int, int) int
840-
public int method_368(int var1, int[] var2, int var3, int var4) {
840+
public int createFace(int var1, int[] var2, int var3, int var4) {
841841
if(this.field_860 >= this.field_904) {
842842
return -1;
843843
} else {
@@ -851,7 +851,7 @@ public int method_368(int var1, int[] var2, int var3, int var4) {
851851
}
852852

853853
// $FF: renamed from: a (int, int, int, int, int, int, int, boolean) a.a.f[]
854-
public GameModel[] method_369(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8) {
854+
public GameModel[] split(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8) {
855855
boolean var22 = class_9.field_759;
856856
this.method_389();
857857
int[] var9 = new int[var6];
@@ -972,22 +972,22 @@ public void method_370(GameModel var1, int[] var2, int var3, int var4) {
972972
int var6 = 0;
973973
int var7;
974974
if(class_9.field_759) {
975-
var7 = var5[var6] = var1.method_366(this.field_898[var2[var6]], this.field_899[var2[var6]], this.field_900[var2[var6]]);
975+
var7 = var5[var6] = var1.vertexAt(this.field_898[var2[var6]], this.field_899[var2[var6]], this.field_900[var2[var6]]);
976976
var1.field_858[var7] = this.field_858[var2[var6]];
977977
var1.field_859[var7] = this.field_859[var2[var6]];
978978
++var6;
979979
}
980980

981981
while(var6 < var3) {
982-
var7 = var5[var6] = var1.method_366(this.field_898[var2[var6]], this.field_899[var2[var6]], this.field_900[var2[var6]]);
982+
var7 = var5[var6] = var1.vertexAt(this.field_898[var2[var6]], this.field_899[var2[var6]], this.field_900[var2[var6]]);
983983
var1.field_858[var7] = this.field_858[var2[var6]];
984984
var1.field_859[var7] = this.field_859[var2[var6]];
985985
++var6;
986986
}
987987

988-
var7 = var1.method_368(var3, var5, this.field_863[var4], this.field_864[var4]);
988+
var7 = var1.createFace(var3, var5, this.field_863[var4], this.field_864[var4]);
989989
if(!var1.field_889 && !this.field_889) {
990-
var1.field_884[var7] = this.field_884[var4];
990+
var1.faceTag[var7] = this.faceTag[var4];
991991
}
992992

993993
var1.field_867[var7] = this.field_867[var4];
@@ -996,7 +996,7 @@ public void method_370(GameModel var1, int[] var2, int var3, int var4) {
996996
}
997997

998998
// $FF: renamed from: a (boolean, int, int, int, int, int) void
999-
public void method_371(boolean var1, int var2, int var3, int var4, int var5, int var6) {
999+
public void setLight(boolean var1, int var2, int var3, int var4, int var5, int var6) {
10001000
boolean var8 = class_9.field_759;
10011001
this.field_934 = 256 - var2 * 4;
10021002
this.field_933 = (64 - var3) * 16 + 128;
@@ -1061,7 +1061,7 @@ public void method_373(int var1, int var2, int var3) {
10611061
}
10621062

10631063
// $FF: renamed from: c (int, int) void
1064-
public void method_374(int var1, int var2) {
1064+
public void setVertexAmbience(int var1, int var2) {
10651065
this.field_859[var1] = (byte)var2;
10661066
}
10671067

‎src/a/a/class_11.java

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package a.a;
22

3-
import a.a.class_9;
4-
53
// $FF: renamed from: a.a.e
64
public class class_11 {
75

@@ -359,16 +357,16 @@ public void method_278() {
359357
// $FF: renamed from: a (int, int, int, int, int) void
360358
protected void method_279(int var1, int var2, int var3, int var4, int var5) {
361359
this.field_761.method_227(var2, var3, var4, var5, 16777215);
362-
this.field_761.method_229(var2, var3, var4, this.field_796);
360+
this.field_761.drawLineHoriz(var2, var3, var4, this.field_796);
363361
this.field_761.method_230(var2, var3, var5, this.field_796);
364-
this.field_761.method_229(var2, var3 + var5 - 1, var4, this.field_799);
362+
this.field_761.drawLineHoriz(var2, var3 + var5 - 1, var4, this.field_799);
365363
this.field_761.method_230(var2 + var4 - 1, var3, var5, this.field_799);
366364
if(this.field_770[var1] == 1) {
367365
int var6 = 0;
368366
if(class_9.field_759 || var6 < var5) {
369367
do {
370-
this.field_761.method_229(var2 + var6, var3 + var6, 1, 0);
371-
this.field_761.method_229(var2 + var4 - 1 - var6, var3 + var6, 1, 0);
368+
this.field_761.drawLineHoriz(var2 + var6, var3 + var6, 1, 0);
369+
this.field_761.drawLineHoriz(var2 + var4 - 1 - var6, var3 + var6, 1, 0);
372370
++var6;
373371
} while(var6 < var5);
374372
}
@@ -468,15 +466,15 @@ public void method_283(int var1, int var2, int var3, int var4) {
468466
}
469467
}
470468

471-
this.field_761.method_229(var1, var2, var3, this.field_796);
472-
this.field_761.method_229(var1 + 1, var2 + 1, var3 - 2, this.field_796);
473-
this.field_761.method_229(var1 + 2, var2 + 2, var3 - 4, this.field_797);
469+
this.field_761.drawLineHoriz(var1, var2, var3, this.field_796);
470+
this.field_761.drawLineHoriz(var1 + 1, var2 + 1, var3 - 2, this.field_796);
471+
this.field_761.drawLineHoriz(var1 + 2, var2 + 2, var3 - 4, this.field_797);
474472
this.field_761.method_230(var1, var2, var4, this.field_796);
475473
this.field_761.method_230(var1 + 1, var2 + 1, var4 - 2, this.field_796);
476474
this.field_761.method_230(var1 + 2, var2 + 2, var4 - 4, this.field_797);
477-
this.field_761.method_229(var1, var2 + var4 - 1, var3, this.field_799);
478-
this.field_761.method_229(var1 + 1, var2 + var4 - 2, var3 - 2, this.field_799);
479-
this.field_761.method_229(var1 + 2, var2 + var4 - 3, var3 - 4, this.field_798);
475+
this.field_761.drawLineHoriz(var1, var2 + var4 - 1, var3, this.field_799);
476+
this.field_761.drawLineHoriz(var1 + 1, var2 + var4 - 2, var3 - 2, this.field_799);
477+
this.field_761.drawLineHoriz(var1 + 2, var2 + var4 - 3, var3 - 4, this.field_798);
480478
this.field_761.method_230(var1 + var3 - 1, var2, var4, this.field_799);
481479
this.field_761.method_230(var1 + var3 - 2, var2 + 1, var4 - 2, this.field_799);
482480
this.field_761.method_230(var1 + var3 - 3, var2 + 2, var4 - 4, this.field_798);
@@ -502,7 +500,7 @@ protected void method_285(int var1, int var2, int var3) {
502500

503501
// $FF: renamed from: c (int, int, int) void
504502
protected void method_286(int var1, int var2, int var3) {
505-
this.field_761.method_229(var1, var2, var3, 0);
503+
this.field_761.drawLineHoriz(var1, var2, var3, 0);
506504
}
507505

508506
// $FF: renamed from: a (int, int, int, int, int, int, java.lang.String[], int, int) void
@@ -594,8 +592,8 @@ protected void method_288(int var1, int var2, int var3, int var4, int var5, int
594592
this.field_761.method_228(var7, var2, 12, var4, 0);
595593
this.field_761.method_242(var7 + 1, var2 + 1, field_802);
596594
this.field_761.method_242(var7 + 1, var2 + var4 - 12, 1 + field_802);
597-
this.field_761.method_229(var7, var2 + 13, 12, 0);
598-
this.field_761.method_229(var7, var2 + var4 - 13, 12, 0);
595+
this.field_761.drawLineHoriz(var7, var2 + 13, 12, 0);
596+
this.field_761.drawLineHoriz(var7, var2 + var4 - 13, 12, 0);
599597
this.field_761.method_226(var7 + 1, var2 + 14, 11, var4 - 27, this.field_788, this.field_789);
600598
this.field_761.method_227(var7 + 3, var5 + var2 + 14, 7, var6, this.field_791);
601599
this.field_761.method_230(var7 + 2, var5 + var2 + 14, var6, this.field_790);

‎src/a/a/class_8.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package a.a;
22

33
import a.Utility;
4-
import a.a.GameModel;
5-
import a.a.class_2;
6-
import a.a.class_3;
7-
import a.a.class_9;
84

95
// $FF: renamed from: a.a.j
106
public class class_8 {
@@ -282,7 +278,7 @@ public class_8(class_9 var1, int var2, int var3, int var4) {
282278
}
283279

284280
// $FF: renamed from: a (a.a.f) void
285-
public void method_170(GameModel var1) {
281+
public void addModel(GameModel var1) {
286282
if(var1 == null) {
287283
System.out.println("Warning tried to add null object!"); // authentic System.out.println
288284
}
@@ -338,7 +334,7 @@ public void method_172() {
338334
// $FF: renamed from: b () void
339335
public void method_173() {
340336
this.field_682 = 0;
341-
this.field_690.method_359();
337+
this.field_690.clear();
342338
}
343339

344340
// $FF: renamed from: a (int) void
@@ -363,8 +359,8 @@ public int drawSprite(int var1, int var2, int var3, int var4, int var5, int var6
363359
int var8 = this.field_690.method_367(var2, var3, var4);
364360
int var9 = this.field_690.method_367(var2, var3 - var6, var4);
365361
int[] var10 = new int[]{var8, var9};
366-
this.field_690.method_368(2, var10, 0, 0);
367-
this.field_690.field_884[this.field_682] = var7;
362+
this.field_690.createFace(2, var10, 0, 0);
363+
this.field_690.faceTag[this.field_682] = var7;
368364
this.field_690.field_885[this.field_682++] = 0;
369365
return this.field_682 - 1;
370366
}

‎src/a/a/class_9.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -482,14 +482,14 @@ public void method_227(int var1, int var2, int var3, int var4, int var5) {
482482

483483
// $FF: renamed from: c (int, int, int, int, int) void
484484
public void method_228(int var1, int var2, int var3, int var4, int var5) {
485-
this.method_229(var1, var2, var3, var5);
486-
this.method_229(var1, var2 + var4 - 1, var3, var5);
485+
this.drawLineHoriz(var1, var2, var3, var5);
486+
this.drawLineHoriz(var1, var2 + var4 - 1, var3, var5);
487487
this.method_230(var1, var2, var4, var5);
488488
this.method_230(var1 + var3 - 1, var2, var4, var5);
489489
}
490490

491491
// $FF: renamed from: b (int, int, int, int) void
492-
public void method_229(int var1, int var2, int var3, int var4) {
492+
public void drawLineHoriz(int var1, int var2, int var3, int var4) {
493493
if(var2 >= this.field_743 && var2 < this.field_744) {
494494
if(var1 < this.field_745) {
495495
var3 -= this.field_745 - var1;
@@ -537,7 +537,7 @@ public void method_230(int var1, int var2, int var3, int var4) {
537537
}
538538

539539
// $FF: renamed from: a (int, int, int) void
540-
public void method_231(int var1, int var2, int var3) {
540+
public void setPixel(int var1, int var2, int var3) {
541541
if(var1 >= this.field_745 && var2 >= this.field_743 && var1 < this.field_746 && var2 < this.field_744) {
542542
this.field_729[var1 + var2 * this.field_723] = var3;
543543
}
@@ -943,7 +943,7 @@ public void method_239(int var1) {
943943
}
944944

945945
// $FF: renamed from: d (int, int, int, int, int) void
946-
public void method_240(int var1, int var2, int var3, int var4, int var5) {
946+
public void drawSpriteMinimap(int var1, int var2, int var3, int var4, int var5) {
947947
boolean var10 = field_759;
948948
this.field_736[var1] = var4;
949949
this.field_737[var1] = var5;

‎src/link.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static final void putjag(String var0, byte[] var1) {
2424

2525
public static final byte[] getjag(String var0) {
2626
int var1 = 0;
27-
if(class_4.field_563 == 0 && var1 >= numfile) {
27+
if(GameData.field_563 == 0 && var1 >= numfile) {
2828
return null;
2929
} else {
3030
do {
@@ -41,7 +41,7 @@ public static final byte[] getjag(String var0) {
4141

4242
public static final Socket opensocket(int var0) {
4343
socketport = var0;
44-
if(class_4.field_563 != 0) {
44+
if(GameData.field_563 != 0) {
4545
try {
4646
Thread.sleep(100L);
4747
} catch (Exception var2) {
@@ -62,7 +62,7 @@ public static final Socket opensocket(int var0) {
6262

6363
public static final void startthread(Runnable var0) {
6464
runme = var0;
65-
if(class_4.field_563 != 0 || runme != null) {
65+
if(GameData.field_563 != 0 || runme != null) {
6666
do {
6767
try {
6868
Thread.sleep(100L);
@@ -76,7 +76,7 @@ public static final void startthread(Runnable var0) {
7676

7777
public static final String gethostname(String var0) {
7878
iplookup = var0;
79-
if(class_4.field_563 != 0) {
79+
if(GameData.field_563 != 0) {
8080
try {
8181
Thread.sleep(100L);
8282
} catch (Exception var2) {

0 commit comments

Comments
 (0)