Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4(.2).

Browse Source
This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/main/java/net/minecraft/server/Vec3D.java
View File

@@ -2,21 +2,18 @@ package net.minecraft.server;
public class Vec3D {
private static final ThreadLocal d = new Vec3DPoolThreadLocal();
public double a;
public double b;
public static final Vec3DPool a = new Vec3DPool(-1, -1);
public final Vec3DPool b;
public double c;
public double d;
public double e;
public Vec3D next; // CraftBukkit
public static Vec3D a(double d0, double d1, double d2) {
return new Vec3D(d0, d1, d2);
return new Vec3D(a, d0, d1, d2);
}
public static Vec3DPool a() {
return (Vec3DPool) d.get();
}
protected Vec3D(double d0, double d1, double d2) {
protected Vec3D(Vec3DPool vec3dpool, double d0, double d1, double d2) {
if (d0 == -0.0D) {
d0 = 0.0D;
}
@@ -29,127 +26,128 @@ public class Vec3D {
d2 = 0.0D;
}
this.a = d0;
this.b = d1;
this.c = d2;
this.c = d0;
this.d = d1;
this.e = d2;
this.b = vec3dpool;
}
protected Vec3D b(double d0, double d1, double d2) {
this.a = d0;
this.b = d1;
this.c = d2;
this.c = d0;
this.d = d1;
this.e = d2;
return this;
}
public Vec3D b() {
double d0 = (double) MathHelper.sqrt(this.a * this.a + this.b * this.b + this.c * this.c);
public Vec3D a() {
double d0 = (double) MathHelper.sqrt(this.c * this.c + this.d * this.d + this.e * this.e);
return d0 < 1.0E-4D ? a().create(0.0D, 0.0D, 0.0D) : a().create(this.a / d0, this.b / d0, this.c / d0);
return d0 < 1.0E-4D ? this.b.create(0.0D, 0.0D, 0.0D) : this.b.create(this.c / d0, this.d / d0, this.e / d0);
}
public double b(Vec3D vec3d) {
return this.a * vec3d.a + this.b * vec3d.b + this.c * vec3d.c;
return this.c * vec3d.c + this.d * vec3d.d + this.e * vec3d.e;
}
public Vec3D add(double d0, double d1, double d2) {
return a().create(this.a + d0, this.b + d1, this.c + d2);
return this.b.create(this.c + d0, this.d + d1, this.e + d2);
}
public double d(Vec3D vec3d) {
double d0 = vec3d.a - this.a;
double d1 = vec3d.b - this.b;
double d2 = vec3d.c - this.c;
double d0 = vec3d.c - this.c;
double d1 = vec3d.d - this.d;
double d2 = vec3d.e - this.e;
return (double) MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2);
}
public double distanceSquared(Vec3D vec3d) {
double d0 = vec3d.a - this.a;
double d1 = vec3d.b - this.b;
double d2 = vec3d.c - this.c;
double d0 = vec3d.c - this.c;
double d1 = vec3d.d - this.d;
double d2 = vec3d.e - this.e;
return d0 * d0 + d1 * d1 + d2 * d2;
}
public double d(double d0, double d1, double d2) {
double d3 = d0 - this.a;
double d4 = d1 - this.b;
double d5 = d2 - this.c;
double d3 = d0 - this.c;
double d4 = d1 - this.d;
double d5 = d2 - this.e;
return d3 * d3 + d4 * d4 + d5 * d5;
}
public double c() {
return (double) MathHelper.sqrt(this.a * this.a + this.b * this.b + this.c * this.c);
public double b() {
return (double) MathHelper.sqrt(this.c * this.c + this.d * this.d + this.e * this.e);
}
public Vec3D b(Vec3D vec3d, double d0) {
double d1 = vec3d.a - this.a;
double d2 = vec3d.b - this.b;
double d3 = vec3d.c - this.c;
double d1 = vec3d.c - this.c;
double d2 = vec3d.d - this.d;
double d3 = vec3d.e - this.e;
if (d1 * d1 < 1.0000000116860974E-7D) {
return null;
} else {
double d4 = (d0 - this.a) / d1;
double d4 = (d0 - this.c) / d1;
return d4 >= 0.0D && d4 <= 1.0D ? a().create(this.a + d1 * d4, this.b + d2 * d4, this.c + d3 * d4) : null;
return d4 >= 0.0D && d4 <= 1.0D ? this.b.create(this.c + d1 * d4, this.d + d2 * d4, this.e + d3 * d4) : null;
}
}
public Vec3D c(Vec3D vec3d, double d0) {
double d1 = vec3d.a - this.a;
double d2 = vec3d.b - this.b;
double d3 = vec3d.c - this.c;
double d1 = vec3d.c - this.c;
double d2 = vec3d.d - this.d;
double d3 = vec3d.e - this.e;
if (d2 * d2 < 1.0000000116860974E-7D) {
return null;
} else {
double d4 = (d0 - this.b) / d2;
double d4 = (d0 - this.d) / d2;
return d4 >= 0.0D && d4 <= 1.0D ? a().create(this.a + d1 * d4, this.b + d2 * d4, this.c + d3 * d4) : null;
return d4 >= 0.0D && d4 <= 1.0D ? this.b.create(this.c + d1 * d4, this.d + d2 * d4, this.e + d3 * d4) : null;
}
}
public Vec3D d(Vec3D vec3d, double d0) {
double d1 = vec3d.a - this.a;
double d2 = vec3d.b - this.b;
double d3 = vec3d.c - this.c;
double d1 = vec3d.c - this.c;
double d2 = vec3d.d - this.d;
double d3 = vec3d.e - this.e;
if (d3 * d3 < 1.0000000116860974E-7D) {
return null;
} else {
double d4 = (d0 - this.c) / d3;
double d4 = (d0 - this.e) / d3;
return d4 >= 0.0D && d4 <= 1.0D ? a().create(this.a + d1 * d4, this.b + d2 * d4, this.c + d3 * d4) : null;
return d4 >= 0.0D && d4 <= 1.0D ? this.b.create(this.c + d1 * d4, this.d + d2 * d4, this.e + d3 * d4) : null;
}
}
public String toString() {
return "(" + this.a + ", " + this.b + ", " + this.c + ")";
return "(" + this.c + ", " + this.d + ", " + this.e + ")";
}
public void a(float f) {
float f1 = MathHelper.cos(f);
float f2 = MathHelper.sin(f);
double d0 = this.a;
double d1 = this.b * (double) f1 + this.c * (double) f2;
double d2 = this.c * (double) f1 - this.b * (double) f2;
double d0 = this.c;
double d1 = this.d * (double) f1 + this.e * (double) f2;
double d2 = this.e * (double) f1 - this.d * (double) f2;
this.a = d0;
this.b = d1;
this.c = d2;
this.c = d0;
this.d = d1;
this.e = d2;
}
public void b(float f) {
float f1 = MathHelper.cos(f);
float f2 = MathHelper.sin(f);
double d0 = this.a * (double) f1 + this.c * (double) f2;
double d1 = this.b;
double d2 = this.c * (double) f1 - this.a * (double) f2;
double d0 = this.c * (double) f1 + this.e * (double) f2;
double d1 = this.d;
double d2 = this.e * (double) f1 - this.c * (double) f2;
this.a = d0;
this.b = d1;
this.c = d2;
this.c = d0;
this.d = d1;
this.e = d2;
}
}