3rdparty/resent-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

math

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-03-07 03:42:34 +00:00
parent fb7332d378
commit d21f86fca3
74 changed files with 6926 additions and 6926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6662
javascript/badwifi/classes.js
View File

File diff suppressed because it is too large Load Diff

6662
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

2
src/main/java/net/minecraft/block/BlockDaylightDetector.java
View File

@ -68,7 +68,7 @@ public class BlockDaylightDetector extends BlockContainer {
IBlockState iblockstate = worldIn.getBlockState(pos); IBlockState iblockstate = worldIn.getBlockState(pos);
int i = worldIn.getLightFor(EnumSkyBlock.SKY, pos) - worldIn.getSkylightSubtracted(); int i = worldIn.getLightFor(EnumSkyBlock.SKY, pos) - worldIn.getSkylightSubtracted();
float f = worldIn.getCelestialAngleRadians(1.0F); float f = worldIn.getCelestialAngleRadians(1.0F);
float f1 = f < 3.1415927F ? 0.0F : 6.2831855F; float f1 = f < 3.141F ? 0.0F : 6.2831855F;
f = f + (f1 - f) * 0.2F; f = f + (f1 - f) * 0.2F;
i = Math.round((float) i * MathHelper.cos(f)); i = Math.round((float) i * MathHelper.cos(f));
i = MathHelper.clamp_int(i, 0, 15); i = MathHelper.clamp_int(i, 0, 15);

4
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -945,7 +945,7 @@ public class Minecraft implements IThreadListener {
for (int i2 = l; i2 >= 0; --i2) { for (int i2 = l; i2 >= 0; --i2) {
float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l) float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l)
* 3.1415927410125732D * 2.0D / 100.0D); * 3.141 * 2.0D / 100.0D);
float f1 = MathHelper.sin(f) * (float) short1; float f1 = MathHelper.sin(f) * (float) short1;
float f2 = MathHelper.cos(f) * (float) short1 * 0.5F; float f2 = MathHelper.cos(f) * (float) short1 * 0.5F;
worldrenderer.pos((double) ((float) i + f1), (double) ((float) j - f2), 0.0D).color(j1, k1, l1, 255) worldrenderer.pos((double) ((float) i + f1), (double) ((float) j - f2), 0.0D).color(j1, k1, l1, 255)
@ -957,7 +957,7 @@ public class Minecraft implements IThreadListener {
for (int l2 = l; l2 >= 0; --l2) { for (int l2 = l; l2 >= 0; --l2) {
float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l) float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l)
* 3.1415927410125732D * 2.0D / 100.0D); * 3.141 * 2.0D / 100.0D);
float f4 = MathHelper.sin(f3) * (float) short1; float f4 = MathHelper.sin(f3) * (float) short1;
float f5 = MathHelper.cos(f3) * (float) short1 * 0.5F; float f5 = MathHelper.cos(f3) * (float) short1 * 0.5F;
worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5), 0.0D) worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5), 0.0D)

8
src/main/java/net/minecraft/client/model/ModelBat.java
View File

