diff --git a/src/main/java/net/minecraft/block/BlockDaylightDetector.java b/src/main/java/net/minecraft/block/BlockDaylightDetector.java index 424ed19a..87b5e61a 100644 --- a/src/main/java/net/minecraft/block/BlockDaylightDetector.java +++ b/src/main/java/net/minecraft/block/BlockDaylightDetector.java @@ -68,7 +68,7 @@ public class BlockDaylightDetector extends BlockContainer { IBlockState iblockstate = worldIn.getBlockState(pos); int i = worldIn.getLightFor(EnumSkyBlock.SKY, pos) - worldIn.getSkylightSubtracted(); float f = worldIn.getCelestialAngleRadians(1.0F); - float f1 = f < 3.141F ? 0.0F : 6.2831855F; + float f1 = f < 3.1415927F ? 0.0F : 6.2831855F; f = f + (f1 - f) * 0.2F; i = Math.round((float) i * MathHelper.cos(f)); i = MathHelper.clamp_int(i, 0, 15); diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index 2f83f50a..8ccbbe35 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -918,7 +918,7 @@ public class Minecraft implements IThreadListener { worldrenderer.pos((double) i, (double) j, 0.0D).color(j1, k1, l1, 255).endVertex(); for (int i2 = l; i2 >= 0; --i2) { - float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l) * 3.141 * 2.0D / 100.0D); + float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l) * 3.1415927410125732D * 2.0D / 100.0D); float f1 = MathHelper.sin(f) * (float) short1; 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).endVertex(); @@ -928,7 +928,7 @@ public class Minecraft implements IThreadListener { worldrenderer.begin(5, DefaultVertexFormats.POSITION_COLOR); for (int l2 = l; l2 >= 0; --l2) { - float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l) * 3.141 * 2.0D / 100.0D); + float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l) * 3.1415927410125732D * 2.0D / 100.0D); float f4 = MathHelper.sin(f3) * (float) short1; float f5 = MathHelper.cos(f3) * (float) short1 * 0.5F; worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5), 0.0D).color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex(); diff --git a/src/main/java/net/minecraft/client/model/ModelBat.java b/src/main/java/net/minecraft/client/model/ModelBat.java index 53940ea7..f3a7abd9 100644 --- a/src/main/java/net/minecraft/client/model/ModelBat.java +++ b/src/main/java/net/minecraft/client/model/ModelBat.java @@ -85,12 +85,12 @@ public class ModelBat extends ModelBase { if (((EntityBat) entity).getIsBatHanging()) { float f3 = 57.295776F; this.batHead.rotateAngleX = f2 / 57.295776F; - this.batHead.rotateAngleY = 3.141F - f1 / 57.295776F; - this.batHead.rotateAngleZ = 3.141F; + this.batHead.rotateAngleY = 3.1415927F - f1 / 57.295776F; + this.batHead.rotateAngleZ = 3.1415927F; this.batHead.setRotationPoint(0.0F, -2.0F, 0.0F); this.batRightWing.setRotationPoint(-3.0F, 0.0F, 3.0F); this.batLeftWing.setRotationPoint(3.0F, 0.0F, 3.0F); - this.batBody.rotateAngleX = 3.141F; + this.batBody.rotateAngleX = 3.1415927F; this.batRightWing.rotateAngleX = -0.15707964F; this.batRightWing.rotateAngleY = -1.2566371F; this.batOuterRightWing.rotateAngleY = -1.7278761F; @@ -107,7 +107,7 @@ public class ModelBat extends ModelBase { this.batLeftWing.setRotationPoint(0.0F, 0.0F, 0.0F); this.batBody.rotateAngleX = 0.7853982F + MathHelper.cos(f * 0.1F) * 0.15F; this.batBody.rotateAngleY = 0.0F; - this.batRightWing.rotateAngleY = MathHelper.cos(f * 1.3F) * 3.141F * 0.25F; + this.batRightWing.rotateAngleY = MathHelper.cos(f * 1.3F) * 3.1415927F * 0.25F; this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY; this.batOuterRightWing.rotateAngleY = this.batRightWing.rotateAngleY * 0.5F; this.batOuterLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY * 0.5F; diff --git a/src/main/java/net/minecraft/client/model/ModelBiped.java b/src/main/java/net/minecraft/client/model/ModelBiped.java index 3a54fb4b..91a52327 100644 --- a/src/main/java/net/minecraft/client/model/ModelBiped.java +++ b/src/main/java/net/minecraft/client/model/ModelBiped.java @@ -122,12 +122,12 @@ public class ModelBiped extends ModelBase { 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.rotateAngleX = f4 / 57.295776F; - this.bipedRightArm.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 2.0F * f1 * 0.5F; + this.bipedRightArm.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 2.0F * f1 * 0.5F; this.bipedLeftArm.rotateAngleX = MathHelper.cos(f * 0.6662F) * 2.0F * f1 * 0.5F; this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; - this.bipedLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1; + this.bipedLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.bipedRightLeg.rotateAngleY = 0.0F; this.bipedLeftLeg.rotateAngleY = 0.0F; if (this.isRiding) { @@ -161,7 +161,7 @@ public class ModelBiped extends ModelBase { this.bipedLeftArm.rotateAngleY = 0.0F; if (this.swingProgress > -9990.0F) { float f5 = this.swingProgress; - this.bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f5) * 3.141F * 2.0F) * 0.2F; + this.bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f5) * 3.1415927F * 2.0F) * 0.2F; this.bipedRightArm.rotationPointZ = MathHelper.sin(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; @@ -173,11 +173,11 @@ public class ModelBiped extends ModelBase { f5 = f5 * f5; f5 = f5 * f5; f5 = 1.0F - f5; - float f6 = MathHelper.sin(f5 * 3.141F); - float f7 = MathHelper.sin(this.swingProgress * 3.141F) * -(this.bipedHead.rotateAngleX - 0.7F) * 0.75F; + float f6 = MathHelper.sin(f5 * 3.1415927F); + float f7 = MathHelper.sin(this.swingProgress * 3.1415927F) * -(this.bipedHead.rotateAngleX - 0.7F) * 0.75F; this.bipedRightArm.rotateAngleX = (float) ((double) this.bipedRightArm.rotateAngleX - ((double) f6 * 1.2D + (double) f7)); this.bipedRightArm.rotateAngleY += this.bipedBody.rotateAngleY * 2.0F; - this.bipedRightArm.rotateAngleZ += MathHelper.sin(this.swingProgress * 3.141F) * -0.4F; + this.bipedRightArm.rotateAngleZ += MathHelper.sin(this.swingProgress * 3.1415927F) * -0.4F; } if (this.isSneak) { diff --git a/src/main/java/net/minecraft/client/model/ModelBlaze.java b/src/main/java/net/minecraft/client/model/ModelBlaze.java index 92daa03a..79c19ea5 100644 --- a/src/main/java/net/minecraft/client/model/ModelBlaze.java +++ b/src/main/java/net/minecraft/client/model/ModelBlaze.java @@ -60,7 +60,7 @@ public class ModelBlaze extends ModelBase { * legs can swing at most. */ public void setRotationAngles(float var1, float var2, float f, float f1, float f2, float var6, Entity var7) { - float f3 = f * 3.141F * -0.1F; + float f3 = f * 3.1415927F * -0.1F; for (int i = 0; i < 4; ++i) { 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 = 0.7853982F + f * 3.141F * 0.03F; + f3 = 0.7853982F + f * 3.1415927F * 0.03F; for (int j = 4; j < 8; ++j) { 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 = 0.47123894F + f * 3.141F * -0.05F; + f3 = 0.47123894F + f * 3.1415927F * -0.05F; for (int k = 8; k < 12; ++k) { this.blazeSticks[k].rotationPointY = 11.0F + MathHelper.cos(((float) k * 1.5F + f) * 0.5F); diff --git a/src/main/java/net/minecraft/client/model/ModelBoat.java b/src/main/java/net/minecraft/client/model/ModelBoat.java index ce7a8aab..cb9de0d5 100644 --- a/src/main/java/net/minecraft/client/model/ModelBoat.java +++ b/src/main/java/net/minecraft/client/model/ModelBoat.java @@ -47,7 +47,7 @@ public class ModelBoat extends ModelBase { this.boatSides[0].rotateAngleX = 1.5707964F; this.boatSides[1].rotateAngleY = 4.712389F; this.boatSides[2].rotateAngleY = 1.5707964F; - this.boatSides[3].rotateAngleY = 3.141F; + this.boatSides[3].rotateAngleY = 3.1415927F; } /**+ diff --git a/src/main/java/net/minecraft/client/model/ModelBook.java b/src/main/java/net/minecraft/client/model/ModelBook.java index d17d4288..75435f43 100644 --- a/src/main/java/net/minecraft/client/model/ModelBook.java +++ b/src/main/java/net/minecraft/client/model/ModelBook.java @@ -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) { float f4 = (MathHelper.sin(f * 0.02F) * 0.1F + 1.25F) * f3; - this.coverRight.rotateAngleY = 3.141F + f4; + this.coverRight.rotateAngleY = 3.1415927F + f4; this.coverLeft.rotateAngleY = -f4; this.pagesRight.rotateAngleY = f4; this.pagesLeft.rotateAngleY = -f4; diff --git a/src/main/java/net/minecraft/client/model/ModelChicken.java b/src/main/java/net/minecraft/client/model/ModelChicken.java index d7421aad..58cf7990 100644 --- a/src/main/java/net/minecraft/client/model/ModelChicken.java +++ b/src/main/java/net/minecraft/client/model/ModelChicken.java @@ -112,7 +112,7 @@ public class ModelChicken extends ModelBase { this.chin.rotateAngleY = this.head.rotateAngleY; this.body.rotateAngleX = 1.5707964F; this.rightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; - this.leftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1; + this.leftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.rightWing.rotateAngleZ = f2; this.leftWing.rotateAngleZ = -f2; } diff --git a/src/main/java/net/minecraft/client/model/ModelCreeper.java b/src/main/java/net/minecraft/client/model/ModelCreeper.java index 860758df..88bfa8cd 100644 --- a/src/main/java/net/minecraft/client/model/ModelCreeper.java +++ b/src/main/java/net/minecraft/client/model/ModelCreeper.java @@ -85,8 +85,8 @@ public class ModelCreeper extends ModelBase { this.head.rotateAngleY = f2 / 57.295776F; this.head.rotateAngleX = f3 / 57.295776F; this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 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.141F) * 1.4F * f1; + this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; + this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; } } diff --git a/src/main/java/net/minecraft/client/model/ModelDragon.java b/src/main/java/net/minecraft/client/model/ModelDragon.java index 0d8fa5d9..36e3757b 100644 --- a/src/main/java/net/minecraft/client/model/ModelDragon.java +++ b/src/main/java/net/minecraft/client/model/ModelDragon.java @@ -136,8 +136,8 @@ public class ModelDragon extends ModelBase { GlStateManager.pushMatrix(); EntityDragon entitydragon = (EntityDragon) entity; float f1 = entitydragon.prevAnimTime + (entitydragon.animTime - entitydragon.prevAnimTime) * this.partialTicks; - this.jaw.rotateAngleX = (float) (Math.sin((double) (f1 * 3.141F * 2.0F)) + 1.0D) * 0.2F; - float f2 = (float) (Math.sin((double) (f1 * 3.141F * 2.0F - 1.0F)) + 1.0D); + this.jaw.rotateAngleX = (float) (Math.sin((double) (f1 * 3.1415927F * 2.0F)) + 1.0D) * 0.2F; + float f2 = (float) (Math.sin((double) (f1 * 3.1415927F * 2.0F - 1.0F)) + 1.0D); f2 = (f2 * f2 * 1.0F + f2 * 2.0F) * 0.05F; GlStateManager.translate(0.0F, f2 - 2.0F, -3.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 f8 = this.updateRotations(entitydragon.getMovementOffsets(5, this.partialTicks)[0] + (double) (f7 / 2.0F)); f3 = f3 + 2.0F; - float f9 = f1 * 3.141F * 2.0F; + float f9 = f1 * 3.1415927F * 2.0F; f3 = 20.0F; float f4 = -12.0F; for (int i = 0; i < 5; ++i) { double[] adouble1 = entitydragon.getMovementOffsets(5 - i, this.partialTicks); float f10 = (float) Math.cos((double) ((float) i * 0.45F + f9)) * 0.15F; - this.spine.rotateAngleY = this.updateRotations(adouble1[0] - adouble[0]) * 3.141F / 180.0F * f6; - 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.141F / 180.0F * f6; + this.spine.rotateAngleY = this.updateRotations(adouble1[0] - adouble[0]) * 3.1415927F / 180.0F * f6; + this.spine.rotateAngleX = f10 + (float) (adouble1[1] - adouble[1]) * 3.1415927F / 180.0F * f6 * 5.0F; + this.spine.rotateAngleZ = -this.updateRotations(adouble1[0] - (double) f8) * 3.1415927F / 180.0F * f6; this.spine.rotationPointY = f3; this.spine.rotationPointZ = f4; this.spine.rotationPointX = f5; @@ -171,8 +171,8 @@ public class ModelDragon extends ModelBase { this.head.rotationPointZ = f4; this.head.rotationPointX = f5; double[] adouble2 = entitydragon.getMovementOffsets(0, this.partialTicks); - 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.141F / 180.0F * 1.0F; + this.head.rotateAngleY = this.updateRotations(adouble2[0] - adouble[0]) * 3.1415927F / 180.0F * 1.0F; + this.head.rotateAngleZ = -this.updateRotations(adouble2[0] - (double) f8) * 3.1415927F / 180.0F * 1.0F; this.head.render(f); GlStateManager.pushMatrix(); GlStateManager.translate(0.0F, 1.0F, 0.0F); @@ -183,7 +183,7 @@ public class ModelDragon extends ModelBase { for (int j = 0; j < 2; ++j) { GlStateManager.enableCull(); - float f12 = f1 * 3.141F * 2.0F; + float f12 = f1 * 3.1415927F * 2.0F; this.wing.rotateAngleX = 0.125F - (float) Math.cos((double) f12) * 0.2F; this.wing.rotateAngleY = 0.25F; this.wing.rotateAngleZ = (float) (Math.sin((double) f12) + 0.125D) * 0.8F; @@ -206,8 +206,8 @@ public class ModelDragon extends ModelBase { GlStateManager.popMatrix(); GlStateManager.cullFace(GL_BACK); GlStateManager.disableCull(); - float f11 = -((float) Math.sin((double) (f1 * 3.141F * 2.0F))) * 0.0F; - f9 = f1 * 3.141F * 2.0F; + float f11 = -((float) Math.sin((double) (f1 * 3.1415927F * 2.0F))) * 0.0F; + f9 = f1 * 3.1415927F * 2.0F; f3 = 10.0F; f4 = 60.0F; f5 = 0.0F; @@ -216,9 +216,9 @@ public class ModelDragon extends ModelBase { for (int k = 0; k < 12; ++k) { adouble2 = entitydragon.getMovementOffsets(12 + k, this.partialTicks); 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.141F / 180.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.141F / 180.0F * f6; + this.spine.rotateAngleY = (this.updateRotations(adouble2[0] - adouble[0]) * f6 + 180.0F) * 3.1415927F / 180.0F; + this.spine.rotateAngleX = f11 + (float) (adouble2[1] - adouble[1]) * 3.1415927F / 180.0F * f6 * 5.0F; + this.spine.rotateAngleZ = this.updateRotations(adouble2[0] - (double) f8) * 3.1415927F / 180.0F * f6; this.spine.rotationPointY = f3; this.spine.rotationPointZ = f4; this.spine.rotationPointX = f5; diff --git a/src/main/java/net/minecraft/client/model/ModelEnderMite.java b/src/main/java/net/minecraft/client/model/ModelEnderMite.java index 14118d1b..5f1482ad 100644 --- a/src/main/java/net/minecraft/client/model/ModelEnderMite.java +++ b/src/main/java/net/minecraft/client/model/ModelEnderMite.java @@ -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) { 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.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.141F) * 3.141F * 0.1F * (float) Math.abs(i - 2); + 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].rotationPointX = MathHelper.sin(f * 0.9F + (float) i * 0.15F * 3.1415927F) * 3.1415927F * 0.1F * (float) Math.abs(i - 2); } } } diff --git a/src/main/java/net/minecraft/client/model/ModelGuardian.java b/src/main/java/net/minecraft/client/model/ModelGuardian.java index 1f1018bf..b0061ee6 100644 --- a/src/main/java/net/minecraft/client/model/ModelGuardian.java +++ b/src/main/java/net/minecraft/client/model/ModelGuardian.java @@ -98,9 +98,9 @@ public class ModelGuardian extends ModelBase { float f4 = (1.0F - entityguardian.func_175469_o(f3)) * 0.55F; for (int i = 0; i < 12; ++i) { - this.guardianSpines[i].rotateAngleX = 3.141F * afloat[i]; - this.guardianSpines[i].rotateAngleY = 3.141F * afloat1[i]; - this.guardianSpines[i].rotateAngleZ = 3.141F * afloat2[i]; + this.guardianSpines[i].rotateAngleX = 3.1415927F * afloat[i]; + this.guardianSpines[i].rotateAngleY = 3.1415927F * afloat1[i]; + this.guardianSpines[i].rotateAngleZ = 3.1415927F * afloat2[i]; 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].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; float f5 = entityguardian.func_175471_a(f3); - this.guardianTail[0].rotateAngleY = MathHelper.sin(f5) * 3.141F * 0.05F; - this.guardianTail[1].rotateAngleY = MathHelper.sin(f5) * 3.141F * 0.1F; + this.guardianTail[0].rotateAngleY = MathHelper.sin(f5) * 3.1415927F * 0.05F; + this.guardianTail[1].rotateAngleY = MathHelper.sin(f5) * 3.1415927F * 0.1F; this.guardianTail[1].rotationPointX = -1.5F; this.guardianTail[1].rotationPointY = 0.5F; this.guardianTail[1].rotationPointZ = 14.0F; - this.guardianTail[2].rotateAngleY = MathHelper.sin(f5) * 3.141F * 0.15F; + this.guardianTail[2].rotateAngleY = MathHelper.sin(f5) * 3.1415927F * 0.15F; this.guardianTail[2].rotationPointX = 0.5F; this.guardianTail[2].rotationPointY = 0.5F; this.guardianTail[2].rotationPointZ = 6.0F; diff --git a/src/main/java/net/minecraft/client/model/ModelHorse.java b/src/main/java/net/minecraft/client/model/ModelHorse.java index 9ce20d5e..a1d6d957 100644 --- a/src/main/java/net/minecraft/client/model/ModelHorse.java +++ b/src/main/java/net/minecraft/client/model/ModelHorse.java @@ -357,7 +357,7 @@ public class ModelHorse extends ModelBase { boolean flag1 = entityhorse.isHorseSaddled(); boolean flag2 = entityhorse.riddenByEntity != null; float f9 = (float) entitylivingbaseIn.ticksExisted + parFloat3; - float f10 = MathHelper.cos(partialTickTime * 0.6662F + 3.141F); + float f10 = MathHelper.cos(partialTickTime * 0.6662F + 3.1415927F); float f11 = f10 * 0.8F * parFloat2; this.head.rotationPointY = 4.0F; this.head.rotationPointZ = -10.0F; @@ -415,7 +415,7 @@ public class ModelHorse extends ModelBase { float f13 = 4.712389F; float f14 = -1.0471976F; float f15 = 0.2617994F * f6; - float f16 = MathHelper.cos(f9 * 0.6F + 3.141F); + float f16 = MathHelper.cos(f9 * 0.6F + 3.1415927F); this.frontLeftLeg.rotationPointY = -2.0F * f6 + 9.0F * f7; this.frontLeftLeg.rotationPointZ = -2.0F * f6 + -8.0F * f7; 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.backRightHoof.rotateAngleX = this.backRightShin.rotateAngleX; this.frontLeftLeg.rotateAngleX = f17; - 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.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.frontLeftHoof.rotateAngleX = this.frontLeftShin.rotateAngleX; this.frontRightLeg.rotateAngleX = f18; - 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.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.frontRightHoof.rotateAngleX = this.frontRightShin.rotateAngleX; this.backLeftHoof.rotationPointY = this.backLeftShin.rotationPointY; this.backLeftHoof.rotationPointZ = this.backLeftShin.rotationPointZ; diff --git a/src/main/java/net/minecraft/client/model/ModelMinecart.java b/src/main/java/net/minecraft/client/model/ModelMinecart.java index 0a6897fc..f2a3d248 100644 --- a/src/main/java/net/minecraft/client/model/ModelMinecart.java +++ b/src/main/java/net/minecraft/client/model/ModelMinecart.java @@ -50,7 +50,7 @@ public class ModelMinecart extends ModelBase { this.sideModels[0].rotateAngleX = 1.5707964F; this.sideModels[1].rotateAngleY = 4.712389F; this.sideModels[2].rotateAngleY = 1.5707964F; - this.sideModels[3].rotateAngleY = 3.141F; + this.sideModels[3].rotateAngleY = 3.1415927F; this.sideModels[5].rotateAngleX = -1.5707964F; } diff --git a/src/main/java/net/minecraft/client/model/ModelOcelot.java b/src/main/java/net/minecraft/client/model/ModelOcelot.java index cf8b1214..deb89fd0 100644 --- a/src/main/java/net/minecraft/client/model/ModelOcelot.java +++ b/src/main/java/net/minecraft/client/model/ModelOcelot.java @@ -122,13 +122,13 @@ public class ModelOcelot extends ModelBase { if (this.field_78163_i == 2) { 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.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F + 0.3F) * 1.0F * f1; - this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.0F * f1; + this.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F + 0.3F) * 1.0F * f1; + this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.0F * f1; this.ocelotTail2.rotateAngleX = 1.7278761F + 0.3141F * MathHelper.cos(f) * f1; } else { this.ocelotBackLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 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.141F) * 1.0F * f1; + this.ocelotBackRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.0F * f1; + this.ocelotFrontLeftLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.0F * f1; this.ocelotFrontRightLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.0F * f1; if (this.field_78163_i == 1) { this.ocelotTail2.rotateAngleX = 1.7278761F + 0.7853982F * MathHelper.cos(f) * f1; diff --git a/src/main/java/net/minecraft/client/model/ModelQuadruped.java b/src/main/java/net/minecraft/client/model/ModelQuadruped.java index 5d56272c..002ee223 100644 --- a/src/main/java/net/minecraft/client/model/ModelQuadruped.java +++ b/src/main/java/net/minecraft/client/model/ModelQuadruped.java @@ -97,8 +97,8 @@ public class ModelQuadruped extends ModelBase { this.head.rotateAngleY = f2 / 57.295776F; this.body.rotateAngleX = 1.5707964F; this.leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 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.141F) * 1.4F * f1; + this.leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; + this.leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; } } diff --git a/src/main/java/net/minecraft/client/model/ModelRabbit.java b/src/main/java/net/minecraft/client/model/ModelRabbit.java index 54fa92cf..51d92714 100644 --- a/src/main/java/net/minecraft/client/model/ModelRabbit.java +++ b/src/main/java/net/minecraft/client/model/ModelRabbit.java @@ -171,7 +171,7 @@ public class ModelRabbit extends ModelBase { this.rabbitNose.rotateAngleY = this.rabbitHead.rotateAngleY = f1 * 0.017453292F; this.rabbitRightEar.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.141F); + this.field_178701_m = MathHelper.sin(entityrabbit.func_175521_o(f3) * 3.1415927F); 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.rabbitLeftArm.rotateAngleX = this.rabbitRightArm.rotateAngleX = (this.field_178701_m * -40.0F - 11.0F) * 0.017453292F; diff --git a/src/main/java/net/minecraft/client/model/ModelSilverfish.java b/src/main/java/net/minecraft/client/model/ModelSilverfish.java index bac0b177..0f1b55c2 100644 --- a/src/main/java/net/minecraft/client/model/ModelSilverfish.java +++ b/src/main/java/net/minecraft/client/model/ModelSilverfish.java @@ -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) { for (int i = 0; i < this.silverfishBodyParts.length; ++i) { - 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.141F) * 3.141F * 0.2F * (float) Math.abs(i - 2); + 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].rotationPointX = MathHelper.sin(f * 0.9F + (float) i * 0.15F * 3.1415927F) * 3.1415927F * 0.2F * (float) Math.abs(i - 2); } this.silverfishWings[0].rotateAngleY = this.silverfishBodyParts[2].rotateAngleY; diff --git a/src/main/java/net/minecraft/client/model/ModelSnowMan.java b/src/main/java/net/minecraft/client/model/ModelSnowMan.java index db72ecb1..a1d7fad7 100644 --- a/src/main/java/net/minecraft/client/model/ModelSnowMan.java +++ b/src/main/java/net/minecraft/client/model/ModelSnowMan.java @@ -66,7 +66,7 @@ public class ModelSnowMan extends ModelBase { this.rightHand.rotateAngleZ = 1.0F; this.leftHand.rotateAngleZ = -1.0F; this.rightHand.rotateAngleY = 0.0F + this.body.rotateAngleY; - this.leftHand.rotateAngleY = 3.141F + this.body.rotateAngleY; + this.leftHand.rotateAngleY = 3.1415927F + this.body.rotateAngleY; this.rightHand.rotationPointX = f7 * 5.0F; this.rightHand.rotationPointZ = -f6 * 5.0F; this.leftHand.rotationPointX = -f7 * 5.0F; diff --git a/src/main/java/net/minecraft/client/model/ModelSpider.java b/src/main/java/net/minecraft/client/model/ModelSpider.java index dc726ed5..29f30a7b 100644 --- a/src/main/java/net/minecraft/client/model/ModelSpider.java +++ b/src/main/java/net/minecraft/client/model/ModelSpider.java @@ -122,11 +122,11 @@ public class ModelSpider extends ModelBase { this.spiderLeg7.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 f8 = -(MathHelper.cos(f * 0.6662F * 2.0F + 3.141F) * 0.4F) * f1; + float f8 = -(MathHelper.cos(f * 0.6662F * 2.0F + 3.1415927F) * 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 f11 = Math.abs(MathHelper.sin(f * 0.6662F + 0.0F) * 0.4F) * f1; - float f12 = Math.abs(MathHelper.sin(f * 0.6662F + 3.141F) * 0.4F) * f1; + float f12 = Math.abs(MathHelper.sin(f * 0.6662F + 3.1415927F) * 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; this.spiderLeg1.rotateAngleY += f7; diff --git a/src/main/java/net/minecraft/client/model/ModelVillager.java b/src/main/java/net/minecraft/client/model/ModelVillager.java index 28cc686f..837b3993 100644 --- a/src/main/java/net/minecraft/client/model/ModelVillager.java +++ b/src/main/java/net/minecraft/client/model/ModelVillager.java @@ -87,7 +87,7 @@ public class ModelVillager extends ModelBase { this.villagerArms.rotationPointZ = -1.0F; this.villagerArms.rotateAngleX = -0.75F; this.rightVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1 * 0.5F; - this.leftVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1 * 0.5F; + this.leftVillagerLeg.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1 * 0.5F; this.rightVillagerLeg.rotateAngleY = 0.0F; this.leftVillagerLeg.rotateAngleY = 0.0F; } diff --git a/src/main/java/net/minecraft/client/model/ModelWitch.java b/src/main/java/net/minecraft/client/model/ModelWitch.java index 178f7d08..00c9aa73 100644 --- a/src/main/java/net/minecraft/client/model/ModelWitch.java +++ b/src/main/java/net/minecraft/client/model/ModelWitch.java @@ -67,9 +67,9 @@ public class ModelWitch extends ModelVillager { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); this.villagerNose.offsetX = this.villagerNose.offsetY = this.villagerNose.offsetZ = 0.0F; float f6 = 0.01F * (float) (entity.getEntityId() % 10); - this.villagerNose.rotateAngleX = MathHelper.sin((float) entity.ticksExisted * f6) * 4.5F * 3.141F / 180.0F; + this.villagerNose.rotateAngleX = MathHelper.sin((float) entity.ticksExisted * f6) * 4.5F * 3.1415927F / 180.0F; this.villagerNose.rotateAngleY = 0.0F; - this.villagerNose.rotateAngleZ = MathHelper.cos((float) entity.ticksExisted * f6) * 2.5F * 3.141F / 180.0F; + this.villagerNose.rotateAngleZ = MathHelper.cos((float) entity.ticksExisted * f6) * 2.5F * 3.1415927F / 180.0F; if (this.field_82900_g) { this.villagerNose.rotateAngleX = -0.9F; this.villagerNose.offsetZ = -0.09375F; diff --git a/src/main/java/net/minecraft/client/model/ModelWither.java b/src/main/java/net/minecraft/client/model/ModelWither.java index 956c3a85..65e62fcf 100644 --- a/src/main/java/net/minecraft/client/model/ModelWither.java +++ b/src/main/java/net/minecraft/client/model/ModelWither.java @@ -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) { float f3 = MathHelper.cos(f * 0.1F); - this.field_82905_a[1].rotateAngleX = (0.065F + 0.05F * f3) * 3.141F; + this.field_82905_a[1].rotateAngleX = (0.065F + 0.05F * f3) * 3.1415927F; 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.141F; + this.field_82905_a[2].rotateAngleX = (0.265F + 0.1F * f3) * 3.1415927F; this.field_82904_b[0].rotateAngleY = f1 / 57.295776F; this.field_82904_b[0].rotateAngleX = f2 / 57.295776F; } diff --git a/src/main/java/net/minecraft/client/model/ModelWolf.java b/src/main/java/net/minecraft/client/model/ModelWolf.java index ece6de23..9a64f987 100644 --- a/src/main/java/net/minecraft/client/model/ModelWolf.java +++ b/src/main/java/net/minecraft/client/model/ModelWolf.java @@ -142,8 +142,8 @@ public class ModelWolf extends ModelBase { this.wolfLeg3.setRotationPoint(-2.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.wolfLeg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1; - this.wolfLeg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.141F) * 1.4F * f1; + this.wolfLeg2.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; + this.wolfLeg3.rotateAngleX = MathHelper.cos(f * 0.6662F + 3.1415927F) * 1.4F * f1; this.wolfLeg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; } diff --git a/src/main/java/net/minecraft/client/model/ModelZombie.java b/src/main/java/net/minecraft/client/model/ModelZombie.java index c9b97b33..d89ecde1 100644 --- a/src/main/java/net/minecraft/client/model/ModelZombie.java +++ b/src/main/java/net/minecraft/client/model/ModelZombie.java @@ -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) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - float f6 = MathHelper.sin(this.swingProgress * 3.141F); - float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.141F); + float f6 = MathHelper.sin(this.swingProgress * 3.1415927F); + float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.1415927F); this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleY = -(0.1F - f6 * 0.6F); diff --git a/src/main/java/net/minecraft/client/model/ModelZombieVillager.java b/src/main/java/net/minecraft/client/model/ModelZombieVillager.java index 51d63b40..a785ac81 100644 --- a/src/main/java/net/minecraft/client/model/ModelZombieVillager.java +++ b/src/main/java/net/minecraft/client/model/ModelZombieVillager.java @@ -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) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - float f6 = MathHelper.sin(this.swingProgress * 3.141F); - float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.141F); + float f6 = MathHelper.sin(this.swingProgress * 3.1415927F); + float f7 = MathHelper.sin((1.0F - (1.0F - this.swingProgress) * (1.0F - this.swingProgress)) * 3.1415927F); this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleY = -(0.1F - f6 * 0.6F); diff --git a/src/main/java/net/minecraft/client/particle/EntityFirework.java b/src/main/java/net/minecraft/client/particle/EntityFirework.java index 0091feac..5165ab1d 100644 --- a/src/main/java/net/minecraft/client/particle/EntityFirework.java +++ b/src/main/java/net/minecraft/client/particle/EntityFirework.java @@ -52,7 +52,7 @@ public class EntityFirework { float f7 = 0.5F; float f8 = 0.125F; float f9 = 0.375F; - float f10 = 7.1F * MathHelper.sin(((float) this.particleAge + f - 1.0F) * 0.25F * 3.141F); + float f10 = 7.1F * MathHelper.sin(((float) this.particleAge + f - 1.0F) * 0.25F * 3.1415927F); 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 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) { - 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); + 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); return true; } } @@ -330,11 +330,11 @@ public class EntityFirework { double d0 = shape[0][0]; double d1 = shape[0][1]; this.createParticle(this.posX, this.posY, this.posZ, d0 * speed, d1 * speed, 0.0D, colours, fadeColours, trail, twinkleIn); - float f = this.rand.nextFloat() * 3.141F; + float f = this.rand.nextFloat() * 3.1415927F; double d2 = parFlag3 ? 0.034D : 0.34D; for (int i = 0; i < 3; ++i) { - double d3 = (double) f + (double) ((float) i * 3.141F) * d2; + double d3 = (double) f + (double) ((float) i * 3.1415927F) * d2; double d4 = d0; double d5 = d1; diff --git a/src/main/java/net/minecraft/client/particle/EntityNoteFX.java b/src/main/java/net/minecraft/client/particle/EntityNoteFX.java index 6b09639c..2dda2bb6 100644 --- a/src/main/java/net/minecraft/client/particle/EntityNoteFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityNoteFX.java @@ -37,9 +37,9 @@ public class EntityNoteFX extends EntityFX { this.motionY *= 0.009999999776482582D; this.motionZ *= 0.009999999776482582D; this.motionY += 0.2D; - 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.141F * 2.0F) * 0.65F + 0.35F; - this.particleBlue = MathHelper.sin(((float) parDouble1 + 0.6666667F) * 3.141F * 2.0F) * 0.65F + 0.35F; + this.particleRed = MathHelper.sin(((float) parDouble1 + 0.0F) * 3.1415927F * 2.0F) * 0.65F + 0.35F; + this.particleGreen = MathHelper.sin(((float) parDouble1 + 0.33333334F) * 3.1415927F * 2.0F) * 0.65F + 0.35F; + this.particleBlue = MathHelper.sin(((float) parDouble1 + 0.6666667F) * 3.1415927F * 2.0F) * 0.65F + 0.35F; this.particleScale *= 0.75F; this.particleScale *= parFloat1; this.noteParticleScale = this.particleScale; diff --git a/src/main/java/net/minecraft/client/particle/MobAppearance.java b/src/main/java/net/minecraft/client/particle/MobAppearance.java index e532d189..d97c1612 100644 --- a/src/main/java/net/minecraft/client/particle/MobAppearance.java +++ b/src/main/java/net/minecraft/client/particle/MobAppearance.java @@ -75,7 +75,7 @@ public class MobAppearance extends EntityFX { float f3 = 240.0F; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, f3, f3); GlStateManager.pushMatrix(); - float f4 = 0.05F + 0.5F * MathHelper.sin(f2 * 3.141F); + float f4 = 0.05F + 0.5F * MathHelper.sin(f2 * 3.1415927F); GlStateManager.color(1.0F, 1.0F, 1.0F, f4); GlStateManager.translate(0.0F, 1.8F, 0.0F); GlStateManager.rotate(180.0F - entityx.rotationYaw, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java b/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java index 831d049a..1e0debbd 100644 --- a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java +++ b/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java @@ -75,11 +75,11 @@ public class ActiveRenderInfo { int i = parFlag ? 1 : 0; float f2 = entityplayerIn.rotationPitch; float f3 = entityplayerIn.rotationYaw; - rotationX = MathHelper.cos(f3 * 3.141F / 180.0F) * (float) (1 - i * 2); - rotationZ = MathHelper.sin(f3 * 3.141F / 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.141F / 180.0F) * (float) (1 - i * 2); - rotationXZ = MathHelper.cos(f2 * 3.141F / 180.0F); + rotationX = MathHelper.cos(f3 * 3.1415927F / 180.0F) * (float) (1 - i * 2); + rotationZ = MathHelper.sin(f3 * 3.1415927F / 180.0F) * (float) (1 - i * 2); + rotationYZ = -rotationZ * MathHelper.sin(f2 * 3.1415927F / 180.0F) * (float) (1 - i * 2); + rotationXY = rotationX * MathHelper.sin(f2 * 3.1415927F / 180.0F) * (float) (1 - i * 2); + rotationXZ = MathHelper.cos(f2 * 3.1415927F / 180.0F); } public static Vec3 projectViewFromEntity(Entity parEntity, double parDouble1) { diff --git a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java index 3bcf4324..eb196acd 100644 --- a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java @@ -433,7 +433,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } f = f / (float) entitylivingbase.maxHurtTime; - f = MathHelper.sin(f * f * f * f * 3.141F); + f = MathHelper.sin(f * f * f * f * 3.1415927F); float f2 = entitylivingbase.attackedAtYaw; GlStateManager.rotate(-f2, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-f * 14.0F, 0.0F, 0.0F, 1.0F); @@ -452,9 +452,9 @@ public class EntityRenderer implements IResourceManagerReloadListener { float f1 = -(entityplayer.distanceWalkedModified + f * partialTicks); float f2 = entityplayer.prevCameraYaw + (entityplayer.cameraYaw - entityplayer.prevCameraYaw) * partialTicks; float f3 = entityplayer.prevCameraPitch + (entityplayer.cameraPitch - entityplayer.prevCameraPitch) * partialTicks; - 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.141F) * f2 * 3.0F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(Math.abs(MathHelper.cos(f1 * 3.141F - 0.2F) * f2) * 5.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.translate(MathHelper.sin(f1 * 3.1415927F) * f2 * 0.5F, -Math.abs(MathHelper.cos(f1 * 3.1415927F) * f2), 0.0F); + GlStateManager.rotate(MathHelper.sin(f1 * 3.1415927F) * 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(f3, 1.0F, 0.0F, 0.0F); } } @@ -494,9 +494,9 @@ public class EntityRenderer implements IResourceManagerReloadListener { f2 += 180.0F; } - 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.141F) * MathHelper.cos(f2 / 180.0F * 3.141F)) * d3; - double d6 = (double) (-MathHelper.sin(f2 / 180.0F * 3.141F)) * d3; + double d4 = (double) (-MathHelper.sin(f1 / 180.0F * 3.1415927F) * MathHelper.cos(f2 / 180.0F * 3.1415927F)) * d3; + double d5 = (double) (MathHelper.cos(f1 / 180.0F * 3.1415927F) * MathHelper.cos(f2 / 180.0F * 3.1415927F)) * d3; + double d6 = (double) (-MathHelper.sin(f2 / 180.0F * 3.1415927F)) * d3; for (int i = 0; i < 8; ++i) { float f3 = (float) ((i & 1) * 2 - 1); @@ -811,7 +811,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { private float getNightVisionBrightness(EntityLivingBase entitylivingbaseIn, float partialTicks) { int i = entitylivingbaseIn.getActivePotionEffect(Potion.nightVision).getDuration(); - return i > 200 ? 1.0F : 0.7F + MathHelper.sin(((float) i - partialTicks) * 3.141F * 0.2F) * 0.3F; + return i > 200 ? 1.0F : 0.7F + MathHelper.sin(((float) i - partialTicks) * 3.1415927F * 0.2F) * 0.3F; } public void func_181560_a(float parFloat1, long parLong1) { diff --git a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java b/src/main/java/net/minecraft/client/renderer/ItemRenderer.java index 45698ea7..69313344 100644 --- a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/ItemRenderer.java @@ -125,7 +125,7 @@ public class ItemRenderer { private float func_178100_c(float parFloat1) { float f = 1.0F - parFloat1 / 45.0F + 0.1F; f = MathHelper.clamp_float(f, 0.0F, 1.0F); - f = -MathHelper.cos(f * 3.141F) * 0.5F + 0.5F; + f = -MathHelper.cos(f * 3.1415927F) * 0.5F + 0.5F; return f; } @@ -162,9 +162,9 @@ public class ItemRenderer { } private void renderItemMap(AbstractClientPlayer clientPlayer, float parFloat1, float parFloat2, float parFloat3) { - float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.141F); - float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.141F * 2.0F); - float f2 = -0.2F * MathHelper.sin(parFloat3 * 3.141F); + float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.1415927F); + float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.1415927F * 2.0F); + float f2 = -0.2F * MathHelper.sin(parFloat3 * 3.1415927F); GlStateManager.translate(f, f1, f2); float f3 = this.func_178100_c(parFloat1); 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(0.0F, 1.0F, 0.0F, 0.0F); this.renderPlayerArms(clientPlayer); - float f4 = MathHelper.sin(parFloat3 * parFloat3 * 3.141F); - float f5 = MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.141F); + float f4 = MathHelper.sin(parFloat3 * parFloat3 * 3.1415927F); + float f5 = MathHelper.sin(MathHelper.sqrt_float(parFloat3) * 3.1415927F); 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 * -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) { - float f = -0.3F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.141F); - float f1 = 0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.141F * 2.0F); - float f2 = -0.4F * MathHelper.sin(parFloat2 * 3.141F); + float f = -0.3F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.1415927F); + float f1 = 0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.1415927F * 2.0F); + float f2 = -0.4F * MathHelper.sin(parFloat2 * 3.1415927F); GlStateManager.translate(f, f1, f2); GlStateManager.translate(0.64000005F, -0.6F, -0.71999997F); GlStateManager.translate(0.0F, parFloat1 * -0.6F, 0.0F); GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F); - float f3 = MathHelper.sin(parFloat2 * parFloat2 * 3.141F); - float f4 = MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.141F); + float f3 = MathHelper.sin(parFloat2 * parFloat2 * 3.1415927F); + float f4 = MathHelper.sin(MathHelper.sqrt_float(parFloat2) * 3.1415927F); GlStateManager.rotate(f4 * 70.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(f3 * -20.0F, 0.0F, 0.0F, 1.0F); this.mc.getTextureManager().bindTexture(clientPlayer.getLocationSkin()); @@ -228,16 +228,16 @@ public class ItemRenderer { } private void func_178105_d(float parFloat1) { - float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.141F); - float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.141F * 2.0F); - float f2 = -0.2F * MathHelper.sin(parFloat1 * 3.141F); + float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.1415927F); + float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(parFloat1) * 3.1415927F * 2.0F); + float f2 = -0.2F * MathHelper.sin(parFloat1 * 3.1415927F); GlStateManager.translate(f, f1, f2); } private void func_178104_a(AbstractClientPlayer clientPlayer, float parFloat1) { float f = (float) clientPlayer.getItemInUseCount() - parFloat1 + 1.0F; float f1 = f / (float) this.itemToRender.getMaxItemUseDuration(); - float f2 = MathHelper.abs(MathHelper.cos(f / 4.0F * 3.141F) * 0.1F); + float f2 = MathHelper.abs(MathHelper.cos(f / 4.0F * 3.1415927F) * 0.1F); if (f1 >= 0.8F) { f2 = 0.0F; } @@ -258,8 +258,8 @@ public class ItemRenderer { GlStateManager.translate(0.56F, -0.52F, -0.71999997F); GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F); GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F); - float f = MathHelper.sin(swingProgress * swingProgress * 3.141F); - float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * 3.141F); + float f = MathHelper.sin(swingProgress * swingProgress * 3.1415927F); + float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * 3.1415927F); 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 * -80.0F, 1.0F, 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java index 14d5e441..9d66f54f 100644 --- a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java +++ b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java @@ -735,8 +735,8 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene f += 180.0F; } - float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.141F); - float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.141F); + float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.1415927F); + float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.1415927F); float f4 = -MathHelper.cos(-f * 0.017453292F); float f5 = MathHelper.sin(-f * 0.017453292F); return new Vector3f(f3 * f4, f5, f2 * f4); @@ -912,7 +912,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene boolean flag = true; for (int k = 0; k <= 16; ++k) { - float f21 = (float) k * 3.141F * 2.0F / 16.0F; + float f21 = (float) k * 3.1415927F * 2.0F / 16.0F; float f12 = MathHelper.sin(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(); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java b/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java index 6eb2a88d..a38c20e6 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java @@ -125,8 +125,8 @@ public class RenderDragon extends RenderLiving { float f6 = MathHelper.sqrt_float(f2 * f2 + f3 * f3 + f4 * f4); GlStateManager.pushMatrix(); GlStateManager.translate((float) parDouble1, (float) parDouble2 + 2.0F, (float) parDouble3); - 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.141F - 90.0F, 1.0F, 0.0F, 0.0F); + 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) f5, (double) f3)) * 180.0F / 3.1415927F - 90.0F, 1.0F, 0.0F, 0.0F); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); RenderHelper.disableStandardItemLighting(); @@ -139,8 +139,8 @@ public class RenderDragon extends RenderLiving { boolean flag = true; for (int i = 0; i <= 8; ++i) { - float f9 = MathHelper.sin((float) (i % 8) * 3.141F * 2.0F / 8.0F) * 0.75F; - float f10 = MathHelper.cos((float) (i % 8) * 3.141F * 2.0F / 8.0F) * 0.75F; + float f9 = MathHelper.sin((float) (i % 8) * 3.1415927F * 2.0F / 8.0F) * 0.75F; + float f10 = MathHelper.cos((float) (i % 8) * 3.1415927F * 2.0F / 8.0F) * 0.75F; 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, (double) f10, (double) f6).tex((double) f11, (double) f7).color(255, 255, 255, 255).endVertex(); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java b/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java index 4aa62dac..c67da723 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java @@ -74,10 +74,10 @@ public class RenderFish extends Render { GlStateManager.popMatrix(); if (entityfishhook.angler != null) { float f9 = entityfishhook.angler.getSwingProgress(f1); - float f10 = MathHelper.sin(MathHelper.sqrt_float(f9) * 3.141F); + float f10 = MathHelper.sin(MathHelper.sqrt_float(f9) * 3.1415927F); Vec3 vec3 = new Vec3(-0.36D, 0.03D, 0.35D); - 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.141F / 180.0F); + vec3 = vec3.rotatePitch(-(entityfishhook.angler.prevRotationPitch + (entityfishhook.angler.rotationPitch - entityfishhook.angler.prevRotationPitch) * f1) * 3.1415927F / 180.0F); + vec3 = vec3.rotateYaw(-(entityfishhook.angler.prevRotationYaw + (entityfishhook.angler.rotationYaw - entityfishhook.angler.prevRotationYaw) * f1) * 3.1415927F / 180.0F); vec3 = vec3.rotateYaw(f10 * 0.5F); vec3 = vec3.rotatePitch(-f10 * 0.7F); double d3 = entityfishhook.angler.prevPosX + (entityfishhook.angler.posX - entityfishhook.angler.prevPosX) * (double) f1 + vec3.xCoord; @@ -85,7 +85,7 @@ public class RenderFish extends Render { double d5 = entityfishhook.angler.prevPosZ + (entityfishhook.angler.posZ - entityfishhook.angler.prevPosZ) * (double) f1 + vec3.zCoord; double d6 = (double) entityfishhook.angler.getEyeHeight(); 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.141F / 180.0F; + float f11 = (entityfishhook.angler.prevRenderYawOffset + (entityfishhook.angler.renderYawOffset - entityfishhook.angler.prevRenderYawOffset) * f1) * 3.1415927F / 180.0F; double d7 = (double) MathHelper.sin(f11); double d9 = (double) MathHelper.cos(f11); double d11 = 0.35D; diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java index e5e9450a..ee87d61f 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java @@ -61,8 +61,8 @@ public class LayerArrow implements LayerRenderer { f2 = f2 * -1.0F; f3 = f3 * -1.0F; float f7 = MathHelper.sqrt_float(f1 * f1 + f3 * f3); - 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.141); + entityarrow.prevRotationYaw = entityarrow.rotationYaw = (float) (Math.atan2((double) f1, (double) f3) * 180.0D / 3.1415927410125732D); + entityarrow.prevRotationPitch = entityarrow.rotationPitch = (float) (Math.atan2((double) f2, (double) f7) * 180.0D / 3.1415927410125732D); double d0 = 0.0D; double d1 = 0.0D; double d2 = 0.0D; diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java index 910d1fab..a83f4e9d 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java @@ -50,8 +50,8 @@ public class LayerCape implements LayerRenderer { 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); float f1 = abstractclientplayer.prevRenderYawOffset + (abstractclientplayer.renderYawOffset - abstractclientplayer.prevRenderYawOffset) * f; - double d3 = (double) MathHelper.sin(f1 * 3.141F / 180.0F); - double d4 = (double) (-MathHelper.cos(f1 * 3.141F / 180.0F)); + double d3 = (double) MathHelper.sin(f1 * 3.1415927F / 180.0F); + double d4 = (double) (-MathHelper.cos(f1 * 3.1415927F / 180.0F)); float f2 = (float) d1 * 10.0F; f2 = MathHelper.clamp_float(f2, -6.0F, 32.0F); float f3 = (float) (d0 * d3 + d2 * d4) * 100.0F; diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java index 46f2e293..18212aff 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java @@ -41,7 +41,7 @@ public class LayerIronGolemFlower implements LayerRenderer { BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.enableRescaleNormal(); GlStateManager.pushMatrix(); - GlStateManager.rotate(5.0F + 180.0F * ((ModelIronGolem) this.ironGolemRenderer.getMainModel()).ironGolemRightArm.rotateAngleX / 3.141F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(5.0F + 180.0F * ((ModelIronGolem) this.ironGolemRenderer.getMainModel()).ironGolemRightArm.rotateAngleX / 3.1415927F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.translate(-0.9375F, -0.625F, -0.9375F); float f1 = 0.5F; diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java b/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java index 7ca7df47..18c263cf 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java +++ b/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java @@ -58,7 +58,7 @@ public class TextureCompass extends EaglerTextureAtlasSprite { parDouble3 = parDouble3 % 360.0D; d0 = -((parDouble3 - 90.0D) * 3.141592653589793D / 180.0D - Math.atan2(d2, d1)); if (!worldIn.provider.isSurfaceWorld()) { - d0 = Math.random() * 3.141 * 2.0D; + d0 = Math.random() * 3.1415927410125732D * 2.0D; } } diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java index ce971d7a..32bfac60 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java @@ -74,7 +74,7 @@ public class TileEntityBannerRenderer extends TileEntitySpecialRenderer= 3.141F; f2 -= 6.2831855F) {} + for (f2 = tileentityenchantmenttable.bookRotation - tileentityenchantmenttable.bookRotationPrev; f2 >= 3.1415927F; f2 -= 6.2831855F) {} - while (f2 < -3.141F) { + while (f2 < -3.1415927F) { f2 += 6.2831855F; } float f3 = tileentityenchantmenttable.bookRotationPrev + f2 * f; - GlStateManager.rotate(-f3 * 180.0F / 3.141F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-f3 * 180.0F / 3.1415927F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(80.0F, 0.0F, 0.0F, 1.0F); this.bindTexture(TEXTURE_BOOK); float f4 = tileentityenchantmenttable.pageFlipPrev + (tileentityenchantmenttable.pageFlip - tileentityenchantmenttable.pageFlipPrev) * f + 0.25F; diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java index 72550d69..b788e5a8 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java @@ -75,7 +75,7 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer 0.0025000002F) { f3 = 1.0F; f2 = (float) Math.sqrt((double) f) * 3.0F; - f1 = (float) MathHelper.func_181159_b(d1, d0) * 180.0F / 3.141F - 90.0F; + f1 = (float) MathHelper.func_181159_b(d1, d0) * 180.0F / 3.1415927F - 90.0F; } if (this.swingProgress > 0.0F) { diff --git a/src/main/java/net/minecraft/entity/boss/EntityDragon.java b/src/main/java/net/minecraft/entity/boss/EntityDragon.java index e46764b4..3b722df8 100644 --- a/src/main/java/net/minecraft/entity/boss/EntityDragon.java +++ b/src/main/java/net/minecraft/entity/boss/EntityDragon.java @@ -123,8 +123,8 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt * to react to sunlight and start to burn. */ public void onLivingUpdate() { - float f = MathHelper.cos(this.animTime * 3.141F * 2.0F); - float f1 = MathHelper.cos(this.prevAnimTime * 3.141F * 2.0F); + float f = MathHelper.cos(this.animTime * 3.1415927F * 2.0F); + float f1 = MathHelper.cos(this.prevAnimTime * 3.1415927F * 2.0F); 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); } @@ -185,10 +185,10 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt this.dragonPartWing1.width = 4.0F; this.dragonPartWing2.height = 3.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.141F; + float f12 = (float) (this.getMovementOffsets(5, 1.0F)[1] - this.getMovementOffsets(10, 1.0F)[1]) * 10.0F / 180.0F * 3.1415927F; float f2 = MathHelper.cos(f12); float f15 = -MathHelper.sin(f12); - float f3 = this.rotationYaw * 3.141F / 180.0F; + float f3 = this.rotationYaw * 3.1415927F / 180.0F; float f16 = MathHelper.sin(f3); float f4 = MathHelper.cos(f3); this.dragonPartBody.onUpdate(); @@ -200,8 +200,8 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt double[] adouble1 = this.getMovementOffsets(5, 1.0F); double[] adouble = this.getMovementOffsets(0, 1.0F); - float f18 = MathHelper.sin(this.rotationYaw * 3.141F / 180.0F - this.randomYawVelocity * 0.01F); - float f19 = MathHelper.cos(this.rotationYaw * 3.141F / 180.0F - this.randomYawVelocity * 0.01F); + float f18 = MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F - this.randomYawVelocity * 0.01F); + float f19 = MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F - this.randomYawVelocity * 0.01F); 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); @@ -220,7 +220,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt } double[] adouble2 = this.getMovementOffsets(12 + j * 2, 1.0F); - float f20 = this.rotationYaw * 3.141F / 180.0F + this.simplifyAngle(adouble2[0] - adouble1[0]) * 3.141F / 180.0F * 1.0F; + float f20 = this.rotationYaw * 3.1415927F / 180.0F + this.simplifyAngle(adouble2[0] - adouble1[0]) * 3.1415927F / 180.0F * 1.0F; float f21 = MathHelper.sin(f20); float f22 = MathHelper.cos(f20); float f23 = 1.5F; @@ -275,7 +275,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt f = f / 4.0F + 1.0F; } - float f1 = this.rotationYaw * 3.141F / 180.0F; + float f1 = this.rotationYaw * 3.1415927F / 180.0F; float f2 = MathHelper.sin(f1); float f3 = MathHelper.cos(f1); this.targetX = this.posX + (double) (f2 * 5.0F) + (double) ((this.rand.nextFloat() - 0.5F) * 2.0F); diff --git a/src/main/java/net/minecraft/entity/boss/EntityWither.java b/src/main/java/net/minecraft/entity/boss/EntityWither.java index 59f0f5c1..8bc15207 100644 --- a/src/main/java/net/minecraft/entity/boss/EntityWither.java +++ b/src/main/java/net/minecraft/entity/boss/EntityWither.java @@ -153,8 +153,8 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged double d7 = entity1.posY + (double) entity1.getEyeHeight() - d12; double d8 = entity1.posZ - d13; double d9 = (double) MathHelper.sqrt_double(d6 * d6 + d8 * d8); - 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.141)); + float f = (float) (MathHelper.func_181159_b(d8, d6) * 180.0D / 3.1415927410125732D) - 90.0F; + float f1 = (float) (-(MathHelper.func_181159_b(d7, d9) * 180.0D / 3.1415927410125732D)); 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); } else { @@ -317,7 +317,7 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged if (parInt1 <= 0) { return this.posX; } else { - float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.141F; + float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.1415927F; float f1 = MathHelper.cos(f); return this.posX + (double) f1 * 1.3D; } @@ -331,7 +331,7 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged if (parInt1 <= 0) { return this.posZ; } else { - float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.141F; + float f = (this.renderYawOffset + (float) (180 * (parInt1 - 1))) / 180.0F * 3.1415927F; float f1 = MathHelper.sin(f); return this.posZ + (double) f1 * 1.3D; } diff --git a/src/main/java/net/minecraft/entity/item/EntityBoat.java b/src/main/java/net/minecraft/entity/item/EntityBoat.java index 4da6611c..b6120264 100644 --- a/src/main/java/net/minecraft/entity/item/EntityBoat.java +++ b/src/main/java/net/minecraft/entity/item/EntityBoat.java @@ -265,8 +265,8 @@ public class EntityBoat extends Entity { if (this.riddenByEntity instanceof EntityLivingBase) { EntityLivingBase entitylivingbase = (EntityLivingBase) this.riddenByEntity; float f = this.riddenByEntity.rotationYaw + -entitylivingbase.moveStrafing * 90.0F; - this.motionX += -Math.sin((double) (f * 3.141F / 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; + this.motionX += -Math.sin((double) (f * 3.1415927F / 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; } double d11 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderEye.java b/src/main/java/net/minecraft/entity/item/EntityEnderEye.java index aed8fb7f..db61e0ca 100644 --- a/src/main/java/net/minecraft/entity/item/EntityEnderEye.java +++ b/src/main/java/net/minecraft/entity/item/EntityEnderEye.java @@ -92,8 +92,8 @@ public class EntityEnderEye extends Entity { this.motionZ = d2; if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); } } @@ -109,9 +109,9 @@ public class EntityEnderEye extends Entity { this.posY += this.motionY; this.posZ += 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.141); + this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); - 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) {} + 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) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; diff --git a/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java b/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java index b4c1494c..87bfa076 100644 --- a/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java +++ b/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java @@ -78,8 +78,8 @@ public class EntityFireworkRocket extends Entity { this.motionZ = d2; if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); } } @@ -96,9 +96,9 @@ public class EntityFireworkRocket extends Entity { this.motionY += 0.04D; this.moveEntity(this.motionX, this.motionY, 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.141); + this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); - 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) {} + 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) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecart.java b/src/main/java/net/minecraft/entity/item/EntityMinecart.java index f9f7ef07..846ec1f3 100644 --- a/src/main/java/net/minecraft/entity/item/EntityMinecart.java +++ b/src/main/java/net/minecraft/entity/item/EntityMinecart.java @@ -292,8 +292,8 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { if (this.riddenByEntity instanceof EntityLivingBase) { double d6 = (double) ((EntityLivingBase) this.riddenByEntity).moveForward; if (d6 > 0.0D) { - double d7 = -Math.sin((double) (this.riddenByEntity.rotationYaw * 3.141F / 180.0F)); - double d8 = Math.cos((double) (this.riddenByEntity.rotationYaw * 3.141F / 180.0F)); + double d7 = -Math.sin((double) (this.riddenByEntity.rotationYaw * 3.1415927F / 180.0F)); + double d8 = Math.cos((double) (this.riddenByEntity.rotationYaw * 3.1415927F / 180.0F)); double d9 = this.motionX * this.motionX + this.motionZ * this.motionZ; if (d9 < 0.01D) { this.motionX += d7 * 0.1D; diff --git a/src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java b/src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java index f82c2546..b465aea6 100644 --- a/src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/entity/item/EntityTNTPrimed.java @@ -38,7 +38,7 @@ public class EntityTNTPrimed extends Entity { public EntityTNTPrimed(World worldIn, double parDouble1, double parDouble2, double parDouble3, EntityLivingBase parEntityLivingBase) { this(worldIn); this.setPosition(parDouble1, parDouble2, parDouble3); - float f = (float) (Math.random() * 3.141 * 2.0D); + float f = (float) (Math.random() * 3.1415927410125732D * 2.0D); this.motionX = (double) (-((float) Math.sin((double) f)) * 0.02F); this.motionY = 0.20000000298023224D; this.motionZ = (double) (-((float) Math.cos((double) f)) * 0.02F); diff --git a/src/main/java/net/minecraft/entity/monster/EntityMob.java b/src/main/java/net/minecraft/entity/monster/EntityMob.java index d900a5da..b5bfe69a 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityMob.java +++ b/src/main/java/net/minecraft/entity/monster/EntityMob.java @@ -85,7 +85,7 @@ public abstract class EntityMob extends EntityCreature implements IMob { boolean flag = entity.attackEntityFrom(DamageSource.causeMobDamage(this), f); if (flag) { if (i > 0) { - 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)); + 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)); this.motionX *= 0.6D; this.motionZ *= 0.6D; } diff --git a/src/main/java/net/minecraft/entity/monster/EntitySlime.java b/src/main/java/net/minecraft/entity/monster/EntitySlime.java index ca48e927..e06621f5 100644 --- a/src/main/java/net/minecraft/entity/monster/EntitySlime.java +++ b/src/main/java/net/minecraft/entity/monster/EntitySlime.java @@ -118,7 +118,7 @@ public class EntitySlime extends EntityLiving implements IMob { int i = this.getSlimeSize(); for (int j = 0; j < i * 8; ++j) { - float f = this.rand.nextFloat() * 3.141F * 2.0F; + float f = this.rand.nextFloat() * 3.1415927F * 2.0F; float f1 = this.rand.nextFloat() * 0.5F + 0.5F; float f2 = MathHelper.sin(f) * (float) i * 0.5F * f1; float f3 = MathHelper.cos(f) * (float) i * 0.5F * f1; diff --git a/src/main/java/net/minecraft/entity/passive/EntityBat.java b/src/main/java/net/minecraft/entity/passive/EntityBat.java index 6b21885c..55cf0245 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityBat.java +++ b/src/main/java/net/minecraft/entity/passive/EntityBat.java @@ -154,7 +154,7 @@ public class EntityBat extends EntityAmbientCreature { this.motionX += (Math.signum(d0) * 0.5D - this.motionX) * 0.10000000149011612D; this.motionY += (Math.signum(d1) * 0.699999988079071D - this.motionY) * 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.141) - 90.0F; + float f = (float) (MathHelper.func_181159_b(this.motionZ, this.motionX) * 180.0D / 3.1415927410125732D) - 90.0F; float f1 = MathHelper.wrapAngleTo180_float(f - this.rotationYaw); this.moveForward = 0.5F; this.rotationYaw += f1; diff --git a/src/main/java/net/minecraft/entity/passive/EntityChicken.java b/src/main/java/net/minecraft/entity/passive/EntityChicken.java index 34717fcd..0c818986 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityChicken.java +++ b/src/main/java/net/minecraft/entity/passive/EntityChicken.java @@ -180,8 +180,8 @@ public class EntityChicken extends EntityAnimal { public void updateRiderPosition() { super.updateRiderPosition(); - float f = MathHelper.sin(this.renderYawOffset * 3.141F / 180.0F); - float f1 = MathHelper.cos(this.renderYawOffset * 3.141F / 180.0F); + float f = MathHelper.sin(this.renderYawOffset * 3.1415927F / 180.0F); + float f1 = MathHelper.cos(this.renderYawOffset * 3.1415927F / 180.0F); float f2 = 0.1F; 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)); diff --git a/src/main/java/net/minecraft/entity/passive/EntityHorse.java b/src/main/java/net/minecraft/entity/passive/EntityHorse.java index 2fcf7bba..0160defd 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityHorse.java +++ b/src/main/java/net/minecraft/entity/passive/EntityHorse.java @@ -983,8 +983,8 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { this.setHorseJumping(true); this.isAirBorne = true; if (f1 > 0.0F) { - float f2 = MathHelper.sin(this.rotationYaw * 3.141F / 180.0F); - float f3 = MathHelper.cos(this.rotationYaw * 3.141F / 180.0F); + float f2 = MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F); + float f3 = MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F); this.motionX += (double) (-0.4F * f2 * this.jumpPower); this.motionZ += (double) (0.4F * f3 * this.jumpPower); this.playSound("mob.horse.jump", 0.4F, 1.0F); @@ -1291,8 +1291,8 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { public void updateRiderPosition() { super.updateRiderPosition(); if (this.prevRearingAmount > 0.0F) { - float f = MathHelper.sin(this.renderYawOffset * 3.141F / 180.0F); - float f1 = MathHelper.cos(this.renderYawOffset * 3.141F / 180.0F); + float f = MathHelper.sin(this.renderYawOffset * 3.1415927F / 180.0F); + float f1 = MathHelper.cos(this.renderYawOffset * 3.1415927F / 180.0F); float f2 = 0.7F * 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)); diff --git a/src/main/java/net/minecraft/entity/passive/EntitySquid.java b/src/main/java/net/minecraft/entity/passive/EntitySquid.java index 6ec396d3..47190f69 100644 --- a/src/main/java/net/minecraft/entity/passive/EntitySquid.java +++ b/src/main/java/net/minecraft/entity/passive/EntitySquid.java @@ -137,9 +137,9 @@ public class EntitySquid extends EntityWaterMob { } if (this.inWater) { - if (this.squidRotation < 3.141F) { - float f = this.squidRotation / 3.141F; - this.tentacleAngle = MathHelper.sin(f * f * 3.141F) * 3.141F * 0.25F; + if (this.squidRotation < 3.1415927F) { + float f = this.squidRotation / 3.1415927F; + this.tentacleAngle = MathHelper.sin(f * f * 3.1415927F) * 3.1415927F * 0.25F; if ((double) f > 0.75D) { this.randomMotionSpeed = 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); - this.renderYawOffset += (-((float) MathHelper.func_181159_b(this.motionX, this.motionZ)) * 180.0F / 3.141F - this.renderYawOffset) * 0.1F; + this.renderYawOffset += (-((float) MathHelper.func_181159_b(this.motionX, this.motionZ)) * 180.0F / 3.1415927F - this.renderYawOffset) * 0.1F; this.rotationYaw = this.renderYawOffset; 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.141F - this.squidPitch) * 0.1F; + this.squidPitch += (-((float) MathHelper.func_181159_b((double) f1, this.motionY)) * 180.0F / 3.1415927F - this.squidPitch) * 0.1F; } else { - this.tentacleAngle = MathHelper.abs(MathHelper.sin(this.squidRotation)) * 3.141F * 0.25F; + this.tentacleAngle = MathHelper.abs(MathHelper.sin(this.squidRotation)) * 3.1415927F * 0.25F; this.squidPitch = (float) ((double) this.squidPitch + (double) (-90.0F - this.squidPitch) * 0.02D); } } diff --git a/src/main/java/net/minecraft/entity/passive/EntityWolf.java b/src/main/java/net/minecraft/entity/passive/EntityWolf.java index 9c14010c..54e0553a 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityWolf.java +++ b/src/main/java/net/minecraft/entity/passive/EntityWolf.java @@ -181,7 +181,7 @@ public class EntityWolf extends EntityTameable { if (this.timeWolfIsShaking > 0.4F) { float f = (float) this.getEntityBoundingBox().minY; - int i = (int) (MathHelper.sin((this.timeWolfIsShaking - 0.4F) * 3.141F) * 7.0F); + int i = (int) (MathHelper.sin((this.timeWolfIsShaking - 0.4F) * 3.1415927F) * 7.0F); for (int j = 0; j < i; ++j) { 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; } - return MathHelper.sin(f * 3.141F) * MathHelper.sin(f * 3.141F * 11.0F) * 0.15F * 3.141F; + return MathHelper.sin(f * 3.1415927F) * MathHelper.sin(f * 3.1415927F * 11.0F) * 0.15F * 3.1415927F; } public float getInterestedAngle(float parFloat1) { - return (this.headRotationCourseOld + (this.headRotationCourse - this.headRotationCourseOld) * parFloat1) * 0.15F * 3.141F; + return (this.headRotationCourseOld + (this.headRotationCourse - this.headRotationCourseOld) * parFloat1) * 0.15F * 3.1415927F; } public float getEyeHeight() { @@ -331,7 +331,7 @@ public class EntityWolf extends EntityTameable { } public float getTailRotation() { - return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (20.0F - this.dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * 3.141F : 0.62831855F); + return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (20.0F - this.dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * 3.1415927F : 0.62831855F); } /**+ diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayer.java b/src/main/java/net/minecraft/entity/player/EntityPlayer.java index c5132d9a..ad4d759d 100644 --- a/src/main/java/net/minecraft/entity/player/EntityPlayer.java +++ b/src/main/java/net/minecraft/entity/player/EntityPlayer.java @@ -331,12 +331,12 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS if (itemStackIn.getItemUseAction() == EnumAction.EAT) { 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.rotatePitch(-this.rotationPitch * 3.141F / 180.0F); - vec3 = vec3.rotateYaw(-this.rotationYaw * 3.141F / 180.0F); + vec3 = vec3.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); + vec3 = vec3.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); 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); - vec31 = vec31.rotatePitch(-this.rotationPitch * 3.141F / 180.0F); - vec31 = vec31.rotateYaw(-this.rotationYaw * 3.141F / 180.0F); + vec31 = vec31.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); + vec31 = vec31.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); 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() }); @@ -538,8 +538,8 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS } if (damagesource != null) { - 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.141F / 180.0F) * 0.1F); + this.motionX = (double) (-MathHelper.cos((this.attackedAtYaw + this.rotationYaw) * 3.1415927F / 180.0F) * 0.1F); + this.motionZ = (double) (-MathHelper.sin((this.attackedAtYaw + this.rotationYaw) * 3.1415927F / 180.0F) * 0.1F); } else { this.motionX = this.motionZ = 0.0D; } @@ -636,16 +636,16 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS if (dropAround) { float f = this.rand.nextFloat() * 0.5F; - float f1 = this.rand.nextFloat() * 3.141F * 2.0F; + float f1 = this.rand.nextFloat() * 3.1415927F * 2.0F; entityitem.motionX = (double) (-MathHelper.sin(f1) * f); entityitem.motionZ = (double) (MathHelper.cos(f1) * f); entityitem.motionY = 0.20000000298023224D; } else { float f2 = 0.3F; - 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.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f2); - entityitem.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.141F) * f2 + 0.1F); - float f3 = this.rand.nextFloat() * 3.141F * 2.0F; + entityitem.motionX = (double) (-MathHelper.sin(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.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f2); + entityitem.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.1415927F) * f2 + 0.1F); + float f3 = this.rand.nextFloat() * 3.1415927F * 2.0F; f2 = 0.02F * this.rand.nextFloat(); entityitem.motionX += Math.cos((double) f3) * (double) f2; 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); if (flag2) { if (i > 0) { - 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)); + 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)); this.motionX *= 0.6D; this.motionZ *= 0.6D; this.setSprinting(false); diff --git a/src/main/java/net/minecraft/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/entity/projectile/EntityArrow.java index cc3021d0..5ab49e4b 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityArrow.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityArrow.java @@ -82,8 +82,8 @@ public class EntityArrow extends Entity implements IProjectile { double d2 = parEntityLivingBase.posZ - shooter.posZ; double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); if (d3 >= 1.0E-7D) { - 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.141)); + float f = (float) (MathHelper.func_181159_b(d2, d0) * 180.0D / 3.1415927410125732D) - 90.0F; + float f1 = (float) (-(MathHelper.func_181159_b(d1, d3) * 180.0D / 3.1415927410125732D)); double d4 = d0 / d3; double d5 = d2 / d3; 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.setLocationAndAngles(shooter.posX, shooter.posY + (double) shooter.getEyeHeight(), shooter.posZ, shooter.rotationYaw, shooter.rotationPitch); - this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.141F) * 0.16F); + this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posY -= 0.10000000149011612D; - this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * 0.16F); + this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.setPosition(this.posX, this.posY, this.posZ); - 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.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F)); - this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.141F)); + this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F)); + this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F)); + this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.1415927F)); 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.motionZ = z; float f1 = MathHelper.sqrt_double(x * x + z * z); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(x, z) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(y, (double) f1) * 180.0D / 3.1415927410125732D); this.ticksInGround = 0; } @@ -154,8 +154,8 @@ public class EntityArrow extends Entity implements IProjectile { this.motionZ = d2; if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); this.prevRotationPitch = this.rotationPitch; this.prevRotationYaw = this.rotationYaw; 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(); if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { 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.141); - this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(this.motionY, (double) f) * 180.0D / 3.1415927410125732D); } 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.posZ += 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.141); + this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); - 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) {} + 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) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; diff --git a/src/main/java/net/minecraft/entity/projectile/EntityFireball.java b/src/main/java/net/minecraft/entity/projectile/EntityFireball.java index 21641a7d..3170a209 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityFireball.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityFireball.java @@ -147,9 +147,9 @@ public abstract class EntityFireball extends Entity { this.posY += this.motionY; this.posZ += 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.141) + 90.0F; + this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionZ, this.motionX) * 180.0D / 3.1415927410125732D) + 90.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) {} + 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) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; diff --git a/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java b/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java index 9495743f..59d0240a 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java @@ -130,14 +130,14 @@ public class EntityFishHook extends Entity { this.angler.fishEntity = this; this.setSize(0.25F, 0.25F); 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.141F) * 0.16F); + this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posY -= 0.10000000149011612D; - this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * 0.16F); + this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.setPosition(this.posX, this.posY, this.posZ); float f = 0.4F; - 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.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f); - this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.141F) * f); + this.motionX = (double) (-MathHelper.sin(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.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f); + this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * 3.1415927F) * f); 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.motionZ = parDouble3; float f1 = MathHelper.sqrt_double(parDouble1 * parDouble1 + parDouble3 * parDouble3); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(parDouble1, parDouble3) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(parDouble2, (double) f1) * 180.0D / 3.1415927410125732D); this.ticksInGround = 0; } @@ -285,9 +285,9 @@ public class EntityFishHook extends Entity { if (!this.inGround) { this.moveEntity(this.motionX, this.motionY, 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.141); + this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); - 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) {} + 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) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; diff --git a/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java b/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java index 791d0fa0..edad04a8 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java @@ -55,14 +55,14 @@ public abstract class EntityThrowable extends Entity implements IProjectile { this.thrower = throwerIn; this.setSize(0.25F, 0.25F); 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.141F) * 0.16F); + this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.posY -= 0.10000000149011612D; - this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.141F) * 0.16F); + this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * 3.1415927F) * 0.16F); this.setPosition(this.posX, this.posY, this.posZ); float f = 0.4F; - 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.141F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.141F) * f); - this.motionY = (double) (-MathHelper.sin((this.rotationPitch + this.getInaccuracy()) / 180.0F * 3.141F) * f); + this.motionX = (double) (-MathHelper.sin(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.1415927F) * MathHelper.cos(this.rotationPitch / 180.0F * 3.1415927F) * f); + this.motionY = (double) (-MathHelper.sin((this.rotationPitch + this.getInaccuracy()) / 180.0F * 3.1415927F) * f); 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.motionZ = d2; float f3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f3) * 180.0D / 3.1415927410125732D); this.ticksInGround = 0; } @@ -114,8 +114,8 @@ public abstract class EntityThrowable extends Entity implements IProjectile { this.motionZ = d2; if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(d0 * d0 + d2 * d2); - 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.141); + this.prevRotationYaw = this.rotationYaw = (float) (MathHelper.func_181159_b(d0, d2) * 180.0D / 3.1415927410125732D); + this.prevRotationPitch = this.rotationPitch = (float) (MathHelper.func_181159_b(d1, (double) f) * 180.0D / 3.1415927410125732D); } } @@ -172,9 +172,9 @@ public abstract class EntityThrowable extends Entity implements IProjectile { this.posY += this.motionY; this.posZ += 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.141); + this.rotationYaw = (float) (MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / 3.1415927410125732D); - 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) {} + 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) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; diff --git a/src/main/java/net/minecraft/item/Item.java b/src/main/java/net/minecraft/item/Item.java index 9b067ff6..d76eeb5d 100644 --- a/src/main/java/net/minecraft/item/Item.java +++ b/src/main/java/net/minecraft/item/Item.java @@ -407,8 +407,8 @@ public class Item { double d1 = playerIn.posY + (double) playerIn.getEyeHeight(); double d2 = playerIn.posZ; Vec3 vec3 = new Vec3(d0, d1, d2); - float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.141F); - float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.141F); + float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.1415927F); + float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.1415927F); float f4 = -MathHelper.cos(-f * 0.017453292F); float f5 = MathHelper.sin(-f * 0.017453292F); float f6 = f3 * f4; diff --git a/src/main/java/net/minecraft/item/ItemBoat.java b/src/main/java/net/minecraft/item/ItemBoat.java index f98d266a..44965fad 100644 --- a/src/main/java/net/minecraft/item/ItemBoat.java +++ b/src/main/java/net/minecraft/item/ItemBoat.java @@ -51,8 +51,8 @@ public class ItemBoat extends Item { double d1 = entityplayer.prevPosY + (entityplayer.posY - entityplayer.prevPosY) * (double) f + (double) entityplayer.getEyeHeight(); double d2 = entityplayer.prevPosZ + (entityplayer.posZ - entityplayer.prevPosZ) * (double) f; Vec3 vec3 = new Vec3(d0, d1, d2); - float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.141F); - float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.141F); + float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.1415927F); + float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.1415927F); float f5 = -MathHelper.cos(-f1 * 0.017453292F); float f6 = MathHelper.sin(-f1 * 0.017453292F); float f7 = f4 * f5; diff --git a/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java b/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java index ce4d679b..069a09ba 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java @@ -87,26 +87,26 @@ public class TileEntityEnchantmentTable extends TileEntity implements ITickable, this.bookSpread -= 0.1F; } - while (this.bookRotation >= 3.141F) { + while (this.bookRotation >= 3.1415927F) { this.bookRotation -= 6.2831855F; } - while (this.bookRotation < -3.141F) { + while (this.bookRotation < -3.1415927F) { this.bookRotation += 6.2831855F; } - while (this.field_145924_q >= 3.141F) { + while (this.field_145924_q >= 3.1415927F) { this.field_145924_q -= 6.2831855F; } - while (this.field_145924_q < -3.141F) { + while (this.field_145924_q < -3.1415927F) { this.field_145924_q += 6.2831855F; } float f2; - for (f2 = this.field_145924_q - this.bookRotation; f2 >= 3.141F; f2 -= 6.2831855F) {} + for (f2 = this.field_145924_q - this.bookRotation; f2 >= 3.1415927F; f2 -= 6.2831855F) {} - while (f2 < -3.141F) { + while (f2 < -3.1415927F) { f2 += 6.2831855F; } diff --git a/src/main/java/net/minecraft/util/Timer.java b/src/main/java/net/minecraft/util/Timer.java index 05f70a40..065deef2 100644 --- a/src/main/java/net/minecraft/util/Timer.java +++ b/src/main/java/net/minecraft/util/Timer.java @@ -85,6 +85,6 @@ public class Timer { this.elapsedTicks = 10; } - this.renderPartialTicks = ((int) (this.elapsedPartialTicks * 64.0f) / 64.0f); + this.renderPartialTicks = this.elapsedPartialTicks; } } diff --git a/src/main/java/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java index 1f0901b7..e0844cb3 100644 --- a/src/main/java/net/minecraft/world/World.java +++ b/src/main/java/net/minecraft/world/World.java @@ -1053,7 +1053,7 @@ public abstract class World implements IBlockAccess { */ public int calculateSkylightSubtracted(float parFloat1) { float f = this.getCelestialAngle(parFloat1); - float f1 = 1.0F - (MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F); + float f1 = 1.0F - (MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = 1.0F - f1; f1 = (float) ((double) f1 * (1.0D - (double) (this.getRainStrength(parFloat1) * 5.0F) / 16.0D)); @@ -1068,7 +1068,7 @@ public abstract class World implements IBlockAccess { */ public float getSunBrightness(float parFloat1) { float f = this.getCelestialAngle(parFloat1); - float f1 = 1.0F - (MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.2F); + float f1 = 1.0F - (MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.2F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); f1 = 1.0F - f1; f1 = (float) ((double) f1 * (1.0D - (double) (this.getRainStrength(parFloat1) * 5.0F) / 16.0D)); @@ -1081,7 +1081,7 @@ public abstract class World implements IBlockAccess { */ public Vec3 getSkyColor(Entity entityIn, float partialTicks) { float f = this.getCelestialAngle(partialTicks); - float f1 = MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F; + float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); int i = MathHelper.floor_double(entityIn.posX); int j = MathHelper.floor_double(entityIn.posY); @@ -1153,12 +1153,12 @@ public abstract class World implements IBlockAccess { */ public float getCelestialAngleRadians(float partialTicks) { float f = this.getCelestialAngle(partialTicks); - return f * 3.141F * 2.0F; + return f * 3.1415927F * 2.0F; } public Vec3 getCloudColour(float partialTicks) { float f = this.getCelestialAngle(partialTicks); - float f1 = MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F; + float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); float f2 = (float) (this.cloudColour >> 16 & 255L) / 255.0F; float f3 = (float) (this.cloudColour >> 8 & 255L) / 255.0F; @@ -1224,7 +1224,7 @@ public abstract class World implements IBlockAccess { */ public float getStarBrightness(float partialTicks) { float f = this.getCelestialAngle(partialTicks); - float f1 = 1.0F - (MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.25F); + float f1 = 1.0F - (MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.25F); f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); return f1 * f1 * 0.5F; } diff --git a/src/main/java/net/minecraft/world/WorldProvider.java b/src/main/java/net/minecraft/world/WorldProvider.java index 8f5081c8..f97b3b8a 100644 --- a/src/main/java/net/minecraft/world/WorldProvider.java +++ b/src/main/java/net/minecraft/world/WorldProvider.java @@ -98,11 +98,11 @@ public abstract class WorldProvider { */ public float[] calcSunriseSunsetColors(float celestialAngle, float partialTicks) { float f = 0.4F; - float f1 = MathHelper.cos(celestialAngle * 3.141F * 2.0F) - 0.0F; + float f1 = MathHelper.cos(celestialAngle * 3.1415927F * 2.0F) - 0.0F; float f2 = 0.0F; if (f1 >= f2 - f && f1 <= f2 + f) { float f3 = (f1 - f2) / f * 0.5F + 0.5F; - float f4 = 1.0F - (1.0F - MathHelper.sin(f3 * 3.141F)) * 0.99F; + float f4 = 1.0F - (1.0F - MathHelper.sin(f3 * 3.1415927F)) * 0.99F; f4 = f4 * f4; this.colorsSunriseSunset[0] = f3 * 0.3F + 0.7F; this.colorsSunriseSunset[1] = f3 * f3 * 0.7F + 0.2F; @@ -118,7 +118,7 @@ public abstract class WorldProvider { * Return Vec3D with biome specific fog color */ public Vec3 getFogColor(float parFloat1, float parFloat2) { - float f = MathHelper.cos(parFloat1 * 3.141F * 2.0F) * 2.0F + 0.5F; + float f = MathHelper.cos(parFloat1 * 3.1415927F * 2.0F) * 2.0F + 0.5F; f = MathHelper.clamp_float(f, 0.0F, 1.0F); float f1 = 0.7529412F; float f2 = 0.84705883F; diff --git a/src/main/java/net/minecraft/world/WorldProviderEnd.java b/src/main/java/net/minecraft/world/WorldProviderEnd.java index 6f553b12..f28fefcb 100644 --- a/src/main/java/net/minecraft/world/WorldProviderEnd.java +++ b/src/main/java/net/minecraft/world/WorldProviderEnd.java @@ -52,7 +52,7 @@ public class WorldProviderEnd extends WorldProvider { */ public Vec3 getFogColor(float f, float var2) { int i = 10518688; - float f1 = MathHelper.cos(f * 3.141F * 2.0F) * 2.0F + 0.5F; + float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); float f2 = (float) (i >> 16 & 255) / 255.0F; float f3 = (float) (i >> 8 & 255) / 255.0F;