Skip to content

Instantly share code, notes, and snippets.

@Pokechu22

Pokechu22/in-20100207-{1,2}.diff Secret

Created May 22, 2018 21:18
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Pokechu22/2384e359abd0fb976477aec578ed5370 to your computer and use it in GitHub Desktop.
Save Pokechu22/2384e359abd0fb976477aec578ed5370 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
in-20100207-{1,2}.diff
diff --git a/in-20100207-1/net/minecraft/a/a/b/a.java b/in-20100207-2/net/minecraft/a/a/b/a.java
index d6b5cfa..d411383 100755
--- a/in-20100207-1/net/minecraft/a/a/b/a.java
+++ b/in-20100207-2/net/minecraft/a/a/b/a.java
@@ -124,22 +124,22 @@ extends n {
if (n5 > 1) {
return false;
}
- if (this.f(f2, n2 - 1, n3, n4)) {
+ if (this.e(f2, n2 - 1, n3, n4)) {
return false;
}
- if (this.f(f2, n2 + 1, n3, n4)) {
+ if (this.e(f2, n2 + 1, n3, n4)) {
return false;
}
- if (this.f(f2, n2, n3, n4 - 1)) {
+ if (this.e(f2, n2, n3, n4 - 1)) {
return false;
}
- if (this.f(f2, n2, n3, n4 + 1)) {
+ if (this.e(f2, n2, n3, n4 + 1)) {
return false;
}
return true;
}
- private boolean f(f f2, int n2, int n3, int n4) {
+ private boolean e(f f2, int n2, int n3, int n4) {
if (f2.c(n2, n3, n4) != this.ar) {
return false;
}
diff --git a/in-20100207-1/net/minecraft/a/a/b/ab.java b/in-20100207-2/net/minecraft/a/a/b/ab.java
index 6075f3b..b105c2e 100755
--- a/in-20100207-1/net/minecraft/a/a/b/ab.java
+++ b/in-20100207-2/net/minecraft/a/a/b/ab.java
@@ -14,7 +14,7 @@ extends s {
this.aq = 48;
}
- public final void a_(f f2, int n2, int n3, int n4) {
+ public final void d(f f2, int n2, int n3, int n4) {
for (int i2 = n2 - 2; i2 <= n2 + 2; ++i2) {
for (int i3 = n3 - 2; i3 <= n3 + 2; ++i3) {
for (int i4 = n4 - 2; i4 <= n4 + 2; ++i4) {
diff --git a/in-20100207-1/net/minecraft/a/a/b/ac.java b/in-20100207-2/net/minecraft/a/a/b/ac.java
index e89c036..2f7e18a 100755
--- a/in-20100207-1/net/minecraft/a/a/b/ac.java
+++ b/in-20100207-2/net/minecraft/a/a/b/ac.java
@@ -57,7 +57,7 @@ extends s {
f2.b(n2, n3, n4, 0);
return;
}
- if (random.nextInt(4) == 0 && !this.f(f2, n2, n3 - 1, n4)) {
+ if (random.nextInt(4) == 0 && !this.e(f2, n2, n3 - 1, n4)) {
f2.b(n2, n3, n4, 0);
return;
}
@@ -115,22 +115,22 @@ extends s {
}
private boolean i(f f2, int n2, int n3, int n4) {
- if (this.f(f2, n2 + 1, n3, n4)) {
+ if (this.e(f2, n2 + 1, n3, n4)) {
return true;
}
- if (this.f(f2, n2 - 1, n3, n4)) {
+ if (this.e(f2, n2 - 1, n3, n4)) {
return true;
}
- if (this.f(f2, n2, n3 - 1, n4)) {
+ if (this.e(f2, n2, n3 - 1, n4)) {
return true;
}
- if (this.f(f2, n2, n3 + 1, n4)) {
+ if (this.e(f2, n2, n3 + 1, n4)) {
return true;
}
- if (this.f(f2, n2, n3, n4 - 1)) {
+ if (this.e(f2, n2, n3, n4 - 1)) {
return true;
}
- if (this.f(f2, n2, n3, n4 + 1)) {
+ if (this.e(f2, n2, n3, n4 + 1)) {
return true;
}
return false;
@@ -140,7 +140,7 @@ extends s {
return false;
}
- public final boolean f(f f2, int n2, int n3, int n4) {
+ public final boolean e(f f2, int n2, int n3, int n4) {
if (this.a[f2.c(n2, n3, n4)] > 0) {
return true;
}
@@ -155,6 +155,13 @@ extends s {
return n5;
}
+ public final boolean a(f f2, int n2, int n3, int n4) {
+ if (f2.d(n2, n3 - 1, n4) || this.i(f2, n2, n3, n4)) {
+ return true;
+ }
+ return false;
+ }
+
public final void b(f f2, int n2, int n3, int n4, int n5) {
if (!f2.d(n2, n3 - 1, n4) && !this.i(f2, n2, n3, n4)) {
f2.b(n2, n3, n4, 0);
@@ -162,6 +169,13 @@ extends s {
}
}
+ public final void d(f f2, int n2, int n3, int n4) {
+ if (!f2.d(n2, n3 - 1, n4) && !this.i(f2, n2, n3, n4)) {
+ f2.b(n2, n3, n4, 0);
+ return;
+ }
+ }
+
public final boolean c(int n2) {
if (this.a[n2] > 0) {
return true;
@@ -197,10 +211,10 @@ extends s {
float f4;
int n5;
float f5;
- if (random.nextInt(10) == 0) {
+ if (random.nextInt(24) == 0) {
f2.a((float)n2 + 0.5f, (float)n3 + 0.5f, (float)n4 + 0.5f, "fire.fire", 1.0f + random.nextFloat(), random.nextFloat() * 0.7f + 0.3f);
}
- if (f2.d(n2, n3 - 1, n4) || s.ag.f(f2, n2, n3 - 1, n4)) {
+ if (f2.d(n2, n3 - 1, n4) || s.ag.e(f2, n2, n3 - 1, n4)) {
for (int i2 = 0; i2 < 3; ++i2) {
float f6 = (float)n2 + random.nextFloat();
float f7 = (float)n3 + random.nextFloat();
@@ -209,7 +223,7 @@ extends s {
}
return;
}
- if (s.ag.f(f2, n2 - 1, n3, n4)) {
+ if (s.ag.e(f2, n2 - 1, n3, n4)) {
for (n5 = 0; n5 < 2; ++n5) {
f3 = (float)n2 + random.nextFloat() * 0.1f;
f4 = (float)n3 + random.nextFloat();
@@ -217,7 +231,7 @@ extends s {
f2.a("smoke", f3, f4, f5, 0.0f, 0.0f, 0.0f);
}
}
- if (s.ag.f(f2, n2 + 1, n3, n4)) {
+ if (s.ag.e(f2, n2 + 1, n3, n4)) {
for (n5 = 0; n5 < 2; ++n5) {
f3 = (float)(n2 + 1) - random.nextFloat() * 0.1f;
f4 = (float)n3 + random.nextFloat();
@@ -225,7 +239,7 @@ extends s {
f2.a("smoke", f3, f4, f5, 0.0f, 0.0f, 0.0f);
}
}
- if (s.ag.f(f2, n2, n3, n4 - 1)) {
+ if (s.ag.e(f2, n2, n3, n4 - 1)) {
for (n5 = 0; n5 < 2; ++n5) {
f3 = (float)n2 + random.nextFloat();
f4 = (float)n3 + random.nextFloat();
@@ -233,7 +247,7 @@ extends s {
f2.a("smoke", f3, f4, f5, 0.0f, 0.0f, 0.0f);
}
}
- if (s.ag.f(f2, n2, n3, n4 + 1)) {
+ if (s.ag.e(f2, n2, n3, n4 + 1)) {
for (n5 = 0; n5 < 2; ++n5) {
f3 = (float)n2 + random.nextFloat();
f4 = (float)n3 + random.nextFloat();
@@ -241,7 +255,7 @@ extends s {
f2.a("smoke", f3, f4, f5, 0.0f, 0.0f, 0.0f);
}
}
- if (s.ag.f(f2, n2, n3 + 1, n4)) {
+ if (s.ag.e(f2, n2, n3 + 1, n4)) {
for (n5 = 0; n5 < 2; ++n5) {
f3 = (float)n2 + random.nextFloat();
f4 = (float)(n3 + 1) - random.nextFloat() * 0.1f;
diff --git a/in-20100207-1/net/minecraft/a/a/b/ad.java b/in-20100207-2/net/minecraft/a/a/b/ad.java
index 4f3e4b7..534f909 100755
--- a/in-20100207-1/net/minecraft/a/a/b/ad.java
+++ b/in-20100207-2/net/minecraft/a/a/b/ad.java
@@ -18,8 +18,8 @@ extends s {
this.a(true);
}
- public final void a_(f f2, int n2, int n3, int n4) {
- super.a_(f2, n2, n3, n4);
+ public final void d(f f2, int n2, int n3, int n4) {
+ super.d(f2, n2, n3, n4);
if (f2.c(n2 - 1, n3, n4) == 0) {
f2.b(n2 - 1, n3, n4, this.a);
}
diff --git a/in-20100207-1/net/minecraft/a/a/b/ae.java b/in-20100207-2/net/minecraft/a/a/b/ae.java
index edebac2..1ae0187 100755
--- a/in-20100207-1/net/minecraft/a/a/b/ae.java
+++ b/in-20100207-2/net/minecraft/a/a/b/ae.java
@@ -17,6 +17,7 @@ extends s {
if (!bl) {
this.a(0.0f, 0.0f, 0.0f, 1.0f, 0.5f, 1.0f);
}
+ this.d(255);
}
public final int a(int n2) {
@@ -36,10 +37,10 @@ extends s {
}
}
- public final void a_(f f2, int n2, int n3, int n4) {
+ public final void d(f f2, int n2, int n3, int n4) {
int n5;
if (this != s.Z) {
- super.a_(f2, n2, n3, n4);
+ super.d(f2, n2, n3, n4);
}
if ((n5 = f2.c(n2, n3 - 1, n4)) == ae.Z.ar) {
f2.b(n2, n3, n4, 0);
diff --git a/in-20100207-1/net/minecraft/a/a/b/b.java b/in-20100207-2/net/minecraft/a/a/b/b.java
index d934bc0..efec3bc 100755
--- a/in-20100207-1/net/minecraft/a/a/b/b.java
+++ b/in-20100207-2/net/minecraft/a/a/b/b.java
@@ -24,19 +24,19 @@ extends m {
public final void b(f f2, int n2, int n3, int n4, int n5) {
boolean bl = false;
- if (this.d(f2, n2, n3 - 1, n4)) {
+ if (this.e(f2, n2, n3 - 1, n4)) {
bl = true;
}
- if (!bl && this.d(f2, n2 - 1, n3, n4)) {
+ if (!bl && this.e(f2, n2 - 1, n3, n4)) {
bl = true;
}
- if (!bl && this.d(f2, n2 + 1, n3, n4)) {
+ if (!bl && this.e(f2, n2 + 1, n3, n4)) {
bl = true;
}
- if (!bl && this.d(f2, n2, n3, n4 - 1)) {
+ if (!bl && this.e(f2, n2, n3, n4 - 1)) {
bl = true;
}
- if (!bl && this.d(f2, n2, n3, n4 + 1)) {
+ if (!bl && this.e(f2, n2, n3, n4 + 1)) {
bl = true;
}
if (n5 != 0) {
diff --git a/in-20100207-1/net/minecraft/a/a/b/j.java b/in-20100207-2/net/minecraft/a/a/b/j.java
index 7024ba1..dae298a 100755
--- a/in-20100207-1/net/minecraft/a/a/b/j.java
+++ b/in-20100207-2/net/minecraft/a/a/b/j.java
@@ -31,6 +31,10 @@ extends m {
this.a(true);
}
+ public final void d(f f2, int n2, int n3, int n4) {
+ f2.e(n2, n3, n4, this.aC);
+ }
+
public final void a(f f2, int n2, int n3, int n4, Random random) {
this.e(f2, n2, n3, n4, 0);
}
@@ -40,9 +44,9 @@ extends m {
int n7;
int n8;
n5 = 0;
- boolean bl = this.d(f2, n2 - 1, n3, n4) || this.d(f2, n2 + 1, n3, n4) || this.d(f2, n2, n3, n4 - 1) || this.d(f2, n2, n3, n4 + 1);
+ boolean bl = this.e(f2, n2 - 1, n3, n4) || this.e(f2, n2 + 1, n3, n4) || this.e(f2, n2, n3, n4 - 1) || this.e(f2, n2, n3, n4 + 1);
if (bl && f2.g(n2, n3 - 1, n4) == this.aA) {
- n5 = f2.b(n2, n3, n4, this.aC, this.aB);
+ n5 = f2.b(n2, n3 - 1, n4, this.aC, this.aB);
if (n5 <= 0) {
return false;
}
@@ -109,17 +113,17 @@ extends m {
return false;
}
if (this.aA == c.f) {
- n5 |= j.f(f2, n2 - 1, n3, n4);
- n5 |= j.f(f2, n2 + 1, n3, n4);
- n5 |= j.f(f2, n2, n3, n4 - 1);
- n5 |= j.f(f2, n2, n3, n4 + 1);
- }
- if (this.aA == c.g) {
n5 |= j.h(f2, n2 - 1, n3, n4);
n5 |= j.h(f2, n2 + 1, n3, n4);
n5 |= j.h(f2, n2, n3, n4 - 1);
n5 |= j.h(f2, n2, n3, n4 + 1);
}
+ if (this.aA == c.g) {
+ n5 |= j.i(f2, n2 - 1, n3, n4);
+ n5 |= j.i(f2, n2 + 1, n3, n4);
+ n5 |= j.i(f2, n2, n3, n4 - 1);
+ n5 |= j.i(f2, n2, n3, n4 + 1);
+ }
if (n5 == 0) {
f2.d(n2, n3, n4, this.aB);
} else {
@@ -129,7 +133,7 @@ extends m {
}
private boolean a(f f2, int n2, int n3, int n4, int n5, int n6, int n7) {
- if (this.d(f2, n5, n6, n7)) {
+ if (this.e(f2, n5, n6, n7)) {
f2.b(n5, n6, n7, this.ar);
f2.e(n5, n6, n7, this.ar);
return true;
@@ -138,7 +142,7 @@ extends m {
}
private boolean b(f f2, int n2, int n3, int n4, int n5, int n6, int n7) {
- if (this.d(f2, n5, n6, n7)) {
+ if (this.e(f2, n5, n6, n7)) {
if ((n2 = f2.a(n2, n3, n4, this.aC, this.aB)) != -9999) {
if (n2 < 0) {
return false;
@@ -146,7 +150,7 @@ extends m {
n3 = n2 % 1024;
n4 = (n2 >>= 10) % 1024;
n2 >>= 10;
- if (!((n2 %= 1024) <= n6 && this.d(f2, n5, n6 - 1, n7) || n2 > n6 || n3 == 0 || n3 == f2.a - 1 || n4 == 0 || n4 == f2.b - 1)) {
+ if (!((n2 %= 1024) <= n6 && this.e(f2, n5, n6 - 1, n7) || n2 > n6 || n3 == 0 || n3 == f2.a - 1 || n4 == 0 || n4 == f2.b - 1)) {
return false;
}
f2.b(n3, n2, n4, 0);
@@ -205,7 +209,7 @@ extends m {
return 0;
}
- private static boolean f(f f2, int n2, int n3, int n4) {
+ private static boolean h(f f2, int n2, int n3, int n4) {
if (f2.c(n2, n3, n4) == s.ag.ar) {
f2.b(n2, n3, n4, 0);
return true;
@@ -217,7 +221,7 @@ extends m {
return false;
}
- private static boolean h(f f2, int n2, int n3, int n4) {
+ private static boolean i(f f2, int n2, int n3, int n4) {
if (s.ag.c(f2.c(n2, n3, n4))) {
s.ag.h(f2, n2, n3, n4);
return true;
diff --git a/in-20100207-1/net/minecraft/a/a/b/m.java b/in-20100207-2/net/minecraft/a/a/b/m.java
index 9e0d279..cdbe930 100755
--- a/in-20100207-1/net/minecraft/a/a/b/m.java
+++ b/in-20100207-2/net/minecraft/a/a/b/m.java
@@ -46,13 +46,17 @@ extends s {
return false;
}
+ public void d(f f2, int n2, int n3, int n4) {
+ f2.e(n2, n3, n4, this.b);
+ }
+
public void a(f f2, int n2, int n3, int n4, Random random) {
this.e(f2, n2, n3, n4, 0);
}
public boolean e(f f2, int n2, int n3, int n4, int n5) {
n5 = 0;
- while (this.d(f2, n2, --n3, n4)) {
+ while (this.e(f2, n2, --n3, n4)) {
boolean bl = f2.b(n2, n3, n4, this.b);
if (bl) {
n5 = 1;
@@ -61,16 +65,16 @@ extends s {
}
++n3;
if (this.aA == c.f || n5 == 0) {
- n5 |= this.h(f2, n2 - 1, n3, n4);
- n5 |= this.h(f2, n2 + 1, n3, n4);
- n5 |= this.h(f2, n2, n3, n4 - 1);
- n5 |= this.h(f2, n2, n3, n4 + 1);
+ n5 |= this.i(f2, n2 - 1, n3, n4);
+ n5 |= this.i(f2, n2 + 1, n3, n4);
+ n5 |= this.i(f2, n2, n3, n4 - 1);
+ n5 |= this.i(f2, n2, n3, n4 + 1);
}
if (this.aA == c.g) {
- n5 |= m.f(f2, n2 - 1, n3, n4);
- n5 |= m.f(f2, n2 + 1, n3, n4);
- n5 |= m.f(f2, n2, n3, n4 - 1);
- n5 |= m.f(f2, n2, n3, n4 + 1);
+ n5 |= m.h(f2, n2 - 1, n3, n4);
+ n5 |= m.h(f2, n2 + 1, n3, n4);
+ n5 |= m.h(f2, n2, n3, n4 - 1);
+ n5 |= m.h(f2, n2, n3, n4 + 1);
}
if (n5 == 0) {
f2.d(n2, n3, n4, this.a);
@@ -80,7 +84,7 @@ extends s {
return (boolean)n5;
}
- protected final boolean d(f f2, int n2, int n3, int n4) {
+ protected final boolean e(f f2, int n2, int n3, int n4) {
if (!f2.g(n2, n3, n4).e()) {
return false;
}
@@ -97,7 +101,7 @@ extends s {
return true;
}
- private static boolean f(f f2, int n2, int n3, int n4) {
+ private static boolean h(f f2, int n2, int n3, int n4) {
if (s.ag.c(f2.c(n2, n3, n4))) {
s.ag.h(f2, n2, n3, n4);
return true;
@@ -105,8 +109,8 @@ extends s {
return false;
}
- private boolean h(f f2, int n2, int n3, int n4) {
- if (!this.d(f2, n2, n3, n4)) {
+ private boolean i(f f2, int n2, int n3, int n4) {
+ if (!this.e(f2, n2, n3, n4)) {
return false;
}
boolean bl = f2.b(n2, n3, n4, this.b);
@@ -116,7 +120,7 @@ extends s {
return false;
}
- public final float e(f f2, int n2, int n3, int n4) {
+ public final float f(f f2, int n2, int n3, int n4) {
if (this.aA == c.g) {
return 100.0f;
}
@@ -178,12 +182,54 @@ extends s {
}
public final void b(f f2, int n2, int n3, int n4, Random random) {
+ if (random.nextInt(128) == -1 && f2.g(n2, n3 + 1, n4).c()) {
+ if (this.aA == c.g) {
+ f2.a((float)n2 + 0.5f, (float)n3 + 0.5f, (float)n4 + 0.5f, "liquid.lava", random.nextFloat() * 0.25f + 0.75f, random.nextFloat() * 0.5f + 0.3f);
+ }
+ if (this.aA == c.f) {
+ f2.a((float)n2 + 0.5f, (float)n3 + 0.5f, (float)n4 + 0.5f, "liquid.water", random.nextFloat() * 0.25f + 0.75f, random.nextFloat() + 0.5f);
+ }
+ }
if (this.aA == c.g && f2.g(n2, n3 + 1, n4) == c.a && !f2.d(n2, n3 + 1, n4) && random.nextInt(100) == 0) {
float f3 = (float)n2 + random.nextFloat();
float f4 = (float)n3 + this.aw;
float f5 = (float)n4 + random.nextFloat();
f2.a("lava", f3, f4, f5, 0.0f, 0.0f, 0.0f);
}
+ if (this.aA == c.f) {
+ if (m.j(f2, n2 + 1, n3, n4)) {
+ for (int i2 = 0; i2 < 4; ++i2) {
+ f2.a("splash", (float)(n2 + 1) + 0.125f, n3, (float)n4 + random.nextFloat(), 0.0f, 0.0f, 0.0f);
+ }
+ }
+ if (m.j(f2, n2 - 1, n3, n4)) {
+ for (int i3 = 0; i3 < 4; ++i3) {
+ f2.a("splash", (float)n2 - 0.125f, n3, (float)n4 + random.nextFloat(), 0.0f, 0.0f, 0.0f);
+ }
+ }
+ if (m.j(f2, n2, n3, n4 + 1)) {
+ for (int i4 = 0; i4 < 4; ++i4) {
+ f2.a("splash", (float)n2 + random.nextFloat(), n3, (float)(n4 + 1) + 0.125f, 0.0f, 0.0f, 0.0f);
+ }
+ }
+ if (m.j(f2, n2, n3, n4 - 1)) {
+ for (int i5 = 0; i5 < 4; ++i5) {
+ f2.a("splash", (float)n2 + random.nextFloat(), n3, (float)n4 - 0.125f, 0.0f, 0.0f, 0.0f);
+ }
+ }
+ }
+ }
+
+ private static boolean j(f object, int n2, int n3, int n4) {
+ c c2 = object.g(n2, n3, n4);
+ object = object.g(n2, n3 - 1, n4);
+ if (c2.c() || c2.d()) {
+ return false;
+ }
+ if (object.c() || object.d()) {
+ return true;
+ }
+ return false;
}
}
diff --git a/in-20100207-1/net/minecraft/a/a/b/n.java b/in-20100207-2/net/minecraft/a/a/b/n.java
index 41d8104..cfd48f9 100755
--- a/in-20100207-1/net/minecraft/a/a/b/n.java
+++ b/in-20100207-2/net/minecraft/a/a/b/n.java
@@ -14,8 +14,8 @@ extends s {
super(n2, c2);
}
- public final void a_(f f2, int n2, int n3, int n4) {
- super.a_(f2, n2, n3, n4);
+ public final void d(f f2, int n2, int n3, int n4) {
+ super.d(f2, n2, n3, n4);
f2.a(n2, n3, n4, this.a_());
}
diff --git a/in-20100207-1/net/minecraft/a/a/b/q.java b/in-20100207-2/net/minecraft/a/a/b/q.java
index 8690608..0ef3861 100755
--- a/in-20100207-1/net/minecraft/a/a/b/q.java
+++ b/in-20100207-2/net/minecraft/a/a/b/q.java
@@ -18,7 +18,7 @@ extends y {
return s.e[n2];
}
- protected final void f(f f2, int n2, int n3, int n4) {
+ protected final void e(f f2, int n2, int n3, int n4) {
block2 : {
int n5 = f2.c(n2, n3 - 1, n4);
if (f2.b(n2, n3, n4)) {
diff --git a/in-20100207-1/net/minecraft/a/a/b/r.java b/in-20100207-2/net/minecraft/a/a/b/r.java
index 74555ad..5868622 100755
--- a/in-20100207-1/net/minecraft/a/a/b/r.java
+++ b/in-20100207-2/net/minecraft/a/a/b/r.java
@@ -20,33 +20,36 @@ extends s {
super(n2, n3, c.m);
}
- public final void b(f object, int n2, int n3, int n4, int n5) {
+ public final void d(f f2, int n2, int n3, int n4) {
+ this.e(f2, n2, n3, n4);
+ }
+
+ public final void b(f f2, int n2, int n3, int n4, int n5) {
+ this.e(f2, n2, n3, n4);
+ }
+
+ private void e(f f2, int n2, int n3, int n4) {
+ int n5;
+ f f3;
int n6;
c c2;
int n7;
- f f2;
int n8;
- int n9;
- n5 = n4;
- n4 = n3;
- n3 = n2;
- f f3 = object;
- object = this;
- int n10 = n4;
- while (((n8 = (f2 = f3).c(n9 = n3, n7 = n10 - 1, n6 = n5)) == 0 ? true : (n8 == s.ag.ar ? true : ((c2 = s.c[n8].aA) == c.f ? true : c2 == c.g))) && n10 >= 0) {
- if (f3.c(n3, --n10, n5) != s.ag.ar) continue;
- f3.a(n3, n10, n5, 0);
+ int n9 = n3;
+ while (((n6 = (f3 = f2).c(n7 = n2, n8 = n9 - 1, n5 = n4)) == 0 ? true : (n6 == s.ag.ar ? true : ((c2 = s.c[n6].aA) == c.f ? true : c2 == c.g))) && n9 >= 0) {
+ if (f2.c(n2, --n9, n4) != s.ag.ar) continue;
+ f2.a(n2, n9, n4, 0);
}
- if (n10 < 0) {
- f3.d(n3, n4, n5, 0);
+ if (n9 < 0) {
+ f2.d(n2, n3, n4, 0);
}
- if (n10 != n4) {
- int n11 = f3.c(n3, n10, n5);
- f2 = (f)n11;
- if (n11 > 0 && s.c[f2].aA != c.a) {
- f3.d(n3, n10, n5, 0);
+ if (n9 != n3) {
+ int n10 = f2.c(n2, n9, n4);
+ f3 = (f)n10;
+ if (n10 > 0 && s.c[f3].aA != c.a) {
+ f2.d(n2, n9, n4, 0);
}
- f3.b(n3, n4, n5, n3, n10, n5);
+ f2.b(n2, n3, n4, n2, n9, n4);
}
}
diff --git a/in-20100207-1/net/minecraft/a/a/b/s.java b/in-20100207-2/net/minecraft/a/a/b/s.java
index 78ce780..0d15f7b 100755
--- a/in-20100207-1/net/minecraft/a/a/b/s.java
+++ b/in-20100207-2/net/minecraft/a/a/b/s.java
@@ -184,7 +184,7 @@ public class s {
this.ax = f7;
}
- public float e(f f2, int n2, int n3, int n4) {
+ public float f(f f2, int n2, int n3, int n4) {
return f2.e(n2, n3, n4);
}
@@ -239,7 +239,7 @@ public class s {
return 5;
}
- public void a_(f f2, int n2, int n3, int n4) {
+ public void d(f f2, int n2, int n3, int n4) {
}
public void b(f f2, int n2, int n3, int n4) {
diff --git a/in-20100207-1/net/minecraft/a/a/b/y.java b/in-20100207-2/net/minecraft/a/a/b/y.java
index 8901735..dae0d41 100755
--- a/in-20100207-1/net/minecraft/a/a/b/y.java
+++ b/in-20100207-2/net/minecraft/a/a/b/y.java
@@ -31,14 +31,14 @@ extends s {
public final void b(f f2, int n2, int n3, int n4, int n5) {
super.b(f2, n2, n3, n4, n5);
- this.f(f2, n2, n3, n4);
+ this.e(f2, n2, n3, n4);
}
public void a(f f2, int n2, int n3, int n4, Random random) {
- this.f(f2, n2, n3, n4);
+ this.e(f2, n2, n3, n4);
}
- protected void f(f f2, int n2, int n3, int n4) {
+ protected void e(f f2, int n2, int n3, int n4) {
int n5 = f2.c(n2, n3 - 1, n4);
if (!f2.a(n2, n3, n4) || !this.c(n5)) {
f2.b(n2, n3, n4, 0);
diff --git a/in-20100207-1/net/minecraft/a/a/b/z.java b/in-20100207-2/net/minecraft/a/a/b/z.java
index 90c9fd7..6d8f934 100755
--- a/in-20100207-1/net/minecraft/a/a/b/z.java
+++ b/in-20100207-2/net/minecraft/a/a/b/z.java
@@ -13,7 +13,6 @@ extends s {
protected z(int n2, int n3, c c2, boolean bl) {
super(20, 49, c2);
- this.d(255);
}
public final boolean b() {
diff --git a/in-20100207-1/net/minecraft/a/a/f.java b/in-20100207-2/net/minecraft/a/a/f.java
index b545f89..54aeb59 100755
--- a/in-20100207-1/net/minecraft/a/a/f.java
+++ b/in-20100207-2/net/minecraft/a/a/f.java
@@ -514,9 +514,9 @@ public final class f {
s.c[by].b(this, n2, n3, n4);
}
if (n5 != 0) {
- s.c[n5].a_(this, n2, n3, n4);
+ s.c[n5].d(this, n2, n3, n4);
}
- this.e[(n3 * this.b + n4) * this.a + n2] = 0;
+ this.f(n2, n3, n4, 0);
this.h(n2, n4, 1, 1);
this.a(n2, n3, n4, n2 + 1, n3 + 1, n4 + 1);
for (n5 = 0; n5 < this.D.size(); ++n5) {
diff --git a/in-20100207-1/net/minecraft/client/a/e.java b/in-20100207-2/net/minecraft/client/a/e.java
index ae781ea..57b44d3 100755
--- a/in-20100207-1/net/minecraft/client/a/e.java
+++ b/in-20100207-2/net/minecraft/client/a/e.java
@@ -48,37 +48,37 @@ public final class e {
c c2 = c.a;
boolean bl = false;
if (object.c || s2.d(object.a, n3, n4 - 1, n5, 0)) {
- f2 = s2.e(object.a, n3, n4 - 1, n5);
+ f2 = s2.f(object.a, n3, n4 - 1, n5);
c2.a(0.5f * f2, 0.5f * f2, 0.5f * f2);
e.super.a(s2, (float)n3, (float)n4, (float)n5, s2.a(object.a, n3, n4, n5, 0));
bl = true;
}
if (object.c || s2.d(object.a, n3, n4 + 1, n5, 1)) {
- f2 = s2.e(object.a, n3, n4 + 1, n5);
+ f2 = s2.f(object.a, n3, n4 + 1, n5);
c2.a(f2 * 1.0f, f2 * 1.0f, f2 * 1.0f);
e.super.b(s2, (float)n3, (float)n4, (float)n5, s2.a(object.a, n3, n4, n5, 1));
bl = true;
}
if (object.c || s2.d(object.a, n3, n4, n5 - 1, 2)) {
- f2 = s2.e(object.a, n3, n4, n5 - 1);
+ f2 = s2.f(object.a, n3, n4, n5 - 1);
c2.a(0.8f * f2, 0.8f * f2, 0.8f * f2);
e.super.b(s2, n3, n4, n5, s2.a(object.a, n3, n4, n5, 2));
bl = true;
}
if (object.c || s2.d(object.a, n3, n4, n5 + 1, 3)) {
- f2 = s2.e(object.a, n3, n4, n5 + 1);
+ f2 = s2.f(object.a, n3, n4, n5 + 1);
c2.a(0.8f * f2, 0.8f * f2, 0.8f * f2);
e.super.c(s2, n3, n4, n5, s2.a(object.a, n3, n4, n5, 3));
bl = true;
}
if (object.c || s2.d(object.a, n3 - 1, n4, n5, 4)) {
- f2 = s2.e(object.a, n3 - 1, n4, n5);
+ f2 = s2.f(object.a, n3 - 1, n4, n5);
c2.a(0.6f * f2, 0.6f * f2, 0.6f * f2);
e.super.d(s2, n3, n4, n5, s2.a(object.a, n3, n4, n5, 4));
bl = true;
}
if (object.c || s2.d(object.a, n3 + 1, n4, n5, 5)) {
- f2 = s2.e(object.a, n3 + 1, n4, n5);
+ f2 = s2.f(object.a, n3 + 1, n4, n5);
c2.a(0.6f * f2, 0.6f * f2, 0.6f * f2);
e.super.e(s2, n3, n4, n5, s2.a(object.a, n3, n4, n5, 5));
bl = true;
@@ -97,41 +97,41 @@ public final class e {
float f4 = s3.aw;
s3.aw = f4 - e.super.a(n3, n4, n5);
if (object.c || s3.d(object.a, n3, n4 - 1, n5, 0)) {
- float f5 = s3.e(object.a, n3, n4 - 1, n5);
+ float f5 = s3.f(object.a, n3, n4 - 1, n5);
c3.a(0.5f * f5, 0.5f * f5, 0.5f * f5);
e.super.a(s3, (float)n3, (float)n4, (float)n5, s3.a(0));
bl = true;
}
if (object.c || s3.d(object.a, n3, n4 + 1, n5, 1)) {
- float f6 = s3.e(object.a, n3, n4 + 1, n5);
+ float f6 = s3.f(object.a, n3, n4 + 1, n5);
c3.a(f6 * 1.0f, f6 * 1.0f, f6 * 1.0f);
e.super.b(s3, (float)n3, (float)n4, (float)n5, s3.a(1));
bl = true;
}
s3.at = f4 - e.super.a(n3, n4, n5 - 1);
if (object.c || s3.aw > s3.at || s3.d(object.a, n3, n4, n5 - 1, 2)) {
- float f7 = s3.e(object.a, n3, n4, n5 - 1);
+ float f7 = s3.f(object.a, n3, n4, n5 - 1);
c3.a(0.8f * f7, 0.8f * f7, 0.8f * f7);
e.super.b(s3, n3, n4, n5, s3.a(2));
bl = true;
}
s3.at = f4 - e.super.a(n3, n4, n5 + 1);
if (object.c || s3.aw > s3.at || s3.d(object.a, n3, n4, n5 + 1, 3)) {
- float f8 = s3.e(object.a, n3, n4, n5 + 1);
+ float f8 = s3.f(object.a, n3, n4, n5 + 1);
c3.a(0.8f * f8, 0.8f * f8, 0.8f * f8);
e.super.c(s3, n3, n4, n5, s3.a(3));
bl = true;
}
s3.at = f4 - e.super.a(n3 - 1, n4, n5);
if (object.c || s3.aw > s3.at || s3.d(object.a, n3 - 1, n4, n5, 4)) {
- float f9 = s3.e(object.a, n3 - 1, n4, n5);
+ float f9 = s3.f(object.a, n3 - 1, n4, n5);
c3.a(0.6f * f9, 0.6f * f9, 0.6f * f9);
e.super.d(s3, n3, n4, n5, s3.a(4));
bl = true;
}
s3.at = f4 - e.super.a(n3 + 1, n4, n5);
if (object.c || s3.aw > s3.at || s3.d(object.a, n3 + 1, n4, n5, 5)) {
- float f10 = s3.e(object.a, n3 + 1, n4, n5);
+ float f10 = s3.f(object.a, n3 + 1, n4, n5);
c3.a(0.6f * f10, 0.6f * f10, 0.6f * f10);
e.super.e(s3, n3, n4, n5, s3.a(5));
bl = true;
@@ -147,7 +147,7 @@ public final class e {
s s4 = object;
object = this;
c c4 = c.a;
- float f11 = s4.e(object.a, n3, n4, n5);
+ float f11 = s4.f(object.a, n3, n4, n5);
c4.a(f11, f11, f11);
e.super.a(s4, (int)object.a.f(n3, n4, n5), (float)n3, (float)n4, (float)n5);
return true;
@@ -159,7 +159,7 @@ public final class e {
Object object2 = object;
object = this;
c c5 = c.a;
- float f12 = object2.e(object.a, n3, n4, n5);
+ float f12 = object2.f(object.a, n3, n4, n5);
c5.a(f12, f12, f12);
e.super.b((s)object2, (int)object.a.f(n3, n4, n5), (float)n3, (float)n4 - 0.0625f, (float)n5);
return true;
@@ -171,7 +171,7 @@ public final class e {
Object object3 = object;
object = this;
c c6 = c.a;
- float f13 = object3.e(object.a, n3, n4, n5);
+ float f13 = object3.f(object.a, n3, n4, n5);
if (s.h[object3.ar] > 0) {
f13 = 1.0f;
}
@@ -200,7 +200,7 @@ public final class e {
if (object.b >= 0) {
n6 = object.b;
}
- float f14 = object4.e(object.a, n3, n4, n5);
+ float f14 = object4.f(object.a, n3, n4, n5);
c7.a(f14, f14, f14);
int n7 = (n6 & 15) << 4;
int n8 = n6 & 240;
@@ -208,7 +208,7 @@ public final class e {
float f16 = ((float)n7 + 15.99f) / 256.0f;
float f17 = (float)n8 / 256.0f;
float f18 = ((float)n8 + 15.99f) / 256.0f;
- if (object.a.d(n3, n4 - 1, n5) || s.ag.f(object.a, n3, n4 - 1, n5)) {
+ if (object.a.d(n3, n4 - 1, n5) || s.ag.e(object.a, n3, n4 - 1, n5)) {
float f19 = (float)n3 + 0.5f + 0.2f;
float f20 = (float)n3 + 0.5f - 0.2f;
float f21 = (float)n5 + 0.5f + 0.2f;
@@ -278,7 +278,7 @@ public final class e {
f16 = f15;
f15 = f27;
}
- if (s.ag.f(object.a, n3 - 1, n4, n5)) {
+ if (s.ag.e(object.a, n3 - 1, n4, n5)) {
c7.a((float)n3 + 0.2f, (float)n4 + 1.4f + 0.0625f, n5 + 1, f16, f17);
c7.a(n3, (float)n4 + 0.0625f, n5 + 1, f16, f18);
c7.a(n3, (float)n4 + 0.0625f, n5, f15, f18);
@@ -288,7 +288,7 @@ public final class e {
c7.a(n3, (float)n4 + 0.0625f, n5 + 1, f16, f18);
c7.a((float)n3 + 0.2f, (float)n4 + 1.4f + 0.0625f, n5 + 1, f16, f17);
}
- if (s.ag.f(object.a, n3 + 1, n4, n5)) {
+ if (s.ag.e(object.a, n3 + 1, n4, n5)) {
c7.a((float)(n3 + 1) - 0.2f, (float)n4 + 1.4f + 0.0625f, n5, f15, f17);
c7.a(n3 + 1, (float)n4 + 0.0625f, n5, f15, f18);
c7.a(n3 + 1, (float)n4 + 0.0625f, n5 + 1, f16, f18);
@@ -298,7 +298,7 @@ public final class e {
c7.a(n3 + 1, (float)n4 + 0.0625f, n5, f15, f18);
c7.a((float)(n3 + 1) - 0.2f, (float)n4 + 1.4f + 0.0625f, n5, f15, f17);
}
- if (s.ag.f(object.a, n3, n4, n5 - 1)) {
+ if (s.ag.e(object.a, n3, n4, n5 - 1)) {
c7.a(n3, (float)n4 + 1.4f + 0.0625f, (float)n5 + 0.2f, f16, f17);
c7.a(n3, (float)n4 + 0.0625f, n5, f16, f18);
c7.a(n3 + 1, (float)n4 + 0.0625f, n5, f15, f18);
@@ -308,7 +308,7 @@ public final class e {
c7.a(n3, (float)n4 + 0.0625f, n5, f16, f18);
c7.a(n3, (float)n4 + 1.4f + 0.0625f, (float)n5 + 0.2f, f16, f17);
}
- if (s.ag.f(object.a, n3, n4, n5 + 1)) {
+ if (s.ag.e(object.a, n3, n4, n5 + 1)) {
c7.a(n3 + 1, (float)n4 + 1.4f + 0.0625f, (float)(n5 + 1) - 0.2f, f15, f17);
c7.a(n3 + 1, (float)n4 + 0.0625f, n5 + 1, f15, f18);
c7.a(n3, (float)n4 + 0.0625f, n5 + 1, f16, f18);
@@ -318,7 +318,7 @@ public final class e {
c7.a(n3 + 1, (float)n4 + 0.0625f, n5 + 1, f15, f18);
c7.a(n3 + 1, (float)n4 + 1.4f + 0.0625f, (float)(n5 + 1) - 0.2f, f15, f17);
}
- if (s.ag.f(object.a, n3, n4 + 1, n5)) {
+ if (s.ag.e(object.a, n3, n4 + 1, n5)) {
f27 = (float)n3 + 0.5f + 0.5f;
float f28 = (float)n3 + 0.5f - 0.5f;
float f29 = (float)n5 + 0.5f + 0.5f;
@@ -369,7 +369,7 @@ public final class e {
if (object.b >= 0) {
n9 = object.b;
}
- float f31 = object5.e(object.a, n3, n4, n5);
+ float f31 = object5.f(object.a, n3, n4, n5);
c8.a(f31, f31, f31);
int n10 = ((n9 & 15) << 4) + 16;
int n11 = (n9 & 15) << 4;
diff --git a/in-20100207-1/net/minecraft/client/d.java b/in-20100207-2/net/minecraft/client/d.java
index c7c7492..faf6bf9 100755
--- a/in-20100207-1/net/minecraft/client/d.java
+++ b/in-20100207-2/net/minecraft/client/d.java
@@ -4,15 +4,16 @@
* Could not load the following classes:
* org.lwjgl.BufferUtils
* org.lwjgl.LWJGLException
+ * org.lwjgl.Sys
* org.lwjgl.input.Controllers
* org.lwjgl.input.Cursor
* org.lwjgl.input.Keyboard
* org.lwjgl.input.Mouse
- * org.lwjgl.opengl.ContextAttribs
+ * org.lwjgl.opengl.ContextCapabilities
* org.lwjgl.opengl.Display
* org.lwjgl.opengl.DisplayMode
* org.lwjgl.opengl.GL11
- * org.lwjgl.opengl.PixelFormat
+ * org.lwjgl.opengl.GLContext
*/
package net.minecraft.client;
@@ -26,6 +27,9 @@ import java.io.PrintStream;
import java.io.Reader;
import java.net.URL;
import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
import javax.swing.JOptionPane;
import net.minecraft.client.MinecraftApplet;
import net.minecraft.client.a.f;
@@ -47,15 +51,16 @@ import net.minecraft.client.r;
import net.minecraft.client.s;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
+import org.lwjgl.Sys;
import org.lwjgl.input.Controllers;
import org.lwjgl.input.Cursor;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.ContextAttribs;
+import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.PixelFormat;
+import org.lwjgl.opengl.GLContext;
public final class d
implements Runnable {
@@ -200,7 +205,24 @@ implements Runnable {
}
Display.setTitle((String)"Minecraft Minecraft Indev");
try {
- Display.create((PixelFormat)new PixelFormat(), (ContextAttribs)new ContextAttribs(1, 0));
+ Display.create();
+ System.out.println("LWJGL version: " + Sys.getVersion());
+ System.out.println("GL RENDERER: " + GL11.glGetString((int)7937));
+ System.out.println("GL VENDOR: " + GL11.glGetString((int)7936));
+ System.out.println("GL VERSION: " + GL11.glGetString((int)7938));
+ object2 = GLContext.getCapabilities();
+ System.out.println("OpenGL 3.0: " + object2.OpenGL30);
+ System.out.println("OpenGL 3.1: " + object2.OpenGL31);
+ System.out.println("OpenGL 3.2: " + object2.OpenGL32);
+ System.out.println("ARB_compatibility: " + object2.GL_ARB_compatibility);
+ if (object2.OpenGL32) {
+ object2 = ByteBuffer.allocateDirect(64).order(ByteOrder.nativeOrder()).asIntBuffer();
+ GL11.glGetInteger((int)37158, (IntBuffer)object2);
+ int n2 = object2.get(0);
+ System.out.println("PROFILE MASK: " + Integer.toBinaryString(n2));
+ System.out.println("CORE PROFILE: " + ((n2 & 1) != 0));
+ System.out.println("COMPATIBILITY PROFILE: " + ((n2 & 2) != 0));
+ }
Mouse.destroy();
}
catch (LWJGLException v0) {
@@ -303,7 +325,7 @@ implements Runnable {
return;
}
long l2 = System.currentTimeMillis();
- int n2 = 0;
+ int n3 = 0;
try {
while (this.A) {
if (this.j == null && Display.isCloseRequested()) {
@@ -340,19 +362,19 @@ implements Runnable {
if (this.w.h) {
Thread.sleep(5);
}
- ++n2;
+ ++n3;
this.l = this.o != null && this.o.c();
}
- catch (Exception var4_12) {
- this.a(new net.minecraft.client.c.c("Client error", "The game broke! [" + var4_12 + "]"));
- var4_12.printStackTrace();
+ catch (Exception var4_13) {
+ this.a(new net.minecraft.client.c.c("Client error", "The game broke! [" + var4_13 + "]"));
+ var4_13.printStackTrace();
break;
}
while (System.currentTimeMillis() >= l2 + 1000) {
- this.B = "" + n2 + " fps, " + net.minecraft.client.a.g.a + " chunk updates";
+ this.B = "" + n3 + " fps, " + net.minecraft.client.a.g.a + " chunk updates";
net.minecraft.client.a.g.a = 0;
l2 += 1000;
- n2 = 0;
+ n3 = 0;
}
}
return;
diff --git a/in-20100207-1/summary.txt b/in-20100207-2/summary.txt
index 75fa40c..68a8f91 100755
--- a/in-20100207-1/summary.txt
+++ b/in-20100207-2/summary.txt
@@ -1,4 +1,4 @@
-Summary for in-20100207-1.jar
+Summary for in-20100207-2.jar
Decompiled with CFR 0_118
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment