rs-client: refactoring (#1344)

* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions

View File

@@ -53,8 +53,7 @@ public class SoundEffect {
public final int calculateDelay() {
int var1 = 9999999;
int var2;
for (var2 = 0; var2 < 10; ++var2) {
for (int var2 = 0; var2 < 10; ++var2) {
if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) {
var1 = this.instruments[var2].offset / 20;
}
@@ -64,22 +63,21 @@ public class SoundEffect {
var1 = this.start / 20;
}
if (var1 != 9999999 && var1 != 0) {
for (var2 = 0; var2 < 10; ++var2) {
if (this.instruments[var2] != null) {
Instrument var10000 = this.instruments[var2];
var10000.offset -= var1 * 20;
}
}
if (this.start < this.end) {
this.start -= var1 * 20;
this.end -= var1 * 20;
}
return var1;
if (var1 == 9999999 || var1 == 0) {
return 0;
}
return 0;
for (int var2 = 0; var2 < 10; ++var2) {
if (this.instruments[var2] != null) {
this.instruments[var2].offset -= var1 * 20;
}
}
if (this.start < this.end) {
this.start -= var1 * 20;
this.end -= var1 * 20;
}
return var1;
}
@ObfuscatedName("p")
@@ -87,8 +85,7 @@ public class SoundEffect {
final byte[] mix() {
int var1 = 0;
int var2;
for (var2 = 0; var2 < 10; ++var2) {
for (int var2 = 0; var2 < 10; ++var2) {
if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) {
var1 = this.instruments[var2].duration + this.instruments[var2].offset;
}
@@ -97,23 +94,24 @@ public class SoundEffect {
if (var1 == 0) {
return new byte[0];
}
var2 = var1 * 22050 / 1000;
int var2 = var1 * 22050 / 1000;
byte[] var3 = new byte[var2];
for (int var4 = 0; var4 < 10; ++var4) {
if (this.instruments[var4] != null) {
int var5 = this.instruments[var4].duration * 22050 / 1000;
int var6 = this.instruments[var4].offset * 22050 / 1000;
int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration);
if (this.instruments[var4] == null) {
continue;
}
int var5 = this.instruments[var4].duration * 22050 / 1000;
int var6 = this.instruments[var4].offset * 22050 / 1000;
int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration);
for (int var8 = 0; var8 < var5; ++var8) {
int var9 = (var7[var8] >> 8) + var3[var8 + var6];
if ((var9 + 128 & -256) != 0) {
var9 = var9 >> 31 ^ 127;
}
var3[var8 + var6] = (byte)var9;
for (int var8 = 0; var8 < var5; ++var8) {
int var9 = (var7[var8] >> 8) + var3[var8 + var6];
if ((var9 + 128 & -256) != 0) {
var9 = var9 >> 31 ^ 127;
}
var3[var8 + var6] = (byte)var9;
}
}