Skip to content

Commit

Permalink
refactor: Few more renames in client class
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pazaz
Pazaz committed Jul 17, 2024
1 parent d778e1c commit 5876084
Showing 1 changed file with 43 additions and 43 deletions.
86 changes: 43 additions & 43 deletions client/src/main/java/client.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ public class client extends GameShell {
private Pix8 imageTitlebutton;

@OriginalMember(owner = "client!client", name = "Yh", descriptor = "[I")
private final int[] LOC_KIND_TO_CLASS_ID = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 };
private final int[] LOC_SHAPE_TO_LAYER = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 };

@OriginalMember(owner = "client!client", name = "Zh", descriptor = "I")
public static int cyclelogic5;
Expand Down Expand Up @@ -1910,7 +1910,7 @@ private void readZonePacket(@OriginalArg(1) Packet buf, @OriginalArg(2) int opco
int info = buf.g1();
int shape = info >> 2;
int angle = info & 0x3;
int layer = this.LOC_KIND_TO_CLASS_ID[shape];
int layer = this.LOC_SHAPE_TO_LAYER[shape];
int id;
if (opcode == 76) {
id = -1;
Expand Down Expand Up @@ -1967,7 +1967,7 @@ private void readZonePacket(@OriginalArg(1) Packet buf, @OriginalArg(2) int opco
// LOC_ANIM
int info = buf.g1();
int shape = info >> 2;
int layer = this.LOC_KIND_TO_CLASS_ID[shape];
int layer = this.LOC_SHAPE_TO_LAYER[shape];
int id = buf.g2();
if (x >= 0 && z >= 0 && x < 104 && z < 104) {
int bitset = 0;
Expand Down Expand Up @@ -2072,7 +2072,7 @@ private void readZonePacket(@OriginalArg(1) Packet buf, @OriginalArg(2) int opco
int info = buf.g1();
int shape = info >> 2;
int angle = info & 0x3;
int layer = this.LOC_KIND_TO_CLASS_ID[shape];
int layer = this.LOC_SHAPE_TO_LAYER[shape];
int id = buf.g2();
int start = buf.g2();
int end = buf.g2();
Expand Down Expand Up @@ -4072,29 +4072,29 @@ private void getPlayerOldVis(@OriginalArg(1) Packet buf, @OriginalArg(0) int siz
@Pc(73) int index = this.playerIds[i];
@Pc(78) PlayerEntity player = this.players[index];

@Pc(83) int hasUpdate = buf.gBit(1);
if (hasUpdate == 0) {
@Pc(83) int info = buf.gBit(1);
if (info == 0) {
this.playerIds[this.playerCount++] = index;
player.cycle = loopCycle;
} else {
@Pc(106) int updateType = buf.gBit(2);
@Pc(106) int op = buf.gBit(2);

if (updateType == 0) {
if (op == 0) {
this.playerIds[this.playerCount++] = index;
player.cycle = loopCycle;
this.entityUpdateIds[this.entityUpdateCount++] = index;
} else if (updateType == 1) {
} else if (op == 1) {
this.playerIds[this.playerCount++] = index;
player.cycle = loopCycle;

int walkDir = buf.gBit(3);
player.step(false, walkDir);

int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = index;
}
} else if (updateType == 2) {
} else if (op == 2) {
this.playerIds[this.playerCount++] = index;
player.cycle = loopCycle;

Expand All @@ -4103,11 +4103,11 @@ private void getPlayerOldVis(@OriginalArg(1) Packet buf, @OriginalArg(0) int siz
int runDir = buf.gBit(3);
player.step(true, runDir);

@Pc(225) int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
@Pc(225) int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = index;
}
} else if (updateType == 3) {
} else if (op == 3) {
this.entityRemovalIds[this.entityRemovalCount++] = index;
}
}
Expand Down Expand Up @@ -4339,8 +4339,8 @@ private void getPlayerNewVis(@OriginalArg(1) int size, @OriginalArg(2) Packet bu
@Pc(99) int jump = buf.gBit(1);
player.move(jump == 1, this.localPlayer.pathTileX[0] + dx, this.localPlayer.pathTileZ[0] + dz);

@Pc(127) int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
@Pc(127) int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = index;
}
}
Expand Down Expand Up @@ -6343,8 +6343,8 @@ private void getNpcPosNewVis(@OriginalArg(1) Packet buf, @OriginalArg(2) int siz
dz -= 32;
}
npc.move(false, this.localPlayer.pathTileX[0] + dx, this.localPlayer.pathTileZ[0] + dz);
@Pc(128) int update = buf.gBit(1);
if (update == 1) {
@Pc(128) int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = index;
}
}
Expand Down Expand Up @@ -9311,29 +9311,29 @@ private void getNpcPosOldVis(@OriginalArg(1) Packet buf, @OriginalArg(2) int siz
@Pc(72) int index = this.npcIds[i];
@Pc(77) NpcEntity npc = this.npcs[index];

@Pc(82) int hasUpdate = buf.gBit(1);
if (hasUpdate == 0) {
@Pc(82) int info = buf.gBit(1);
if (info == 0) {
this.npcIds[this.npcCount++] = index;
npc.cycle = loopCycle;
} else {
@Pc(105) int updateType = buf.gBit(2);
@Pc(105) int op = buf.gBit(2);

if (updateType == 0) {
if (op == 0) {
this.npcIds[this.npcCount++] = index;
npc.cycle = loopCycle;
this.entityUpdateIds[this.entityUpdateCount++] = index;
} else if (updateType == 1) {
} else if (op == 1) {
this.npcIds[this.npcCount++] = index;
npc.cycle = loopCycle;

int walkDir = buf.gBit(3);
npc.step(false, walkDir);

int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = index;
}
} else if (updateType == 2) {
} else if (op == 2) {
this.npcIds[this.npcCount++] = index;
npc.cycle = loopCycle;

Expand All @@ -9342,11 +9342,11 @@ private void getNpcPosOldVis(@OriginalArg(1) Packet buf, @OriginalArg(2) int siz
int runDir = buf.gBit(3);
npc.step(true, runDir);

@Pc(224) int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
@Pc(224) int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = index;
}
} else if (updateType == 3) {
} else if (op == 3) {
this.entityRemovalIds[this.entityRemovalCount++] = index;
}
}
Expand Down Expand Up @@ -10244,31 +10244,31 @@ private void drawTileHint() {
private void getPlayerLocal(@OriginalArg(2) Packet buf, @OriginalArg(1) int size) {
buf.accessBits();

@Pc(7) int hasUpdate = buf.gBit(1);
if (hasUpdate != 0) {
@Pc(21) int updateType = buf.gBit(2);
@Pc(7) int info = buf.gBit(1);
if (info != 0) {
@Pc(21) int op = buf.gBit(2);

if (updateType == 0) {
if (op == 0) {
this.entityUpdateIds[this.entityUpdateCount++] = this.LOCAL_PLAYER_INDEX;
} else if (updateType == 1) {
} else if (op == 1) {
int walkDir = buf.gBit(3);
this.localPlayer.step(false, walkDir);

int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = this.LOCAL_PLAYER_INDEX;
}
} else if (updateType == 2) {
} else if (op == 2) {
int walkDir = buf.gBit(3);
this.localPlayer.step(true, walkDir);
int runDir = buf.gBit(3);
this.localPlayer.step(true, runDir);

int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = this.LOCAL_PLAYER_INDEX;
}
} else if (updateType == 3) {
} else if (op == 3) {
this.currentLevel = buf.gBit(2);
if (this.showDebug) {
this.userTileMarkers = new Ground[4];
Expand All @@ -10279,8 +10279,8 @@ private void getPlayerLocal(@OriginalArg(2) Packet buf, @OriginalArg(1) int size
int jump = buf.gBit(1);
this.localPlayer.move(jump == 1, localX, localZ);

@Pc(158) int hasMaskUpdate = buf.gBit(1);
if (hasMaskUpdate == 1) {
@Pc(158) int extendedInfo = buf.gBit(1);
if (extendedInfo == 1) {
this.entityUpdateIds[this.entityUpdateCount++] = this.LOCAL_PLAYER_INDEX;
}
}
Expand Down

0 comments on commit 5876084

Please sign in to comment.