@ -85,12 +85,12 @@ public class ModelBat extends ModelBase {
if (((EntityBat) entity).getIsBatHanging()) { if (((EntityBat) entity).getIsBatHanging()) {
float f3 = 57.295776F; float f3 = 57.295776F;
this.batHead.rotateAngleX = f2 / 57.295776F; this.batHead.rotateAngleX = f2 / 57.295776F;
this.batHead.rotateAngleY = 3.1415927F - f1 / 57.295776F; this.batHead.rotateAngleY = 3.141F - f1 / 57.295776F;
this.batHead.rotateAngleZ = 3.1415927F; this.batHead.rotateAngleZ = 3.141F;
this.batHead.setRotationPoint(0.0F, -2.0F, 0.0F); this.batHead.setRotationPoint(0.0F, -2.0F, 0.0F);
this.batRightWing.setRotationPoint(-3.0F, 0.0F, 3.0F); this.batRightWing.setRotationPoint(-3.0F, 0.0F, 3.0F);
this.batLeftWing.setRotationPoint(3.0F, 0.0F, 3.0F); this.batLeftWing.setRotationPoint(3.0F, 0.0F, 3.0F);
this.batBody.rotateAngleX = 3.1415927F; this.batBody.rotateAngleX = 3.141F;
this.batRightWing.rotateAngleX = -0.15707964F; this.batRightWing.rotateAngleX = -0.15707964F;
this.batRightWing.rotateAngleY = -1.2566371F; this.batRightWing.rotateAngleY = -1.2566371F;
this.batOuterRightWing.rotateAngleY = -1.7278761F; this.batOuterRightWing.rotateAngleY = -1.7278761F;
@ -107,7 +107,7 @@ public class ModelBat extends ModelBase {
this.batLeftWing.setRotationPoint(0.0F, 0.0F, 0.0F); this.batLeftWing.setRotationPoint(0.0F, 0.0F, 0.0F);
this.batBody.rotateAngleX = 0.7853982F + MathHelper.cos(f * 0.1F) * 0.15F; this.batBody.rotateAngleX = 0.7853982F + MathHelper.cos(f * 0.1F) * 0.15F;
this.batBody.rotateAngleY = 0.0F; this.batBody.rotateAngleY = 0.0F;
this.batRightWing.rotateAngleY = MathHelper.cos(f * 1.3F) * 3.1415927F * 0.25F; this.batRightWing.rotateAngleY = MathHelper.cos(f * 1.3F) * 3.141F * 0.25F;
this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY; this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY;
this.batOuterRightWing.rotateAngleY = this.batRightWing.rotateAngleY * 0.5F; this.batOuterRightWing.rotateAngleY = this.batRightWing.rotateAngleY * 0.5F;
this.batOuterLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY * 0.5F; this.batOuterLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY * 0.5F;

22
src/main/java/net/minecraft/client/model/ModelBiped.java
View File

@ -121,12 +121,12 @@ public class ModelBiped extends ModelBase {
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float var6, Entity var7) { public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float var6, Entity var7) {
this.bipedHead.rotateAngleY = f3 / 57.295776F; this.bipedHead.rotateAngleY = f3 / 57.295776F;
this.bipedHead.rotateAngleX = f4 / 57.295776F; this.bipedHead.rotateAngleX = f4 / 57.295776F;
this.bipedRightArm.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 2.0F * f1 * 0.5F; this.bipedRightArm.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 2.0F * f1 * 0.5F;
this.bipedLeftArm.rotateAngleX = MathHelper.cos(f * 0.6662F) * 2.0F * f1 * 0.5F; this.bipedLeftArm.rotateAngleX = MathHelper.cos(f * 0.6662F) * 2.0F * f1 * 0.5F;
this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleZ = 0.0F;
this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F;
this.bipedRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.bipedRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
this.bipedLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.bipedLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.bipedRightLeg.rotateAngleY = 0.0F; this.bipedRightLeg.rotateAngleY = 0.0F;
this.bipedLeftLeg.rotateAngleY = 0.0F; this.bipedLeftLeg.rotateAngleY = 0.0F;
if (this.isRiding) { if (this.isRiding) {
@ -134,12 +134,12 @@ public class ModelBiped extends ModelBase {
this.bipedLeftArm.rotateAngleX += -0.62831855F; this.bipedLeftArm.rotateAngleX += -0.62831855F;
this.bipedRightLeg.rotateAngleX = -1.2566371F; this.bipedRightLeg.rotateAngleX = -1.2566371F;
this.bipedLeftLeg.rotateAngleX = -1.2566371F; this.bipedLeftLeg.rotateAngleX = -1.2566371F;
this.bipedRightLeg.rotateAngleY = 0.31415927F; this.bipedRightLeg.rotateAngleY = 0.3141F;
this.bipedLeftLeg.rotateAngleY = -0.31415927F; this.bipedLeftLeg.rotateAngleY = -0.3141F;
} }
if (this.heldItemLeft != 0) { if (this.heldItemLeft != 0) {
this.bipedLeftArm.rotateAngleX = this.bipedLeftArm.rotateAngleX * 0.5F - 0.31415927F * (float) this.heldItemLeft; this.bipedLeftArm.rotateAngleX = this.bipedLeftArm.rotateAngleX * 0.5F - 0.3141F * (float) this.heldItemLeft;
} }
this.bipedRightArm.rotateAngleY = 0.0F; this.bipedRightArm.rotateAngleY = 0.0F;
@ -150,17 +150,17 @@ public class ModelBiped extends ModelBase {
default: default:
break; break;
case 1: case 1:
this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - 0.31415927F * (float) this.heldItemRight; this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - 0.3141F * (float) this.heldItemRight;
break; break;
case 3: case 3:
this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - 0.31415927F * (float) this.heldItemRight; this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - 0.3141F * (float) this.heldItemRight;
this.bipedRightArm.rotateAngleY = -0.5235988F; this.bipedRightArm.rotateAngleY = -0.5235988F;
} }
this.bipedLeftArm.rotateAngleY = 0.0F; this.bipedLeftArm.rotateAngleY = 0.0F;
if (this.swingProgress > -9990.0F) { if (this.swingProgress > -9990.0F) {
float f5 = this.swingProgress; float f5 = this.swingProgress;
this.bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f5) * 3.1415927F * 2.0F) * 0.2F; this.bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f5) * 3.141F * 2.0F) * 0.2F;
this.bipedRightArm.rotationPointZ = MathHelper.sin(this.bipedBody.rotateAngleY) * 5.0F; this.bipedRightArm.rotationPointZ = MathHelper.sin(this.bipedBody.rotateAngleY) * 5.0F;
this.bipedRightArm.rotationPointX = -MathHelper.cos(this.bipedBody.rotateAngleY) * 5.0F; this.bipedRightArm.rotationPointX = -MathHelper.cos(this.bipedBody.rotateAngleY) * 5.0F;
this.bipedLeftArm.rotationPointZ = -MathHelper.sin(this.bipedBody.rotateAngleY) * 5.0F; this.bipedLeftArm.rotationPointZ = -MathHelper.sin(this.bipedBody.rotateAngleY) * 5.0F;
@ -172,11 +172,11 @@ public class ModelBiped extends ModelBase {
f5 = f5 * f5; f5 = f5 * f5;
f5 = f5 * f5; f5 = f5 * f5;
f5 = 1.0F - f5; f5 = 1.0F - f5;
float f6 = MathHelper.sin(f5 * 3.1415927F); float f6 = MathHelper.sin(f5 * 3.141F);
float f7 = MathHelper.sin(this.swingProgress * 3.1415927F) * -(this.bipedHead.rotateAngleX - 0.7F) * 0.75F; float f7 = MathHelper.sin(this.swingProgress * 3.141F) * -(this.bipedHead.rotateAngleX - 0.7F) * 0.75F;
this.bipedRightArm.rotateAngleX = (float) ((double) this.bipedRightArm.rotateAngleX - ((double) f6 * 1.2D + (double) f7)); this.bipedRightArm.rotateAngleX = (float) ((double) this.bipedRightArm.rotateAngleX - ((double) f6 * 1.2D + (double) f7));
this.bipedRightArm.rotateAngleY += this.bipedBody.rotateAngleY * 2.0F; this.bipedRightArm.rotateAngleY += this.bipedBody.rotateAngleY * 2.0F;
this.bipedRightArm.rotateAngleZ += MathHelper.sin(this.swingProgress * 3.1415927F) * -0.4F; this.bipedRightArm.rotateAngleZ += MathHelper.sin(this.swingProgress * 3.141F) * -0.4F;
} }
if (this.isSneak) { if (this.isSneak) {

6
src/main/java/net/minecraft/client/model/ModelBlaze.java
View File

@ -60,7 +60,7 @@ public class ModelBlaze extends ModelBase {
* legs can swing at most. * legs can swing at most.
*/ */
public void setRotationAngles(float var1, float var2, float f, float f1, float f2, float var6, Entity var7) { public void setRotationAngles(float var1, float var2, float f, float f1, float f2, float var6, Entity var7) {
float f3 = f * 3.1415927F * -0.1F; float f3 = f * 3.141F * -0.1F;
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
this.blazeSticks[i].rotationPointY = -2.0F + MathHelper.cos(((float) (i * 2) + f) * 0.25F); this.blazeSticks[i].rotationPointY = -2.0F + MathHelper.cos(((float) (i * 2) + f) * 0.25F);
@ -69,7 +69,7 @@ public class ModelBlaze extends ModelBase {
++f3; ++f3;
} }
f3 = 0.7853982F + f * 3.1415927F * 0.03F; f3 = 0.7853982F + f * 3.141F * 0.03F;
for (int j = 4; j < 8; ++j) { for (int j = 4; j < 8; ++j) {
this.blazeSticks[j].rotationPointY = 2.0F + MathHelper.cos(((float) (j * 2) + f) * 0.25F); this.blazeSticks[j].rotationPointY = 2.0F + MathHelper.cos(((float) (j * 2) + f) * 0.25F);
@ -78,7 +78,7 @@ public class ModelBlaze extends ModelBase {
++f3; ++f3;
} }
f3 = 0.47123894F + f * 3.1415927F * -0.05F; f3 = 0.47123894F + f * 3.141F * -0.05F;
for (int k = 8; k < 12; ++k) { for (int k = 8; k < 12; ++k) {
this.blazeSticks[k].rotationPointY = 11.0F + MathHelper.cos(((float) k * 1.5F + f) * 0.5F); this.blazeSticks[k].rotationPointY = 11.0F + MathHelper.cos(((float) k * 1.5F + f) * 0.5F);

2
src/main/java/net/minecraft/client/model/ModelBoat.java
View File

@ -47,7 +47,7 @@ public class ModelBoat extends ModelBase {
this.boatSides[0].rotateAngleX = 1.5707964F; this.boatSides[0].rotateAngleX = 1.5707964F;
this.boatSides[1].rotateAngleY = 4.712389F; this.boatSides[1].rotateAngleY = 4.712389F;
this.boatSides[2].rotateAngleY = 1.5707964F; this.boatSides[2].rotateAngleY = 1.5707964F;
this.boatSides[3].rotateAngleY = 3.1415927F; this.boatSides[3].rotateAngleY = 3.141F;
} }
/**+ /**+

2
src/main/java/net/minecraft/client/model/ModelBook.java
View File

@ -82,7 +82,7 @@ public class ModelBook extends ModelBase {
*/ */
public void setRotationAngles(float f, float f1, float f2, float f3, float var5, float var6, Entity var7) { public void setRotationAngles(float f, float f1, float f2, float f3, float var5, float var6, Entity var7) {
float f4 = (MathHelper.sin(f * 0.02F) * 0.1F + 1.25F) * f3; float f4 = (MathHelper.sin(f * 0.02F) * 0.1F + 1.25F) * f3;
this.coverRight.rotateAngleY = 3.1415927F + f4; this.coverRight.rotateAngleY = 3.141F + f4;
this.coverLeft.rotateAngleY = -f4; this.coverLeft.rotateAngleY = -f4;
this.pagesRight.rotateAngleY = f4; this.pagesRight.rotateAngleY = f4;
this.pagesLeft.rotateAngleY = -f4; this.pagesLeft.rotateAngleY = -f4;

2
src/main/java/net/minecraft/client/model/ModelChicken.java
View File

@ -112,7 +112,7 @@ public class ModelChicken extends ModelBase {
this.chin.rotateAngleY = this.head.rotateAngleY; this.chin.rotateAngleY = this.head.rotateAngleY;
this.body.rotateAngleX = 1.5707964F; this.body.rotateAngleX = 1.5707964F;
this.rightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.rightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
this.leftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.rightWing.rotateAngleZ = f2; this.rightWing.rotateAngleZ = f2;
this.leftWing.rotateAngleZ = -f2; this.leftWing.rotateAngleZ = -f2;
} }

4
src/main/java/net/minecraft/client/model/ModelCreeper.java
View File

@ -85,8 +85,8 @@ public class ModelCreeper extends ModelBase {
this.head.rotateAngleY = f2 / 57.295776F; this.head.rotateAngleY = f2 / 57.295776F;
this.head.rotateAngleX = f3 / 57.295776F; this.head.rotateAngleX = f3 / 57.295776F;
this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
} }
} }

28
src/main/java/net/minecraft/client/model/ModelDragon.java
View File

@ -136,8 +136,8 @@ public class ModelDragon extends ModelBase {
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
EntityDragon entitydragon = (EntityDragon) entity; EntityDragon entitydragon = (EntityDragon) entity;
float f1 = entitydragon.prevAnimTime + (entitydragon.animTime - entitydragon.prevAnimTime) * this.partialTicks; float f1 = entitydragon.prevAnimTime + (entitydragon.animTime - entitydragon.prevAnimTime) * this.partialTicks;
this.jaw.rotateAngleX = (float) (Math.sin((double) (f1 * 3.1415927F * 2.0F)) + 1.0D) * 0.2F; this.jaw.rotateAngleX = (float) (Math.sin((double) (f1 * 3.141F * 2.0F)) + 1.0D) * 0.2F;
float f2 = (float) (Math.sin((double) (f1 * 3.1415927F * 2.0F - 1.0F)) + 1.0D); float f2 = (float) (Math.sin((double) (f1 * 3.141F * 2.0F - 1.0F)) + 1.0D);
f2 = (f2 * f2 * 1.0F + f2 * 2.0F) * 0.05F; f2 = (f2 * f2 * 1.0F + f2 * 2.0F) * 0.05F;
GlStateManager.translate(0.0F, f2 - 2.0F, -3.0F); GlStateManager.translate(0.0F, f2 - 2.0F, -3.0F);
GlStateManager.rotate(f2 * 2.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(f2 * 2.0F, 1.0F, 0.0F, 0.0F);
@ -148,16 +148,16 @@ public class ModelDragon extends ModelBase {
float f7 = this.updateRotations(entitydragon.getMovementOffsets(5, this.partialTicks)[0] - entitydragon.getMovementOffsets(10, this.partialTicks)[0]); float f7 = this.updateRotations(entitydragon.getMovementOffsets(5, this.partialTicks)[0] - entitydragon.getMovementOffsets(10, this.partialTicks)[0]);
float f8 = this.updateRotations(entitydragon.getMovementOffsets(5, this.partialTicks)[0] + (double) (f7 / 2.0F)); float f8 = this.updateRotations(entitydragon.getMovementOffsets(5, this.partialTicks)[0] + (double) (f7 / 2.0F));
f3 = f3 + 2.0F; f3 = f3 + 2.0F;
float f9 = f1 * 3.1415927F * 2.0F; float f9 = f1 * 3.141F * 2.0F;
f3 = 20.0F; f3 = 20.0F;
float f4 = -12.0F; float f4 = -12.0F;
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
double[] adouble1 = entitydragon.getMovementOffsets(5 - i, this.partialTicks); double[] adouble1 = entitydragon.getMovementOffsets(5 - i, this.partialTicks);
float f10 = (float) Math.cos((double) ((float) i * 0.45F + f9)) * 0.15F; float f10 = (float) Math.cos((double) ((float) i * 0.45F + f9)) * 0.15F;
this.spine.rotateAngleY = this.updateRotations(adouble1[0] - adouble[0]) * 3.1415927F / 180.0F * f6; this.spine.rotateAngleY = this.updateRotations(adouble1[0] - adouble[0]) * 3.141F / 180.0F * f6;
this.spine.rotateAngleX = f10 + (float) (adouble1[1] - adouble[1]) * 3.1415927F / 180.0F * f6 * 5.0F; this.spine.rotateAngleX = f10 + (float) (adouble1[1] - adouble[1]) * 3.141F / 180.0F * f6 * 5.0F;
this.spine.rotateAngleZ = -this.updateRotations(adouble1[0] - (double) f8) * 3.1415927F / 180.0F * f6; this.spine.rotateAngleZ = -this.updateRotations(adouble1[0] - (double) f8) * 3.141F / 180.0F * f6;
this.spine.rotationPointY = f3; this.spine.rotationPointY = f3;
this.spine.rotationPointZ = f4; this.spine.rotationPointZ = f4;
this.spine.rotationPointX = f5; this.spine.rotationPointX = f5;
@ -171,8 +171,8 @@ public class ModelDragon extends ModelBase {
this.head.rotationPointZ = f4; this.head.rotationPointZ = f4;
this.head.rotationPointX = f5; this.head.rotationPointX = f5;
double[] adouble2 = entitydragon.getMovementOffsets(0, this.partialTicks); double[] adouble2 = entitydragon.getMovementOffsets(0, this.partialTicks);
this.head.rotateAngleY = this.updateRotations(adouble2[0] - adouble[0]) * 3.1415927F / 180.0F * 1.0F; this.head.rotateAngleY = this.updateRotations(adouble2[0] - adouble[0]) * 3.141F / 180.0F * 1.0F;
this.head.rotateAngleZ = -this.updateRotations(adouble2[0] - (double) f8) * 3.1415927F / 180.0F * 1.0F; this.head.rotateAngleZ = -this.updateRotations(adouble2[0] - (double) f8) * 3.141F / 180.0F * 1.0F;
this.head.render(f); this.head.render(f);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translate(0.0F, 1.0F, 0.0F); GlStateManager.translate(0.0F, 1.0F, 0.0F);
@ -183,7 +183,7 @@ public class ModelDragon extends ModelBase {
for (int j = 0; j < 2; ++j) { for (int j = 0; j < 2; ++j) {
GlStateManager.enableCull(); GlStateManager.enableCull();
float f12 = f1 * 3.1415927F * 2.0F; float f12 = f1 * 3.141F * 2.0F;
this.wing.rotateAngleX = 0.125F - (float) Math.cos((double) f12) * 0.2F; this.wing.rotateAngleX = 0.125F - (float) Math.cos((double) f12) * 0.2F;
this.wing.rotateAngleY = 0.25F; this.wing.rotateAngleY = 0.25F;
this.wing.rotateAngleZ = (float) (Math.sin((double) f12) + 0.125D) * 0.8F; this.wing.rotateAngleZ = (float) (Math.sin((double) f12) + 0.125D) * 0.8F;
@ -206,8 +206,8 @@ public class ModelDragon extends ModelBase {
GlStateManager.popMatrix(); GlStateManager.popMatrix();
GlStateManager.cullFace(GL_BACK); GlStateManager.cullFace(GL_BACK);
GlStateManager.disableCull(); GlStateManager.disableCull();
float f11 = -((float) Math.sin((double) (f1 * 3.1415927F * 2.0F))) * 0.0F; float f11 = -((float) Math.sin((double) (f1 * 3.141F * 2.0F))) * 0.0F;
f9 = f1 * 3.1415927F * 2.0F; f9 = f1 * 3.141F * 2.0F;
f3 = 10.0F; f3 = 10.0F;
f4 = 60.0F; f4 = 60.0F;
f5 = 0.0F; f5 = 0.0F;
@ -216,9 +216,9 @@ public class ModelDragon extends ModelBase {
for (int k = 0; k < 12; ++k) { for (int k = 0; k < 12; ++k) {
adouble2 = entitydragon.getMovementOffsets(12 + k, this.partialTicks); adouble2 = entitydragon.getMovementOffsets(12 + k, this.partialTicks);
f11 = (float) ((double) f11 + Math.sin((double) ((float) k * 0.45F + f9)) * 0.05000000074505806D); f11 = (float) ((double) f11 + Math.sin((double) ((float) k * 0.45F + f9)) * 0.05000000074505806D);
this.spine.rotateAngleY = (this.updateRotations(adouble2[0] - adouble[0]) * f6 + 180.0F) * 3.1415927F / 180.0F; this.spine.rotateAngleY = (this.updateRotations(adouble2[0] - adouble[0]) * f6 + 180.0F) * 3.141F / 180.0F;
this.spine.rotateAngleX = f11 + (float) (adouble2[1] - adouble[1]) * 3.1415927F / 180.0F * f6 * 5.0F; this.spine.rotateAngleX = f11 + (float) (adouble2[1] - adouble[1]) * 3.141F / 180.0F * f6 * 5.0F;
this.spine.rotateAngleZ = this.updateRotations(adouble2[0] - (double) f8) * 3.1415927F / 180.0F * f6; this.spine.rotateAngleZ = this.updateRotations(adouble2[0] - (double) f8) * 3.141F / 180.0F * f6;
this.spine.rotationPointY = f3; this.spine.rotationPointY = f3;
this.spine.rotationPointZ = f4; this.spine.rotationPointZ = f4;
this.spine.rotationPointX = f5; this.spine.rotationPointX = f5;

4
src/main/java/net/minecraft/client/model/ModelEnderMite.java
View File

@ -63,8 +63,8 @@ public class ModelEnderMite extends ModelBase {
*/ */
public void setRotationAngles(float var1, float var2, float f, float var4, float var5, float var6, Entity var7) { public void setRotationAngles(float var1, float var2, float f, float var4, float var5, float var6, Entity var7) {
for (int i = 0; i < this.field_178713_d.length; ++i) { for (int i = 0; i < this.field_178713_d.length; ++i) {
this.field_178713_d[i].rotateAngleY = MathHelper.cos(f * 0.9F + (float) i * 0.15F * 3.1415927F) * 3.1415927F * 0.01F * (float) (1 + Math.abs(i - 2)); this.field_178713_d[i].rotateAngleY = MathHelper.cos(f * 0.9F + (float) i * 0.15F * 3.141F) * 3.141F * 0.01F * (float) (1 + Math.abs(i - 2));
this.field_178713_d[i].rotationPointX = MathHelper.sin(f * 0.9F + (float) i * 0.15F * 3.1415927F) * 3.1415927F * 0.1F * (float) Math.abs(i - 2); this.field_178713_d[i].rotationPointX = MathHelper.sin(f * 0.9F + (float) i * 0.15F * 3.141F) * 3.141F * 0.1F * (float) Math.abs(i - 2);
} }
} }
} }

12
src/main/java/net/minecraft/client/model/ModelGuardian.java
View File

@ -98,9 +98,9 @@ public class ModelGuardian extends ModelBase {
float f4 = (1.0F - entityguardian.func_175469_o(f3)) * 0.55F; float f4 = (1.0F - entityguardian.func_175469_o(f3)) * 0.55F;
for (int i = 0; i < 12; ++i) { for (int i = 0; i < 12; ++i) {
this.guardianSpines[i].rotateAngleX = 3.1415927F * afloat[i]; this.guardianSpines[i].rotateAngleX = 3.141F * afloat[i];
this.guardianSpines[i].rotateAngleY = 3.1415927F * afloat1[i]; this.guardianSpines[i].rotateAngleY = 3.141F * afloat1[i];
this.guardianSpines[i].rotateAngleZ = 3.1415927F * afloat2[i]; this.guardianSpines[i].rotateAngleZ = 3.141F * afloat2[i];
this.guardianSpines[i].rotationPointX = afloat3[i] * (1.0F + MathHelper.cos(f * 1.5F + (float) i) * 0.01F - f4); this.guardianSpines[i].rotationPointX = afloat3[i] * (1.0F + MathHelper.cos(f * 1.5F + (float) i) * 0.01F - f4);
this.guardianSpines[i].rotationPointY = 16.0F + afloat4[i] * (1.0F + MathHelper.cos(f * 1.5F + (float) i) * 0.01F - f4); this.guardianSpines[i].rotationPointY = 16.0F + afloat4[i] * (1.0F + MathHelper.cos(f * 1.5F + (float) i) * 0.01F - f4);
this.guardianSpines[i].rotationPointZ = afloat5[i] * (1.0F + MathHelper.cos(f * 1.5F + (float) i) * 0.01F - f4); this.guardianSpines[i].rotationPointZ = afloat5[i] * (1.0F + MathHelper.cos(f * 1.5F + (float) i) * 0.01F - f4);
@ -131,12 +131,12 @@ public class ModelGuardian extends ModelBase {
this.guardianEye.showModel = true; this.guardianEye.showModel = true;
float f5 = entityguardian.func_175471_a(f3); float f5 = entityguardian.func_175471_a(f3);
this.guardianTail[0].rotateAngleY = MathHelper.sin(f5) * 3.1415927F * 0.05F; this.guardianTail[0].rotateAngleY = MathHelper.sin(f5) * 3.141F * 0.05F;
this.guardianTail[1].rotateAngleY = MathHelper.sin(f5) * 3.1415927F * 0.1F; this.guardianTail[1].rotateAngleY = MathHelper.sin(f5) * 3.141F * 0.1F;
this.guardianTail[1].rotationPointX = -1.5F; this.guardianTail[1].rotationPointX = -1.5F;
this.guardianTail[1].rotationPointY = 0.5F; this.guardianTail[1].rotationPointY = 0.5F;
this.guardianTail[1].rotationPointZ = 14.0F; this.guardianTail[1].rotationPointZ = 14.0F;
this.guardianTail[2].rotateAngleY = MathHelper.sin(f5) * 3.1415927F * 0.15F; this.guardianTail[2].rotateAngleY = MathHelper.sin(f5) * 3.141F * 0.15F;
this.guardianTail[2].rotationPointX = 0.5F; this.guardianTail[2].rotationPointX = 0.5F;
this.guardianTail[2].rotationPointY = 0.5F; this.guardianTail[2].rotationPointY = 0.5F;
this.guardianTail[2].rotationPointZ = 6.0F; this.guardianTail[2].rotationPointZ = 6.0F;

8
src/main/java/net/minecraft/client/model/ModelHorse.java
View File

@ -357,7 +357,7 @@ public class ModelHorse extends ModelBase {
boolean flag1 = entityhorse.isHorseSaddled(); boolean flag1 = entityhorse.isHorseSaddled();
boolean flag2 = entityhorse.riddenByEntity != null; boolean flag2 = entityhorse.riddenByEntity != null;
float f9 = (float) entitylivingbaseIn.ticksExisted + parFloat3; float f9 = (float) entitylivingbaseIn.ticksExisted + parFloat3;
float f10 = MathHelper.cos(partialTickTime * 0.6662F + 3.1415927F); float f10 = MathHelper.cos(partialTickTime * 0.6662F + 3.141F);
float f11 = f10 * 0.8F * parFloat2; float f11 = f10 * 0.8F * parFloat2;
this.head.rotationPointY = 4.0F; this.head.rotationPointY = 4.0F;
this.head.rotationPointZ = -10.0F; this.head.rotationPointZ = -10.0F;
@ -415,7 +415,7 @@ public class ModelHorse extends ModelBase {
float f13 = 4.712389F; float f13 = 4.712389F;
float f14 = -1.0471976F; float f14 = -1.0471976F;
float f15 = 0.2617994F * f6; float f15 = 0.2617994F * f6;
float f16 = MathHelper.cos(f9 * 0.6F + 3.1415927F); float f16 = MathHelper.cos(f9 * 0.6F + 3.141F);
this.frontLeftLeg.rotationPointY = -2.0F * f6 + 9.0F * f7; this.frontLeftLeg.rotationPointY = -2.0F * f6 + 9.0F * f7;
this.frontLeftLeg.rotationPointZ = -2.0F * f6 + -8.0F * f7; this.frontLeftLeg.rotationPointZ = -2.0F * f6 + -8.0F * f7;
this.frontRightLeg.rotationPointY = this.frontLeftLeg.rotationPointY; this.frontRightLeg.rotationPointY = this.frontLeftLeg.rotationPointY;
@ -437,10 +437,10 @@ public class ModelHorse extends ModelBase {
this.backRightShin.rotateAngleX = -0.08726646F * f6 + (f10 * 0.5F * parFloat2 - Math.max(0.0F, -f10 * 0.5F * parFloat2)) * f7; this.backRightShin.rotateAngleX = -0.08726646F * f6 + (f10 * 0.5F * parFloat2 - Math.max(0.0F, -f10 * 0.5F * parFloat2)) * f7;
this.backRightHoof.rotateAngleX = this.backRightShin.rotateAngleX; this.backRightHoof.rotateAngleX = this.backRightShin.rotateAngleX;
this.frontLeftLeg.rotateAngleX = f17; this.frontLeftLeg.rotateAngleX = f17;
this.frontLeftShin.rotateAngleX = (this.frontLeftLeg.rotateAngleX + 3.1415927F * Math.max(0.0F, 0.2F + f16 * 0.2F)) * f6 + (f11 + Math.max(0.0F, f10 * 0.5F * parFloat2)) * f7; this.frontLeftShin.rotateAngleX = (this.frontLeftLeg.rotateAngleX + 3.141F * Math.max(0.0F, 0.2F + f16 * 0.2F)) * f6 + (f11 + Math.max(0.0F, f10 * 0.5F * parFloat2)) * f7;
this.frontLeftHoof.rotateAngleX = this.frontLeftShin.rotateAngleX; this.frontLeftHoof.rotateAngleX = this.frontLeftShin.rotateAngleX;
this.frontRightLeg.rotateAngleX = f18; this.frontRightLeg.rotateAngleX = f18;
this.frontRightShin.rotateAngleX = (this.frontRightLeg.rotateAngleX + 3.1415927F * Math.max(0.0F, 0.2F - f16 * 0.2F)) * f6 + (-f11 + Math.max(0.0F, -f10 * 0.5F * parFloat2)) * f7; this.frontRightShin.rotateAngleX = (this.frontRightLeg.rotateAngleX + 3.141F * Math.max(0.0F, 0.2F - f16 * 0.2F)) * f6 + (-f11 + Math.max(0.0F, -f10 * 0.5F * parFloat2)) * f7;
this.frontRightHoof.rotateAngleX = this.frontRightShin.rotateAngleX; this.frontRightHoof.rotateAngleX = this.frontRightShin.rotateAngleX;
this.backLeftHoof.rotationPointY = this.backLeftShin.rotationPointY; this.backLeftHoof.rotationPointY = this.backLeftShin.rotationPointY;
this.backLeftHoof.rotationPointZ = this.backLeftShin.rotationPointZ; this.backLeftHoof.rotationPointZ = this.backLeftShin.rotationPointZ;

2
src/main/java/net/minecraft/client/model/ModelMinecart.java
View File

@ -50,7 +50,7 @@ public class ModelMinecart extends ModelBase {
this.sideModels[0].rotateAngleX = 1.5707964F; this.sideModels[0].rotateAngleX = 1.5707964F;
this.sideModels[1].rotateAngleY = 4.712389F; this.sideModels[1].rotateAngleY = 4.712389F;
this.sideModels[2].rotateAngleY = 1.5707964F; this.sideModels[2].rotateAngleY = 1.5707964F;
this.sideModels[3].rotateAngleY = 3.1415927F; this.sideModels[3].rotateAngleY = 3.141F;
this.sideModels[5].rotateAngleX = -1.5707964F; this.sideModels[5].rotateAngleX = -1.5707964F;
} }

10
src/main/java/net/minecraft/client/model/ModelOcelot.java
View File

@ -122,13 +122,13 @@ public class ModelOcelot extends ModelBase {
if (this.field_78163_i == 2) { if (this.field_78163_i == 2) {
this.ocelotBackLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1; this.ocelotBackLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1;
this.ocelotBackRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 0.3F) * 1.0F * f1; this.ocelotBackRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 0.3F) * 1.0F * f1;
this.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F + 0.3F) * 1.0F * f1; this.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F + 0.3F) * 1.0F * f1;
this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.0F * f1; this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.0F * f1;
this.ocelotTail2.rotateAngleX = 1.7278761F + 0.31415927F * MathHelper.cos(f) * f1; this.ocelotTail2.rotateAngleX = 1.7278761F + 0.3141F * MathHelper.cos(f) * f1;
} else { } else {
this.ocelotBackLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1; this.ocelotBackLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1;
this.ocelotBackRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.0F * f1; this.ocelotBackRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.0F * f1;
this.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.0F * f1; this.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.0F * f1;
this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1; this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1;
if (this.field_78163_i == 1) { if (this.field_78163_i == 1) {
this.ocelotTail2.rotateAngleX = 1.7278761F + 0.7853982F * MathHelper.cos(f) * f1; this.ocelotTail2.rotateAngleX = 1.7278761F + 0.7853982F * MathHelper.cos(f) * f1;

4
src/main/java/net/minecraft/client/model/ModelQuadruped.java
View File

@ -97,8 +97,8 @@ public class ModelQuadruped extends ModelBase {
this.head.rotateAngleY = f2 / 57.295776F; this.head.rotateAngleY = f2 / 57.295776F;
this.body.rotateAngleX = 1.5707964F; this.body.rotateAngleX = 1.5707964F;
this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
} }
} }

2
src/main/java/net/minecraft/client/model/ModelRabbit.java
View File

@ -171,7 +171,7 @@ public class ModelRabbit extends ModelBase {
this.rabbitNose.rotateAngleY = this.rabbitHead.rotateAngleY = f1 * 0.017453292F; this.rabbitNose.rotateAngleY = this.rabbitHead.rotateAngleY = f1 * 0.017453292F;
this.rabbitRightEar.rotateAngleY = this.rabbitNose.rotateAngleY - 0.2617994F; this.rabbitRightEar.rotateAngleY = this.rabbitNose.rotateAngleY - 0.2617994F;
this.rabbitLeftEar.rotateAngleY = this.rabbitNose.rotateAngleY + 0.2617994F; this.rabbitLeftEar.rotateAngleY = this.rabbitNose.rotateAngleY + 0.2617994F;
this.field_178701_m = MathHelper.sin(entityrabbit.func_175521_o(f3) * 3.1415927F); this.field_178701_m = MathHelper.sin(entityrabbit.func_175521_o(f3) * 3.141F);
this.rabbitLeftThigh.rotateAngleX = this.rabbitRightThigh.rotateAngleX = (this.field_178701_m * 50.0F - 21.0F) * 0.017453292F; this.rabbitLeftThigh.rotateAngleX = this.rabbitRightThigh.rotateAngleX = (this.field_178701_m * 50.0F - 21.0F) * 0.017453292F;
this.rabbitLeftFoot.rotateAngleX = this.rabbitRightFoot.rotateAngleX = this.field_178701_m * 50.0F * 0.017453292F; this.rabbitLeftFoot.rotateAngleX = this.rabbitRightFoot.rotateAngleX = this.field_178701_m * 50.0F * 0.017453292F;
this.rabbitLeftArm.rotateAngleX = this.rabbitRightArm.rotateAngleX = (this.field_178701_m * -40.0F - 11.0F) * 0.017453292F; this.rabbitLeftArm.rotateAngleX = this.rabbitRightArm.rotateAngleX = (this.field_178701_m * -40.0F - 11.0F) * 0.017453292F;

4
src/main/java/net/minecraft/client/model/ModelSilverfish.java
View File

@ -89,8 +89,8 @@ public class ModelSilverfish extends ModelBase {
*/ */
public void setRotationAngles(float var1, float var2, float f, float var4, float var5, float var6, Entity var7) { public void setRotationAngles(float var1, float var2, float f, float var4, float var5, float var6, Entity var7) {
for (int i = 0; i < this.silverfishBodyParts.length; ++i) { for (int i = 0; i < this.silverfishBodyParts.length; ++i) {
this.silverfishBodyParts[i].rotateAngleY = MathHelper.cos(f * 0.9F + (float) i * 0.15F * 3.1415927F) * 3.1415927F * 0.05F * (float) (1 + Math.abs(i - 2)); this.silverfishBodyParts[i].rotateAngleY = MathHelper.cos(f * 0.9F + (float) i * 0.15F * 3.141F) * 3.141F * 0.05F * (float) (1 + Math.abs(i - 2));
this.silverfishBodyParts[i].rotationPointX = MathHelper.sin(f * 0.9F + (float) i * 0.15F * 3.1415927F) * 3.1415927F * 0.2F * (float) Math.abs(i - 2); this.silverfishBodyParts[i].rotationPointX = MathHelper.sin(f * 0.9F + (float) i * 0.15F * 3.141F) * 3.141F * 0.2F * (float) Math.abs(i - 2);
} }
this.silverfishWings[0].rotateAngleY = this.silverfishBodyParts[2].rotateAngleY; this.silverfishWings[0].rotateAngleY = this.silverfishBodyParts[2].rotateAngleY;

2
src/main/java/net/minecraft/client/model/ModelSnowMan.java
View File

@ -66,7 +66,7 @@ public class ModelSnowMan extends ModelBase {
this.rightHand.rotateAngleZ = 1.0F; this.rightHand.rotateAngleZ = 1.0F;
this.leftHand.rotateAngleZ = -1.0F; this.leftHand.rotateAngleZ = -1.0F;
this.rightHand.rotateAngleY = 0.0F + this.body.rotateAngleY; this.rightHand.rotateAngleY = 0.0F + this.body.rotateAngleY;
this.leftHand.rotateAngleY = 3.1415927F + this.body.rotateAngleY; this.leftHand.rotateAngleY = 3.141F + this.body.rotateAngleY;
this.rightHand.rotationPointX = f7 * 5.0F; this.rightHand.rotationPointX = f7 * 5.0F;
this.rightHand.rotationPointZ = -f6 * 5.0F; this.rightHand.rotationPointZ = -f6 * 5.0F;
this.leftHand.rotationPointX = -f7 * 5.0F; this.leftHand.rotationPointX = -f7 * 5.0F;

4
src/main/java/net/minecraft/client/model/ModelSpider.java
View File

@ -122,11 +122,11 @@ public class ModelSpider extends ModelBase {
this.spiderLeg7.rotateAngleY = -f6 * 2.0F + f5; this.spiderLeg7.rotateAngleY = -f6 * 2.0F + f5;
this.spiderLeg8.rotateAngleY = f6 * 2.0F - f5; this.spiderLeg8.rotateAngleY = f6 * 2.0F - f5;
float f7 = -(MathHelper.cos(f * 0.6662F * 2.0F + 0.0F) * 0.4F) * f1; float f7 = -(MathHelper.cos(f * 0.6662F * 2.0F + 0.0F) * 0.4F) * f1;
float f8 = -(MathHelper.cos(f * 0.6662F * 2.0F + 3.1415927F) * 0.4F) * f1; float f8 = -(MathHelper.cos(f * 0.6662F * 2.0F + 3.141F) * 0.4F) * f1;
float f9 = -(MathHelper.cos(f * 0.6662F * 2.0F + 1.5707964F) * 0.4F) * f1; float f9 = -(MathHelper.cos(f * 0.6662F * 2.0F + 1.5707964F) * 0.4F) * f1;
float f10 = -(MathHelper.cos(f * 0.6662F * 2.0F + 4.712389F) * 0.4F) * f1; float f10 = -(MathHelper.cos(f * 0.6662F * 2.0F + 4.712389F) * 0.4F) * f1;
float f11 = Math.abs(MathHelper.sin(f * 0.6662F + 0.0F) * 0.4F) * f1; float f11 = Math.abs(MathHelper.sin(f * 0.6662F + 0.0F) * 0.4F) * f1;
float f12 = Math.abs(MathHelper.sin(f * 0.6662F + 3.1415927F) * 0.4F) * f1; float f12 = Math.abs(MathHelper.sin(f * 0.6662F + 3.141F) * 0.4F) * f1;
float f13 = Math.abs(MathHelper.sin(f * 0.6662F + 1.5707964F) * 0.4F) * f1; float f13 = Math.abs(MathHelper.sin(f * 0.6662F + 1.5707964F) * 0.4F) * f1;
float f14 = Math.abs(MathHelper.sin(f * 0.6662F + 4.712389F) * 0.4F) * f1; float f14 = Math.abs(MathHelper.sin(f * 0.6662F + 4.712389F) * 0.4F) * f1;
this.spiderLeg1.rotateAngleY += f7; this.spiderLeg1.rotateAngleY += f7;

2
src/main/java/net/minecraft/client/model/ModelVillager.java
View File

@ -87,7 +87,7 @@ public class ModelVillager extends ModelBase {
this.villagerArms.rotationPointZ = -1.0F; this.villagerArms.rotationPointZ = -1.0F;
this.villagerArms.rotateAngleX = -0.75F; this.villagerArms.rotateAngleX = -0.75F;
this.rightVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1 * 0.5F; this.rightVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1 * 0.5F;
this.leftVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1 * 0.5F; this.leftVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1 * 0.5F;
this.rightVillagerLeg.rotateAngleY = 0.0F; this.rightVillagerLeg.rotateAngleY = 0.0F;
this.leftVillagerLeg.rotateAngleY = 0.0F; this.leftVillagerLeg.rotateAngleY = 0.0F;
} }

4
src/main/java/net/minecraft/client/model/ModelWitch.java
View File

@ -67,9 +67,9 @@ public class ModelWitch extends ModelVillager {
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.villagerNose.offsetX = this.villagerNose.offsetY = this.villagerNose.offsetZ = 0.0F; this.villagerNose.offsetX = this.villagerNose.offsetY = this.villagerNose.offsetZ = 0.0F;
float f6 = 0.01F * (float) (entity.getEntityId() % 10); float f6 = 0.01F * (float) (entity.getEntityId() % 10);
this.villagerNose.rotateAngleX = MathHelper.sin((float) entity.ticksExisted * f6) * 4.5F * 3.1415927F / 180.0F; this.villagerNose.rotateAngleX = MathHelper.sin((float) entity.ticksExisted * f6) * 4.5F * 3.141F / 180.0F;
this.villagerNose.rotateAngleY = 0.0F; this.villagerNose.rotateAngleY = 0.0F;
this.villagerNose.rotateAngleZ = MathHelper.cos((float) entity.ticksExisted * f6) * 2.5F * 3.1415927F / 180.0F; this.villagerNose.rotateAngleZ = MathHelper.cos((float) entity.ticksExisted * f6) * 2.5F * 3.141F / 180.0F;
if (this.field_82900_g) { if (this.field_82900_g) {
this.villagerNose.rotateAngleX = -0.9F; this.villagerNose.rotateAngleX = -0.9F;
this.villagerNose.offsetZ = -0.09375F; this.villagerNose.offsetZ = -0.09375F;

4
src/main/java/net/minecraft/client/model/ModelWither.java
View File

@ -80,9 +80,9 @@ public class ModelWither extends ModelBase {
*/ */
public void setRotationAngles(float var1, float var2, float f, float f1, float f2, float var6, Entity var7) { public void setRotationAngles(float var1, float var2, float f, float f1, float f2, float var6, Entity var7) {
float f3 = MathHelper.cos(f * 0.1F); float f3 = MathHelper.cos(f * 0.1F);
this.field_82905_a[1].rotateAngleX = (0.065F + 0.05F * f3) * 3.1415927F; this.field_82905_a[1].rotateAngleX = (0.065F + 0.05F * f3) * 3.141F;
this.field_82905_a[2].setRotationPoint(-2.0F, 6.9F + MathHelper.cos(this.field_82905_a[1].rotateAngleX) * 10.0F, -0.5F + MathHelper.sin(this.field_82905_a[1].rotateAngleX) * 10.0F); this.field_82905_a[2].setRotationPoint(-2.0F, 6.9F + MathHelper.cos(this.field_82905_a[1].rotateAngleX) * 10.0F, -0.5F + MathHelper.sin(this.field_82905_a[1].rotateAngleX) * 10.0F);
this.field_82905_a[2].rotateAngleX = (0.265F + 0.1F * f3) * 3.1415927F; this.field_82905_a[2].rotateAngleX = (0.265F + 0.1F * f3) * 3.141F;
this.field_82904_b[0].rotateAngleY = f1 / 57.295776F; this.field_82904_b[0].rotateAngleY = f1 / 57.295776F;
this.field_82904_b[0].rotateAngleX = f2 / 57.295776F; this.field_82904_b[0].rotateAngleX = f2 / 57.295776F;
} }

4
src/main/java/net/minecraft/client/model/ModelWolf.java
View File

@ -142,8 +142,8 @@ public class ModelWolf extends ModelBase {
this.wolfLeg3.setRotationPoint(-2.5F, 16.0F, -4.0F); this.wolfLeg3.setRotationPoint(-2.5F, 16.0F, -4.0F);
this.wolfLeg4.setRotationPoint(0.5F, 16.0F, -4.0F); this.wolfLeg4.setRotationPoint(0.5F, 16.0F, -4.0F);
this.wolfLeg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.wolfLeg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
this.wolfLeg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.wolfLeg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.wolfLeg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.wolfLeg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1;
this.wolfLeg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; this.wolfLeg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1;
} }

4
src/main/java/net/minecraft/client/model/ModelZombie.java
View File

@ -44,8 +44,8 @@ public class ModelZombie extends ModelBiped {
*/ */
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
float f6 = MathHelper.sin(this.swingProgress * 3.1415927F); float f6 = MathHelper.sin(this.swingProgress * 3.141F);
float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.1415927F); float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.141F);
this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleZ = 0.0F;
this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F;
this.bipedRightArm.rotateAngleY = -(0.1F - f6 * 0.6F); this.bipedRightArm.rotateAngleY = -(0.1F - f6 * 0.6F);

4
src/main/java/net/minecraft/client/model/ModelZombieVillager.java
View File

@ -50,8 +50,8 @@ public class ModelZombieVillager extends ModelBiped {
*/ */
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
float f6 = MathHelper.sin(this.swingProgress * 3.1415927F); float f6 = MathHelper.sin(this.swingProgress * 3.141F);
float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.1415927F); float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.141F);
this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleZ = 0.0F;
this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F;
this.bipedRightArm.rotateAngleY = -(0.1F - f6 * 0.6F); this.bipedRightArm.rotateAngleY = -(0.1F - f6 * 0.6F);

8
src/main/java/net/minecraft/client/particle/EntityFirework.java
View File

@ -52,7 +52,7 @@ public class EntityFirework {
float f7 = 0.5F; float f7 = 0.5F;
float f8 = 0.125F; float f8 = 0.125F;
float f9 = 0.375F; float f9 = 0.375F;
float f10 = 7.1F * MathHelper.sin(((float) this.particleAge + f - 1.0F) * 0.25F * 3.1415927F); float f10 = 7.1F * MathHelper.sin(((float) this.particleAge + f - 1.0F) * 0.25F * 3.141F);
this.particleAlpha = 0.6F - ((float) this.particleAge + f - 1.0F) * 0.25F * 0.5F; this.particleAlpha = 0.6F - ((float) this.particleAge + f - 1.0F) * 0.25F * 0.5F;
float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) f - interpPosX); float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) f - interpPosX);
float f12 = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) f - interpPosY); float f12 = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) f - interpPosY);
@ -67,7 +67,7 @@ public class EntityFirework {
} }
public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2, float f3, float f4, float f5) { public boolean renderAccelerated(IAcceleratedParticleEngine accelerator, Entity var2, float f, float f1, float f2, float f3, float f4, float f5) {
accelerator.drawParticle(this, 64, 32, getBrightnessForRender(f), 64, 7.1F * MathHelper.sin(((float) this.particleAge + f - 1.0F) * 0.25F * 3.1415927F) * 0.0625f * 0.25f, this.particleRed, this.particleGreen, this.particleBlue, 0.6F - ((float) this.particleAge + f - 1.0F) * 0.25F * 0.5F); accelerator.drawParticle(this, 64, 32, getBrightnessForRender(f), 64, 7.1F * MathHelper.sin(((float) this.particleAge + f - 1.0F) * 0.25F * 3.141F) * 0.0625f * 0.25f, this.particleRed, this.particleGreen, this.particleBlue, 0.6F - ((float) this.particleAge + f - 1.0F) * 0.25F * 0.5F);
return true; return true;
} }
} }
@ -330,11 +330,11 @@ public class EntityFirework {
double d0 = shape[0][0]; double d0 = shape[0][0];
double d1 = shape[0][1]; double d1 = shape[0][1];
this.createParticle(this.posX, this.posY, this.posZ, d0 * speed, d1 * speed, 0.0D, colours, fadeColours, trail, twinkleIn); this.createParticle(this.posX, this.posY, this.posZ, d0 * speed, d1 * speed, 0.0D, colours, fadeColours, trail, twinkleIn);
float f = this.rand.nextFloat() * 3.1415927F; float f = this.rand.nextFloat() * 3.141F;
double d2 = parFlag3 ? 0.034D : 0.34D; double d2 = parFlag3 ? 0.034D : 0.34D;
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
double d3 = (double) f + (double) ((float) i * 3.1415927F) * d2; double d3 = (double) f + (double) ((float) i * 3.141F) * d2;
double d4 = d0; double d4 = d0;
double d5 = d1; double d5 = d1;

6
src/main/java/net/minecraft/client/particle/EntityNoteFX.java
View File

@ -37,9 +37,9 @@ public class EntityNoteFX extends EntityFX {
this.motionY *= 0.009999999776482582D; this.motionY *= 0.009999999776482582D;
this.motionZ *= 0.009999999776482582D; this.motionZ *= 0.009999999776482582D;
this.motionY += 0.2D; this.motionY += 0.2D;
this.particleRed = MathHelper.sin(((float) parDouble1 + 0.0F) * 3.1415927F * 2.0F) * 0.65F + 0.35F; this.particleRed = MathHelper.sin(((float) parDouble1 + 0.0F) * 3.141F * 2.0F) * 0.65F + 0.35F;
this.particleGreen = MathHelper.sin(((float) parDouble1 + 0.33333334F) * 3.1415927F * 2.0F) * 0.65F + 0.35F; this.particleGreen = MathHelper.sin(((float) parDouble1 + 0.33333334F) * 3.141F * 2.0F) * 0.65F + 0.35F;
this.particleBlue = MathHelper.sin(((float) parDouble1 + 0.6666667F) * 3.1415927F * 2.0F) * 0.65F + 0.35F; this.particleBlue = MathHelper.sin(((float) parDouble1 + 0.6666667F) * 3.141F * 2.0F) * 0.65F + 0.35F;
this.particleScale *= 0.75F; this.particleScale *= 0.75F;
this.particleScale *= parFloat1; this.particleScale *= parFloat1;
this.noteParticleScale = this.particleScale; this.noteParticleScale = this.particleScale;

2
src/main/java/net/minecraft/client/particle/MobAppearance.java
View File

@ -75,7 +75,7 @@ public class MobAppearance extends EntityFX {
float f3 = 240.0F; float f3 = 240.0F;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, f3, f3); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, f3, f3);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
float f4 = 0.05F + 0.5F * MathHelper.sin(f2 * 3.1415927F); float f4 = 0.05F + 0.5F * MathHelper.sin(f2 * 3.141F);
GlStateManager.color(1.0F, 1.0F, 1.0F, f4); GlStateManager.color(1.0F, 1.0F, 1.0F, f4);
GlStateManager.translate(0.0F, 1.8F, 0.0F); GlStateManager.translate(0.0F, 1.8F, 0.0F);
GlStateManager.rotate(180.0F - entityx.rotationYaw, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(180.0F - entityx.rotationYaw, 0.0F, 1.0F, 0.0F);

10
src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java
View File

@ -75,11 +75,11 @@ public class ActiveRenderInfo {
int i = parFlag ? 1 : 0; int i = parFlag ? 1 : 0;
float f2 = entityplayerIn.rotationPitch; float f2 = entityplayerIn.rotationPitch;
float f3 = entityplayerIn.rotationYaw; float f3 = entityplayerIn.rotationYaw;
rotationX = MathHelper.cos(f3 * 3.1415927F / 180.0F) * (float) (1 - i * 2); rotationX = MathHelper.cos(f3 * 3.141F / 180.0F) * (float) (1 - i * 2);
rotationZ = MathHelper.sin(f3 * 3.1415927F / 180.0F) * (float) (1 - i * 2); rotationZ = MathHelper.sin(f3 * 3.141F / 180.0F) * (float) (1 - i * 2);
rotationYZ = -rotationZ * MathHelper.sin(f2 * 3.1415927F / 180.0F) * (float) (1 - i * 2); rotationYZ = -rotationZ * MathHelper.sin(f2 * 3.141F / 180.0F) * (float) (1 - i * 2);
rotationXY = rotationX * MathHelper.sin(f2 * 3.1415927F / 180.0F) * (float) (1 - i * 2); rotationXY = rotationX * MathHelper.sin(f2 * 3.141F / 180.0F) * (float) (1 - i * 2);
rotationXZ = MathHelper.cos(f2 * 3.1415927F / 180.0F); rotationXZ = MathHelper.cos(f2 * 3.141F / 180.0F);
} }
public static Vec3 projectViewFromEntity(Entity parEntity, double parDouble1) { public static Vec3 projectViewFromEntity(Entity parEntity, double parDouble1) {

16
src/main/java/net/minecraft/client/renderer/EntityRenderer.java
View File

@ -430,7 +430,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
} }
f = f / (float) entitylivingbase.maxHurtTime; f = f / (float) entitylivingbase.maxHurtTime;
f = MathHelper.sin(f * f * f * f * 3.1415927F); f = MathHelper.sin(f * f * f * f * 3.141F);
float f2 = entitylivingbase.attackedAtYaw; float f2 = entitylivingbase.attackedAtYaw;
GlStateManager.rotate(-f2, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-f2, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(-f * 14.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(-f * 14.0F, 0.0F, 0.0F, 1.0F);
@ -449,9 +449,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
float f1 = -(entityplayer.distanceWalkedModified + f * partialTicks); float f1 = -(entityplayer.distanceWalkedModified + f * partialTicks);
float f2 = entityplayer.prevCameraYaw + (entityplayer.cameraYaw - entityplayer.prevCameraYaw) * partialTicks; float f2 = entityplayer.prevCameraYaw + (entityplayer.cameraYaw - entityplayer.prevCameraYaw) * partialTicks;
float f3 = entityplayer.prevCameraPitch + (entityplayer.cameraPitch - entityplayer.prevCameraPitch) * partialTicks; float f3 = entityplayer.prevCameraPitch + (entityplayer.cameraPitch - entityplayer.prevCameraPitch) * partialTicks;
GlStateManager.translate(MathHelper.sin(f1 * 3.1415927F) * f2 * 0.5F, -Math.abs(MathHelper.cos(f1 * 3.1415927F) * f2), 0.0F); GlStateManager.translate(MathHelper.sin(f1 * 3.141F) * f2 * 0.5F, -Math.abs(MathHelper.cos(f1 * 3.141F) * f2), 0.0F);
GlStateManager.rotate(MathHelper.sin(f1 * 3.1415927F) * f2 * 3.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(MathHelper.sin(f1 * 3.141F) * f2 * 3.0F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(Math.abs(MathHelper.cos(f1 * 3.1415927F - 0.2F) * f2) * 5.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(Math.abs(MathHelper.cos(f1 * 3.141F - 0.2F) * f2) * 5.0F, 1.0F, 0.0F, 0.0F);
GlStateManager.rotate(f3, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(f3, 1.0F, 0.0F, 0.0F);
} }
} }
@ -491,9 +491,9 @@ public class EntityRenderer implements IResourceManagerReloadListener {
f2 += 180.0F; f2 += 180.0F;
} }
double d4 = (double) (-MathHelper.sin(f1 / 180.0F * 3.1415927F) * MathHelper.cos(f2 / 180.0F * 3.1415927F)) * d3; double d4 = (double) (-MathHelper.sin(f1 / 180.0F * 3.141F) * MathHelper.cos(f2 / 180.0F * 3.141F)) * d3;
double d5 = (double) (MathHelper.cos(f1 / 180.0F * 3.1415927F) * MathHelper.cos(f2 / 180.0F * 3.1415927F)) * d3; double d5 = (double) (MathHelper.cos(f1 / 180.0F * 3.141F) * MathHelper.cos(f2 / 180.0F * 3.141F)) * d3;
double d6 = (double) (-MathHelper.sin(f2 / 180.0F * 3.1415927F)) * d3; double d6 = (double) (-MathHelper.sin(f2 / 180.0F * 3.141F)) * d3;
for (int i = 0; i < 8; ++i) { for (int i = 0; i < 8; ++i) {
float f3 = (float) ((i & 1) * 2 - 1); float f3 = (float) ((i & 1) * 2 - 1);
@ -810,7 +810,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
private float getNightVisionBrightness(EntityLivingBase entitylivingbaseIn, float partialTicks) { private float getNightVisionBrightness(EntityLivingBase entitylivingbaseIn, float partialTicks) {
int i = entitylivingbaseIn.getActivePotionEffect(Potion.nightVision).getDuration(); int i = entitylivingbaseIn.getActivePotionEffect(Potion.nightVision).getDuration();
return i > 200 ? 1.0F : 0.7F + MathHelper.sin(((float) i - partialTicks) * 3.1415927F * 0.2F) * 0.3F; return i > 200 ? 1.0F : 0.7F + MathHelper.sin(((float) i - partialTicks) * 3.141F * 0.2F) * 0.3F;
} }
public void func_181560_a(float parFloat1, long parLong1) { public void func_181560_a(float parFloat1, long parLong1) {

34
src/main/java/net/minecraft/client/renderer/ItemRenderer.java
View File

@ -125,7 +125,7 @@ public class ItemRenderer {
private float func_178100_c(float parFloat1) { private float func_178100_c(float parFloat1) {
float f = 1.0F - parFloat1 / 45.0F + 0.1F; float f = 1.0F - parFloat1 / 45.0F + 0.1F;
f = MathHelper.clamp_float(f, 0.0F, 1.0F); f = MathHelper.clamp_float(f, 0.0F, 1.0F);
f = -MathHelper.cos(f * 3.1415927F) * 0.5F + 0.5F; f = -MathHelper.cos(f * 3.141F) * 0.5F + 0.5F;
return f; return f;
} }
@ -162,9 +162,9 @@ public class ItemRenderer {
} }
private void renderItemMap(AbstractClientPlayer clientPlayer, float parFloat1, float parFloat2, float parFloat3) { private void renderItemMap(AbstractClientPlayer clientPlayer, float parFloat1, float parFloat2, float parFloat3) {
float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.1415927F); float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.141F);
float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.1415927F * 2.0F); float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.141F * 2.0F);
float f2 = -0.2F * MathHelper.sin(parFloat3 * 3.1415927F); float f2 = -0.2F * MathHelper.sin(parFloat3 * 3.141F);
GlStateManager.translate(f, f1, f2); GlStateManager.translate(f, f1, f2);
float f3 = this.func_178100_c(parFloat1); float f3 = this.func_178100_c(parFloat1);
GlStateManager.translate(0.0F, 0.04F, -0.72F); GlStateManager.translate(0.0F, 0.04F, -0.72F);
@ -174,8 +174,8 @@ public class ItemRenderer {
GlStateManager.rotate(f3 * -85.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(f3 * -85.0F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(0.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(0.0F, 1.0F, 0.0F, 0.0F);
this.renderPlayerArms(clientPlayer); this.renderPlayerArms(clientPlayer);
float f4 = MathHelper.sin(parFloat3 * parFloat3 * 3.1415927F); float f4 = MathHelper.sin(parFloat3 * parFloat3 * 3.141F);
float f5 = MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.1415927F); float f5 = MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.141F);
GlStateManager.rotate(f4 * -20.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(f4 * -20.0F, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(f5 * -20.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(f5 * -20.0F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(f5 * -80.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(f5 * -80.0F, 1.0F, 0.0F, 0.0F);
@ -202,15 +202,15 @@ public class ItemRenderer {
} }
private void func_178095_a(AbstractClientPlayer clientPlayer, float parFloat1, float parFloat2) { private void func_178095_a(AbstractClientPlayer clientPlayer, float parFloat1, float parFloat2) {
float f = -0.3F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.1415927F); float f = -0.3F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.141F);
float f1 = 0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.1415927F * 2.0F); float f1 = 0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.141F * 2.0F);
float f2 = -0.4F * MathHelper.sin(parFloat2 * 3.1415927F); float f2 = -0.4F * MathHelper.sin(parFloat2 * 3.141F);
GlStateManager.translate(f, f1, f2); GlStateManager.translate(f, f1, f2);
GlStateManager.translate(0.64000005F, -0.6F, -0.71999997F); GlStateManager.translate(0.64000005F, -0.6F, -0.71999997F);
GlStateManager.translate(0.0F, parFloat1 * -0.6F, 0.0F); GlStateManager.translate(0.0F, parFloat1 * -0.6F, 0.0F);
GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
float f3 = MathHelper.sin(parFloat2 * parFloat2 * 3.1415927F); float f3 = MathHelper.sin(parFloat2 * parFloat2 * 3.141F);
float f4 = MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.1415927F); float f4 = MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.141F);
GlStateManager.rotate(f4 * 70.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(f4 * 70.0F, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(f3 * -20.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(f3 * -20.0F, 0.0F, 0.0F, 1.0F);
this.mc.getTextureManager().bindTexture(clientPlayer.getLocationSkin()); this.mc.getTextureManager().bindTexture(clientPlayer.getLocationSkin());
@ -228,16 +228,16 @@ public class ItemRenderer {
} }
private void func_178105_d(float parFloat1) { private void func_178105_d(float parFloat1) {
float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.1415927F); float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.141F);
float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.1415927F * 2.0F); float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.141F * 2.0F);
float f2 = -0.2F * MathHelper.sin(parFloat1 * 3.1415927F); float f2 = -0.2F * MathHelper.sin(parFloat1 * 3.141F);
GlStateManager.translate(f, f1, f2); GlStateManager.translate(f, f1, f2);
} }
private void func_178104_a(AbstractClientPlayer clientPlayer, float parFloat1) { private void func_178104_a(AbstractClientPlayer clientPlayer, float parFloat1) {
float f = (float) clientPlayer.getItemInUseCount() - parFloat1 + 1.0F; float f = (float) clientPlayer.getItemInUseCount() - parFloat1 + 1.0F;
float f1 = f / (float) this.itemToRender.getMaxItemUseDuration(); float f1 = f / (float) this.itemToRender.getMaxItemUseDuration();
float f2 = MathHelper.abs(MathHelper.cos(f / 4.0F * 3.1415927F) * 0.1F); float f2 = MathHelper.abs(MathHelper.cos(f / 4.0F * 3.141F) * 0.1F);
if (f1 >= 0.8F) { if (f1 >= 0.8F) {
f2 = 0.0F; f2 = 0.0F;
} }
@ -258,8 +258,8 @@ public class ItemRenderer {
GlStateManager.translate(0.56F, -0.52F, -0.71999997F); GlStateManager.translate(0.56F, -0.52F, -0.71999997F);
GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F); GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F);
GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
float f = MathHelper.sin(swingProgress * swingProgress * 3.1415927F); float f = MathHelper.sin(swingProgress * swingProgress * 3.141F);
float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * 3.1415927F); float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * 3.141F);
GlStateManager.rotate(f * -20.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(f * -20.0F, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(f1 * -20.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(f1 * -20.0F, 0.0F, 0.0F, 1.0F);
GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F);

6
src/main/java/net/minecraft/client/renderer/RenderGlobal.java
View File

@ -735,8 +735,8 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
f += 180.0F; f += 180.0F;
} }
float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.1415927F); float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.141F);
float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.1415927F); float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.141F);
float f4 = -MathHelper.cos(-f * 0.017453292F); float f4 = -MathHelper.cos(-f * 0.017453292F);
float f5 = MathHelper.sin(-f * 0.017453292F); float f5 = MathHelper.sin(-f * 0.017453292F);
return new Vector3f(f3 * f4, f5, f2 * f4); return new Vector3f(f3 * f4, f5, f2 * f4);
@ -912,7 +912,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
boolean flag = true; boolean flag = true;
for (int k = 0; k <= 16; ++k) { for (int k = 0; k <= 16; ++k) {
float f21 = (float) k * 3.1415927F * 2.0F / 16.0F; float f21 = (float) k * 3.141F * 2.0F / 16.0F;
float f12 = MathHelper.sin(f21); float f12 = MathHelper.sin(f21);
float f13 = MathHelper.cos(f21); float f13 = MathHelper.cos(f21);
worldrenderer.pos((double) (f12 * 120.0F), (double) (f13 * 120.0F), (double) (f13 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex(); worldrenderer.pos((double) (f12 * 120.0F), (double) (f13 * 120.0F), (double) (f13 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex();

8
src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java
View File

@ -125,8 +125,8 @@ public class RenderDragon extends RenderLiving<EntityDragon> {
float f6 = MathHelper.sqrt_float(f2 * f2 + f3 * f3 + f4 * f4); float f6 = MathHelper.sqrt_float(f2 * f2 + f3 * f3 + f4 * f4);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translate((float) parDouble1, (float) parDouble2 + 2.0F, (float) parDouble3); GlStateManager.translate((float) parDouble1, (float) parDouble2 + 2.0F, (float) parDouble3);
GlStateManager.rotate((float) (-Math.atan2((double) f4, (double) f2)) * 180.0F / 3.1415927F - 90.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate((float) (-Math.atan2((double) f4, (double) f2)) * 180.0F / 3.141F - 90.0F, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate((float) (-Math.atan2((double) f5, (double) f3)) * 180.0F / 3.1415927F - 90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate((float) (-Math.atan2((double) f5, (double) f3)) * 180.0F / 3.141F - 90.0F, 1.0F, 0.0F, 0.0F);
Tessellator tessellator = Tessellator.getInstance(); Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer(); WorldRenderer worldrenderer = tessellator.getWorldRenderer();
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
@ -139,8 +139,8 @@ public class RenderDragon extends RenderLiving<EntityDragon> {
boolean flag = true; boolean flag = true;
for (int i = 0; i <= 8; ++i) { for (int i = 0; i <= 8; ++i) {
float f9 = MathHelper.sin((float) (i % 8) * 3.1415927F * 2.0F / 8.0F) * 0.75F; float f9 = MathHelper.sin((float) (i % 8) * 3.141F * 2.0F / 8.0F) * 0.75F;
float f10 = MathHelper.cos((float) (i % 8) * 3.1415927F * 2.0F / 8.0F) * 0.75F; float f10 = MathHelper.cos((float) (i % 8) * 3.141F * 2.0F / 8.0F) * 0.75F;
float f11 = (float) (i % 8) * 1.0F / 8.0F; float f11 = (float) (i % 8) * 1.0F / 8.0F;
worldrenderer.pos((double) (f9 * 0.2F), (double) (f10 * 0.2F), 0.0D).tex((double) f11, (double) f8).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double) (f9 * 0.2F), (double) (f10 * 0.2F), 0.0D).tex((double) f11, (double) f8).color(0, 0, 0, 255).endVertex();
worldrenderer.pos((double) f9, (double) f10, (double) f6).tex((double) f11, (double) f7).color(255, 255, 255, 255).endVertex(); worldrenderer.pos((double) f9, (double) f10, (double) f6).tex((double) f11, (double) f7).color(255, 255, 255, 255).endVertex();

8
src/main/java/net/minecraft/client/renderer/entity/RenderFish.java
View File

@ -74,10 +74,10 @@ public class RenderFish extends Render<EntityFishHook> {
GlStateManager.popMatrix(); GlStateManager.popMatrix();
if (entityfishhook.angler != null) { if (entityfishhook.angler != null) {
float f9 = entityfishhook.angler.getSwingProgress(f1); float f9 = entityfishhook.angler.getSwingProgress(f1);
float f10 = MathHelper.sin(MathHelper.sqrt_float(f9) * 3.1415927F); float f10 = MathHelper.sin(MathHelper.sqrt_float(f9) * 3.141F);
Vec3 vec3 = new Vec3(-0.36D, 0.03D, 0.35D); Vec3 vec3 = new Vec3(-0.36D, 0.03D, 0.35D);
vec3 = vec3.rotatePitch(-(entityfishhook.angler.prevRotationPitch + (entityfishhook.angler.rotationPitch - entityfishhook.angler.prevRotationPitch) * f1) * 3.1415927F / 180.0F); vec3 = vec3.rotatePitch(-(entityfishhook.angler.prevRotationPitch + (entityfishhook.angler.rotationPitch - entityfishhook.angler.prevRotationPitch) * f1) * 3.141F / 180.0F);
vec3 = vec3.rotateYaw(-(entityfishhook.angler.prevRotationYaw + (entityfishhook.angler.rotationYaw - entityfishhook.angler.prevRotationYaw) * f1) * 3.1415927F / 180.0F); vec3 = vec3.rotateYaw(-(entityfishhook.angler.prevRotationYaw + (entityfishhook.angler.rotationYaw - entityfishhook.angler.prevRotationYaw) * f1) * 3.141F / 180.0F);
vec3 = vec3.rotateYaw(f10 * 0.5F); vec3 = vec3.rotateYaw(f10 * 0.5F);
vec3 = vec3.rotatePitch(-f10 * 0.7F); vec3 = vec3.rotatePitch(-f10 * 0.7F);
double d3 = entityfishhook.angler.prevPosX + (entityfishhook.angler.posX - entityfishhook.angler.prevPosX) * (double) f1 + vec3.xCoord; double d3 = entityfishhook.angler.prevPosX + (entityfishhook.angler.posX - entityfishhook.angler.prevPosX) * (double) f1 + vec3.xCoord;
@ -85,7 +85,7 @@ public class RenderFish extends Render<EntityFishHook> {
double d5 = entityfishhook.angler.prevPosZ + (entityfishhook.angler.posZ - entityfishhook.angler.prevPosZ) * (double) f1 + vec3.zCoord; double d5 = entityfishhook.angler.prevPosZ + (entityfishhook.angler.posZ - entityfishhook.angler.prevPosZ) * (double) f1 + vec3.zCoord;
double d6 = (double) entityfishhook.angler.getEyeHeight(); double d6 = (double) entityfishhook.angler.getEyeHeight();
if (this.renderManager.options != null && this.renderManager.options.thirdPersonView > 0 || entityfishhook.angler != Minecraft.getMinecraft().thePlayer) { if (this.renderManager.options != null && this.renderManager.options.thirdPersonView > 0 || entityfishhook.angler != Minecraft.getMinecraft().thePlayer) {
float f11 = (entityfishhook.angler.prevRenderYawOffset + (entityfishhook.angler.renderYawOffset - entityfishhook.angler.prevRenderYawOffset) * f1) * 3.1415927F / 180.0F; float f11 = (entityfishhook.angler.prevRenderYawOffset + (entityfishhook.angler.renderYawOffset - entityfishhook.angler.prevRenderYawOffset) * f1) * 3.141F / 180.0F;
double d7 = (double) MathHelper.sin(f11); double d7 = (double) MathHelper.sin(f11);
double d9 = (double) MathHelper.cos(f11); double d9 = (double) MathHelper.cos(f11);
double d11 = 0.35D; double d11 = 0.35D;

4
src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
View File

@ -61,8 +61,8 @@ public class LayerArrow implements LayerRenderer<EntityLivingBase> {
f2 = f2 * -1.0F; f2 = f2 * -1.0F;
f3 = f3 * -1.0F; f3 = f3 * -1.0F;
float f7 = MathHelper.sqrt_float(f1 * f1 + f3 * f3); float f7 = MathHelper.sqrt_float(f1 * f1 + f3 * f3);
entityarrow.prevRotationYaw = entityarrow.rotationYaw = (float) (Math.atan2((double) f1, (double) f3) * 180.0D / 3.1415927410125732D); entityarrow.prevRotationYaw = entityarrow.rotationYaw = (float) (Math.atan2((double) f1, (double) f3) * 180.0D / 3.141);
entityarrow.prevRotationPitch = entityarrow.rotationPitch = (float) (Math.atan2((double) f2, (double) f7) * 180.0D / 3.1415927410125732D); entityarrow.prevRotationPitch = entityarrow.rotationPitch = (float) (Math.atan2((double) f2, (double) f7) * 180.0D / 3.141);
double d0 = 0.0D; double d0 = 0.0D;
double d1 = 0.0D; double d1 = 0.0D;
double d2 = 0.0D; double d2 = 0.0D;

4
src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java
View File

@ -51,8 +51,8 @@ public class LayerCape implements LayerRenderer<AbstractClientPlayer> {
double d1 = abstractclientplayer.prevChasingPosY + (abstractclientplayer.chasingPosY - abstractclientplayer.prevChasingPosY) * (double) f - (abstractclientplayer.prevPosY + (abstractclientplayer.posY - abstractclientplayer.prevPosY) * (double) f); double d1 = abstractclientplayer.prevChasingPosY + (abstractclientplayer.chasingPosY - abstractclientplayer.prevChasingPosY) * (double) f - (abstractclientplayer.prevPosY + (abstractclientplayer.posY - abstractclientplayer.prevPosY) * (double) f);
double d2 = abstractclientplayer.prevChasingPosZ + (abstractclientplayer.chasingPosZ - abstractclientplayer.prevChasingPosZ) * (double) f - (abstractclientplayer.prevPosZ + (abstractclientplayer.posZ - abstractclientplayer.prevPosZ) * (double) f); double d2 = abstractclientplayer.prevChasingPosZ + (abstractclientplayer.chasingPosZ - abstractclientplayer.prevChasingPosZ) * (double) f - (abstractclientplayer.prevPosZ + (abstractclientplayer.posZ - abstractclientplayer.prevPosZ) * (double) f);
float f1 = abstractclientplayer.prevRenderYawOffset + (abstractclientplayer.renderYawOffset - abstractclientplayer.prevRenderYawOffset) * f; float f1 = abstractclientplayer.prevRenderYawOffset + (abstractclientplayer.renderYawOffset - abstractclientplayer.prevRenderYawOffset) * f;
double d3 = (double) MathHelper.sin(f1 * 3.1415927F / 180.0F); double d3 = (double) MathHelper.sin(f1 * 3.141F / 180.0F);
double d4 = (double) (-MathHelper.cos(f1 * 3.1415927F / 180.0F)); double d4 = (double) (-MathHelper.cos(f1 * 3.141F / 180.0F));
float f2 = (float) d1 * 10.0F; float f2 = (float) d1 * 10.0F;
f2 = MathHelper.clamp_float(f2, -6.0F, 32.0F); f2 = MathHelper.clamp_float(f2, -6.0F, 32.0F);
float f3 = (float) (d0 * d3 + d2 * d4) * 100.0F; float f3 = (float) (d0 * d3 + d2 * d4) * 100.0F;

2
src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java
View File

@ -41,7 +41,7 @@ public class LayerIronGolemFlower implements LayerRenderer<EntityIronGolem> {
BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher(); BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
GlStateManager.enableRescaleNormal(); GlStateManager.enableRescaleNormal();
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.rotate(5.0F + 180.0F * ((ModelIronGolem) this.ironGolemRenderer.getMainModel()).ironGolemRightArm.rotateAngleX / 3.1415927F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(5.0F + 180.0F * ((ModelIronGolem) this.ironGolemRenderer.getMainModel()).ironGolemRightArm.rotateAngleX / 3.141F, 1.0F, 0.0F, 0.0F);
GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
GlStateManager.translate(-0.9375F, -0.625F, -0.9375F); GlStateManager.translate(-0.9375F, -0.625F, -0.9375F);
float f1 = 0.5F; float f1 = 0.5F;

2
src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java
View File

@ -58,7 +58,7 @@ public class TextureCompass extends EaglerTextureAtlasSprite {
parDouble3 = parDouble3 % 360.0D; parDouble3 = parDouble3 % 360.0D;
d0 = -((parDouble3 - 90.0D) * 3.141592653589793D / 180.0D - Math.atan2(d2, d1)); d0 = -((parDouble3 - 90.0D) * 3.141592653589793D / 180.0D - Math.atan2(d2, d1));
if (!worldIn.provider.isSurfaceWorld()) { if (!worldIn.provider.isSurfaceWorld()) {
d0 = Math.random() * 3.1415927410125732D * 2.0D; d0 = Math.random() * 3.141 * 2.0D;
} }
} }

2
src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
View File

@ -74,7 +74,7 @@ public class TileEntityBannerRenderer extends TileEntitySpecialRenderer<TileEnti
BlockPos blockpos = te.getPos(); BlockPos blockpos = te.getPos();
float f3 = (float) (blockpos.getX() * 7 + blockpos.getY() * 9 + blockpos.getZ() * 13) + (float) j + partialTicks; float f3 = (float) (blockpos.getX() * 7 + blockpos.getY() * 9 + blockpos.getZ() * 13) + (float) j + partialTicks;
this.bannerModel.bannerSlate.rotateAngleX = (-0.0125F + 0.01F * MathHelper.cos(f3 * 3.1415927F * 0.02F)) * 3.1415927F; this.bannerModel.bannerSlate.rotateAngleX = (-0.0125F + 0.01F * MathHelper.cos(f3 * 3.141F * 0.02F)) * 3.141F;
GlStateManager.enableRescaleNormal(); GlStateManager.enableRescaleNormal();
ResourceLocation resourcelocation = this.func_178463_a(te); ResourceLocation resourcelocation = this.func_178463_a(te);
if (resourcelocation != null) { if (resourcelocation != null) {

2
src/main/java/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
View File

@ -156,7 +156,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer<TileEntit
f1 = 1.0F - f1; f1 = 1.0F - f1;
f1 = 1.0F - f1 * f1 * f1; f1 = 1.0F - f1 * f1 * f1;
modelchest.chestLid.rotateAngleX = -(f1 * 3.1415927F / 2.0F); modelchest.chestLid.rotateAngleX = -(f1 * 3.141F / 2.0F);
modelchest.renderAll(); modelchest.renderAll();
GlStateManager.disableRescaleNormal(); GlStateManager.disableRescaleNormal();
GlStateManager.popMatrix(); GlStateManager.popMatrix();

6
src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java
View File

@ -40,14 +40,14 @@ public class TileEntityEnchantmentTableRenderer extends TileEntitySpecialRendere
GlStateManager.translate(0.0F, 0.1F + MathHelper.sin(f1 * 0.1F) * 0.01F, 0.0F); GlStateManager.translate(0.0F, 0.1F + MathHelper.sin(f1 * 0.1F) * 0.01F, 0.0F);
float f2; float f2;
for (f2 = tileentityenchantmenttable.bookRotation - tileentityenchantmenttable.bookRotationPrev; f2 >= 3.1415927F; f2 -= 6.2831855F) {} for (f2 = tileentityenchantmenttable.bookRotation - tileentityenchantmenttable.bookRotationPrev; f2 >= 3.141F; f2 -= 6.2831855F) {}
while (f2 < -3.1415927F) { while (f2 < -3.141F) {
f2 += 6.2831855F; f2 += 6.2831855F;
} }
float f3 = tileentityenchantmenttable.bookRotationPrev + f2 * f; float f3 = tileentityenchantmenttable.bookRotationPrev + f2 * f;
GlStateManager.rotate(-f3 * 180.0F / 3.1415927F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-f3 * 180.0F / 3.141F, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(80.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(80.0F, 0.0F, 0.0F, 1.0F);
this.bindTexture(TEXTURE_BOOK); this.bindTexture(TEXTURE_BOOK);
float f4 = tileentityenchantmenttable.pageFlipPrev + (tileentityenchantmenttable.pageFlip - tileentityenchantmenttable.pageFlipPrev) * f + 0.25F; float f4 = tileentityenchantmenttable.pageFlipPrev + (tileentityenchantmenttable.pageFlip - tileentityenchantmenttable.pageFlipPrev) * f + 0.25F;

2
src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java
View File

@ -75,7 +75,7 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer<Tile
float f1 = tileentityenderchest.prevLidAngle + (tileentityenderchest.lidAngle - tileentityenderchest.prevLidAngle) * f; float f1 = tileentityenderchest.prevLidAngle + (tileentityenderchest.lidAngle - tileentityenderchest.prevLidAngle) * f;
f1 = 1.0F - f1; f1 = 1.0F - f1;
f1 = 1.0F - f1 * f1 * f1; f1 = 1.0F - f1 * f1 * f1;
this.field_147521_c.chestLid.rotateAngleX = -(f1 * 3.1415927F / 2.0F); this.field_147521_c.chestLid.rotateAngleX = -(f1 * 3.141F / 2.0F);
this.field_147521_c.renderAll(); this.field_147521_c.renderAll();
GlStateManager.disableRescaleNormal(); GlStateManager.disableRescaleNormal();
GlStateManager.popMatrix(); GlStateManager.popMatrix();

8
src/main/java/net/minecraft/entity/Entity.java
View File

@ -862,8 +862,8 @@ public abstract class Entity {
f = friction / f; f = friction / f;
strafe = strafe * f; strafe = strafe * f;
forward = forward * f; forward = forward * f;
float f1 = MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F); float f1 = MathHelper.sin(this.rotationYaw * 3.141F / 180.0F);
float f2 = MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F); float f2 = MathHelper.cos(this.rotationYaw * 3.141F / 180.0F);
this.motionX += (double) (strafe * f2 - forward * f1); this.motionX += (double) (strafe * f2 - forward * f1);
this.motionZ += (double) (forward * f2 + strafe * f1); this.motionZ += (double) (forward * f2 + strafe * f1);
} }
@ -1067,8 +1067,8 @@ public abstract class Entity {
* rotation. * rotation.
*/ */
protected final Vec3 getVectorForRotation(float pitch, float yaw) { protected final Vec3 getVectorForRotation(float pitch, float yaw) {
float f = MathHelper.cos(-yaw * 0.017453292F - 3.1415927F); float f = MathHelper.cos(-yaw * 0.017453292F - 3.141F);
float f1 = MathHelper.sin(-yaw * 0.017453292F - 3.1415927F); float f1 = MathHelper.sin(-yaw * 0.017453292F - 3.141F);
float f2 = -MathHelper.cos(-pitch * 0.017453292F); float f2 = -MathHelper.cos(-pitch * 0.017453292F);
float f3 = MathHelper.sin(-pitch * 0.017453292F); float f3 = MathHelper.sin(-pitch * 0.017453292F);
return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2)); return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2));

4
src/main/java/net/minecraft/entity/EntityLiving.java
View File

@ -424,8 +424,8 @@ public abstract class EntityLiving extends EntityLivingBase {
} }
double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2);
float f = (float) (MathHelper.func_181159_b(d2, d0) * 180.0D / 3.1415927410125732D) - 90.0F; float f = (float) (MathHelper.func_181159_b(d2, d0) * 180.0D / 3.141) - 90.0F;
float f1 = (float) (-(MathHelper.func_181159_b(d1, d3) * 180.0D / 3.1415927410125732D)); float f1 = (float) (-(MathHelper.func_181159_b(d1, d3) * 180.0D / 3.141));
this.rotationPitch = this.updateRotation(this.rotationPitch, f1, parFloat2); this.rotationPitch = this.updateRotation(this.rotationPitch, f1, parFloat2);
this.rotationYaw = this.updateRotation(this.rotationYaw, f, parFloat1); this.rotationYaw = this.updateRotation(this.rotationYaw, f, parFloat1);
} }

12
src/main/java/net/minecraft/entity/EntityLivingBase.java
View File

@ -130,7 +130,7 @@ public abstract class EntityLivingBase extends Entity {
this.field_70770_ap = (float) ((Math.random() + 1.0D) * 0.009999999776482582D); this.field_70770_ap = (float) ((Math.random() + 1.0D) * 0.009999999776482582D);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.field_70769_ao = (float) Math.random() * 12398.0F; this.field_70769_ao = (float) Math.random() * 12398.0F;
this.rotationYaw = (float) (Math.random() * 3.1415927410125732D * 2.0D); this.rotationYaw = (float) (Math.random() * 3.141 * 2.0D);
this.rotationYawHead = this.rotationYaw; this.rotationYawHead = this.rotationYaw;
this.stepHeight = 0.6F; this.stepHeight = 0.6F;
} }
@ -595,12 +595,12 @@ public abstract class EntityLivingBase extends Entity {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D);
vec3 = vec3.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec3 = vec3.rotatePitch(-this.rotationPitch * 3.141F / 180.0F);
vec3 = vec3.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec3 = vec3.rotateYaw(-this.rotationYaw * 3.141F / 180.0F);
double d0 = (double) (-this.rand.nextFloat()) * 0.6D - 0.3D; double d0 = (double) (-this.rand.nextFloat()) * 0.6D - 0.3D;
Vec3 vec31 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D); Vec3 vec31 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D);
vec31 = vec31.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec31 = vec31.rotatePitch(-this.rotationPitch * 3.141F / 180.0F);
vec31 = vec31.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec31 = vec31.rotateYaw(-this.rotationYaw * 3.141F / 180.0F);
vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ);
this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord + 0.05D, vec3.zCoord, new int[] { Item.getIdFromItem(stack.getItem()) }); this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord + 0.05D, vec3.zCoord, new int[] { Item.getIdFromItem(stack.getItem()) });
} }
@ -1203,7 +1203,7 @@ public abstract class EntityLivingBase extends Entity {
if (f > 0.0025000002F) { if (f > 0.0025000002F) {
f3 = 1.0F; f3 = 1.0F;
f2 = (float) Math.sqrt((double) f) * 3.0F; f2 = (float) Math.sqrt((double) f) * 3.0F;
f1 = (float) MathHelper.func_181159_b(d1, d0) * 180.0F / 3.1415927F - 90.0F; f1 = (float) MathHelper.func_181159_b(d1, d0) * 180.0F / 3.141F - 90.0F;
} }
if (this.swingProgress > 0.0F) { if (this.swingProgress > 0.0F) {

16
src/main/java/net/minecraft/entity/boss/EntityDragon.java
View File

@ -123,8 +123,8 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
* to react to sunlight and start to burn. * to react to sunlight and start to burn.
*/ */
public void onLivingUpdate() { public void onLivingUpdate() {
float f = MathHelper.cos(this.animTime * 3.1415927F * 2.0F); float f = MathHelper.cos(this.animTime * 3.141F * 2.0F);
float f1 = MathHelper.cos(this.prevAnimTime * 3.1415927F * 2.0F); float f1 = MathHelper.cos(this.prevAnimTime * 3.141F * 2.0F);
if (f1 <= -0.3F && f >= -0.3F && !this.isSilent()) { if (f1 <= -0.3F && f >= -0.3F && !this.isSilent()) {
this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.enderdragon.wings", 5.0F, 0.8F + this.rand.nextFloat() * 0.3F, false); this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.enderdragon.wings", 5.0F, 0.8F + this.rand.nextFloat() * 0.3F, false);
} }
@ -185,10 +185,10 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
this.dragonPartWing1.width = 4.0F; this.dragonPartWing1.width = 4.0F;
this.dragonPartWing2.height = 3.0F; this.dragonPartWing2.height = 3.0F;
this.dragonPartWing2.width = 4.0F; this.dragonPartWing2.width = 4.0F;
float f12 = (float) (this.getMovementOffsets(5, 1.0F)[1] - this.getMovementOffsets(10, 1.0F)[1]) * 10.0F / 180.0F * 3.1415927F; float f12 = (float) (this.getMovementOffsets(5, 1.0F)[1] - this.getMovementOffsets(10, 1.0F)[1]) * 10.0F / 180.0F * 3.141F;
float f2 = MathHelper.cos(f12); float f2 = MathHelper.cos(f12);
float f15 = -MathHelper.sin(f12); float f15 = -MathHelper.sin(f12);
float f3 = this.rotationYaw * 3.1415927F / 180.0F; float f3 = this.rotationYaw * 3.141F / 180.0F;
float f16 = MathHelper.sin(f3); float f16 = MathHelper.sin(f3);
float f4 = MathHelper.cos(f3); float f4 = MathHelper.cos(f3);
this.dragonPartBody.onUpdate(); this.dragonPartBody.onUpdate();
@ -200,8 +200,8 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
double[] adouble1 = this.getMovementOffsets(5, 1.0F); double[] adouble1 = this.getMovementOffsets(5, 1.0F);
double[] adouble = this.getMovementOffsets(0, 1.0F); double[] adouble = this.getMovementOffsets(0, 1.0F);
float f18 = MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F - this.randomYawVelocity * 0.01F); float f18 = MathHelper.sin(this.rotationYaw * 3.141F / 180.0F - this.randomYawVelocity * 0.01F);
float f19 = MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F - this.randomYawVelocity * 0.01F); float f19 = MathHelper.cos(this.rotationYaw * 3.141F / 180.0F - this.randomYawVelocity * 0.01F);
this.dragonPartHead.onUpdate(); this.dragonPartHead.onUpdate();
this.dragonPartHead.setLocationAndAngles(this.posX + (double) (f18 * 5.5F * f2), this.posY + (adouble[1] - adouble1[1]) * 1.0D + (double) (f15 * 5.5F), this.posZ - (double) (f19 * 5.5F * f2), 0.0F, 0.0F); this.dragonPartHead.setLocationAndAngles(this.posX + (double) (f18 * 5.5F * f2), this.posY + (adouble[1] - adouble1[1]) * 1.0D + (double) (f15 * 5.5F), this.posZ - (double) (f19 * 5.5F * f2), 0.0F, 0.0F);
@ -220,7 +220,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
} }
double[] adouble2 = this.getMovementOffsets(12 + j * 2, 1.0F); double[] adouble2 = this.getMovementOffsets(12 + j * 2, 1.0F);
float f20 = this.rotationYaw * 3.1415927F / 180.0F + this.simplifyAngle(adouble2[0] - adouble1[0]) * 3.1415927F / 180.0F * 1.0F; float f20 = this.rotationYaw * 3.141F / 180.0F + this.simplifyAngle(adouble2[0] - adouble1[0]) * 3.141F / 180.0F * 1.0F;
float f21 = MathHelper.sin(f20); float f21 = MathHelper.sin(f20);
float f22 = MathHelper.cos(f20); float f22 = MathHelper.cos(f20);
float f23 = 1.5F; float f23 = 1.5F;
@ -275,7 +275,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
f = f / 4.0F + 1.0F; f = f / 4.0F + 1.0F;
} }
float f1 = this.rotationYaw * 3.1415927F / 180.0F; float f1 = this.rotationYaw * 3.141F / 180.0F;
float f2 = MathHelper.sin(f1); float f2 = MathHelper.sin(f1);
float f3 = MathHelper.cos(f1); float f3 = MathHelper.cos(f1);
this.targetX = this.posX + (double) (f2 * 5.0F) + (double) ((this.rand.nextFloat() - 0.5F) * 2.0F); this.targetX = this.posX + (double) (f2 * 5.0F) + (double) ((this.rand.nextFloat() - 0.5F) * 2.0F);

8
src/main/java/net/minecraft/entity/boss/EntityWither.java
View File

@ -153,8 +153,8 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged
double d7 = entity1.posY + (double) entity1.getEyeHeight() - d12; double d7 = entity1.posY + (double) entity1.getEyeHeight() - d12;
double d8 = entity1.posZ - d13; double d8 = entity1.posZ - d13;
double d9 = (double) MathHelper.sqrt_double(d6 * d6 + d8 * d8); double d9 = (double) MathHelper.sqrt_double(d6 * d6 + d8 * d8);
float f = (float) (MathHelper.func_181159_b(d8, d6) * 180.0D / 3.1415927410125732D) - 90.0F; float f = (float) (MathHelper.func_181159_b(d8, d6) * 180.0D / 3.141) - 90.0F;
float f1 = (float) (-(MathHelper.func_181159_b(d7, d9) * 180.0D / 3.1415927410125732D)); float f1 = (float) (-(MathHelper.func_181159_b(d7, d9) * 180.0D / 3.141));
this.field_82220_d[j] = this.func_82204_b(this.field_82220_d[j], f1, 40.0F); this.field_82220_d[j] = this.func_82204_b(this.field_82220_d[j], f1, 40.0F);
this.field_82221_e[j] = this.func_82204_b(this.field_82221_e[j], f, 10.0F); this.field_82221_e[j] = this.func_82204_b(this.field_82221_e[j], f, 10.0F);
} else { } else {
@ -317,7 +317,7 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged
if (parInt1 <= 0) { if (parInt1 <= 0) {
return this.posX; return this.posX;
} else { } else {
float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.1415927F; float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.141F;
float f1 = MathHelper.cos(f); float f1 = MathHelper.cos(f);
return this.posX + (double) f1 * 1.3D; return this.posX + (double) f1 * 1.3D;
} }
@ -331,7 +331,7 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged
if (parInt1 <= 0) { if (parInt1 <= 0) {
return this.posZ; return this.posZ;
} else { } else {
float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.1415927F; float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.141F;
float f1 = MathHelper.sin(f); float f1 = MathHelper.sin(f);
return this.posZ + (double) f1 * 1.3D; return this.posZ + (double) f1 * 1.3D;
} }

4
src/main/java/net/minecraft/entity/item/EntityBoat.java
View File

@ -265,8 +265,8 @@ public class EntityBoat extends Entity {
if (this.riddenByEntity instanceof EntityLivingBase) { if (this.riddenByEntity instanceof EntityLivingBase) {
EntityLivingBase entitylivingbase = (EntityLivingBase) this.riddenByEntity; EntityLivingBase entitylivingbase = (EntityLivingBase) this.riddenByEntity;
float f = this.riddenByEntity.rotationYaw + -entitylivingbase.moveStrafing * 90.0F; float f = this.riddenByEntity.rotationYaw + -entitylivingbase.moveStrafing * 90.0F;
this.motionX += -Math.sin((double) (f * 3.1415927F / 180.0F)) * this.speedMultiplier * (double) entitylivingbase.moveForward * 0.05000000074505806D; this.motionX += -Math.sin((double) (f * 3.141F / 180.0F)) * this.speedMultiplier * (double) entitylivingbase.moveForward * 0.05000000074505806D;
this.motionZ += Math.cos((double) (f * 3.1415927F / 180.0F)) * this.speedMultiplier * (double) entitylivingbase.moveForward * 0.05000000074505806D; this.motionZ += Math.cos((double) (f * 3.141F / 180.0F)) * this.speedMultiplier * (double) entitylivingbase.moveForward * 0.05000000074505806D;
} }
double d11 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); double d11 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);

8
src/main/java/net/minecraft/entity/item/EntityEnderEye.java
View File

@ -92,8 +92,8 @@ public class EntityEnderEye extends Entity {
this.motionZ = d2; this.motionZ = d2;
if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.141);
} }
} }
@ -109,9 +109,9 @@ public class EntityEnderEye extends Entity {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.141);
for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.1415927410125732D); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.141); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;

8
src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java
View File

@ -78,8 +78,8 @@ public class EntityFireworkRocket extends Entity {
this.motionZ = d2; this.motionZ = d2;
if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.141);
} }
} }
@ -96,9 +96,9 @@ public class EntityFireworkRocket extends Entity {
this.motionY += 0.04D; this.motionY += 0.04D;
this.moveEntity(this.motionX, this.motionY, this.motionZ); this.moveEntity(this.motionX, this.motionY, this.motionZ);
float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.141);
for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.1415927410125732D); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.141); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;

4
src/main/java/net/minecraft/entity/item/EntityMinecart.java
View File

@ -292,8 +292,8 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
if (this.riddenByEntity instanceof EntityLivingBase) { if (this.riddenByEntity instanceof EntityLivingBase) {
double d6 = (double) ((EntityLivingBase) this.riddenByEntity).moveForward; double d6 = (double) ((EntityLivingBase) this.riddenByEntity).moveForward;
if (d6 > 0.0D) { if (d6 > 0.0D) {
double d7 = -Math.sin((double) (this.riddenByEntity.rotationYaw * 3.1415927F / 180.0F)); double d7 = -Math.sin((double) (this.riddenByEntity.rotationYaw * 3.141F / 180.0F));
double d8 = Math.cos((double) (this.riddenByEntity.rotationYaw * 3.1415927F / 180.0F)); double d8 = Math.cos((double) (this.riddenByEntity.rotationYaw * 3.141F / 180.0F));
double d9 = this.motionX * this.motionX + this.motionZ * this.motionZ; double d9 = this.motionX * this.motionX + this.motionZ * this.motionZ;
if (d9 < 0.01D) { if (d9 < 0.01D) {
this.motionX += d7 * 0.1D; this.motionX += d7 * 0.1D;

2
src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java
View File

@ -38,7 +38,7 @@ public class EntityTNTPrimed extends Entity {
public EntityTNTPrimed(World worldIn, double parDouble1, double parDouble2, double parDouble3, EntityLivingBase parEntityLivingBase) { public EntityTNTPrimed(World worldIn, double parDouble1, double parDouble2, double parDouble3, EntityLivingBase parEntityLivingBase) {
this(worldIn); this(worldIn);
this.setPosition(parDouble1, parDouble2, parDouble3); this.setPosition(parDouble1, parDouble2, parDouble3);
float f = (float) (Math.random() * 3.1415927410125732D * 2.0D); float f = (float) (Math.random() * 3.141 * 2.0D);
this.motionX = (double) (-((float) Math.sin((double) f)) * 0.02F); this.motionX = (double) (-((float) Math.sin((double) f)) * 0.02F);
this.motionY = 0.20000000298023224D; this.motionY = 0.20000000298023224D;
this.motionZ = (double) (-((float) Math.cos((double) f)) * 0.02F); this.motionZ = (double) (-((float) Math.cos((double) f)) * 0.02F);

2
src/main/java/net/minecraft/entity/monster/EntityMob.java
View File

@ -85,7 +85,7 @@ public abstract class EntityMob extends EntityCreature implements IMob {
boolean flag = entity.attackEntityFrom(DamageSource.causeMobDamage(this), f); boolean flag = entity.attackEntityFrom(DamageSource.causeMobDamage(this), f);
if (flag) { if (flag) {
if (i > 0) { if (i > 0) {
entity.addVelocity((double) (-MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F) * (float) i * 0.5F)); entity.addVelocity((double) (-MathHelper.sin(this.rotationYaw * 3.141F / 180.0F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.rotationYaw * 3.141F / 180.0F) * (float) i * 0.5F));
this.motionX *= 0.6D; this.motionX *= 0.6D;
this.motionZ *= 0.6D; this.motionZ *= 0.6D;
} }

2
src/main/java/net/minecraft/entity/monster/EntitySlime.java
View File

@ -118,7 +118,7 @@ public class EntitySlime extends EntityLiving implements IMob {
int i = this.getSlimeSize(); int i = this.getSlimeSize();
for (int j = 0; j < i * 8; ++j) { for (int j = 0; j < i * 8; ++j) {
float f = this.rand.nextFloat() * 3.1415927F * 2.0F; float f = this.rand.nextFloat() * 3.141F * 2.0F;
float f1 = this.rand.nextFloat() * 0.5F + 0.5F; float f1 = this.rand.nextFloat() * 0.5F + 0.5F;
float f2 = MathHelper.sin(f) * (float) i * 0.5F * f1; float f2 = MathHelper.sin(f) * (float) i * 0.5F * f1;
float f3 = MathHelper.cos(f) * (float) i * 0.5F * f1; float f3 = MathHelper.cos(f) * (float) i * 0.5F * f1;

2
src/main/java/net/minecraft/entity/passive/EntityBat.java
View File

@ -154,7 +154,7 @@ public class EntityBat extends EntityAmbientCreature {
this.motionX += (Math.signum(d0) * 0.5D - this.motionX) * 0.10000000149011612D; this.motionX += (Math.signum(d0) * 0.5D - this.motionX) * 0.10000000149011612D;
this.motionY += (Math.signum(d1) * 0.699999988079071D - this.motionY) * 0.10000000149011612D; this.motionY += (Math.signum(d1) * 0.699999988079071D - this.motionY) * 0.10000000149011612D;
this.motionZ += (Math.signum(d2) * 0.5D - this.motionZ) * 0.10000000149011612D; this.motionZ += (Math.signum(d2) * 0.5D - this.motionZ) * 0.10000000149011612D;
float f = (float) (MathHelper.func_181159_b(this.motionZ, this.motionX) * 180.0D / 3.1415927410125732D) - 90.0F; float f = (float) (MathHelper.func_181159_b(this.motionZ, this.motionX) * 180.0D / 3.141) - 90.0F;
float f1 = MathHelper.wrapAngleTo180_float(f - this.rotationYaw); float f1 = MathHelper.wrapAngleTo180_float(f - this.rotationYaw);
this.moveForward = 0.5F; this.moveForward = 0.5F;
this.rotationYaw += f1; this.rotationYaw += f1;

4
src/main/java/net/minecraft/entity/passive/EntityChicken.java
View File

@ -180,8 +180,8 @@ public class EntityChicken extends EntityAnimal {
public void updateRiderPosition() { public void updateRiderPosition() {
super.updateRiderPosition(); super.updateRiderPosition();
float f = MathHelper.sin(this.renderYawOffset * 3.1415927F / 180.0F); float f = MathHelper.sin(this.renderYawOffset * 3.141F / 180.0F);
float f1 = MathHelper.cos(this.renderYawOffset * 3.1415927F / 180.0F); float f1 = MathHelper.cos(this.renderYawOffset * 3.141F / 180.0F);
float f2 = 0.1F; float f2 = 0.1F;
float f3 = 0.0F; float f3 = 0.0F;
this.riddenByEntity.setPosition(this.posX + (double) (f2 * f), this.posY + (double) (this.height * 0.5F) + this.riddenByEntity.getYOffset() + (double) f3, this.posZ - (double) (f2 * f1)); this.riddenByEntity.setPosition(this.posX + (double) (f2 * f), this.posY + (double) (this.height * 0.5F) + this.riddenByEntity.getYOffset() + (double) f3, this.posZ - (double) (f2 * f1));

8
src/main/java/net/minecraft/entity/passive/EntityHorse.java
View File

@ -983,8 +983,8 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
this.setHorseJumping(true); this.setHorseJumping(true);
this.isAirBorne = true; this.isAirBorne = true;
if (f1 > 0.0F) { if (f1 > 0.0F) {
float f2 = MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F); float f2 = MathHelper.sin(this.rotationYaw * 3.141F / 180.0F);
float f3 = MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F); float f3 = MathHelper.cos(this.rotationYaw * 3.141F / 180.0F);
this.motionX += (double) (-0.4F * f2 * this.jumpPower); this.motionX += (double) (-0.4F * f2 * this.jumpPower);
this.motionZ += (double) (0.4F * f3 * this.jumpPower); this.motionZ += (double) (0.4F * f3 * this.jumpPower);
this.playSound("mob.horse.jump", 0.4F, 1.0F); this.playSound("mob.horse.jump", 0.4F, 1.0F);
@ -1291,8 +1291,8 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
public void updateRiderPosition() { public void updateRiderPosition() {
super.updateRiderPosition(); super.updateRiderPosition();
if (this.prevRearingAmount > 0.0F) { if (this.prevRearingAmount > 0.0F) {
float f = MathHelper.sin(this.renderYawOffset * 3.1415927F / 180.0F); float f = MathHelper.sin(this.renderYawOffset * 3.141F / 180.0F);
float f1 = MathHelper.cos(this.renderYawOffset * 3.1415927F / 180.0F); float f1 = MathHelper.cos(this.renderYawOffset * 3.141F / 180.0F);
float f2 = 0.7F * this.prevRearingAmount; float f2 = 0.7F * this.prevRearingAmount;
float f3 = 0.15F * this.prevRearingAmount; float f3 = 0.15F * this.prevRearingAmount;
this.riddenByEntity.setPosition(this.posX + (double) (f2 * f), this.posY + this.getMountedYOffset() + this.riddenByEntity.getYOffset() + (double) f3, this.posZ - (double) (f2 * f1)); this.riddenByEntity.setPosition(this.posX + (double) (f2 * f), this.posY + this.getMountedYOffset() + this.riddenByEntity.getYOffset() + (double) f3, this.posZ - (double) (f2 * f1));

12
src/main/java/net/minecraft/entity/passive/EntitySquid.java
View File

@ -137,9 +137,9 @@ public class EntitySquid extends EntityWaterMob {
} }
if (this.inWater) { if (this.inWater) {
if (this.squidRotation < 3.1415927F) { if (this.squidRotation < 3.141F) {
float f = this.squidRotation / 3.1415927F; float f = this.squidRotation / 3.141F;
this.tentacleAngle = MathHelper.sin(f * f * 3.1415927F) * 3.1415927F * 0.25F; this.tentacleAngle = MathHelper.sin(f * f * 3.141F) * 3.141F * 0.25F;
if ((double) f > 0.75D) { if ((double) f > 0.75D) {
this.randomMotionSpeed = 1.0F; this.randomMotionSpeed = 1.0F;
this.field_70871_bB = 1.0F; this.field_70871_bB = 1.0F;
@ -153,12 +153,12 @@ public class EntitySquid extends EntityWaterMob {
} }
float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.renderYawOffset += (-((float) MathHelper.func_181159_b(this.motionX, this.motionZ)) * 180.0F / 3.1415927F - this.renderYawOffset) * 0.1F; this.renderYawOffset += (-((float) MathHelper.func_181159_b(this.motionX, this.motionZ)) * 180.0F / 3.141F - this.renderYawOffset) * 0.1F;
this.rotationYaw = this.renderYawOffset; this.rotationYaw = this.renderYawOffset;
this.squidYaw = (float) ((double) this.squidYaw + 3.141592653589793D * (double) this.field_70871_bB * 1.5D); this.squidYaw = (float) ((double) this.squidYaw + 3.141592653589793D * (double) this.field_70871_bB * 1.5D);
this.squidPitch += (-((float) MathHelper.func_181159_b((double) f1, this.motionY)) * 180.0F / 3.1415927F - this.squidPitch) * 0.1F; this.squidPitch += (-((float) MathHelper.func_181159_b((double) f1, this.motionY)) * 180.0F / 3.141F - this.squidPitch) * 0.1F;
} else { } else {
this.tentacleAngle = MathHelper.abs(MathHelper.sin(this.squidRotation)) * 3.1415927F * 0.25F; this.tentacleAngle = MathHelper.abs(MathHelper.sin(this.squidRotation)) * 3.141F * 0.25F;
this.squidPitch = (float) ((double) this.squidPitch + (double) (-90.0F - this.squidPitch) * 0.02D); this.squidPitch = (float) ((double) this.squidPitch + (double) (-90.0F - this.squidPitch) * 0.02D);
} }
} }

8
src/main/java/net/minecraft/entity/passive/EntityWolf.java
View File

@ -181,7 +181,7 @@ public class EntityWolf extends EntityTameable {
if (this.timeWolfIsShaking > 0.4F) { if (this.timeWolfIsShaking > 0.4F) {
float f = (float) this.getEntityBoundingBox().minY; float f = (float) this.getEntityBoundingBox().minY;
int i = (int) (MathHelper.sin((this.timeWolfIsShaking - 0.4F) * 3.1415927F) * 7.0F); int i = (int) (MathHelper.sin((this.timeWolfIsShaking - 0.4F) * 3.141F) * 7.0F);
for (int j = 0; j < i; ++j) { for (int j = 0; j < i; ++j) {
float f1 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width * 0.5F; float f1 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width * 0.5F;
@ -215,11 +215,11 @@ public class EntityWolf extends EntityTameable {
f = 1.0F; f = 1.0F;
} }
return MathHelper.sin(f * 3.1415927F) * MathHelper.sin(f * 3.1415927F * 11.0F) * 0.15F * 3.1415927F; return MathHelper.sin(f * 3.141F) * MathHelper.sin(f * 3.141F * 11.0F) * 0.15F * 3.141F;
} }
public float getInterestedAngle(float parFloat1) { public float getInterestedAngle(float parFloat1) {
return (this.headRotationCourseOld + (this.headRotationCourse - this.headRotationCourseOld) * parFloat1) * 0.15F * 3.1415927F; return (this.headRotationCourseOld + (this.headRotationCourse - this.headRotationCourseOld) * parFloat1) * 0.15F * 3.141F;
} }
public float getEyeHeight() { public float getEyeHeight() {
@ -331,7 +331,7 @@ public class EntityWolf extends EntityTameable {
} }
public float getTailRotation() { public float getTailRotation() {
return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (20.0F - this.dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * 3.1415927F : 0.62831855F); return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (20.0F - this.dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * 3.141F : 0.62831855F);
} }
/**+ /**+

24
src/main/java/net/minecraft/entity/player/EntityPlayer.java
View File

@ -331,12 +331,12 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
if (itemStackIn.getItemUseAction() == EnumAction.EAT) { if (itemStackIn.getItemUseAction() == EnumAction.EAT) {
for (int i = 0; i < parInt1; ++i) { for (int i = 0; i < parInt1; ++i) {
Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D);
vec3 = vec3.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec3 = vec3.rotatePitch(-this.rotationPitch * 3.141F / 180.0F);
vec3 = vec3.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec3 = vec3.rotateYaw(-this.rotationYaw * 3.141F / 180.0F);
double d0 = (double) (-this.rand.nextFloat()) * 0.6D - 0.3D; double d0 = (double) (-this.rand.nextFloat()) * 0.6D - 0.3D;
Vec3 vec31 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D); Vec3 vec31 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D);
vec31 = vec31.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec31 = vec31.rotatePitch(-this.rotationPitch * 3.141F / 180.0F);
vec31 = vec31.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec31 = vec31.rotateYaw(-this.rotationYaw * 3.141F / 180.0F);
vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ);
if (itemStackIn.getHasSubtypes()) { if (itemStackIn.getHasSubtypes()) {
this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord + 0.05D, vec3.zCoord, new int[] { Item.getIdFromItem(itemStackIn.getItem()), itemStackIn.getMetadata() }); this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord + 0.05D, vec3.zCoord, new int[] { Item.getIdFromItem(itemStackIn.getItem()), itemStackIn.getMetadata() });
@ -538,8 +538,8 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
} }
if (damagesource != null) { if (damagesource != null) {
this.motionX = (double) (-MathHelper.cos((this.attackedAtYaw + this.rotationYaw) * 3.1415927F / 180.0F) * 0.1F); this.motionX = (double) (-MathHelper.cos((this.attackedAtYaw + this.rotationYaw) * 3.141F / 180.0F) * 0.1F);
this.motionZ = (double) (-MathHelper.sin((this.attackedAtYaw + this.rotationYaw) * 3.1415927F / 180.0F) * 0.1F); this.motionZ = (double) (-MathHelper.sin((this.attackedAtYaw + this.rotationYaw) * 3.141F / 180.0F) * 0.1F);
} else { } else {
this.motionX = this.motionZ = 0.0D; this.motionX = this.motionZ = 0.0D;
} }
@ -636,16 +636,16 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
if (dropAround) { if (dropAround) {
float f = this.rand.nextFloat() * 0.5F; float f = this.rand.nextFloat() * 0.5F;
float f1 = this.rand.nextFloat() * 3.1415927F * 2.0F; float f1 = this.rand.nextFloat() * 3.141F * 2.0F;
entityitem.motionX = (double) (-MathHelper.sin(f1) * f); entityitem.motionX = (double) (-MathHelper.sin(f1) * f);
entityitem.motionZ = (double) (MathHelper.cos(f1) * f); entityitem.motionZ = (double) (MathHelper.cos(f1) * f);
entityitem.motionY = 0.20000000298023224D; entityitem.motionY = 0.20000000298023224D;
} else { } else {
float f2 = 0.3F; float f2 = 0.3F;
entityitem.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f2); entityitem.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f2);
entityitem.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f2); entityitem.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f2);
entityitem.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.1415927F) * f2 + 0.1F); entityitem.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.141F) * f2 + 0.1F);
float f3 = this.rand.nextFloat() * 3.1415927F * 2.0F; float f3 = this.rand.nextFloat() * 3.141F * 2.0F;
f2 = 0.02F * this.rand.nextFloat(); f2 = 0.02F * this.rand.nextFloat();
entityitem.motionX += Math.cos((double) f3) * (double) f2; entityitem.motionX += Math.cos((double) f3) * (double) f2;
entityitem.motionY += (double) ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); entityitem.motionY += (double) ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F);
@ -1041,7 +1041,7 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
boolean flag2 = entity.attackEntityFrom(DamageSource.causePlayerDamage(this), f); boolean flag2 = entity.attackEntityFrom(DamageSource.causePlayerDamage(this), f);
if (flag2) { if (flag2) {
if (i > 0) { if (i > 0) {
entity.addVelocity((double) (-MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F) * (float) i * 0.5F)); entity.addVelocity((double) (-MathHelper.sin(this.rotationYaw * 3.141F / 180.0F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.rotationYaw * 3.141F / 180.0F) * (float) i * 0.5F));
this.motionX *= 0.6D; this.motionX *= 0.6D;
this.motionZ *= 0.6D; this.motionZ *= 0.6D;
this.setSprinting(false); this.setSprinting(false);

30
src/main/java/net/minecraft/entity/projectile/EntityArrow.java
View File

@ -82,8 +82,8 @@ public class EntityArrow extends Entity implements IProjectile {
double d2 = parEntityLivingBase.posZ - shooter.posZ; double d2 = parEntityLivingBase.posZ - shooter.posZ;
double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2);
if (d3 >= 1.0E-7D) { if (d3 >= 1.0E-7D) {
float f = (float) (MathHelper.func_181159_b(d2, d0) * 180.0D / 3.1415927410125732D) - 90.0F; float f = (float) (MathHelper.func_181159_b(d2, d0) * 180.0D / 3.141) - 90.0F;
float f1 = (float) (-(MathHelper.func_181159_b(d1, d3) * 180.0D / 3.1415927410125732D)); float f1 = (float) (-(MathHelper.func_181159_b(d1, d3) * 180.0D / 3.141));
double d4 = d0 / d3; double d4 = d0 / d3;
double d5 = d2 / d3; double d5 = d2 / d3;
this.setLocationAndAngles(shooter.posX + d4, this.posY, shooter.posZ + d5, f, f1); this.setLocationAndAngles(shooter.posX + d4, this.posY, shooter.posZ + d5, f, f1);
@ -102,13 +102,13 @@ public class EntityArrow extends Entity implements IProjectile {
this.setSize(0.5F, 0.5F); this.setSize(0.5F, 0.5F);
this.setLocationAndAngles(shooter.posX, shooter.posY + (double) shooter.getEyeHeight(), shooter.posZ, shooter.rotationYaw, shooter.rotationPitch); this.setLocationAndAngles(shooter.posX, shooter.posY + (double) shooter.getEyeHeight(), shooter.posZ, shooter.rotationYaw, shooter.rotationPitch);
this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * 0.16F);
this.posY -= 0.10000000149011612D; this.posY -= 0.10000000149011612D;
this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * 0.16F);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F)); this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F));
this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F)); this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F));
this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.1415927F)); this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.141F));
this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, velocity * 1.5F, 1.0F); this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, velocity * 1.5F, 1.0F);
} }
@ -135,8 +135,8 @@ public class EntityArrow extends Entity implements IProjectile {
this.motionY = y; this.motionY = y;
this.motionZ = z; this.motionZ = z;
float f1 = MathHelper.sqrt_double(x * x + z * z); float f1 = MathHelper.sqrt_double(x * x + z * z);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(x, z) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(x, z) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(y, (double) f1) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(y, (double) f1) * 180.0D / 3.141);
this.ticksInGround = 0; this.ticksInGround = 0;
} }
@ -154,8 +154,8 @@ public class EntityArrow extends Entity implements IProjectile {
this.motionZ = d2; this.motionZ = d2;
if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch; this.prevRotationPitch = this.rotationPitch;
this.prevRotationYaw = this.rotationYaw; this.prevRotationYaw = this.rotationYaw;
this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch);
@ -170,8 +170,8 @@ public class EntityArrow extends Entity implements IProjectile {
super.onUpdate(); super.onUpdate();
if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.141);
} }
BlockPos blockpos = new BlockPos(this.xTile, this.yTile, this.zTile); BlockPos blockpos = new BlockPos(this.xTile, this.yTile, this.zTile);
@ -328,9 +328,9 @@ public class EntityArrow extends Entity implements IProjectile {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
float f3 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f3 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.141);
for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f3) * 180.0D / 3.1415927410125732D); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f3) * 180.0D / 3.141); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;

4
src/main/java/net/minecraft/entity/projectile/EntityFireball.java
View File

@ -147,9 +147,9 @@ public abstract class EntityFireball extends Entity {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionZ, this.motionX) * 180.0D / 3.1415927410125732D) + 90.0F; this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionZ, this.motionX) * 180.0D / 3.141) + 90.0F;
for (this.rotationPitch = (float) (MathHelper.func_181159_b((double) f1, this.motionY) * 180.0D / 3.1415927410125732D) - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} for (this.rotationPitch = (float) (MathHelper.func_181159_b((double) f1, this.motionY) * 180.0D / 3.141) - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;

18
src/main/java/net/minecraft/entity/projectile/EntityFishHook.java
View File

@ -130,14 +130,14 @@ public class EntityFishHook extends Entity {
this.angler.fishEntity = this; this.angler.fishEntity = this;
this.setSize(0.25F, 0.25F); this.setSize(0.25F, 0.25F);
this.setLocationAndAngles(fishingPlayer.posX, fishingPlayer.posY + (double) fishingPlayer.getEyeHeight(), fishingPlayer.posZ, fishingPlayer.rotationYaw, fishingPlayer.rotationPitch); this.setLocationAndAngles(fishingPlayer.posX, fishingPlayer.posY + (double) fishingPlayer.getEyeHeight(), fishingPlayer.posZ, fishingPlayer.rotationYaw, fishingPlayer.rotationPitch);
this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * 0.16F);
this.posY -= 0.10000000149011612D; this.posY -= 0.10000000149011612D;
this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * 0.16F);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
float f = 0.4F; float f = 0.4F;
this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f); this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f);
this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f); this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f);
this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.1415927F) * f); this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.141F) * f);
this.handleHookCasting(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F); this.handleHookCasting(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F);
} }
@ -173,8 +173,8 @@ public class EntityFishHook extends Entity {
this.motionY = parDouble2; this.motionY = parDouble2;
this.motionZ = parDouble3; this.motionZ = parDouble3;
float f1 = MathHelper.sqrt_double(parDouble1 * parDouble1 + parDouble3 * parDouble3); float f1 = MathHelper.sqrt_double(parDouble1 * parDouble1 + parDouble3 * parDouble3);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(parDouble1, parDouble3) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(parDouble1, parDouble3) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(parDouble2, (double) f1) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(parDouble2, (double) f1) * 180.0D / 3.141);
this.ticksInGround = 0; this.ticksInGround = 0;
} }
@ -285,9 +285,9 @@ public class EntityFishHook extends Entity {
if (!this.inGround) { if (!this.inGround) {
this.moveEntity(this.motionX, this.motionY, this.motionZ); this.moveEntity(this.motionX, this.motionY, this.motionZ);
float f5 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f5 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.141);
for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f5) * 180.0D / 3.1415927410125732D); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f5) * 180.0D / 3.141); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;

22
src/main/java/net/minecraft/entity/projectile/EntityThrowable.java
View File

@ -55,14 +55,14 @@ public abstract class EntityThrowable extends Entity implements IProjectile {
this.thrower = throwerIn; this.thrower = throwerIn;
this.setSize(0.25F, 0.25F); this.setSize(0.25F, 0.25F);
this.setLocationAndAngles(throwerIn.posX, throwerIn.posY + (double) throwerIn.getEyeHeight(), throwerIn.posZ, throwerIn.rotationYaw, throwerIn.rotationPitch); this.setLocationAndAngles(throwerIn.posX, throwerIn.posY + (double) throwerIn.getEyeHeight(), throwerIn.posZ, throwerIn.rotationYaw, throwerIn.rotationPitch);
this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * 0.16F);
this.posY -= 0.10000000149011612D; this.posY -= 0.10000000149011612D;
this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * 0.16F);
this.setPosition(this.posX, this.posY, this.posZ); this.setPosition(this.posX, this.posY, this.posZ);
float f = 0.4F; float f = 0.4F;
this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f); this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f);
this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f); this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f);
this.motionY = (double) (-MathHelper.sin((this.rotationPitch + this.getInaccuracy()) / 180.0F * 3.1415927F) * f); this.motionY = (double) (-MathHelper.sin((this.rotationPitch + this.getInaccuracy()) / 180.0F * 3.141F) * f);
this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.getVelocity(), 1.0F); this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.getVelocity(), 1.0F);
} }
@ -100,8 +100,8 @@ public abstract class EntityThrowable extends Entity implements IProjectile {
this.motionY = d1; this.motionY = d1;
this.motionZ = d2; this.motionZ = d2;
float f3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2); float f3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f3) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f3) * 180.0D / 3.141);
this.ticksInGround = 0; this.ticksInGround = 0;
} }
@ -114,8 +114,8 @@ public abstract class EntityThrowable extends Entity implements IProjectile {
this.motionZ = d2; this.motionZ = d2;
if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.141);
this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.141);
} }
} }
@ -172,9 +172,9 @@ public abstract class EntityThrowable extends Entity implements IProjectile {
this.posY += this.motionY; this.posY += this.motionY;
this.posZ += this.motionZ; this.posZ += this.motionZ;
float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.141);
for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f1) * 180.0D / 3.1415927410125732D); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} for (this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f1) * 180.0D / 3.141); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { while (this.rotationPitch - this.prevRotationPitch >= 180.0F) {
this.prevRotationPitch += 360.0F; this.prevRotationPitch += 360.0F;

4
src/main/java/net/minecraft/item/Item.java
View File

@ -407,8 +407,8 @@ public class Item {
double d1 = playerIn.posY + (double) playerIn.getEyeHeight(); double d1 = playerIn.posY + (double) playerIn.getEyeHeight();
double d2 = playerIn.posZ; double d2 = playerIn.posZ;
Vec3 vec3 = new Vec3(d0, d1, d2); Vec3 vec3 = new Vec3(d0, d1, d2);
float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.1415927F); float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.141F);
float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.1415927F); float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.141F);
float f4 = -MathHelper.cos(-f * 0.017453292F); float f4 = -MathHelper.cos(-f * 0.017453292F);
float f5 = MathHelper.sin(-f * 0.017453292F); float f5 = MathHelper.sin(-f * 0.017453292F);
float f6 = f3 * f4; float f6 = f3 * f4;

4
src/main/java/net/minecraft/item/ItemBoat.java
View File

@ -51,8 +51,8 @@ public class ItemBoat extends Item {
double d1 = entityplayer.prevPosY + (entityplayer.posY - entityplayer.prevPosY) * (double) f + (double) entityplayer.getEyeHeight(); double d1 = entityplayer.prevPosY + (entityplayer.posY - entityplayer.prevPosY) * (double) f + (double) entityplayer.getEyeHeight();
double d2 = entityplayer.prevPosZ + (entityplayer.posZ - entityplayer.prevPosZ) * (double) f; double d2 = entityplayer.prevPosZ + (entityplayer.posZ - entityplayer.prevPosZ) * (double) f;
Vec3 vec3 = new Vec3(d0, d1, d2); Vec3 vec3 = new Vec3(d0, d1, d2);
float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.1415927F); float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.141F);
float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.1415927F); float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.141F);
float f5 = -MathHelper.cos(-f1 * 0.017453292F); float f5 = -MathHelper.cos(-f1 * 0.017453292F);
float f6 = MathHelper.sin(-f1 * 0.017453292F); float f6 = MathHelper.sin(-f1 * 0.017453292F);
float f7 = f4 * f5; float f7 = f4 * f5;

12
src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java
View File

@ -87,26 +87,26 @@ public class TileEntityEnchantmentTable extends TileEntity implements ITickable,
this.bookSpread -= 0.1F; this.bookSpread -= 0.1F;
} }
while (this.bookRotation >= 3.1415927F) { while (this.bookRotation >= 3.141F) {
this.bookRotation -= 6.2831855F; this.bookRotation -= 6.2831855F;
} }
while (this.bookRotation < -3.1415927F) { while (this.bookRotation < -3.141F) {
this.bookRotation += 6.2831855F; this.bookRotation += 6.2831855F;
} }
while (this.field_145924_q >= 3.1415927F) { while (this.field_145924_q >= 3.141F) {
this.field_145924_q -= 6.2831855F; this.field_145924_q -= 6.2831855F;
} }
while (this.field_145924_q < -3.1415927F) { while (this.field_145924_q < -3.141F) {
this.field_145924_q += 6.2831855F; this.field_145924_q += 6.2831855F;
} }
float f2; float f2;
for (f2 = this.field_145924_q - this.bookRotation; f2 >= 3.1415927F; f2 -= 6.2831855F) {} for (f2 = this.field_145924_q - this.bookRotation; f2 >= 3.141F; f2 -= 6.2831855F) {}
while (f2 < -3.1415927F) { while (f2 < -3.141F) {
f2 += 6.2831855F; f2 += 6.2831855F;
} }

12
src/main/java/net/minecraft/world/World.java
View File

@ -1054,7 +1054,7 @@ public abstract class World implements IBlockAccess {
*/ */
public int calculateSkylightSubtracted(float parFloat1) { public int calculateSkylightSubtracted(float parFloat1) {
float f = this.getCelestialAngle(parFloat1); float f = this.getCelestialAngle(parFloat1);
float f1 = 1.0F - (MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F); float f1 = 1.0F - (MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F);
f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F);
f1 = 1.0F - f1; f1 = 1.0F - f1;
f1 = (float) ((double) f1 * (1.0D - (double) (this.getRainStrength(parFloat1) * 5.0F) / 16.0D)); f1 = (float) ((double) f1 * (1.0D - (double) (this.getRainStrength(parFloat1) * 5.0F) / 16.0D));
@ -1069,7 +1069,7 @@ public abstract class World implements IBlockAccess {
*/ */
public float getSunBrightness(float parFloat1) { public float getSunBrightness(float parFloat1) {
float f = this.getCelestialAngle(parFloat1); float f = this.getCelestialAngle(parFloat1);
float f1 = 1.0F - (MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.2F); float f1 = 1.0F - (MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.2F);
f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F);
f1 = 1.0F - f1; f1 = 1.0F - f1;
f1 = (float) ((double) f1 * (1.0D - (double) (this.getRainStrength(parFloat1) * 5.0F) / 16.0D)); f1 = (float) ((double) f1 * (1.0D - (double) (this.getRainStrength(parFloat1) * 5.0F) / 16.0D));
@ -1082,7 +1082,7 @@ public abstract class World implements IBlockAccess {
*/ */
public Vec3 getSkyColor(Entity entityIn, float partialTicks) { public Vec3 getSkyColor(Entity entityIn, float partialTicks) {
float f = this.getCelestialAngle(partialTicks); float f = this.getCelestialAngle(partialTicks);
float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; float f1 = MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F;
f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F);
int i = MathHelper.floor_double(entityIn.posX); int i = MathHelper.floor_double(entityIn.posX);
int j = MathHelper.floor_double(entityIn.posY); int j = MathHelper.floor_double(entityIn.posY);
@ -1154,12 +1154,12 @@ public abstract class World implements IBlockAccess {
*/ */
public float getCelestialAngleRadians(float partialTicks) { public float getCelestialAngleRadians(float partialTicks) {
float f = this.getCelestialAngle(partialTicks); float f = this.getCelestialAngle(partialTicks);
return f * 3.1415927F * 2.0F; return f * 3.141F * 2.0F;
} }
public Vec3 getCloudColour(float partialTicks) { public Vec3 getCloudColour(float partialTicks) {
float f = this.getCelestialAngle(partialTicks); float f = this.getCelestialAngle(partialTicks);
float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; float f1 = MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F;
f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F);
float f2 = (float) (this.cloudColour >> 16 & 255L) / 255.0F; float f2 = (float) (this.cloudColour >> 16 & 255L) / 255.0F;
float f3 = (float) (this.cloudColour >> 8 & 255L) / 255.0F; float f3 = (float) (this.cloudColour >> 8 & 255L) / 255.0F;
@ -1225,7 +1225,7 @@ public abstract class World implements IBlockAccess {
*/ */
public float getStarBrightness(float partialTicks) { public float getStarBrightness(float partialTicks) {
float f = this.getCelestialAngle(partialTicks); float f = this.getCelestialAngle(partialTicks);
float f1 = 1.0F - (MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.25F); float f1 = 1.0F - (MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.25F);
f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F);
return f1 * f1 * 0.5F; return f1 * f1 * 0.5F;
} }

6
src/main/java/net/minecraft/world/WorldProvider.java
View File

@ -98,11 +98,11 @@ public abstract class WorldProvider {
*/ */
public float[] calcSunriseSunsetColors(float celestialAngle, float partialTicks) { public float[] calcSunriseSunsetColors(float celestialAngle, float partialTicks) {
float f = 0.4F; float f = 0.4F;
float f1 = MathHelper.cos(celestialAngle * 3.1415927F * 2.0F) - 0.0F; float f1 = MathHelper.cos(celestialAngle * 3.141F * 2.0F) - 0.0F;
float f2 = 0.0F; float f2 = 0.0F;
if (f1 >= f2 - f && f1 <= f2 + f) { if (f1 >= f2 - f && f1 <= f2 + f) {
float f3 = (f1 - f2) / f * 0.5F + 0.5F; float f3 = (f1 - f2) / f * 0.5F + 0.5F;
float f4 = 1.0F - (1.0F - MathHelper.sin(f3 * 3.1415927F)) * 0.99F; float f4 = 1.0F - (1.0F - MathHelper.sin(f3 * 3.141F)) * 0.99F;
f4 = f4 * f4; f4 = f4 * f4;
this.colorsSunriseSunset[0] = f3 * 0.3F + 0.7F; this.colorsSunriseSunset[0] = f3 * 0.3F + 0.7F;
this.colorsSunriseSunset[1] = f3 * f3 * 0.7F + 0.2F; this.colorsSunriseSunset[1] = f3 * f3 * 0.7F + 0.2F;
@ -118,7 +118,7 @@ public abstract class WorldProvider {
* Return Vec3D with biome specific fog color * Return Vec3D with biome specific fog color
*/ */
public Vec3 getFogColor(float parFloat1, float parFloat2) { public Vec3 getFogColor(float parFloat1, float parFloat2) {
float f = MathHelper.cos(parFloat1 * 3.1415927F * 2.0F) * 2.0F + 0.5F; float f = MathHelper.cos(parFloat1 * 3.141F * 2.0F) * 2.0F + 0.5F;
f = MathHelper.clamp_float(f, 0.0F, 1.0F); f = MathHelper.clamp_float(f, 0.0F, 1.0F);
float f1 = 0.7529412F; float f1 = 0.7529412F;
float f2 = 0.84705883F; float f2 = 0.84705883F;

2
src/main/java/net/minecraft/world/WorldProviderEnd.java
View File

@ -52,7 +52,7 @@ public class WorldProviderEnd extends WorldProvider {
*/ */
public Vec3 getFogColor(float f, float var2) { public Vec3 getFogColor(float f, float var2) {
int i = 10518688; int i = 10518688;
float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; float f1 = MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F;
f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F);
float f2 = (float) (i >> 16 & 255) / 255.0F; float f2 = (float) (i >> 16 & 255) / 255.0F;
float f3 = (float) (i >> 8 & 255) / 255.0F; float f3 = (float) (i >> 8 & 255) / 255.0F;