From f4170f030f009d846f1dff183afa5437f1b27516 Mon Sep 17 00:00:00 2001 From: SolDev69 Date: Sat, 19 Aug 2023 21:46:40 -0400 Subject: [PATCH] fucked up renderer --- runtime/commands.pyc | Bin 58104 -> 58230 bytes runtime/filehandling/__init__.pyc | Bin 146 -> 148 bytes runtime/filehandling/srgsexport.pyc | Bin 2602 -> 2606 bytes runtime/filehandling/srgshandler.pyc | Bin 1955 -> 1963 bytes runtime/mcp.pyc | Bin 6765 -> 6783 bytes runtime/pylibs/__init__.pyc | Bin 140 -> 142 bytes runtime/pylibs/annotate_gl_constants.pyc | Bin 42425 -> 42441 bytes runtime/pylibs/cleanup_src.pyc | Bin 9069 -> 9089 bytes runtime/pylibs/fffix.pyc | Bin 6569 -> 6591 bytes runtime/pylibs/jadfix.pyc | Bin 14580 -> 14628 bytes runtime/pylibs/normlines.pyc | Bin 2640 -> 2648 bytes runtime/pylibs/normpatch.pyc | Bin 1794 -> 1800 bytes runtime/pylibs/whereis.pyc | Bin 708 -> 712 bytes .../net/minecraft/src/ActiveRenderInfo.java | 22 +- .../net/minecraft/src/AnvilSaveConverter.java | 6 +- .../net/minecraft/src/BiomeGenBase.java | 8 +- .../net/minecraft/src/BiomeGenSwamp.java | 8 +- src/minecraft/net/minecraft/src/Block.java | 44 +- src/minecraft/net/minecraft/src/BlockBed.java | 14 +- .../net/minecraft/src/BlockBrewingStand.java | 14 +- .../net/minecraft/src/BlockButton.java | 4 +- .../net/minecraft/src/BlockCactus.java | 4 +- .../net/minecraft/src/BlockCake.java | 4 +- .../net/minecraft/src/BlockCauldron.java | 2 +- .../net/minecraft/src/BlockChest.java | 12 +- .../net/minecraft/src/BlockCocoa.java | 2 +- .../net/minecraft/src/BlockCrops.java | 2 +- .../net/minecraft/src/BlockDetectorRail.java | 2 +- .../net/minecraft/src/BlockDispenser.java | 58 +- .../net/minecraft/src/BlockDragonEgg.java | 10 +- .../minecraft/src/BlockEnchantmentTable.java | 2 +- .../net/minecraft/src/BlockEndPortal.java | 6 +- .../minecraft/src/BlockEndPortalFrame.java | 2 +- .../net/minecraft/src/BlockEnderChest.java | 22 +- .../net/minecraft/src/BlockFarmland.java | 2 +- .../net/minecraft/src/BlockFence.java | 2 +- .../net/minecraft/src/BlockFenceGate.java | 6 +- .../net/minecraft/src/BlockFire.java | 14 +- .../net/minecraft/src/BlockFluid.java | 50 +- .../net/minecraft/src/BlockFurnace.java | 26 +- .../net/minecraft/src/BlockHalfSlab.java | 2 +- .../net/minecraft/src/BlockJukeBox.java | 8 +- .../net/minecraft/src/BlockLeaves.java | 6 +- .../net/minecraft/src/BlockLever.java | 2 +- .../net/minecraft/src/BlockLilyPad.java | 2 +- .../net/minecraft/src/BlockMycelium.java | 2 +- .../net/minecraft/src/BlockNote.java | 6 +- .../net/minecraft/src/BlockPistonBase.java | 12 +- .../net/minecraft/src/BlockPistonMoving.java | 24 +- .../net/minecraft/src/BlockPortal.java | 24 +- .../net/minecraft/src/BlockPressurePlate.java | 10 +- .../net/minecraft/src/BlockPumpkin.java | 10 +- .../net/minecraft/src/BlockRedstoneOre.java | 20 +- .../minecraft/src/BlockRedstoneRepeater.java | 8 +- .../net/minecraft/src/BlockRedstoneTorch.java | 14 +- .../net/minecraft/src/BlockRedstoneWire.java | 8 +- .../net/minecraft/src/BlockSand.java | 2 +- .../net/minecraft/src/BlockSilverfish.java | 2 +- .../net/minecraft/src/BlockSnow.java | 10 +- .../net/minecraft/src/BlockSoulSand.java | 2 +- .../net/minecraft/src/BlockStairs.java | 4 +- .../net/minecraft/src/BlockStem.java | 4 +- src/minecraft/net/minecraft/src/BlockTNT.java | 4 +- .../net/minecraft/src/BlockTorch.java | 6 +- .../net/minecraft/src/BlockTripWire.java | 2 +- .../minecraft/src/BlockTripWireSource.java | 8 +- .../net/minecraft/src/ChunkProviderEnd.java | 12 +- .../minecraft/src/ChunkProviderGenerate.java | 12 +- .../net/minecraft/src/ChunkProviderHell.java | 14 +- .../net/minecraft/src/ClippingHelper.java | 2 +- .../net/minecraft/src/CommandServerTp.java | 2 +- .../net/minecraft/src/ComponentVillage.java | 2 +- .../net/minecraft/src/ContainerCreative.java | 2 +- .../minecraft/src/ContainerEnchantment.java | 2 +- .../net/minecraft/src/ContainerWorkbench.java | 2 +- .../net/minecraft/src/DedicatedServer.java | 2 +- .../net/minecraft/src/EffectRenderer.java | 32 +- src/minecraft/net/minecraft/src/Entity.java | 132 +- .../minecraft/src/EntityAIArrowAttack.java | 4 +- .../src/EntityAIAttackOnCollide.java | 2 +- .../minecraft/src/EntityAIAvoidEntity.java | 4 +- .../net/minecraft/src/EntityAIBeg.java | 6 +- .../net/minecraft/src/EntityAIBreakDoor.java | 2 +- .../minecraft/src/EntityAIDoorInteract.java | 10 +- .../net/minecraft/src/EntityAIFleeSun.java | 8 +- .../minecraft/src/EntityAIFollowOwner.java | 6 +- .../minecraft/src/EntityAIHurtByTarget.java | 2 +- .../minecraft/src/EntityAILeapAtTarget.java | 6 +- .../net/minecraft/src/EntityAILookIdle.java | 8 +- .../net/minecraft/src/EntityAIMate.java | 4 +- .../minecraft/src/EntityAIMoveIndoors.java | 8 +- .../src/EntityAIMoveThroughVillage.java | 8 +- .../src/EntityAIMoveTowardsTarget.java | 4 +- .../src/EntityAIMoveTwardsRestriction.java | 2 +- .../src/EntityAINearestAttackableTarget.java | 4 +- .../minecraft/src/EntityAIOcelotAttack.java | 2 +- .../net/minecraft/src/EntityAIOcelotSit.java | 10 +- .../src/EntityAIRestrictOpenDoor.java | 2 +- .../net/minecraft/src/EntityAITarget.java | 4 +- .../net/minecraft/src/EntityAITempt.java | 6 +- .../minecraft/src/EntityAIVillagerMate.java | 2 +- .../minecraft/src/EntityAIWatchClosest.java | 8 +- .../net/minecraft/src/EntityAnimal.java | 20 +- .../net/minecraft/src/EntityArrow.java | 94 +- .../net/minecraft/src/EntityBlaze.java | 12 +- .../net/minecraft/src/EntityBoat.java | 52 +- .../net/minecraft/src/EntityBreakingFX.java | 14 +- .../net/minecraft/src/EntityBubbleFX.java | 6 +- .../net/minecraft/src/EntityChicken.java | 4 +- .../minecraft/src/EntityClientPlayerMP.java | 4 +- .../net/minecraft/src/EntityCreature.java | 16 +- .../net/minecraft/src/EntityCrit2FX.java | 14 +- .../net/minecraft/src/EntityCritFX.java | 4 +- .../net/minecraft/src/EntityDiggingFX.java | 14 +- .../net/minecraft/src/EntityDragon.java | 100 +- .../minecraft/src/EntityDropParticleFX.java | 4 +- .../src/EntityEnchantmentTableParticleFX.java | 6 +- .../net/minecraft/src/EntityEnderEye.java | 24 +- .../net/minecraft/src/EntityEnderman.java | 20 +- .../net/minecraft/src/EntityExplodeFX.java | 8 +- src/minecraft/net/minecraft/src/EntityFX.java | 34 +- .../net/minecraft/src/EntityFireball.java | 24 +- .../net/minecraft/src/EntityFishHook.java | 92 +- .../net/minecraft/src/EntityFlameFX.java | 6 +- .../net/minecraft/src/EntityFlying.java | 6 +- .../net/minecraft/src/EntityFootStepFX.java | 8 +- .../net/minecraft/src/EntityGhast.java | 18 +- .../minecraft/src/EntityHugeExplodeFX.java | 2 +- .../net/minecraft/src/EntityIronGolem.java | 4 +- .../net/minecraft/src/EntityItem.java | 14 +- .../minecraft/src/EntityLargeExplodeFX.java | 14 +- .../net/minecraft/src/EntityLavaFX.java | 2 +- .../net/minecraft/src/EntityLiving.java | 120 +- .../net/minecraft/src/EntityLookHelper.java | 10 +- .../net/minecraft/src/EntityMagmaCube.java | 2 +- .../net/minecraft/src/EntityMinecart.java | 122 +- .../net/minecraft/src/EntityMooshroom.java | 4 +- .../net/minecraft/src/EntityMoveHelper.java | 4 +- .../net/minecraft/src/EntityNoteFX.java | 6 +- .../minecraft/src/EntityOtherPlayerMP.java | 16 +- .../net/minecraft/src/EntityPainting.java | 14 +- .../net/minecraft/src/EntityPickupFX.java | 16 +- .../net/minecraft/src/EntityPlayer.java | 78 +- .../net/minecraft/src/EntityPlayerMP.java | 4 +- .../net/minecraft/src/EntityPlayerSP.java | 24 +- .../net/minecraft/src/EntityPortalFX.java | 6 +- .../net/minecraft/src/EntityPotion.java | 2 +- .../net/minecraft/src/EntityRainFX.java | 6 +- .../net/minecraft/src/EntityRenderer.java | 122 +- .../net/minecraft/src/EntitySheep.java | 10 +- .../net/minecraft/src/EntitySlime.java | 8 +- .../net/minecraft/src/EntitySnowman.java | 4 +- .../net/minecraft/src/EntitySorter.java | 12 +- .../net/minecraft/src/EntitySpider.java | 6 +- .../net/minecraft/src/EntitySquid.java | 30 +- .../net/minecraft/src/EntityTNTPrimed.java | 6 +- .../net/minecraft/src/EntityTameable.java | 2 +- .../net/minecraft/src/EntityThrowable.java | 60 +- .../net/minecraft/src/EntityTrackerEntry.java | 12 +- .../net/minecraft/src/EntityVillager.java | 2 +- .../net/minecraft/src/EntityWolf.java | 10 +- .../net/minecraft/src/EntityXPOrb.java | 16 +- .../net/minecraft/src/EnumEntitySize.java | 2 +- .../net/minecraft/src/Explosion.java | 48 +- .../net/minecraft/src/FontRenderer.java | 16 +- .../minecraft/src/GenLayerVoronoiZoom.java | 26 +- src/minecraft/net/minecraft/src/Gui.java | 24 +- .../net/minecraft/src/GuiAchievement.java | 4 +- .../net/minecraft/src/GuiAchievements.java | 32 +- .../minecraft/src/GuiContainerCreative.java | 2 +- .../net/minecraft/src/GuiEnchantment.java | 4 +- .../net/minecraft/src/GuiIngame.java | 28 +- .../net/minecraft/src/GuiInventory.java | 8 +- .../net/minecraft/src/GuiMainMenu.java | 28 +- .../net/minecraft/src/GuiNewChat.java | 2 +- .../net/minecraft/src/GuiParticle.java | 12 +- .../net/minecraft/src/GuiScreen.java | 8 +- src/minecraft/net/minecraft/src/GuiSlot.java | 72 +- src/minecraft/net/minecraft/src/GuiStats.java | 8 +- .../net/minecraft/src/GuiTextField.java | 8 +- .../net/minecraft/src/GuiTexturePackSlot.java | 8 +- .../net/minecraft/src/GuiWinGame.java | 16 +- src/minecraft/net/minecraft/src/Item.java | 12 +- src/minecraft/net/minecraft/src/ItemBed.java | 2 +- .../net/minecraft/src/ItemBlock.java | 2 +- src/minecraft/net/minecraft/src/ItemBoat.java | 18 +- src/minecraft/net/minecraft/src/ItemBow.java | 4 +- .../net/minecraft/src/ItemBucket.java | 8 +- src/minecraft/net/minecraft/src/ItemDoor.java | 2 +- .../net/minecraft/src/ItemEnderEye.java | 8 +- .../net/minecraft/src/ItemFireball.java | 2 +- .../net/minecraft/src/ItemFlintAndSteel.java | 2 +- src/minecraft/net/minecraft/src/ItemHoe.java | 2 +- src/minecraft/net/minecraft/src/ItemMap.java | 10 +- .../net/minecraft/src/ItemMinecart.java | 2 +- .../net/minecraft/src/ItemMonsterPlacer.java | 2 +- src/minecraft/net/minecraft/src/ItemReed.java | 2 +- .../net/minecraft/src/ItemRenderer.java | 114 +- src/minecraft/net/minecraft/src/ItemSign.java | 2 +- src/minecraft/net/minecraft/src/ItemSlab.java | 4 +- .../net/minecraft/src/ItemSword.java | 2 +- src/minecraft/net/minecraft/src/ItemTool.java | 2 +- .../minecraft/src/LoadingScreenRenderer.java | 22 +- src/minecraft/net/minecraft/src/MapData.java | 10 +- .../net/minecraft/src/MapGenCaves.java | 34 +- .../net/minecraft/src/MapGenCavesHell.java | 34 +- .../net/minecraft/src/MapGenRavine.java | 36 +- .../net/minecraft/src/MapGenStronghold.java | 8 +- .../net/minecraft/src/MapGenStructure.java | 4 +- .../net/minecraft/src/MapItemRenderer.java | 16 +- .../net/minecraft/src/MathHelper.java | 12 +- .../net/minecraft/src/ModelBiped.java | 38 +- .../net/minecraft/src/ModelBlaze.java | 10 +- .../net/minecraft/src/ModelBoat.java | 8 +- .../net/minecraft/src/ModelBook.java | 4 +- .../net/minecraft/src/ModelChicken.java | 8 +- .../net/minecraft/src/ModelCreeper.java | 8 +- .../net/minecraft/src/ModelDragon.java | 52 +- .../net/minecraft/src/ModelEnderman.java | 8 +- .../net/minecraft/src/ModelIronGolem.java | 4 +- .../net/minecraft/src/ModelMinecart.java | 10 +- .../net/minecraft/src/ModelOcelot.java | 30 +- .../net/minecraft/src/ModelQuadruped.java | 10 +- .../net/minecraft/src/ModelRenderer.java | 18 +- .../net/minecraft/src/ModelSilverfish.java | 4 +- .../net/minecraft/src/ModelSnowMan.java | 8 +- .../net/minecraft/src/ModelSpider.java | 18 +- .../net/minecraft/src/ModelSquid.java | 8 +- .../net/minecraft/src/ModelVillager.java | 6 +- .../net/minecraft/src/ModelWolf.java | 18 +- .../net/minecraft/src/ModelZombie.java | 8 +- .../src/MovementInputFromOptions.java | 4 +- .../net/minecraft/src/NetClientHandler.java | 76 +- .../net/minecraft/src/NetServerHandler.java | 20 +- .../minecraft/src/NoiseGeneratorOctaves.java | 14 +- .../minecraft/src/NoiseGeneratorPerlin.java | 32 +- .../minecraft/src/NoiseGeneratorPerlin2.java | 32 +- .../minecraft/src/NoiseGeneratorPerlin64.java | 32 +- .../net/minecraft/src/Packet62LevelSound.java | 6 +- src/minecraft/net/minecraft/src/Particle.java | 2 +- .../net/minecraft/src/PathEntity.java | 6 +- .../net/minecraft/src/PathFinder.java | 4 +- .../net/minecraft/src/PathNavigate.java | 18 +- .../minecraft/src/PositionTextureVertex.java | 2 +- src/minecraft/net/minecraft/src/Potion.java | 4 +- .../net/minecraft/src/PotionHelper.java | 4 +- src/minecraft/net/minecraft/src/Profiler.java | 10 +- .../src/RandomPositionGenerator.java | 8 +- src/minecraft/net/minecraft/src/Render.java | 56 +- .../net/minecraft/src/RenderArrow.java | 24 +- .../net/minecraft/src/RenderBlocks.java | 2028 ++++++++--------- .../net/minecraft/src/RenderDragon.java | 26 +- .../minecraft/src/RenderEnchantmentTable.java | 12 +- .../net/minecraft/src/RenderEndPortal.java | 12 +- .../net/minecraft/src/RenderFallingSand.java | 2 +- .../net/minecraft/src/RenderFireball.java | 8 +- .../net/minecraft/src/RenderFish.java | 48 +- .../net/minecraft/src/RenderGlobal.java | 292 +-- .../net/minecraft/src/RenderIronGolem.java | 4 +- .../net/minecraft/src/RenderItem.java | 38 +- .../minecraft/src/RenderLightningBolt.java | 24 +- .../net/minecraft/src/RenderLiving.java | 10 +- .../net/minecraft/src/RenderManager.java | 12 +- .../net/minecraft/src/RenderMinecart.java | 8 +- .../net/minecraft/src/RenderPainting.java | 58 +- .../net/minecraft/src/RenderPlayer.java | 24 +- .../net/minecraft/src/RenderSnowball.java | 8 +- .../net/minecraft/src/RenderSorter.java | 4 +- .../net/minecraft/src/RenderVillager.java | 2 +- .../net/minecraft/src/RenderXPOrb.java | 8 +- .../net/minecraft/src/ScaledResolution.java | 4 +- .../src/ServerConfigurationManager.java | 12 +- .../net/minecraft/src/SoundManager.java | 10 +- .../net/minecraft/src/SpawnerAnimals.java | 10 +- .../net/minecraft/src/StatTypeDistance.java | 2 +- .../net/minecraft/src/StatTypeTime.java | 2 +- .../net/minecraft/src/Teleporter.java | 26 +- .../net/minecraft/src/Tessellator.java | 6 +- .../net/minecraft/src/TextureCompassFX.java | 26 +- .../net/minecraft/src/TextureLavaFX.java | 4 +- .../net/minecraft/src/TextureLavaFlowFX.java | 4 +- .../net/minecraft/src/TexturePortalFX.java | 2 +- .../net/minecraft/src/TextureWatchFX.java | 18 +- .../net/minecraft/src/TexturedQuad.java | 2 +- .../net/minecraft/src/TileEntity.java | 6 +- .../minecraft/src/TileEntityBrewingStand.java | 2 +- .../net/minecraft/src/TileEntityChest.java | 14 +- .../src/TileEntityChestRenderer.java | 2 +- .../minecraft/src/TileEntityDispenser.java | 2 +- .../src/TileEntityEnchantmentTable.java | 28 +- .../minecraft/src/TileEntityEnderChest.java | 14 +- .../src/TileEntityEnderChestRenderer.java | 2 +- .../net/minecraft/src/TileEntityFurnace.java | 2 +- .../minecraft/src/TileEntityMobSpawner.java | 16 +- .../src/TileEntityMobSpawnerRenderer.java | 2 +- .../net/minecraft/src/TileEntityPiston.java | 2 +- .../net/minecraft/src/TileEntityRenderer.java | 8 +- .../src/TileEntityRendererPiston.java | 4 +- src/minecraft/net/minecraft/src/Timer.java | 6 +- src/minecraft/net/minecraft/src/Vec3.java | 18 +- src/minecraft/net/minecraft/src/Village.java | 8 +- .../net/minecraft/src/VillageSiege.java | 8 +- src/minecraft/net/minecraft/src/World.java | 84 +- .../net/minecraft/src/WorldClient.java | 12 +- .../net/minecraft/src/WorldGenBigTree.java | 48 +- .../net/minecraft/src/WorldGenHugeTrees.java | 2 +- .../net/minecraft/src/WorldGenLakes.java | 6 +- .../net/minecraft/src/WorldGenMinable.java | 32 +- .../net/minecraft/src/WorldGenSpikes.java | 2 +- .../net/minecraft/src/WorldManager.java | 10 +- .../net/minecraft/src/WorldProvider.java | 10 +- .../net/minecraft/src/WorldProviderEnd.java | 4 +- .../net/minecraft/src/WorldRenderer.java | 12 +- .../net/minecraft/src/WorldServer.java | 4 +- 314 files changed, 3377 insertions(+), 3377 deletions(-) diff --git a/runtime/commands.pyc b/runtime/commands.pyc index 4823e76ca165f307e261c7b8ab85c3c89d0e2d2c..ac0c1e2e2763a7e6039c54cc9d7a9a7dd4aa5073 100644 GIT binary patch delta 2701 zcma)7T}V@57+&to~eA0Oxs^##Kn(ayL?J9G*w7cU^lMLEbcbTL}& zmjf-`jCu^nT8vcZ^a4nZ@?5)Pmy27R#*89775flYG`kE4NJp+}!011D@>hl(2(6p) zRh2-hw8KqTtJjJUPF)ldPO7`~#wADdU6uNFa7D#Y0Inp%T6l>eWQdzB1 zJn*qtPRpU%yB2`6@}vV%C$;ok#=51Ky*>z zyOAi(meJg^3|Q3I_#+T`Z6YL3Po^;_M+wvLP+~F*+=yq_ol1hp+81E!nVD69l9!yH zy^bM8ezt^q(g#3%4)tX22K1)u;$%JrO@yDcjkk9Jea_YP?k1pbITgE$BXWI?G`4gL z6Su}(MmnwFXrV3d%1!Wl!qlFXevq0!maPxY5{R2hv#rn;+%&$fVGk9TwwY7FZ&3O2 mUd62b-1Ynq4H&x4i5iC}m1sf)|32B8hxMH#cn)b?Bt1m81ss ziv$ZQ>XKow9+WwDkid!J!NP+Dg&+h`)IktM5Z@>8{C(~pzTfBj{Q3R1a?b5}r{>%| z;)(Yyr?i@UU$w*GFxtDqmJ#j6YU9|SvfAzOPjAeh~vJDUHvS`p_6LO79u^)aqs37 z>K~cGdeO}0L#G9tm#V|3AZG@B>RDtHMhN<7p(}yq?5OcuNjNgU+e?AoM^Mk^)Lvf> zmB$m?>Hm#7toY7$hul<=cq_2hX?I8yZ9(8pR-{*XHzCne-;%2+vN`Qn|L)Hsj1wE_ z!}ROHN6}DLM+YEh2E8==*b*hKP&Y(e=IJ8r4Bt_DJSpO$6H_AJOD|@j9&gvVmklB= z^ZGCJm!n$sFDq9AHyqfEC2ui diff --git a/runtime/filehandling/__init__.pyc b/runtime/filehandling/__init__.pyc index 430ea5629ce791dd57fd12b86c1865a379e24e59..244301e06e70fce5e15804d4a2e7c41a5710737c 100644 GIT binary patch delta 51 zcmbQlIE9g&`7Z_`Q}qq?jP;Cki%W_!3sQ3u^HPc@ HMw}GP-3=9nV8Tq-X`nj3esrtnwMVSSuIf;2G#qq`2l@nvl E0e9XIfB*mh diff --git a/runtime/filehandling/srgsexport.pyc b/runtime/filehandling/srgsexport.pyc index c59fc704360985f9ef4244a47496ffdcf3122f2d..8bd828a8d35d9d6add1f70fd15685e09492783e0 100644 GIT binary patch delta 94 zcmZ1_vQC7Z`7KW@9=@yq1Wfr97B<7_Q RPkzp+GWi$Bd14eg0|2CQAA|q^ delta 90 zcmZ1{vPy)V`7>D}cY#A6B^fU5vQ}uH*vs3kpONufJQgagXQi|h?vnwaR O=2V&dhvPh9WzGPPJRr#c diff --git a/runtime/filehandling/srgshandler.pyc b/runtime/filehandling/srgshandler.pyc index 48dfadf0edc85d38426501de37d85c2332624d39..f631a2636ebc90ffe506344d3ffb8b253dc81d45 100644 GIT binary patch delta 177 zcmZ3?znY(&`7g delta 169 zcmZ3@znGt$`7`KgXb_@&*`WgATsrtE@*{S-)B}JJ9sX2*xDaG-{*_D%X c*;Oa!F>fJ4+2(YXU?w8eP5#g3M_8F10Es#|Pyhe` diff --git a/runtime/mcp.pyc b/runtime/mcp.pyc index d0991f57e6b5a43a146869d1476212b41699772c..e2b4f3538f6664494773d9333ebf554ad77786be 100644 GIT binary patch delta 372 zcmaEB^52A=`76x}^fU5vQ}uH*vs3jA^^En5bc;)hG7D0367y1u zCkqIQY|;m@LjJ)-b~6QY1_lQGjQreG{oKs#RDDA|V?86?;*z4wg4CSEyp-aJ G(S`tfr4POU delta 49 zcmeBU>|tbQ{>;l&S$<|ByP2FR0|SG8Mt*Lper{%Vs(x`vQD#AEPGVk4aeQ%h<-}M+ E0Cdt2XaE2J diff --git a/runtime/pylibs/annotate_gl_constants.pyc b/runtime/pylibs/annotate_gl_constants.pyc index c198cd9c02d5dc028bfcf9da758fa61fa68dc6ce..b53b8b5f0b3640c9de2df69e0240337350f61020 100644 GIT binary patch delta 346 zcmdman(5?eCU)k}yj&~fA8cfwFiF9Mfq_9kBR@A)KQ}WwRo_t0SkFkexTGkvAT=j3 zFQs_0;T+A$_a?Ovr*P%uXyO!lPx(uf!p;3tFEbLSa^>_UB2^a6oJ^d`$v(4>6SRD@ I;hYXm001a;mH+?% delta 326 zcmX?knrY{0CU)k}yj+##XEw4=m?Y=Kz`&rNk)NBYpPQMTs$X1Elv$9PlbDxM9ABJW zIoWWw=Hv&HT8L4$c5*Z^$^xhSB|_Qe=~FK=5~FVO^d_Rz)yC7S diff --git a/runtime/pylibs/cleanup_src.pyc b/runtime/pylibs/cleanup_src.pyc index 3ac2104f6b084de339f4ce45dadb83d1c738bc8e..a68b8af0a68ce8ecf1e0b8ff59ee2b6c34a5fd2c 100644 GIT binary patch delta 424 zcmaFs*67a8{F#?)h5Un!>>HRBtQZ&=^fU5vQ}uH*vs3jA^^En5bc;)hG7D0367y1u zCo_u5Z~nqOm614=$5>DC5~uR4uozKhz9Y)G$vR@2h*G#&T6`mszUGwPN|X!bH~*Fq SVkOG<$zDo32`f}o_5lDfl!1)^ delta 408 zcmZp4f9uB1{F#@lvi!_O_6^K(77Ppw`WgATsrtE@*{S-)B}JJ9sX2*xDaG-{*_D%R zmE<>nW1h-LjJi{-r+A4`cUf4B81p7;h@L0HxXET>n}|@hSzUZ1QN9(I-b#$?Hgn4g Qu@biT24N-glS7ns0r#_tC;$Ke diff --git a/runtime/pylibs/fffix.pyc b/runtime/pylibs/fffix.pyc index e4b30e0fc9a167a6b2eb49ddd44a34e4c673f4c7..552f264ec8de6b41b640e6d81459755c2acedfcf 100644 GIT binary patch delta 471 zcmZ2!yx*9e`7KW@9=@yq1Wfr97B<7_Q zPtFmOoNU6DK$ODGr`hrtiBT!BIiJIpi8z&yxH^bbxq#Q2NZSSZTZuALa`Rb1FJ|K0 f=_|@e*!ImiV(SU30tULoO+Ln(K$ODGaeR4<#Hf_q%q-x^LY&HGk#9trxj~GPi8wP~NQ4t$~Gocu%WHo;)r{89Y}Q5H*X zR?spdPUU0;E$+!PwEYQM4)%|{&O@S&Wu0uJ7ebt|C-jyP7fhR%8u}2aQo}@!D5pwo Wt}|UkoXW`&=5LAdkmTeViwXezqdBDj delta 970 zcmZ2d^reuU`7^3j9FhL!U&lK^s3b6R;gJ; zsFU0rA=5#Wy;AbpM44Bo@RBHX3zUd6k45DwG47iztbU7d@JVh~)3{HB^Q1Q0Ync+G zZnC`=*W?}A{=``Ap!0|*BV+U;h%xT1-g06BX7f2iZ=%!%o5&L3Jju-~O&1fRZgQ*n NJHp}AYyW(*7r`WgATsrtE@*{S-)B}JJ9sX2*xDaG-{*_D$G bIAu5QVzyx-Mx8O+T_V&SBEqQ2`dpd--4-~- diff --git a/runtime/pylibs/normpatch.pyc b/runtime/pylibs/normpatch.pyc index 38c3a960d9be9660941053fe57229e5c2860c931..8d6add8474d8935e9140c757de93a64becd297e4 100644 GIT binary patch delta 136 zcmZqT>)>N&{>;m@LjJ)<_GV@U3kC)T{fzwFRQ=q{>{NY2J!3s1-Qtp>%!1UM#JrT^ Z$$wd8Hy>q|Vj@Q6a$*$8PQK5k3;;ldE9L+I delta 130 zcmeC+YvN;P{>;l&S$<|Cdo#0~83O}@enx(7s(x-}cB+1HNl|7&YEEKaN^yK~cI9M7 WHrdU`nWdNrt6NT3iR|R3Y{~$n0V>M? diff --git a/runtime/pylibs/whereis.pyc b/runtime/pylibs/whereis.pyc index cdee3e4fd280df9d31dd9c03379dd9dc3b048a61..94599ecf988b8911d0afd42931d79e37b50d51f4 100644 GIT binary patch delta 94 zcmX@YdV-am`7KW@9=@yq1Wfr97B<7_Q QPiADwCq|L<Hq)$ delta 86 zcmX@XdW4mo`7~|RDOc)p#^fU5vQ}uH*vs3kpONufJQgagXQi|h?vnwYv MGvyOfGKt9y0O0o>dH?_b diff --git a/src/minecraft/net/minecraft/src/ActiveRenderInfo.java b/src/minecraft/net/minecraft/src/ActiveRenderInfo.java index 1f9a1f9..2de8e72 100644 --- a/src/minecraft/net/minecraft/src/ActiveRenderInfo.java +++ b/src/minecraft/net/minecraft/src/ActiveRenderInfo.java @@ -64,11 +64,11 @@ public class ActiveRenderInfo int var4 = par1 ? 1 : 0; float var5 = par0EntityPlayer.rotationPitch; float var6 = par0EntityPlayer.rotationYaw; - rotationX = MathHelper.cos(var6 * (float)Math.PI / 180.0F) * (float)(1 - var4 * 2); - rotationZ = MathHelper.sin(var6 * (float)Math.PI / 180.0F) * (float)(1 - var4 * 2); - rotationYZ = -rotationZ * MathHelper.sin(var5 * (float)Math.PI / 180.0F) * (float)(1 - var4 * 2); - rotationXY = rotationX * MathHelper.sin(var5 * (float)Math.PI / 180.0F) * (float)(1 - var4 * 2); - rotationXZ = MathHelper.cos(var5 * (float)Math.PI / 180.0F); + rotationX = MathHelper.cos(var6 * (float)(float)Math.PI / 180.0F) * (float)(1 - var4 * 2); + rotationZ = MathHelper.sin(var6 * (float)(float)Math.PI / 180.0F) * (float)(1 - var4 * 2); + rotationYZ = -rotationZ * MathHelper.sin(var5 * (float)(float)Math.PI / 180.0F) * (float)(1 - var4 * 2); + rotationXY = rotationX * MathHelper.sin(var5 * (float)(float)Math.PI / 180.0F) * (float)(1 - var4 * 2); + rotationXZ = MathHelper.cos(var5 * (float)(float)Math.PI / 180.0F); } /** @@ -77,11 +77,11 @@ public class ActiveRenderInfo public static Vec3 projectViewFromEntity(EntityLiving par0EntityLiving, double par1) { double var3 = par0EntityLiving.prevPosX + (par0EntityLiving.posX - par0EntityLiving.prevPosX) * par1; - double var5 = par0EntityLiving.prevPosY + (par0EntityLiving.posY - par0EntityLiving.prevPosY) * par1 + (double)par0EntityLiving.getEyeHeight(); + double var5 = par0EntityLiving.prevPosY + (par0EntityLiving.posY - par0EntityLiving.prevPosY) * par1 + (float)par0EntityLiving.getEyeHeight(); double var7 = par0EntityLiving.prevPosZ + (par0EntityLiving.posZ - par0EntityLiving.prevPosZ) * par1; - double var9 = var3 + (double)(objectX * 1.0F); - double var11 = var5 + (double)(objectY * 1.0F); - double var13 = var7 + (double)(objectZ * 1.0F); + double var9 = var3 + (float)(objectX * 1.0F); + double var11 = var5 + (float)(objectY * 1.0F); + double var13 = var7 + (float)(objectZ * 1.0F); return Vec3.getVec3Pool().getVecFromPool(var9, var11, var13); } @@ -91,7 +91,7 @@ public class ActiveRenderInfo */ public static int getBlockIdAtEntityViewpoint(World par0World, EntityLiving par1EntityLiving, float par2) { - Vec3 var3 = projectViewFromEntity(par1EntityLiving, (double)par2); + Vec3 var3 = projectViewFromEntity(par1EntityLiving, (float)par2); ChunkPosition var4 = new ChunkPosition(var3); int var5 = par0World.getBlockId(var4.x, var4.y, var4.z); @@ -100,7 +100,7 @@ public class ActiveRenderInfo float var6 = BlockFluid.getFluidHeightPercent(par0World.getBlockMetadata(var4.x, var4.y, var4.z)) - 0.11111111F; float var7 = (float)(var4.y + 1) - var6; - if (var3.yCoord >= (double)var7) + if (var3.yCoord >= (float)var7) { var5 = par0World.getBlockId(var4.x, var4.y + 1, var4.z); } diff --git a/src/minecraft/net/minecraft/src/AnvilSaveConverter.java b/src/minecraft/net/minecraft/src/AnvilSaveConverter.java index 1cd4f4e..d0cec89 100644 --- a/src/minecraft/net/minecraft/src/AnvilSaveConverter.java +++ b/src/minecraft/net/minecraft/src/AnvilSaveConverter.java @@ -174,7 +174,7 @@ public class AnvilSaveConverter extends SaveFormatOld File var8 = (File)var7.next(); this.convertChunks(par1File, var8, par3WorldChunkManager, par4, par5, par6IProgressUpdate); ++par4; - int var9 = (int)Math.round(100.0D * (double)par4 / (double)par5); + int var9 = (int)Math.round(100.0D * (float)par4 / (float)par5); par6IProgressUpdate.setLoadingProgress(var9); } } @@ -221,8 +221,8 @@ public class AnvilSaveConverter extends SaveFormatOld } } - var11 = (int)Math.round(100.0D * (double)(par4 * 1024) / (double)(par5 * 1024)); - int var20 = (int)Math.round(100.0D * (double)((var10 + 1) * 32 + par4 * 1024) / (double)(par5 * 1024)); + var11 = (int)Math.round(100.0D * (float)(par4 * 1024) / (float)(par5 * 1024)); + int var20 = (int)Math.round(100.0D * (float)((var10 + 1) * 32 + par4 * 1024) / (float)(par5 * 1024)); if (var20 > var11) { diff --git a/src/minecraft/net/minecraft/src/BiomeGenBase.java b/src/minecraft/net/minecraft/src/BiomeGenBase.java index 43a5db9..f1a7838 100644 --- a/src/minecraft/net/minecraft/src/BiomeGenBase.java +++ b/src/minecraft/net/minecraft/src/BiomeGenBase.java @@ -330,8 +330,8 @@ public abstract class BiomeGenBase */ public int getBiomeGrassColor() { - double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); - double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); + double var1 = (float)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); + double var3 = (float)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); return ColorizerGrass.getGrassColor(var1, var3); } @@ -340,8 +340,8 @@ public abstract class BiomeGenBase */ public int getBiomeFoliageColor() { - double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); - double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); + double var1 = (float)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); + double var3 = (float)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); return ColorizerFoliage.getFoliageColor(var1, var3); } } diff --git a/src/minecraft/net/minecraft/src/BiomeGenSwamp.java b/src/minecraft/net/minecraft/src/BiomeGenSwamp.java index 4485f60..9b445e2 100644 --- a/src/minecraft/net/minecraft/src/BiomeGenSwamp.java +++ b/src/minecraft/net/minecraft/src/BiomeGenSwamp.java @@ -30,8 +30,8 @@ public class BiomeGenSwamp extends BiomeGenBase */ public int getBiomeGrassColor() { - double var1 = (double)this.getFloatTemperature(); - double var3 = (double)this.getFloatRainfall(); + double var1 = (float)this.getFloatTemperature(); + double var3 = (float)this.getFloatRainfall(); return ((ColorizerGrass.getGrassColor(var1, var3) & 16711422) + 5115470) / 2; } @@ -40,8 +40,8 @@ public class BiomeGenSwamp extends BiomeGenBase */ public int getBiomeFoliageColor() { - double var1 = (double)this.getFloatTemperature(); - double var3 = (double)this.getFloatRainfall(); + double var1 = (float)this.getFloatTemperature(); + double var3 = (float)this.getFloatRainfall(); return ((ColorizerFoliage.getFoliageColor(var1, var3) & 16711422) + 5115470) / 2; } } diff --git a/src/minecraft/net/minecraft/src/Block.java b/src/minecraft/net/minecraft/src/Block.java index 69d2ac8..8f764bf 100644 --- a/src/minecraft/net/minecraft/src/Block.java +++ b/src/minecraft/net/minecraft/src/Block.java @@ -226,22 +226,22 @@ public class Block protected boolean isBlockContainer; /** minimum X for the block bounds (local coordinates) */ - public double minX; + public float minX; /** minimum Y for the block bounds (local coordinates) */ - public double minY; + public float minY; /** minimum Z for the block bounds (local coordinates) */ - public double minZ; + public float minZ; /** maximum X for the block bounds (local coordinates) */ - public double maxX; + public float maxX; /** maximum Y for the block bounds (local coordinates) */ - public double maxY; + public float maxY; /** maximum Z for the block bounds (local coordinates) */ - public double maxZ; + public float maxZ; /** Sound of stepping on the block */ public StepSound stepSound; @@ -426,12 +426,12 @@ public class Block */ public void setBlockBounds(float par1, float par2, float par3, float par4, float par5, float par6) { - this.minX = (double)par1; - this.minY = (double)par2; - this.minZ = (double)par3; - this.maxX = (double)par4; - this.maxY = (double)par5; - this.maxZ = (double)par6; + this.minX = (float)par1; + this.minY = (float)par2; + this.minZ = (float)par3; + this.maxX = (float)par4; + this.maxY = (float)par5; + this.maxZ = (float)par6; } /** @@ -499,7 +499,7 @@ public class Block { double x = par2.doubleValue(), z = par4.doubleValue(); - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)x + this.minX, (double)par3 + this.minY, (double)z + this.minZ, (double)x + this.maxX, (double)par3 + this.maxY, (double)z + this.maxZ); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)x + this.minX, (float)par3 + this.minY, (float)z + this.minZ, (float)x + this.maxX, (float)par3 + this.maxY, (float)z + this.maxZ); } /** @@ -523,7 +523,7 @@ public class Block { double x = par2.doubleValue(), z = par4.doubleValue(); - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)x + this.minX, (double)par3 + this.minY, (double)z + this.minZ, (double)x + this.maxX, (double)par3 + this.maxY, (double)z + this.maxZ); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)x + this.minX, (float)par3 + this.minY, (float)z + this.minZ, (float)x + this.maxX, (float)par3 + this.maxY, (float)z + this.maxZ); } /** @@ -656,10 +656,10 @@ public class Block if (!par1World.isRemote) { float var6 = 0.7F; - double var7 = (double)(par1World.rand.nextFloat() * var6) + (double)(1.0F - var6) * 0.5D; - double var9 = (double)(par1World.rand.nextFloat() * var6) + (double)(1.0F - var6) * 0.5D; - double var11 = (double)(par1World.rand.nextFloat() * var6) + (double)(1.0F - var6) * 0.5D; - EntityItem var13 = new EntityItem(par1World, (double)par2.doubleValue() + var7, (double)par3 + var9, (double)par4.doubleValue() + var11, par5ItemStack); + double var7 = (float)(par1World.rand.nextFloat() * var6) + (float)(1.0F - var6) * 0.5D; + double var9 = (float)(par1World.rand.nextFloat() * var6) + (float)(1.0F - var6) * 0.5D; + double var11 = (float)(par1World.rand.nextFloat() * var6) + (float)(1.0F - var6) * 0.5D; + EntityItem var13 = new EntityItem(par1World, (float)par2.doubleValue() + var7, (float)par3 + var9, (float)par4.doubleValue() + var11, par5ItemStack); var13.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(var13); } @@ -676,7 +676,7 @@ public class Block { int var6 = EntityXPOrb.getXPSplit(par5); par5 -= var6; - par1World.spawnEntityInWorld(new EntityXPOrb(par1World, (double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, var6)); + par1World.spawnEntityInWorld(new EntityXPOrb(par1World, (float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, var6)); } } } @@ -705,8 +705,8 @@ public class Block { double nx = -par2.doubleValue(), nz = -par4.doubleValue(); this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); - par5Vec3 = par5Vec3.addVector(nx, (double)(-par3), nz); - par6Vec3 = par6Vec3.addVector(nx, (double)(-par3), nz); + par5Vec3 = par5Vec3.addVector(nx, (float)(-par3), nz); + par6Vec3 = par6Vec3.addVector(nx, (float)(-par3), nz); Vec3 var7 = par5Vec3.getIntermediateWithXValue(par6Vec3, this.minX); Vec3 var8 = par5Vec3.getIntermediateWithXValue(par6Vec3, this.maxX); Vec3 var9 = par5Vec3.getIntermediateWithYValue(par6Vec3, this.minY); @@ -814,7 +814,7 @@ public class Block var14 = 3; } - return new MovingObjectPosition(par2, par3, par4, var14, var13.addVector((double)par2.doubleValue(), (double)par3, (double)par4.doubleValue())); + return new MovingObjectPosition(par2, par3, par4, var14, var13.addVector((float)par2.doubleValue(), (float)par3, (float)par4.doubleValue())); } } diff --git a/src/minecraft/net/minecraft/src/BlockBed.java b/src/minecraft/net/minecraft/src/BlockBed.java index 828414c..d12b8ea 100644 --- a/src/minecraft/net/minecraft/src/BlockBed.java +++ b/src/minecraft/net/minecraft/src/BlockBed.java @@ -47,9 +47,9 @@ public class BlockBed extends BlockDirectional if (!par1World.provider.canRespawnHere()) { - double var20 = (double)par2.doubleValue() + 0.5D; - double var21 = (double)par3 + 0.5D; - double var15 = (double)par4.doubleValue() + 0.5D; + double var20 = (float)par2.doubleValue() + 0.5D; + double var21 = (float)par3 + 0.5D; + double var15 = (float)par4.doubleValue() + 0.5D; par1World.setBlockWithNotify(par2, par3, par4, 0); int var17 = getDirection(var10); par2 = par2.add(footBlockToHeadBlockMap[var17][0]); @@ -58,12 +58,12 @@ public class BlockBed extends BlockDirectional if (par1World.getBlockId(par2, par3, par4) == this.blockID) { par1World.setBlockWithNotify(par2, par3, par4, 0); - var20 = (var20 + (double)par2.doubleValue() + 0.5D) / 2.0D; - var21 = (var21 + (double)par3 + 0.5D) / 2.0D; - var15 = (var15 + (double)par4.doubleValue() + 0.5D) / 2.0D; + var20 = (var20 + (float)par2.doubleValue() + 0.5D) / 2.0D; + var21 = (var21 + (float)par3 + 0.5D) / 2.0D; + var15 = (var15 + (float)par4.doubleValue() + 0.5D) / 2.0D; } - par1World.newExplosion((Entity)null, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), 5.0F, true); + par1World.newExplosion((Entity)null, (float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), 5.0F, true); return true; } else diff --git a/src/minecraft/net/minecraft/src/BlockBrewingStand.java b/src/minecraft/net/minecraft/src/BlockBrewingStand.java index f7c2045..90076a0 100644 --- a/src/minecraft/net/minecraft/src/BlockBrewingStand.java +++ b/src/minecraft/net/minecraft/src/BlockBrewingStand.java @@ -93,9 +93,9 @@ public class BlockBrewingStand extends BlockContainer */ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - double var6 = (double)((float)par2 + 0.4F + par5Random.nextFloat() * 0.2F); - double var8 = (double)((float)par3 + 0.7F + par5Random.nextFloat() * 0.3F); - double var10 = (double)((float)par4 + 0.4F + par5Random.nextFloat() * 0.2F); + double var6 = (float)((float)par2 + 0.4F + par5Random.nextFloat() * 0.2F); + double var8 = (float)((float)par3 + 0.7F + par5Random.nextFloat() * 0.3F); + double var10 = (float)((float)par4 + 0.4F + par5Random.nextFloat() * 0.2F); par1World.spawnParticle("smoke", var6, var8, var10, 0.0D, 0.0D, 0.0D); } @@ -130,11 +130,11 @@ public class BlockBrewingStand extends BlockContainer } var10.stackSize -= var14; - EntityItem var15 = new EntityItem(par1World, (double)((float)par2.floatValue() + var11), (double)((float)par3 + var12), (double)((float)par4.floatValue() + var13), new ItemStack(var10.itemID, var14, var10.getItemDamage())); + EntityItem var15 = new EntityItem(par1World, (float)((float)par2.floatValue() + var11), (float)((float)par3 + var12), (float)((float)par4.floatValue() + var13), new ItemStack(var10.itemID, var14, var10.getItemDamage())); float var16 = 0.05F; - var15.motionX = (double)((float)this.rand.nextGaussian() * var16); - var15.motionY = (double)((float)this.rand.nextGaussian() * var16 + 0.2F); - var15.motionZ = (double)((float)this.rand.nextGaussian() * var16); + var15.motionX = (float)((float)this.rand.nextGaussian() * var16); + var15.motionY = (float)((float)this.rand.nextGaussian() * var16 + 0.2F); + var15.motionZ = (float)((float)this.rand.nextGaussian() * var16); par1World.spawnEntityInWorld(var15); } } diff --git a/src/minecraft/net/minecraft/src/BlockButton.java b/src/minecraft/net/minecraft/src/BlockButton.java index f8cf95b..eb98dbd 100644 --- a/src/minecraft/net/minecraft/src/BlockButton.java +++ b/src/minecraft/net/minecraft/src/BlockButton.java @@ -220,7 +220,7 @@ public class BlockButton extends Block { par1World.setBlockMetadataWithNotify(par2, par3, par4, var11 + var12); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.6F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.6F); par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); if (var11 == 1) @@ -354,7 +354,7 @@ public class BlockButton extends Block par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this.blockID); } - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.5F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.5F); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); } } diff --git a/src/minecraft/net/minecraft/src/BlockCactus.java b/src/minecraft/net/minecraft/src/BlockCactus.java index d6e763a..771bc95 100644 --- a/src/minecraft/net/minecraft/src/BlockCactus.java +++ b/src/minecraft/net/minecraft/src/BlockCactus.java @@ -50,7 +50,7 @@ public class BlockCactus extends Block public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { float var5 = 0.0625F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var5), (double)par3, (double)((float)par4.floatValue() + var5), (double)((float)(par2.floatValue() + 1) - var5), (double)((float)(par3 + 1) - var5), (double)((float)(par4.floatValue() + 1) - var5)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var5), (float)par3, (float)((float)par4.floatValue() + var5), (float)((float)(par2.floatValue() + 1) - var5), (float)((float)(par3 + 1) - var5), (float)((float)(par4.floatValue() + 1) - var5)); } /** @@ -59,7 +59,7 @@ public class BlockCactus extends Block public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { float var5 = 0.0625F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var5), (double)par3, (double)((float)par4.floatValue() + var5), (double)((float)(par2.floatValue() + 1) - var5), (double)(par3 + 1), (double)((float)(par4.floatValue() + 1) - var5)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var5), (float)par3, (float)((float)par4.floatValue() + var5), (float)((float)(par2.floatValue() + 1) - var5), (float)(par3 + 1), (float)((float)(par4.floatValue() + 1) - var5)); } /** diff --git a/src/minecraft/net/minecraft/src/BlockCake.java b/src/minecraft/net/minecraft/src/BlockCake.java index 968f9e2..15c4e9e 100644 --- a/src/minecraft/net/minecraft/src/BlockCake.java +++ b/src/minecraft/net/minecraft/src/BlockCake.java @@ -43,7 +43,7 @@ public class BlockCake extends Block float var6 = 0.0625F; float var7 = (float)(1 + var5 * 2) / 16.0F; float var8 = 0.5F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var6), (double)((float)(par2.floatValue() + 1) - var6), (double)((float)par3 + var8 - var6), (double)((float)(par4.floatValue() + 1) - var6)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var7), (float)par3, (float)((float)par4.floatValue() + var6), (float)((float)(par2.floatValue() + 1) - var6), (float)((float)par3 + var8 - var6), (float)((float)(par4.floatValue() + 1) - var6)); } /** @@ -55,7 +55,7 @@ public class BlockCake extends Block float var6 = 0.0625F; float var7 = (float)(1 + var5 * 2) / 16.0F; float var8 = 0.5F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var6), (double)((float)(par2.floatValue() + 1) - var6), (double)((float)par3 + var8), (double)((float)(par4.floatValue() + 1) - var6)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var7), (float)par3, (float)((float)par4.floatValue() + var6), (float)((float)(par2.floatValue() + 1) - var6), (float)((float)par3 + var8), (float)((float)(par4.floatValue() + 1) - var6)); } /** diff --git a/src/minecraft/net/minecraft/src/BlockCauldron.java b/src/minecraft/net/minecraft/src/BlockCauldron.java index 2e7d270..eae56cb 100644 --- a/src/minecraft/net/minecraft/src/BlockCauldron.java +++ b/src/minecraft/net/minecraft/src/BlockCauldron.java @@ -115,7 +115,7 @@ public class BlockCauldron extends Block if (!par5EntityPlayer.inventory.addItemStackToInventory(var12)) { - par1World.spawnEntityInWorld(new EntityItem(par1World, (double)par2.doubleValue() + 0.5D, (double)par3 + 1.5D, (double)par4.doubleValue() + 0.5D, var12)); + par1World.spawnEntityInWorld(new EntityItem(par1World, (float)par2.doubleValue() + 0.5D, (float)par3 + 1.5D, (float)par4.doubleValue() + 0.5D, var12)); } else if (par5EntityPlayer instanceof EntityPlayerMP) { diff --git a/src/minecraft/net/minecraft/src/BlockChest.java b/src/minecraft/net/minecraft/src/BlockChest.java index f7037ef..d342e8a 100644 --- a/src/minecraft/net/minecraft/src/BlockChest.java +++ b/src/minecraft/net/minecraft/src/BlockChest.java @@ -83,7 +83,7 @@ public class BlockChest extends BlockContainer int var8 = par1World.getBlockId(par2.subtract(BigInteger.ONE), par3, par4); int var9 = par1World.getBlockId(par2.add(BigInteger.ONE), par3, par4); byte var10 = 0; - int var11 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var11 = MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; if (var11 == 0) { @@ -351,11 +351,11 @@ public class BlockChest extends BlockContainer } var9.stackSize -= var13; - var14 = new EntityItem(par1World, (double)((float)par2.floatValue() + var10), (double)((float)par3 + var11), (double)((float)par4.floatValue() + var12), new ItemStack(var9.itemID, var13, var9.getItemDamage())); + var14 = new EntityItem(par1World, (float)((float)par2.floatValue() + var10), (float)((float)par3 + var11), (float)((float)par4.floatValue() + var12), new ItemStack(var9.itemID, var13, var9.getItemDamage())); float var15 = 0.05F; - var14.motionX = (double)((float)this.random.nextGaussian() * var15); - var14.motionY = (double)((float)this.random.nextGaussian() * var15 + 0.2F); - var14.motionZ = (double)((float)this.random.nextGaussian() * var15); + var14.motionX = (float)((float)this.random.nextGaussian() * var15); + var14.motionY = (float)((float)this.random.nextGaussian() * var15 + 0.2F); + var14.motionZ = (float)((float)this.random.nextGaussian() * var15); if (var9.hasTagCompound()) { @@ -452,7 +452,7 @@ public class BlockChest extends BlockContainer */ private static boolean isOcelotBlockingChest(World par0World, BigInteger par1, int par2, BigInteger par3) { - Iterator var4 = par0World.getEntitiesWithinAABB(EntityOcelot.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par1.doubleValue(), (double)(par2 + 1), (double)par3.doubleValue(), (double)(par1.add(BigInteger.ONE).doubleValue()), (double)(par2 + 2), (double)(par3.add(BigInteger.ONE).doubleValue()))).iterator(); + Iterator var4 = par0World.getEntitiesWithinAABB(EntityOcelot.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)par1.doubleValue(), (float)(par2 + 1), (float)par3.doubleValue(), (float)(par1.add(BigInteger.ONE).doubleValue()), (float)(par2 + 2), (float)(par3.add(BigInteger.ONE).doubleValue()))).iterator(); EntityOcelot var6; do diff --git a/src/minecraft/net/minecraft/src/BlockCocoa.java b/src/minecraft/net/minecraft/src/BlockCocoa.java index 175041a..4819a90 100644 --- a/src/minecraft/net/minecraft/src/BlockCocoa.java +++ b/src/minecraft/net/minecraft/src/BlockCocoa.java @@ -125,7 +125,7 @@ public class BlockCocoa extends BlockDirectional */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = ((MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 0) % 4; + int var6 = ((MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 0) % 4; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); } diff --git a/src/minecraft/net/minecraft/src/BlockCrops.java b/src/minecraft/net/minecraft/src/BlockCrops.java index 6086aee..dda71f7 100644 --- a/src/minecraft/net/minecraft/src/BlockCrops.java +++ b/src/minecraft/net/minecraft/src/BlockCrops.java @@ -154,7 +154,7 @@ public class BlockCrops extends BlockFlower float var11 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F; float var12 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F; float var13 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F; - EntityItem var14 = new EntityItem(par1World, (double)((float)par2.floatValue() + var11), (double)((float)par3 + var12), (double)((float)par4.floatValue() + var13), new ItemStack(Item.seeds)); + EntityItem var14 = new EntityItem(par1World, (float)((float)par2.floatValue() + var11), (float)((float)par3 + var12), (float)((float)par4.floatValue() + var13), new ItemStack(Item.seeds)); var14.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(var14); } diff --git a/src/minecraft/net/minecraft/src/BlockDetectorRail.java b/src/minecraft/net/minecraft/src/BlockDetectorRail.java index d3ab54b..508f292 100644 --- a/src/minecraft/net/minecraft/src/BlockDetectorRail.java +++ b/src/minecraft/net/minecraft/src/BlockDetectorRail.java @@ -84,7 +84,7 @@ public class BlockDetectorRail extends BlockRail boolean var6 = (par5 & 8) != 0; boolean var7 = false; float var8 = 0.125F; - List var9 = par1World.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var8), (double)par3, (double)((float)par4.floatValue() + var8), (double)((float)(par2.floatValue() + 1) - var8), (double)((float)(par3 + 1) - var8), (double)((float)(par4.floatValue() + 1) - var8))); + List var9 = par1World.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var8), (float)par3, (float)((float)par4.floatValue() + var8), (float)((float)(par2.floatValue() + 1) - var8), (float)((float)(par3 + 1) - var8), (float)((float)(par4.floatValue() + 1) - var8))); if (!var9.isEmpty()) { diff --git a/src/minecraft/net/minecraft/src/BlockDispenser.java b/src/minecraft/net/minecraft/src/BlockDispenser.java index 3e30380..361c35e 100644 --- a/src/minecraft/net/minecraft/src/BlockDispenser.java +++ b/src/minecraft/net/minecraft/src/BlockDispenser.java @@ -165,9 +165,9 @@ public class BlockDispenser extends BlockContainer } else { - double var13 = (double)par2.doubleValue() + (double)var9 * 0.6D + 0.5D; - double var15 = (double)par3 + 0.5D; - double var17 = (double)par4.doubleValue() + (double)var10 * 0.6D + 0.5D; + double var13 = (float)par2.doubleValue() + (float)var9 * 0.6D + 0.5D; + double var15 = (float)par3 + 0.5D; + double var17 = (float)par4.doubleValue() + (float)var10 * 0.6D + 0.5D; ItemStack var19 = var11.getStackInSlot(var12); int var20 = spawnEntityWithAction(var11, par1World, var19, par5Random, par2, par3, par4, var9, var10, var13, var15, var17); @@ -228,7 +228,7 @@ public class BlockDispenser extends BlockContainer */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var6 = MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; if (var6 == 0) { @@ -280,7 +280,7 @@ public class BlockDispenser extends BlockContainer } var9.stackSize -= var13; - EntityItem var14 = new EntityItem(par1World, (double)((float)par2.floatValue() + var10), (double)((float)par3 + var11), (double)((float)par4.floatValue() + var12), new ItemStack(var9.itemID, var13, var9.getItemDamage())); + EntityItem var14 = new EntityItem(par1World, (float)((float)par2.floatValue() + var10), (float)((float)par3 + var11), (float)((float)par4.floatValue() + var12), new ItemStack(var9.itemID, var13, var9.getItemDamage())); if (var9.hasTagCompound()) { @@ -288,9 +288,9 @@ public class BlockDispenser extends BlockContainer } float var15 = 0.05F; - var14.motionX = (double)((float)this.random.nextGaussian() * var15); - var14.motionY = (double)((float)this.random.nextGaussian() * var15 + 0.2F); - var14.motionZ = (double)((float)this.random.nextGaussian() * var15); + var14.motionX = (float)((float)this.random.nextGaussian() * var15); + var14.motionY = (float)((float)this.random.nextGaussian() * var15 + 0.2F); + var14.motionZ = (float)((float)this.random.nextGaussian() * var15); par1World.spawnEntityInWorld(var14); } } @@ -304,12 +304,12 @@ public class BlockDispenser extends BlockContainer { EntityItem var12 = new EntityItem(par0World, par6, par8 - 0.3D, par10, par1ItemStack); double var13 = par2Random.nextDouble() * 0.1D + 0.2D; - var12.motionX = (double)par4 * var13; + var12.motionX = (float)par4 * var13; var12.motionY = 0.20000000298023224D; - var12.motionZ = (double)par5 * var13; - var12.motionX += par2Random.nextGaussian() * 0.007499999832361937D * (double)par3; - var12.motionY += par2Random.nextGaussian() * 0.007499999832361937D * (double)par3; - var12.motionZ += par2Random.nextGaussian() * 0.007499999832361937D * (double)par3; + var12.motionZ = (float)par5 * var13; + var12.motionX += par2Random.nextGaussian() * 0.007499999832361937D * (float)par3; + var12.motionY += par2Random.nextGaussian() * 0.007499999832361937D * (float)par3; + var12.motionZ += par2Random.nextGaussian() * 0.007499999832361937D * (float)par3; par0World.spawnEntityInWorld(var12); } @@ -324,7 +324,7 @@ public class BlockDispenser extends BlockContainer if (par2ItemStack.itemID == Item.arrow.shiftedIndex) { EntityArrow var29 = new EntityArrow(par1World, par9, par11, par13); - var29.setArrowHeading((double)par7, 0.10000000149011612D, (double)par8, var15, (float)var16); + var29.setArrowHeading((float)par7, 0.10000000149011612D, (float)par8, var15, (float)var16); var29.canBePickedUp = 1; par1World.spawnEntityInWorld(var29); par1World.playAuxSFX(1002, par4, par5, par6, 0); @@ -333,7 +333,7 @@ public class BlockDispenser extends BlockContainer else if (par2ItemStack.itemID == Item.egg.shiftedIndex) { EntityEgg var28 = new EntityEgg(par1World, par9, par11, par13); - var28.setThrowableHeading((double)par7, 0.10000000149011612D, (double)par8, var15, (float)var16); + var28.setThrowableHeading((float)par7, 0.10000000149011612D, (float)par8, var15, (float)var16); par1World.spawnEntityInWorld(var28); par1World.playAuxSFX(1002, par4, par5, par6, 0); return 1; @@ -341,7 +341,7 @@ public class BlockDispenser extends BlockContainer else if (par2ItemStack.itemID == Item.snowball.shiftedIndex) { EntitySnowball var27 = new EntitySnowball(par1World, par9, par11, par13); - var27.setThrowableHeading((double)par7, 0.10000000149011612D, (double)par8, var15, (float)var16); + var27.setThrowableHeading((float)par7, 0.10000000149011612D, (float)par8, var15, (float)var16); par1World.spawnEntityInWorld(var27); par1World.playAuxSFX(1002, par4, par5, par6, 0); return 1; @@ -349,7 +349,7 @@ public class BlockDispenser extends BlockContainer else if (par2ItemStack.itemID == Item.potion.shiftedIndex && ItemPotion.isSplash(par2ItemStack.getItemDamage())) { EntityPotion var26 = new EntityPotion(par1World, par9, par11, par13, par2ItemStack.getItemDamage()); - var26.setThrowableHeading((double)par7, 0.10000000149011612D, (double)par8, var15 * 1.25F, (float)var16 * 0.5F); + var26.setThrowableHeading((float)par7, 0.10000000149011612D, (float)par8, var15 * 1.25F, (float)var16 * 0.5F); par1World.spawnEntityInWorld(var26); par1World.playAuxSFX(1002, par4, par5, par6, 0); return 1; @@ -357,20 +357,20 @@ public class BlockDispenser extends BlockContainer else if (par2ItemStack.itemID == Item.expBottle.shiftedIndex) { EntityExpBottle var25 = new EntityExpBottle(par1World, par9, par11, par13); - var25.setThrowableHeading((double)par7, 0.10000000149011612D, (double)par8, var15 * 1.25F, (float)var16 * 0.5F); + var25.setThrowableHeading((float)par7, 0.10000000149011612D, (float)par8, var15 * 1.25F, (float)var16 * 0.5F); par1World.spawnEntityInWorld(var25); par1World.playAuxSFX(1002, par4, par5, par6, 0); return 1; } else if (par2ItemStack.itemID == Item.monsterPlacer.shiftedIndex) { - ItemMonsterPlacer.spawnCreature(par1World, par2ItemStack.getItemDamage(), par9 + (double)par7 * 0.3D, par11 - 0.3D, par13 + (double)par8 * 0.3D); + ItemMonsterPlacer.spawnCreature(par1World, par2ItemStack.getItemDamage(), par9 + (float)par7 * 0.3D, par11 - 0.3D, par13 + (float)par8 * 0.3D); par1World.playAuxSFX(1002, par4, par5, par6, 0); return 1; } else if (par2ItemStack.itemID == Item.fireballCharge.shiftedIndex) { - EntitySmallFireball var24 = new EntitySmallFireball(par1World, par9 + (double)par7 * 0.3D, par11, par13 + (double)par8 * 0.3D, (double)par7 + par3Random.nextGaussian() * 0.05D, par3Random.nextGaussian() * 0.05D, (double)par8 + par3Random.nextGaussian() * 0.05D); + EntitySmallFireball var24 = new EntitySmallFireball(par1World, par9 + (float)par7 * 0.3D, par11, par13 + (float)par8 * 0.3D, (float)par7 + par3Random.nextGaussian() * 0.05D, par3Random.nextGaussian() * 0.05D, (float)par8 + par3Random.nextGaussian() * 0.05D); par1World.spawnEntityInWorld(var24); par1World.playAuxSFX(1009, par4, par5, par6, 0); return 1; @@ -425,12 +425,12 @@ public class BlockDispenser extends BlockContainer { BigInteger var23 = par4.add(BigInteger.valueOf(par7)); BigInteger var18 = par6.add(BigInteger.valueOf(par8)); - par9 = (double)par4.doubleValue() + (par7 < 0 ? (double)par7 * 0.8D : (double)((float)par7 * 1.8F)) + (double)((float)Math.abs(par8) * 0.5F); - par13 = (double)par6.doubleValue() + (par8 < 0 ? (double)par8 * 0.8D : (double)((float)par8 * 1.8F)) + (double)((float)Math.abs(par7) * 0.5F); + par9 = (float)par4.doubleValue() + (par7 < 0 ? (float)par7 * 0.8D : (float)((float)par7 * 1.8F)) + (float)((float)Math.abs(par8) * 0.5F); + par13 = (float)par6.doubleValue() + (par8 < 0 ? (float)par8 * 0.8D : (float)((float)par8 * 1.8F)) + (float)((float)Math.abs(par7) * 0.5F); if (BlockRail.isRailBlockAt(par1World, var23, par5, var18)) { - par11 = (double)((float)par5 + 0.5F); + par11 = (float)((float)par5 + 0.5F); } else { @@ -439,7 +439,7 @@ public class BlockDispenser extends BlockContainer return 0; } - par11 = (double)((float)par5 - 0.5F); + par11 = (float)((float)par5 - 0.5F); } EntityMinecart var22 = new EntityMinecart(par1World, par9, par11, par13, ((ItemMinecart)par2ItemStack.getItem()).minecartType); @@ -451,12 +451,12 @@ public class BlockDispenser extends BlockContainer { BigInteger var23 = par4.add(BigInteger.valueOf(par7)); BigInteger var18 = par6.add(BigInteger.valueOf(par8)); - par9 = (double)par4.doubleValue() + (par7 < 0 ? (double)par7 * 0.8D : (double)((float)par7 * 1.8F)) + (double)((float)Math.abs(par8) * 0.5F); - par13 = (double)par6.doubleValue() + (par8 < 0 ? (double)par8 * 0.8D : (double)((float)par8 * 1.8F)) + (double)((float)Math.abs(par7) * 0.5F); + par9 = (float)par4.doubleValue() + (par7 < 0 ? (float)par7 * 0.8D : (float)((float)par7 * 1.8F)) + (float)((float)Math.abs(par8) * 0.5F); + par13 = (float)par6.doubleValue() + (par8 < 0 ? (float)par8 * 0.8D : (float)((float)par8 * 1.8F)) + (float)((float)Math.abs(par7) * 0.5F); if (par1World.getBlockMaterial(var23, par5, var18) == Material.water) { - par11 = (double)((float)par5 + 1.0F); + par11 = (float)((float)par5 + 1.0F); } else { @@ -465,7 +465,7 @@ public class BlockDispenser extends BlockContainer return 0; } - par11 = (double)par5; + par11 = (float)par5; } EntityBoat var21 = new EntityBoat(par1World, par9, par11, par13); @@ -482,7 +482,7 @@ public class BlockDispenser extends BlockContainer { ItemBucket var17 = (ItemBucket)par2ItemStack.getItem(); - if (var17.func_77875_a(par1World, (double)par4.doubleValue(), (double)par5, (double)par6.doubleValue(), par4.add(BigInteger.valueOf(par7)), par5, par6.add(BigInteger.valueOf(par8)))) + if (var17.func_77875_a(par1World, (float)par4.doubleValue(), (float)par5, (float)par6.doubleValue(), par4.add(BigInteger.valueOf(par7)), par5, par6.add(BigInteger.valueOf(par8)))) { par2ItemStack.itemID = Item.bucketEmpty.shiftedIndex; par2ItemStack.stackSize = 1; diff --git a/src/minecraft/net/minecraft/src/BlockDragonEgg.java b/src/minecraft/net/minecraft/src/BlockDragonEgg.java index 241a571..3ca0718 100644 --- a/src/minecraft/net/minecraft/src/BlockDragonEgg.java +++ b/src/minecraft/net/minecraft/src/BlockDragonEgg.java @@ -46,7 +46,7 @@ public class BlockDragonEgg extends Block if (!BlockSand.fallInstantly/* && par1World.checkChunksExist(par2 - var5, par3 - var5, par4 - var5, par2 + var5, par3 + var5, par4 + var5) */) { - EntityFallingSand var6 = new EntityFallingSand(par1World, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), this.blockID); + EntityFallingSand var6 = new EntityFallingSand(par1World, (float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), this.blockID); par1World.spawnEntityInWorld(var6); } else @@ -110,10 +110,10 @@ public class BlockDragonEgg extends Block float var13 = (par1World.rand.nextFloat() - 0.5F) * 0.2F; float var14 = (par1World.rand.nextFloat() - 0.5F) * 0.2F; float var15 = (par1World.rand.nextFloat() - 0.5F) * 0.2F; - double var16 = (double)var6.doubleValue() + (double)(par2.subtract(var6)).doubleValue() * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; - double var18 = (double)var7 + (double)(par3 - var7) * var11 + par1World.rand.nextDouble() * 1.0D - 0.5D; - double var20 = (double)var8.doubleValue() + (double)(par4.subtract(var8)).doubleValue() * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; - par1World.spawnParticle("portal", var16, var18, var20, (double)var13, (double)var14, (double)var15); + double var16 = (float)var6.doubleValue() + (float)(par2.subtract(var6)).doubleValue() * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; + double var18 = (float)var7 + (float)(par3 - var7) * var11 + par1World.rand.nextDouble() * 1.0D - 0.5D; + double var20 = (float)var8.doubleValue() + (float)(par4.subtract(var8)).doubleValue() * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; + par1World.spawnParticle("portal", var16, var18, var20, (float)var13, (float)var14, (float)var15); } return; diff --git a/src/minecraft/net/minecraft/src/BlockEnchantmentTable.java b/src/minecraft/net/minecraft/src/BlockEnchantmentTable.java index df2c2d2..c5e6406 100644 --- a/src/minecraft/net/minecraft/src/BlockEnchantmentTable.java +++ b/src/minecraft/net/minecraft/src/BlockEnchantmentTable.java @@ -51,7 +51,7 @@ public class BlockEnchantmentTable extends BlockContainer break; } - par1World.spawnParticle("enchantmenttable", (double)par2.doubleValue() + 0.5D, (double)par3 + 2.0D, (double)par4.doubleValue() + 0.5D, (double)((float)(var6) + par5Random.nextFloat()) - 0.5D, (double)((float)(var8 - par3) - par5Random.nextFloat() - 1.0F), (double)((float)(var7) + par5Random.nextFloat()) - 0.5D); + par1World.spawnParticle("enchantmenttable", (float)par2.doubleValue() + 0.5D, (float)par3 + 2.0D, (float)par4.doubleValue() + 0.5D, (float)((float)(var6) + par5Random.nextFloat()) - 0.5D, (float)((float)(var8 - par3) - par5Random.nextFloat() - 1.0F), (float)((float)(var7) + par5Random.nextFloat()) - 0.5D); } } } diff --git a/src/minecraft/net/minecraft/src/BlockEndPortal.java b/src/minecraft/net/minecraft/src/BlockEndPortal.java index df5ed11..af9ea76 100644 --- a/src/minecraft/net/minecraft/src/BlockEndPortal.java +++ b/src/minecraft/net/minecraft/src/BlockEndPortal.java @@ -89,9 +89,9 @@ public class BlockEndPortal extends BlockContainer */ public void randomDisplayTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { - double var6 = (double)((float)par2.floatValue() + par5Random.nextFloat()); - double var8 = (double)((float)par3 + 0.8F); - double var10 = (double)((float)par4.floatValue() + par5Random.nextFloat()); + double var6 = (float)((float)par2.floatValue() + par5Random.nextFloat()); + double var8 = (float)((float)par3 + 0.8F); + double var10 = (float)((float)par4.floatValue() + par5Random.nextFloat()); double var12 = 0.0D; double var14 = 0.0D; double var16 = 0.0D; diff --git a/src/minecraft/net/minecraft/src/BlockEndPortalFrame.java b/src/minecraft/net/minecraft/src/BlockEndPortalFrame.java index 3f8f49b..807e63a 100644 --- a/src/minecraft/net/minecraft/src/BlockEndPortalFrame.java +++ b/src/minecraft/net/minecraft/src/BlockEndPortalFrame.java @@ -83,7 +83,7 @@ public class BlockEndPortalFrame extends Block */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = ((MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; + int var6 = ((MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); } } diff --git a/src/minecraft/net/minecraft/src/BlockEnderChest.java b/src/minecraft/net/minecraft/src/BlockEnderChest.java index 8086e5c..65981e7 100644 --- a/src/minecraft/net/minecraft/src/BlockEnderChest.java +++ b/src/minecraft/net/minecraft/src/BlockEnderChest.java @@ -67,7 +67,7 @@ public class BlockEnderChest extends BlockContainer public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { byte var6 = 0; - int var7 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var7 = MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; if (var7 == 0) { @@ -138,21 +138,21 @@ public class BlockEnderChest extends BlockContainer { for (int var6 = 0; var6 < 3; ++var6) { - double var10000 = (double)((float)par2 + par5Random.nextFloat()); - double var9 = (double)((float)par3 + par5Random.nextFloat()); - var10000 = (double)((float)par4 + par5Random.nextFloat()); + double var10000 = (float)((float)par2 + par5Random.nextFloat()); + double var9 = (float)((float)par3 + par5Random.nextFloat()); + var10000 = (float)((float)par4 + par5Random.nextFloat()); double var13 = 0.0D; double var15 = 0.0D; double var17 = 0.0D; int var19 = par5Random.nextInt(2) * 2 - 1; int var20 = par5Random.nextInt(2) * 2 - 1; - var13 = ((double)par5Random.nextFloat() - 0.5D) * 0.125D; - var15 = ((double)par5Random.nextFloat() - 0.5D) * 0.125D; - var17 = ((double)par5Random.nextFloat() - 0.5D) * 0.125D; - double var11 = (double)par4 + 0.5D + 0.25D * (double)var20; - var17 = (double)(par5Random.nextFloat() * 1.0F * (float)var20); - double var7 = (double)par2 + 0.5D + 0.25D * (double)var19; - var13 = (double)(par5Random.nextFloat() * 1.0F * (float)var19); + var13 = ((float)par5Random.nextFloat() - 0.5D) * 0.125D; + var15 = ((float)par5Random.nextFloat() - 0.5D) * 0.125D; + var17 = ((float)par5Random.nextFloat() - 0.5D) * 0.125D; + double var11 = (float)par4 + 0.5D + 0.25D * (float)var20; + var17 = (float)(par5Random.nextFloat() * 1.0F * (float)var20); + double var7 = (float)par2 + 0.5D + 0.25D * (float)var19; + var13 = (float)(par5Random.nextFloat() * 1.0F * (float)var19); par1World.spawnParticle("portal", var7, var9, var11, var13, var15, var17); } } diff --git a/src/minecraft/net/minecraft/src/BlockFarmland.java b/src/minecraft/net/minecraft/src/BlockFarmland.java index 1465d3a..0e99c69 100644 --- a/src/minecraft/net/minecraft/src/BlockFarmland.java +++ b/src/minecraft/net/minecraft/src/BlockFarmland.java @@ -20,7 +20,7 @@ public class BlockFarmland extends Block // */ // public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) // { -// return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)(par2 + 0), (double)(par3 + 0), (double)(par4 + 0), (double)(par2 + 1), (double)(par3 + 1), (double)(par4 + 1)); +// return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)(par2 + 0), (float)(par3 + 0), (float)(par4 + 0), (float)(par2 + 1), (float)(par3 + 1), (float)(par4 + 1)); // } /** diff --git a/src/minecraft/net/minecraft/src/BlockFence.java b/src/minecraft/net/minecraft/src/BlockFence.java index f357c9f..6f5f004 100644 --- a/src/minecraft/net/minecraft/src/BlockFence.java +++ b/src/minecraft/net/minecraft/src/BlockFence.java @@ -51,7 +51,7 @@ public class BlockFence extends Block var10 = 1.0F; } - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var9), (double)par3, (double)((float)par4.floatValue() + var11), (double)((float)par2.floatValue() + var10), (double)((float)par3 + 1.5F), (double)((float)par4.floatValue() + var12)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var9), (float)par3, (float)((float)par4.floatValue() + var11), (float)((float)par2.floatValue() + var10), (float)((float)par3 + 1.5F), (float)((float)par4.floatValue() + var12)); } /** diff --git a/src/minecraft/net/minecraft/src/BlockFenceGate.java b/src/minecraft/net/minecraft/src/BlockFenceGate.java index 8277a83..dda0a9a 100644 --- a/src/minecraft/net/minecraft/src/BlockFenceGate.java +++ b/src/minecraft/net/minecraft/src/BlockFenceGate.java @@ -25,7 +25,7 @@ public class BlockFenceGate extends BlockDirectional public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { int var5 = par1World.getBlockMetadata(par2, par3, par4); - return isFenceGateOpen(var5) ? null : (var5 != 2 && var5 != 0 ? AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + 0.375F), (double)par3, (double)par4.doubleValue(), (double)((float)par2.floatValue() + 0.625F), (double)((float)par3 + 1.5F), (double)(par4.doubleValue() + 1)) : AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue(), (double)par3, (double)((float)par4.floatValue() + 0.375F), (double)(par2.doubleValue() + 1), (double)((float)par3 + 1.5F), (double)((float)par4.floatValue() + 0.625F))); + return isFenceGateOpen(var5) ? null : (var5 != 2 && var5 != 0 ? AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + 0.375F), (float)par3, (float)par4.doubleValue(), (float)((float)par2.floatValue() + 0.625F), (float)((float)par3 + 1.5F), (float)(par4.doubleValue() + 1)) : AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)par2.doubleValue(), (float)par3, (float)((float)par4.floatValue() + 0.375F), (float)(par2.doubleValue() + 1), (float)((float)par3 + 1.5F), (float)((float)par4.floatValue() + 0.625F))); } /** @@ -80,7 +80,7 @@ public class BlockFenceGate extends BlockDirectional */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = (MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) % 4; + int var6 = (MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) % 4; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); } @@ -97,7 +97,7 @@ public class BlockFenceGate extends BlockDirectional } else { - int var11 = (MathHelper.floor_double((double)(par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) % 4; + int var11 = (MathHelper.floor_double((float)(par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) % 4; int var12 = getDirection(var10); if (var12 == (var11 + 2) % 4) diff --git a/src/minecraft/net/minecraft/src/BlockFire.java b/src/minecraft/net/minecraft/src/BlockFire.java index 9fa4883..8a06044 100644 --- a/src/minecraft/net/minecraft/src/BlockFire.java +++ b/src/minecraft/net/minecraft/src/BlockFire.java @@ -347,7 +347,7 @@ public class BlockFire extends Block { if (par5Random.nextInt(24) == 0) { - par1World.playSound((double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), "fire.fire", 1.0F + par5Random.nextFloat(), par5Random.nextFloat() * 0.7F + 0.3F); + par1World.playSound((float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), "fire.fire", 1.0F + par5Random.nextFloat(), par5Random.nextFloat() * 0.7F + 0.3F); } int var6; @@ -364,7 +364,7 @@ public class BlockFire extends Block var7 = (float)par2.floatValue() + par5Random.nextFloat() * 0.1F; var8 = (float)par3 + par5Random.nextFloat(); var9 = (float)par4.floatValue() + par5Random.nextFloat(); - par1World.spawnParticle("largesmoke", (double)var7, (double)var8, (double)var9, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)var7, (float)var8, (float)var9, 0.0D, 0.0D, 0.0D); } } @@ -375,7 +375,7 @@ public class BlockFire extends Block var7 = (float)(par2.add(BigInteger.ONE)).floatValue() - par5Random.nextFloat() * 0.1F; var8 = (float)par3 + par5Random.nextFloat(); var9 = (float)par4.floatValue() + par5Random.nextFloat(); - par1World.spawnParticle("largesmoke", (double)var7, (double)var8, (double)var9, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)var7, (float)var8, (float)var9, 0.0D, 0.0D, 0.0D); } } @@ -386,7 +386,7 @@ public class BlockFire extends Block var7 = (float)par2.floatValue() + par5Random.nextFloat(); var8 = (float)par3 + par5Random.nextFloat(); var9 = (float)par4.floatValue() + par5Random.nextFloat() * 0.1F; - par1World.spawnParticle("largesmoke", (double)var7, (double)var8, (double)var9, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)var7, (float)var8, (float)var9, 0.0D, 0.0D, 0.0D); } } @@ -397,7 +397,7 @@ public class BlockFire extends Block var7 = (float)par2.floatValue() + par5Random.nextFloat(); var8 = (float)par3 + par5Random.nextFloat(); var9 = (float)(par4.add(BigInteger.ONE)).floatValue() - par5Random.nextFloat() * 0.1F; - par1World.spawnParticle("largesmoke", (double)var7, (double)var8, (double)var9, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)var7, (float)var8, (float)var9, 0.0D, 0.0D, 0.0D); } } @@ -408,7 +408,7 @@ public class BlockFire extends Block var7 = (float)par2.floatValue() + par5Random.nextFloat(); var8 = (float)(par3 + 1) - par5Random.nextFloat() * 0.1F; var9 = (float)par4.floatValue() + par5Random.nextFloat(); - par1World.spawnParticle("largesmoke", (double)var7, (double)var8, (double)var9, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)var7, (float)var8, (float)var9, 0.0D, 0.0D, 0.0D); } } } @@ -419,7 +419,7 @@ public class BlockFire extends Block var7 = (float)par2.floatValue() + par5Random.nextFloat(); var8 = (float)par3 + par5Random.nextFloat() * 0.5F + 0.5F; var9 = (float)par4.floatValue() + par5Random.nextFloat(); - par1World.spawnParticle("largesmoke", (double)var7, (double)var8, (double)var9, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)var7, (float)var8, (float)var9, 0.0D, 0.0D, 0.0D); } } } diff --git a/src/minecraft/net/minecraft/src/BlockFluid.java b/src/minecraft/net/minecraft/src/BlockFluid.java index 94275d3..c067df7 100644 --- a/src/minecraft/net/minecraft/src/BlockFluid.java +++ b/src/minecraft/net/minecraft/src/BlockFluid.java @@ -231,14 +231,14 @@ public abstract class BlockFluid extends Block if (var11 >= 0) { var12 = var11 - (var6 - 8); - var5 = var5.addVector((double)((var8.subtract(par2)).doubleValue() * var12), (double)((par3 - par3) * var12), (double)((var10.subtract(par4)).doubleValue() * var12)); + var5 = var5.addVector((float)((var8.subtract(par2)).doubleValue() * var12), (float)((par3 - par3) * var12), (float)((var10.subtract(par4)).doubleValue() * var12)); } } } else if (var11 >= 0) { var12 = var11 - var6; - var5 = var5.addVector((double)((var8.subtract(par2)).doubleValue() * var12), (double)((par3 - par3) * var12), (double)((var10.subtract(par4)).doubleValue() * var12)); + var5 = var5.addVector((float)((var8.subtract(par2)).doubleValue() * var12), (float)((par3 - par3) * var12), (float)((var10.subtract(par4)).doubleValue() * var12)); } } @@ -362,7 +362,7 @@ public abstract class BlockFluid extends Block if (var6 <= 0 || var6 >= 8) { - par1World.spawnParticle("suspended", (double)((float)par2.floatValue() + par5Random.nextFloat()), (double)((float)par3 + par5Random.nextFloat()), (double)((float)par4.floatValue() + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("suspended", (float)((float)par2.floatValue() + par5Random.nextFloat()), (float)((float)par3 + par5Random.nextFloat()), (float)((float)par4.floatValue() + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D); } } @@ -395,28 +395,28 @@ public abstract class BlockFluid extends Block if (par1World.getBlockMaterial(var8, par3, var9) == Material.air && (par1World.getBlockMaterial(var8, par3 - 1, var9).blocksMovement() || par1World.getBlockMaterial(var8, par3 - 1, var9).isLiquid())) { float var10 = 0.0625F; - double var11 = (double)((float)par2.floatValue() + par5Random.nextFloat()); - double var13 = (double)((float)par3 + par5Random.nextFloat()); - double var15 = (double)((float)par4.floatValue() + par5Random.nextFloat()); + double var11 = (float)((float)par2.floatValue() + par5Random.nextFloat()); + double var13 = (float)((float)par3 + par5Random.nextFloat()); + double var15 = (float)((float)par4.floatValue() + par5Random.nextFloat()); if (var7 == 0) { - var11 = (double)((float)par2.floatValue() - var10); + var11 = (float)((float)par2.floatValue() - var10); } if (var7 == 1) { - var11 = (double)((float)(par2.add(BigInteger.ONE)).floatValue() + var10); + var11 = (float)((float)(par2.add(BigInteger.ONE)).floatValue() + var10); } if (var7 == 2) { - var15 = (double)((float)par4.floatValue() - var10); + var15 = (float)((float)par4.floatValue() - var10); } if (var7 == 3) { - var15 = (double)((float)(par4.add(BigInteger.ONE)).floatValue() + var10); + var15 = (float)((float)(par4.add(BigInteger.ONE)).floatValue() + var10); } double var17 = 0.0D; @@ -424,22 +424,22 @@ public abstract class BlockFluid extends Block if (var7 == 0) { - var17 = (double)(-var10); + var17 = (float)(-var10); } if (var7 == 1) { - var17 = (double)var10; + var17 = (float)var10; } if (var7 == 2) { - var19 = (double)(-var10); + var19 = (float)(-var10); } if (var7 == 3) { - var19 = (double)var10; + var19 = (float)var10; } par1World.spawnParticle("splash", var11, var13, var15, var17, 0.0D, var19); @@ -453,7 +453,7 @@ public abstract class BlockFluid extends Block if (var6 > 0 && var6 < 8) { - par1World.playSound((double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), "liquid.water", par5Random.nextFloat() * 0.25F + 0.75F, par5Random.nextFloat() * 1.0F + 0.5F); + par1World.playSound((float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), "liquid.water", par5Random.nextFloat() * 0.25F + 0.75F, par5Random.nextFloat() * 1.0F + 0.5F); } } @@ -465,24 +465,24 @@ public abstract class BlockFluid extends Block { if (par5Random.nextInt(100) == 0) { - var21 = (double)((float)par2.floatValue() + par5Random.nextFloat()); - var22 = (double)par3 + this.maxY; - var23 = (double)((float)par4.floatValue() + par5Random.nextFloat()); + var21 = (float)((float)par2.floatValue() + par5Random.nextFloat()); + var22 = (float)par3 + this.maxY; + var23 = (float)((float)par4.floatValue() + par5Random.nextFloat()); par1World.spawnParticle("lava", var21, var22, var23, 0.0D, 0.0D, 0.0D); par1World.playSound(var21, var22, var23, "liquid.lavapop", 0.2F + par5Random.nextFloat() * 0.2F, 0.9F + par5Random.nextFloat() * 0.15F); } if (par5Random.nextInt(200) == 0) { - par1World.playSound((double)par2.doubleValue(), (double)par3, (double)par4.doubleValue(), "liquid.lava", 0.2F + par5Random.nextFloat() * 0.2F, 0.9F + par5Random.nextFloat() * 0.15F); + par1World.playSound((float)par2.doubleValue(), (float)par3, (float)par4.doubleValue(), "liquid.lava", 0.2F + par5Random.nextFloat() * 0.2F, 0.9F + par5Random.nextFloat() * 0.15F); } } if (par5Random.nextInt(10) == 0 && par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && !par1World.getBlockMaterial(par2, par3 - 2, par4).blocksMovement()) { - var21 = (double)((float)par2.floatValue() + par5Random.nextFloat()); - var22 = (double)par3 - 1.05D; - var23 = (double)((float)par4.floatValue() + par5Random.nextFloat()); + var21 = (float)((float)par2.floatValue() + par5Random.nextFloat()); + var22 = (float)par3 - 1.05D; + var23 = (float)((float)par4.floatValue() + par5Random.nextFloat()); if (this.blockMaterial == Material.water) { @@ -512,7 +512,7 @@ public abstract class BlockFluid extends Block var5 = ((BlockFluid)Block.lavaMoving).getFlowVector(par0IBlockAccess, par1, par2, par3); } - return var5.xCoord == 0.0D && var5.zCoord == 0.0D ? -1000.0D : Math.atan2(var5.zCoord, var5.xCoord) - (Math.PI / 2D); + return var5.xCoord == 0.0D && var5.zCoord == 0.0D ? -1000.0D : Math.atan2(var5.zCoord, var5.xCoord) - ((float)Math.PI / 2D); } /** @@ -592,11 +592,11 @@ public abstract class BlockFluid extends Block */ protected void triggerLavaMixEffects(World par1World, BigInteger par2, int par3, BigInteger par4) { - par1World.playSoundEffect((double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); + par1World.playSoundEffect((float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); for (int var5 = 0; var5 < 8; ++var5) { - par1World.spawnParticle("largesmoke", (double)par2.doubleValue() + Math.random(), (double)par3 + 1.2D, (double)par4.doubleValue() + Math.random(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)par2.doubleValue() + Math.random(), (float)par3 + 1.2D, (float)par4.doubleValue() + Math.random(), 0.0D, 0.0D, 0.0D); } } } diff --git a/src/minecraft/net/minecraft/src/BlockFurnace.java b/src/minecraft/net/minecraft/src/BlockFurnace.java index 554ed7e..864d8b3 100644 --- a/src/minecraft/net/minecraft/src/BlockFurnace.java +++ b/src/minecraft/net/minecraft/src/BlockFurnace.java @@ -116,23 +116,23 @@ public class BlockFurnace extends BlockContainer if (var6 == 4) { - par1World.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("smoke", (float)(var7 - var10), (float)var8, (float)(var9 + var11), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("flame", (float)(var7 - var10), (float)var8, (float)(var9 + var11), 0.0D, 0.0D, 0.0D); } else if (var6 == 5) { - par1World.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("smoke", (float)(var7 + var10), (float)var8, (float)(var9 + var11), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("flame", (float)(var7 + var10), (float)var8, (float)(var9 + var11), 0.0D, 0.0D, 0.0D); } else if (var6 == 2) { - par1World.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("smoke", (float)(var7 + var11), (float)var8, (float)(var9 - var10), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("flame", (float)(var7 + var11), (float)var8, (float)(var9 - var10), 0.0D, 0.0D, 0.0D); } else if (var6 == 3) { - par1World.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("smoke", (float)(var7 + var11), (float)var8, (float)(var9 + var10), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("flame", (float)(var7 + var11), (float)var8, (float)(var9 + var10), 0.0D, 0.0D, 0.0D); } } } @@ -208,7 +208,7 @@ public class BlockFurnace extends BlockContainer */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var6 = MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; if (var6 == 0) { @@ -262,7 +262,7 @@ public class BlockFurnace extends BlockContainer } var9.stackSize -= var13; - EntityItem var14 = new EntityItem(par1World, (double)((float)par2.floatValue() + var10), (double)((float)par3 + var11), (double)((float)par4.floatValue() + var12), new ItemStack(var9.itemID, var13, var9.getItemDamage())); + EntityItem var14 = new EntityItem(par1World, (float)((float)par2.floatValue() + var10), (float)((float)par3 + var11), (float)((float)par4.floatValue() + var12), new ItemStack(var9.itemID, var13, var9.getItemDamage())); if (var9.hasTagCompound()) { @@ -270,9 +270,9 @@ public class BlockFurnace extends BlockContainer } float var15 = 0.05F; - var14.motionX = (double)((float)this.furnaceRand.nextGaussian() * var15); - var14.motionY = (double)((float)this.furnaceRand.nextGaussian() * var15 + 0.2F); - var14.motionZ = (double)((float)this.furnaceRand.nextGaussian() * var15); + var14.motionX = (float)((float)this.furnaceRand.nextGaussian() * var15); + var14.motionY = (float)((float)this.furnaceRand.nextGaussian() * var15 + 0.2F); + var14.motionZ = (float)((float)this.furnaceRand.nextGaussian() * var15); par1World.spawnEntityInWorld(var14); } } diff --git a/src/minecraft/net/minecraft/src/BlockHalfSlab.java b/src/minecraft/net/minecraft/src/BlockHalfSlab.java index 7b9c2bd..7a539bd 100644 --- a/src/minecraft/net/minecraft/src/BlockHalfSlab.java +++ b/src/minecraft/net/minecraft/src/BlockHalfSlab.java @@ -97,7 +97,7 @@ public abstract class BlockHalfSlab extends Block { if (!this.isDoubleSlab) { - if (par5 == 0 || par5 != 1 && (double)par7 > 0.5D) + if (par5 == 0 || par5 != 1 && (float)par7 > 0.5D) { int var9 = par1World.getBlockMetadata(par2, par3, par4) & 7; par1World.setBlockMetadataWithNotify(par2, par3, par4, var9 | 8); diff --git a/src/minecraft/net/minecraft/src/BlockJukeBox.java b/src/minecraft/net/minecraft/src/BlockJukeBox.java index 4eaf7f8..468de42 100644 --- a/src/minecraft/net/minecraft/src/BlockJukeBox.java +++ b/src/minecraft/net/minecraft/src/BlockJukeBox.java @@ -73,10 +73,10 @@ public class BlockJukeBox extends BlockContainer var5.onInventoryChanged(); par1World.setBlockMetadataWithNotify(par2, par3, par4, 0); float var7 = 0.7F; - double var8 = (double)(par1World.rand.nextFloat() * var7) + (double)(1.0F - var7) * 0.5D; - double var10 = (double)(par1World.rand.nextFloat() * var7) + (double)(1.0F - var7) * 0.2D + 0.6D; - double var12 = (double)(par1World.rand.nextFloat() * var7) + (double)(1.0F - var7) * 0.5D; - EntityItem var14 = new EntityItem(par1World, (double)par2.doubleValue() + var8, (double)par3 + var10, (double)par4.doubleValue() + var12, new ItemStack(var6, 1, 0)); + double var8 = (float)(par1World.rand.nextFloat() * var7) + (float)(1.0F - var7) * 0.5D; + double var10 = (float)(par1World.rand.nextFloat() * var7) + (float)(1.0F - var7) * 0.2D + 0.6D; + double var12 = (float)(par1World.rand.nextFloat() * var7) + (float)(1.0F - var7) * 0.5D; + EntityItem var14 = new EntityItem(par1World, (float)par2.doubleValue() + var8, (float)par3 + var10, (float)par4.doubleValue() + var12, new ItemStack(var6, 1, 0)); var14.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(var14); } diff --git a/src/minecraft/net/minecraft/src/BlockLeaves.java b/src/minecraft/net/minecraft/src/BlockLeaves.java index 8ad39b1..c5e7251 100644 --- a/src/minecraft/net/minecraft/src/BlockLeaves.java +++ b/src/minecraft/net/minecraft/src/BlockLeaves.java @@ -226,9 +226,9 @@ public class BlockLeaves extends BlockLeavesBase { if (par1World.canLightningStrikeAt(par2, par3 + 1, par4) && !par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && par5Random.nextInt(15) == 1) { - double var6 = (double)((float)par2.floatValue() + par5Random.nextFloat()); - double var8 = (double)par3 - 0.05D; - double var10 = (double)((float)par4.floatValue() + par5Random.nextFloat()); + double var6 = (float)((float)par2.floatValue() + par5Random.nextFloat()); + double var8 = (float)par3 - 0.05D; + double var10 = (float)((float)par4.floatValue() + par5Random.nextFloat()); par1World.spawnParticle("dripWater", var6, var8, var10, 0.0D, 0.0D, 0.0D); } } diff --git a/src/minecraft/net/minecraft/src/BlockLever.java b/src/minecraft/net/minecraft/src/BlockLever.java index a2f48b5..ab92fc3 100644 --- a/src/minecraft/net/minecraft/src/BlockLever.java +++ b/src/minecraft/net/minecraft/src/BlockLever.java @@ -281,7 +281,7 @@ public class BlockLever extends Block int var12 = 8 - (var10 & 8); par1World.setBlockMetadataWithNotify(par2, par3, par4, var11 + var12); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, var12 > 0 ? 0.6F : 0.5F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "random.click", 0.3F, var12 > 0 ? 0.6F : 0.5F); par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); if (var11 == 1) diff --git a/src/minecraft/net/minecraft/src/BlockLilyPad.java b/src/minecraft/net/minecraft/src/BlockLilyPad.java index 6fb9337..f92daa1 100644 --- a/src/minecraft/net/minecraft/src/BlockLilyPad.java +++ b/src/minecraft/net/minecraft/src/BlockLilyPad.java @@ -39,7 +39,7 @@ public class BlockLilyPad extends BlockFlower */ public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue() + this.minX, (double)par3 + this.minY, (double)par4.doubleValue() + this.minZ, (double)par2.doubleValue() + this.maxX, (double)par3 + this.maxY, (double)par4.doubleValue() + this.maxZ); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)par2.doubleValue() + this.minX, (float)par3 + this.minY, (float)par4.doubleValue() + this.minZ, (float)par2.doubleValue() + this.maxX, (float)par3 + this.maxY, (float)par4.doubleValue() + this.maxZ); } public int getBlockColor() diff --git a/src/minecraft/net/minecraft/src/BlockMycelium.java b/src/minecraft/net/minecraft/src/BlockMycelium.java index 6b69fdc..7d139a6 100644 --- a/src/minecraft/net/minecraft/src/BlockMycelium.java +++ b/src/minecraft/net/minecraft/src/BlockMycelium.java @@ -79,7 +79,7 @@ public class BlockMycelium extends Block if (par5Random.nextInt(10) == 0) { - par1World.spawnParticle("townaura", (double)((float)par2.floatValue() + par5Random.nextFloat()), (double)((float)par3 + 1.1F), (double)((float)par4.floatValue() + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("townaura", (float)((float)par2.floatValue() + par5Random.nextFloat()), (float)((float)par3 + 1.1F), (float)((float)par4.floatValue() + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D); } } diff --git a/src/minecraft/net/minecraft/src/BlockNote.java b/src/minecraft/net/minecraft/src/BlockNote.java index 82bcc05..fcc946d 100644 --- a/src/minecraft/net/minecraft/src/BlockNote.java +++ b/src/minecraft/net/minecraft/src/BlockNote.java @@ -94,7 +94,7 @@ public class BlockNote extends BlockContainer */ public void onBlockEventReceived(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, int par6) { - float var7 = (float)Math.pow(2.0D, (double)(par6 - 12) / 12.0D); + float var7 = (float)Math.pow(2.0D, (float)(par6 - 12) / 12.0D); String var8 = "harp"; if (par5 == 1) @@ -117,7 +117,7 @@ public class BlockNote extends BlockContainer var8 = "bassattack"; } - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "note." + var8, 3.0F, var7); - par1World.spawnParticle("note", (double)par2.doubleValue() + 0.5D, (double)par3 + 1.2D, (double)par4.doubleValue() + 0.5D, (double)par6 / 24.0D, 0.0D, 0.0D); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "note." + var8, 3.0F, var7); + par1World.spawnParticle("note", (float)par2.doubleValue() + 0.5D, (float)par3 + 1.2D, (float)par4.doubleValue() + 0.5D, (float)par6 / 24.0D, 0.0D, 0.0D); } } diff --git a/src/minecraft/net/minecraft/src/BlockPistonBase.java b/src/minecraft/net/minecraft/src/BlockPistonBase.java index 83e2685..629548d 100644 --- a/src/minecraft/net/minecraft/src/BlockPistonBase.java +++ b/src/minecraft/net/minecraft/src/BlockPistonBase.java @@ -152,7 +152,7 @@ public class BlockPistonBase extends Block if (this.tryExtend(par1World, par2, par3, par4, par6)) { par1World.setBlockMetadataWithNotify(par2, par3, par4, par6 | 8); - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "tile.piston.out", 0.5F, par1World.rand.nextFloat() * 0.25F + 0.6F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "tile.piston.out", 0.5F, par1World.rand.nextFloat() * 0.25F + 0.6F); } else { @@ -217,7 +217,7 @@ public class BlockPistonBase extends Block par1World.setBlockWithNotify(par2.add(Facing.offsetsXForSide[par6]), par3 + Facing.offsetsYForSide[par6], par4.add(Facing.offsetsZForSide[par6]), 0); } - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "tile.piston.in", 0.5F, par1World.rand.nextFloat() * 0.15F + 0.6F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "tile.piston.in", 0.5F, par1World.rand.nextFloat() * 0.15F + 0.6F); } } @@ -320,20 +320,20 @@ public class BlockPistonBase extends Block { if (MathHelper.abs((float)par4EntityPlayer.posX - (float)par1.floatValue()) < 2.0F && MathHelper.abs((float)par4EntityPlayer.posZ - (float)par3.floatValue()) < 2.0F) { - double var5 = par4EntityPlayer.posY + 1.82D - (double)par4EntityPlayer.yOffset; + double var5 = par4EntityPlayer.posY + 1.82D - (float)par4EntityPlayer.yOffset; - if (var5 - (double)par2 > 2.0D) + if (var5 - (float)par2 > 2.0D) { return 1; } - if ((double)par2 - var5 > 0.0D) + if ((float)par2 - var5 > 0.0D) { return 0; } } - int var7 = MathHelper.floor_double((double)(par4EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var7 = MathHelper.floor_double((float)(par4EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; return var7 == 0 ? 2 : (var7 == 1 ? 5 : (var7 == 2 ? 3 : (var7 == 3 ? 4 : 0))); } diff --git a/src/minecraft/net/minecraft/src/BlockPistonMoving.java b/src/minecraft/net/minecraft/src/BlockPistonMoving.java index 08650c4..1cb6dfe 100644 --- a/src/minecraft/net/minecraft/src/BlockPistonMoving.java +++ b/src/minecraft/net/minecraft/src/BlockPistonMoving.java @@ -196,12 +196,12 @@ public class BlockPistonMoving extends BlockContainer float x = Facing.offsetsXForSide[var8].floatValue(), z = Facing.offsetsZForSide[var8].floatValue(); - this.minX = var6.minX - (double)((float)x * var7); - this.minY = var6.minY - (double)((float)Facing.offsetsYForSide[var8] * var7); - this.minZ = var6.minZ - (double)((float)z * var7); - this.maxX = var6.maxX - (double)((float)x * var7); - this.maxY = var6.maxY - (double)((float)Facing.offsetsYForSide[var8] * var7); - this.maxZ = var6.maxZ - (double)((float)z * var7); + this.minX = var6.minX - (float)((float)x * var7); + this.minY = var6.minY - (float)((float)Facing.offsetsYForSide[var8] * var7); + this.minZ = var6.minZ - (float)((float)z * var7); + this.maxX = var6.maxX - (float)((float)x * var7); + this.maxY = var6.maxY - (float)((float)Facing.offsetsYForSide[var8] * var7); + this.maxZ = var6.maxZ - (float)((float)z * var7); } } @@ -221,29 +221,29 @@ public class BlockPistonMoving extends BlockContainer z = Facing.offsetsZForSide[par7].floatValue(); if (x < 0) { - var8.minX -= (double)((float)x * par6); + var8.minX -= (float)((float)x * par6); } else { - var8.maxX -= (double)((float)x * par6); + var8.maxX -= (float)((float)x * par6); } if (Facing.offsetsYForSide[par7] < 0) { - var8.minY -= (double)((float)Facing.offsetsYForSide[par7] * par6); + var8.minY -= (float)((float)Facing.offsetsYForSide[par7] * par6); } else { - var8.maxY -= (double)((float)Facing.offsetsYForSide[par7] * par6); + var8.maxY -= (float)((float)Facing.offsetsYForSide[par7] * par6); } if (z < 0) { - var8.minZ -= (double)((float)z * par6); + var8.minZ -= (float)((float)z * par6); } else { - var8.maxZ -= (double)((float)z * par6); + var8.maxZ -= (float)((float)z * par6); } return var8; diff --git a/src/minecraft/net/minecraft/src/BlockPortal.java b/src/minecraft/net/minecraft/src/BlockPortal.java index de51e99..4ec8635 100644 --- a/src/minecraft/net/minecraft/src/BlockPortal.java +++ b/src/minecraft/net/minecraft/src/BlockPortal.java @@ -29,7 +29,7 @@ public class BlockPortal extends BlockBreakable if (var6 > 0 && !par1World.isBlockNormalCube(par2, var6 + 1, par4)) { - ItemMonsterPlacer.spawnCreature(par1World, 57, (double)par2.doubleValue() + 0.5D, (double)var6 + 1.1D, (double)par4.doubleValue() + 0.5D); + ItemMonsterPlacer.spawnCreature(par1World, 57, (float)par2.doubleValue() + 0.5D, (float)var6 + 1.1D, (float)par4.doubleValue() + 0.5D); } } } @@ -270,31 +270,31 @@ public class BlockPortal extends BlockBreakable { if (par5Random.nextInt(100) == 0) { - par1World.playSound((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "portal.portal", 0.5F, par5Random.nextFloat() * 0.4F + 0.8F); + par1World.playSound((float)par2.doubleValue() + 0.5D, (float)par3 + 0.5D, (float)par4.doubleValue() + 0.5D, "portal.portal", 0.5F, par5Random.nextFloat() * 0.4F + 0.8F); } for (int var6 = 0; var6 < 4; ++var6) { - double var7 = (double)((float)par2.floatValue() + par5Random.nextFloat()); - double var9 = (double)((float)par3 + par5Random.nextFloat()); - double var11 = (double)((float)par4.floatValue() + par5Random.nextFloat()); + double var7 = (float)((float)par2.floatValue() + par5Random.nextFloat()); + double var9 = (float)((float)par3 + par5Random.nextFloat()); + double var11 = (float)((float)par4.floatValue() + par5Random.nextFloat()); double var13 = 0.0D; double var15 = 0.0D; double var17 = 0.0D; int var19 = par5Random.nextInt(2) * 2 - 1; - var13 = ((double)par5Random.nextFloat() - 0.5D) * 0.5D; - var15 = ((double)par5Random.nextFloat() - 0.5D) * 0.5D; - var17 = ((double)par5Random.nextFloat() - 0.5D) * 0.5D; + var13 = ((float)par5Random.nextFloat() - 0.5D) * 0.5D; + var15 = ((float)par5Random.nextFloat() - 0.5D) * 0.5D; + var17 = ((float)par5Random.nextFloat() - 0.5D) * 0.5D; if (par1World.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) != this.blockID && par1World.getBlockId(par2.add(BigInteger.ONE), par3, par4) != this.blockID) { - var7 = (double)par2.doubleValue() + 0.5D + 0.25D * (double)var19; - var13 = (double)(par5Random.nextFloat() * 2.0F * (float)var19); + var7 = (float)par2.doubleValue() + 0.5D + 0.25D * (float)var19; + var13 = (float)(par5Random.nextFloat() * 2.0F * (float)var19); } else { - var11 = (double)par4.doubleValue() + 0.5D + 0.25D * (double)var19; - var17 = (double)(par5Random.nextFloat() * 2.0F * (float)var19); + var11 = (float)par4.doubleValue() + 0.5D + 0.25D * (float)var19; + var17 = (float)(par5Random.nextFloat() * 2.0F * (float)var19); } par1World.spawnParticle("portal", var7, var9, var11, var13, var15, var17); diff --git a/src/minecraft/net/minecraft/src/BlockPressurePlate.java b/src/minecraft/net/minecraft/src/BlockPressurePlate.java index 35def8f..cf682fc 100644 --- a/src/minecraft/net/minecraft/src/BlockPressurePlate.java +++ b/src/minecraft/net/minecraft/src/BlockPressurePlate.java @@ -126,17 +126,17 @@ public class BlockPressurePlate extends Block if (this.triggerMobType == EnumMobType.everything) { - var8 = par1World.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4 .floatValue()+ var7), (double)((float)(par2.doubleValue() + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4.doubleValue() + 1) - var7))); + var8 = par1World.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var7), (float)par3, (float)((float)par4 .floatValue()+ var7), (float)((float)(par2.doubleValue() + 1) - var7), (float)par3 + 0.25D, (float)((float)(par4.doubleValue() + 1) - var7))); } if (this.triggerMobType == EnumMobType.mobs) { - var8 = par1World.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var7), (double)((float)(par2.doubleValue() + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4.doubleValue() + 1) - var7))); + var8 = par1World.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var7), (float)par3, (float)((float)par4.floatValue() + var7), (float)((float)(par2.doubleValue() + 1) - var7), (float)par3 + 0.25D, (float)((float)(par4.doubleValue() + 1) - var7))); } if (this.triggerMobType == EnumMobType.players) { - var8 = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var7), (double)((float)(par2.doubleValue() + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4.doubleValue() + 1) - var7))); + var8 = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)par2.floatValue() + var7), (float)par3, (float)((float)par4.floatValue() + var7), (float)((float)(par2.doubleValue() + 1) - var7), (float)par3 + 0.25D, (float)((float)(par4.doubleValue() + 1) - var7))); } if (!var8.isEmpty()) @@ -150,7 +150,7 @@ public class BlockPressurePlate extends Block par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this.blockID); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.6F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.1D, (float)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.6F); } if (!var6 && var5) @@ -159,7 +159,7 @@ public class BlockPressurePlate extends Block par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this.blockID); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.5F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.1D, (float)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.5F); } if (var6) diff --git a/src/minecraft/net/minecraft/src/BlockPumpkin.java b/src/minecraft/net/minecraft/src/BlockPumpkin.java index 0c387f0..ba34607 100644 --- a/src/minecraft/net/minecraft/src/BlockPumpkin.java +++ b/src/minecraft/net/minecraft/src/BlockPumpkin.java @@ -65,7 +65,7 @@ public class BlockPumpkin extends BlockDirectional par1World.setBlock(par2, par3 - 1, par4, 0); par1World.setBlock(par2, par3 - 2, par4, 0); EntitySnowman var9 = new EntitySnowman(par1World); - var9.setLocationAndAngles((double)par2.doubleValue() + 0.5D, (double)par3 - 1.95D, (double)par4.doubleValue() + 0.5D, 0.0F, 0.0F); + var9.setLocationAndAngles((float)par2.doubleValue() + 0.5D, (float)par3 - 1.95D, (float)par4.doubleValue() + 0.5D, 0.0F, 0.0F); par1World.spawnEntityInWorld(var9); par1World.notifyBlockChange(par2, par3, par4, 0); par1World.notifyBlockChange(par2, par3 - 1, par4, 0); @@ -74,7 +74,7 @@ public class BlockPumpkin extends BlockDirectional for (int var10 = 0; var10 < 120; ++var10) { - par1World.spawnParticle("snowshovel", (double)par2.doubleValue() + par1World.rand.nextDouble(), (double)(par3 - 2) + par1World.rand.nextDouble() * 2.5D, (double)par4.doubleValue() + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("snowshovel", (float)par2.doubleValue() + par1World.rand.nextDouble(), (float)(par3 - 2) + par1World.rand.nextDouble() * 2.5D, (float)par4.doubleValue() + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); } } else if (par1World.getBlockId(par2, par3 - 1, par4) == Block.blockSteel.blockID && par1World.getBlockId(par2, par3 - 2, par4) == Block.blockSteel.blockID) @@ -101,12 +101,12 @@ public class BlockPumpkin extends BlockDirectional EntityIronGolem var7 = new EntityIronGolem(par1World); var7.setBit1FlagTo(true); - var7.setLocationAndAngles((double)par2.doubleValue() + 0.5D, (double)par3 - 1.95D, (double)par4.doubleValue() + 0.5D, 0.0F, 0.0F); + var7.setLocationAndAngles((float)par2.doubleValue() + 0.5D, (float)par3 - 1.95D, (float)par4.doubleValue() + 0.5D, 0.0F, 0.0F); par1World.spawnEntityInWorld(var7); for (int var8 = 0; var8 < 120; ++var8) { - par1World.spawnParticle("snowballpoof", (double)par2.doubleValue() + par1World.rand.nextDouble(), (double)(par3 - 2) + par1World.rand.nextDouble() * 3.9D, (double)par4.doubleValue() + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("snowballpoof", (float)par2.doubleValue() + par1World.rand.nextDouble(), (float)(par3 - 2) + par1World.rand.nextDouble() * 3.9D, (float)par4.doubleValue() + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); } par1World.notifyBlockChange(par2, par3, par4, 0); @@ -141,7 +141,7 @@ public class BlockPumpkin extends BlockDirectional */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 2.5D) & 3; + int var6 = MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 2.5D) & 3; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); } } diff --git a/src/minecraft/net/minecraft/src/BlockRedstoneOre.java b/src/minecraft/net/minecraft/src/BlockRedstoneOre.java index af9608b..8860fa2 100644 --- a/src/minecraft/net/minecraft/src/BlockRedstoneOre.java +++ b/src/minecraft/net/minecraft/src/BlockRedstoneOre.java @@ -137,41 +137,41 @@ public class BlockRedstoneOre extends Block for (int var8 = 0; var8 < 6; ++var8) { - double var9 = (double)((float)par2.floatValue() + var5.nextFloat()); - double var11 = (double)((float)par3 + var5.nextFloat()); - double var13 = (double)((float)par4.floatValue() + var5.nextFloat()); + double var9 = (float)((float)par2.floatValue() + var5.nextFloat()); + double var11 = (float)((float)par3 + var5.nextFloat()); + double var13 = (float)((float)par4.floatValue() + var5.nextFloat()); if (var8 == 0 && !par1World.isBlockOpaqueCube(par2, par3 + 1, par4)) { - var11 = (double)(par3 + 1) + var6; + var11 = (float)(par3 + 1) + var6; } if (var8 == 1 && !par1World.isBlockOpaqueCube(par2, par3 - 1, par4)) { - var11 = (double)(par3 + 0) - var6; + var11 = (float)(par3 + 0) - var6; } if (var8 == 2 && !par1World.isBlockOpaqueCube(par2, par3, par4.add(BigInteger.ONE))) { - var13 = (double)(par4.add(BigInteger.ONE).doubleValue()) + var6; + var13 = (float)(par4.add(BigInteger.ONE).doubleValue()) + var6; } if (var8 == 3 && !par1World.isBlockOpaqueCube(par2, par3, par4.subtract(BigInteger.ONE))) { - var13 = (double)(par4.doubleValue()) - var6; + var13 = (float)(par4.doubleValue()) - var6; } if (var8 == 4 && !par1World.isBlockOpaqueCube(par2.add(BigInteger.ONE), par3, par4)) { - var9 = (double)(par2.add(BigInteger.ONE).doubleValue()) + var6; + var9 = (float)(par2.add(BigInteger.ONE).doubleValue()) + var6; } if (var8 == 5 && !par1World.isBlockOpaqueCube(par2.subtract(BigInteger.ONE), par3, par4)) { - var9 = (double)(par2.doubleValue()) - var6; + var9 = (float)(par2.doubleValue()) - var6; } - if (var9 < (double)par2.doubleValue() || var9 > (double)(par2.add(BigInteger.ONE).doubleValue()) || var11 < 0.0D || var11 > (double)(par3 + 1) || var13 < (double)par4.doubleValue() || var13 > (double)(par4.add(BigInteger.ONE).doubleValue())) + if (var9 < (float)par2.doubleValue() || var9 > (float)(par2.add(BigInteger.ONE).doubleValue()) || var11 < 0.0D || var11 > (float)(par3 + 1) || var13 < (float)par4.doubleValue() || var13 > (float)(par4.add(BigInteger.ONE).doubleValue())) { par1World.spawnParticle("reddust", var9, var11, var13, 0.0D, 0.0D, 0.0D); } diff --git a/src/minecraft/net/minecraft/src/BlockRedstoneRepeater.java b/src/minecraft/net/minecraft/src/BlockRedstoneRepeater.java index a88893c..e98f1e6 100644 --- a/src/minecraft/net/minecraft/src/BlockRedstoneRepeater.java +++ b/src/minecraft/net/minecraft/src/BlockRedstoneRepeater.java @@ -204,7 +204,7 @@ public class BlockRedstoneRepeater extends BlockDirectional */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = ((MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; + int var6 = ((MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); boolean var7 = this.ignoreTick(par1World, par2, par3, par4, var6); @@ -271,9 +271,9 @@ public class BlockRedstoneRepeater extends BlockDirectional { int var6 = par1World.getBlockMetadata(par2, par3, par4); int var7 = getDirection(var6); - double var8 = (double)((float)par2.floatValue() + 0.5F) + (double)(par5Random.nextFloat() - 0.5F) * 0.2D; - double var10 = (double)((float)par3 + 0.4F) + (double)(par5Random.nextFloat() - 0.5F) * 0.2D; - double var12 = (double)((float)par4.floatValue() + 0.5F) + (double)(par5Random.nextFloat() - 0.5F) * 0.2D; + double var8 = (float)((float)par2.floatValue() + 0.5F) + (float)(par5Random.nextFloat() - 0.5F) * 0.2D; + double var10 = (float)((float)par3 + 0.4F) + (float)(par5Random.nextFloat() - 0.5F) * 0.2D; + double var12 = (float)((float)par4.floatValue() + 0.5F) + (float)(par5Random.nextFloat() - 0.5F) * 0.2D; double var14 = 0.0D; double var16 = 0.0D; diff --git a/src/minecraft/net/minecraft/src/BlockRedstoneTorch.java b/src/minecraft/net/minecraft/src/BlockRedstoneTorch.java index 2984d5a..618f802 100644 --- a/src/minecraft/net/minecraft/src/BlockRedstoneTorch.java +++ b/src/minecraft/net/minecraft/src/BlockRedstoneTorch.java @@ -156,13 +156,13 @@ public class BlockRedstoneTorch extends BlockTorch if (this.checkForBurnout(par1World, par2, par3, par4, true)) { - par1World.playSoundEffect((double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); + par1World.playSoundEffect((float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); for (int var8 = 0; var8 < 5; ++var8) { - double var9 = (double)par2.doubleValue() + par5Random.nextDouble() * 0.6D + 0.2D; - double var11 = (double)par3 + par5Random.nextDouble() * 0.6D + 0.2D; - double var13 = (double)par4.doubleValue() + par5Random.nextDouble() * 0.6D + 0.2D; + double var9 = (float)par2.doubleValue() + par5Random.nextDouble() * 0.6D + 0.2D; + double var11 = (float)par3 + par5Random.nextDouble() * 0.6D + 0.2D; + double var13 = (float)par4.doubleValue() + par5Random.nextDouble() * 0.6D + 0.2D; par1World.spawnParticle("smoke", var9, var11, var13, 0.0D, 0.0D, 0.0D); } } @@ -216,9 +216,9 @@ public class BlockRedstoneTorch extends BlockTorch if (this.torchActive) { int var6 = par1World.getBlockMetadata(par2, par3, par4); - double var7 = (double)((float)par2.floatValue() + 0.5F) + (double)(par5Random.nextFloat() - 0.5F) * 0.2D; - double var9 = (double)((float)par3 + 0.7F) + (double)(par5Random.nextFloat() - 0.5F) * 0.2D; - double var11 = (double)((float)par4.floatValue() + 0.5F) + (double)(par5Random.nextFloat() - 0.5F) * 0.2D; + double var7 = (float)((float)par2.floatValue() + 0.5F) + (float)(par5Random.nextFloat() - 0.5F) * 0.2D; + double var9 = (float)((float)par3 + 0.7F) + (float)(par5Random.nextFloat() - 0.5F) * 0.2D; + double var11 = (float)((float)par4.floatValue() + 0.5F) + (float)(par5Random.nextFloat() - 0.5F) * 0.2D; double var13 = 0.2199999988079071D; double var15 = 0.27000001072883606D; diff --git a/src/minecraft/net/minecraft/src/BlockRedstoneWire.java b/src/minecraft/net/minecraft/src/BlockRedstoneWire.java index 40ceff6..ac3dba8 100644 --- a/src/minecraft/net/minecraft/src/BlockRedstoneWire.java +++ b/src/minecraft/net/minecraft/src/BlockRedstoneWire.java @@ -506,9 +506,9 @@ public class BlockRedstoneWire extends Block if (var6 > 0) { - double var7 = (double)par2.doubleValue() + 0.5D + ((double)par5Random.nextFloat() - 0.5D) * 0.2D; - double var9 = (double)((float)par3 + 0.0625F); - double var11 = (double)par4.doubleValue() + 0.5D + ((double)par5Random.nextFloat() - 0.5D) * 0.2D; + double var7 = (float)par2.doubleValue() + 0.5D + ((float)par5Random.nextFloat() - 0.5D) * 0.2D; + double var9 = (float)((float)par3 + 0.0625F); + double var11 = (float)par4.doubleValue() + 0.5D + ((float)par5Random.nextFloat() - 0.5D) * 0.2D; float var13 = (float)var6 / 15.0F; float var14 = var13 * 0.6F + 0.4F; @@ -530,7 +530,7 @@ public class BlockRedstoneWire extends Block var16 = 0.0F; } - par1World.spawnParticle("reddust", var7, var9, var11, (double)var14, (double)var15, (double)var16); + par1World.spawnParticle("reddust", var7, var9, var11, (float)var14, (float)var15, (float)var16); } } diff --git a/src/minecraft/net/minecraft/src/BlockSand.java b/src/minecraft/net/minecraft/src/BlockSand.java index de1d2d4..991b0d0 100644 --- a/src/minecraft/net/minecraft/src/BlockSand.java +++ b/src/minecraft/net/minecraft/src/BlockSand.java @@ -55,7 +55,7 @@ public class BlockSand extends Block { if (!par1World.isRemote) { - EntityFallingSand var9 = new EntityFallingSand(par1World, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), this.blockID); + EntityFallingSand var9 = new EntityFallingSand(par1World, (float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), this.blockID); par1World.spawnEntityInWorld(var9); } } diff --git a/src/minecraft/net/minecraft/src/BlockSilverfish.java b/src/minecraft/net/minecraft/src/BlockSilverfish.java index 36e97d0..94eda51 100644 --- a/src/minecraft/net/minecraft/src/BlockSilverfish.java +++ b/src/minecraft/net/minecraft/src/BlockSilverfish.java @@ -31,7 +31,7 @@ public class BlockSilverfish extends Block if (!par1World.isRemote) { EntitySilverfish var6 = new EntitySilverfish(par1World); - var6.setLocationAndAngles((double)par2.doubleValue() + 0.5D, (double)par3, (double)par4.doubleValue() + 0.5D, 0.0F, 0.0F); + var6.setLocationAndAngles((float)par2.doubleValue() + 0.5D, (float)par3, (float)par4.doubleValue() + 0.5D, 0.0F, 0.0F); par1World.spawnEntityInWorld(var6); var6.spawnExplosionParticle(); } diff --git a/src/minecraft/net/minecraft/src/BlockSnow.java b/src/minecraft/net/minecraft/src/BlockSnow.java index 5e403a3..6bbd60d 100644 --- a/src/minecraft/net/minecraft/src/BlockSnow.java +++ b/src/minecraft/net/minecraft/src/BlockSnow.java @@ -20,7 +20,7 @@ public class BlockSnow extends Block public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { int var5 = par1World.getBlockMetadata(par2, par3, par4) & 7; - return var5 >= 3 ? AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue() + this.minX, (double)par3 + this.minY, (double)par4.doubleValue() + this.minZ, (double)par2.doubleValue() + this.maxX, (double)((float)par3 + 0.5F), (double)par4.doubleValue() + this.maxZ) : null; + return var5 >= 3 ? AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)par2.doubleValue() + this.minX, (float)par3 + this.minY, (float)par4.doubleValue() + this.minZ, (float)par2.doubleValue() + this.maxX, (float)((float)par3 + 0.5F), (float)par4.doubleValue() + this.maxZ) : null; } /** @@ -93,10 +93,10 @@ public class BlockSnow extends Block { int var7 = Item.snowball.shiftedIndex; float var8 = 0.7F; - double var9 = (double)(par1World.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; - double var11 = (double)(par1World.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; - double var13 = (double)(par1World.rand.nextFloat() * var8) + (double)(1.0F - var8) * 0.5D; - EntityItem var15 = new EntityItem(par1World, (double)par3.doubleValue() + var9, (double)par4 + var11, (double)par5 .doubleValue()+ var13, new ItemStack(var7, 1, 0)); + double var9 = (float)(par1World.rand.nextFloat() * var8) + (float)(1.0F - var8) * 0.5D; + double var11 = (float)(par1World.rand.nextFloat() * var8) + (float)(1.0F - var8) * 0.5D; + double var13 = (float)(par1World.rand.nextFloat() * var8) + (float)(1.0F - var8) * 0.5D; + EntityItem var15 = new EntityItem(par1World, (float)par3.doubleValue() + var9, (float)par4 + var11, (float)par5 .doubleValue()+ var13, new ItemStack(var7, 1, 0)); var15.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(var15); par1World.setBlockWithNotify(par3, par4, par5, 0); diff --git a/src/minecraft/net/minecraft/src/BlockSoulSand.java b/src/minecraft/net/minecraft/src/BlockSoulSand.java index 20bf9dc..2924301 100644 --- a/src/minecraft/net/minecraft/src/BlockSoulSand.java +++ b/src/minecraft/net/minecraft/src/BlockSoulSand.java @@ -17,7 +17,7 @@ public class BlockSoulSand extends Block public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { float var5 = 0.125F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue(), (double)par3, (double)par4.doubleValue(), (double)(par2.doubleValue() + 1), (double)((float)(par3 + 1) - var5), (double)(par4.doubleValue() + 1)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)par2.doubleValue(), (float)par3, (float)par4.doubleValue(), (float)(par2.doubleValue() + 1), (float)((float)(par3 + 1) - var5), (float)(par4.doubleValue() + 1)); } /** diff --git a/src/minecraft/net/minecraft/src/BlockStairs.java b/src/minecraft/net/minecraft/src/BlockStairs.java index a78b4a3..65efd5c 100644 --- a/src/minecraft/net/minecraft/src/BlockStairs.java +++ b/src/minecraft/net/minecraft/src/BlockStairs.java @@ -287,7 +287,7 @@ public class BlockStairs extends Block */ public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { - int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var6 = MathHelper.floor_double((float)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int var7 = par1World.getBlockMetadata(par2, par3, par4) & 4; if (var6 == 0) @@ -316,7 +316,7 @@ public class BlockStairs extends Block */ public void updateBlockMetadata(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, float par7, float par8) { - if (par5 == 0 || par5 != 1 && (double)par7 > 0.5D) + if (par5 == 0 || par5 != 1 && (float)par7 > 0.5D) { int var9 = par1World.getBlockMetadata(par2, par3, par4); par1World.setBlockMetadataWithNotify(par2, par3, par4, var9 | 4); diff --git a/src/minecraft/net/minecraft/src/BlockStem.java b/src/minecraft/net/minecraft/src/BlockStem.java index 64aecd0..034cba6 100644 --- a/src/minecraft/net/minecraft/src/BlockStem.java +++ b/src/minecraft/net/minecraft/src/BlockStem.java @@ -204,7 +204,7 @@ public class BlockStem extends BlockFlower */ public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { - this.maxY = (double)((float)(par1IBlockAccess.getBlockMetadata(par2, par3, par4) * 2 + 2) / 16.0F); + this.maxY = (float)((float)(par1IBlockAccess.getBlockMetadata(par2, par3, par4) * 2 + 2) / 16.0F); float var5 = 0.125F; this.setBlockBounds(0.5F - var5, 0.0F, 0.5F - var5, 0.5F + var5, (float)this.maxY, 0.5F + var5); } @@ -256,7 +256,7 @@ public class BlockStem extends BlockFlower float var11 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F; float var12 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F; float var13 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F; - EntityItem var14 = new EntityItem(par1World, (double)((float)par2.floatValue() + var11), (double)((float)par3 + var12), (double)((float)par4.floatValue() + var13), new ItemStack(var8)); + EntityItem var14 = new EntityItem(par1World, (float)((float)par2.floatValue() + var11), (float)((float)par3 + var12), (float)((float)par4.floatValue() + var13), new ItemStack(var8)); var14.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(var14); } diff --git a/src/minecraft/net/minecraft/src/BlockTNT.java b/src/minecraft/net/minecraft/src/BlockTNT.java index 8b6530a..4eb5342 100644 --- a/src/minecraft/net/minecraft/src/BlockTNT.java +++ b/src/minecraft/net/minecraft/src/BlockTNT.java @@ -61,7 +61,7 @@ public class BlockTNT extends Block { if (!par1World.isRemote) { - EntityTNTPrimed var5 = new EntityTNTPrimed(par1World, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F)); + EntityTNTPrimed var5 = new EntityTNTPrimed(par1World, (float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F)); var5.fuse = par1World.rand.nextInt(var5.fuse / 4) + var5.fuse / 8; par1World.spawnEntityInWorld(var5); } @@ -76,7 +76,7 @@ public class BlockTNT extends Block { if ((par5 & 1) == 1) { - EntityTNTPrimed var6 = new EntityTNTPrimed(par1World, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F)); + EntityTNTPrimed var6 = new EntityTNTPrimed(par1World, (float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F)); par1World.spawnEntityInWorld(var6); par1World.playSoundAtEntity(var6, "random.fuse", 1.0F, 1.0F); } diff --git a/src/minecraft/net/minecraft/src/BlockTorch.java b/src/minecraft/net/minecraft/src/BlockTorch.java index 62469a2..deb4604 100644 --- a/src/minecraft/net/minecraft/src/BlockTorch.java +++ b/src/minecraft/net/minecraft/src/BlockTorch.java @@ -253,9 +253,9 @@ public class BlockTorch extends Block public void randomDisplayTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); - double var7 = (double)((float)par2.floatValue() + 0.5F); - double var9 = (double)((float)par3 + 0.7F); - double var11 = (double)((float)par4.floatValue() + 0.5F); + double var7 = (float)((float)par2.floatValue() + 0.5F); + double var9 = (float)((float)par3 + 0.7F); + double var11 = (float)((float)par4.floatValue() + 0.5F); double var13 = 0.2199999988079071D; double var15 = 0.27000001072883606D; diff --git a/src/minecraft/net/minecraft/src/BlockTripWire.java b/src/minecraft/net/minecraft/src/BlockTripWire.java index 3e2264a..986c6f8 100644 --- a/src/minecraft/net/minecraft/src/BlockTripWire.java +++ b/src/minecraft/net/minecraft/src/BlockTripWire.java @@ -222,7 +222,7 @@ public class BlockTripWire extends Block int var5 = par1World.getBlockMetadata(par2, par3, par4); boolean var6 = (var5 & 1) == 1; boolean var7 = false; - List var8 = par1World.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue() + this.minX, (double)par3 + this.minY, (double)par4.doubleValue() + this.minZ, (double)par2.doubleValue() + this.maxX, (double)par3 + this.maxY, (double)par4.doubleValue() + this.maxZ)); + List var8 = par1World.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)par2.doubleValue() + this.minX, (float)par3 + this.minY, (float)par4.doubleValue() + this.minZ, (float)par2.doubleValue() + this.maxX, (float)par3 + this.maxY, (float)par4.doubleValue() + this.maxZ)); if (!var8.isEmpty()) { diff --git a/src/minecraft/net/minecraft/src/BlockTripWireSource.java b/src/minecraft/net/minecraft/src/BlockTripWireSource.java index 180025f..a5953be 100644 --- a/src/minecraft/net/minecraft/src/BlockTripWireSource.java +++ b/src/minecraft/net/minecraft/src/BlockTripWireSource.java @@ -269,19 +269,19 @@ public class BlockTripWireSource extends Block { if (par6 && !par8) { - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.4F, 0.6F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.1D, (float)par4.doubleValue() + 0.5D, "random.click", 0.4F, 0.6F); } else if (!par6 && par8) { - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.4F, 0.5F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.1D, (float)par4.doubleValue() + 0.5D, "random.click", 0.4F, 0.5F); } else if (par5 && !par7) { - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.4F, 0.7F); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.1D, (float)par4.doubleValue() + 0.5D, "random.click", 0.4F, 0.7F); } else if (!par5 && par7) { - par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.bowhit", 0.4F, 1.2F / (par1World.rand.nextFloat() * 0.2F + 0.9F)); + par1World.playSoundEffect((float)par2.doubleValue() + 0.5D, (float)par3 + 0.1D, (float)par4.doubleValue() + 0.5D, "random.bowhit", 0.4F, 1.2F / (par1World.rand.nextFloat() * 0.2F + 0.9F)); } } diff --git a/src/minecraft/net/minecraft/src/ChunkProviderEnd.java b/src/minecraft/net/minecraft/src/ChunkProviderEnd.java index d9eeeed..141c057 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderEnd.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderEnd.java @@ -255,14 +255,14 @@ public class ChunkProviderEnd implements IChunkProvider } var16 += 0.5D; - var18 = var18 * (double)par6 / 16.0D; + var18 = var18 * (float)par6 / 16.0D; ++var13; - double var23 = (double)par6 / 2.0D; + double var23 = (float)par6 / 2.0D; for (int var25 = 0; var25 < par6; ++var25) { double var26 = 0.0D; - double var28 = ((double)var25 - var23) * 8.0D / var16; + double var28 = ((float)var25 - var23) * 8.0D / var16; if (var28 < 0.0D) { @@ -287,13 +287,13 @@ public class ChunkProviderEnd implements IChunkProvider } var26 -= 8.0D; - var26 += (double)var22; + var26 += (float)var22; byte var36 = 2; double var37; if (var25 > par6 / 2 - var36) { - var37 = (double)((float)(var25 - (par6 / 2 - var36)) / 64.0F); + var37 = (float)((float)(var25 - (par6 / 2 - var36)) / 64.0F); if (var37 < 0.0D) { @@ -312,7 +312,7 @@ public class ChunkProviderEnd implements IChunkProvider if (var25 < var36) { - var37 = (double)((float)(var36 - var25) / ((float)var36 - 1.0F)); + var37 = (float)((float)(var36 - var25) / ((float)var36 - 1.0F)); var26 = var26 * (1.0D - var37) + -30.0D * var37; } diff --git a/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java b/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java index 1ef83bc..1f3c82d 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java @@ -417,13 +417,13 @@ public class ChunkProviderGenerate implements IChunkProvider for (int var47 = 0; var47 < par6; ++var47) { - double var48 = (double)var17; - double var26 = (double)var16; + double var48 = (float)var17; + double var26 = (float)var16; var48 += var46 * 0.2D; - var48 = var48 * (double)par6 / 16.0D; - double var28 = (double)par6 / 2.0D + var48 * 4.0D; + var48 = var48 * (float)par6 / 16.0D; + double var28 = (float)par6 / 2.0D + var48 * 4.0D; double var30 = 0.0D; - double var32 = ((double)var47 - var28) * 12.0D * 128.0D / 128.0D / var26; + double var32 = ((float)var47 - var28) * 12.0D * 128.0D / 128.0D / var26; if (var32 < 0.0D) { @@ -451,7 +451,7 @@ public class ChunkProviderGenerate implements IChunkProvider if (var47 > par6 - 4) { - double var40 = (double)((float)(var47 - (par6 - 4)) / 3.0F); + double var40 = (float)((float)(var47 - (par6 - 4)) / 3.0F); var30 = var30 * (1.0D - var40) + -10.0D * var40; } diff --git a/src/minecraft/net/minecraft/src/ChunkProviderHell.java b/src/minecraft/net/minecraft/src/ChunkProviderHell.java index 13b4c07..121a8f2 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderHell.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderHell.java @@ -295,12 +295,12 @@ public class ChunkProviderHell implements IChunkProvider for (var15 = 0; var15 < par6; ++var15) { - var14[var15] = Math.cos((double)var15 * Math.PI * 6.0D / (double)par6) * 2.0D; - double var16 = (double)var15; + var14[var15] = (float)Math.cos((float)var15 * (float)Math.PI * 6.0D / (float)par6) * 2.0D; + double var16 = (float)var15; if (var15 > par6 / 2) { - var16 = (double)(par6 - 1 - var15); + var16 = (float)(par6 - 1 - var15); } if (var16 < 4.0D) @@ -355,7 +355,7 @@ public class ChunkProviderHell implements IChunkProvider } var17 += 0.5D; - var21 = var21 * (double)par6 / 16.0D; + var21 = var21 * (float)par6 / 16.0D; ++var13; for (int var23 = 0; var23 < par6; ++var23) @@ -384,13 +384,13 @@ public class ChunkProviderHell implements IChunkProvider if (var23 > par6 - 4) { - var34 = (double)((float)(var23 - (par6 - 4)) / 3.0F); + var34 = (float)((float)(var23 - (par6 - 4)) / 3.0F); var24 = var24 * (1.0D - var34) + -10.0D * var34; } - if ((double)var23 < var19) + if ((float)var23 < var19) { - var34 = (var19 - (double)var23) / 4.0D; + var34 = (var19 - (float)var23) / 4.0D; if (var34 < 0.0D) { diff --git a/src/minecraft/net/minecraft/src/ClippingHelper.java b/src/minecraft/net/minecraft/src/ClippingHelper.java index fc073f2..6ccf7ff 100644 --- a/src/minecraft/net/minecraft/src/ClippingHelper.java +++ b/src/minecraft/net/minecraft/src/ClippingHelper.java @@ -14,7 +14,7 @@ public class ClippingHelper { for (int var13 = 0; var13 < 6; ++var13) { - if ((double)this.frustum[var13][0] * par1 + (double)this.frustum[var13][1] * par3 + (double)this.frustum[var13][2] * par5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par7 + (double)this.frustum[var13][1] * par3 + (double)this.frustum[var13][2] * par5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par1 + (double)this.frustum[var13][1] * par9 + (double)this.frustum[var13][2] * par5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par7 + (double)this.frustum[var13][1] * par9 + (double)this.frustum[var13][2] * par5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par1 + (double)this.frustum[var13][1] * par3 + (double)this.frustum[var13][2] * par11 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par7 + (double)this.frustum[var13][1] * par3 + (double)this.frustum[var13][2] * par11 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par1 + (double)this.frustum[var13][1] * par9 + (double)this.frustum[var13][2] * par11 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * par7 + (double)this.frustum[var13][1] * par9 + (double)this.frustum[var13][2] * par11 + (double)this.frustum[var13][3] <= 0.0D) + if ((float)this.frustum[var13][0] * par1 + (float)this.frustum[var13][1] * par3 + (float)this.frustum[var13][2] * par5 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par7 + (float)this.frustum[var13][1] * par3 + (float)this.frustum[var13][2] * par5 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par1 + (float)this.frustum[var13][1] * par9 + (float)this.frustum[var13][2] * par5 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par7 + (float)this.frustum[var13][1] * par9 + (float)this.frustum[var13][2] * par5 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par1 + (float)this.frustum[var13][1] * par3 + (float)this.frustum[var13][2] * par11 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par7 + (float)this.frustum[var13][1] * par3 + (float)this.frustum[var13][2] * par11 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par1 + (float)this.frustum[var13][1] * par9 + (float)this.frustum[var13][2] * par11 + (float)this.frustum[var13][3] <= 0.0D && (float)this.frustum[var13][0] * par7 + (float)this.frustum[var13][1] * par9 + (float)this.frustum[var13][2] * par11 + (float)this.frustum[var13][3] <= 0.0D) { return false; } diff --git a/src/minecraft/net/minecraft/src/CommandServerTp.java b/src/minecraft/net/minecraft/src/CommandServerTp.java index 1aa49d4..6ecfa96 100644 --- a/src/minecraft/net/minecraft/src/CommandServerTp.java +++ b/src/minecraft/net/minecraft/src/CommandServerTp.java @@ -65,7 +65,7 @@ public class CommandServerTp extends CommandBase BigDecimal var7 = parseBigDecimal(par1ICommandSender, par2ArrayOfStr[var5++]); int var8 = parseInt(par1ICommandSender, par2ArrayOfStr[var5++]); BigDecimal var9 = parseBigDecimal(par1ICommandSender, par2ArrayOfStr[var5++]); - var4.serverForThisPlayer.setPlayerLocation(var7.add(BigDecimal.valueOf(0.5)), (double)var8, var9.add(BigDecimal.valueOf(0.5)), var4.rotationYaw, var4.rotationPitch); + var4.serverForThisPlayer.setPlayerLocation(var7.add(BigDecimal.valueOf(0.5)), (float)var8, var9.add(BigDecimal.valueOf(0.5)), var4.rotationYaw, var4.rotationPitch); notifyAdmins(par1ICommandSender, "commands.tp.coordinates", new Object[] {var4.getEntityName(), var7.toString(), Integer.valueOf(var8), var9.toString()}); } } diff --git a/src/minecraft/net/minecraft/src/ComponentVillage.java b/src/minecraft/net/minecraft/src/ComponentVillage.java index ad8f161..5ddaad1 100644 --- a/src/minecraft/net/minecraft/src/ComponentVillage.java +++ b/src/minecraft/net/minecraft/src/ComponentVillage.java @@ -121,7 +121,7 @@ abstract class ComponentVillage extends StructureComponent ++this.villagersSpawned; EntityVillager var11 = new EntityVillager(par1World, this.getVillagerType(var7)); - var11.setLocationAndAngles((double)var8 + 0.5D, (double)var9, (double)var10 + 0.5D, 0.0F, 0.0F); + var11.setLocationAndAngles((float)var8 + 0.5D, (float)var9, (float)var10 + 0.5D, 0.0F, 0.0F); par1World.spawnEntityInWorld(var11); } } diff --git a/src/minecraft/net/minecraft/src/ContainerCreative.java b/src/minecraft/net/minecraft/src/ContainerCreative.java index c326794..bf3c496 100644 --- a/src/minecraft/net/minecraft/src/ContainerCreative.java +++ b/src/minecraft/net/minecraft/src/ContainerCreative.java @@ -40,7 +40,7 @@ class ContainerCreative extends Container public void scrollTo(float par1) { int var2 = this.itemList.size() / 9 - 5 + 1; - int var3 = (int)((double)(par1 * (float)var2) + 0.5D); + int var3 = (int)((float)(par1 * (float)var2) + 0.5D); if (var3 < 0) { diff --git a/src/minecraft/net/minecraft/src/ContainerEnchantment.java b/src/minecraft/net/minecraft/src/ContainerEnchantment.java index 0dec938..7851e9d 100644 --- a/src/minecraft/net/minecraft/src/ContainerEnchantment.java +++ b/src/minecraft/net/minecraft/src/ContainerEnchantment.java @@ -218,7 +218,7 @@ public class ContainerEnchantment extends Container public boolean canInteractWith(EntityPlayer par1EntityPlayer) { - return this.worldPointer.getBlockId(this.posX, this.posY, this.posZ) != Block.enchantmentTable.blockID ? false : par1EntityPlayer.getDistanceSq((double)this.posX.doubleValue() + 0.5D, (double)this.posY + 0.5D, (double)this.posZ.doubleValue() + 0.5D) <= 64.0D; + return this.worldPointer.getBlockId(this.posX, this.posY, this.posZ) != Block.enchantmentTable.blockID ? false : par1EntityPlayer.getDistanceSq((float)this.posX.doubleValue() + 0.5D, (float)this.posY + 0.5D, (float)this.posZ.doubleValue() + 0.5D) <= 64.0D; } /** diff --git a/src/minecraft/net/minecraft/src/ContainerWorkbench.java b/src/minecraft/net/minecraft/src/ContainerWorkbench.java index fadb78a..e341d2d 100644 --- a/src/minecraft/net/minecraft/src/ContainerWorkbench.java +++ b/src/minecraft/net/minecraft/src/ContainerWorkbench.java @@ -77,7 +77,7 @@ public class ContainerWorkbench extends Container public boolean canInteractWith(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != Block.workbench.blockID ? false : par1EntityPlayer.getDistanceSq((double)this.posX.doubleValue() + 0.5D, (double)this.posY + 0.5D, (double)this.posZ.doubleValue() + 0.5D) <= 64.0D; + return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != Block.workbench.blockID ? false : par1EntityPlayer.getDistanceSq((float)this.posX.doubleValue() + 0.5D, (float)this.posY + 0.5D, (float)this.posZ.doubleValue() + 0.5D) <= 64.0D; } /** diff --git a/src/minecraft/net/minecraft/src/DedicatedServer.java b/src/minecraft/net/minecraft/src/DedicatedServer.java index d18062d..cd907fb 100644 --- a/src/minecraft/net/minecraft/src/DedicatedServer.java +++ b/src/minecraft/net/minecraft/src/DedicatedServer.java @@ -145,7 +145,7 @@ public class DedicatedServer extends MinecraftServer implements IServer logger.info("Preparing level \"" + this.getFolderName() + "\""); this.loadAllDimensions(this.getFolderName(), this.getFolderName(), var8, var16); long var11 = System.nanoTime() - var4; - String var13 = String.format("%.3fs", new Object[] {Double.valueOf((double)var11 / 1.0E9D)}); + String var13 = String.format("%.3fs", new Object[] {Double.valueOf((float)var11 / 1.0E9D)}); logger.info("Done (" + var13 + ")! For help, type \"help\" or \"?\""); if (this.settings.getOrSetBoolProperty("enable-query", false)) diff --git a/src/minecraft/net/minecraft/src/EffectRenderer.java b/src/minecraft/net/minecraft/src/EffectRenderer.java index 1d1777d..f664c58 100644 --- a/src/minecraft/net/minecraft/src/EffectRenderer.java +++ b/src/minecraft/net/minecraft/src/EffectRenderer.java @@ -70,9 +70,9 @@ public class EffectRenderer float var5 = ActiveRenderInfo.rotationYZ; float var6 = ActiveRenderInfo.rotationXY; float var7 = ActiveRenderInfo.rotationXZ; - EntityFX.interpPosX = par1Entity.lastTickPosX + (par1Entity.posX - par1Entity.lastTickPosX) * (double)par2; - EntityFX.interpPosY = par1Entity.lastTickPosY + (par1Entity.posY - par1Entity.lastTickPosY) * (double)par2; - EntityFX.interpPosZ = par1Entity.lastTickPosZ + (par1Entity.posZ - par1Entity.lastTickPosZ) * (double)par2; + EntityFX.interpPosX = par1Entity.lastTickPosX + (par1Entity.posX - par1Entity.lastTickPosX) * (float)par2; + EntityFX.interpPosY = par1Entity.lastTickPosY + (par1Entity.posY - par1Entity.lastTickPosY) * (float)par2; + EntityFX.interpPosZ = par1Entity.lastTickPosZ + (par1Entity.posZ - par1Entity.lastTickPosZ) * (float)par2; for (int var8 = 0; var8 < 3; ++var8) { @@ -157,11 +157,11 @@ public class EffectRenderer { for (int var10 = 0; var10 < var7; ++var10) { - double var11 = (double)par1.doubleValue() + ((double)var8 + 0.5D) / (double)var7; - double var13 = (double)par2 + ((double)var9 + 0.5D) / (double)var7; - double var15 = (double)par3.doubleValue() + ((double)var10 + 0.5D) / (double)var7; + double var11 = (float)par1.doubleValue() + ((float)var8 + 0.5D) / (float)var7; + double var13 = (float)par2 + ((float)var9 + 0.5D) / (float)var7; + double var15 = (float)par3.doubleValue() + ((float)var10 + 0.5D) / (float)var7; int var17 = this.rand.nextInt(6); - this.addEffect((new EntityDiggingFX(this.worldObj, var11, var13, var15, var11 - (double)par1.doubleValue() - 0.5D, var13 - (double)par2 - 0.5D, var15 - (double)par3.doubleValue() - 0.5D, var6, var17, par5)).func_70596_a(par1, par2, par3)); + this.addEffect((new EntityDiggingFX(this.worldObj, var11, var13, var15, var11 - (float)par1.doubleValue() - 0.5D, var13 - (float)par2 - 0.5D, var15 - (float)par3.doubleValue() - 0.5D, var6, var17, par5)).func_70596_a(par1, par2, par3)); } } } @@ -179,38 +179,38 @@ public class EffectRenderer { Block var6 = Block.blocksList[var5]; float var7 = 0.1F; - double var8 = (double)par1.doubleValue() + this.rand.nextDouble() * (var6.maxX - var6.minX - (double)(var7 * 2.0F)) + (double)var7 + var6.minX; - double var10 = (double)par2 + this.rand.nextDouble() * (var6.maxY - var6.minY - (double)(var7 * 2.0F)) + (double)var7 + var6.minY; - double var12 = (double)par3.doubleValue() + this.rand.nextDouble() * (var6.maxZ - var6.minZ - (double)(var7 * 2.0F)) + (double)var7 + var6.minZ; + double var8 = (float)par1.doubleValue() + this.rand.nextDouble() * (var6.maxX - var6.minX - (float)(var7 * 2.0F)) + (float)var7 + var6.minX; + double var10 = (float)par2 + this.rand.nextDouble() * (var6.maxY - var6.minY - (float)(var7 * 2.0F)) + (float)var7 + var6.minY; + double var12 = (float)par3.doubleValue() + this.rand.nextDouble() * (var6.maxZ - var6.minZ - (float)(var7 * 2.0F)) + (float)var7 + var6.minZ; if (par4 == 0) { - var10 = (double)par2 + var6.minY - (double)var7; + var10 = (float)par2 + var6.minY - (float)var7; } if (par4 == 1) { - var10 = (double)par2 + var6.maxY + (double)var7; + var10 = (float)par2 + var6.maxY + (float)var7; } if (par4 == 2) { - var12 = (double)par3.doubleValue() + var6.minZ - (double)var7; + var12 = (float)par3.doubleValue() + var6.minZ - (float)var7; } if (par4 == 3) { - var12 = (double)par3.doubleValue() + var6.maxZ + (double)var7; + var12 = (float)par3.doubleValue() + var6.maxZ + (float)var7; } if (par4 == 4) { - var8 = (double)par1.doubleValue() + var6.minX - (double)var7; + var8 = (float)par1.doubleValue() + var6.minX - (float)var7; } if (par4 == 5) { - var8 = (double)par1.doubleValue() + var6.maxX + (double)var7; + var8 = (float)par1.doubleValue() + var6.maxX + (float)var7; } this.addEffect((new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, par4, this.worldObj.getBlockMetadata(par1, par2, par3))).func_70596_a(par1, par2, par3).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); diff --git a/src/minecraft/net/minecraft/src/Entity.java b/src/minecraft/net/minecraft/src/Entity.java index 4b54b48..cde6028 100644 --- a/src/minecraft/net/minecraft/src/Entity.java +++ b/src/minecraft/net/minecraft/src/Entity.java @@ -280,23 +280,23 @@ public abstract class Entity this.height = par2; float var3 = par1 % 2.0F; - if ((double)var3 < 0.375D) + if ((float)var3 < 0.375D) { this.myEntitySize = EnumEntitySize.SIZE_1; } - else if ((double)var3 < 0.75D) + else if ((float)var3 < 0.75D) { this.myEntitySize = EnumEntitySize.SIZE_2; } - else if ((double)var3 < 1.0D) + else if ((float)var3 < 1.0D) { this.myEntitySize = EnumEntitySize.SIZE_3; } - else if ((double)var3 < 1.375D) + else if ((float)var3 < 1.375D) { this.myEntitySize = EnumEntitySize.SIZE_4; } - else if ((double)var3 < 1.75D) + else if ((float)var3 < 1.75D) { this.myEntitySize = EnumEntitySize.SIZE_5; } @@ -325,7 +325,7 @@ public abstract class Entity this.posZ = par5; float var7 = this.width / 2.0F; float var8 = this.height; - this.boundingBox.setBounds(par1 - (double)var7, par3 - (double)this.yOffset + (double)this.ySize, par5 - (double)var7, par1 + (double)var7, par3 - (double)this.yOffset + (double)this.ySize + (double)var8, par5 + (double)var7); + this.boundingBox.setBounds(par1 - (float)var7, par3 - (float)this.yOffset + (float)this.ySize, par5 - (float)var7, par1 + (float)var7, par3 - (float)this.yOffset + (float)this.ySize + (float)var8, par5 + (float)var7); } /** @@ -336,8 +336,8 @@ public abstract class Entity { float var3 = this.rotationPitch; float var4 = this.rotationYaw; - this.rotationYaw = (float)((double)this.rotationYaw + (double)par1 * 0.15D); - this.rotationPitch = (float)((double)this.rotationPitch - (double)par2 * 0.15D); + this.rotationYaw = (float)((float)this.rotationYaw + (float)par1 * 0.15D); + this.rotationPitch = (float)((float)this.rotationPitch - (float)par2 * 0.15D); if (this.rotationPitch < -90.0F) { @@ -385,13 +385,13 @@ public abstract class Entity if (this.isSprinting() && !this.isInWater()) { BigInteger x = MathHelper.floor_double_BigInteger(this.posX); - int y = MathHelper.floor_double(this.posY - 0.20000000298023224D - (double)this.yOffset); + int y = MathHelper.floor_double(this.posY - 0.20000000298023224D - (float)this.yOffset); BigInteger z = MathHelper.floor_double_BigInteger(this.posZ); int var4 = this.worldObj.getBlockId(x, y, z); if (var4 > 0) { - this.worldObj.spawnParticle("tilecrack_" + var4, this.posX + ((double)this.rand.nextFloat() - 0.5D) * (double)this.width, this.boundingBox.minY + 0.1D, this.posZ + ((double)this.rand.nextFloat() - 0.5D) * (double)this.width, -this.motionX * 4.0D, 1.5D, -this.motionZ * 4.0D); + this.worldObj.spawnParticle("tilecrack_" + var4, this.posX + ((float)this.rand.nextFloat() - 0.5D) * (float)this.width, this.boundingBox.minY + 0.1D, this.posZ + ((float)this.rand.nextFloat() - 0.5D) * (float)this.width, -this.motionX * 4.0D, 1.5D, -this.motionZ * 4.0D); } } @@ -415,14 +415,14 @@ public abstract class Entity { var8 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - this.worldObj.spawnParticle("bubble", this.posX + (double)var8, (double)(var7 + 1.0F), this.posZ + (double)var5, this.motionX, this.motionY - (double)(this.rand.nextFloat() * 0.2F), this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX + (float)var8, (float)(var7 + 1.0F), this.posZ + (float)var5, this.motionX, this.motionY - (float)(this.rand.nextFloat() * 0.2F), this.motionZ); } for (var3 = 0; (float)var3 < 1.0F + this.width * 20.0F; ++var3) { var8 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - this.worldObj.spawnParticle("splash", this.posX + (double)var8, (double)(var7 + 1.0F), this.posZ + (double)var5, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("splash", this.posX + (float)var8, (float)(var7 + 1.0F), this.posZ + (float)var5, this.motionX, this.motionY, this.motionZ); } } @@ -542,7 +542,7 @@ public abstract class Entity { this.boundingBox.offset(par1, par3, par5); this.posX = (this.boundingBox.minX + this.boundingBox.maxX) / 2.0D; - this.posY = this.boundingBox.minY + (double)this.yOffset - (double)this.ySize; + this.posY = this.boundingBox.minY + (float)this.yOffset - (float)this.ySize; this.posZ = (this.boundingBox.minZ + this.boundingBox.maxZ) / 2.0D; } else @@ -696,7 +696,7 @@ public abstract class Entity var23 = par3; double var25 = par5; par1 = var11; - par3 = (double)this.stepHeight; + par3 = (float)this.stepHeight; par5 = var15; AxisAlignedBB var27 = this.boundingBox.copy(); this.boundingBox.setBB(var17); @@ -754,7 +754,7 @@ public abstract class Entity } else { - par3 = (double)(-this.stepHeight); + par3 = (float)(-this.stepHeight); for (var28 = var30.iterator(); var28.hasNext(); par3 = var29.calculateYOffset(this.boundingBox, par3)) { @@ -773,11 +773,11 @@ public abstract class Entity } else { - double var37 = this.boundingBox.minY - (double)((int)this.boundingBox.minY); + double var37 = this.boundingBox.minY - (float)((int)this.boundingBox.minY); if (var37 > 0.0D) { - this.ySize = (float)((double)this.ySize + var37 + 0.01D); + this.ySize = (float)((float)this.ySize + var37 + 0.01D); } } } @@ -785,7 +785,7 @@ public abstract class Entity this.worldObj.theProfiler.endSection(); this.worldObj.theProfiler.startSection("rest"); this.posX = (this.boundingBox.minX + this.boundingBox.maxX) / 2.0D; - this.posY = this.boundingBox.minY + (double)this.yOffset - (double)this.ySize; + this.posY = this.boundingBox.minY + (float)this.yOffset - (float)this.ySize; this.posZ = (this.boundingBox.minZ + this.boundingBox.maxZ) / 2.0D; this.isCollidedHorizontally = var11 != par1 || var15 != par5; this.isCollidedVertically = var13 != par3; @@ -813,9 +813,9 @@ public abstract class Entity if (this.canTriggerWalking() && !var18 && this.ridingEntity == null) { - this.distanceWalkedModified = (float)((double)this.distanceWalkedModified + (double)MathHelper.sqrt_double(var33 * var33 + var23 * var23) * 0.6D); + this.distanceWalkedModified = (float)((float)this.distanceWalkedModified + (float)MathHelper.sqrt_double(var33 * var33 + var23 * var23) * 0.6D); BigInteger var34 = MathHelper.floor_double_BigInteger(this.posX); - int var26 = MathHelper.floor_double(this.posY - 0.20000000298023224D - (double)this.yOffset); + int var26 = MathHelper.floor_double(this.posY - 0.20000000298023224D - (float)this.yOffset); BigInteger var36 = MathHelper.floor_double_BigInteger(this.posZ); int var38 = this.worldObj.getBlockId(var34, var26, var36); @@ -940,7 +940,7 @@ public abstract class Entity if (this instanceof EntityLiving) { BigInteger var4 = MathHelper.floor_double_BigInteger(this.posX); - int var5 = MathHelper.floor_double(this.posY - 0.20000000298023224D - (double)this.yOffset); + int var5 = MathHelper.floor_double(this.posY - 0.20000000298023224D - (float)this.yOffset); BigInteger var6 = MathHelper.floor_double_BigInteger(this.posZ); int var7 = this.worldObj.getBlockId(var4, var5, var6); @@ -961,7 +961,7 @@ public abstract class Entity } else if (par1 < 0.0D) { - this.fallDistance = (float)((double)this.fallDistance - par1); + this.fallDistance = (float)((float)this.fallDistance - par1); } } @@ -1031,7 +1031,7 @@ public abstract class Entity */ public boolean isInsideOfMaterial(Material par1Material) { - double var2 = this.posY + (double)this.getEyeHeight(); + double var2 = this.posY + (float)this.getEyeHeight(); BigInteger var4 = MathHelper.floor_double_BigInteger(this.posX); int var5 = MathHelper.floor_float((float)MathHelper.floor_double(var2)); BigInteger var6 = MathHelper.floor_double_BigInteger(this.posZ); @@ -1041,7 +1041,7 @@ public abstract class Entity { float var8 = BlockFluid.getFluidHeightPercent(this.worldObj.getBlockMetadata(var4, var5, var6)) - 0.11111111F; float var9 = (float)(var5 + 1) - var8; - return var2 < (double)var9; + return var2 < (float)var9; } else { @@ -1081,10 +1081,10 @@ public abstract class Entity var4 = par3 / var4; par1 *= var4; par2 *= var4; - float var5 = MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F); - float var6 = MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F); - this.motionX += (double)(par1 * var6 - par2 * var5); - this.motionZ += (double)(par2 * var6 + par1 * var5); + float var5 = MathHelper.sin(this.rotationYaw * (float)(float)Math.PI / 180.0F); + float var6 = MathHelper.cos(this.rotationYaw * (float)(float)Math.PI / 180.0F); + this.motionX += (float)(par1 * var6 - par2 * var5); + this.motionZ += (float)(par2 * var6 + par1 * var5); } } @@ -1096,7 +1096,7 @@ public abstract class Entity if (this.worldObj.blockExists(var2, 0, var3)) { double var4 = (this.boundingBox.maxY - this.boundingBox.minY) * 0.66D; - int var6 = MathHelper.floor_double(this.posY - (double)this.yOffset + var4); + int var6 = MathHelper.floor_double(this.posY - (float)this.yOffset + var4); return this.worldObj.getLightBrightnessForSkyBlocks(var2, var6, var3, 0); } else @@ -1116,7 +1116,7 @@ public abstract class Entity if (this.worldObj.blockExists(var2, 0, var3)) { double var4 = (this.boundingBox.maxY - this.boundingBox.minY) * 0.66D; - int var6 = MathHelper.floor_double(this.posY - (double)this.yOffset + var4); + int var6 = MathHelper.floor_double(this.posY - (float)this.yOffset + var4); return this.worldObj.getLightBrightness(var2, var6, var3); } else @@ -1144,7 +1144,7 @@ public abstract class Entity this.prevRotationYaw = this.rotationYaw = par7; this.prevRotationPitch = this.rotationPitch = par8; this.ySize = 0.0F; - double var9 = (double)(this.prevRotationYaw - par7); + double var9 = (float)(this.prevRotationYaw - par7); if (var9 < -180.0D) { @@ -1166,7 +1166,7 @@ public abstract class Entity public void setLocationAndAngles(double par1, double par3, double par5, float par7, float par8) { this.lastTickPosX = this.prevPosX = this.posX = par1; - this.lastTickPosY = this.prevPosY = this.posY = par3 + (double)this.yOffset; + this.lastTickPosY = this.prevPosY = this.posY = par3 + (float)this.yOffset; this.lastTickPosZ = this.prevPosZ = this.posZ = par5; this.rotationYaw = par7; this.rotationPitch = par8; @@ -1203,7 +1203,7 @@ public abstract class Entity double var7 = this.posX - par1; double var9 = this.posY - par3; double var11 = this.posZ - par5; - return (double)MathHelper.sqrt_double(var7 * var7 + var9 * var9 + var11 * var11); + return (float)MathHelper.sqrt_double(var7 * var7 + var9 * var9 + var11 * var11); } /** @@ -1235,7 +1235,7 @@ public abstract class Entity if (var6 >= 0.009999999776482582D) { - var6 = (double)MathHelper.sqrt_double(var6); + var6 = (float)MathHelper.sqrt_double(var6); var2 /= var6; var4 /= var6; double var8 = 1.0D / var6; @@ -1249,8 +1249,8 @@ public abstract class Entity var4 *= var8; var2 *= 0.05000000074505806D; var4 *= 0.05000000074505806D; - var2 *= (double)(1.0F - this.entityCollisionReduction); - var4 *= (double)(1.0F - this.entityCollisionReduction); + var2 *= (float)(1.0F - this.entityCollisionReduction); + var4 *= (float)(1.0F - this.entityCollisionReduction); this.addVelocity(-var2, 0.0D, -var4); par1Entity.addVelocity(var2, 0.0D, var4); } @@ -1362,7 +1362,7 @@ public abstract class Entity */ public void writeToNBT(NBTTagCompound par1NBTTagCompound) { - par1NBTTagCompound.setTag("Pos", this.newDoubleNBTList(new double[] {this.posX, this.posY + (double)this.ySize, this.posZ})); + par1NBTTagCompound.setTag("Pos", this.newDoubleNBTList(new double[] {this.posX, this.posY + (float)this.ySize, this.posZ})); par1NBTTagCompound.setTag("Motion", this.newDoubleNBTList(new double[] {this.motionX, this.motionY, this.motionZ})); par1NBTTagCompound.setTag("Rotation", this.newFloatNBTList(new float[] {this.rotationYaw, this.rotationPitch})); par1NBTTagCompound.setFloat("FallDistance", this.fallDistance); @@ -1493,7 +1493,7 @@ public abstract class Entity */ public EntityItem entityDropItem(ItemStack par1ItemStack, float par2) { - EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (double)par2, this.posZ, par1ItemStack); + EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (float)par2, this.posZ, par1ItemStack); var3.delayBeforeCanPickup = 10; this.worldObj.spawnEntityInWorld(var3); return var3; @@ -1517,9 +1517,9 @@ public abstract class Entity float var2 = ((float)((var1 >> 0) % 2) - 0.5F) * this.width * 0.8F; float var3 = ((float)((var1 >> 1) % 2) - 0.5F) * 0.1F; float var4 = ((float)((var1 >> 2) % 2) - 0.5F) * this.width * 0.8F; - BigInteger var5 = MathHelper.floor_double_BigInteger(this.posX + (double)var2); - int var6 = MathHelper.floor_double(this.posY + (double)this.getEyeHeight() + (double)var3); - BigInteger var7 = MathHelper.floor_double_BigInteger(this.posZ + (double)var4); + BigInteger var5 = MathHelper.floor_double_BigInteger(this.posX + (float)var2); + int var6 = MathHelper.floor_double(this.posY + (float)this.getEyeHeight() + (float)var3); + BigInteger var7 = MathHelper.floor_double_BigInteger(this.posZ + (float)var4); if (this.worldObj.isBlockNormalCube(var5, var6, var7)) { @@ -1566,9 +1566,9 @@ public abstract class Entity if (this.ridingEntity != null) { this.ridingEntity.updateRiderPosition(); - this.entityRiderYawDelta += (double)(this.ridingEntity.rotationYaw - this.ridingEntity.prevRotationYaw); + this.entityRiderYawDelta += (float)(this.ridingEntity.rotationYaw - this.ridingEntity.prevRotationYaw); - for (this.entityRiderPitchDelta += (double)(this.ridingEntity.rotationPitch - this.ridingEntity.prevRotationPitch); this.entityRiderYawDelta >= 180.0D; this.entityRiderYawDelta -= 360.0D) + for (this.entityRiderPitchDelta += (float)(this.ridingEntity.rotationPitch - this.ridingEntity.prevRotationPitch); this.entityRiderYawDelta >= 180.0D; this.entityRiderYawDelta -= 360.0D) { ; } @@ -1592,30 +1592,30 @@ public abstract class Entity double var3 = this.entityRiderPitchDelta * 0.5D; float var5 = 10.0F; - if (var1 > (double)var5) + if (var1 > (float)var5) { - var1 = (double)var5; + var1 = (float)var5; } - if (var1 < (double)(-var5)) + if (var1 < (float)(-var5)) { - var1 = (double)(-var5); + var1 = (float)(-var5); } - if (var3 > (double)var5) + if (var3 > (float)var5) { - var3 = (double)var5; + var3 = (float)var5; } - if (var3 < (double)(-var5)) + if (var3 < (float)(-var5)) { - var3 = (double)(-var5); + var3 = (float)(-var5); } this.entityRiderYawDelta -= var1; this.entityRiderPitchDelta -= var3; - this.rotationYaw = (float)((double)this.rotationYaw + var1); - this.rotationPitch = (float)((double)this.rotationPitch + var3); + this.rotationYaw = (float)((float)this.rotationYaw + var1); + this.rotationPitch = (float)((float)this.rotationPitch + var3); } } } @@ -1637,7 +1637,7 @@ public abstract class Entity */ public double getYOffset() { - return (double)this.yOffset; + return (float)this.yOffset; } /** @@ -1645,7 +1645,7 @@ public abstract class Entity */ public double getMountedYOffset() { - return (double)this.height * 0.75D; + return (float)this.height * 0.75D; } /** @@ -1660,7 +1660,7 @@ public abstract class Entity { if (this.ridingEntity != null) { - this.setLocationAndAngles(this.ridingEntity.posX, this.ridingEntity.boundingBox.minY + (double)this.ridingEntity.height, this.ridingEntity.posZ, this.rotationYaw, this.rotationPitch); + this.setLocationAndAngles(this.ridingEntity.posX, this.ridingEntity.boundingBox.minY + (float)this.ridingEntity.height, this.ridingEntity.posZ, this.rotationYaw, this.rotationPitch); this.ridingEntity.riddenByEntity = null; } @@ -1695,7 +1695,7 @@ public abstract class Entity public void unmountEntity(Entity par1Entity) { double var3 = par1Entity.posX; - double var5 = par1Entity.boundingBox.minY + (double)par1Entity.height; + double var5 = par1Entity.boundingBox.minY + (float)par1Entity.height; double var7 = par1Entity.posZ; for (double var9 = -1.5D; var9 < 2.0D; ++var9) @@ -1926,9 +1926,9 @@ public abstract class Entity BigInteger var7 = MathHelper.floor_double_BigInteger(par1); int var8 = MathHelper.floor_double(par3); BigInteger var9 = MathHelper.floor_double_BigInteger(par5); - double var10 = par1 - (double)var7.doubleValue(); - double var12 = par3 - (double)var8; - double var14 = par5 - (double)var9.doubleValue(); + double var10 = par1 - (float)var7.doubleValue(); + double var12 = par3 - (float)var8; + double var14 = par5 - (float)var9.doubleValue(); if (this.worldObj.isBlockNormalCube(var7, var8, var9)) { @@ -1981,32 +1981,32 @@ public abstract class Entity if (var22 == 0) { - this.motionX = (double)(-var25); + this.motionX = (float)(-var25); } if (var22 == 1) { - this.motionX = (double)var25; + this.motionX = (float)var25; } if (var22 == 2) { - this.motionY = (double)(-var25); + this.motionY = (float)(-var25); } if (var22 == 3) { - this.motionY = (double)var25; + this.motionY = (float)var25; } if (var22 == 4) { - this.motionZ = (double)(-var25); + this.motionZ = (float)(-var25); } if (var22 == 5) { - this.motionZ = (double)var25; + this.motionZ = (float)var25; } return true; diff --git a/src/minecraft/net/minecraft/src/EntityAIArrowAttack.java b/src/minecraft/net/minecraft/src/EntityAIArrowAttack.java index 302c7da..c7e64c7 100644 --- a/src/minecraft/net/minecraft/src/EntityAIArrowAttack.java +++ b/src/minecraft/net/minecraft/src/EntityAIArrowAttack.java @@ -125,10 +125,10 @@ public class EntityAIArrowAttack extends EntityAIBase { EntitySnowball var9 = new EntitySnowball(this.worldObj, this.entityHost); double var2 = this.attackTarget.posX - this.entityHost.posX; - double var4 = this.attackTarget.posY + (double)this.attackTarget.getEyeHeight() - 1.100000023841858D - var9.posY; + double var4 = this.attackTarget.posY + (float)this.attackTarget.getEyeHeight() - 1.100000023841858D - var9.posY; double var6 = this.attackTarget.posZ - this.entityHost.posZ; float var8 = MathHelper.sqrt_double(var2 * var2 + var6 * var6) * 0.2F; - var9.setThrowableHeading(var2, var4 + (double)var8, var6, 1.6F, 12.0F); + var9.setThrowableHeading(var2, var4 + (float)var8, var6, 1.6F, 12.0F); this.worldObj.playSoundAtEntity(this.entityHost, "random.bow", 1.0F, 1.0F / (this.entityHost.getRNG().nextFloat() * 0.4F + 0.8F)); this.worldObj.spawnEntityInWorld(var9); } diff --git a/src/minecraft/net/minecraft/src/EntityAIAttackOnCollide.java b/src/minecraft/net/minecraft/src/EntityAIAttackOnCollide.java index c0441eb..2af4820 100644 --- a/src/minecraft/net/minecraft/src/EntityAIAttackOnCollide.java +++ b/src/minecraft/net/minecraft/src/EntityAIAttackOnCollide.java @@ -96,7 +96,7 @@ public class EntityAIAttackOnCollide extends EntityAIBase } this.attackTick = Math.max(this.attackTick - 1, 0); - double var1 = (double)(this.attacker.width * 2.0F * this.attacker.width * 2.0F); + double var1 = (float)(this.attacker.width * 2.0F * this.attacker.width * 2.0F); if (this.attacker.getDistanceSq(this.entityTarget.posX, this.entityTarget.boundingBox.minY, this.entityTarget.posZ) <= var1) { diff --git a/src/minecraft/net/minecraft/src/EntityAIAvoidEntity.java b/src/minecraft/net/minecraft/src/EntityAIAvoidEntity.java index 2179722..2a78058 100644 --- a/src/minecraft/net/minecraft/src/EntityAIAvoidEntity.java +++ b/src/minecraft/net/minecraft/src/EntityAIAvoidEntity.java @@ -41,7 +41,7 @@ public class EntityAIAvoidEntity extends EntityAIBase return false; } - this.closestLivingEntity = this.theEntity.worldObj.getClosestPlayerToEntity(this.theEntity, (double)this.distanceFromEntity); + this.closestLivingEntity = this.theEntity.worldObj.getClosestPlayerToEntity(this.theEntity, (float)this.distanceFromEntity); if (this.closestLivingEntity == null) { @@ -50,7 +50,7 @@ public class EntityAIAvoidEntity extends EntityAIBase } else { - List var1 = this.theEntity.worldObj.getEntitiesWithinAABB(this.targetEntityClass, this.theEntity.boundingBox.expand((double)this.distanceFromEntity, 3.0D, (double)this.distanceFromEntity)); + List var1 = this.theEntity.worldObj.getEntitiesWithinAABB(this.targetEntityClass, this.theEntity.boundingBox.expand((float)this.distanceFromEntity, 3.0D, (float)this.distanceFromEntity)); if (var1.isEmpty()) { diff --git a/src/minecraft/net/minecraft/src/EntityAIBeg.java b/src/minecraft/net/minecraft/src/EntityAIBeg.java index 45cb101..06f04b3 100644 --- a/src/minecraft/net/minecraft/src/EntityAIBeg.java +++ b/src/minecraft/net/minecraft/src/EntityAIBeg.java @@ -21,7 +21,7 @@ public class EntityAIBeg extends EntityAIBase */ public boolean shouldExecute() { - this.field_75385_b = this.worldObject.getClosestPlayerToEntity(this.theWolf, (double)this.minPlayerDistance); + this.field_75385_b = this.worldObject.getClosestPlayerToEntity(this.theWolf, (float)this.minPlayerDistance); return this.field_75385_b == null ? false : this.func_75382_a(this.field_75385_b); } @@ -30,7 +30,7 @@ public class EntityAIBeg extends EntityAIBase */ public boolean continueExecuting() { - return !this.field_75385_b.isEntityAlive() ? false : (this.theWolf.getDistanceSqToEntity(this.field_75385_b) > (double)(this.minPlayerDistance * this.minPlayerDistance) ? false : this.field_75384_e > 0 && this.func_75382_a(this.field_75385_b)); + return !this.field_75385_b.isEntityAlive() ? false : (this.theWolf.getDistanceSqToEntity(this.field_75385_b) > (float)(this.minPlayerDistance * this.minPlayerDistance) ? false : this.field_75384_e > 0 && this.func_75382_a(this.field_75385_b)); } /** @@ -56,7 +56,7 @@ public class EntityAIBeg extends EntityAIBase */ public void updateTask() { - this.theWolf.getLookHelper().setLookPosition(this.field_75385_b.posX, this.field_75385_b.posY + (double)this.field_75385_b.getEyeHeight(), this.field_75385_b.posZ, 10.0F, (float)this.theWolf.getVerticalFaceSpeed()); + this.theWolf.getLookHelper().setLookPosition(this.field_75385_b.posX, this.field_75385_b.posY + (float)this.field_75385_b.getEyeHeight(), this.field_75385_b.posZ, 10.0F, (float)this.theWolf.getVerticalFaceSpeed()); --this.field_75384_e; } diff --git a/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java b/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java index 052f1c6..376dd37 100644 --- a/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java +++ b/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java @@ -32,7 +32,7 @@ public class EntityAIBreakDoor extends EntityAIDoorInteract */ public boolean continueExecuting() { - double var1 = this.theEntity.getDistanceSq((double)this.entityPosX.doubleValue(), (double)this.entityPosY, (double)this.entityPosZ.doubleValue()); + double var1 = this.theEntity.getDistanceSq((float)this.entityPosX.doubleValue(), (float)this.entityPosY, (float)this.entityPosZ.doubleValue()); return this.breakingTime <= 240 && !this.targetDoor.isDoorOpen(this.theEntity.worldObj, this.entityPosX, this.entityPosY, this.entityPosZ) && var1 < 4.0D; } diff --git a/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java b/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java index 50f5f05..cae93cd 100644 --- a/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java +++ b/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java @@ -41,7 +41,7 @@ public abstract class EntityAIDoorInteract extends EntityAIBase this.entityPosY = var4.yCoord + 1; this.entityPosZ = var4.zCoord; - if (this.theEntity.getDistanceSq((double)this.entityPosX.doubleValue(), this.theEntity.posY, (double)this.entityPosZ.doubleValue()) <= 2.25D) + if (this.theEntity.getDistanceSq((float)this.entityPosX.doubleValue(), this.theEntity.posY, (float)this.entityPosZ.doubleValue()) <= 2.25D) { this.targetDoor = this.findUsableDoor(this.entityPosX, this.entityPosY, this.entityPosZ); @@ -79,8 +79,8 @@ public abstract class EntityAIDoorInteract extends EntityAIBase public void startExecuting() { this.field_75350_f = false; - this.entityPositionX = (float)((double)((float)this.entityPosX.floatValue() + 0.5F) - this.theEntity.posX); - this.entityPositionZ = (float)((double)((float)this.entityPosZ.floatValue() + 0.5F) - this.theEntity.posZ); + this.entityPositionX = (float)((float)((float)this.entityPosX.floatValue() + 0.5F) - this.theEntity.posX); + this.entityPositionZ = (float)((float)((float)this.entityPosZ.floatValue() + 0.5F) - this.theEntity.posZ); } /** @@ -88,8 +88,8 @@ public abstract class EntityAIDoorInteract extends EntityAIBase */ public void updateTask() { - float var1 = (float)((double)((float)this.entityPosX.floatValue() + 0.5F) - this.theEntity.posX); - float var2 = (float)((double)((float)this.entityPosZ.floatValue() + 0.5F) - this.theEntity.posZ); + float var1 = (float)((float)((float)this.entityPosX.floatValue() + 0.5F) - this.theEntity.posX); + float var2 = (float)((float)((float)this.entityPosZ.floatValue() + 0.5F) - this.theEntity.posZ); float var3 = this.entityPositionX * var1 + this.entityPositionZ * var2; if (var3 < 0.0F) diff --git a/src/minecraft/net/minecraft/src/EntityAIFleeSun.java b/src/minecraft/net/minecraft/src/EntityAIFleeSun.java index fe35ab3..0fcaed4 100644 --- a/src/minecraft/net/minecraft/src/EntityAIFleeSun.java +++ b/src/minecraft/net/minecraft/src/EntityAIFleeSun.java @@ -77,13 +77,13 @@ public class EntityAIFleeSun extends EntityAIBase for (int var2 = 0; var2 < 10; ++var2) { - BigInteger var3 = MathHelper.floor_double_BigInteger(this.theCreature.posX + (double)var1.nextInt(20) - 10.0D); - int var4 = MathHelper.floor_double(this.theCreature.boundingBox.minY + (double)var1.nextInt(6) - 3.0D); - BigInteger var5 = MathHelper.floor_double_BigInteger(this.theCreature.posZ + (double)var1.nextInt(20) - 10.0D); + BigInteger var3 = MathHelper.floor_double_BigInteger(this.theCreature.posX + (float)var1.nextInt(20) - 10.0D); + int var4 = MathHelper.floor_double(this.theCreature.boundingBox.minY + (float)var1.nextInt(6) - 3.0D); + BigInteger var5 = MathHelper.floor_double_BigInteger(this.theCreature.posZ + (float)var1.nextInt(20) - 10.0D); if (!this.theWorld.canBlockSeeTheSky(var3, var4, var5) && this.theCreature.getBlockPathWeight(var3, var4, var5) < 0.0F) { - return Vec3.getVec3Pool().getVecFromPool((double)var3.doubleValue(), (double)var4, (double)var5.doubleValue()); + return Vec3.getVec3Pool().getVecFromPool((float)var3.doubleValue(), (float)var4, (float)var5.doubleValue()); } } diff --git a/src/minecraft/net/minecraft/src/EntityAIFollowOwner.java b/src/minecraft/net/minecraft/src/EntityAIFollowOwner.java index 52e88f6..f5de8bf 100644 --- a/src/minecraft/net/minecraft/src/EntityAIFollowOwner.java +++ b/src/minecraft/net/minecraft/src/EntityAIFollowOwner.java @@ -40,7 +40,7 @@ public class EntityAIFollowOwner extends EntityAIBase { return false; } - else if (this.thePet.getDistanceSqToEntity(var1) < (double)(this.minDist * this.minDist)) + else if (this.thePet.getDistanceSqToEntity(var1) < (float)(this.minDist * this.minDist)) { return false; } @@ -56,7 +56,7 @@ public class EntityAIFollowOwner extends EntityAIBase */ public boolean continueExecuting() { - return !this.petPathfinder.noPath() && this.thePet.getDistanceSqToEntity(this.theOwner) > (double)(this.maxDist * this.maxDist) && !this.thePet.isSitting(); + return !this.petPathfinder.noPath() && this.thePet.getDistanceSqToEntity(this.theOwner) > (float)(this.maxDist * this.maxDist) && !this.thePet.isSitting(); } /** @@ -106,7 +106,7 @@ public class EntityAIFollowOwner extends EntityAIBase { if ((var4 < 1 || var5 < 1 || var4 > 3 || var5 > 3) && this.theWorld.doesBlockHaveSolidTopSurface(var1.add(BigInteger.valueOf(var4)), var3 - 1, var2.add(BigInteger.valueOf(var5))) && !this.theWorld.isBlockNormalCube(var1.add(BigInteger.valueOf(var4)), var3, var2.add(BigInteger.valueOf(var5))) && !this.theWorld.isBlockNormalCube(var1.add(BigInteger.valueOf(var4)), var3 + 1, var2.add(BigInteger.valueOf(var5)))) { - this.thePet.setLocationAndAngles((double)((float)(var1.add(BigInteger.valueOf(var4))).floatValue() + 0.5F), (double)var3, (double)((float)(var2.add(BigInteger.valueOf(var5))).floatValue() + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch); + this.thePet.setLocationAndAngles((float)((float)(var1.add(BigInteger.valueOf(var4))).floatValue() + 0.5F), (float)var3, (float)((float)(var2.add(BigInteger.valueOf(var5))).floatValue() + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch); this.petPathfinder.clearPathEntity(); return; } diff --git a/src/minecraft/net/minecraft/src/EntityAIHurtByTarget.java b/src/minecraft/net/minecraft/src/EntityAIHurtByTarget.java index 7ee2a54..935f29f 100644 --- a/src/minecraft/net/minecraft/src/EntityAIHurtByTarget.java +++ b/src/minecraft/net/minecraft/src/EntityAIHurtByTarget.java @@ -41,7 +41,7 @@ public class EntityAIHurtByTarget extends EntityAITarget if (this.field_75312_a) { - List var1 = this.taskOwner.worldObj.getEntitiesWithinAABB(this.taskOwner.getClass(), AxisAlignedBB.getAABBPool().addOrModifyAABBInPool(this.taskOwner.posX, this.taskOwner.posY, this.taskOwner.posZ, this.taskOwner.posX + 1.0D, this.taskOwner.posY + 1.0D, this.taskOwner.posZ + 1.0D).expand((double)this.targetDistance, 4.0D, (double)this.targetDistance)); + List var1 = this.taskOwner.worldObj.getEntitiesWithinAABB(this.taskOwner.getClass(), AxisAlignedBB.getAABBPool().addOrModifyAABBInPool(this.taskOwner.posX, this.taskOwner.posY, this.taskOwner.posZ, this.taskOwner.posX + 1.0D, this.taskOwner.posY + 1.0D, this.taskOwner.posZ + 1.0D).expand((float)this.targetDistance, 4.0D, (float)this.targetDistance)); Iterator var2 = var1.iterator(); while (var2.hasNext()) diff --git a/src/minecraft/net/minecraft/src/EntityAILeapAtTarget.java b/src/minecraft/net/minecraft/src/EntityAILeapAtTarget.java index fae845f..2a7a4ef 100644 --- a/src/minecraft/net/minecraft/src/EntityAILeapAtTarget.java +++ b/src/minecraft/net/minecraft/src/EntityAILeapAtTarget.java @@ -52,8 +52,8 @@ public class EntityAILeapAtTarget extends EntityAIBase double var1 = this.leapTarget.posX - this.leaper.posX; double var3 = this.leapTarget.posZ - this.leaper.posZ; float var5 = MathHelper.sqrt_double(var1 * var1 + var3 * var3); - this.leaper.motionX += var1 / (double)var5 * 0.5D * 0.800000011920929D + this.leaper.motionX * 0.20000000298023224D; - this.leaper.motionZ += var3 / (double)var5 * 0.5D * 0.800000011920929D + this.leaper.motionZ * 0.20000000298023224D; - this.leaper.motionY = (double)this.leapMotionY; + this.leaper.motionX += var1 / (float)var5 * 0.5D * 0.800000011920929D + this.leaper.motionX * 0.20000000298023224D; + this.leaper.motionZ += var3 / (float)var5 * 0.5D * 0.800000011920929D + this.leaper.motionZ * 0.20000000298023224D; + this.leaper.motionY = (float)this.leapMotionY; } } diff --git a/src/minecraft/net/minecraft/src/EntityAILookIdle.java b/src/minecraft/net/minecraft/src/EntityAILookIdle.java index 90d26a3..bad6422 100644 --- a/src/minecraft/net/minecraft/src/EntityAILookIdle.java +++ b/src/minecraft/net/minecraft/src/EntityAILookIdle.java @@ -43,9 +43,9 @@ public class EntityAILookIdle extends EntityAIBase */ public void startExecuting() { - double var1 = (Math.PI * 2D) * this.idleEntity.getRNG().nextDouble(); - this.lookX = Math.cos(var1); - this.lookZ = Math.sin(var1); + double var1 = ((float)Math.PI * 2D) * this.idleEntity.getRNG().nextDouble(); + this.lookX = (float)Math.cos(var1); + this.lookZ = (float)Math.sin(var1); this.idleTime = 20 + this.idleEntity.getRNG().nextInt(20); } @@ -55,6 +55,6 @@ public class EntityAILookIdle extends EntityAIBase public void updateTask() { --this.idleTime; - this.idleEntity.getLookHelper().setLookPosition(this.idleEntity.posX + this.lookX, this.idleEntity.posY + (double)this.idleEntity.getEyeHeight(), this.idleEntity.posZ + this.lookZ, 10.0F, (float)this.idleEntity.getVerticalFaceSpeed()); + this.idleEntity.getLookHelper().setLookPosition(this.idleEntity.posX + this.lookX, this.idleEntity.posY + (float)this.idleEntity.getEyeHeight(), this.idleEntity.posZ + this.lookZ, 10.0F, (float)this.idleEntity.getVerticalFaceSpeed()); } } diff --git a/src/minecraft/net/minecraft/src/EntityAIMate.java b/src/minecraft/net/minecraft/src/EntityAIMate.java index 69acfda..43a9951 100644 --- a/src/minecraft/net/minecraft/src/EntityAIMate.java +++ b/src/minecraft/net/minecraft/src/EntityAIMate.java @@ -81,7 +81,7 @@ public class EntityAIMate extends EntityAIBase private EntityAnimal getNearbyMate() { float var1 = 8.0F; - List var2 = this.theWorld.getEntitiesWithinAABB(this.theAnimal.getClass(), this.theAnimal.boundingBox.expand((double)var1, (double)var1, (double)var1)); + List var2 = this.theWorld.getEntitiesWithinAABB(this.theAnimal.getClass(), this.theAnimal.boundingBox.expand((float)var1, (float)var1, (float)var1)); Iterator var3 = var2.iterator(); EntityAnimal var4; @@ -122,7 +122,7 @@ public class EntityAIMate extends EntityAIBase double var4 = var2.nextGaussian() * 0.02D; double var6 = var2.nextGaussian() * 0.02D; double var8 = var2.nextGaussian() * 0.02D; - this.theWorld.spawnParticle("heart", this.theAnimal.posX + (double)(var2.nextFloat() * this.theAnimal.width * 2.0F) - (double)this.theAnimal.width, this.theAnimal.posY + 0.5D + (double)(var2.nextFloat() * this.theAnimal.height), this.theAnimal.posZ + (double)(var2.nextFloat() * this.theAnimal.width * 2.0F) - (double)this.theAnimal.width, var4, var6, var8); + this.theWorld.spawnParticle("heart", this.theAnimal.posX + (float)(var2.nextFloat() * this.theAnimal.width * 2.0F) - (float)this.theAnimal.width, this.theAnimal.posY + 0.5D + (float)(var2.nextFloat() * this.theAnimal.height), this.theAnimal.posZ + (float)(var2.nextFloat() * this.theAnimal.width * 2.0F) - (float)this.theAnimal.width, var4, var6, var8); } } } diff --git a/src/minecraft/net/minecraft/src/EntityAIMoveIndoors.java b/src/minecraft/net/minecraft/src/EntityAIMoveIndoors.java index dce1aa9..448ecd0 100644 --- a/src/minecraft/net/minecraft/src/EntityAIMoveIndoors.java +++ b/src/minecraft/net/minecraft/src/EntityAIMoveIndoors.java @@ -26,7 +26,7 @@ public class EntityAIMoveIndoors extends EntityAIBase { return false; } - else if (this.insidePosX != null && this.entityObj.getDistanceSq((double)this.insidePosX.doubleValue(), this.entityObj.posY, (double)this.insidePosZ.doubleValue()) < 4.0D) + else if (this.insidePosX != null && this.entityObj.getDistanceSq((float)this.insidePosX.doubleValue(), this.entityObj.posY, (float)this.insidePosZ.doubleValue()) < 4.0D) { return false; } @@ -66,9 +66,9 @@ public class EntityAIMoveIndoors extends EntityAIBase { this.insidePosX = null; - if (this.entityObj.getDistanceSq((double)this.doorInfo.getInsidePosX().doubleValue(), (double)this.doorInfo.posY, (double)this.doorInfo.getInsidePosZ().doubleValue()) > 256.0D) + if (this.entityObj.getDistanceSq((float)this.doorInfo.getInsidePosX().doubleValue(), (float)this.doorInfo.posY, (float)this.doorInfo.getInsidePosZ().doubleValue()) > 256.0D) { - Vec3 var1 = RandomPositionGenerator.findRandomTargetBlockTowards(this.entityObj, 14, 3, Vec3.getVec3Pool().getVecFromPool((double)this.doorInfo.getInsidePosX().doubleValue() + 0.5D, (double)this.doorInfo.getInsidePosY(), (double)this.doorInfo.getInsidePosZ().doubleValue() + 0.5D)); + Vec3 var1 = RandomPositionGenerator.findRandomTargetBlockTowards(this.entityObj, 14, 3, Vec3.getVec3Pool().getVecFromPool((float)this.doorInfo.getInsidePosX().doubleValue() + 0.5D, (float)this.doorInfo.getInsidePosY(), (float)this.doorInfo.getInsidePosZ().doubleValue() + 0.5D)); if (var1 != null) { @@ -77,7 +77,7 @@ public class EntityAIMoveIndoors extends EntityAIBase } else { - this.entityObj.getNavigator().tryMoveToXYZ((double)this.doorInfo.getInsidePosX().doubleValue() + 0.5D, (double)this.doorInfo.getInsidePosY(), (double)this.doorInfo.getInsidePosZ().doubleValue() + 0.5D, 0.3F); + this.entityObj.getNavigator().tryMoveToXYZ((float)this.doorInfo.getInsidePosX().doubleValue() + 0.5D, (float)this.doorInfo.getInsidePosY(), (float)this.doorInfo.getInsidePosZ().doubleValue() + 0.5D, 0.3F); } } diff --git a/src/minecraft/net/minecraft/src/EntityAIMoveThroughVillage.java b/src/minecraft/net/minecraft/src/EntityAIMoveThroughVillage.java index efa5fca..1c6b861 100644 --- a/src/minecraft/net/minecraft/src/EntityAIMoveThroughVillage.java +++ b/src/minecraft/net/minecraft/src/EntityAIMoveThroughVillage.java @@ -53,7 +53,7 @@ public class EntityAIMoveThroughVillage extends EntityAIBase { boolean var2 = this.theEntity.getNavigator().getCanBreakDoors(); this.theEntity.getNavigator().setBreakDoors(false); - this.field_75419_c = this.theEntity.getNavigator().getPathToXYZ((double)this.doorInfo.posX.doubleValue(), (double)this.doorInfo.posY, (double)this.doorInfo.posZ.doubleValue()); + this.field_75419_c = this.theEntity.getNavigator().getPathToXYZ((float)this.doorInfo.posX.doubleValue(), (float)this.doorInfo.posY, (float)this.doorInfo.posZ.doubleValue()); this.theEntity.getNavigator().setBreakDoors(var2); if (this.field_75419_c != null) @@ -62,7 +62,7 @@ public class EntityAIMoveThroughVillage extends EntityAIBase } else { - Vec3 var3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 10, 7, Vec3.getVec3Pool().getVecFromPool((double)this.doorInfo.posX.doubleValue(), (double)this.doorInfo.posY, (double)this.doorInfo.posZ.doubleValue())); + Vec3 var3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 10, 7, Vec3.getVec3Pool().getVecFromPool((float)this.doorInfo.posX.doubleValue(), (float)this.doorInfo.posY, (float)this.doorInfo.posZ.doubleValue())); if (var3 == null) { @@ -93,7 +93,7 @@ public class EntityAIMoveThroughVillage extends EntityAIBase else { float var1 = this.theEntity.width + 4.0F; - return this.theEntity.getDistanceSq((double)this.doorInfo.posX.doubleValue(), (double)this.doorInfo.posY, (double)this.doorInfo.posZ.doubleValue()) > (double)(var1 * var1); + return this.theEntity.getDistanceSq((float)this.doorInfo.posX.doubleValue(), (float)this.doorInfo.posY, (float)this.doorInfo.posZ.doubleValue()) > (float)(var1 * var1); } } @@ -110,7 +110,7 @@ public class EntityAIMoveThroughVillage extends EntityAIBase */ public void resetTask() { - if (this.theEntity.getNavigator().noPath() || this.theEntity.getDistanceSq((double)this.doorInfo.posX.doubleValue(), (double)this.doorInfo.posY, (double)this.doorInfo.posZ.doubleValue()) < 16.0D) + if (this.theEntity.getNavigator().noPath() || this.theEntity.getDistanceSq((float)this.doorInfo.posX.doubleValue(), (float)this.doorInfo.posY, (float)this.doorInfo.posZ.doubleValue()) < 16.0D) { this.doorList.add(this.doorInfo); } diff --git a/src/minecraft/net/minecraft/src/EntityAIMoveTowardsTarget.java b/src/minecraft/net/minecraft/src/EntityAIMoveTowardsTarget.java index 1216361..212259d 100644 --- a/src/minecraft/net/minecraft/src/EntityAIMoveTowardsTarget.java +++ b/src/minecraft/net/minecraft/src/EntityAIMoveTowardsTarget.java @@ -29,7 +29,7 @@ public class EntityAIMoveTowardsTarget extends EntityAIBase { return false; } - else if (this.targetEntity.getDistanceSqToEntity(this.theEntity) > (double)(this.field_75426_g * this.field_75426_g)) + else if (this.targetEntity.getDistanceSqToEntity(this.theEntity) > (float)(this.field_75426_g * this.field_75426_g)) { return false; } @@ -56,7 +56,7 @@ public class EntityAIMoveTowardsTarget extends EntityAIBase */ public boolean continueExecuting() { - return !this.theEntity.getNavigator().noPath() && this.targetEntity.isEntityAlive() && this.targetEntity.getDistanceSqToEntity(this.theEntity) < (double)(this.field_75426_g * this.field_75426_g); + return !this.theEntity.getNavigator().noPath() && this.targetEntity.isEntityAlive() && this.targetEntity.getDistanceSqToEntity(this.theEntity) < (float)(this.field_75426_g * this.field_75426_g); } /** diff --git a/src/minecraft/net/minecraft/src/EntityAIMoveTwardsRestriction.java b/src/minecraft/net/minecraft/src/EntityAIMoveTwardsRestriction.java index a00339e..84451c2 100644 --- a/src/minecraft/net/minecraft/src/EntityAIMoveTwardsRestriction.java +++ b/src/minecraft/net/minecraft/src/EntityAIMoveTwardsRestriction.java @@ -27,7 +27,7 @@ public class EntityAIMoveTwardsRestriction extends EntityAIBase else { ChunkCoordinates var1 = this.theEntity.getHomePosition(); - Vec3 var2 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 16, 7, Vec3.getVec3Pool().getVecFromPool((double)var1.posX.doubleValue(), (double)var1.posY, (double)var1.posZ.doubleValue())); + Vec3 var2 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 16, 7, Vec3.getVec3Pool().getVecFromPool((float)var1.posX.doubleValue(), (float)var1.posY, (float)var1.posZ.doubleValue())); if (var2 == null) { diff --git a/src/minecraft/net/minecraft/src/EntityAINearestAttackableTarget.java b/src/minecraft/net/minecraft/src/EntityAINearestAttackableTarget.java index cb1dccd..0d2b654 100644 --- a/src/minecraft/net/minecraft/src/EntityAINearestAttackableTarget.java +++ b/src/minecraft/net/minecraft/src/EntityAINearestAttackableTarget.java @@ -39,7 +39,7 @@ public class EntityAINearestAttackableTarget extends EntityAITarget { if (this.targetClass == EntityPlayer.class) { - EntityPlayer var1 = this.taskOwner.worldObj.getClosestVulnerablePlayerToEntity(this.taskOwner, (double)this.targetDistance); + EntityPlayer var1 = this.taskOwner.worldObj.getClosestVulnerablePlayerToEntity(this.taskOwner, (float)this.targetDistance); if (this.isSuitableTarget(var1, false)) { @@ -49,7 +49,7 @@ public class EntityAINearestAttackableTarget extends EntityAITarget } else { - List var5 = this.taskOwner.worldObj.getEntitiesWithinAABB(this.targetClass, this.taskOwner.boundingBox.expand((double)this.targetDistance, 4.0D, (double)this.targetDistance)); + List var5 = this.taskOwner.worldObj.getEntitiesWithinAABB(this.targetClass, this.taskOwner.boundingBox.expand((float)this.targetDistance, 4.0D, (float)this.targetDistance)); Collections.sort(var5, this.field_75306_g); Iterator var2 = var5.iterator(); diff --git a/src/minecraft/net/minecraft/src/EntityAIOcelotAttack.java b/src/minecraft/net/minecraft/src/EntityAIOcelotAttack.java index b79b176..482b126 100644 --- a/src/minecraft/net/minecraft/src/EntityAIOcelotAttack.java +++ b/src/minecraft/net/minecraft/src/EntityAIOcelotAttack.java @@ -55,7 +55,7 @@ public class EntityAIOcelotAttack extends EntityAIBase public void updateTask() { this.theEntity.getLookHelper().setLookPositionWithEntity(this.theVictim, 30.0F, 30.0F); - double var1 = (double)(this.theEntity.width * 2.0F * this.theEntity.width * 2.0F); + double var1 = (float)(this.theEntity.width * 2.0F * this.theEntity.width * 2.0F); double var3 = this.theEntity.getDistanceSq(this.theVictim.posX, this.theVictim.boundingBox.minY, this.theVictim.posZ); float var5 = 0.23F; diff --git a/src/minecraft/net/minecraft/src/EntityAIOcelotSit.java b/src/minecraft/net/minecraft/src/EntityAIOcelotSit.java index cbb4d98..01382b2 100644 --- a/src/minecraft/net/minecraft/src/EntityAIOcelotSit.java +++ b/src/minecraft/net/minecraft/src/EntityAIOcelotSit.java @@ -51,7 +51,7 @@ public class EntityAIOcelotSit extends EntityAIBase */ public void startExecuting() { - this.theOcelot.getNavigator().tryMoveToXYZ((double)((float)this.sitableBlockX.floatValue()) + 0.5D, (double)(this.sitableBlockY + 1), (double)((float)this.sitableBlockZ.floatValue()) + 0.5D, this.field_75404_b); + this.theOcelot.getNavigator().tryMoveToXYZ((float)((float)this.sitableBlockX.floatValue()) + 0.5D, (float)(this.sitableBlockY + 1), (float)((float)this.sitableBlockZ.floatValue()) + 0.5D, this.field_75404_b); this.currentTick = 0; this.field_75402_d = 0; this.maxSittingTicks = this.theOcelot.getRNG().nextInt(this.theOcelot.getRNG().nextInt(1200) + 1200) + 1200; @@ -74,10 +74,10 @@ public class EntityAIOcelotSit extends EntityAIBase ++this.currentTick; this.theOcelot.func_70907_r().setSitting(false); - if (this.theOcelot.getDistanceSq((double)this.sitableBlockX.doubleValue(), (double)(this.sitableBlockY + 1), (double)this.sitableBlockZ.doubleValue()) > 1.0D) + if (this.theOcelot.getDistanceSq((float)this.sitableBlockX.doubleValue(), (float)(this.sitableBlockY + 1), (float)this.sitableBlockZ.doubleValue()) > 1.0D) { this.theOcelot.setSitting(false); - this.theOcelot.getNavigator().tryMoveToXYZ((double)((float)this.sitableBlockX.floatValue()) + 0.5D, (double)(this.sitableBlockY + 1), (double)((float)this.sitableBlockZ.floatValue()) + 0.5D, this.field_75404_b); + this.theOcelot.getNavigator().tryMoveToXYZ((float)((float)this.sitableBlockX.floatValue()) + 0.5D, (float)(this.sitableBlockY + 1), (float)((float)this.sitableBlockZ.floatValue()) + 0.5D, this.field_75404_b); ++this.field_75402_d; } else if (!this.theOcelot.isSitting()) @@ -101,9 +101,9 @@ public class EntityAIOcelotSit extends EntityAIBase BigInteger x = MathHelper.floor_double_BigInteger(this.theOcelot.posX), z = MathHelper.floor_double_BigInteger(this.theOcelot.posZ); - for (int var4 = - 8; (double)var4 < + 8.0D; ++var4) + for (int var4 = - 8; (float)var4 < + 8.0D; ++var4) { - for (int var5 = - 8; (double)var5 < + 8.0D; ++var5) + for (int var5 = - 8; (float)var5 < + 8.0D; ++var5) { if (this.isSittableBlock(this.theOcelot.worldObj, x.add(BigInteger.valueOf(var4)), var1, z.add(BigInteger.valueOf(var5))) && this.theOcelot.worldObj.isAirBlock(x.add(BigInteger.valueOf(var4)), var1, z.add(BigInteger.valueOf(var5)))) { diff --git a/src/minecraft/net/minecraft/src/EntityAIRestrictOpenDoor.java b/src/minecraft/net/minecraft/src/EntityAIRestrictOpenDoor.java index e1d9c29..e020bd1 100644 --- a/src/minecraft/net/minecraft/src/EntityAIRestrictOpenDoor.java +++ b/src/minecraft/net/minecraft/src/EntityAIRestrictOpenDoor.java @@ -30,7 +30,7 @@ public class EntityAIRestrictOpenDoor extends EntityAIBase else { this.frontDoor = var1.findNearestDoor(MathHelper.floor_double_BigInteger(this.entityObj.posX), MathHelper.floor_double(this.entityObj.posY), MathHelper.floor_double_BigInteger(this.entityObj.posZ)); - return this.frontDoor == null ? false : (double)this.frontDoor.getInsideDistanceSquare(MathHelper.floor_double_BigInteger(this.entityObj.posX), MathHelper.floor_double(this.entityObj.posY), MathHelper.floor_double_BigInteger(this.entityObj.posZ)).doubleValue() < 2.25D; + return this.frontDoor == null ? false : (float)this.frontDoor.getInsideDistanceSquare(MathHelper.floor_double_BigInteger(this.entityObj.posX), MathHelper.floor_double(this.entityObj.posY), MathHelper.floor_double_BigInteger(this.entityObj.posZ)).doubleValue() < 2.25D; } } } diff --git a/src/minecraft/net/minecraft/src/EntityAITarget.java b/src/minecraft/net/minecraft/src/EntityAITarget.java index e0710a3..dedcfee 100644 --- a/src/minecraft/net/minecraft/src/EntityAITarget.java +++ b/src/minecraft/net/minecraft/src/EntityAITarget.java @@ -48,7 +48,7 @@ public abstract class EntityAITarget extends EntityAIBase { return false; } - else if (this.taskOwner.getDistanceSqToEntity(var1) > (double)(this.targetDistance * this.targetDistance)) + else if (this.taskOwner.getDistanceSqToEntity(var1) > (float)(this.targetDistance * this.targetDistance)) { return false; } @@ -189,7 +189,7 @@ public abstract class EntityAITarget extends EntityAIBase { BigInteger var4 = var3.xCoord.subtract(MathHelper.floor_double_BigInteger(par1EntityLiving.posX)); BigInteger var5 = var3.zCoord.subtract(MathHelper.floor_double_BigInteger(par1EntityLiving.posZ)); - return (double)(var4.doubleValue() * var4.doubleValue() + var5.doubleValue() * var5.doubleValue()) <= 2.25D; + return (float)(var4.doubleValue() * var4.doubleValue() + var5.doubleValue() * var5.doubleValue()) <= 2.25D; } } } diff --git a/src/minecraft/net/minecraft/src/EntityAITempt.java b/src/minecraft/net/minecraft/src/EntityAITempt.java index 870e031..1527438 100644 --- a/src/minecraft/net/minecraft/src/EntityAITempt.java +++ b/src/minecraft/net/minecraft/src/EntityAITempt.java @@ -81,7 +81,7 @@ public class EntityAITempt extends EntityAIBase return false; } - if (Math.abs((double)this.temptingPlayer.rotationPitch - this.field_75278_f) > 5.0D || Math.abs((double)this.temptingPlayer.rotationYaw - this.field_75279_g) > 5.0D) + if (Math.abs((float)this.temptingPlayer.rotationPitch - this.field_75278_f) > 5.0D || Math.abs((float)this.temptingPlayer.rotationYaw - this.field_75279_g) > 5.0D) { return false; } @@ -93,8 +93,8 @@ public class EntityAITempt extends EntityAIBase this.field_75281_e = this.temptingPlayer.posZ; } - this.field_75278_f = (double)this.temptingPlayer.rotationPitch; - this.field_75279_g = (double)this.temptingPlayer.rotationYaw; + this.field_75278_f = (float)this.temptingPlayer.rotationPitch; + this.field_75279_g = (float)this.temptingPlayer.rotationYaw; } return this.shouldExecute(); diff --git a/src/minecraft/net/minecraft/src/EntityAIVillagerMate.java b/src/minecraft/net/minecraft/src/EntityAIVillagerMate.java index c1d0001..f97db4a 100644 --- a/src/minecraft/net/minecraft/src/EntityAIVillagerMate.java +++ b/src/minecraft/net/minecraft/src/EntityAIVillagerMate.java @@ -109,7 +109,7 @@ public class EntityAIVillagerMate extends EntityAIBase private boolean checkSufficientDoorsPresentForNewVillager() { - int var1 = (int)((double)((float)this.villageObj.getNumVillageDoors()) * 0.35D); + int var1 = (int)((float)((float)this.villageObj.getNumVillageDoors()) * 0.35D); return this.villageObj.getNumVillagers() < var1; } diff --git a/src/minecraft/net/minecraft/src/EntityAIWatchClosest.java b/src/minecraft/net/minecraft/src/EntityAIWatchClosest.java index 32a0fa0..65f7ae0 100644 --- a/src/minecraft/net/minecraft/src/EntityAIWatchClosest.java +++ b/src/minecraft/net/minecraft/src/EntityAIWatchClosest.java @@ -42,11 +42,11 @@ public class EntityAIWatchClosest extends EntityAIBase { if (this.watchedClass == EntityPlayer.class) { - this.closestEntity = this.theWatcher.worldObj.getClosestPlayerToEntity(this.theWatcher, (double)this.field_75333_c); + this.closestEntity = this.theWatcher.worldObj.getClosestPlayerToEntity(this.theWatcher, (float)this.field_75333_c); } else { - this.closestEntity = this.theWatcher.worldObj.findNearestEntityWithinAABB(this.watchedClass, this.theWatcher.boundingBox.expand((double)this.field_75333_c, 3.0D, (double)this.field_75333_c), this.theWatcher); + this.closestEntity = this.theWatcher.worldObj.findNearestEntityWithinAABB(this.watchedClass, this.theWatcher.boundingBox.expand((float)this.field_75333_c, 3.0D, (float)this.field_75333_c), this.theWatcher); } return this.closestEntity != null; @@ -58,7 +58,7 @@ public class EntityAIWatchClosest extends EntityAIBase */ public boolean continueExecuting() { - return !this.closestEntity.isEntityAlive() ? false : (this.theWatcher.getDistanceSqToEntity(this.closestEntity) > (double)(this.field_75333_c * this.field_75333_c) ? false : this.lookTime > 0); + return !this.closestEntity.isEntityAlive() ? false : (this.theWatcher.getDistanceSqToEntity(this.closestEntity) > (float)(this.field_75333_c * this.field_75333_c) ? false : this.lookTime > 0); } /** @@ -82,7 +82,7 @@ public class EntityAIWatchClosest extends EntityAIBase */ public void updateTask() { - this.theWatcher.getLookHelper().setLookPosition(this.closestEntity.posX, this.closestEntity.posY + (double)this.closestEntity.getEyeHeight(), this.closestEntity.posZ, 10.0F, (float)this.theWatcher.getVerticalFaceSpeed()); + this.theWatcher.getLookHelper().setLookPosition(this.closestEntity.posX, this.closestEntity.posY + (float)this.closestEntity.getEyeHeight(), this.closestEntity.posZ, 10.0F, (float)this.theWatcher.getVerticalFaceSpeed()); --this.lookTime; } } diff --git a/src/minecraft/net/minecraft/src/EntityAnimal.java b/src/minecraft/net/minecraft/src/EntityAnimal.java index 23a00ea..cf5bfcc 100644 --- a/src/minecraft/net/minecraft/src/EntityAnimal.java +++ b/src/minecraft/net/minecraft/src/EntityAnimal.java @@ -55,7 +55,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals double var2 = this.rand.nextGaussian() * 0.02D; double var4 = this.rand.nextGaussian() * 0.02D; double var6 = this.rand.nextGaussian() * 0.02D; - this.worldObj.spawnParticle(var1, this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var2, var4, var6); + this.worldObj.spawnParticle(var1, this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + 0.5D + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, var2, var4, var6); } } else @@ -75,7 +75,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals { double var3 = par1Entity.posX - this.posX; double var5 = par1Entity.posZ - this.posZ; - this.rotationYaw = (float)(Math.atan2(var5, var3) * 180.0D / Math.PI) - 90.0F; + this.rotationYaw = (float)(Math.atan2(var5, var3) * 180.0D / (float)Math.PI) - 90.0F; this.hasAttacked = true; } @@ -92,7 +92,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals if (this.getGrowingAge() > 0 && var8.getGrowingAge() < 0) { - if ((double)par2 < 2.5D) + if ((float)par2 < 2.5D) { this.hasAttacked = true; } @@ -104,7 +104,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals var8.entityToAttack = this; } - if (var8.entityToAttack == this && (double)par2 < 3.5D) + if (var8.entityToAttack == this && (float)par2 < 3.5D) { ++var8.inLove; ++this.inLove; @@ -112,7 +112,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals if (this.breeding % 4 == 0) { - this.worldObj.spawnParticle("heart", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, 0.0D, 0.0D, 0.0D); + this.worldObj.spawnParticle("heart", this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + 0.5D + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, 0.0D, 0.0D, 0.0D); } if (this.breeding == 60) @@ -159,7 +159,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals double var4 = this.rand.nextGaussian() * 0.02D; double var6 = this.rand.nextGaussian() * 0.02D; double var8 = this.rand.nextGaussian() * 0.02D; - this.worldObj.spawnParticle("heart", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var4, var6, var8); + this.worldObj.spawnParticle("heart", this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + 0.5D + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, var4, var6, var8); } this.worldObj.spawnEntityInWorld(var2); @@ -228,7 +228,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals if (this.inLove > 0) { - var2 = this.worldObj.getEntitiesWithinAABB(this.getClass(), this.boundingBox.expand((double)var1, (double)var1, (double)var1)); + var2 = this.worldObj.getEntitiesWithinAABB(this.getClass(), this.boundingBox.expand((float)var1, (float)var1, (float)var1)); var3 = var2.iterator(); while (var3.hasNext()) @@ -243,7 +243,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals } else if (this.getGrowingAge() == 0) { - var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.boundingBox.expand((double)var1, (double)var1, (double)var1)); + var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.boundingBox.expand((float)var1, (float)var1, (float)var1)); var3 = var2.iterator(); while (var3.hasNext()) @@ -258,7 +258,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals } else if (this.getGrowingAge() > 0) { - var2 = this.worldObj.getEntitiesWithinAABB(this.getClass(), this.boundingBox.expand((double)var1, (double)var1, (double)var1)); + var2 = this.worldObj.getEntitiesWithinAABB(this.getClass(), this.boundingBox.expand((float)var1, (float)var1, (float)var1)); var3 = var2.iterator(); while (var3.hasNext()) @@ -346,7 +346,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimals double var4 = this.rand.nextGaussian() * 0.02D; double var6 = this.rand.nextGaussian() * 0.02D; double var8 = this.rand.nextGaussian() * 0.02D; - this.worldObj.spawnParticle("heart", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var4, var6, var8); + this.worldObj.spawnParticle("heart", this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + 0.5D + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, var4, var6, var8); } return true; diff --git a/src/minecraft/net/minecraft/src/EntityArrow.java b/src/minecraft/net/minecraft/src/EntityArrow.java index e7808e3..adcd94d 100644 --- a/src/minecraft/net/minecraft/src/EntityArrow.java +++ b/src/minecraft/net/minecraft/src/EntityArrow.java @@ -52,22 +52,22 @@ public class EntityArrow extends Entity this.canBePickedUp = 1; } - this.posY = par2EntityLiving.posY + (double)par2EntityLiving.getEyeHeight() - 0.10000000149011612D; + this.posY = par2EntityLiving.posY + (float)par2EntityLiving.getEyeHeight() - 0.10000000149011612D; double var6 = par3EntityLiving.posX - par2EntityLiving.posX; - double var8 = par3EntityLiving.posY + (double)par3EntityLiving.getEyeHeight() - 0.699999988079071D - this.posY; + double var8 = par3EntityLiving.posY + (float)par3EntityLiving.getEyeHeight() - 0.699999988079071D - this.posY; double var10 = par3EntityLiving.posZ - par2EntityLiving.posZ; - double var12 = (double)MathHelper.sqrt_double(var6 * var6 + var10 * var10); + double var12 = (float)MathHelper.sqrt_double(var6 * var6 + var10 * var10); if (var12 >= 1.0E-7D) { - float var14 = (float)(Math.atan2(var10, var6) * 180.0D / Math.PI) - 90.0F; - float var15 = (float)(-(Math.atan2(var8, var12) * 180.0D / Math.PI)); + float var14 = (float)(Math.atan2(var10, var6) * 180.0D / (float)Math.PI) - 90.0F; + float var15 = (float)(-(Math.atan2(var8, var12) * 180.0D / (float)Math.PI)); double var16 = var6 / var12; double var18 = var10 / var12; this.setLocationAndAngles(par2EntityLiving.posX + var16, this.posY, par2EntityLiving.posZ + var18, var14, var15); this.yOffset = 0.0F; float var20 = (float)var12 * 0.2F; - this.setArrowHeading(var6, var8 + (double)var20, var10, par4, par5); + this.setArrowHeading(var6, var8 + (float)var20, var10, par4, par5); } } @@ -82,15 +82,15 @@ public class EntityArrow extends Entity } this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(par2EntityLiving.posX, par2EntityLiving.posY + (double)par2EntityLiving.getEyeHeight(), par2EntityLiving.posZ, par2EntityLiving.rotationYaw, par2EntityLiving.rotationPitch); - this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.setLocationAndAngles(par2EntityLiving.posX, par2EntityLiving.posY + (float)par2EntityLiving.getEyeHeight(), par2EntityLiving.posZ, par2EntityLiving.rotationYaw, par2EntityLiving.rotationPitch); + this.posX -= (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * 0.16F); this.posY -= 0.10000000149011612D; - this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.posZ -= (float)(MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * 0.16F); this.setPosition(this.posX, this.posY, this.posZ); this.yOffset = 0.0F; - this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI)); - this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI)); - this.motionY = (double)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI)); + this.motionX = (float)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI)); + this.motionZ = (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI)); + this.motionY = (float)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)(float)Math.PI)); this.setArrowHeading(this.motionX, this.motionY, this.motionZ, par3 * 1.5F, 1.0F); } @@ -106,21 +106,21 @@ public class EntityArrow extends Entity public void setArrowHeading(double par1, double par3, double par5, float par7, float par8) { float var9 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); - par1 /= (double)var9; - par3 /= (double)var9; - par5 /= (double)var9; - par1 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par3 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par5 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par1 *= (double)par7; - par3 *= (double)par7; - par5 *= (double)par7; + par1 /= (float)var9; + par3 /= (float)var9; + par5 /= (float)var9; + par1 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par3 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par5 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par1 *= (float)par7; + par3 *= (float)par7; + par5 *= (float)par7; this.motionX = par1; this.motionY = par3; this.motionZ = par5; float var10 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (double)var10) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (float)var10) * 180.0D / (float)Math.PI); this.ticksInGround = 0; } @@ -146,8 +146,8 @@ public class EntityArrow extends Entity if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float var7 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (double)var7) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (float)var7) * 180.0D / (float)Math.PI); this.prevRotationPitch = this.rotationPitch; this.prevRotationYaw = this.rotationYaw; this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); @@ -165,8 +165,8 @@ public class EntityArrow extends Entity if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float var1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var1) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (float)var1) * 180.0D / (float)Math.PI); } int var16 = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); @@ -204,9 +204,9 @@ public class EntityArrow extends Entity else { this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.motionX *= (float)(this.rand.nextFloat() * 0.2F); + this.motionY *= (float)(this.rand.nextFloat() * 0.2F); + this.motionZ *= (float)(this.rand.nextFloat() * 0.2F); this.ticksInGround = 0; this.ticksInAir = 0; } @@ -238,7 +238,7 @@ public class EntityArrow extends Entity if (var10.canBeCollidedWith() && (var10 != this.shootingEntity || this.ticksInAir >= 5)) { var11 = 0.3F; - AxisAlignedBB var12 = var10.boundingBox.expand((double)var11, (double)var11, (double)var11); + AxisAlignedBB var12 = var10.boundingBox.expand((float)var11, (float)var11, (float)var11); MovingObjectPosition var13 = var12.calculateIntercept(var17, var3); if (var13 != null) @@ -266,7 +266,7 @@ public class EntityArrow extends Entity if (var4.entityHit != null) { var20 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - int var22 = MathHelper.ceiling_double_int((double)var20 * this.damage); + int var22 = MathHelper.ceiling_double_int((float)var20 * this.damage); if (this.func_70241_g()) { @@ -301,7 +301,7 @@ public class EntityArrow extends Entity if (var25 > 0.0F) { - var4.entityHit.addVelocity(this.motionX * (double)this.knockbackStrength * 0.6000000238418579D / (double)var25, 0.1D, this.motionZ * (double)this.knockbackStrength * 0.6000000238418579D / (double)var25); + var4.entityHit.addVelocity(this.motionX * (float)this.knockbackStrength * 0.6000000238418579D / (float)var25, 0.1D, this.motionZ * (float)this.knockbackStrength * 0.6000000238418579D / (float)var25); } } } @@ -326,13 +326,13 @@ public class EntityArrow extends Entity this.zTile = var4.blockZ; this.inTile = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.motionX = (double)((float)(var4.hitVec.xCoord - this.posX)); - this.motionY = (double)((float)(var4.hitVec.yCoord - this.posY)); - this.motionZ = (double)((float)(var4.hitVec.zCoord - this.posZ)); + this.motionX = (float)((float)(var4.hitVec.xCoord - this.posX)); + this.motionY = (float)((float)(var4.hitVec.yCoord - this.posY)); + this.motionZ = (float)((float)(var4.hitVec.zCoord - this.posZ)); var20 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.posX -= this.motionX / (double)var20 * 0.05000000074505806D; - this.posY -= this.motionY / (double)var20 * 0.05000000074505806D; - this.posZ -= this.motionZ / (double)var20 * 0.05000000074505806D; + this.posX -= this.motionX / (float)var20 * 0.05000000074505806D; + this.posY -= this.motionY / (float)var20 * 0.05000000074505806D; + this.posZ -= this.motionZ / (float)var20 * 0.05000000074505806D; this.worldObj.playSoundAtEntity(this, "random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); this.inGround = true; this.arrowShake = 7; @@ -344,7 +344,7 @@ public class EntityArrow extends Entity { for (int var21 = 0; var21 < 4; ++var21) { - this.worldObj.spawnParticle("crit", this.posX + this.motionX * (double)var21 / 4.0D, this.posY + this.motionY * (double)var21 / 4.0D, this.posZ + this.motionZ * (double)var21 / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); + this.worldObj.spawnParticle("crit", this.posX + this.motionX * (float)var21 / 4.0D, this.posY + this.motionY * (float)var21 / 4.0D, this.posZ + this.motionZ * (float)var21 / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); } } @@ -352,9 +352,9 @@ public class EntityArrow extends Entity this.posY += this.motionY; this.posZ += this.motionZ; var20 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (float)Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var20) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, (float)var20) * 180.0D / (float)Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -384,16 +384,16 @@ public class EntityArrow extends Entity for (int var26 = 0; var26 < 4; ++var26) { float var27 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var27, this.posY - this.motionY * (double)var27, this.posZ - this.motionZ * (double)var27, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (float)var27, this.posY - this.motionY * (float)var27, this.posZ - this.motionZ * (float)var27, this.motionX, this.motionY, this.motionZ); } var24 = 0.8F; } - this.motionX *= (double)var24; - this.motionY *= (double)var24; - this.motionZ *= (double)var24; - this.motionY -= (double)var11; + this.motionX *= (float)var24; + this.motionY *= (float)var24; + this.motionZ *= (float)var24; + this.motionY -= (float)var11; this.setPosition(this.posX, this.posY, this.posZ); this.doBlockCollisions(); } diff --git a/src/minecraft/net/minecraft/src/EntityBlaze.java b/src/minecraft/net/minecraft/src/EntityBlaze.java index c9908b2..93796c9 100644 --- a/src/minecraft/net/minecraft/src/EntityBlaze.java +++ b/src/minecraft/net/minecraft/src/EntityBlaze.java @@ -87,7 +87,7 @@ public class EntityBlaze extends EntityMob this.heightOffset = 0.5F + (float)this.rand.nextGaussian() * 3.0F; } - if (this.getEntityToAttack() != null && this.getEntityToAttack().posY + (double)this.getEntityToAttack().getEyeHeight() > this.posY + (double)this.getEyeHeight() + (double)this.heightOffset) + if (this.getEntityToAttack() != null && this.getEntityToAttack().posY + (float)this.getEntityToAttack().getEyeHeight() > this.posY + (float)this.getEyeHeight() + (float)this.heightOffset) { this.motionY += (0.30000001192092896D - this.motionY) * 0.30000001192092896D; } @@ -105,7 +105,7 @@ public class EntityBlaze extends EntityMob for (int var1 = 0; var1 < 2; ++var1) { - this.worldObj.spawnParticle("largesmoke", this.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, this.posY + this.rand.nextDouble() * (double)this.height, this.posZ + (this.rand.nextDouble() - 0.5D) * (double)this.width, 0.0D, 0.0D, 0.0D); + this.worldObj.spawnParticle("largesmoke", this.posX + (this.rand.nextDouble() - 0.5D) * (float)this.width, this.posY + this.rand.nextDouble() * (float)this.height, this.posZ + (this.rand.nextDouble() - 0.5D) * (float)this.width, 0.0D, 0.0D, 0.0D); } super.onLivingUpdate(); @@ -124,7 +124,7 @@ public class EntityBlaze extends EntityMob else if (par2 < 30.0F) { double var3 = par1Entity.posX - this.posX; - double var5 = par1Entity.boundingBox.minY + (double)(par1Entity.height / 2.0F) - (this.posY + (double)(this.height / 2.0F)); + double var5 = par1Entity.boundingBox.minY + (float)(par1Entity.height / 2.0F) - (this.posY + (float)(this.height / 2.0F)); double var7 = par1Entity.posZ - this.posZ; if (this.attackTime == 0) @@ -154,14 +154,14 @@ public class EntityBlaze extends EntityMob for (int var10 = 0; var10 < 1; ++var10) { - EntitySmallFireball var11 = new EntitySmallFireball(this.worldObj, this, var3 + this.rand.nextGaussian() * (double)var9, var5, var7 + this.rand.nextGaussian() * (double)var9); - var11.posY = this.posY + (double)(this.height / 2.0F) + 0.5D; + EntitySmallFireball var11 = new EntitySmallFireball(this.worldObj, this, var3 + this.rand.nextGaussian() * (float)var9, var5, var7 + this.rand.nextGaussian() * (float)var9); + var11.posY = this.posY + (float)(this.height / 2.0F) + 0.5D; this.worldObj.spawnEntityInWorld(var11); } } } - this.rotationYaw = (float)(Math.atan2(var7, var3) * 180.0D / Math.PI) - 90.0F; + this.rotationYaw = (float)(Math.atan2(var7, var3) * 180.0D / (float)Math.PI) - 90.0F; this.hasAttacked = true; } } diff --git a/src/minecraft/net/minecraft/src/EntityBoat.java b/src/minecraft/net/minecraft/src/EntityBoat.java index 6048f5e..79b44af 100644 --- a/src/minecraft/net/minecraft/src/EntityBoat.java +++ b/src/minecraft/net/minecraft/src/EntityBoat.java @@ -72,7 +72,7 @@ public class EntityBoat extends Entity public EntityBoat(World par1World, double par2, double par4, double par6) { this(par1World); - this.setPosition(par2, par4 + (double)this.yOffset, par6); + this.setPosition(par2, par4 + (float)this.yOffset, par6); this.motionX = 0.0D; this.motionY = 0.0D; this.motionZ = 0.0D; @@ -86,7 +86,7 @@ public class EntityBoat extends Entity */ public double getMountedYOffset() { - return (double)this.height * 0.0D - 0.30000001192092896D; + return (float)this.height * 0.0D - 0.30000001192092896D; } /** @@ -171,8 +171,8 @@ public class EntityBoat extends Entity this.boatX = par1; this.boatY = par3; this.boatZ = par5; - this.boatYaw = (double)par7; - this.boatPitch = (double)par8; + this.boatYaw = (float)par7; + this.boatPitch = (float)par8; this.motionX = this.velocityX; this.motionY = this.velocityY; this.motionZ = this.velocityZ; @@ -213,13 +213,13 @@ public class EntityBoat extends Entity for (int var4 = 0; var4 < var1; ++var4) { - double var5 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double)(var4 + 0) / (double)var1 - 0.125D; - double var7 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double)(var4 + 1) / (double)var1 - 0.125D; + double var5 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (float)(var4 + 0) / (float)var1 - 0.125D; + double var7 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (float)(var4 + 1) / (float)var1 - 0.125D; AxisAlignedBB var9 = AxisAlignedBB.getAABBPool().addOrModifyAABBInPool(this.boundingBox.minX, var5, this.boundingBox.minZ, this.boundingBox.maxX, var7, this.boundingBox.maxZ); if (this.worldObj.isAABBInMaterial(var9, Material.water)) { - var2 += 1.0D / (double)var1; + var2 += 1.0D / (float)var1; } } @@ -229,13 +229,13 @@ public class EntityBoat extends Entity if (var24 > 0.26249999999999996D) { - var6 = Math.cos((double)this.rotationYaw * Math.PI / 180.0D); - var8 = Math.sin((double)this.rotationYaw * Math.PI / 180.0D); + var6 = (float)Math.cos((float)this.rotationYaw * (float)Math.PI / 180.0D); + var8 = (float)Math.sin((float)this.rotationYaw * (float)Math.PI / 180.0D); - for (int var10 = 0; (double)var10 < 1.0D + var24 * 60.0D; ++var10) + for (int var10 = 0; (float)var10 < 1.0D + var24 * 60.0D; ++var10) { - double var11 = (double)(this.rand.nextFloat() * 2.0F - 1.0F); - double var13 = (double)(this.rand.nextInt(2) * 2 - 1) * 0.7D; + double var11 = (float)(this.rand.nextFloat() * 2.0F - 1.0F); + double var13 = (float)(this.rand.nextInt(2) * 2 - 1) * 0.7D; double var15; double var17; @@ -261,12 +261,12 @@ public class EntityBoat extends Entity { if (this.boatPosRotationIncrements > 0) { - var6 = this.posX + (this.boatX - this.posX) / (double)this.boatPosRotationIncrements; - var8 = this.posY + (this.boatY - this.posY) / (double)this.boatPosRotationIncrements; - var26 = this.posZ + (this.boatZ - this.posZ) / (double)this.boatPosRotationIncrements; - var12 = MathHelper.wrapAngleTo180_double(this.boatYaw - (double)this.rotationYaw); - this.rotationYaw = (float)((double)this.rotationYaw + var12 / (double)this.boatPosRotationIncrements); - this.rotationPitch = (float)((double)this.rotationPitch + (this.boatPitch - (double)this.rotationPitch) / (double)this.boatPosRotationIncrements); + var6 = this.posX + (this.boatX - this.posX) / (float)this.boatPosRotationIncrements; + var8 = this.posY + (this.boatY - this.posY) / (float)this.boatPosRotationIncrements; + var26 = this.posZ + (this.boatZ - this.posZ) / (float)this.boatPosRotationIncrements; + var12 = MathHelper.wrapAngleTo180_double(this.boatYaw - (float)this.rotationYaw); + this.rotationYaw = (float)((float)this.rotationYaw + var12 / (float)this.boatPosRotationIncrements); + this.rotationPitch = (float)((float)this.rotationPitch + (this.boatPitch - (float)this.rotationPitch) / (float)this.boatPosRotationIncrements); --this.boatPosRotationIncrements; this.setPosition(var6, var8, var26); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -377,16 +377,16 @@ public class EntityBoat extends Entity } this.rotationPitch = 0.0F; - var8 = (double)this.rotationYaw; + var8 = (float)this.rotationYaw; var26 = this.prevPosX - this.posX; var12 = this.prevPosZ - this.posZ; if (var26 * var26 + var12 * var12 > 0.001D) { - var8 = (double)((float)(Math.atan2(var12, var26) * 180.0D / Math.PI)); + var8 = (float)((float)(Math.atan2(var12, var26) * 180.0D / (float)Math.PI)); } - double var14 = MathHelper.wrapAngleTo180_double(var8 - (double)this.rotationYaw); + double var14 = MathHelper.wrapAngleTo180_double(var8 - (float)this.rotationYaw); if (var14 > 20.0D) { @@ -398,7 +398,7 @@ public class EntityBoat extends Entity var14 = -20.0D; } - this.rotationYaw = (float)((double)this.rotationYaw + var14); + this.rotationYaw = (float)((float)this.rotationYaw + var14); this.setRotation(this.rotationYaw, this.rotationPitch); if (!this.worldObj.isRemote) @@ -422,8 +422,8 @@ public class EntityBoat extends Entity for (int var28 = 0; var28 < 4; ++var28) { - BigInteger var29 = MathHelper.floor_double_BigInteger(this.posX + ((double)(var28 % 2) - 0.5D) * 0.8D); - BigInteger var19 = MathHelper.floor_double_BigInteger(this.posZ + ((double)(var28 / 2) - 0.5D) * 0.8D); + BigInteger var29 = MathHelper.floor_double_BigInteger(this.posX + ((float)(var28 % 2) - 0.5D) * 0.8D); + BigInteger var19 = MathHelper.floor_double_BigInteger(this.posZ + ((float)(var28 / 2) - 0.5D) * 0.8D); for (int var20 = 0; var20 < 2; ++var20) { @@ -455,8 +455,8 @@ public class EntityBoat extends Entity { if (this.riddenByEntity != null) { - double var1 = Math.cos((double)this.rotationYaw * Math.PI / 180.0D) * 0.4D; - double var3 = Math.sin((double)this.rotationYaw * Math.PI / 180.0D) * 0.4D; + double var1 = (float)Math.cos((float)this.rotationYaw * (float)Math.PI / 180.0D) * 0.4D; + double var3 = (float)Math.sin((float)this.rotationYaw * (float)Math.PI / 180.0D) * 0.4D; this.riddenByEntity.setPosition(this.posX + var1, this.posY + this.getMountedYOffset() + this.riddenByEntity.getYOffset(), this.posZ + var3); } } diff --git a/src/minecraft/net/minecraft/src/EntityBreakingFX.java b/src/minecraft/net/minecraft/src/EntityBreakingFX.java index e157d59..d0bafbf 100644 --- a/src/minecraft/net/minecraft/src/EntityBreakingFX.java +++ b/src/minecraft/net/minecraft/src/EntityBreakingFX.java @@ -34,14 +34,14 @@ public class EntityBreakingFX extends EntityFX float var10 = ((float)(this.getParticleTextureIndex() / 16) + this.particleTextureJitterY / 4.0F) / 16.0F; float var11 = var10 + 0.015609375F; float var12 = 0.1F * this.particleScale; - float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (float)par2 - interpPosX); + float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (float)par2 - interpPosY); + float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (float)par2 - interpPosZ); float var16 = 1.0F; par1Tessellator.setColorOpaque_F(var16 * this.particleRed, var16 * this.particleGreen, var16 * this.particleBlue); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var8, (double)var11); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var8, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var9, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var9, (double)var11); + par1Tessellator.addVertexWithUV((float)(var13 - par3 * var12 - par6 * var12), (float)(var14 - par4 * var12), (float)(var15 - par5 * var12 - par7 * var12), (float)var8, (float)var11); + par1Tessellator.addVertexWithUV((float)(var13 - par3 * var12 + par6 * var12), (float)(var14 + par4 * var12), (float)(var15 - par5 * var12 + par7 * var12), (float)var8, (float)var10); + par1Tessellator.addVertexWithUV((float)(var13 + par3 * var12 + par6 * var12), (float)(var14 + par4 * var12), (float)(var15 + par5 * var12 + par7 * var12), (float)var9, (float)var10); + par1Tessellator.addVertexWithUV((float)(var13 + par3 * var12 - par6 * var12), (float)(var14 - par4 * var12), (float)(var15 + par5 * var12 - par7 * var12), (float)var9, (float)var11); } } diff --git a/src/minecraft/net/minecraft/src/EntityBubbleFX.java b/src/minecraft/net/minecraft/src/EntityBubbleFX.java index d8fa30c..2ea7835 100644 --- a/src/minecraft/net/minecraft/src/EntityBubbleFX.java +++ b/src/minecraft/net/minecraft/src/EntityBubbleFX.java @@ -11,9 +11,9 @@ public class EntityBubbleFX extends EntityFX this.setParticleTextureIndex(32); this.setSize(0.02F, 0.02F); this.particleScale *= this.rand.nextFloat() * 0.6F + 0.2F; - this.motionX = par8 * 0.20000000298023224D + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.02F); - this.motionY = par10 * 0.20000000298023224D + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.02F); - this.motionZ = par12 * 0.20000000298023224D + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.02F); + this.motionX = par8 * 0.20000000298023224D + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.02F); + this.motionY = par10 * 0.20000000298023224D + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.02F); + this.motionZ = par12 * 0.20000000298023224D + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.02F); this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D)); } diff --git a/src/minecraft/net/minecraft/src/EntityChicken.java b/src/minecraft/net/minecraft/src/EntityChicken.java index 9cffc43..edf7c2d 100644 --- a/src/minecraft/net/minecraft/src/EntityChicken.java +++ b/src/minecraft/net/minecraft/src/EntityChicken.java @@ -51,7 +51,7 @@ public class EntityChicken extends EntityAnimal super.onLivingUpdate(); this.field_70888_h = this.field_70886_e; this.field_70884_g = this.destPos; - this.destPos = (float)((double)this.destPos + (double)(this.onGround ? -1 : 4) * 0.3D); + this.destPos = (float)((float)this.destPos + (float)(this.onGround ? -1 : 4) * 0.3D); if (this.destPos < 0.0F) { @@ -68,7 +68,7 @@ public class EntityChicken extends EntityAnimal this.field_70889_i = 1.0F; } - this.field_70889_i = (float)((double)this.field_70889_i * 0.9D); + this.field_70889_i = (float)((float)this.field_70889_i * 0.9D); if (!this.onGround && this.motionY < 0.0D) { diff --git a/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java b/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java index 3bd2450..acfc672 100644 --- a/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java +++ b/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java @@ -102,8 +102,8 @@ public class EntityClientPlayerMP extends EntityPlayerSP double var3 = this.posXBig.subtract(this.oldPosX).doubleValue(); double var5 = this.boundingBox.minY - this.oldMinY; double var7 = this.posZBig.subtract(this.oldPosZ).doubleValue(); - double var9 = (double)(this.rotationYaw - this.oldRotationYaw); - double var11 = (double)(this.rotationPitch - this.oldRotationPitch); + double var9 = (float)(this.rotationYaw - this.oldRotationYaw); + double var11 = (float)(this.rotationPitch - this.oldRotationPitch); boolean var13 = var3 * var3 + var5 * var5 + var7 * var7 > 9.0E-4D || this.field_71168_co >= 20; boolean var14 = var9 != 0.0D || var11 != 0.0D; diff --git a/src/minecraft/net/minecraft/src/EntityCreature.java b/src/minecraft/net/minecraft/src/EntityCreature.java index 3841a10..8fcb5d5 100644 --- a/src/minecraft/net/minecraft/src/EntityCreature.java +++ b/src/minecraft/net/minecraft/src/EntityCreature.java @@ -85,7 +85,7 @@ public abstract class EntityCreature extends EntityLiving { this.worldObj.theProfiler.startSection("followpath"); Vec3 var5 = this.pathToEntity.getPosition(this); - double var6 = (double)(this.width * 2.0F); + double var6 = (float)(this.width * 2.0F); while (var5 != null && var5.squareDistanceTo(this.posX, var5.yCoord, this.posZ) < var6 * var6) { @@ -108,8 +108,8 @@ public abstract class EntityCreature extends EntityLiving { double var8 = var5.xCoord - this.posX; double var10 = var5.zCoord - this.posZ; - double var12 = var5.yCoord - (double)var21; - float var14 = (float)(Math.atan2(var10, var8) * 180.0D / Math.PI) - 90.0F; + double var12 = var5.yCoord - (float)var21; + float var14 = (float)(Math.atan2(var10, var8) * 180.0D / (float)Math.PI) - 90.0F; float var15 = MathHelper.wrapAngleTo180_float(var14 - this.rotationYaw); this.moveForward = this.moveSpeed; @@ -130,8 +130,8 @@ public abstract class EntityCreature extends EntityLiving double var16 = this.entityToAttack.posX - this.posX; double var18 = this.entityToAttack.posZ - this.posZ; float var20 = this.rotationYaw; - this.rotationYaw = (float)(Math.atan2(var18, var16) * 180.0D / Math.PI) - 90.0F; - var15 = (var20 - this.rotationYaw + 90.0F) * (float)Math.PI / 180.0F; + this.rotationYaw = (float)(Math.atan2(var18, var16) * 180.0D / (float)Math.PI) - 90.0F; + var15 = (var20 - this.rotationYaw + 90.0F) * (float)(float)Math.PI / 180.0F; this.moveStrafing = -MathHelper.sin(var15) * this.moveForward * 1.0F; this.moveForward = MathHelper.cos(var15) * this.moveForward * 1.0F; } @@ -180,9 +180,9 @@ public abstract class EntityCreature extends EntityLiving for (int var6 = 0; var6 < 10; ++var6) { - BigInteger var7 = MathHelper.floor_double_BigInteger(this.posX + (double)this.rand.nextInt(13) - 6.0D); - int var8 = MathHelper.floor_double(this.posY + (double)this.rand.nextInt(7) - 3.0D); - BigInteger var9 = MathHelper.floor_double_BigInteger(this.posZ + (double)this.rand.nextInt(13) - 6.0D); + BigInteger var7 = MathHelper.floor_double_BigInteger(this.posX + (float)this.rand.nextInt(13) - 6.0D); + int var8 = MathHelper.floor_double(this.posY + (float)this.rand.nextInt(7) - 3.0D); + BigInteger var9 = MathHelper.floor_double_BigInteger(this.posZ + (float)this.rand.nextInt(13) - 6.0D); float var10 = this.getBlockPathWeight(var7, var8, var9); if (var10 > var5) diff --git a/src/minecraft/net/minecraft/src/EntityCrit2FX.java b/src/minecraft/net/minecraft/src/EntityCrit2FX.java index 3076348..d8e7194 100644 --- a/src/minecraft/net/minecraft/src/EntityCrit2FX.java +++ b/src/minecraft/net/minecraft/src/EntityCrit2FX.java @@ -14,7 +14,7 @@ public class EntityCrit2FX extends EntityFX public EntityCrit2FX(World par1World, Entity par2Entity, String par3Str) { - super(par1World, par2Entity.posX, par2Entity.boundingBox.minY + (double)(par2Entity.height / 2.0F), par2Entity.posZ, par2Entity.motionX, par2Entity.motionY, par2Entity.motionZ); + super(par1World, par2Entity.posX, par2Entity.boundingBox.minY + (float)(par2Entity.height / 2.0F), par2Entity.posZ, par2Entity.motionX, par2Entity.motionY, par2Entity.motionZ); this.currentLife = 0; this.maximumLife = 0; this.field_70557_a = par2Entity; @@ -32,15 +32,15 @@ public class EntityCrit2FX extends EntityFX { for (int var1 = 0; var1 < 16; ++var1) { - double var2 = (double)(this.rand.nextFloat() * 2.0F - 1.0F); - double var4 = (double)(this.rand.nextFloat() * 2.0F - 1.0F); - double var6 = (double)(this.rand.nextFloat() * 2.0F - 1.0F); + double var2 = (float)(this.rand.nextFloat() * 2.0F - 1.0F); + double var4 = (float)(this.rand.nextFloat() * 2.0F - 1.0F); + double var6 = (float)(this.rand.nextFloat() * 2.0F - 1.0F); if (var2 * var2 + var4 * var4 + var6 * var6 <= 1.0D) { - double var8 = this.field_70557_a.posX + var2 * (double)this.field_70557_a.width / 4.0D; - double var10 = this.field_70557_a.boundingBox.minY + (double)(this.field_70557_a.height / 2.0F) + var4 * (double)this.field_70557_a.height / 4.0D; - double var12 = this.field_70557_a.posZ + var6 * (double)this.field_70557_a.width / 4.0D; + double var8 = this.field_70557_a.posX + var2 * (float)this.field_70557_a.width / 4.0D; + double var10 = this.field_70557_a.boundingBox.minY + (float)(this.field_70557_a.height / 2.0F) + var4 * (float)this.field_70557_a.height / 4.0D; + double var12 = this.field_70557_a.posZ + var6 * (float)this.field_70557_a.width / 4.0D; this.worldObj.spawnParticle(this.particleName, var8, var10, var12, var2, var4 + 0.2D, var6); } } diff --git a/src/minecraft/net/minecraft/src/EntityCritFX.java b/src/minecraft/net/minecraft/src/EntityCritFX.java index 2f69c3a..809fb1b 100644 --- a/src/minecraft/net/minecraft/src/EntityCritFX.java +++ b/src/minecraft/net/minecraft/src/EntityCritFX.java @@ -62,8 +62,8 @@ public class EntityCritFX extends EntityFX } this.moveEntity(this.motionX, this.motionY, this.motionZ); - this.particleGreen = (float)((double)this.particleGreen * 0.96D); - this.particleBlue = (float)((double)this.particleBlue * 0.9D); + this.particleGreen = (float)((float)this.particleGreen * 0.96D); + this.particleBlue = (float)((float)this.particleBlue * 0.9D); this.motionX *= 0.699999988079071D; this.motionY *= 0.699999988079071D; this.motionZ *= 0.699999988079071D; diff --git a/src/minecraft/net/minecraft/src/EntityDiggingFX.java b/src/minecraft/net/minecraft/src/EntityDiggingFX.java index 5473f8d..05d173f 100644 --- a/src/minecraft/net/minecraft/src/EntityDiggingFX.java +++ b/src/minecraft/net/minecraft/src/EntityDiggingFX.java @@ -44,14 +44,14 @@ public class EntityDiggingFX extends EntityFX float var10 = ((float)(this.getParticleTextureIndex() / 16) + this.particleTextureJitterY / 4.0F) / 16.0F; float var11 = var10 + 0.015609375F; float var12 = 0.1F * this.particleScale; - float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (float)par2 - interpPosX); + float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (float)par2 - interpPosY); + float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (float)par2 - interpPosZ); float var16 = 1.0F; par1Tessellator.setColorOpaque_F(var16 * this.particleRed, var16 * this.particleGreen, var16 * this.particleBlue); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var8, (double)var11); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var8, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var9, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var9, (double)var11); + par1Tessellator.addVertexWithUV((float)(var13 - par3 * var12 - par6 * var12), (float)(var14 - par4 * var12), (float)(var15 - par5 * var12 - par7 * var12), (float)var8, (float)var11); + par1Tessellator.addVertexWithUV((float)(var13 - par3 * var12 + par6 * var12), (float)(var14 + par4 * var12), (float)(var15 - par5 * var12 + par7 * var12), (float)var8, (float)var10); + par1Tessellator.addVertexWithUV((float)(var13 + par3 * var12 + par6 * var12), (float)(var14 + par4 * var12), (float)(var15 + par5 * var12 + par7 * var12), (float)var9, (float)var10); + par1Tessellator.addVertexWithUV((float)(var13 + par3 * var12 - par6 * var12), (float)(var14 - par4 * var12), (float)(var15 + par5 * var12 - par7 * var12), (float)var9, (float)var11); } } diff --git a/src/minecraft/net/minecraft/src/EntityDragon.java b/src/minecraft/net/minecraft/src/EntityDragon.java index 81a4b38..bf26dff 100644 --- a/src/minecraft/net/minecraft/src/EntityDragon.java +++ b/src/minecraft/net/minecraft/src/EntityDragon.java @@ -92,11 +92,11 @@ public class EntityDragon extends EntityDragonBase double[] var5 = new double[3]; double var6 = this.ringBuffer[var3][0]; double var8 = MathHelper.wrapAngleTo180_double(this.ringBuffer[var4][0] - var6); - var5[0] = var6 + var8 * (double)par2; + var5[0] = var6 + var8 * (float)par2; var6 = this.ringBuffer[var3][1]; var8 = this.ringBuffer[var4][1] - var6; - var5[1] = var6 + var8 * (double)par2; - var5[2] = this.ringBuffer[var3][2] + (this.ringBuffer[var4][2] - this.ringBuffer[var3][2]) * (double)par2; + var5[1] = var6 + var8 * (float)par2; + var5[2] = this.ringBuffer[var3][2] + (this.ringBuffer[var4][2] - this.ringBuffer[var3][2]) * (float)par2; return var5; } @@ -122,7 +122,7 @@ public class EntityDragon extends EntityDragonBase var1 = (this.rand.nextFloat() - 0.5F) * 8.0F; var26 = (this.rand.nextFloat() - 0.5F) * 4.0F; var3 = (this.rand.nextFloat() - 0.5F) * 8.0F; - this.worldObj.spawnParticle("largeexplode", this.posX + (double)var1, this.posY + 2.0D + (double)var26, this.posZ + (double)var3, 0.0D, 0.0D, 0.0D); + this.worldObj.spawnParticle("largeexplode", this.posX + (float)var1, this.posY + 2.0D + (float)var26, this.posZ + (float)var3, 0.0D, 0.0D, 0.0D); } else { @@ -145,7 +145,7 @@ public class EntityDragon extends EntityDragonBase { for (int var2 = 0; var2 < this.ringBuffer.length; ++var2) { - this.ringBuffer[var2][0] = (double)this.rotationYaw; + this.ringBuffer[var2][0] = (float)this.rotationYaw; this.ringBuffer[var2][1] = this.posY; } } @@ -155,7 +155,7 @@ public class EntityDragon extends EntityDragonBase this.ringBufferIndex = 0; } - this.ringBuffer[this.ringBufferIndex][0] = (double)this.rotationYaw; + this.ringBuffer[this.ringBufferIndex][0] = (float)this.rotationYaw; this.ringBuffer[this.ringBufferIndex][1] = this.posY; double var4; double var6; @@ -167,12 +167,12 @@ public class EntityDragon extends EntityDragonBase { if (this.newPosRotationIncrements > 0) { - var25 = this.posX + (this.newPosX - this.posX) / (double)this.newPosRotationIncrements; - var4 = this.posY + (this.newPosY - this.posY) / (double)this.newPosRotationIncrements; - var6 = this.posZ + (this.newPosZ - this.posZ) / (double)this.newPosRotationIncrements; - var8 = MathHelper.wrapAngleTo180_double(this.newRotationYaw - (double)this.rotationYaw); - this.rotationYaw = (float)((double)this.rotationYaw + var8 / (double)this.newPosRotationIncrements); - this.rotationPitch = (float)((double)this.rotationPitch + (this.newRotationPitch - (double)this.rotationPitch) / (double)this.newPosRotationIncrements); + var25 = this.posX + (this.newPosX - this.posX) / (float)this.newPosRotationIncrements; + var4 = this.posY + (this.newPosY - this.posY) / (float)this.newPosRotationIncrements; + var6 = this.posZ + (this.newPosZ - this.posZ) / (float)this.newPosRotationIncrements; + var8 = MathHelper.wrapAngleTo180_double(this.newRotationYaw - (float)this.rotationYaw); + this.rotationYaw = (float)((float)this.rotationYaw + var8 / (float)this.newPosRotationIncrements); + this.rotationPitch = (float)((float)this.rotationPitch + (this.newRotationPitch - (float)this.rotationPitch) / (float)this.newPosRotationIncrements); --this.newPosRotationIncrements; this.setPosition(var25, var4, var6); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -212,23 +212,23 @@ public class EntityDragon extends EntityDragonBase this.setNewTarget(); } - var4 /= (double)MathHelper.sqrt_double(var25 * var25 + var6 * var6); + var4 /= (float)MathHelper.sqrt_double(var25 * var25 + var6 * var6); var31 = 0.6F; - if (var4 < (double)(-var31)) + if (var4 < (float)(-var31)) { - var4 = (double)(-var31); + var4 = (float)(-var31); } - if (var4 > (double)var31) + if (var4 > (float)var31) { - var4 = (double)var31; + var4 = (float)var31; } this.motionY += var4 * 0.10000000149011612D; this.rotationYaw = MathHelper.wrapAngleTo180_float(this.rotationYaw); - double var11 = 180.0D - Math.atan2(var25, var6) * 180.0D / Math.PI; - double var13 = MathHelper.wrapAngleTo180_double(var11 - (double)this.rotationYaw); + double var11 = 180.0D - Math.atan2(var25, var6) * 180.0D / (float)Math.PI; + double var13 = MathHelper.wrapAngleTo180_double(var11 - (float)this.rotationYaw); if (var13 > 50.0D) { @@ -241,7 +241,7 @@ public class EntityDragon extends EntityDragonBase } Vec3 var15 = Vec3.getVec3Pool().getVecFromPool(this.targetX - this.posX, this.targetY - this.posY, this.targetZ - this.posZ).normalize(); - Vec3 var39 = Vec3.getVec3Pool().getVecFromPool((double)MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F), this.motionY, (double)(-MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F))).normalize(); + Vec3 var39 = Vec3.getVec3Pool().getVecFromPool((float)MathHelper.sin(this.rotationYaw * (float)(float)Math.PI / 180.0F), this.motionY, (float)(-MathHelper.cos(this.rotationYaw * (float)(float)Math.PI / 180.0F))).normalize(); float var17 = (float)(var39.dotProduct(var15) + 0.5D) / 1.5F; if (var17 < 0.0F) @@ -258,7 +258,7 @@ public class EntityDragon extends EntityDragonBase var19 = 40.0D; } - this.randomYawVelocity = (float)((double)this.randomYawVelocity + var13 * (0.699999988079071D / var19 / (double)var18)); + this.randomYawVelocity = (float)((float)this.randomYawVelocity + var13 * (0.699999988079071D / var19 / (float)var18)); this.rotationYaw += this.randomYawVelocity * 0.1F; float var21 = (float)(2.0D / (var19 + 1.0D)); float var22 = 0.06F; @@ -276,8 +276,8 @@ public class EntityDragon extends EntityDragonBase Vec3 var23 = Vec3.getVec3Pool().getVecFromPool(this.motionX, this.motionY, this.motionZ).normalize(); float var24 = (float)(var23.dotProduct(var39) + 1.0D) / 2.0F; var24 = 0.8F + 0.15F * var24; - this.motionX *= (double)var24; - this.motionZ *= (double)var24; + this.motionX *= (float)var24; + this.motionZ *= (float)var24; this.motionY *= 0.9100000262260437D; } @@ -292,18 +292,18 @@ public class EntityDragon extends EntityDragonBase this.dragonPartWing1.width = 4.0F; this.dragonPartWing2.height = 3.0F; this.dragonPartWing2.width = 4.0F; - var26 = (float)(this.getMovementOffsets(5, 1.0F)[1] - this.getMovementOffsets(10, 1.0F)[1]) * 10.0F / 180.0F * (float)Math.PI; + var26 = (float)(this.getMovementOffsets(5, 1.0F)[1] - this.getMovementOffsets(10, 1.0F)[1]) * 10.0F / 180.0F * (float)(float)Math.PI; var3 = MathHelper.cos(var26); float var27 = -MathHelper.sin(var26); - float var5 = this.rotationYaw * (float)Math.PI / 180.0F; + float var5 = this.rotationYaw * (float)(float)Math.PI / 180.0F; float var28 = MathHelper.sin(var5); float var7 = MathHelper.cos(var5); this.dragonPartBody.onUpdate(); - this.dragonPartBody.setLocationAndAngles(this.posX + (double)(var28 * 0.5F), this.posY, this.posZ - (double)(var7 * 0.5F), 0.0F, 0.0F); + this.dragonPartBody.setLocationAndAngles(this.posX + (float)(var28 * 0.5F), this.posY, this.posZ - (float)(var7 * 0.5F), 0.0F, 0.0F); this.dragonPartWing1.onUpdate(); - this.dragonPartWing1.setLocationAndAngles(this.posX + (double)(var7 * 4.5F), this.posY + 2.0D, this.posZ + (double)(var28 * 4.5F), 0.0F, 0.0F); + this.dragonPartWing1.setLocationAndAngles(this.posX + (float)(var7 * 4.5F), this.posY + 2.0D, this.posZ + (float)(var28 * 4.5F), 0.0F, 0.0F); this.dragonPartWing2.onUpdate(); - this.dragonPartWing2.setLocationAndAngles(this.posX - (double)(var7 * 4.5F), this.posY + 2.0D, this.posZ - (double)(var28 * 4.5F), 0.0F, 0.0F); + this.dragonPartWing2.setLocationAndAngles(this.posX - (float)(var7 * 4.5F), this.posY + 2.0D, this.posZ - (float)(var28 * 4.5F), 0.0F, 0.0F); if (!this.worldObj.isRemote && this.hurtTime == 0) { @@ -314,10 +314,10 @@ public class EntityDragon extends EntityDragonBase double[] var29 = this.getMovementOffsets(5, 1.0F); double[] var9 = this.getMovementOffsets(0, 1.0F); - var31 = MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F - this.randomYawVelocity * 0.01F); - float var33 = MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F - this.randomYawVelocity * 0.01F); + var31 = MathHelper.sin(this.rotationYaw * (float)(float)Math.PI / 180.0F - this.randomYawVelocity * 0.01F); + float var33 = MathHelper.cos(this.rotationYaw * (float)(float)Math.PI / 180.0F - this.randomYawVelocity * 0.01F); this.dragonPartHead.onUpdate(); - this.dragonPartHead.setLocationAndAngles(this.posX + (double)(var31 * 5.5F * var3), this.posY + (var9[1] - var29[1]) * 1.0D + (double)(var27 * 5.5F), this.posZ - (double)(var33 * 5.5F * var3), 0.0F, 0.0F); + this.dragonPartHead.setLocationAndAngles(this.posX + (float)(var31 * 5.5F * var3), this.posY + (var9[1] - var29[1]) * 1.0D + (float)(var27 * 5.5F), this.posZ - (float)(var33 * 5.5F * var3), 0.0F, 0.0F); for (int var30 = 0; var30 < 3; ++var30) { @@ -339,13 +339,13 @@ public class EntityDragon extends EntityDragonBase } double[] var34 = this.getMovementOffsets(12 + var30 * 2, 1.0F); - float var35 = this.rotationYaw * (float)Math.PI / 180.0F + this.simplifyAngle(var34[0] - var29[0]) * (float)Math.PI / 180.0F * 1.0F; + float var35 = this.rotationYaw * (float)(float)Math.PI / 180.0F + this.simplifyAngle(var34[0] - var29[0]) * (float)(float)Math.PI / 180.0F * 1.0F; float var37 = MathHelper.sin(var35); float var36 = MathHelper.cos(var35); float var38 = 1.5F; float var40 = (float)(var30 + 1) * 2.0F; var32.onUpdate(); - var32.setLocationAndAngles(this.posX - (double)((var28 * var38 + var37 * var40) * var3), this.posY + (var34[1] - var29[1]) * 1.0D - (double)((var40 + var38) * var27) + 1.5D, this.posZ + (double)((var7 * var38 + var36 * var40) * var3), 0.0F, 0.0F); + var32.setLocationAndAngles(this.posX - (float)((var28 * var38 + var37 * var40) * var3), this.posY + (var34[1] - var29[1]) * 1.0D - (float)((var40 + var38) * var27) + 1.5D, this.posZ + (float)((var7 * var38 + var36 * var40) * var3), 0.0F, 0.0F); } if (!this.worldObj.isRemote) @@ -380,7 +380,7 @@ public class EntityDragon extends EntityDragonBase if (this.rand.nextInt(10) == 0) { float var1 = 32.0F; - List var2 = this.worldObj.getEntitiesWithinAABB(EntityEnderCrystal.class, this.boundingBox.expand((double)var1, (double)var1, (double)var1)); + List var2 = this.worldObj.getEntitiesWithinAABB(EntityEnderCrystal.class, this.boundingBox.expand((float)var1, (float)var1, (float)var1)); EntityEnderCrystal var3 = null; double var4 = Double.MAX_VALUE; Iterator var6 = var2.iterator(); @@ -460,10 +460,10 @@ public class EntityDragon extends EntityDragonBase do { this.targetX = 0.0D; - this.targetY = (double)(70.0F + this.rand.nextFloat() * 50.0F); + this.targetY = (float)(70.0F + this.rand.nextFloat() * 50.0F); this.targetZ = 0.0D; - this.targetX += (double)(this.rand.nextFloat() * 120.0F - 60.0F); - this.targetZ += (double)(this.rand.nextFloat() * 120.0F - 60.0F); + this.targetX += (float)(this.rand.nextFloat() * 120.0F - 60.0F); + this.targetZ += (float)(this.rand.nextFloat() * 120.0F - 60.0F); double var2 = this.posX - this.targetX; double var4 = this.posY - this.targetY; double var6 = this.posZ - this.targetZ; @@ -526,9 +526,9 @@ public class EntityDragon extends EntityDragonBase if (var9) { - double var16 = par1AxisAlignedBB.minX + (par1AxisAlignedBB.maxX - par1AxisAlignedBB.minX) * (double)this.rand.nextFloat(); - double var17 = par1AxisAlignedBB.minY + (par1AxisAlignedBB.maxY - par1AxisAlignedBB.minY) * (double)this.rand.nextFloat(); - double var14 = par1AxisAlignedBB.minZ + (par1AxisAlignedBB.maxZ - par1AxisAlignedBB.minZ) * (double)this.rand.nextFloat(); + double var16 = par1AxisAlignedBB.minX + (par1AxisAlignedBB.maxX - par1AxisAlignedBB.minX) * (float)this.rand.nextFloat(); + double var17 = par1AxisAlignedBB.minY + (par1AxisAlignedBB.maxY - par1AxisAlignedBB.minY) * (float)this.rand.nextFloat(); + double var14 = par1AxisAlignedBB.minZ + (par1AxisAlignedBB.maxZ - par1AxisAlignedBB.minZ) * (float)this.rand.nextFloat(); this.worldObj.spawnParticle("largeexplode", var16, var17, var14, 0.0D, 0.0D, 0.0D); } @@ -542,12 +542,12 @@ public class EntityDragon extends EntityDragonBase par3 = par3 / 4 + 1; } - float var4 = this.rotationYaw * (float)Math.PI / 180.0F; + float var4 = this.rotationYaw * (float)(float)Math.PI / 180.0F; float var5 = MathHelper.sin(var4); float var6 = MathHelper.cos(var4); - this.targetX = this.posX + (double)(var5 * 5.0F) + (double)((this.rand.nextFloat() - 0.5F) * 2.0F); - this.targetY = this.posY + (double)(this.rand.nextFloat() * 3.0F) + 1.0D; - this.targetZ = this.posZ - (double)(var6 * 5.0F) + (double)((this.rand.nextFloat() - 0.5F) * 2.0F); + this.targetX = this.posX + (float)(var5 * 5.0F) + (float)((this.rand.nextFloat() - 0.5F) * 2.0F); + this.targetY = this.posY + (float)(this.rand.nextFloat() * 3.0F) + 1.0D; + this.targetZ = this.posZ - (float)(var6 * 5.0F) + (float)((this.rand.nextFloat() - 0.5F) * 2.0F); this.target = null; if (par2DamageSource.getEntity() instanceof EntityPlayer || par2DamageSource == DamageSource.explosion) @@ -570,7 +570,7 @@ public class EntityDragon extends EntityDragonBase float var1 = (this.rand.nextFloat() - 0.5F) * 8.0F; float var2 = (this.rand.nextFloat() - 0.5F) * 4.0F; float var3 = (this.rand.nextFloat() - 0.5F) * 8.0F; - this.worldObj.spawnParticle("hugeexplosion", this.posX + (double)var1, this.posY + 2.0D + (double)var2, this.posZ + (double)var3, 0.0D, 0.0D, 0.0D); + this.worldObj.spawnParticle("hugeexplosion", this.posX + (float)var1, this.posY + 2.0D + (float)var2, this.posZ + (float)var3, 0.0D, 0.0D, 0.0D); } int var4; @@ -622,17 +622,17 @@ public class EntityDragon extends EntityDragonBase { for (int var7 = - var4; var7 <= + var4; ++var7) { - double var8 = (double)(var6); - double var10 = (double)(var7); + double var8 = (float)(var6); + double var10 = (float)(var7); double var12 = var8 * var8 + var10 * var10; BigInteger x = BigInteger.valueOf(var6).add(par1); BigInteger z = BigInteger.valueOf(var7).add(par2); - if (var12 <= ((double)var4 - 0.5D) * ((double)var4 - 0.5D)) + if (var12 <= ((float)var4 - 0.5D) * ((float)var4 - 0.5D)) { if (var5 < var3) { - if (var12 <= ((double)(var4 - 1) - 0.5D) * ((double)(var4 - 1) - 0.5D)) + if (var12 <= ((float)(var4 - 1) - 0.5D) * ((float)(var4 - 1) - 0.5D)) { this.worldObj.setBlockWithNotify(x, var5, z, Block.bedrock.blockID); } @@ -641,7 +641,7 @@ public class EntityDragon extends EntityDragonBase { this.worldObj.setBlockWithNotify(x, var5, z, 0); } - else if (var12 > ((double)(var4 - 1) - 0.5D) * ((double)(var4 - 1) - 0.5D)) + else if (var12 > ((float)(var4 - 1) - 0.5D) * ((float)(var4 - 1) - 0.5D)) { this.worldObj.setBlockWithNotify(x, var5, z, Block.bedrock.blockID); } diff --git a/src/minecraft/net/minecraft/src/EntityDropParticleFX.java b/src/minecraft/net/minecraft/src/EntityDropParticleFX.java index 10bb75c..d76d0cc 100644 --- a/src/minecraft/net/minecraft/src/EntityDropParticleFX.java +++ b/src/minecraft/net/minecraft/src/EntityDropParticleFX.java @@ -70,7 +70,7 @@ public class EntityDropParticleFX extends EntityFX this.particleBlue = 4.0F / (float)(40 - this.bobTimer + 8); } - this.motionY -= (double)this.particleGravity; + this.motionY -= (float)this.particleGravity; if (this.bobTimer-- > 0) { @@ -114,7 +114,7 @@ public class EntityDropParticleFX extends EntityFX if (var1.isLiquid() || var1.isSolid()) { - double var2 = (double)((float)(MathHelper.floor_double(this.posY) + 1) - BlockFluid.getFluidHeightPercent(this.worldObj.getBlockMetadata(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)))); + double var2 = (float)((float)(MathHelper.floor_double(this.posY) + 1) - BlockFluid.getFluidHeightPercent(this.worldObj.getBlockMetadata(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)))); if (this.posY < var2) { diff --git a/src/minecraft/net/minecraft/src/EntityEnchantmentTableParticleFX.java b/src/minecraft/net/minecraft/src/EntityEnchantmentTableParticleFX.java index 2ea4e69..e7a1066 100644 --- a/src/minecraft/net/minecraft/src/EntityEnchantmentTableParticleFX.java +++ b/src/minecraft/net/minecraft/src/EntityEnchantmentTableParticleFX.java @@ -69,9 +69,9 @@ public class EntityEnchantmentTableParticleFX extends EntityFX float var2 = 1.0F - var1; var2 *= var2; var2 *= var2; - this.posX = this.field_70568_aq + this.motionX * (double)var1; - this.posY = this.field_70567_ar + this.motionY * (double)var1 - (double)(var2 * 1.2F); - this.posZ = this.field_70566_as + this.motionZ * (double)var1; + this.posX = this.field_70568_aq + this.motionX * (float)var1; + this.posY = this.field_70567_ar + this.motionY * (float)var1 - (float)(var2 * 1.2F); + this.posZ = this.field_70566_as + this.motionZ * (float)var1; if (this.particleAge++ >= this.particleMaxAge) { diff --git a/src/minecraft/net/minecraft/src/EntityEnderEye.java b/src/minecraft/net/minecraft/src/EntityEnderEye.java index 2c33a75..7c4ad92 100644 --- a/src/minecraft/net/minecraft/src/EntityEnderEye.java +++ b/src/minecraft/net/minecraft/src/EntityEnderEye.java @@ -55,14 +55,14 @@ public class EntityEnderEye extends Entity if (var10 > 12.0F) { - this.targetX = this.posX + var6 / (double)var10 * 12.0D; - this.targetZ = this.posZ + var8 / (double)var10 * 12.0D; + this.targetX = this.posX + var6 / (float)var10 * 12.0D; + this.targetZ = this.posZ + var8 / (float)var10 * 12.0D; this.targetY = this.posY + 8.0D; } else { this.targetX = par1; - this.targetY = (double)par3; + this.targetY = (float)par3; this.targetZ = par4; } @@ -82,8 +82,8 @@ public class EntityEnderEye extends Entity if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float var7 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (double)var7) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (float)var7) * 180.0D / (float)Math.PI); } } @@ -100,9 +100,9 @@ public class EntityEnderEye extends Entity this.posY += this.motionY; this.posZ += this.motionZ; float var1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (float)Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, (float)var1) * 180.0D / (float)Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -131,7 +131,7 @@ public class EntityEnderEye extends Entity double var4 = this.targetZ - this.posZ; float var6 = (float)Math.sqrt(var2 * var2 + var4 * var4); float var7 = (float)Math.atan2(var4, var2); - double var8 = (double)var1 + (double)(var6 - var1) * 0.0025D; + double var8 = (float)var1 + (float)(var6 - var1) * 0.0025D; if (var6 < 1.0F) { @@ -139,8 +139,8 @@ public class EntityEnderEye extends Entity this.motionY *= 0.8D; } - this.motionX = Math.cos((double)var7) * var8; - this.motionZ = Math.sin((double)var7) * var8; + this.motionX = (float)Math.cos((float)var7) * var8; + this.motionZ = (float)Math.sin((float)var7) * var8; if (this.posY < this.targetY) { @@ -158,12 +158,12 @@ public class EntityEnderEye extends Entity { for (int var3 = 0; var3 < 4; ++var3) { - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var10, this.posY - this.motionY * (double)var10, this.posZ - this.motionZ * (double)var10, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (float)var10, this.posY - this.motionY * (float)var10, this.posZ - this.motionZ * (float)var10, this.motionX, this.motionY, this.motionZ); } } else { - this.worldObj.spawnParticle("portal", this.posX - this.motionX * (double)var10 + this.rand.nextDouble() * 0.6D - 0.3D, this.posY - this.motionY * (double)var10 - 0.5D, this.posZ - this.motionZ * (double)var10 + this.rand.nextDouble() * 0.6D - 0.3D, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("portal", this.posX - this.motionX * (float)var10 + this.rand.nextDouble() * 0.6D - 0.3D, this.posY - this.motionY * (float)var10 - 0.5D, this.posZ - this.motionZ * (float)var10 + this.rand.nextDouble() * 0.6D - 0.3D, this.motionX, this.motionY, this.motionZ); } if (!this.worldObj.isRemote) diff --git a/src/minecraft/net/minecraft/src/EntityEnderman.java b/src/minecraft/net/minecraft/src/EntityEnderman.java index d341ff8..4af9f61 100644 --- a/src/minecraft/net/minecraft/src/EntityEnderman.java +++ b/src/minecraft/net/minecraft/src/EntityEnderman.java @@ -97,7 +97,7 @@ public class EntityEnderman extends EntityMob else { Vec3 var3 = par1EntityPlayer.getLook(1.0F).normalize(); - Vec3 var4 = Vec3.getVec3Pool().getVecFromPool(this.posX - par1EntityPlayer.posX, this.boundingBox.minY + (double)(this.height / 2.0F) - (par1EntityPlayer.posY + (double)par1EntityPlayer.getEyeHeight()), this.posZ - par1EntityPlayer.posZ); + Vec3 var4 = Vec3.getVec3Pool().getVecFromPool(this.posX - par1EntityPlayer.posX, this.boundingBox.minY + (float)(this.height / 2.0F) - (par1EntityPlayer.posY + (float)par1EntityPlayer.getEyeHeight()), this.posZ - par1EntityPlayer.posZ); double var5 = var4.lengthVector(); var4 = var4.normalize(); double var7 = var3.dotProduct(var4); @@ -161,7 +161,7 @@ public class EntityEnderman extends EntityMob for (int var1 = 0; var1 < 2; ++var1) { - this.worldObj.spawnParticle("portal", this.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, this.posY + this.rand.nextDouble() * (double)this.height - 0.25D, this.posZ + (this.rand.nextDouble() - 0.5D) * (double)this.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); + this.worldObj.spawnParticle("portal", this.posX + (this.rand.nextDouble() - 0.5D) * (float)this.width, this.posY + this.rand.nextDouble() * (float)this.height - 0.25D, this.posZ + (this.rand.nextDouble() - 0.5D) * (float)this.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); } if (this.worldObj.isDaytime() && !this.worldObj.isRemote) @@ -227,7 +227,7 @@ public class EntityEnderman extends EntityMob protected boolean teleportRandomly() { double var1 = this.posX + (this.rand.nextDouble() - 0.5D) * 64.0D; - double var3 = this.posY + (double)(this.rand.nextInt(64) - 32); + double var3 = this.posY + (float)(this.rand.nextInt(64) - 32); double var5 = this.posZ + (this.rand.nextDouble() - 0.5D) * 64.0D; return this.teleportTo(var1, var3, var5); } @@ -237,11 +237,11 @@ public class EntityEnderman extends EntityMob */ protected boolean teleportToEntity(Entity par1Entity) { - Vec3 var2 = Vec3.getVec3Pool().getVecFromPool(this.posX - par1Entity.posX, this.boundingBox.minY + (double)(this.height / 2.0F) - par1Entity.posY + (double)par1Entity.getEyeHeight(), this.posZ - par1Entity.posZ); + Vec3 var2 = Vec3.getVec3Pool().getVecFromPool(this.posX - par1Entity.posX, this.boundingBox.minY + (float)(this.height / 2.0F) - par1Entity.posY + (float)par1Entity.getEyeHeight(), this.posZ - par1Entity.posZ); var2 = var2.normalize(); double var3 = 16.0D; double var5 = this.posX + (this.rand.nextDouble() - 0.5D) * 8.0D - var2.xCoord * var3; - double var7 = this.posY + (double)(this.rand.nextInt(16) - 8) - var2.yCoord * var3; + double var7 = this.posY + (float)(this.rand.nextInt(16) - 8) - var2.yCoord * var3; double var9 = this.posZ + (this.rand.nextDouble() - 0.5D) * 8.0D - var2.zCoord * var3; return this.teleportTo(var5, var7, var9); } @@ -304,14 +304,14 @@ public class EntityEnderman extends EntityMob for (var18 = 0; var18 < var30; ++var18) { - double var19 = (double)var18 / ((double)var30 - 1.0D); + double var19 = (float)var18 / ((float)var30 - 1.0D); float var21 = (this.rand.nextFloat() - 0.5F) * 0.2F; float var22 = (this.rand.nextFloat() - 0.5F) * 0.2F; float var23 = (this.rand.nextFloat() - 0.5F) * 0.2F; - double var24 = var7 + (this.posX - var7) * var19 + (this.rand.nextDouble() - 0.5D) * (double)this.width * 2.0D; - double var26 = var9 + (this.posY - var9) * var19 + this.rand.nextDouble() * (double)this.height; - double var28 = var11 + (this.posZ - var11) * var19 + (this.rand.nextDouble() - 0.5D) * (double)this.width * 2.0D; - this.worldObj.spawnParticle("portal", var24, var26, var28, (double)var21, (double)var22, (double)var23); + double var24 = var7 + (this.posX - var7) * var19 + (this.rand.nextDouble() - 0.5D) * (float)this.width * 2.0D; + double var26 = var9 + (this.posY - var9) * var19 + this.rand.nextDouble() * (float)this.height; + double var28 = var11 + (this.posZ - var11) * var19 + (this.rand.nextDouble() - 0.5D) * (float)this.width * 2.0D; + this.worldObj.spawnParticle("portal", var24, var26, var28, (float)var21, (float)var22, (float)var23); } this.worldObj.playSoundEffect(var7, var9, var11, "mob.endermen.portal", 1.0F, 1.0F); diff --git a/src/minecraft/net/minecraft/src/EntityExplodeFX.java b/src/minecraft/net/minecraft/src/EntityExplodeFX.java index 7ae5ee1..e4b7aba 100644 --- a/src/minecraft/net/minecraft/src/EntityExplodeFX.java +++ b/src/minecraft/net/minecraft/src/EntityExplodeFX.java @@ -5,12 +5,12 @@ public class EntityExplodeFX extends EntityFX public EntityExplodeFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12) { super(par1World, par2, par4, par6, par8, par10, par12); - this.motionX = par8 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.05F); - this.motionY = par10 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.05F); - this.motionZ = par12 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.05F); + this.motionX = par8 + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.05F); + this.motionY = par10 + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.05F); + this.motionZ = par12 + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.05F); this.particleRed = this.particleGreen = this.particleBlue = this.rand.nextFloat() * 0.3F + 0.7F; this.particleScale = this.rand.nextFloat() * this.rand.nextFloat() * 6.0F + 1.0F; - this.particleMaxAge = (int)(16.0D / ((double)this.rand.nextFloat() * 0.8D + 0.2D)) + 2; + this.particleMaxAge = (int)(16.0D / ((float)this.rand.nextFloat() * 0.8D + 0.2D)) + 2; } /** diff --git a/src/minecraft/net/minecraft/src/EntityFX.java b/src/minecraft/net/minecraft/src/EntityFX.java index 52feccd..6528c2a 100644 --- a/src/minecraft/net/minecraft/src/EntityFX.java +++ b/src/minecraft/net/minecraft/src/EntityFX.java @@ -33,14 +33,14 @@ public class EntityFX extends Entity this.yOffset = this.height / 2.0F; this.setPosition(par2, par4, par6); this.particleRed = this.particleGreen = this.particleBlue = 1.0F; - this.motionX = par8 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); - this.motionY = par10 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); - this.motionZ = par12 + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); + this.motionX = par8 + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); + this.motionY = par10 + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); + this.motionZ = par12 + (float)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); float var14 = (float)(Math.random() + Math.random() + 1.0D) * 0.15F; float var15 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.motionX = this.motionX / (double)var15 * (double)var14 * 0.4000000059604645D; - this.motionY = this.motionY / (double)var15 * (double)var14 * 0.4000000059604645D + 0.10000000149011612D; - this.motionZ = this.motionZ / (double)var15 * (double)var14 * 0.4000000059604645D; + this.motionX = this.motionX / (float)var15 * (float)var14 * 0.4000000059604645D; + this.motionY = this.motionY / (float)var15 * (float)var14 * 0.4000000059604645D + 0.10000000149011612D; + this.motionZ = this.motionZ / (float)var15 * (float)var14 * 0.4000000059604645D; this.particleTextureJitterX = this.rand.nextFloat() * 3.0F; this.particleTextureJitterY = this.rand.nextFloat() * 3.0F; this.particleScale = (this.rand.nextFloat() * 0.5F + 0.5F) * 2.0F; @@ -50,9 +50,9 @@ public class EntityFX extends Entity public EntityFX multiplyVelocity(float par1) { - this.motionX *= (double)par1; - this.motionY = (this.motionY - 0.10000000149011612D) * (double)par1 + 0.10000000149011612D; - this.motionZ *= (double)par1; + this.motionX *= (float)par1; + this.motionY = (this.motionY - 0.10000000149011612D) * (float)par1 + 0.10000000149011612D; + this.motionZ *= (float)par1; return this; } @@ -110,7 +110,7 @@ public class EntityFX extends Entity this.setDead(); } - this.motionY -= 0.04D * (double)this.particleGravity; + this.motionY -= 0.04D * (float)this.particleGravity; this.moveEntity(this.motionX, this.motionY, this.motionZ); this.motionX *= 0.9800000190734863D; this.motionY *= 0.9800000190734863D; @@ -130,15 +130,15 @@ public class EntityFX extends Entity float var10 = (float)(this.particleTextureIndex / 16) / 16.0F; float var11 = var10 + 0.0624375F; float var12 = 0.1F * this.particleScale; - float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (float)par2 - interpPosX); + float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (float)par2 - interpPosY); + float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (float)par2 - interpPosZ); float var16 = 1.0F; par1Tessellator.setColorOpaque_F(this.particleRed * var16, this.particleGreen * var16, this.particleBlue * var16); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var9, (double)var11); - par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var9, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var8, (double)var10); - par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var8, (double)var11); + par1Tessellator.addVertexWithUV((float)(var13 - par3 * var12 - par6 * var12), (float)(var14 - par4 * var12), (float)(var15 - par5 * var12 - par7 * var12), (float)var9, (float)var11); + par1Tessellator.addVertexWithUV((float)(var13 - par3 * var12 + par6 * var12), (float)(var14 + par4 * var12), (float)(var15 - par5 * var12 + par7 * var12), (float)var9, (float)var10); + par1Tessellator.addVertexWithUV((float)(var13 + par3 * var12 + par6 * var12), (float)(var14 + par4 * var12), (float)(var15 + par5 * var12 + par7 * var12), (float)var8, (float)var10); + par1Tessellator.addVertexWithUV((float)(var13 + par3 * var12 - par6 * var12), (float)(var14 - par4 * var12), (float)(var15 + par5 * var12 - par7 * var12), (float)var8, (float)var11); } public int getFXLayer() diff --git a/src/minecraft/net/minecraft/src/EntityFireball.java b/src/minecraft/net/minecraft/src/EntityFireball.java index 9482398..a7e38b9 100644 --- a/src/minecraft/net/minecraft/src/EntityFireball.java +++ b/src/minecraft/net/minecraft/src/EntityFireball.java @@ -43,7 +43,7 @@ public class EntityFireball extends Entity this.setSize(1.0F, 1.0F); this.setLocationAndAngles(par2, par4, par6, this.rotationYaw, this.rotationPitch); this.setPosition(par2, par4, par6); - double var14 = (double)MathHelper.sqrt_double(par8 * par8 + par10 * par10 + par12 * par12); + double var14 = (float)MathHelper.sqrt_double(par8 * par8 + par10 * par10 + par12 * par12); this.accelerationX = par8 / var14 * 0.1D; this.accelerationY = par10 / var14 * 0.1D; this.accelerationZ = par12 / var14 * 0.1D; @@ -61,7 +61,7 @@ public class EntityFireball extends Entity par3 += this.rand.nextGaussian() * 0.4D; par5 += this.rand.nextGaussian() * 0.4D; par7 += this.rand.nextGaussian() * 0.4D; - double var9 = (double)MathHelper.sqrt_double(par3 * par3 + par5 * par5 + par7 * par7); + double var9 = (float)MathHelper.sqrt_double(par3 * par3 + par5 * par5 + par7 * par7); this.accelerationX = par3 / var9 * 0.1D; this.accelerationY = par5 / var9 * 0.1D; this.accelerationZ = par7 / var9 * 0.1D; @@ -98,9 +98,9 @@ public class EntityFireball extends Entity } this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.motionX *= (float)(this.rand.nextFloat() * 0.2F); + this.motionY *= (float)(this.rand.nextFloat() * 0.2F); + this.motionZ *= (float)(this.rand.nextFloat() * 0.2F); this.ticksAlive = 0; this.ticksInAir = 0; } @@ -132,7 +132,7 @@ public class EntityFireball extends Entity if (var9.canBeCollidedWith() && (!var9.isEntityEqual(this.shootingEntity) || this.ticksInAir >= 25)) { float var10 = 0.3F; - AxisAlignedBB var11 = var9.boundingBox.expand((double)var10, (double)var10, (double)var10); + AxisAlignedBB var11 = var9.boundingBox.expand((float)var10, (float)var10, (float)var10); MovingObjectPosition var12 = var11.calculateIntercept(var15, var2); if (var12 != null) @@ -162,9 +162,9 @@ public class EntityFireball extends Entity this.posY += this.motionY; this.posZ += this.motionZ; float var16 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (float)Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var16) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, (float)var16) * 180.0D / (float)Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -193,7 +193,7 @@ public class EntityFireball extends Entity for (int var18 = 0; var18 < 4; ++var18) { float var19 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var19, this.posY - this.motionY * (double)var19, this.posZ - this.motionZ * (double)var19, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (float)var19, this.posY - this.motionY * (float)var19, this.posZ - this.motionZ * (float)var19, this.motionX, this.motionY, this.motionZ); } var17 = 0.8F; @@ -202,9 +202,9 @@ public class EntityFireball extends Entity this.motionX += this.accelerationX; this.motionY += this.accelerationY; this.motionZ += this.accelerationZ; - this.motionX *= (double)var17; - this.motionY *= (double)var17; - this.motionZ *= (double)var17; + this.motionX *= (float)var17; + this.motionY *= (float)var17; + this.motionZ *= (float)var17; this.worldObj.spawnParticle("smoke", this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D); this.setPosition(this.posX, this.posY, this.posZ); } diff --git a/src/minecraft/net/minecraft/src/EntityFishHook.java b/src/minecraft/net/minecraft/src/EntityFishHook.java index 38b7f95..cc1e54b 100644 --- a/src/minecraft/net/minecraft/src/EntityFishHook.java +++ b/src/minecraft/net/minecraft/src/EntityFishHook.java @@ -80,16 +80,16 @@ public class EntityFishHook extends Entity this.angler = par2EntityPlayer; this.angler.fishEntity = this; this.setSize(0.25F, 0.25F); - this.setLocationAndAngles(par2EntityPlayer.posX, par2EntityPlayer.posY + 1.62D - (double)par2EntityPlayer.yOffset, par2EntityPlayer.posZ, par2EntityPlayer.rotationYaw, par2EntityPlayer.rotationPitch); - this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.setLocationAndAngles(par2EntityPlayer.posX, par2EntityPlayer.posY + 1.62D - (float)par2EntityPlayer.yOffset, par2EntityPlayer.posZ, par2EntityPlayer.rotationYaw, par2EntityPlayer.rotationPitch); + this.posX -= (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * 0.16F); this.posY -= 0.10000000149011612D; - this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.posZ -= (float)(MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * 0.16F); this.setPosition(this.posX, this.posY, this.posZ); this.yOffset = 0.0F; float var3 = 0.4F; - this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var3); - this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var3); - this.motionY = (double)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI) * var3); + this.motionX = (float)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var3); + this.motionZ = (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var3); + this.motionY = (float)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var3); this.calculateVelocity(this.motionX, this.motionY, this.motionZ, 1.5F, 1.0F); } @@ -109,21 +109,21 @@ public class EntityFishHook extends Entity public void calculateVelocity(double par1, double par3, double par5, float par7, float par8) { float var9 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); - par1 /= (double)var9; - par3 /= (double)var9; - par5 /= (double)var9; - par1 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par3 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par5 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par1 *= (double)par7; - par3 *= (double)par7; - par5 *= (double)par7; + par1 /= (float)var9; + par3 /= (float)var9; + par5 /= (float)var9; + par1 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par3 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par5 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par1 *= (float)par7; + par3 *= (float)par7; + par5 *= (float)par7; this.motionX = par1; this.motionY = par3; this.motionZ = par5; float var10 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (double)var10) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (float)var10) * 180.0D / (float)Math.PI); this.ticksInGround = 0; } @@ -136,8 +136,8 @@ public class EntityFishHook extends Entity this.fishX = par1; this.fishY = par3; this.fishZ = par5; - this.fishYaw = (double)par7; - this.fishPitch = (double)par8; + this.fishYaw = (float)par7; + this.fishPitch = (float)par8; this.fishPosRotationIncrements = par9; this.motionX = this.velocityX; this.motionY = this.velocityY; @@ -163,12 +163,12 @@ public class EntityFishHook extends Entity if (this.fishPosRotationIncrements > 0) { - double var21 = this.posX + (this.fishX - this.posX) / (double)this.fishPosRotationIncrements; - double var22 = this.posY + (this.fishY - this.posY) / (double)this.fishPosRotationIncrements; - double var23 = this.posZ + (this.fishZ - this.posZ) / (double)this.fishPosRotationIncrements; - double var7 = MathHelper.wrapAngleTo180_double(this.fishYaw - (double)this.rotationYaw); - this.rotationYaw = (float)((double)this.rotationYaw + var7 / (double)this.fishPosRotationIncrements); - this.rotationPitch = (float)((double)this.rotationPitch + (this.fishPitch - (double)this.rotationPitch) / (double)this.fishPosRotationIncrements); + double var21 = this.posX + (this.fishX - this.posX) / (float)this.fishPosRotationIncrements; + double var22 = this.posY + (this.fishY - this.posY) / (float)this.fishPosRotationIncrements; + double var23 = this.posZ + (this.fishZ - this.posZ) / (float)this.fishPosRotationIncrements; + double var7 = MathHelper.wrapAngleTo180_double(this.fishYaw - (float)this.rotationYaw); + this.rotationYaw = (float)((float)this.rotationYaw + var7 / (float)this.fishPosRotationIncrements); + this.rotationPitch = (float)((float)this.rotationPitch + (this.fishPitch - (float)this.rotationPitch) / (float)this.fishPosRotationIncrements); --this.fishPosRotationIncrements; this.setPosition(var21, var22, var23); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -191,7 +191,7 @@ public class EntityFishHook extends Entity if (!this.bobber.isDead) { this.posX = this.bobber.posX; - this.posY = this.bobber.boundingBox.minY + (double)this.bobber.height * 0.8D; + this.posY = this.bobber.boundingBox.minY + (float)this.bobber.height * 0.8D; this.posZ = this.bobber.posZ; return; } @@ -222,9 +222,9 @@ public class EntityFishHook extends Entity } this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.motionX *= (float)(this.rand.nextFloat() * 0.2F); + this.motionY *= (float)(this.rand.nextFloat() * 0.2F); + this.motionZ *= (float)(this.rand.nextFloat() * 0.2F); this.ticksInGround = 0; this.ticksInAir = 0; } @@ -257,7 +257,7 @@ public class EntityFishHook extends Entity if (var9.canBeCollidedWith() && (var9 != this.angler || this.ticksInAir >= 5)) { float var10 = 0.3F; - AxisAlignedBB var11 = var9.boundingBox.expand((double)var10, (double)var10, (double)var10); + AxisAlignedBB var11 = var9.boundingBox.expand((float)var10, (float)var10, (float)var10); MovingObjectPosition var12 = var11.calculateIntercept(var20, var2); if (var12 != null) @@ -297,9 +297,9 @@ public class EntityFishHook extends Entity { this.moveEntity(this.motionX, this.motionY, this.motionZ); float var24 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (float)Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var24) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, (float)var24) * 180.0D / (float)Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -333,13 +333,13 @@ public class EntityFishHook extends Entity for (int var28 = 0; var28 < var26; ++var28) { - double var14 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double)(var28 + 0) / (double)var26 - 0.125D + 0.125D; - double var16 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (double)(var28 + 1) / (double)var26 - 0.125D + 0.125D; + double var14 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (float)(var28 + 0) / (float)var26 - 0.125D + 0.125D; + double var16 = this.boundingBox.minY + (this.boundingBox.maxY - this.boundingBox.minY) * (float)(var28 + 1) / (float)var26 - 0.125D + 0.125D; AxisAlignedBB var18 = AxisAlignedBB.getAABBPool().addOrModifyAABBInPool(this.boundingBox.minX, var14, this.boundingBox.minZ, this.boundingBox.maxX, var16, this.boundingBox.maxZ); if (this.worldObj.isAABBInMaterial(var18, Material.water)) { - var27 += 1.0D / (double)var26; + var27 += 1.0D / (float)var26; } } @@ -372,14 +372,14 @@ public class EntityFishHook extends Entity { var31 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var17 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - this.worldObj.spawnParticle("bubble", this.posX + (double)var31, (double)(var30 + 1.0F), this.posZ + (double)var17, this.motionX, this.motionY - (double)(this.rand.nextFloat() * 0.2F), this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX + (float)var31, (float)(var30 + 1.0F), this.posZ + (float)var17, this.motionX, this.motionY - (float)(this.rand.nextFloat() * 0.2F), this.motionZ); } for (var15 = 0; (float)var15 < 1.0F + this.width * 20.0F; ++var15) { var31 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; var17 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - this.worldObj.spawnParticle("splash", this.posX + (double)var31, (double)(var30 + 1.0F), this.posZ + (double)var17, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("splash", this.posX + (float)var31, (float)(var30 + 1.0F), this.posZ + (float)var17, this.motionX, this.motionY, this.motionZ); } } } @@ -387,7 +387,7 @@ public class EntityFishHook extends Entity if (this.ticksCatchable > 0) { - this.motionY -= (double)(this.rand.nextFloat() * this.rand.nextFloat() * this.rand.nextFloat()) * 0.2D; + this.motionY -= (float)(this.rand.nextFloat() * this.rand.nextFloat() * this.rand.nextFloat()) * 0.2D; } var13 = var27 * 2.0D - 1.0D; @@ -395,13 +395,13 @@ public class EntityFishHook extends Entity if (var27 > 0.0D) { - var25 = (float)((double)var25 * 0.9D); + var25 = (float)((float)var25 * 0.9D); this.motionY *= 0.8D; } - this.motionX *= (double)var25; - this.motionY *= (double)var25; - this.motionZ *= (double)var25; + this.motionX *= (float)var25; + this.motionY *= (float)var25; + this.motionZ *= (float)var25; this.setPosition(this.posX, this.posY, this.posZ); } } @@ -453,10 +453,10 @@ public class EntityFishHook extends Entity double var2 = this.angler.posX - this.posX; double var4 = this.angler.posY - this.posY; double var6 = this.angler.posZ - this.posZ; - double var8 = (double)MathHelper.sqrt_double(var2 * var2 + var4 * var4 + var6 * var6); + double var8 = (float)MathHelper.sqrt_double(var2 * var2 + var4 * var4 + var6 * var6); double var10 = 0.1D; this.bobber.motionX += var2 * var10; - this.bobber.motionY += var4 * var10 + (double)MathHelper.sqrt_double(var8) * 0.08D; + this.bobber.motionY += var4 * var10 + (float)MathHelper.sqrt_double(var8) * 0.08D; this.bobber.motionZ += var6 * var10; var1 = 3; } @@ -466,10 +466,10 @@ public class EntityFishHook extends Entity double var3 = this.angler.posX - this.posX; double var5 = this.angler.posY - this.posY; double var7 = this.angler.posZ - this.posZ; - double var9 = (double)MathHelper.sqrt_double(var3 * var3 + var5 * var5 + var7 * var7); + double var9 = (float)MathHelper.sqrt_double(var3 * var3 + var5 * var5 + var7 * var7); double var11 = 0.1D; var13.motionX = var3 * var11; - var13.motionY = var5 * var11 + (double)MathHelper.sqrt_double(var9) * 0.08D; + var13.motionY = var5 * var11 + (float)MathHelper.sqrt_double(var9) * 0.08D; var13.motionZ = var7 * var11; this.worldObj.spawnEntityInWorld(var13); this.angler.addStat(StatList.fishCaughtStat, 1); diff --git a/src/minecraft/net/minecraft/src/EntityFlameFX.java b/src/minecraft/net/minecraft/src/EntityFlameFX.java index eaa6313..983e806 100644 --- a/src/minecraft/net/minecraft/src/EntityFlameFX.java +++ b/src/minecraft/net/minecraft/src/EntityFlameFX.java @@ -11,9 +11,9 @@ public class EntityFlameFX extends EntityFX this.motionX = this.motionX * 0.009999999776482582D + par8; this.motionY = this.motionY * 0.009999999776482582D + par10; this.motionZ = this.motionZ * 0.009999999776482582D + par12; - double var10000 = par2 + (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.05F); - var10000 = par4 + (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.05F); - var10000 = par6 + (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.05F); + double var10000 = par2 + (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.05F); + var10000 = par4 + (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.05F); + var10000 = par6 + (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.05F); this.flameScale = this.particleScale; this.particleRed = this.particleGreen = this.particleBlue = 1.0F; this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D)) + 4; diff --git a/src/minecraft/net/minecraft/src/EntityFlying.java b/src/minecraft/net/minecraft/src/EntityFlying.java index 5889a24..ee8b9c5 100644 --- a/src/minecraft/net/minecraft/src/EntityFlying.java +++ b/src/minecraft/net/minecraft/src/EntityFlying.java @@ -64,9 +64,9 @@ public abstract class EntityFlying extends EntityLiving } this.moveEntity(this.motionX, this.motionY, this.motionZ); - this.motionX *= (double)var3; - this.motionY *= (double)var3; - this.motionZ *= (double)var3; + this.motionX *= (float)var3; + this.motionY *= (float)var3; + this.motionZ *= (float)var3; } this.prevLegYaw = this.legYaw; diff --git a/src/minecraft/net/minecraft/src/EntityFootStepFX.java b/src/minecraft/net/minecraft/src/EntityFootStepFX.java index 73a1b32..6db1407 100644 --- a/src/minecraft/net/minecraft/src/EntityFootStepFX.java +++ b/src/minecraft/net/minecraft/src/EntityFootStepFX.java @@ -39,10 +39,10 @@ public class EntityFootStepFX extends EntityFX GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); par1Tessellator.startDrawingQuads(); par1Tessellator.setColorRGBA_F(var14, var14, var14, var9); - par1Tessellator.addVertexWithUV((double)(var11 - var10), (double)var12, (double)(var13 + var10), 0.0D, 1.0D); - par1Tessellator.addVertexWithUV((double)(var11 + var10), (double)var12, (double)(var13 + var10), 1.0D, 1.0D); - par1Tessellator.addVertexWithUV((double)(var11 + var10), (double)var12, (double)(var13 - var10), 1.0D, 0.0D); - par1Tessellator.addVertexWithUV((double)(var11 - var10), (double)var12, (double)(var13 - var10), 0.0D, 0.0D); + par1Tessellator.addVertexWithUV((float)(var11 - var10), (float)var12, (float)(var13 + var10), 0.0D, 1.0D); + par1Tessellator.addVertexWithUV((float)(var11 + var10), (float)var12, (float)(var13 + var10), 1.0D, 1.0D); + par1Tessellator.addVertexWithUV((float)(var11 + var10), (float)var12, (float)(var13 - var10), 1.0D, 0.0D); + par1Tessellator.addVertexWithUV((float)(var11 - var10), (float)var12, (float)(var13 - var10), 0.0D, 0.0D); par1Tessellator.draw(); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/minecraft/net/minecraft/src/EntityGhast.java b/src/minecraft/net/minecraft/src/EntityGhast.java index fc35d96..29bd986 100644 --- a/src/minecraft/net/minecraft/src/EntityGhast.java +++ b/src/minecraft/net/minecraft/src/EntityGhast.java @@ -76,15 +76,15 @@ public class EntityGhast extends EntityFlying implements IMob if (var7 < 1.0D || var7 > 3600.0D) { - this.waypointX = this.posX + (double)((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); - this.waypointY = this.posY + (double)((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); - this.waypointZ = this.posZ + (double)((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); + this.waypointX = this.posX + (float)((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); + this.waypointY = this.posY + (float)((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); + this.waypointZ = this.posZ + (float)((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); } if (this.courseChangeCooldown-- <= 0) { this.courseChangeCooldown += this.rand.nextInt(5) + 2; - var7 = (double)MathHelper.sqrt_double(var7); + var7 = (float)MathHelper.sqrt_double(var7); if (this.isCourseTraversable(this.waypointX, this.waypointY, this.waypointZ, var7)) { @@ -120,9 +120,9 @@ public class EntityGhast extends EntityFlying implements IMob if (this.targetedEntity != null && this.targetedEntity.getDistanceSqToEntity(this) < var9 * var9) { double var11 = this.targetedEntity.posX - this.posX; - double var13 = this.targetedEntity.boundingBox.minY + (double)(this.targetedEntity.height / 2.0F) - (this.posY + (double)(this.height / 2.0F)); + double var13 = this.targetedEntity.boundingBox.minY + (float)(this.targetedEntity.height / 2.0F) - (this.posY + (float)(this.height / 2.0F)); double var15 = this.targetedEntity.posZ - this.posZ; - this.renderYawOffset = this.rotationYaw = -((float)Math.atan2(var11, var15)) * 180.0F / (float)Math.PI; + this.renderYawOffset = this.rotationYaw = -((float)Math.atan2(var11, var15)) * 180.0F / (float)(float)Math.PI; if (this.canEntityBeSeen(this.targetedEntity)) { @@ -140,7 +140,7 @@ public class EntityGhast extends EntityFlying implements IMob double var18 = 4.0D; Vec3 var20 = this.getLook(1.0F); var17.posX = this.posX + var20.xCoord * var18; - var17.posY = this.posY + (double)(this.height / 2.0F) + 0.5D; + var17.posY = this.posY + (float)(this.height / 2.0F) + 0.5D; var17.posZ = this.posZ + var20.zCoord * var18; this.worldObj.spawnEntityInWorld(var17); this.attackCounter = -40; @@ -153,7 +153,7 @@ public class EntityGhast extends EntityFlying implements IMob } else { - this.renderYawOffset = this.rotationYaw = -((float)Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float)Math.PI; + this.renderYawOffset = this.rotationYaw = -((float)Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float)(float)Math.PI; if (this.attackCounter > 0) { @@ -183,7 +183,7 @@ public class EntityGhast extends EntityFlying implements IMob double var13 = (this.waypointZ - this.posZ) / par7; AxisAlignedBB var15 = this.boundingBox.copy(); - for (int var16 = 1; (double)var16 < par7; ++var16) + for (int var16 = 1; (float)var16 < par7; ++var16) { var15.offset(var9, var11, var13); diff --git a/src/minecraft/net/minecraft/src/EntityHugeExplodeFX.java b/src/minecraft/net/minecraft/src/EntityHugeExplodeFX.java index 3116959..fc9eeae 100644 --- a/src/minecraft/net/minecraft/src/EntityHugeExplodeFX.java +++ b/src/minecraft/net/minecraft/src/EntityHugeExplodeFX.java @@ -25,7 +25,7 @@ public class EntityHugeExplodeFX extends EntityFX double var2 = this.posX + (this.rand.nextDouble() - this.rand.nextDouble()) * 4.0D; double var4 = this.posY + (this.rand.nextDouble() - this.rand.nextDouble()) * 4.0D; double var6 = this.posZ + (this.rand.nextDouble() - this.rand.nextDouble()) * 4.0D; - this.worldObj.spawnParticle("largeexplode", var2, var4, var6, (double)((float)this.timeSinceStart / (float)this.maximumTime), 0.0D, 0.0D); + this.worldObj.spawnParticle("largeexplode", var2, var4, var6, (float)((float)this.timeSinceStart / (float)this.maximumTime), 0.0D, 0.0D); } ++this.timeSinceStart; diff --git a/src/minecraft/net/minecraft/src/EntityIronGolem.java b/src/minecraft/net/minecraft/src/EntityIronGolem.java index c5d4638..bcfe6e4 100644 --- a/src/minecraft/net/minecraft/src/EntityIronGolem.java +++ b/src/minecraft/net/minecraft/src/EntityIronGolem.java @@ -101,13 +101,13 @@ public class EntityIronGolem extends EntityGolem if (this.motionX * this.motionX + this.motionZ * this.motionZ > 2.500000277905201E-7D && this.rand.nextInt(5) == 0) { BigInteger var1 = MathHelper.floor_double_BigInteger(this.posX); - int var2 = MathHelper.floor_double(this.posY - 0.20000000298023224D - (double)this.yOffset); + int var2 = MathHelper.floor_double(this.posY - 0.20000000298023224D - (float)this.yOffset); BigInteger var3 = MathHelper.floor_double_BigInteger(this.posZ); int var4 = this.worldObj.getBlockId(var1, var2, var3); if (var4 > 0) { - this.worldObj.spawnParticle("tilecrack_" + var4, this.posX + ((double)this.rand.nextFloat() - 0.5D) * (double)this.width, this.boundingBox.minY + 0.1D, this.posZ + ((double)this.rand.nextFloat() - 0.5D) * (double)this.width, 4.0D * ((double)this.rand.nextFloat() - 0.5D), 0.5D, ((double)this.rand.nextFloat() - 0.5D) * 4.0D); + this.worldObj.spawnParticle("tilecrack_" + var4, this.posX + ((float)this.rand.nextFloat() - 0.5D) * (float)this.width, this.boundingBox.minY + 0.1D, this.posZ + ((float)this.rand.nextFloat() - 0.5D) * (float)this.width, 4.0D * ((float)this.rand.nextFloat() - 0.5D), 0.5D, ((float)this.rand.nextFloat() - 0.5D) * 4.0D); } } } diff --git a/src/minecraft/net/minecraft/src/EntityItem.java b/src/minecraft/net/minecraft/src/EntityItem.java index 47c318f..28b8863 100644 --- a/src/minecraft/net/minecraft/src/EntityItem.java +++ b/src/minecraft/net/minecraft/src/EntityItem.java @@ -17,7 +17,7 @@ public class EntityItem extends Entity private int health = 5; /** The EntityItem's random initial float height. */ - public float hoverStart = (float)(Math.random() * Math.PI * 2.0D); + public float hoverStart = (float)(Math.random() * (float)Math.PI * 2.0D); public EntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { @@ -27,9 +27,9 @@ public class EntityItem extends Entity this.setPosition(par2, par4, par6); this.item = par8ItemStack; this.rotationYaw = (float)(Math.random() * 360.0D); - this.motionX = (double)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D)); + this.motionX = (float)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D)); this.motionY = 0.20000000298023224D; - this.motionZ = (double)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D)); + this.motionZ = (float)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D)); } /** @@ -75,8 +75,8 @@ public class EntityItem extends Entity if (this.worldObj.getBlockMaterial(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)) == Material.lava) { this.motionY = 0.20000000298023224D; - this.motionX = (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); - this.motionZ = (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.motionX = (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.motionZ = (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); this.worldObj.playSoundAtEntity(this, "random.fizz", 0.4F, 2.0F + this.rand.nextFloat() * 0.4F); } @@ -105,9 +105,9 @@ public class EntityItem extends Entity } } - this.motionX *= (double)var4; + this.motionX *= (float)var4; this.motionY *= 0.9800000190734863D; - this.motionZ *= (double)var4; + this.motionZ *= (float)var4; if (this.onGround) { diff --git a/src/minecraft/net/minecraft/src/EntityLargeExplodeFX.java b/src/minecraft/net/minecraft/src/EntityLargeExplodeFX.java index 54f0795..f2c67f0 100644 --- a/src/minecraft/net/minecraft/src/EntityLargeExplodeFX.java +++ b/src/minecraft/net/minecraft/src/EntityLargeExplodeFX.java @@ -30,9 +30,9 @@ public class EntityLargeExplodeFX extends EntityFX float var11 = (float)(var8 / 4) / 4.0F; float var12 = var11 + 0.24975F; float var13 = 2.0F * this.field_70582_as; - float var14 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); - float var15 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); - float var16 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); + float var14 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (float)par2 - interpPosX); + float var15 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (float)par2 - interpPosY); + float var16 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (float)par2 - interpPosZ); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_LIGHTING); RenderHelper.disableStandardItemLighting(); @@ -40,10 +40,10 @@ public class EntityLargeExplodeFX extends EntityFX par1Tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, 1.0F); par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); par1Tessellator.setBrightness(240); - par1Tessellator.addVertexWithUV((double)(var14 - par3 * var13 - par6 * var13), (double)(var15 - par4 * var13), (double)(var16 - par5 * var13 - par7 * var13), (double)var10, (double)var12); - par1Tessellator.addVertexWithUV((double)(var14 - par3 * var13 + par6 * var13), (double)(var15 + par4 * var13), (double)(var16 - par5 * var13 + par7 * var13), (double)var10, (double)var11); - par1Tessellator.addVertexWithUV((double)(var14 + par3 * var13 + par6 * var13), (double)(var15 + par4 * var13), (double)(var16 + par5 * var13 + par7 * var13), (double)var9, (double)var11); - par1Tessellator.addVertexWithUV((double)(var14 + par3 * var13 - par6 * var13), (double)(var15 - par4 * var13), (double)(var16 + par5 * var13 - par7 * var13), (double)var9, (double)var12); + par1Tessellator.addVertexWithUV((float)(var14 - par3 * var13 - par6 * var13), (float)(var15 - par4 * var13), (float)(var16 - par5 * var13 - par7 * var13), (float)var10, (float)var12); + par1Tessellator.addVertexWithUV((float)(var14 - par3 * var13 + par6 * var13), (float)(var15 + par4 * var13), (float)(var16 - par5 * var13 + par7 * var13), (float)var10, (float)var11); + par1Tessellator.addVertexWithUV((float)(var14 + par3 * var13 + par6 * var13), (float)(var15 + par4 * var13), (float)(var16 + par5 * var13 + par7 * var13), (float)var9, (float)var11); + par1Tessellator.addVertexWithUV((float)(var14 + par3 * var13 - par6 * var13), (float)(var15 - par4 * var13), (float)(var16 + par5 * var13 - par7 * var13), (float)var9, (float)var12); par1Tessellator.draw(); GL11.glPolygonOffset(0.0F, 0.0F); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/minecraft/net/minecraft/src/EntityLavaFX.java b/src/minecraft/net/minecraft/src/EntityLavaFX.java index ac01866..a320349 100644 --- a/src/minecraft/net/minecraft/src/EntityLavaFX.java +++ b/src/minecraft/net/minecraft/src/EntityLavaFX.java @@ -10,7 +10,7 @@ public class EntityLavaFX extends EntityFX this.motionX *= 0.800000011920929D; this.motionY *= 0.800000011920929D; this.motionZ *= 0.800000011920929D; - this.motionY = (double)(this.rand.nextFloat() * 0.4F + 0.05F); + this.motionY = (float)(this.rand.nextFloat() * 0.4F + 0.05F); this.particleRed = this.particleGreen = this.particleBlue = 1.0F; this.particleScale *= this.rand.nextFloat() * 2.0F + 0.2F; this.lavaParticleScale = this.particleScale; diff --git a/src/minecraft/net/minecraft/src/EntityLiving.java b/src/minecraft/net/minecraft/src/EntityLiving.java index 54d559f..70fcc59 100644 --- a/src/minecraft/net/minecraft/src/EntityLiving.java +++ b/src/minecraft/net/minecraft/src/EntityLiving.java @@ -200,7 +200,7 @@ public abstract class EntityLiving extends Entity this.field_70770_ap = (float)(Math.random() + 1.0D) * 0.01F; this.setPosition(this.posX, this.posY, this.posZ); this.field_70769_ao = (float)Math.random() * 12398.0F; - this.rotationYaw = (float)(Math.random() * Math.PI * 2.0D); + this.rotationYaw = (float)(Math.random() * (float)Math.PI * 2.0D); this.rotationYawHead = this.rotationYaw; this.stepHeight = 0.5F; } @@ -379,7 +379,7 @@ public abstract class EntityLiving extends Entity */ public boolean canEntityBeSeen(Entity par1Entity) { - return this.worldObj.rayTraceBlocks(Vec3.getVec3Pool().getVecFromPool(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ), Vec3.getVec3Pool().getVecFromPool(par1Entity.posX, par1Entity.posY + (double)par1Entity.getEyeHeight(), par1Entity.posZ)) == null; + return this.worldObj.rayTraceBlocks(Vec3.getVec3Pool().getVecFromPool(this.posX, this.posY + (float)this.getEyeHeight(), this.posZ), Vec3.getVec3Pool().getVecFromPool(par1Entity.posX, par1Entity.posY + (float)par1Entity.getEyeHeight(), par1Entity.posZ)) == null; } /** @@ -470,7 +470,7 @@ public abstract class EntityLiving extends Entity float var2 = this.rand.nextFloat() - this.rand.nextFloat(); float var3 = this.rand.nextFloat() - this.rand.nextFloat(); float var4 = this.rand.nextFloat() - this.rand.nextFloat(); - this.worldObj.spawnParticle("bubble", this.posX + (double)var2, this.posY + (double)var3, this.posZ + (double)var4, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX + (float)var2, this.posY + (float)var3, this.posZ + (float)var4, this.motionX, this.motionY, this.motionZ); } this.attackEntityFrom(DamageSource.drown, 2); @@ -574,7 +574,7 @@ public abstract class EntityLiving extends Entity double var8 = this.rand.nextGaussian() * 0.02D; double var4 = this.rand.nextGaussian() * 0.02D; double var6 = this.rand.nextGaussian() * 0.02D; - this.worldObj.spawnParticle("explode", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var8, var4, var6); + this.worldObj.spawnParticle("explode", this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, var8, var4, var6); } } } @@ -614,7 +614,7 @@ public abstract class EntityLiving extends Entity double var4 = this.rand.nextGaussian() * 0.02D; double var6 = this.rand.nextGaussian() * 0.02D; double var8 = 10.0D; - this.worldObj.spawnParticle("explode", this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width - var2 * var8, this.posY + (double)(this.rand.nextFloat() * this.height) - var4 * var8, this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width - var6 * var8, var2, var4, var6); + this.worldObj.spawnParticle("explode", this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width - var2 * var8, this.posY + (float)(this.rand.nextFloat() * this.height) - var4 * var8, this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width - var6 * var8, var2, var4, var6); } } @@ -639,8 +639,8 @@ public abstract class EntityLiving extends Entity this.newPosX = par1; this.newPosY = par3; this.newPosZ = par5; - this.newRotationYaw = (double)par7; - this.newRotationPitch = (double)par8; + this.newRotationYaw = (float)par7; + this.newRotationPitch = (float)par8; this.newPosRotationIncrements = par9; } @@ -678,8 +678,8 @@ public abstract class EntityLiving extends Entity if (var5 > 0.0025000002F) { var8 = 1.0F; - var7 = (float)Math.sqrt((double)var5) * 3.0F; - var6 = (float)Math.atan2(var3, var1) * 180.0F / (float)Math.PI - 90.0F; + var7 = (float)Math.sqrt((float)var5) * 3.0F; + var6 = (float)Math.atan2(var3, var1) * 180.0F / (float)(float)Math.PI - 90.0F; } if (this.swingProgress > 0.0F) @@ -903,7 +903,7 @@ public abstract class EntityLiving extends Entity var9 = (Math.random() - Math.random()) * 0.01D; } - this.attackedAtYaw = (float)(Math.atan2(var7, var9) * 180.0D / Math.PI) - this.rotationYaw; + this.attackedAtYaw = (float)(Math.atan2(var7, var9) * 180.0D / (float)Math.PI) - this.rotationYaw; this.knockBack(var4, par2, var9, var7); } else @@ -1046,9 +1046,9 @@ public abstract class EntityLiving extends Entity this.motionX /= 2.0D; this.motionY /= 2.0D; this.motionZ /= 2.0D; - this.motionX -= par3 / (double)var7 * (double)var8; - this.motionY += (double)var8; - this.motionZ -= par5 / (double)var7 * (double)var8; + this.motionX -= par3 / (float)var7 * (float)var8; + this.motionY += (float)var8; + this.motionZ -= par5 / (float)var7 * (float)var8; if (this.motionY > 0.4000000059604645D) { @@ -1156,7 +1156,7 @@ public abstract class EntityLiving extends Entity } this.attackEntityFrom(DamageSource.fall, var2); - int var3 = this.worldObj.getBlockId(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY - 0.20000000298023224D - (double)this.yOffset), MathHelper.floor_double_BigInteger(this.posZ)); + int var3 = this.worldObj.getBlockId(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY - 0.20000000298023224D - (float)this.yOffset), MathHelper.floor_double_BigInteger(this.posZ)); if (var3 > 0) { @@ -1257,24 +1257,24 @@ public abstract class EntityLiving extends Entity { float var10 = 0.15F; - if (this.motionX < (double)(-var10)) + if (this.motionX < (float)(-var10)) { - this.motionX = (double)(-var10); + this.motionX = (float)(-var10); } - if (this.motionX > (double)var10) + if (this.motionX > (float)var10) { - this.motionX = (double)var10; + this.motionX = (float)var10; } - if (this.motionZ < (double)(-var10)) + if (this.motionZ < (float)(-var10)) { - this.motionZ = (double)(-var10); + this.motionZ = (float)(-var10); } - if (this.motionZ > (double)var10) + if (this.motionZ > (float)var10) { - this.motionZ = (double)var10; + this.motionZ = (float)var10; } this.fallDistance = 0.0F; @@ -1301,8 +1301,8 @@ public abstract class EntityLiving extends Entity this.motionY -= 0.08D; this.motionY *= 0.9800000190734863D; - this.motionX *= (double)var3; - this.motionZ *= (double)var3; + this.motionX *= (float)var3; + this.motionZ *= (float)var3; } this.prevLegYaw = this.legYaw; @@ -1432,12 +1432,12 @@ public abstract class EntityLiving extends Entity if (this.newPosRotationIncrements > 0) { - double var1 = this.posX + (this.newPosX - this.posX) / (double)this.newPosRotationIncrements; - double var3 = this.posY + (this.newPosY - this.posY) / (double)this.newPosRotationIncrements; - double var5 = this.posZ + (this.newPosZ - this.posZ) / (double)this.newPosRotationIncrements; - double var7 = MathHelper.wrapAngleTo180_double(this.newRotationYaw - (double)this.rotationYaw); - this.rotationYaw = (float)((double)this.rotationYaw + var7 / (double)this.newPosRotationIncrements); - this.rotationPitch = (float)((double)this.rotationPitch + (this.newRotationPitch - (double)this.rotationPitch) / (double)this.newPosRotationIncrements); + double var1 = this.posX + (this.newPosX - this.posX) / (float)this.newPosRotationIncrements; + double var3 = this.posY + (this.newPosY - this.posY) / (float)this.newPosRotationIncrements; + double var5 = this.posZ + (this.newPosZ - this.posZ) / (float)this.newPosRotationIncrements; + double var7 = MathHelper.wrapAngleTo180_double(this.newRotationYaw - (float)this.rotationYaw); + this.rotationYaw = (float)((float)this.rotationYaw + var7 / (float)this.newPosRotationIncrements); + this.rotationPitch = (float)((float)this.rotationPitch + (this.newRotationPitch - (float)this.rotationPitch) / (float)this.newPosRotationIncrements); --this.newPosRotationIncrements; this.setPosition(var1, var3, var5); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -1580,14 +1580,14 @@ public abstract class EntityLiving extends Entity if (this.isPotionActive(Potion.jump)) { - this.motionY += (double)((float)(this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F); + this.motionY += (float)((float)(this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F); } if (this.isSprinting()) { float var1 = this.rotationYaw * 0.017453292F; - this.motionX -= (double)(MathHelper.sin(var1) * 0.2F); - this.motionZ += (double)(MathHelper.cos(var1) * 0.2F); + this.motionX -= (float)(MathHelper.sin(var1) * 0.2F); + this.motionZ += (float)(MathHelper.cos(var1) * 0.2F); } this.isAirBorne = true; @@ -1678,7 +1678,7 @@ public abstract class EntityLiving extends Entity if (this.rand.nextFloat() < 0.02F) { - EntityPlayer var2 = this.worldObj.getClosestPlayerToEntity(this, (double)var1); + EntityPlayer var2 = this.worldObj.getClosestPlayerToEntity(this, (float)var1); if (var2 != null) { @@ -1695,7 +1695,7 @@ public abstract class EntityLiving extends Entity { this.faceEntity(this.currentTarget, 10.0F, (float)this.getVerticalFaceSpeed()); - if (this.numTicksToChaseTarget-- <= 0 || this.currentTarget.isDead || this.currentTarget.getDistanceSqToEntity(this) > (double)(var1 * var1)) + if (this.numTicksToChaseTarget-- <= 0 || this.currentTarget.isDead || this.currentTarget.getDistanceSqToEntity(this) > (float)(var1 * var1)) { this.currentTarget = null; } @@ -1741,16 +1741,16 @@ public abstract class EntityLiving extends Entity if (par1Entity instanceof EntityLiving) { EntityLiving var10 = (EntityLiving)par1Entity; - var6 = this.posY + (double)this.getEyeHeight() - (var10.posY + (double)var10.getEyeHeight()); + var6 = this.posY + (float)this.getEyeHeight() - (var10.posY + (float)var10.getEyeHeight()); } else { - var6 = (par1Entity.boundingBox.minY + par1Entity.boundingBox.maxY) / 2.0D - (this.posY + (double)this.getEyeHeight()); + var6 = (par1Entity.boundingBox.minY + par1Entity.boundingBox.maxY) / 2.0D - (this.posY + (float)this.getEyeHeight()); } - double var14 = (double)MathHelper.sqrt_double(var4 * var4 + var8 * var8); - float var12 = (float)(Math.atan2(var8, var4) * 180.0D / Math.PI) - 90.0F; - float var13 = (float)(-(Math.atan2(var6, var14) * 180.0D / Math.PI)); + double var14 = (float)MathHelper.sqrt_double(var4 * var4 + var8 * var8); + float var12 = (float)(Math.atan2(var8, var4) * 180.0D / (float)Math.PI) - 90.0F; + float var13 = (float)(-(Math.atan2(var6, var14) * 180.0D / (float)Math.PI)); this.rotationPitch = -this.updateRotation(this.rotationPitch, var13, par3); this.rotationYaw = this.updateRotation(this.rotationYaw, var12, par2); } @@ -1817,9 +1817,9 @@ public abstract class EntityLiving extends Entity } else { - double var2 = this.prevPosX + (this.posX - this.prevPosX) * (double)par1; - double var4 = this.prevPosY + (this.posY - this.prevPosY) * (double)par1; - double var6 = this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par1; + double var2 = this.prevPosX + (this.posX - this.prevPosX) * (float)par1; + double var4 = this.prevPosY + (this.posY - this.prevPosY) * (float)par1; + double var6 = this.prevPosZ + (this.posZ - this.prevPosZ) * (float)par1; return Vec3.getVec3Pool().getVecFromPool(var2, var4, var6); } } @@ -1844,21 +1844,21 @@ public abstract class EntityLiving extends Entity if (par1 == 1.0F) { - var2 = MathHelper.cos(-this.rotationYaw * 0.017453292F - (float)Math.PI); - var3 = MathHelper.sin(-this.rotationYaw * 0.017453292F - (float)Math.PI); + var2 = MathHelper.cos(-this.rotationYaw * 0.017453292F - (float)(float)Math.PI); + var3 = MathHelper.sin(-this.rotationYaw * 0.017453292F - (float)(float)Math.PI); var4 = -MathHelper.cos(-this.rotationPitch * 0.017453292F); var5 = MathHelper.sin(-this.rotationPitch * 0.017453292F); - return Vec3.getVec3Pool().getVecFromPool((double)(var3 * var4), (double)var5, (double)(var2 * var4)); + return Vec3.getVec3Pool().getVecFromPool((float)(var3 * var4), (float)var5, (float)(var2 * var4)); } else { var2 = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * par1; var3 = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * par1; - var4 = MathHelper.cos(-var3 * 0.017453292F - (float)Math.PI); - var5 = MathHelper.sin(-var3 * 0.017453292F - (float)Math.PI); + var4 = MathHelper.cos(-var3 * 0.017453292F - (float)(float)Math.PI); + var5 = MathHelper.sin(-var3 * 0.017453292F - (float)(float)Math.PI); float var6 = -MathHelper.cos(-var2 * 0.017453292F); float var7 = MathHelper.sin(-var2 * 0.017453292F); - return Vec3.getVec3Pool().getVecFromPool((double)(var5 * var6), (double)var7, (double)(var4 * var6)); + return Vec3.getVec3Pool().getVecFromPool((float)(var5 * var6), (float)var7, (float)(var4 * var6)); } } @@ -1978,10 +1978,10 @@ public abstract class EntityLiving extends Entity if (var9 > 0) { - double var10 = (double)(var9 >> 16 & 255) / 255.0D; - double var5 = (double)(var9 >> 8 & 255) / 255.0D; - double var7 = (double)(var9 >> 0 & 255) / 255.0D; - this.worldObj.spawnParticle("mobSpell", this.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, this.posY + this.rand.nextDouble() * (double)this.height - (double)this.yOffset, this.posZ + (this.rand.nextDouble() - 0.5D) * (double)this.width, var10, var5, var7); + double var10 = (float)(var9 >> 16 & 255) / 255.0D; + double var5 = (float)(var9 >> 8 & 255) / 255.0D; + double var7 = (float)(var9 >> 0 & 255) / 255.0D; + this.worldObj.spawnParticle("mobSpell", this.posX + (this.rand.nextDouble() - 0.5D) * (float)this.width, this.posY + this.rand.nextDouble() * (float)this.height - (float)this.yOffset, this.posZ + (this.rand.nextDouble() - 0.5D) * (float)this.width, var10, var5, var7); } } } @@ -2141,13 +2141,13 @@ public abstract class EntityLiving extends Entity for (int var2 = 0; var2 < 5; ++var2) { - Vec3 var3 = Vec3.getVec3Pool().getVecFromPool(((double)this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); - var3.rotateAroundX(-this.rotationPitch * (float)Math.PI / 180.0F); - var3.rotateAroundY(-this.rotationYaw * (float)Math.PI / 180.0F); - Vec3 var4 = Vec3.getVec3Pool().getVecFromPool(((double)this.rand.nextFloat() - 0.5D) * 0.3D, (double)(-this.rand.nextFloat()) * 0.6D - 0.3D, 0.6D); - var4.rotateAroundX(-this.rotationPitch * (float)Math.PI / 180.0F); - var4.rotateAroundY(-this.rotationYaw * (float)Math.PI / 180.0F); - var4 = var4.addVector(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ); + Vec3 var3 = Vec3.getVec3Pool().getVecFromPool(((float)this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); + var3.rotateAroundX(-this.rotationPitch * (float)(float)Math.PI / 180.0F); + var3.rotateAroundY(-this.rotationYaw * (float)(float)Math.PI / 180.0F); + Vec3 var4 = Vec3.getVec3Pool().getVecFromPool(((float)this.rand.nextFloat() - 0.5D) * 0.3D, (float)(-this.rand.nextFloat()) * 0.6D - 0.3D, 0.6D); + var4.rotateAroundX(-this.rotationPitch * (float)(float)Math.PI / 180.0F); + var4.rotateAroundY(-this.rotationYaw * (float)(float)Math.PI / 180.0F); + var4 = var4.addVector(this.posX, this.posY + (float)this.getEyeHeight(), this.posZ); this.worldObj.spawnParticle("iconcrack_" + par1ItemStack.getItem().shiftedIndex, var4.xCoord, var4.yCoord, var4.zCoord, var3.xCoord, var3.yCoord + 0.05D, var3.zCoord); } } diff --git a/src/minecraft/net/minecraft/src/EntityLookHelper.java b/src/minecraft/net/minecraft/src/EntityLookHelper.java index 0bff9ec..9c974a6 100644 --- a/src/minecraft/net/minecraft/src/EntityLookHelper.java +++ b/src/minecraft/net/minecraft/src/EntityLookHelper.java @@ -34,7 +34,7 @@ public class EntityLookHelper if (par1Entity instanceof EntityLiving) { - this.posY = par1Entity.posY + (double)par1Entity.getEyeHeight(); + this.posY = par1Entity.posY + (float)par1Entity.getEyeHeight(); } else { @@ -71,11 +71,11 @@ public class EntityLookHelper { this.isLooking = false; double var1 = this.posX - this.entity.posX; - double var3 = this.posY - (this.entity.posY + (double)this.entity.getEyeHeight()); + double var3 = this.posY - (this.entity.posY + (float)this.entity.getEyeHeight()); double var5 = this.posZ - this.entity.posZ; - double var7 = (double)MathHelper.sqrt_double(var1 * var1 + var5 * var5); - float var9 = (float)(Math.atan2(var5, var1) * 180.0D / Math.PI) - 90.0F; - float var10 = (float)(-(Math.atan2(var3, var7) * 180.0D / Math.PI)); + double var7 = (float)MathHelper.sqrt_double(var1 * var1 + var5 * var5); + float var9 = (float)(Math.atan2(var5, var1) * 180.0D / (float)Math.PI) - 90.0F; + float var10 = (float)(-(Math.atan2(var3, var7) * 180.0D / (float)Math.PI)); this.entity.rotationPitch = this.updateRotation(this.entity.rotationPitch, var10, this.deltaLookPitch); this.entity.rotationYawHead = this.updateRotation(this.entity.rotationYawHead, var9, this.deltaLookYaw); } diff --git a/src/minecraft/net/minecraft/src/EntityMagmaCube.java b/src/minecraft/net/minecraft/src/EntityMagmaCube.java index 1f2e65f..cccfc72 100644 --- a/src/minecraft/net/minecraft/src/EntityMagmaCube.java +++ b/src/minecraft/net/minecraft/src/EntityMagmaCube.java @@ -109,7 +109,7 @@ public class EntityMagmaCube extends EntitySlime */ protected void jump() { - this.motionY = (double)(0.42F + (float)this.getSlimeSize() * 0.1F); + this.motionY = (float)(0.42F + (float)this.getSlimeSize() * 0.1F); this.isAirBorne = true; } diff --git a/src/minecraft/net/minecraft/src/EntityMinecart.java b/src/minecraft/net/minecraft/src/EntityMinecart.java index 97dd15c..45f3a73 100644 --- a/src/minecraft/net/minecraft/src/EntityMinecart.java +++ b/src/minecraft/net/minecraft/src/EntityMinecart.java @@ -83,7 +83,7 @@ public class EntityMinecart extends Entity implements IInventory public EntityMinecart(World par1World, double par2, double par4, double par6, int par8) { this(par1World); - this.setPosition(par2, par4 + (double)this.yOffset, par6); + this.setPosition(par2, par4 + (float)this.yOffset, par6); this.motionX = 0.0D; this.motionY = 0.0D; this.motionZ = 0.0D; @@ -98,7 +98,7 @@ public class EntityMinecart extends Entity implements IInventory */ public double getMountedYOffset() { - return (double)this.height * 0.0D - 0.30000001192092896D; + return (float)this.height * 0.0D - 0.30000001192092896D; } /** @@ -152,11 +152,11 @@ public class EntityMinecart extends Entity implements IInventory } var5.stackSize -= var9; - EntityItem var10 = new EntityItem(this.worldObj, this.posX + (double)var6, this.posY + (double)var7, this.posZ + (double)var8, new ItemStack(var5.itemID, var9, var5.getItemDamage())); + EntityItem var10 = new EntityItem(this.worldObj, this.posX + (float)var6, this.posY + (float)var7, this.posZ + (float)var8, new ItemStack(var5.itemID, var9, var5.getItemDamage())); float var11 = 0.05F; - var10.motionX = (double)((float)this.rand.nextGaussian() * var11); - var10.motionY = (double)((float)this.rand.nextGaussian() * var11 + 0.2F); - var10.motionZ = (double)((float)this.rand.nextGaussian() * var11); + var10.motionX = (float)((float)this.rand.nextGaussian() * var11); + var10.motionY = (float)((float)this.rand.nextGaussian() * var11 + 0.2F); + var10.motionZ = (float)((float)this.rand.nextGaussian() * var11); this.worldObj.spawnEntityInWorld(var10); } } @@ -221,7 +221,7 @@ public class EntityMinecart extends Entity implements IInventory } var2.stackSize -= var6; - EntityItem var7 = new EntityItem(this.worldObj, this.posX + (double)var3, this.posY + (double)var4, this.posZ + (double)var5, new ItemStack(var2.itemID, var6, var2.getItemDamage())); + EntityItem var7 = new EntityItem(this.worldObj, this.posX + (float)var3, this.posY + (float)var4, this.posZ + (float)var5, new ItemStack(var2.itemID, var6, var2.getItemDamage())); if (var2.hasTagCompound()) { @@ -229,9 +229,9 @@ public class EntityMinecart extends Entity implements IInventory } float var8 = 0.05F; - var7.motionX = (double)((float)this.rand.nextGaussian() * var8); - var7.motionY = (double)((float)this.rand.nextGaussian() * var8 + 0.2F); - var7.motionZ = (double)((float)this.rand.nextGaussian() * var8); + var7.motionX = (float)((float)this.rand.nextGaussian() * var8); + var7.motionY = (float)((float)this.rand.nextGaussian() * var8 + 0.2F); + var7.motionZ = (float)((float)this.rand.nextGaussian() * var8); this.worldObj.spawnEntityInWorld(var7); } } @@ -269,12 +269,12 @@ public class EntityMinecart extends Entity implements IInventory { if (this.turnProgress > 0) { - double var45 = this.posX + (this.minecartX - this.posX) / (double)this.turnProgress; - double var46 = this.posY + (this.minecartY - this.posY) / (double)this.turnProgress; - double var5 = this.posZ + (this.minecartZ - this.posZ) / (double)this.turnProgress; - double var7 = MathHelper.wrapAngleTo180_double(this.minecartYaw - (double)this.rotationYaw); - this.rotationYaw = (float)((double)this.rotationYaw + var7 / (double)this.turnProgress); - this.rotationPitch = (float)((double)this.rotationPitch + (this.minecartPitch - (double)this.rotationPitch) / (double)this.turnProgress); + double var45 = this.posX + (this.minecartX - this.posX) / (float)this.turnProgress; + double var46 = this.posY + (this.minecartY - this.posY) / (float)this.turnProgress; + double var5 = this.posZ + (this.minecartZ - this.posZ) / (float)this.turnProgress; + double var7 = MathHelper.wrapAngleTo180_double(this.minecartYaw - (float)this.rotationYaw); + this.rotationYaw = (float)((float)this.rotationYaw + var7 / (float)this.turnProgress); + this.rotationPitch = (float)((float)this.rotationPitch + (this.minecartPitch - (float)this.rotationPitch) / (float)this.turnProgress); --this.turnProgress; this.setPosition(var45, var46, var5); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -308,7 +308,7 @@ public class EntityMinecart extends Entity implements IInventory { Vec3 var9 = this.func_70489_a(this.posX, this.posY, this.posZ); int var10 = this.worldObj.getBlockMetadata(var1, var2, var3); - this.posY = (double)var2; + this.posY = (float)var2; boolean var11 = false; boolean var12 = false; @@ -325,7 +325,7 @@ public class EntityMinecart extends Entity implements IInventory if (var10 >= 2 && var10 <= 5) { - this.posY = (double)(var2 + 1); + this.posY = (float)(var2 + 1); } if (var10 == 2) @@ -349,8 +349,8 @@ public class EntityMinecart extends Entity implements IInventory } int[][] var13 = field_70500_g[var10]; - double var14 = (double)(var13[1][0] - var13[0][0]); - double var16 = (double)(var13[1][2] - var13[0][2]); + double var14 = (float)(var13[1][0] - var13[0][0]); + double var16 = (float)(var13[1][2] - var13[0][2]); double var18 = Math.sqrt(var14 * var14 + var16 * var16); double var20 = this.motionX * var14 + this.motionZ * var16; @@ -398,10 +398,10 @@ public class EntityMinecart extends Entity implements IInventory } var24 = 0.0D; - var26 = (double)var1.doubleValue() + 0.5D + (double)var13[0][0] * 0.5D; - double var28 = (double)var3.doubleValue() + 0.5D + (double)var13[0][2] * 0.5D; - double var30 = (double)var1.doubleValue() + 0.5D + (double)var13[1][0] * 0.5D; - double var32 = (double)var3.doubleValue() + 0.5D + (double)var13[1][2] * 0.5D; + var26 = (float)var1.doubleValue() + 0.5D + (float)var13[0][0] * 0.5D; + double var28 = (float)var3.doubleValue() + 0.5D + (float)var13[0][2] * 0.5D; + double var30 = (float)var1.doubleValue() + 0.5D + (float)var13[1][0] * 0.5D; + double var32 = (float)var3.doubleValue() + 0.5D + (float)var13[1][2] * 0.5D; var14 = var30 - var26; var16 = var32 - var28; double var34; @@ -409,13 +409,13 @@ public class EntityMinecart extends Entity implements IInventory if (var14 == 0.0D) { - this.posX = (double)var1.doubleValue() + 0.5D; - var24 = this.posZ - (double)var3.doubleValue(); + this.posX = (float)var1.doubleValue() + 0.5D; + var24 = this.posZ - (float)var3.doubleValue(); } else if (var16 == 0.0D) { - this.posZ = (double)var3.doubleValue() + 0.5D; - var24 = this.posX - (double)var1.doubleValue(); + this.posZ = (float)var3.doubleValue() + 0.5D; + var24 = this.posX - (float)var1.doubleValue(); } else { @@ -426,7 +426,7 @@ public class EntityMinecart extends Entity implements IInventory this.posX = var26 + var14 * var24; this.posZ = var28 + var16 * var24; - this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ); + this.setPosition(this.posX, this.posY + (float)this.yOffset, this.posZ); var34 = this.motionX; var36 = this.motionZ; @@ -460,11 +460,11 @@ public class EntityMinecart extends Entity implements IInventory if (var13[0][1] != 0 && MathHelper.floor_double_BigInteger(this.posX).subtract(var1).equals(BigInteger.valueOf(var13[0][0])) && MathHelper.floor_double_BigInteger(this.posZ).subtract(var3).equals(BigInteger.valueOf(var13[0][2]))) { - this.setPosition(this.posX, this.posY + (double)var13[0][1], this.posZ); + this.setPosition(this.posX, this.posY + (float)var13[0][1], this.posZ); } else if (var13[1][1] != 0 && MathHelper.floor_double_BigInteger(this.posX).subtract(var1).equals(BigInteger.valueOf(var13[1][0])) && MathHelper.floor_double_BigInteger(this.posZ).subtract(var3).equals(var13[1][2])) { - this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ); + this.setPosition(this.posX, this.posY + (float)var13[1][1], this.posZ); } if (this.riddenByEntity != null) @@ -481,7 +481,7 @@ public class EntityMinecart extends Entity implements IInventory if (var38 > 1.0E-4D) { - var38 = (double)MathHelper.sqrt_double(var38); + var38 = (float)MathHelper.sqrt_double(var38); this.pushX /= var38; this.pushZ /= var38; double var40 = 0.04D; @@ -526,8 +526,8 @@ public class EntityMinecart extends Entity implements IInventory if (!var52.equals(var1) || var53.equals(var3)) { var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.motionX = var22 * (double)(var52.subtract(var1)).doubleValue(); - this.motionZ = var22 * (double)(var53.subtract(var3)).doubleValue(); + this.motionX = var22 * (float)(var52.subtract(var1)).doubleValue(); + this.motionZ = var22 * (float)(var53.subtract(var3)).doubleValue(); } double var41; @@ -538,7 +538,7 @@ public class EntityMinecart extends Entity implements IInventory if (var41 > 1.0E-4D && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.001D) { - var41 = (double)MathHelper.sqrt_double(var41); + var41 = (float)MathHelper.sqrt_double(var41); this.pushX /= var41; this.pushZ /= var41; @@ -636,7 +636,7 @@ public class EntityMinecart extends Entity implements IInventory if (var47 * var47 + var48 * var48 > 0.001D) { - this.rotationYaw = (float)(Math.atan2(var48, var47) * 180.0D / Math.PI); + this.rotationYaw = (float)(Math.atan2(var48, var47) * 180.0D / (float)Math.PI); if (this.field_70499_f) { @@ -644,7 +644,7 @@ public class EntityMinecart extends Entity implements IInventory } } - double var49 = (double)MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); + double var49 = (float)MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); if (var49 < -170.0D || var49 >= 170.0D) { @@ -718,16 +718,16 @@ public class EntityMinecart extends Entity implements IInventory var13 &= 7; } - par3 = (double)var10; + par3 = (float)var10; if (var13 >= 2 && var13 <= 5) { - par3 = (double)(var10 + 1); + par3 = (float)(var10 + 1); } int[][] var14 = field_70500_g[var13]; - double var15 = (double)(var14[1][0] - var14[0][0]); - double var17 = (double)(var14[1][2] - var14[0][2]); + double var15 = (float)(var14[1][0] - var14[0][0]); + double var17 = (float)(var14[1][2] - var14[0][2]); double var19 = Math.sqrt(var15 * var15 + var17 * var17); var15 /= var19; var17 /= var19; @@ -736,11 +736,11 @@ public class EntityMinecart extends Entity implements IInventory if (var14[0][1] != 0 && MathHelper.floor_double_BigInteger(par1).subtract(var9).equals(BigInteger.valueOf(var14[0][0])) && MathHelper.floor_double_BigInteger(par5).subtract(var11).equals(BigInteger.valueOf(var14[0][2]))) { - par3 += (double)var14[0][1]; + par3 += (float)var14[0][1]; } else if (var14[1][1] != 0 && MathHelper.floor_double_BigInteger(par1).subtract(var9).equals(BigInteger.valueOf(var14[1][0])) && MathHelper.floor_double_BigInteger(par5).subtract(var11).equals(BigInteger.valueOf(var14[1][2]))) { - par3 += (double)var14[1][1]; + par3 += (float)var14[1][1]; } return this.func_70489_a(par1, par3, par5); @@ -763,7 +763,7 @@ public class EntityMinecart extends Entity implements IInventory if (BlockRail.isRailBlock(var10)) { int var11 = this.worldObj.getBlockMetadata(var7, var8, var9); - par3 = (double)var8; + par3 = (float)var8; if (((BlockRail)Block.blocksList[var10]).isPowered()) { @@ -772,30 +772,30 @@ public class EntityMinecart extends Entity implements IInventory if (var11 >= 2 && var11 <= 5) { - par3 = (double)(var8 + 1); + par3 = (float)(var8 + 1); } int[][] var12 = field_70500_g[var11]; double var13 = 0.0D; - double var15 = (double)var7.doubleValue() + 0.5D + (double)var12[0][0] * 0.5D; - double var17 = (double)var8 + 0.5D + (double)var12[0][1] * 0.5D; - double var19 = (double)var9.doubleValue() + 0.5D + (double)var12[0][2] * 0.5D; - double var21 = (double)var7.doubleValue() + 0.5D + (double)var12[1][0] * 0.5D; - double var23 = (double)var8 + 0.5D + (double)var12[1][1] * 0.5D; - double var25 = (double)var9.doubleValue() + 0.5D + (double)var12[1][2] * 0.5D; + double var15 = (float)var7.doubleValue() + 0.5D + (float)var12[0][0] * 0.5D; + double var17 = (float)var8 + 0.5D + (float)var12[0][1] * 0.5D; + double var19 = (float)var9.doubleValue() + 0.5D + (float)var12[0][2] * 0.5D; + double var21 = (float)var7.doubleValue() + 0.5D + (float)var12[1][0] * 0.5D; + double var23 = (float)var8 + 0.5D + (float)var12[1][1] * 0.5D; + double var25 = (float)var9.doubleValue() + 0.5D + (float)var12[1][2] * 0.5D; double var27 = var21 - var15; double var29 = (var23 - var17) * 2.0D; double var31 = var25 - var19; if (var27 == 0.0D) { - par1 = (double)var7.doubleValue() + 0.5D; - var13 = par5 - (double)var9.doubleValue(); + par1 = (float)var7.doubleValue() + 0.5D; + var13 = par5 - (float)var9.doubleValue(); } else if (var31 == 0.0D) { - par5 = (double)var9.doubleValue() + 0.5D; - var13 = par1 - (double)var7.doubleValue(); + par5 = (float)var9.doubleValue() + 0.5D; + var13 = par1 - (float)var7.doubleValue(); } else { @@ -914,7 +914,7 @@ public class EntityMinecart extends Entity implements IInventory if (var6 >= 9.999999747378752E-5D) { - var6 = (double)MathHelper.sqrt_double(var6); + var6 = (float)MathHelper.sqrt_double(var6); var2 /= var6; var4 /= var6; double var8 = 1.0D / var6; @@ -928,8 +928,8 @@ public class EntityMinecart extends Entity implements IInventory var4 *= var8; var2 *= 0.10000000149011612D; var4 *= 0.10000000149011612D; - var2 *= (double)(1.0F - this.entityCollisionReduction); - var4 *= (double)(1.0F - this.entityCollisionReduction); + var2 *= (float)(1.0F - this.entityCollisionReduction); + var4 *= (float)(1.0F - this.entityCollisionReduction); var2 *= 0.5D; var4 *= 0.5D; @@ -938,7 +938,7 @@ public class EntityMinecart extends Entity implements IInventory double var10 = par1Entity.posX - this.posX; double var12 = par1Entity.posZ - this.posZ; Vec3 var14 = Vec3.getVec3Pool().getVecFromPool(var10, 0.0D, var12).normalize(); - Vec3 var15 = Vec3.getVec3Pool().getVecFromPool((double)MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F), 0.0D, (double)MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F)).normalize(); + Vec3 var15 = Vec3.getVec3Pool().getVecFromPool((float)MathHelper.cos(this.rotationYaw * (float)(float)Math.PI / 180.0F), 0.0D, (float)MathHelper.sin(this.rotationYaw * (float)(float)Math.PI / 180.0F)).normalize(); double var16 = Math.abs(var14.dotProduct(var15)); if (var16 < 0.800000011920929D) @@ -1144,8 +1144,8 @@ public class EntityMinecart extends Entity implements IInventory this.minecartX = par1; this.minecartY = par3; this.minecartZ = par5; - this.minecartYaw = (double)par7; - this.minecartPitch = (double)par8; + this.minecartYaw = (float)par7; + this.minecartPitch = (float)par8; this.turnProgress = par9 + 2; this.motionX = this.velocityX; this.motionY = this.velocityY; diff --git a/src/minecraft/net/minecraft/src/EntityMooshroom.java b/src/minecraft/net/minecraft/src/EntityMooshroom.java index c7791fc..79cd3f0 100644 --- a/src/minecraft/net/minecraft/src/EntityMooshroom.java +++ b/src/minecraft/net/minecraft/src/EntityMooshroom.java @@ -34,7 +34,7 @@ public class EntityMooshroom extends EntityCow if (var2 != null && var2.itemID == Item.shears.shiftedIndex && this.getGrowingAge() >= 0) { this.setDead(); - this.worldObj.spawnParticle("largeexplode", this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, 0.0D, 0.0D, 0.0D); + this.worldObj.spawnParticle("largeexplode", this.posX, this.posY + (float)(this.height / 2.0F), this.posZ, 0.0D, 0.0D, 0.0D); if (!this.worldObj.isRemote) { @@ -46,7 +46,7 @@ public class EntityMooshroom extends EntityCow for (int var4 = 0; var4 < 5; ++var4) { - this.worldObj.spawnEntityInWorld(new EntityItem(this.worldObj, this.posX, this.posY + (double)this.height, this.posZ, new ItemStack(Block.mushroomRed))); + this.worldObj.spawnEntityInWorld(new EntityItem(this.worldObj, this.posX, this.posY + (float)this.height, this.posZ, new ItemStack(Block.mushroomRed))); } } diff --git a/src/minecraft/net/minecraft/src/EntityMoveHelper.java b/src/minecraft/net/minecraft/src/EntityMoveHelper.java index 6b8e658..2c6c21b 100644 --- a/src/minecraft/net/minecraft/src/EntityMoveHelper.java +++ b/src/minecraft/net/minecraft/src/EntityMoveHelper.java @@ -52,12 +52,12 @@ public class EntityMoveHelper int var1 = MathHelper.floor_double(this.entity.boundingBox.minY + 0.5D); double var2 = this.posX - this.entity.posX; double var4 = this.posZ - this.entity.posZ; - double var6 = this.posY - (double)var1; + double var6 = this.posY - (float)var1; double var8 = var2 * var2 + var6 * var6 + var4 * var4; if (var8 >= 2.500000277905201E-7D) { - float var10 = (float)(Math.atan2(var4, var2) * 180.0D / Math.PI) - 90.0F; + float var10 = (float)(Math.atan2(var4, var2) * 180.0D / (float)Math.PI) - 90.0F; this.entity.rotationYaw = this.func_75639_a(this.entity.rotationYaw, var10, 30.0F); this.entity.setAIMoveSpeed(this.speed); diff --git a/src/minecraft/net/minecraft/src/EntityNoteFX.java b/src/minecraft/net/minecraft/src/EntityNoteFX.java index 9c90634..43e6a47 100644 --- a/src/minecraft/net/minecraft/src/EntityNoteFX.java +++ b/src/minecraft/net/minecraft/src/EntityNoteFX.java @@ -16,9 +16,9 @@ public class EntityNoteFX extends EntityFX this.motionY *= 0.009999999776482582D; this.motionZ *= 0.009999999776482582D; this.motionY += 0.2D; - this.particleRed = MathHelper.sin(((float)par8 + 0.0F) * (float)Math.PI * 2.0F) * 0.65F + 0.35F; - this.particleGreen = MathHelper.sin(((float)par8 + 0.33333334F) * (float)Math.PI * 2.0F) * 0.65F + 0.35F; - this.particleBlue = MathHelper.sin(((float)par8 + 0.6666667F) * (float)Math.PI * 2.0F) * 0.65F + 0.35F; + this.particleRed = MathHelper.sin(((float)par8 + 0.0F) * (float)(float)Math.PI * 2.0F) * 0.65F + 0.35F; + this.particleGreen = MathHelper.sin(((float)par8 + 0.33333334F) * (float)(float)Math.PI * 2.0F) * 0.65F + 0.35F; + this.particleBlue = MathHelper.sin(((float)par8 + 0.6666667F) * (float)(float)Math.PI * 2.0F) * 0.65F + 0.35F; this.particleScale *= 0.75F; this.particleScale *= par14; this.noteParticleScale = this.particleScale; diff --git a/src/minecraft/net/minecraft/src/EntityOtherPlayerMP.java b/src/minecraft/net/minecraft/src/EntityOtherPlayerMP.java index 15ecca5..8a16c0f 100644 --- a/src/minecraft/net/minecraft/src/EntityOtherPlayerMP.java +++ b/src/minecraft/net/minecraft/src/EntityOtherPlayerMP.java @@ -54,8 +54,8 @@ public class EntityOtherPlayerMP extends EntityPlayer this.otherPlayerMPX = par1; this.otherPlayerMPY = par3; this.otherPlayerMPZ = par5; - this.otherPlayerMPYaw = (double)par7; - this.otherPlayerMPPitch = (double)par8; + this.otherPlayerMPYaw = (float)par7; + this.otherPlayerMPPitch = (float)par8; this.otherPlayerMPPosRotationIncrements = par9; } @@ -113,12 +113,12 @@ public class EntityOtherPlayerMP extends EntityPlayer if (this.otherPlayerMPPosRotationIncrements > 0) { - double var1 = this.posX + (this.otherPlayerMPX - this.posX) / (double)this.otherPlayerMPPosRotationIncrements; - double var3 = this.posY + (this.otherPlayerMPY - this.posY) / (double)this.otherPlayerMPPosRotationIncrements; - double var5 = this.posZ + (this.otherPlayerMPZ - this.posZ) / (double)this.otherPlayerMPPosRotationIncrements; + double var1 = this.posX + (this.otherPlayerMPX - this.posX) / (float)this.otherPlayerMPPosRotationIncrements; + double var3 = this.posY + (this.otherPlayerMPY - this.posY) / (float)this.otherPlayerMPPosRotationIncrements; + double var5 = this.posZ + (this.otherPlayerMPZ - this.posZ) / (float)this.otherPlayerMPPosRotationIncrements; double var7; - for (var7 = this.otherPlayerMPYaw - (double)this.rotationYaw; var7 < -180.0D; var7 += 360.0D) + for (var7 = this.otherPlayerMPYaw - (float)this.rotationYaw; var7 < -180.0D; var7 += 360.0D) { ; } @@ -128,8 +128,8 @@ public class EntityOtherPlayerMP extends EntityPlayer var7 -= 360.0D; } - this.rotationYaw = (float)((double)this.rotationYaw + var7 / (double)this.otherPlayerMPPosRotationIncrements); - this.rotationPitch = (float)((double)this.rotationPitch + (this.otherPlayerMPPitch - (double)this.rotationPitch) / (double)this.otherPlayerMPPosRotationIncrements); + this.rotationYaw = (float)((float)this.rotationYaw + var7 / (float)this.otherPlayerMPPosRotationIncrements); + this.rotationPitch = (float)((float)this.rotationPitch + (this.otherPlayerMPPitch - (float)this.rotationPitch) / (float)this.otherPlayerMPPosRotationIncrements); --this.otherPlayerMPPosRotationIncrements; this.setPosition(var1, var3, var5); this.setRotation(this.rotationYaw, this.rotationPitch); diff --git a/src/minecraft/net/minecraft/src/EntityPainting.java b/src/minecraft/net/minecraft/src/EntityPainting.java index 4a0c69e..4b4bf39 100644 --- a/src/minecraft/net/minecraft/src/EntityPainting.java +++ b/src/minecraft/net/minecraft/src/EntityPainting.java @@ -149,9 +149,9 @@ public class EntityPainting extends Entity } var6 += this.func_70517_b(this.art.sizeY); - this.setPosition((double)var5, (double)var6, (double)var7); + this.setPosition((float)var5, (float)var6, (float)var7); float var9 = -0.00625F; - this.boundingBox.setBounds((double)(var5 - var2 - var9), (double)(var6 - var3 - var9), (double)(var7 - var4 - var9), (double)(var5 + var2 + var9), (double)(var6 + var3 + var9), (double)(var7 + var4 + var9)); + this.boundingBox.setBounds((float)(var5 - var2 - var9), (float)(var6 - var3 - var9), (float)(var7 - var4 - var9), (float)(var5 + var2 + var9), (float)(var6 + var3 + var9), (float)(var7 + var4 + var9)); } private float func_70517_b(int par1) @@ -195,25 +195,25 @@ public class EntityPainting extends Entity if (this.direction == 0) { - var3 = MathHelper.floor_double_BigInteger(this.posX - (double)((float)this.art.sizeX / 32.0F)); + var3 = MathHelper.floor_double_BigInteger(this.posX - (float)((float)this.art.sizeX / 32.0F)); } if (this.direction == 1) { - var5 = MathHelper.floor_double_BigInteger(this.posZ - (double)((float)this.art.sizeX / 32.0F)); + var5 = MathHelper.floor_double_BigInteger(this.posZ - (float)((float)this.art.sizeX / 32.0F)); } if (this.direction == 2) { - var3 = MathHelper.floor_double_BigInteger(this.posX - (double)((float)this.art.sizeX / 32.0F)); + var3 = MathHelper.floor_double_BigInteger(this.posX - (float)((float)this.art.sizeX / 32.0F)); } if (this.direction == 3) { - var5 = MathHelper.floor_double_BigInteger(this.posZ - (double)((float)this.art.sizeX / 32.0F)); + var5 = MathHelper.floor_double_BigInteger(this.posZ - (float)((float)this.art.sizeX / 32.0F)); } - var4 = MathHelper.floor_double(this.posY - (double)((float)this.art.sizeY / 32.0F)); + var4 = MathHelper.floor_double(this.posY - (float)((float)this.art.sizeY / 32.0F)); for (int var6 = 0; var6 < var1; ++var6) { diff --git a/src/minecraft/net/minecraft/src/EntityPickupFX.java b/src/minecraft/net/minecraft/src/EntityPickupFX.java index e4f0c6c..7b03c27 100644 --- a/src/minecraft/net/minecraft/src/EntityPickupFX.java +++ b/src/minecraft/net/minecraft/src/EntityPickupFX.java @@ -28,14 +28,14 @@ public class EntityPickupFX extends EntityFX double var9 = this.entityToPickUp.posX; double var11 = this.entityToPickUp.posY; double var13 = this.entityToPickUp.posZ; - double var15 = this.entityPickingUp.lastTickPosX + (this.entityPickingUp.posX - this.entityPickingUp.lastTickPosX) * (double)par2; - double var17 = this.entityPickingUp.lastTickPosY + (this.entityPickingUp.posY - this.entityPickingUp.lastTickPosY) * (double)par2 + (double)this.yOffs; - double var19 = this.entityPickingUp.lastTickPosZ + (this.entityPickingUp.posZ - this.entityPickingUp.lastTickPosZ) * (double)par2; - double var21 = var9 + (var15 - var9) * (double)var8; - double var23 = var11 + (var17 - var11) * (double)var8; - double var25 = var13 + (var19 - var13) * (double)var8; + double var15 = this.entityPickingUp.lastTickPosX + (this.entityPickingUp.posX - this.entityPickingUp.lastTickPosX) * (float)par2; + double var17 = this.entityPickingUp.lastTickPosY + (this.entityPickingUp.posY - this.entityPickingUp.lastTickPosY) * (float)par2 + (float)this.yOffs; + double var19 = this.entityPickingUp.lastTickPosZ + (this.entityPickingUp.posZ - this.entityPickingUp.lastTickPosZ) * (float)par2; + double var21 = var9 + (var15 - var9) * (float)var8; + double var23 = var11 + (var17 - var11) * (float)var8; + double var25 = var13 + (var19 - var13) * (float)var8; int var27 = MathHelper.floor_double(var21); - int var28 = MathHelper.floor_double(var23 + (double)(this.yOffset / 2.0F)); + int var28 = MathHelper.floor_double(var23 + (float)(this.yOffset / 2.0F)); int var29 = MathHelper.floor_double(var25); int var30 = this.getBrightnessForRender(par2); int var31 = var30 % 65536; @@ -45,7 +45,7 @@ public class EntityPickupFX extends EntityFX var21 -= interpPosX; var23 -= interpPosY; var25 -= interpPosZ; - RenderManager.instance.renderEntityWithPosYaw(this.entityToPickUp, (double)((float)var21), (double)((float)var23), (double)((float)var25), this.entityToPickUp.rotationYaw, par2); + RenderManager.instance.renderEntityWithPosYaw(this.entityToPickUp, (float)((float)var21), (float)((float)var23), (float)((float)var25), this.entityToPickUp.rotationYaw, par2); } /** diff --git a/src/minecraft/net/minecraft/src/EntityPlayer.java b/src/minecraft/net/minecraft/src/EntityPlayer.java index 12940da..381f68c 100644 --- a/src/minecraft/net/minecraft/src/EntityPlayer.java +++ b/src/minecraft/net/minecraft/src/EntityPlayer.java @@ -126,7 +126,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende this.craftingInventory = this.inventorySlots; this.yOffset = 1.62F; ChunkCoordinates var2 = par1World.getSpawnPoint(); - this.setLocationAndAngles(MathHelper.toBigDecimal(var2.posX).add(new BigDecimal(0.5)), (double)(var2.posY + 1), MathHelper.toBigDecimal(var2.posZ).add(new BigDecimal(0.5)), 0.0F, 0.0F); + this.setLocationAndAngles(MathHelper.toBigDecimal(var2.posX).add(new BigDecimal(0.5)), (float)(var2.posY + 1), MathHelper.toBigDecimal(var2.posZ).add(new BigDecimal(0.5)), 0.0F, 0.0F); this.entityType = "humanoid"; this.field_70741_aB = 180.0F; this.fireResistance = 20; @@ -350,13 +350,13 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende { for (int var3 = 0; var3 < par2; ++var3) { - Vec3 var4 = Vec3.getVec3Pool().getVecFromPool(((double)this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); - var4.rotateAroundX(-this.rotationPitch * (float)Math.PI / 180.0F); - var4.rotateAroundY(-this.rotationYaw * (float)Math.PI / 180.0F); - Vec3 var5 = Vec3.getVec3Pool().getVecFromPool(((double)this.rand.nextFloat() - 0.5D) * 0.3D, (double)(-this.rand.nextFloat()) * 0.6D - 0.3D, 0.6D); - var5.rotateAroundX(-this.rotationPitch * (float)Math.PI / 180.0F); - var5.rotateAroundY(-this.rotationYaw * (float)Math.PI / 180.0F); - var5 = var5.addVector(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ); + Vec3 var4 = Vec3.getVec3Pool().getVecFromPool(((float)this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); + var4.rotateAroundX(-this.rotationPitch * (float)(float)Math.PI / 180.0F); + var4.rotateAroundY(-this.rotationYaw * (float)(float)Math.PI / 180.0F); + Vec3 var5 = Vec3.getVec3Pool().getVecFromPool(((float)this.rand.nextFloat() - 0.5D) * 0.3D, (float)(-this.rand.nextFloat()) * 0.6D - 0.3D, 0.6D); + var5.rotateAroundX(-this.rotationPitch * (float)(float)Math.PI / 180.0F); + var5.rotateAroundY(-this.rotationYaw * (float)(float)Math.PI / 180.0F); + var5 = var5.addVector(this.posX, this.posY + (float)this.getEyeHeight(), this.posZ); this.worldObj.spawnParticle("iconcrack_" + par1ItemStack.getItem().shiftedIndex, var5.xCoord, var5.yCoord, var5.zCoord, var4.xCoord, var4.yCoord + 0.05D, var4.zCoord); } @@ -499,8 +499,8 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende if (this.isSprinting()) { - this.landMovementFactor = (float)((double)this.landMovementFactor + (double)this.capabilities.getWalkSpeed() * 0.3D); - this.jumpMovementFactor = (float)((double)this.jumpMovementFactor + (double)this.speedInAir * 0.3D); + this.landMovementFactor = (float)((float)this.landMovementFactor + (float)this.capabilities.getWalkSpeed() * 0.3D); + this.jumpMovementFactor = (float)((float)this.jumpMovementFactor + (float)this.speedInAir * 0.3D); } float var1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); @@ -574,8 +574,8 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende if (par1DamageSource != null) { - this.motionX = (double)(-MathHelper.cos((this.attackedAtYaw + this.rotationYaw) * (float)Math.PI / 180.0F) * 0.1F); - this.motionZ = (double)(-MathHelper.sin((this.attackedAtYaw + this.rotationYaw) * (float)Math.PI / 180.0F) * 0.1F); + this.motionX = (float)(-MathHelper.cos((this.attackedAtYaw + this.rotationYaw) * (float)(float)Math.PI / 180.0F) * 0.1F); + this.motionZ = (float)(-MathHelper.sin((this.attackedAtYaw + this.rotationYaw) * (float)(float)Math.PI / 180.0F) * 0.1F); } else { @@ -592,7 +592,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende float var7 = this.width / 2.0F; float var8 = this.height; if(this.boundingBox == null) this.boundingBox = BigDecimalAABB.getBoundingBox(0, 0, 0, 0, 0, 0); - this.boundingBox.setBounds(x - (double)var7, y - (double)this.yOffset + (double)this.ySize, z - (double)var7, x + (double)var7, y - (double)this.yOffset + (double)this.ySize + (double)var8, z + (double)var7); + this.boundingBox.setBounds(x - (float)var7, y - (float)this.yOffset + (float)this.ySize, z - (float)var7, x + (float)var7, y - (float)this.yOffset + (float)this.ySize + (float)var8, z + (float)var7); } public void setPosition(BigDecimal x, double y, BigDecimal z) { @@ -600,7 +600,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende BigDecimal var7 = BigDecimal.valueOf(this.width / 2.0F); float var8 = this.height; if(this.boundingBox == null) this.boundingBox = BigDecimalAABB.getBoundingBox(0, 0, 0, 0, 0, 0); - this.boundingBox.setBounds(x.subtract(var7), y - (double)this.yOffset + (double)this.ySize, z.subtract(var7), x.add(var7), y - (double)this.yOffset + (double)this.ySize + (double)var8, z.add(var7)); + this.boundingBox.setBounds(x.subtract(var7), y - (float)this.yOffset + (float)this.ySize, z.subtract(var7), x.add(var7), y - (float)this.yOffset + (float)this.ySize + (float)var8, z.add(var7)); } public void setLocationAndAngles(BigDecimal posX, double posY, BigDecimal posZ, float rotationYaw, @@ -625,7 +625,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende { this.boundingBox.offset(par1, par3, par5); this.posXBig = (this.boundingBox.minX.add(this.boundingBox.maxX)).divide(BigDecimal.valueOf(2)); - this.posY = this.boundingBox.minY + (double)this.yOffset - (double)this.ySize; + this.posY = this.boundingBox.minY + (float)this.yOffset - (float)this.ySize; this.posZBig = (this.boundingBox.minZ.add(this.boundingBox.maxZ)).divide(BigDecimal.valueOf(2)); } else @@ -780,7 +780,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende var23 = par3; double var25 = par5; par1 = var11; - par3 = (double)this.stepHeight; + par3 = (float)this.stepHeight; par5 = var15; BigDecimalAABB var27 = this.boundingBox.copy(); this.boundingBox.setBB(var17); @@ -838,7 +838,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende } else { - par3 = (double)(-this.stepHeight); + par3 = (float)(-this.stepHeight); for (var28 = var30.iterator(); var28.hasNext(); par3 = var29.calculateYOffset(bb, par3)) { @@ -857,11 +857,11 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende } else { - double var37 = this.boundingBox.minY - (double)((int)this.boundingBox.minY); + double var37 = this.boundingBox.minY - (float)((int)this.boundingBox.minY); if (var37 > 0.0D) { - this.ySize = (float)((double)this.ySize + var37 + 0.01D); + this.ySize = (float)((float)this.ySize + var37 + 0.01D); } } } @@ -927,7 +927,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende } else { - EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY - 0.30000001192092896D + (double)this.getEyeHeight(), this.posZ, par1ItemStack); + EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY - 0.30000001192092896D + (float)this.getEyeHeight(), this.posZ, par1ItemStack); var3.delayBeforeCanPickup = 40; float var4 = 0.1F; float var5; @@ -935,23 +935,23 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende if (par2) { var5 = this.rand.nextFloat() * 0.5F; - float var6 = this.rand.nextFloat() * (float)Math.PI * 2.0F; - var3.motionX = (double)(-MathHelper.sin(var6) * var5); - var3.motionZ = (double)(MathHelper.cos(var6) * var5); + float var6 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; + var3.motionX = (float)(-MathHelper.sin(var6) * var5); + var3.motionZ = (float)(MathHelper.cos(var6) * var5); var3.motionY = 0.20000000298023224D; } else { var4 = 0.3F; - var3.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var4); - var3.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var4); - var3.motionY = (double)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI) * var4 + 0.1F); + var3.motionX = (float)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var4); + var3.motionZ = (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var4); + var3.motionY = (float)(-MathHelper.sin(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var4 + 0.1F); var4 = 0.02F; - var5 = this.rand.nextFloat() * (float)Math.PI * 2.0F; + var5 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; var4 *= this.rand.nextFloat(); - var3.motionX += Math.cos((double)var5) * (double)var4; - var3.motionY += (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); - var3.motionZ += Math.sin((double)var5) * (double)var4; + var3.motionX += (float)Math.cos((float)var5) * (float)var4; + var3.motionY += (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); + var3.motionZ += (float)Math.sin((float)var5) * (float)var4; } this.joinEntityItemWithWorld(var3); @@ -1367,7 +1367,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende */ public double getYOffset() { - return (double)(this.yOffset - 0.5F); + return (float)(this.yOffset - 0.5F); } /** @@ -1432,7 +1432,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende { if (var3 > 0) { - par1Entity.addVelocity((double)(-MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F) * (float)var3 * 0.5F), 0.1D, (double)(MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F) * (float)var3 * 0.5F)); + par1Entity.addVelocity((float)(-MathHelper.sin(this.rotationYaw * (float)(float)Math.PI / 180.0F) * (float)var3 * 0.5F), 0.1D, (float)(MathHelper.cos(this.rotationYaw * (float)(float)Math.PI / 180.0F) * (float)var3 * 0.5F)); this.motionX *= 0.6D; this.motionZ *= 0.6D; this.setSprinting(false); @@ -1550,14 +1550,14 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende return EnumStatus.NOT_POSSIBLE_NOW; } - if (Math.abs(this.posX - (double)x) > 3.0D || Math.abs(this.posY - (double)y) > 2.0D || Math.abs(this.posZ - (double)z) > 3.0D) + if (Math.abs(this.posX - (float)x) > 3.0D || Math.abs(this.posY - (float)y) > 2.0D || Math.abs(this.posZ - (float)z) > 3.0D) { return EnumStatus.TOO_FAR_AWAY; } double var4 = 8.0D; double var6 = 5.0D; - List var8 = this.worldObj.getEntitiesWithinAABB(EntityMob.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)x - var4, (double)y - var6, (double)z - var4, (double)x + var4, (double)y + var6, (double)x + var4)); + List var8 = this.worldObj.getEntitiesWithinAABB(EntityMob.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)x - var4, (float)y - var6, (float)z - var4, (float)x + var4, (float)y + var6, (float)x + var4)); if (!var8.isEmpty()) { @@ -1594,11 +1594,11 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende } this.func_71013_b(var5); - this.setPosition((double)((float)x + var10), (double)((float)y + 0.9375F), (double)((float)z + var7)); + this.setPosition((float)((float)x + var10), (float)((float)y + 0.9375F), (float)((float)z + var7)); } else { - this.setPosition((double)((float)x + 0.5F), (double)((float)y + 0.9375F), (double)((float)z + 0.5F)); + this.setPosition((float)((float)x + 0.5F), (float)((float)y + 0.9375F), (float)((float)z + 0.5F)); } this.sleeping = true; @@ -1658,7 +1658,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende var5 = new ChunkCoordinates(var4.posX, var4.posY + 1, var4.posZ); } - this.setPosition((double)((float)var5.posX.floatValue() + 0.5F), (double)((float)var5.posY + this.yOffset + 0.1F), (double)((float)var5.posZ.floatValue() + 0.5F)); + this.setPosition((float)((float)var5.posX.floatValue() + 0.5F), (float)((float)var5.posY + this.yOffset + 0.1F), (float)((float)var5.posZ.floatValue() + 0.5F)); } this.sleeping = false; @@ -1935,7 +1935,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende { this.startMinecartRidingCoordinate = new ChunkCoordinates(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)); } - else if ((double)this.startMinecartRidingCoordinate.getDistanceSquared(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)) >= 1000000.0D) + else if ((float)this.startMinecartRidingCoordinate.getDistanceSquared(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)) >= 1000000.0D) { this.addStat(AchievementList.onARail, 1); } @@ -1961,7 +1961,7 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende { if (par1 >= 2.0F) { - this.addStat(StatList.distanceFallenStat, (int)Math.round((double)par1 * 100.0D)); + this.addStat(StatList.distanceFallenStat, (int)Math.round((float)par1 * 100.0D)); } super.fall(par1); diff --git a/src/minecraft/net/minecraft/src/EntityPlayerMP.java b/src/minecraft/net/minecraft/src/EntityPlayerMP.java index 69fb34e..4d385ca 100644 --- a/src/minecraft/net/minecraft/src/EntityPlayerMP.java +++ b/src/minecraft/net/minecraft/src/EntityPlayerMP.java @@ -89,7 +89,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting var7 = var7.add(BigInteger.valueOf(this.rand.nextInt(20) - 10)); } - this.setLocationAndAngles((double)var6.doubleValue() + 0.5D, (double)var8, (double)var7.doubleValue() + 0.5D, 0.0F, 0.0F); + this.setLocationAndAngles((float)var6.doubleValue() + 0.5D, (float)var8, (float)var7.doubleValue() + 0.5D, 0.0F, 0.0F); this.mcServer = par1MinecraftServer; this.stepHeight = 0.0F; this.username = par3Str; @@ -401,7 +401,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting if (var2 != null) { - this.serverForThisPlayer.setPlayerLocation((double)var2.posX.doubleValue(), (double)var2.posY, (double)var2.posZ.doubleValue(), 0.0F, 0.0F); + this.serverForThisPlayer.setPlayerLocation((float)var2.posX.doubleValue(), (float)var2.posY, (float)var2.posZ.doubleValue(), 0.0F, 0.0F); } this.mcServer.getConfigurationManager().transferPlayerToDimension(this, 1); diff --git a/src/minecraft/net/minecraft/src/EntityPlayerSP.java b/src/minecraft/net/minecraft/src/EntityPlayerSP.java index d1e1c11..674e289 100644 --- a/src/minecraft/net/minecraft/src/EntityPlayerSP.java +++ b/src/minecraft/net/minecraft/src/EntityPlayerSP.java @@ -56,8 +56,8 @@ public class EntityPlayerSP extends EntityPlayer this.isJumping = this.movementInput.jump; this.prevRenderArmYaw = this.renderArmYaw; this.prevRenderArmPitch = this.renderArmPitch; - this.renderArmPitch = (float)((double)this.renderArmPitch + (double)(this.rotationPitch - this.renderArmPitch) * 0.5D); - this.renderArmYaw = (float)((double)this.renderArmYaw + (double)(this.rotationYaw - this.renderArmYaw) * 0.5D); + this.renderArmPitch = (float)((float)this.renderArmPitch + (float)(this.rotationPitch - this.renderArmPitch) * 0.5D); + this.renderArmYaw = (float)((float)this.renderArmYaw + (float)(this.rotationYaw - this.renderArmYaw) * 0.5D); } /** @@ -172,10 +172,10 @@ public class EntityPlayerSP extends EntityPlayer this.ySize = 0.2F; } - this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (double)this.width * 0.35D); - this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D); - this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D); - this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (double)this.width * 0.35D); + this.pushOutOfBlocks(this.posX - (float)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (float)this.width * 0.35D); + this.pushOutOfBlocks(this.posX - (float)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (float)this.width * 0.35D); + this.pushOutOfBlocks(this.posX + (float)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (float)this.width * 0.35D); + this.pushOutOfBlocks(this.posX + (float)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (float)this.width * 0.35D); boolean var4 = (float)this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying; if (this.onGround && !var3 && this.movementInput.moveForward >= var2 && !this.isSprinting() && var4 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness)) @@ -485,8 +485,8 @@ public class EntityPlayerSP extends EntityPlayer BigInteger var7 = MathHelper.floor_double_BigInteger(par1); int var8 = MathHelper.floor_double(par3); BigInteger var9 = MathHelper.floor_double_BigInteger(par5); - double var10 = par1 - (double)var7.doubleValue(); - double var12 = par5 - (double)var9.doubleValue(); + double var10 = par1 - (float)var7.doubleValue(); + double var12 = par5 - (float)var9.doubleValue(); if (this.isBlockTranslucent(var7, var8, var9) || this.isBlockTranslucent(var7, var8 + 1, var9)) { @@ -525,22 +525,22 @@ public class EntityPlayerSP extends EntityPlayer if (var18 == 0) { - this.motionX = (double)(-var21); + this.motionX = (float)(-var21); } if (var18 == 1) { - this.motionX = (double)var21; + this.motionX = (float)var21; } if (var18 == 4) { - this.motionZ = (double)(-var21); + this.motionZ = (float)(-var21); } if (var18 == 5) { - this.motionZ = (double)var21; + this.motionZ = (float)var21; } } diff --git a/src/minecraft/net/minecraft/src/EntityPortalFX.java b/src/minecraft/net/minecraft/src/EntityPortalFX.java index 5eb0faf..880ded5 100644 --- a/src/minecraft/net/minecraft/src/EntityPortalFX.java +++ b/src/minecraft/net/minecraft/src/EntityPortalFX.java @@ -77,9 +77,9 @@ public class EntityPortalFX extends EntityFX float var2 = var1; var1 = -var1 + var1 * var1 * 2.0F; var1 = 1.0F - var1; - this.posX = this.portalPosX + this.motionX * (double)var1; - this.posY = this.portalPosY + this.motionY * (double)var1 + (double)(1.0F - var2); - this.posZ = this.portalPosZ + this.motionZ * (double)var1; + this.posX = this.portalPosX + this.motionX * (float)var1; + this.posY = this.portalPosY + this.motionY * (float)var1 + (float)(1.0F - var2); + this.posZ = this.portalPosZ + this.motionZ * (float)var1; if (this.particleAge++ >= this.particleMaxAge) { diff --git a/src/minecraft/net/minecraft/src/EntityPotion.java b/src/minecraft/net/minecraft/src/EntityPotion.java index 5639a6d..e9d8e11 100644 --- a/src/minecraft/net/minecraft/src/EntityPotion.java +++ b/src/minecraft/net/minecraft/src/EntityPotion.java @@ -98,7 +98,7 @@ public class EntityPotion extends EntityThrowable } else { - int var14 = (int)(var9 * (double)var12.getDuration() + 0.5D); + int var14 = (int)(var9 * (float)var12.getDuration() + 0.5D); if (var14 > 20) { diff --git a/src/minecraft/net/minecraft/src/EntityRainFX.java b/src/minecraft/net/minecraft/src/EntityRainFX.java index c0c2b24..06918ae 100644 --- a/src/minecraft/net/minecraft/src/EntityRainFX.java +++ b/src/minecraft/net/minecraft/src/EntityRainFX.java @@ -6,7 +6,7 @@ public class EntityRainFX extends EntityFX { super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D); this.motionX *= 0.30000001192092896D; - this.motionY = (double)((float)Math.random() * 0.2F + 0.1F); + this.motionY = (float)((float)Math.random() * 0.2F + 0.1F); this.motionZ *= 0.30000001192092896D; this.particleRed = 1.0F; this.particleGreen = 1.0F; @@ -25,7 +25,7 @@ public class EntityRainFX extends EntityFX this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; - this.motionY -= (double)this.particleGravity; + this.motionY -= (float)this.particleGravity; this.moveEntity(this.motionX, this.motionY, this.motionZ); this.motionX *= 0.9800000190734863D; this.motionY *= 0.9800000190734863D; @@ -51,7 +51,7 @@ public class EntityRainFX extends EntityFX if (var1.isLiquid() || var1.isSolid()) { - double var2 = (double)((float)(MathHelper.floor_double(this.posY) + 1) - BlockFluid.getFluidHeightPercent(this.worldObj.getBlockMetadata(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)))); + double var2 = (float)((float)(MathHelper.floor_double(this.posY) + 1) - BlockFluid.getFluidHeightPercent(this.worldObj.getBlockMetadata(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)))); if (this.posY < var2) { diff --git a/src/minecraft/net/minecraft/src/EntityRenderer.java b/src/minecraft/net/minecraft/src/EntityRenderer.java index 31d2fc3..2309cf2 100644 --- a/src/minecraft/net/minecraft/src/EntityRenderer.java +++ b/src/minecraft/net/minecraft/src/EntityRenderer.java @@ -215,7 +215,7 @@ public class EntityRenderer { if (this.mc.theWorld != null) { - double var2 = (double)this.mc.playerController.getBlockReachDistance(); + double var2 = (float)this.mc.playerController.getBlockReachDistance(); this.mc.objectMouseOver = this.mc.renderViewEntity.rayTrace(var2, par1); double var4 = var2; Vec3 var6 = this.mc.renderViewEntity.getPosition(par1); @@ -244,7 +244,7 @@ public class EntityRenderer Vec3 var8 = var6.addVector(var7.xCoord * var2, var7.yCoord * var2, var7.zCoord * var2); this.pointedEntity = null; float var9 = 1.0F; - List var10 = this.mc.theWorld.getEntitiesWithinAABBExcludingEntity(this.mc.renderViewEntity, this.mc.renderViewEntity.boundingBox.addCoord(var7.xCoord * var2, var7.yCoord * var2, var7.zCoord * var2).expand((double)var9, (double)var9, (double)var9)); + List var10 = this.mc.theWorld.getEntitiesWithinAABBExcludingEntity(this.mc.renderViewEntity, this.mc.renderViewEntity.boundingBox.addCoord(var7.xCoord * var2, var7.yCoord * var2, var7.zCoord * var2).expand((float)var9, (float)var9, (float)var9)); double var11 = var4; Iterator var13 = var10.iterator(); @@ -255,7 +255,7 @@ public class EntityRenderer if (var14.canBeCollidedWith()) { float var15 = var14.getCollisionBorderSize(); - AxisAlignedBB var16 = var14.boundingBox.expand((double)var15, (double)var15, (double)var15); + AxisAlignedBB var16 = var14.boundingBox.expand((float)var15, (float)var15, (float)var15); MovingObjectPosition var17 = var16.calculateIntercept(var6, var8); if (var16.isVecInside(var6)) @@ -350,7 +350,7 @@ public class EntityRenderer if (var3 >= 0.0F) { var3 /= (float)var2.maxHurtTime; - var3 = MathHelper.sin(var3 * var3 * var3 * var3 * (float)Math.PI); + var3 = MathHelper.sin(var3 * var3 * var3 * var3 * (float)(float)Math.PI); var4 = var2.attackedAtYaw; GL11.glRotatef(-var4, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-var3 * 14.0F, 0.0F, 0.0F, 1.0F); @@ -370,9 +370,9 @@ public class EntityRenderer float var4 = -(var2.distanceWalkedModified + var3 * par1); float var5 = var2.prevCameraYaw + (var2.cameraYaw - var2.prevCameraYaw) * par1; float var6 = var2.prevCameraPitch + (var2.cameraPitch - var2.prevCameraPitch) * par1; - GL11.glTranslatef(MathHelper.sin(var4 * (float)Math.PI) * var5 * 0.5F, -Math.abs(MathHelper.cos(var4 * (float)Math.PI) * var5), 0.0F); - GL11.glRotatef(MathHelper.sin(var4 * (float)Math.PI) * var5 * 3.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(Math.abs(MathHelper.cos(var4 * (float)Math.PI - 0.2F) * var5) * 5.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslatef(MathHelper.sin(var4 * (float)(float)Math.PI) * var5 * 0.5F, -Math.abs(MathHelper.cos(var4 * (float)(float)Math.PI) * var5), 0.0F); + GL11.glRotatef(MathHelper.sin(var4 * (float)(float)Math.PI) * var5 * 3.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(Math.abs(MathHelper.cos(var4 * (float)(float)Math.PI - 0.2F) * var5) * 5.0F, 1.0F, 0.0F, 0.0F); GL11.glRotatef(var6, 1.0F, 0.0F, 0.0F); } } @@ -384,16 +384,16 @@ public class EntityRenderer { EntityLiving var2 = this.mc.renderViewEntity; float var3 = var2.yOffset - 1.62F; - double var4 = var2.prevPosX + (var2.posX - var2.prevPosX) * (double)par1; - double var6 = var2.prevPosY + (var2.posY - var2.prevPosY) * (double)par1 - (double)var3; - double var8 = var2.prevPosZ + (var2.posZ - var2.prevPosZ) * (double)par1; + double var4 = var2.prevPosX + (var2.posX - var2.prevPosX) * (float)par1; + double var6 = var2.prevPosY + (var2.posY - var2.prevPosY) * (float)par1 - (float)var3; + double var8 = var2.prevPosZ + (var2.posZ - var2.prevPosZ) * (float)par1; GL11.glRotatef(this.prevCamRoll + (this.camRoll - this.prevCamRoll) * par1, 0.0F, 0.0F, 1.0F); // System.out.println(var4); if (var2.isPlayerSleeping()) { - var3 = (float)((double)var3 + 1.0D); + var3 = (float)((float)var3 + 1.0D); GL11.glTranslatef(0.0F, 0.3F, 0.0F); if (!this.mc.gameSettings.debugCamEnable) @@ -413,7 +413,7 @@ public class EntityRenderer } else if (this.mc.gameSettings.thirdPersonView > 0) { - double var27 = (double)(this.thirdPersonDistanceTemp + (this.thirdPersonDistance - this.thirdPersonDistanceTemp) * par1); + double var27 = (float)(this.thirdPersonDistanceTemp + (this.thirdPersonDistance - this.thirdPersonDistanceTemp) * par1); float var13; float var28; @@ -435,9 +435,9 @@ public class EntityRenderer var13 += 180.0F; } - double var14 = (double)(-MathHelper.sin(var28 / 180.0F * (float)Math.PI) * MathHelper.cos(var13 / 180.0F * (float)Math.PI)) * var27; - double var16 = (double)(MathHelper.cos(var28 / 180.0F * (float)Math.PI) * MathHelper.cos(var13 / 180.0F * (float)Math.PI)) * var27; - double var18 = (double)(-MathHelper.sin(var13 / 180.0F * (float)Math.PI)) * var27; + double var14 = (float)(-MathHelper.sin(var28 / 180.0F * (float)(float)Math.PI) * MathHelper.cos(var13 / 180.0F * (float)(float)Math.PI)) * var27; + double var16 = (float)(MathHelper.cos(var28 / 180.0F * (float)(float)Math.PI) * MathHelper.cos(var13 / 180.0F * (float)(float)Math.PI)) * var27; + double var18 = (float)(-MathHelper.sin(var13 / 180.0F * (float)(float)Math.PI)) * var27; for (int var20 = 0; var20 < 8; ++var20) { @@ -447,7 +447,7 @@ public class EntityRenderer var21 *= 0.1F; var22 *= 0.1F; var23 *= 0.1F; - MovingObjectPosition var24 = this.mc.theWorld.rayTraceBlocks(Vec3.getVec3Pool().getVecFromPool(var4 + (double)var21, var6 + (double)var22, var8 + (double)var23), Vec3.getVec3Pool().getVecFromPool(var4 - var14 + (double)var21 + (double)var23, var6 - var18 + (double)var22, var8 - var16 + (double)var23)); + MovingObjectPosition var24 = this.mc.theWorld.rayTraceBlocks(Vec3.getVec3Pool().getVecFromPool(var4 + (float)var21, var6 + (float)var22, var8 + (float)var23), Vec3.getVec3Pool().getVecFromPool(var4 - var14 + (float)var21 + (float)var23, var6 - var18 + (float)var22, var8 - var16 + (float)var23)); if (var24 != null) { @@ -484,9 +484,9 @@ public class EntityRenderer } GL11.glTranslatef(0.0F, var3, 0.0F); - var4 = var2.prevPosX + (var2.posX - var2.prevPosX) * (double)par1; - var6 = var2.prevPosY + (var2.posY - var2.prevPosY) * (double)par1 - (double)var3; - var8 = var2.prevPosZ + (var2.posZ - var2.prevPosZ) * (double)par1; + var4 = var2.prevPosX + (var2.posX - var2.prevPosX) * (float)par1; + var6 = var2.prevPosY + (var2.posY - var2.prevPosY) * (float)par1 - (float)var3; + var8 = var2.prevPosZ + (var2.posZ - var2.prevPosZ) * (float)par1; this.cloudFog = this.mc.renderGlobal.func_72721_a(var4, var6, var8, par1); } @@ -634,9 +634,9 @@ public class EntityRenderer if (this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.func_78747_a()) { - this.enableLightmap((double)par1); + this.enableLightmap((float)par1); this.itemRenderer.renderItemInFirstPerson(par1); - this.disableLightmap((double)par1); + this.disableLightmap((float)par1); } GL11.glPopMatrix(); @@ -693,10 +693,10 @@ public class EntityRenderer */ private void updateTorchFlicker() { - this.torchFlickerDX = (float)((double)this.torchFlickerDX + (Math.random() - Math.random()) * Math.random() * Math.random()); - this.torchFlickerDY = (float)((double)this.torchFlickerDY + (Math.random() - Math.random()) * Math.random() * Math.random()); - this.torchFlickerDX = (float)((double)this.torchFlickerDX * 0.9D); - this.torchFlickerDY = (float)((double)this.torchFlickerDY * 0.9D); + this.torchFlickerDX = (float)((float)this.torchFlickerDX + (Math.random() - Math.random()) * Math.random() * Math.random()); + this.torchFlickerDY = (float)((float)this.torchFlickerDY + (Math.random() - Math.random()) * Math.random() * Math.random()); + this.torchFlickerDX = (float)((float)this.torchFlickerDX * 0.9D); + this.torchFlickerDY = (float)((float)this.torchFlickerDY * 0.9D); this.torchFlickerX += (this.torchFlickerDX - this.torchFlickerX) * 1.0F; this.torchFlickerY += (this.torchFlickerDY - this.torchFlickerY) * 1.0F; this.lightmapUpdateNeeded = true; @@ -945,7 +945,7 @@ public class EntityRenderer RenderGlobal var5 = this.mc.renderGlobal; EffectRenderer var6 = this.mc.effectRenderer; BigDecimal var7 = var4.lastPosX == var4.posXBig ? var4.posXBig : var4.lastPosX.add(BigDecimal.valueOf(MathHelper.normalize(var4.posXBig.subtract(var4.lastPosX).doubleValue() * par1))); - double var9 = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par1; + double var9 = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (float)par1; BigDecimal var11 = var4.lastPosZ == var4.posZBig ? var4.posZBig : var4.lastPosZ.add(BigDecimal.valueOf(MathHelper.normalize(var4.posZBig.subtract(var4.lastPosZ).doubleValue() * par1))); this.mc.mcProfiler.endStartSection("center"); @@ -1018,7 +1018,7 @@ public class EntityRenderer GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/terrain.png")); RenderHelper.disableStandardItemLighting(); this.mc.mcProfiler.endStartSection("terrain"); - var5.sortAndRender(var4, 0, (double)par1); + var5.sortAndRender(var4, 0, (float)par1); GL11.glShadeModel(GL11.GL_FLAT); EntityPlayer var17; @@ -1027,14 +1027,14 @@ public class EntityRenderer RenderHelper.enableStandardItemLighting(); this.mc.mcProfiler.endStartSection("entities"); var5.renderEntities(var4.getPosition(par1), var14, par1); - this.enableLightmap((double)par1); + this.enableLightmap((float)par1); this.mc.mcProfiler.endStartSection("litParticles"); var6.func_78872_b(var4, par1); RenderHelper.disableStandardItemLighting(); this.setupFog(0, par1); this.mc.mcProfiler.endStartSection("particles"); var6.renderParticles(var4, par1); - this.disableLightmap((double)par1); + this.disableLightmap((float)par1); if (this.mc.objectMouseOver != null && var4.isInsideOfMaterial(Material.water) && var4 instanceof EntityPlayer && !this.mc.gameSettings.hideGUI) { @@ -1066,7 +1066,7 @@ public class EntityRenderer } GL11.glColorMask(false, false, false, false); - int var18 = var5.sortAndRender(var4, 1, (double)par1); + int var18 = var5.sortAndRender(var4, 1, (float)par1); if (this.mc.gameSettings.anaglyph) { @@ -1086,7 +1086,7 @@ public class EntityRenderer if (var18 > 0) { - var5.renderAllRenderLists(1, (double)par1); + var5.renderAllRenderLists(1, (float)par1); } GL11.glShadeModel(GL11.GL_FLAT); @@ -1094,7 +1094,7 @@ public class EntityRenderer else { this.mc.mcProfiler.endStartSection("water"); - var5.sortAndRender(var4, 1, (double)par1); + var5.sortAndRender(var4, 1, (float)par1); } GL11.glDepthMask(true); @@ -1201,7 +1201,7 @@ public class EntityRenderer { if (Block.blocksList[var20].blockMaterial == Material.lava) { - this.mc.effectRenderer.addEffect(new EntitySmokeFX(var3, (double)((float)var17.floatValue() + var22), (double)((float)var19 + 0.1F) - Block.blocksList[var20].minY, (double)((float)var18.floatValue() + var23), 0.0D, 0.0D, 0.0D)); + this.mc.effectRenderer.addEffect(new EntitySmokeFX(var3, (float)((float)var17.floatValue() + var22), (float)((float)var19 + 0.1F) - Block.blocksList[var20].minY, (float)((float)var18.floatValue() + var23), 0.0D, 0.0D, 0.0D)); } else { @@ -1209,12 +1209,12 @@ public class EntityRenderer if (this.random.nextInt(var14) == 0) { - var8 = (double)((float)var17.floatValue() + var22); - var10 = (double)((float)var19 + 0.1F) - Block.blocksList[var20].minY; - var12 = (double)((float)var18.floatValue() + var23); + var8 = (float)((float)var17.floatValue() + var22); + var10 = (float)((float)var19 + 0.1F) - Block.blocksList[var20].minY; + var12 = (float)((float)var18.floatValue() + var23); } - this.mc.effectRenderer.addEffect(new EntityRainFX(var3, (double)((float)var17.floatValue() + var22), (double)((float)var19 + 0.1F) - Block.blocksList[var20].minY, (double)((float)var18.floatValue() + var23))); + this.mc.effectRenderer.addEffect(new EntityRainFX(var3, (float)((float)var17.floatValue() + var22), (float)((float)var19 + 0.1F) - Block.blocksList[var20].minY, (float)((float)var18.floatValue() + var23))); } } } @@ -1245,7 +1245,7 @@ public class EntityRenderer if (var2 > 0.0F) { - this.enableLightmap((double)par1); + this.enableLightmap((float)par1); if (this.rainXCoords == null) { @@ -1277,9 +1277,9 @@ public class EntityRenderer GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glAlphaFunc(GL11.GL_GREATER, 0.01F); GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/environment/snow.png")); - double var9 = var41.lastTickPosX + (var41.posX - var41.lastTickPosX) * (double)par1; - double var11 = var41.lastTickPosY + (var41.posY - var41.lastTickPosY) * (double)par1; - double var13 = var41.lastTickPosZ + (var41.posZ - var41.lastTickPosZ) * (double)par1; + double var9 = var41.lastTickPosX + (var41.posX - var41.lastTickPosX) * (float)par1; + double var11 = var41.lastTickPosY + (var41.posY - var41.lastTickPosY) * (float)par1; + double var13 = var41.lastTickPosZ + (var41.posZ - var41.lastTickPosZ) * (float)par1; int var15 = MathHelper.floor_double(var11); byte var16 = 5; @@ -1357,17 +1357,17 @@ public class EntityRenderer } var32 = ((float)(this.rendererUpdateCount + var21 * var21 * 3121 + var21 * 45238971 + var20 * var20 * 418711 + var20 * 13761 & 31) + par1) / 32.0F * (3.0F + this.random.nextFloat()); - double var33 = (double)((float)var21 + 0.5F) - var41.posX; - var35 = (double)((float)var20 + 0.5F) - var41.posZ; + double var33 = (float)((float)var21 + 0.5F) - var41.posX; + var35 = (float)((float)var20 + 0.5F) - var41.posZ; float var37 = MathHelper.sqrt_double(var33 * var33 + var35 * var35) / (float)var16; float var38 = 1.0F; var8.setBrightness(var42.getLightBrightnessForSkyBlocks(x, var30, z, 0)); var8.setColorRGBA_F(var38, var38, var38, ((1.0F - var37 * var37) * 0.5F + 0.5F) * var2); var8.setTranslation(-var9 * 1.0D, -var11 * 1.0D, -var13 * 1.0D); - var8.addVertexWithUV((double)((float)var21 - var23) + 0.5D, (double)var27, (double)((float)var20 - var24) + 0.5D, (double)(0.0F * var29), (double)((float)var27 * var29 / 4.0F + var32 * var29)); - var8.addVertexWithUV((double)((float)var21 + var23) + 0.5D, (double)var27, (double)((float)var20 + var24) + 0.5D, (double)(1.0F * var29), (double)((float)var27 * var29 / 4.0F + var32 * var29)); - var8.addVertexWithUV((double)((float)var21 + var23) + 0.5D, (double)var28, (double)((float)var20 + var24) + 0.5D, (double)(1.0F * var29), (double)((float)var28 * var29 / 4.0F + var32 * var29)); - var8.addVertexWithUV((double)((float)var21 - var23) + 0.5D, (double)var28, (double)((float)var20 - var24) + 0.5D, (double)(0.0F * var29), (double)((float)var28 * var29 / 4.0F + var32 * var29)); + var8.addVertexWithUV((float)((float)var21 - var23) + 0.5D, (float)var27, (float)((float)var20 - var24) + 0.5D, (float)(0.0F * var29), (float)((float)var27 * var29 / 4.0F + var32 * var29)); + var8.addVertexWithUV((float)((float)var21 + var23) + 0.5D, (float)var27, (float)((float)var20 + var24) + 0.5D, (float)(1.0F * var29), (float)((float)var27 * var29 / 4.0F + var32 * var29)); + var8.addVertexWithUV((float)((float)var21 + var23) + 0.5D, (float)var28, (float)((float)var20 + var24) + 0.5D, (float)(1.0F * var29), (float)((float)var28 * var29 / 4.0F + var32 * var29)); + var8.addVertexWithUV((float)((float)var21 - var23) + 0.5D, (float)var28, (float)((float)var20 - var24) + 0.5D, (float)(0.0F * var29), (float)((float)var28 * var29 / 4.0F + var32 * var29)); var8.setTranslation(0.0D, 0.0D, 0.0D); } else @@ -1387,17 +1387,17 @@ public class EntityRenderer var32 = ((float)(this.rendererUpdateCount & 511) + par1) / 512.0F; float var46 = this.random.nextFloat() + var19 * 0.01F * (float)this.random.nextGaussian(); float var34 = this.random.nextFloat() + var19 * (float)this.random.nextGaussian() * 0.001F; - var35 = (double)((float)var21 + 0.5F) - var41.posX; - double var47 = (double)((float)var20 + 0.5F) - var41.posZ; + var35 = (float)((float)var21 + 0.5F) - var41.posX; + double var47 = (float)((float)var20 + 0.5F) - var41.posZ; float var39 = MathHelper.sqrt_double(var35 * var35 + var47 * var47) / (float)var16; float var40 = 1.0F; var8.setBrightness((var42.getLightBrightnessForSkyBlocks(x, var30, z, 0) * 3 + 15728880) / 4); var8.setColorRGBA_F(var40, var40, var40, ((1.0F - var39 * var39) * 0.3F + 0.5F) * var2); var8.setTranslation(-var9 * 1.0D, -var11 * 1.0D, -var13 * 1.0D); - var8.addVertexWithUV((double)((float)var21 - var23) + 0.5D, (double)var27, (double)((float)var20 - var24) + 0.5D, (double)(0.0F * var29 + var46), (double)((float)var27 * var29 / 4.0F + var32 * var29 + var34)); - var8.addVertexWithUV((double)((float)var21 + var23) + 0.5D, (double)var27, (double)((float)var20 + var24) + 0.5D, (double)(1.0F * var29 + var46), (double)((float)var27 * var29 / 4.0F + var32 * var29 + var34)); - var8.addVertexWithUV((double)((float)var21 + var23) + 0.5D, (double)var28, (double)((float)var20 + var24) + 0.5D, (double)(1.0F * var29 + var46), (double)((float)var28 * var29 / 4.0F + var32 * var29 + var34)); - var8.addVertexWithUV((double)((float)var21 - var23) + 0.5D, (double)var28, (double)((float)var20 - var24) + 0.5D, (double)(0.0F * var29 + var46), (double)((float)var28 * var29 / 4.0F + var32 * var29 + var34)); + var8.addVertexWithUV((float)((float)var21 - var23) + 0.5D, (float)var27, (float)((float)var20 - var24) + 0.5D, (float)(0.0F * var29 + var46), (float)((float)var27 * var29 / 4.0F + var32 * var29 + var34)); + var8.addVertexWithUV((float)((float)var21 + var23) + 0.5D, (float)var27, (float)((float)var20 + var24) + 0.5D, (float)(1.0F * var29 + var46), (float)((float)var27 * var29 / 4.0F + var32 * var29 + var34)); + var8.addVertexWithUV((float)((float)var21 + var23) + 0.5D, (float)var28, (float)((float)var20 + var24) + 0.5D, (float)(1.0F * var29 + var46), (float)((float)var28 * var29 / 4.0F + var32 * var29 + var34)); + var8.addVertexWithUV((float)((float)var21 - var23) + 0.5D, (float)var28, (float)((float)var20 - var24) + 0.5D, (float)(0.0F * var29 + var46), (float)((float)var28 * var29 / 4.0F + var32 * var29 + var34)); var8.setTranslation(0.0D, 0.0D, 0.0D); } } @@ -1413,7 +1413,7 @@ public class EntityRenderer GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_BLEND); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - this.disableLightmap((double)par1); + this.disableLightmap((float)par1); } } @@ -1440,7 +1440,7 @@ public class EntityRenderer WorldClient var2 = this.mc.theWorld; EntityLiving var3 = this.mc.renderViewEntity; float var4 = 1.0F / (float)(4 - this.mc.gameSettings.renderDistance); - var4 = 1.0F - (float)Math.pow((double)var4, 0.25D); + var4 = 1.0F - (float)Math.pow((float)var4, 0.25D); Vec3 var5 = var2.getSkyColor(this.mc.renderViewEntity, par1); float var6 = (float)var5.xCoord; float var7 = (float)var5.yCoord; @@ -1526,7 +1526,7 @@ public class EntityRenderer this.fogColorRed *= var22; this.fogColorGreen *= var22; this.fogColorBlue *= var22; - double var14 = (var3.lastTickPosY + (var3.posY - var3.lastTickPosY) * (double)par1) * var2.provider.getVoidFogYFactor(); + double var14 = (var3.lastTickPosY + (var3.posY - var3.lastTickPosY) * (float)par1) * var2.provider.getVoidFogYFactor(); if (var3.isPotionActive(Potion.blindness)) { @@ -1534,7 +1534,7 @@ public class EntityRenderer if (var16 < 20) { - var14 *= (double)(1.0F - (float)var16 / 20.0F); + var14 *= (float)(1.0F - (float)var16 / 20.0F); } else { @@ -1550,9 +1550,9 @@ public class EntityRenderer } var14 *= var14; - this.fogColorRed = (float)((double)this.fogColorRed * var14); - this.fogColorGreen = (float)((double)this.fogColorGreen * var14); - this.fogColorBlue = (float)((double)this.fogColorBlue * var14); + this.fogColorRed = (float)((float)this.fogColorRed * var14); + this.fogColorGreen = (float)((float)this.fogColorGreen * var14); + this.fogColorBlue = (float)((float)this.fogColorBlue * var14); } if (this.mc.gameSettings.anaglyph) @@ -1700,7 +1700,7 @@ public class EntityRenderer if (this.mc.theWorld.provider.getWorldHasVoidParticles() && !var4) { - double var13 = (double)((var3.getBrightnessForRender(par2) & 15728640) >> 20) / 16.0D + (var3.lastTickPosY + (var3.posY - var3.lastTickPosY) * (double)par2 + 4.0D) / 32.0D; + double var13 = (float)((var3.getBrightnessForRender(par2) & 15728640) >> 20) / 16.0D + (var3.lastTickPosY + (var3.posY - var3.lastTickPosY) * (float)par2 + 4.0D) / 32.0D; if (var13 < 1.0D) { diff --git a/src/minecraft/net/minecraft/src/EntitySheep.java b/src/minecraft/net/minecraft/src/EntitySheep.java index 44a2ef1..0a76f32 100644 --- a/src/minecraft/net/minecraft/src/EntitySheep.java +++ b/src/minecraft/net/minecraft/src/EntitySheep.java @@ -116,11 +116,11 @@ public class EntitySheep extends EntityAnimal if (this.sheepTimer > 4 && this.sheepTimer <= 36) { float var2 = ((float)(this.sheepTimer - 4) - par1) / 32.0F; - return ((float)Math.PI / 5F) + ((float)Math.PI * 7F / 100F) * MathHelper.sin(var2 * 28.7F); + return ((float)(float)Math.PI / 5F) + ((float)(float)Math.PI * 7F / 100F) * MathHelper.sin(var2 * 28.7F); } else { - return this.sheepTimer > 0 ? ((float)Math.PI / 5F) : this.rotationPitch / (180F / (float)Math.PI); + return this.sheepTimer > 0 ? ((float)(float)Math.PI / 5F) : this.rotationPitch / (180F / (float)(float)Math.PI); } } @@ -141,9 +141,9 @@ public class EntitySheep extends EntityAnimal for (int var4 = 0; var4 < var3; ++var4) { EntityItem var5 = this.entityDropItem(new ItemStack(Block.cloth.blockID, 1, this.getFleeceColor()), 1.0F); - var5.motionY += (double)(this.rand.nextFloat() * 0.05F); - var5.motionX += (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); - var5.motionZ += (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); + var5.motionY += (float)(this.rand.nextFloat() * 0.05F); + var5.motionX += (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); + var5.motionZ += (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.1F); } } diff --git a/src/minecraft/net/minecraft/src/EntitySlime.java b/src/minecraft/net/minecraft/src/EntitySlime.java index 32742c7..f03dd5b 100644 --- a/src/minecraft/net/minecraft/src/EntitySlime.java +++ b/src/minecraft/net/minecraft/src/EntitySlime.java @@ -103,11 +103,11 @@ public class EntitySlime extends EntityLiving implements IMob for (int var3 = 0; var3 < var2 * 8; ++var3) { - float var4 = this.rand.nextFloat() * (float)Math.PI * 2.0F; + float var4 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; float var5 = this.rand.nextFloat() * 0.5F + 0.5F; float var6 = MathHelper.sin(var4) * (float)var2 * 0.5F * var5; float var7 = MathHelper.cos(var4) * (float)var2 * 0.5F * var5; - this.worldObj.spawnParticle(this.getSlimeParticle(), this.posX + (double)var6, this.boundingBox.minY, this.posZ + (double)var7, 0.0D, 0.0D, 0.0D); + this.worldObj.spawnParticle(this.getSlimeParticle(), this.posX + (float)var6, this.boundingBox.minY, this.posZ + (float)var7, 0.0D, 0.0D, 0.0D); } if (this.makesSoundOnLand()) @@ -200,7 +200,7 @@ public class EntitySlime extends EntityLiving implements IMob float var5 = ((float)(var3 / 2) - 0.5F) * (float)var1 / 4.0F; EntitySlime var6 = this.createInstance(); var6.setSlimeSize(var1 / 2); - var6.setLocationAndAngles(this.posX + (double)var4, this.posY + 0.5D, this.posZ + (double)var5, this.rand.nextFloat() * 360.0F, 0.0F); + var6.setLocationAndAngles(this.posX + (float)var4, this.posY + 0.5D, this.posZ + (float)var5, this.rand.nextFloat() * 360.0F, 0.0F); this.worldObj.spawnEntityInWorld(var6); } } @@ -217,7 +217,7 @@ public class EntitySlime extends EntityLiving implements IMob { int var2 = this.getSlimeSize(); - if (this.canEntityBeSeen(par1EntityPlayer) && this.getDistanceSqToEntity(par1EntityPlayer) < 0.6D * (double)var2 * 0.6D * (double)var2 && par1EntityPlayer.attackEntityFrom(DamageSource.causeMobDamage(this), this.getAttackStrength())) + if (this.canEntityBeSeen(par1EntityPlayer) && this.getDistanceSqToEntity(par1EntityPlayer) < 0.6D * (float)var2 * 0.6D * (float)var2 && par1EntityPlayer.attackEntityFrom(DamageSource.causeMobDamage(this), this.getAttackStrength())) { this.worldObj.playSoundAtEntity(this, "mob.slimeattack", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); } diff --git a/src/minecraft/net/minecraft/src/EntitySnowman.java b/src/minecraft/net/minecraft/src/EntitySnowman.java index 7253b99..093b5f3 100644 --- a/src/minecraft/net/minecraft/src/EntitySnowman.java +++ b/src/minecraft/net/minecraft/src/EntitySnowman.java @@ -53,9 +53,9 @@ public class EntitySnowman extends EntityGolem for (int var1 = 0; var1 < 4; ++var1) { - x = MathHelper.floor_double_BigInteger(this.posX + (double)((float)(var1 % 2 * 2 - 1) * 0.25F)); + x = MathHelper.floor_double_BigInteger(this.posX + (float)((float)(var1 % 2 * 2 - 1) * 0.25F)); int var3 = MathHelper.floor_double(this.posY); - z = MathHelper.floor_double_BigInteger(this.posZ + (double)((float)(var1 / 2 % 2 * 2 - 1) * 0.25F)); + z = MathHelper.floor_double_BigInteger(this.posZ + (float)((float)(var1 / 2 % 2 * 2 - 1) * 0.25F)); if (this.worldObj.getBlockId(x, var3, z) == 0 && this.worldObj.getBiomeGenForCoords(x, z).getFloatTemperature() < 0.8F && Block.snow.canPlaceBlockAt(this.worldObj, x, var3, z)) { diff --git a/src/minecraft/net/minecraft/src/EntitySorter.java b/src/minecraft/net/minecraft/src/EntitySorter.java index e6204fa..7bddb8a 100644 --- a/src/minecraft/net/minecraft/src/EntitySorter.java +++ b/src/minecraft/net/minecraft/src/EntitySorter.java @@ -25,12 +25,12 @@ public class EntitySorter implements Comparator */ public int sortByDistanceToEntity(WorldRenderer par1WorldRenderer, WorldRenderer par2WorldRenderer) { - double var3 = (double)par1WorldRenderer.posXPlus.doubleValue() + this.entityPosX; - double var5 = (double)par1WorldRenderer.posYPlus + this.entityPosY; - double var7 = (double)par1WorldRenderer.posZPlus.doubleValue() + this.entityPosZ; - double var9 = (double)par2WorldRenderer.posXPlus.doubleValue() + this.entityPosX; - double var11 = (double)par2WorldRenderer.posYPlus + this.entityPosY; - double var13 = (double)par2WorldRenderer.posZPlus.doubleValue() + this.entityPosZ; + double var3 = (float)par1WorldRenderer.posXPlus.doubleValue() + this.entityPosX; + double var5 = (float)par1WorldRenderer.posYPlus + this.entityPosY; + double var7 = (float)par1WorldRenderer.posZPlus.doubleValue() + this.entityPosZ; + double var9 = (float)par2WorldRenderer.posXPlus.doubleValue() + this.entityPosX; + double var11 = (float)par2WorldRenderer.posYPlus + this.entityPosY; + double var13 = (float)par2WorldRenderer.posZPlus.doubleValue() + this.entityPosZ; return (int)((var3 * var3 + var5 * var5 + var7 * var7 - (var9 * var9 + var11 * var11 + var13 * var13)) * 1024.0D); } diff --git a/src/minecraft/net/minecraft/src/EntitySpider.java b/src/minecraft/net/minecraft/src/EntitySpider.java index f7ec396..47dd637 100644 --- a/src/minecraft/net/minecraft/src/EntitySpider.java +++ b/src/minecraft/net/minecraft/src/EntitySpider.java @@ -39,7 +39,7 @@ public class EntitySpider extends EntityMob */ public double getMountedYOffset() { - return (double)this.height * 0.75D - 0.5D; + return (float)this.height * 0.75D - 0.5D; } /** @@ -114,8 +114,8 @@ public class EntitySpider extends EntityMob double var4 = par1Entity.posX - this.posX; double var6 = par1Entity.posZ - this.posZ; float var8 = MathHelper.sqrt_double(var4 * var4 + var6 * var6); - this.motionX = var4 / (double)var8 * 0.5D * 0.800000011920929D + this.motionX * 0.20000000298023224D; - this.motionZ = var6 / (double)var8 * 0.5D * 0.800000011920929D + this.motionZ * 0.20000000298023224D; + this.motionX = var4 / (float)var8 * 0.5D * 0.800000011920929D + this.motionX * 0.20000000298023224D; + this.motionZ = var6 / (float)var8 * 0.5D * 0.800000011920929D + this.motionZ * 0.20000000298023224D; this.motionY = 0.4000000059604645D; } } diff --git a/src/minecraft/net/minecraft/src/EntitySquid.java b/src/minecraft/net/minecraft/src/EntitySquid.java index 7e25365..390c21c 100644 --- a/src/minecraft/net/minecraft/src/EntitySquid.java +++ b/src/minecraft/net/minecraft/src/EntitySquid.java @@ -109,9 +109,9 @@ public class EntitySquid extends EntityWaterMob this.lastTentacleAngle = this.tentacleAngle; this.field_70867_h += this.field_70864_bA; - if (this.field_70867_h > ((float)Math.PI * 2F)) + if (this.field_70867_h > ((float)(float)Math.PI * 2F)) { - this.field_70867_h -= ((float)Math.PI * 2F); + this.field_70867_h -= ((float)(float)Math.PI * 2F); if (this.rand.nextInt(10) == 0) { @@ -123,12 +123,12 @@ public class EntitySquid extends EntityWaterMob { float var1; - if (this.field_70867_h < (float)Math.PI) + if (this.field_70867_h < (float)(float)Math.PI) { - var1 = this.field_70867_h / (float)Math.PI; - this.tentacleAngle = MathHelper.sin(var1 * var1 * (float)Math.PI) * (float)Math.PI * 0.25F; + var1 = this.field_70867_h / (float)(float)Math.PI; + this.tentacleAngle = MathHelper.sin(var1 * var1 * (float)(float)Math.PI) * (float)(float)Math.PI * 0.25F; - if ((double)var1 > 0.75D) + if ((float)var1 > 0.75D) { this.randomMotionSpeed = 1.0F; this.field_70871_bB = 1.0F; @@ -147,20 +147,20 @@ public class EntitySquid extends EntityWaterMob if (!this.worldObj.isRemote) { - this.motionX = (double)(this.randomMotionVecX * this.randomMotionSpeed); - this.motionY = (double)(this.randomMotionVecY * this.randomMotionSpeed); - this.motionZ = (double)(this.randomMotionVecZ * this.randomMotionSpeed); + this.motionX = (float)(this.randomMotionVecX * this.randomMotionSpeed); + this.motionY = (float)(this.randomMotionVecY * this.randomMotionSpeed); + this.motionZ = (float)(this.randomMotionVecZ * this.randomMotionSpeed); } var1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.renderYawOffset += (-((float)Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float)Math.PI - this.renderYawOffset) * 0.1F; + this.renderYawOffset += (-((float)Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float)(float)Math.PI - this.renderYawOffset) * 0.1F; this.rotationYaw = this.renderYawOffset; - this.field_70859_f += (float)Math.PI * this.field_70871_bB * 1.5F; - this.field_70861_d += (-((float)Math.atan2((double)var1, this.motionY)) * 180.0F / (float)Math.PI - this.field_70861_d) * 0.1F; + this.field_70859_f += (float)(float)Math.PI * this.field_70871_bB * 1.5F; + this.field_70861_d += (-((float)Math.atan2((float)var1, this.motionY)) * 180.0F / (float)(float)Math.PI - this.field_70861_d) * 0.1F; } else { - this.tentacleAngle = MathHelper.abs(MathHelper.sin(this.field_70867_h)) * (float)Math.PI * 0.25F; + this.tentacleAngle = MathHelper.abs(MathHelper.sin(this.field_70867_h)) * (float)(float)Math.PI * 0.25F; if (!this.worldObj.isRemote) { @@ -170,7 +170,7 @@ public class EntitySquid extends EntityWaterMob this.motionZ = 0.0D; } - this.field_70861_d = (float)((double)this.field_70861_d + (double)(-90.0F - this.field_70861_d) * 0.02D); + this.field_70861_d = (float)((float)this.field_70861_d + (float)(-90.0F - this.field_70861_d) * 0.02D); } } @@ -192,7 +192,7 @@ public class EntitySquid extends EntityWaterMob } else if (this.rand.nextInt(50) == 0 || !this.inWater || this.randomMotionVecX == 0.0F && this.randomMotionVecY == 0.0F && this.randomMotionVecZ == 0.0F) { - float var1 = this.rand.nextFloat() * (float)Math.PI * 2.0F; + float var1 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; this.randomMotionVecX = MathHelper.cos(var1) * 0.2F; this.randomMotionVecY = -0.1F + this.rand.nextFloat() * 0.2F; this.randomMotionVecZ = MathHelper.sin(var1) * 0.2F; diff --git a/src/minecraft/net/minecraft/src/EntityTNTPrimed.java b/src/minecraft/net/minecraft/src/EntityTNTPrimed.java index 5bd0b1e..f41cb2c 100644 --- a/src/minecraft/net/minecraft/src/EntityTNTPrimed.java +++ b/src/minecraft/net/minecraft/src/EntityTNTPrimed.java @@ -18,10 +18,10 @@ public class EntityTNTPrimed extends Entity { this(par1World); this.setPosition(par2, par4, par6); - float var8 = (float)(Math.random() * Math.PI * 2.0D); - this.motionX = (double)(-((float)Math.sin((double)var8)) * 0.02F); + float var8 = (float)(Math.random() * (float)Math.PI * 2.0D); + this.motionX = (float)(-((float)(float)Math.sin((float)var8)) * 0.02F); this.motionY = 0.20000000298023224D; - this.motionZ = (double)(-((float)Math.cos((double)var8)) * 0.02F); + this.motionZ = (float)(-((float)(float)Math.cos((float)var8)) * 0.02F); this.fuse = 80; this.prevPosX = par2; this.prevPosY = par4; diff --git a/src/minecraft/net/minecraft/src/EntityTameable.java b/src/minecraft/net/minecraft/src/EntityTameable.java index 24c1f22..b24f979 100644 --- a/src/minecraft/net/minecraft/src/EntityTameable.java +++ b/src/minecraft/net/minecraft/src/EntityTameable.java @@ -69,7 +69,7 @@ public abstract class EntityTameable extends EntityAnimal double var4 = this.rand.nextGaussian() * 0.02D; double var6 = this.rand.nextGaussian() * 0.02D; double var8 = this.rand.nextGaussian() * 0.02D; - this.worldObj.spawnParticle(var2, this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var4, var6, var8); + this.worldObj.spawnParticle(var2, this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + 0.5D + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, var4, var6, var8); } } diff --git a/src/minecraft/net/minecraft/src/EntityThrowable.java b/src/minecraft/net/minecraft/src/EntityThrowable.java index 8934468..3efd313 100644 --- a/src/minecraft/net/minecraft/src/EntityThrowable.java +++ b/src/minecraft/net/minecraft/src/EntityThrowable.java @@ -44,16 +44,16 @@ public abstract class EntityThrowable extends Entity super(par1World); this.thrower = par2EntityLiving; this.setSize(0.25F, 0.25F); - this.setLocationAndAngles(par2EntityLiving.posX, par2EntityLiving.posY + (double)par2EntityLiving.getEyeHeight(), par2EntityLiving.posZ, par2EntityLiving.rotationYaw, par2EntityLiving.rotationPitch); - this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.setLocationAndAngles(par2EntityLiving.posX, par2EntityLiving.posY + (float)par2EntityLiving.getEyeHeight(), par2EntityLiving.posZ, par2EntityLiving.rotationYaw, par2EntityLiving.rotationPitch); + this.posX -= (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * 0.16F); this.posY -= 0.10000000149011612D; - this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.posZ -= (float)(MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * 0.16F); this.setPosition(this.posX, this.posY, this.posZ); this.yOffset = 0.0F; float var3 = 0.4F; - this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var3); - this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * var3); - this.motionY = (double)(-MathHelper.sin((this.rotationPitch + this.func_70183_g()) / 180.0F * (float)Math.PI) * var3); + this.motionX = (float)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var3); + this.motionZ = (float)(MathHelper.cos(this.rotationYaw / 180.0F * (float)(float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)(float)Math.PI) * var3); + this.motionY = (float)(-MathHelper.sin((this.rotationPitch + this.func_70183_g()) / 180.0F * (float)(float)Math.PI) * var3); this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.func_70182_d(), 1.0F); } @@ -82,21 +82,21 @@ public abstract class EntityThrowable extends Entity public void setThrowableHeading(double par1, double par3, double par5, float par7, float par8) { float var9 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); - par1 /= (double)var9; - par3 /= (double)var9; - par5 /= (double)var9; - par1 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par3 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par5 += this.rand.nextGaussian() * 0.007499999832361937D * (double)par8; - par1 *= (double)par7; - par3 *= (double)par7; - par5 *= (double)par7; + par1 /= (float)var9; + par3 /= (float)var9; + par5 /= (float)var9; + par1 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par3 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par5 += this.rand.nextGaussian() * 0.007499999832361937D * (float)par8; + par1 *= (float)par7; + par3 *= (float)par7; + par5 *= (float)par7; this.motionX = par1; this.motionY = par3; this.motionZ = par5; float var10 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (double)var10) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (float)var10) * 180.0D / (float)Math.PI); this.ticksInGround = 0; } @@ -112,8 +112,8 @@ public abstract class EntityThrowable extends Entity if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float var7 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (double)var7) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(par1, par5) * 180.0D / (float)Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(par3, (float)var7) * 180.0D / (float)Math.PI); } } @@ -149,9 +149,9 @@ public abstract class EntityThrowable extends Entity } this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.motionX *= (float)(this.rand.nextFloat() * 0.2F); + this.motionY *= (float)(this.rand.nextFloat() * 0.2F); + this.motionZ *= (float)(this.rand.nextFloat() * 0.2F); this.ticksInGround = 0; this.ticksInAir = 0; } @@ -185,7 +185,7 @@ public abstract class EntityThrowable extends Entity if (var9.canBeCollidedWith() && (var9 != this.thrower || this.ticksInAir >= 5)) { float var10 = 0.3F; - AxisAlignedBB var11 = var9.boundingBox.expand((double)var10, (double)var10, (double)var10); + AxisAlignedBB var11 = var9.boundingBox.expand((float)var10, (float)var10, (float)var10); MovingObjectPosition var12 = var11.calculateIntercept(var15, var2); if (var12 != null) @@ -216,9 +216,9 @@ public abstract class EntityThrowable extends Entity this.posY += this.motionY; this.posZ += this.motionZ; float var16 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / (float)Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)var16) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, (float)var16) * 180.0D / (float)Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -248,16 +248,16 @@ public abstract class EntityThrowable extends Entity for (int var7 = 0; var7 < 4; ++var7) { float var19 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)var19, this.posY - this.motionY * (double)var19, this.posZ - this.motionZ * (double)var19, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (float)var19, this.posY - this.motionY * (float)var19, this.posZ - this.motionZ * (float)var19, this.motionX, this.motionY, this.motionZ); } var17 = 0.8F; } - this.motionX *= (double)var17; - this.motionY *= (double)var17; - this.motionZ *= (double)var17; - this.motionY -= (double)var18; + this.motionX *= (float)var17; + this.motionY *= (float)var17; + this.motionZ *= (float)var17; + this.motionY -= (float)var18; this.setPosition(this.posX, this.posY, this.posZ); } diff --git a/src/minecraft/net/minecraft/src/EntityTrackerEntry.java b/src/minecraft/net/minecraft/src/EntityTrackerEntry.java index 21a5e0d..719f6f5 100644 --- a/src/minecraft/net/minecraft/src/EntityTrackerEntry.java +++ b/src/minecraft/net/minecraft/src/EntityTrackerEntry.java @@ -239,10 +239,10 @@ public class EntityTrackerEntry { if (par1EntityPlayerMP != this.myEntity) { - double var2 = par1EntityPlayerMP.posX - (double)(this.lastScaledXPosition / 32); - double var4 = par1EntityPlayerMP.posZ - (double)(this.lastScaledZPosition / 32); + double var2 = par1EntityPlayerMP.posX - (float)(this.lastScaledXPosition / 32); + double var4 = par1EntityPlayerMP.posZ - (float)(this.lastScaledZPosition / 32); - if (var2 >= (double)(-this.BlocksDistanceThreshold) && var2 <= (double)this.BlocksDistanceThreshold && var4 >= (double)(-this.BlocksDistanceThreshold) && var4 <= (double)this.BlocksDistanceThreshold) + if (var2 >= (float)(-this.BlocksDistanceThreshold) && var2 <= (float)this.BlocksDistanceThreshold && var4 >= (float)(-this.BlocksDistanceThreshold) && var4 <= (float)this.BlocksDistanceThreshold) { if (!this.field_73134_o.contains(par1EntityPlayerMP) && this.isPlayerWatchingThisChunk(par1EntityPlayerMP)) { @@ -331,9 +331,9 @@ public class EntityTrackerEntry { EntityItem var8 = (EntityItem)this.myEntity; Packet21PickupSpawn var9 = new Packet21PickupSpawn(var8); - var8.posX = (double)var9.xPosition / 32.0D; - var8.posY = (double)var9.yPosition / 32.0D; - var8.posZ = (double)var9.zPosition / 32.0D; + var8.posX = (float)var9.xPosition / 32.0D; + var8.posY = (float)var9.yPosition / 32.0D; + var8.posZ = (float)var9.zPosition / 32.0D; return var9; } else if (this.myEntity instanceof EntityPlayerMP) diff --git a/src/minecraft/net/minecraft/src/EntityVillager.java b/src/minecraft/net/minecraft/src/EntityVillager.java index 4a9b2ee..fb1016f 100644 --- a/src/minecraft/net/minecraft/src/EntityVillager.java +++ b/src/minecraft/net/minecraft/src/EntityVillager.java @@ -548,7 +548,7 @@ public class EntityVillager extends EntityAgeable implements INpc, IMerchant double var3 = this.rand.nextGaussian() * 0.02D; double var5 = this.rand.nextGaussian() * 0.02D; double var7 = this.rand.nextGaussian() * 0.02D; - this.worldObj.spawnParticle(par1Str, this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 1.0D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, var3, var5, var7); + this.worldObj.spawnParticle(par1Str, this.posX + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, this.posY + 1.0D + (float)(this.rand.nextFloat() * this.height), this.posZ + (float)(this.rand.nextFloat() * this.width * 2.0F) - (float)this.width, var3, var5, var7); } } diff --git a/src/minecraft/net/minecraft/src/EntityWolf.java b/src/minecraft/net/minecraft/src/EntityWolf.java index 55ad8a5..2ea7e3b 100644 --- a/src/minecraft/net/minecraft/src/EntityWolf.java +++ b/src/minecraft/net/minecraft/src/EntityWolf.java @@ -229,13 +229,13 @@ public class EntityWolf extends EntityTameable if (this.timeWolfIsShaking > 0.4F) { float var1 = (float)this.boundingBox.minY; - int var2 = (int)(MathHelper.sin((this.timeWolfIsShaking - 0.4F) * (float)Math.PI) * 7.0F); + int var2 = (int)(MathHelper.sin((this.timeWolfIsShaking - 0.4F) * (float)(float)Math.PI) * 7.0F); for (int var3 = 0; var3 < var2; ++var3) { float var4 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width * 0.5F; float var5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width * 0.5F; - this.worldObj.spawnParticle("splash", this.posX + (double)var4, (double)(var1 + 0.8F), this.posZ + (double)var5, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("splash", this.posX + (float)var4, (float)(var1 + 0.8F), this.posZ + (float)var5, this.motionX, this.motionY, this.motionZ); } } } @@ -267,12 +267,12 @@ public class EntityWolf extends EntityTameable var3 = 1.0F; } - return MathHelper.sin(var3 * (float)Math.PI) * MathHelper.sin(var3 * (float)Math.PI * 11.0F) * 0.15F * (float)Math.PI; + return MathHelper.sin(var3 * (float)(float)Math.PI) * MathHelper.sin(var3 * (float)(float)Math.PI * 11.0F) * 0.15F * (float)(float)Math.PI; } public float getInterestedAngle(float par1) { - return (this.field_70924_f + (this.field_70926_e - this.field_70924_f) * par1) * 0.15F * (float)Math.PI; + return (this.field_70924_f + (this.field_70926_e - this.field_70924_f) * par1) * 0.15F * (float)(float)Math.PI; } public float getEyeHeight() @@ -403,7 +403,7 @@ public class EntityWolf extends EntityTameable public float getTailRotation() { - return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (float)(20 - this.dataWatcher.getWatchableObjectInt(18)) * 0.02F) * (float)Math.PI : ((float)Math.PI / 5F)); + return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (float)(20 - this.dataWatcher.getWatchableObjectInt(18)) * 0.02F) * (float)(float)Math.PI : ((float)(float)Math.PI / 5F)); } /** diff --git a/src/minecraft/net/minecraft/src/EntityXPOrb.java b/src/minecraft/net/minecraft/src/EntityXPOrb.java index 0e6e186..b0b0236 100644 --- a/src/minecraft/net/minecraft/src/EntityXPOrb.java +++ b/src/minecraft/net/minecraft/src/EntityXPOrb.java @@ -26,9 +26,9 @@ public class EntityXPOrb extends Entity this.yOffset = this.height / 2.0F; this.setPosition(par2, par4, par6); this.rotationYaw = (float)(Math.random() * 360.0D); - this.motionX = (double)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D) * 2.0F); - this.motionY = (double)((float)(Math.random() * 0.2D) * 2.0F); - this.motionZ = (double)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D) * 2.0F); + this.motionX = (float)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D) * 2.0F); + this.motionY = (float)((float)(Math.random() * 0.2D) * 2.0F); + this.motionZ = (float)((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D) * 2.0F); this.xpValue = par8; } @@ -97,8 +97,8 @@ public class EntityXPOrb extends Entity if (this.worldObj.getBlockMaterial(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)) == Material.lava) { this.motionY = 0.20000000298023224D; - this.motionX = (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); - this.motionZ = (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.motionX = (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.motionZ = (float)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); this.worldObj.playSoundAtEntity(this, "random.fizz", 0.4F, 2.0F + this.rand.nextFloat() * 0.4F); } @@ -118,7 +118,7 @@ public class EntityXPOrb extends Entity if (this.field_80001_f != null) { double var3 = (this.field_80001_f.posX - this.posX) / var1; - double var5 = (this.field_80001_f.posY + (double)this.field_80001_f.getEyeHeight() - this.posY) / var1; + double var5 = (this.field_80001_f.posY + (float)this.field_80001_f.getEyeHeight() - this.posY) / var1; double var7 = (this.field_80001_f.posZ - this.posZ) / var1; double var9 = Math.sqrt(var3 * var3 + var5 * var5 + var7 * var7); double var11 = 1.0D - var9; @@ -146,9 +146,9 @@ public class EntityXPOrb extends Entity } } - this.motionX *= (double)var13; + this.motionX *= (float)var13; this.motionY *= 0.9800000190734863D; - this.motionZ *= (double)var13; + this.motionZ *= (float)var13; if (this.onGround) { diff --git a/src/minecraft/net/minecraft/src/EnumEntitySize.java b/src/minecraft/net/minecraft/src/EnumEntitySize.java index a0345f5..30d9f10 100644 --- a/src/minecraft/net/minecraft/src/EnumEntitySize.java +++ b/src/minecraft/net/minecraft/src/EnumEntitySize.java @@ -11,7 +11,7 @@ public enum EnumEntitySize public int multiplyBy32AndRound(double par1) { - double var3 = par1 - ((double)MathHelper.floor_double(par1) + 0.5D); + double var3 = par1 - ((float)MathHelper.floor_double(par1) + 0.5D); switch (EnumEntitySizeHelper.field_75628_a[this.ordinal()]) { diff --git a/src/minecraft/net/minecraft/src/Explosion.java b/src/minecraft/net/minecraft/src/Explosion.java index 590078a..a66f3e7 100644 --- a/src/minecraft/net/minecraft/src/Explosion.java +++ b/src/minecraft/net/minecraft/src/Explosion.java @@ -56,9 +56,9 @@ public class Explosion { if (var3 == 0 || var3 == this.field_77289_h - 1 || var4 == 0 || var4 == this.field_77289_h - 1 || var5 == 0 || var5 == this.field_77289_h - 1) { - double var6 = (double)((float)var3 / ((float)this.field_77289_h - 1.0F) * 2.0F - 1.0F); - double var8 = (double)((float)var4 / ((float)this.field_77289_h - 1.0F) * 2.0F - 1.0F); - double var10 = (double)((float)var5 / ((float)this.field_77289_h - 1.0F) * 2.0F - 1.0F); + double var6 = (float)((float)var3 / ((float)this.field_77289_h - 1.0F) * 2.0F - 1.0F); + double var8 = (float)((float)var4 / ((float)this.field_77289_h - 1.0F) * 2.0F - 1.0F); + double var10 = (float)((float)var5 / ((float)this.field_77289_h - 1.0F) * 2.0F - 1.0F); double var12 = Math.sqrt(var6 * var6 + var8 * var8 + var10 * var10); var6 /= var12; var8 /= var12; @@ -85,9 +85,9 @@ public class Explosion var2.add(new ChunkPosition(var22, var23, var24)); } - var15 += var6 * (double)var21; - var17 += var8 * (double)var21; - var19 += var10 * (double)var21; + var15 += var6 * (float)var21; + var17 += var8 * (float)var21; + var19 += var10 * (float)var21; } } } @@ -96,35 +96,35 @@ public class Explosion this.field_77281_g.addAll(var2); this.explosionSize *= 2.0F; - var3 = MathHelper.floor_double(this.explosionX - (double)this.explosionSize - 1.0D); - var4 = MathHelper.floor_double(this.explosionX + (double)this.explosionSize + 1.0D); - var5 = MathHelper.floor_double(this.explosionY - (double)this.explosionSize - 1.0D); - int var27 = MathHelper.floor_double(this.explosionY + (double)this.explosionSize + 1.0D); - int var7 = MathHelper.floor_double(this.explosionZ - (double)this.explosionSize - 1.0D); - int var28 = MathHelper.floor_double(this.explosionZ + (double)this.explosionSize + 1.0D); - List var9 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)var3, (double)var5, (double)var7, (double)var4, (double)var27, (double)var28)); + var3 = MathHelper.floor_double(this.explosionX - (float)this.explosionSize - 1.0D); + var4 = MathHelper.floor_double(this.explosionX + (float)this.explosionSize + 1.0D); + var5 = MathHelper.floor_double(this.explosionY - (float)this.explosionSize - 1.0D); + int var27 = MathHelper.floor_double(this.explosionY + (float)this.explosionSize + 1.0D); + int var7 = MathHelper.floor_double(this.explosionZ - (float)this.explosionSize - 1.0D); + int var28 = MathHelper.floor_double(this.explosionZ + (float)this.explosionSize + 1.0D); + List var9 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)var3, (float)var5, (float)var7, (float)var4, (float)var27, (float)var28)); Vec3 var29 = Vec3.getVec3Pool().getVecFromPool(this.explosionX, this.explosionY, this.explosionZ); for (int var11 = 0; var11 < var9.size(); ++var11) { Entity var30 = (Entity)var9.get(var11); - double var13 = var30.getDistance(this.explosionX, this.explosionY, this.explosionZ) / (double)this.explosionSize; + double var13 = var30.getDistance(this.explosionX, this.explosionY, this.explosionZ) / (float)this.explosionSize; if (var13 <= 1.0D) { var15 = var30.posX - this.explosionX; - var17 = var30.posY + (double)var30.getEyeHeight() - this.explosionY; + var17 = var30.posY + (float)var30.getEyeHeight() - this.explosionY; var19 = var30.posZ - this.explosionZ; - double var31 = (double)MathHelper.sqrt_double(var15 * var15 + var17 * var17 + var19 * var19); + double var31 = (float)MathHelper.sqrt_double(var15 * var15 + var17 * var17 + var19 * var19); if (var31 != 0.0D) { var15 /= var31; var17 /= var31; var19 /= var31; - double var32 = (double)this.worldObj.getBlockDensity(var29, var30.boundingBox); + double var32 = (float)this.worldObj.getBlockDensity(var29, var30.boundingBox); double var33 = (1.0D - var13) * var32; - var30.attackEntityFrom(DamageSource.explosion, (int)((var33 * var33 + var33) / 2.0D * 8.0D * (double)this.explosionSize + 1.0D)); + var30.attackEntityFrom(DamageSource.explosion, (int)((var33 * var33 + var33) / 2.0D * 8.0D * (float)this.explosionSize + 1.0D)); var30.motionX += var15 * var33; var30.motionY += var17 * var33; var30.motionZ += var19 * var33; @@ -164,18 +164,18 @@ public class Explosion if (par1) { - double var8 = (double)((float)var4.floatValue() + this.worldObj.rand.nextFloat()); - double var10 = (double)((float)var5 + this.worldObj.rand.nextFloat()); - double var12 = (double)((float)var6.floatValue() + this.worldObj.rand.nextFloat()); + double var8 = (float)((float)var4.floatValue() + this.worldObj.rand.nextFloat()); + double var10 = (float)((float)var5 + this.worldObj.rand.nextFloat()); + double var12 = (float)((float)var6.floatValue() + this.worldObj.rand.nextFloat()); double var14 = var8 - this.explosionX; double var16 = var10 - this.explosionY; double var18 = var12 - this.explosionZ; - double var20 = (double)MathHelper.sqrt_double(var14 * var14 + var16 * var16 + var18 * var18); + double var20 = (float)MathHelper.sqrt_double(var14 * var14 + var16 * var16 + var18 * var18); var14 /= var20; var16 /= var20; var18 /= var20; - double var22 = 0.5D / (var20 / (double)this.explosionSize + 0.1D); - var22 *= (double)(this.worldObj.rand.nextFloat() * this.worldObj.rand.nextFloat() + 0.3F); + double var22 = 0.5D / (var20 / (float)this.explosionSize + 0.1D); + var22 *= (float)(this.worldObj.rand.nextFloat() * this.worldObj.rand.nextFloat() + 0.3F); var14 *= var22; var16 *= var22; var18 *= var22; diff --git a/src/minecraft/net/minecraft/src/FontRenderer.java b/src/minecraft/net/minecraft/src/FontRenderer.java index 9232f11..0e1d7eb 100644 --- a/src/minecraft/net/minecraft/src/FontRenderer.java +++ b/src/minecraft/net/minecraft/src/FontRenderer.java @@ -535,10 +535,10 @@ public class FontRenderer var7 = Tessellator.instance; GL11.glDisable(GL11.GL_TEXTURE_2D); var7.startDrawingQuads(); - var7.addVertex((double)this.posX, (double)(this.posY + (float)(this.FONT_HEIGHT / 2)), 0.0D); - var7.addVertex((double)(this.posX + var9), (double)(this.posY + (float)(this.FONT_HEIGHT / 2)), 0.0D); - var7.addVertex((double)(this.posX + var9), (double)(this.posY + (float)(this.FONT_HEIGHT / 2) - 1.0F), 0.0D); - var7.addVertex((double)this.posX, (double)(this.posY + (float)(this.FONT_HEIGHT / 2) - 1.0F), 0.0D); + var7.addVertex((float)this.posX, (float)(this.posY + (float)(this.FONT_HEIGHT / 2)), 0.0D); + var7.addVertex((float)(this.posX + var9), (float)(this.posY + (float)(this.FONT_HEIGHT / 2)), 0.0D); + var7.addVertex((float)(this.posX + var9), (float)(this.posY + (float)(this.FONT_HEIGHT / 2) - 1.0F), 0.0D); + var7.addVertex((float)this.posX, (float)(this.posY + (float)(this.FONT_HEIGHT / 2) - 1.0F), 0.0D); var7.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); } @@ -549,10 +549,10 @@ public class FontRenderer GL11.glDisable(GL11.GL_TEXTURE_2D); var7.startDrawingQuads(); int var8 = this.underlineStyle ? -1 : 0; - var7.addVertex((double)(this.posX + (float)var8), (double)(this.posY + (float)this.FONT_HEIGHT), 0.0D); - var7.addVertex((double)(this.posX + var9), (double)(this.posY + (float)this.FONT_HEIGHT), 0.0D); - var7.addVertex((double)(this.posX + var9), (double)(this.posY + (float)this.FONT_HEIGHT - 1.0F), 0.0D); - var7.addVertex((double)(this.posX + (float)var8), (double)(this.posY + (float)this.FONT_HEIGHT - 1.0F), 0.0D); + var7.addVertex((float)(this.posX + (float)var8), (float)(this.posY + (float)this.FONT_HEIGHT), 0.0D); + var7.addVertex((float)(this.posX + var9), (float)(this.posY + (float)this.FONT_HEIGHT), 0.0D); + var7.addVertex((float)(this.posX + var9), (float)(this.posY + (float)this.FONT_HEIGHT - 1.0F), 0.0D); + var7.addVertex((float)(this.posX + (float)var8), (float)(this.posY + (float)this.FONT_HEIGHT - 1.0F), 0.0D); var7.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); } diff --git a/src/minecraft/net/minecraft/src/GenLayerVoronoiZoom.java b/src/minecraft/net/minecraft/src/GenLayerVoronoiZoom.java index 85b609c..d020046 100644 --- a/src/minecraft/net/minecraft/src/GenLayerVoronoiZoom.java +++ b/src/minecraft/net/minecraft/src/GenLayerVoronoiZoom.java @@ -37,19 +37,19 @@ public class GenLayerVoronoiZoom extends GenLayer for (int var18 = 0; var18 < var9 - 1; ++var18) { - double var19 = (double)var6 * 0.9D; + double var19 = (float)var6 * 0.9D; this.initChunkSeed((long)(var18 + var7.longValue() << var5), (long)(var15 + var8.longValue() << var5)); - double var21 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19; - double var23 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19; + double var21 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19; + double var23 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19; this.initChunkSeed((long)(var18 + var7.longValue() + 1 << var5), (long)(var15 + var8.longValue() << var5)); - double var25 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (double)var6; - double var27 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19; + double var25 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (float)var6; + double var27 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19; this.initChunkSeed((long)(var18 + var7.longValue() << var5), (long)(var15 + var8.longValue() + 1 << var5)); - double var29 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19; - double var31 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (double)var6; + double var29 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19; + double var31 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (float)var6; this.initChunkSeed((long)(var18 + var7.longValue() + 1 << var5), (long)(var15 + var8.longValue() + 1 << var5)); - double var33 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (double)var6; - double var35 = ((double)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (double)var6; + double var33 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (float)var6; + double var35 = ((float)this.nextInt(1024) / 1024.0D - 0.5D) * var19 + (float)var6; int var37 = var11[var18 + 1 + (var15 + 0) * var9]; int var38 = var11[var18 + 1 + (var15 + 1) * var9]; @@ -59,10 +59,10 @@ public class GenLayerVoronoiZoom extends GenLayer for (int var41 = 0; var41 < var6; ++var41) { - double var42 = ((double)var39 - var23) * ((double)var39 - var23) + ((double)var41 - var21) * ((double)var41 - var21); - double var44 = ((double)var39 - var27) * ((double)var39 - var27) + ((double)var41 - var25) * ((double)var41 - var25); - double var46 = ((double)var39 - var31) * ((double)var39 - var31) + ((double)var41 - var29) * ((double)var41 - var29); - double var48 = ((double)var39 - var35) * ((double)var39 - var35) + ((double)var41 - var33) * ((double)var41 - var33); + double var42 = ((float)var39 - var23) * ((float)var39 - var23) + ((float)var41 - var21) * ((float)var41 - var21); + double var44 = ((float)var39 - var27) * ((float)var39 - var27) + ((float)var41 - var25) * ((float)var41 - var25); + double var46 = ((float)var39 - var31) * ((float)var39 - var31) + ((float)var41 - var29) * ((float)var41 - var29); + double var48 = ((float)var39 - var35) * ((float)var39 - var35) + ((float)var41 - var33) * ((float)var41 - var33); if (var42 < var44 && var42 < var46 && var42 < var48) { diff --git a/src/minecraft/net/minecraft/src/Gui.java b/src/minecraft/net/minecraft/src/Gui.java index 82a501b..c3a4c77 100644 --- a/src/minecraft/net/minecraft/src/Gui.java +++ b/src/minecraft/net/minecraft/src/Gui.java @@ -61,10 +61,10 @@ public class Gui GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(var6, var7, var8, var10); var9.startDrawingQuads(); - var9.addVertex((double)par0, (double)par3, 0.0D); - var9.addVertex((double)par2, (double)par3, 0.0D); - var9.addVertex((double)par2, (double)par1, 0.0D); - var9.addVertex((double)par0, (double)par1, 0.0D); + var9.addVertex((float)par0, (float)par3, 0.0D); + var9.addVertex((float)par2, (float)par3, 0.0D); + var9.addVertex((float)par2, (float)par1, 0.0D); + var9.addVertex((float)par0, (float)par1, 0.0D); var9.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_BLEND); @@ -91,11 +91,11 @@ public class Gui Tessellator var15 = Tessellator.instance; var15.startDrawingQuads(); var15.setColorRGBA_F(var8, var9, var10, var7); - var15.addVertex((double)par3, (double)par2, (double)this.zLevel); - var15.addVertex((double)par1, (double)par2, (double)this.zLevel); + var15.addVertex((float)par3, (float)par2, (float)this.zLevel); + var15.addVertex((float)par1, (float)par2, (float)this.zLevel); var15.setColorRGBA_F(var12, var13, var14, var11); - var15.addVertex((double)par1, (double)par4, (double)this.zLevel); - var15.addVertex((double)par3, (double)par4, (double)this.zLevel); + var15.addVertex((float)par1, (float)par4, (float)this.zLevel); + var15.addVertex((float)par3, (float)par4, (float)this.zLevel); var15.draw(); GL11.glShadeModel(GL11.GL_FLAT); GL11.glDisable(GL11.GL_BLEND); @@ -128,10 +128,10 @@ public class Gui float var8 = 0.00390625F; Tessellator var9 = Tessellator.instance; var9.startDrawingQuads(); - var9.addVertexWithUV((double)(par1 + 0), (double)(par2 + par6), (double)this.zLevel, (double)((float)(par3 + 0) * var7), (double)((float)(par4 + par6) * var8)); - var9.addVertexWithUV((double)(par1 + par5), (double)(par2 + par6), (double)this.zLevel, (double)((float)(par3 + par5) * var7), (double)((float)(par4 + par6) * var8)); - var9.addVertexWithUV((double)(par1 + par5), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + par5) * var7), (double)((float)(par4 + 0) * var8)); - var9.addVertexWithUV((double)(par1 + 0), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + 0) * var7), (double)((float)(par4 + 0) * var8)); + var9.addVertexWithUV((float)(par1 + 0), (float)(par2 + par6), (float)this.zLevel, (float)((float)(par3 + 0) * var7), (float)((float)(par4 + par6) * var8)); + var9.addVertexWithUV((float)(par1 + par5), (float)(par2 + par6), (float)this.zLevel, (float)((float)(par3 + par5) * var7), (float)((float)(par4 + par6) * var8)); + var9.addVertexWithUV((float)(par1 + par5), (float)(par2 + 0), (float)this.zLevel, (float)((float)(par3 + par5) * var7), (float)((float)(par4 + 0) * var8)); + var9.addVertexWithUV((float)(par1 + 0), (float)(par2 + 0), (float)this.zLevel, (float)((float)(par3 + 0) * var7), (float)((float)(par4 + 0) * var8)); var9.draw(); } } diff --git a/src/minecraft/net/minecraft/src/GuiAchievement.java b/src/minecraft/net/minecraft/src/GuiAchievement.java index 50495ca..c96e3c7 100644 --- a/src/minecraft/net/minecraft/src/GuiAchievement.java +++ b/src/minecraft/net/minecraft/src/GuiAchievement.java @@ -75,7 +75,7 @@ public class GuiAchievement extends Gui GL11.glClear(256); GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, (double)this.achievementWindowWidth, (double)this.achievementWindowHeight, 0.0D, 1000.0D, 3000.0D); + GL11.glOrtho(0.0D, (float)this.achievementWindowWidth, (float)this.achievementWindowHeight, 0.0D, 1000.0D, 3000.0D); GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glLoadIdentity(); GL11.glTranslatef(0.0F, 0.0F, -2000.0F); @@ -88,7 +88,7 @@ public class GuiAchievement extends Gui { if (this.theAchievement != null && this.achievementTime != 0L) { - double var1 = (double)(Minecraft.getSystemTime() - this.achievementTime) / 3000.0D; + double var1 = (float)(Minecraft.getSystemTime() - this.achievementTime) / 3000.0D; if (!this.haveAchiement && (var1 < 0.0D || var1 > 1.0D)) { diff --git a/src/minecraft/net/minecraft/src/GuiAchievements.java b/src/minecraft/net/minecraft/src/GuiAchievements.java index bd5beed..7c88110 100644 --- a/src/minecraft/net/minecraft/src/GuiAchievements.java +++ b/src/minecraft/net/minecraft/src/GuiAchievements.java @@ -47,8 +47,8 @@ public class GuiAchievements extends GuiScreen this.statFileWriter = par1StatFileWriter; short var2 = 141; short var3 = 141; - this.field_74117_m = this.guiMapX = this.field_74124_q = (double)(AchievementList.openInventory.displayColumn * 24 - var2 / 2 - 12); - this.field_74115_n = this.guiMapY = this.field_74123_r = (double)(AchievementList.openInventory.displayRow * 24 - var3 / 2); + this.field_74117_m = this.guiMapX = this.field_74124_q = (float)(AchievementList.openInventory.displayColumn * 24 - var2 / 2 - 12); + this.field_74115_n = this.guiMapY = this.field_74123_r = (float)(AchievementList.openInventory.displayRow * 24 - var3 / 2); } /** @@ -110,8 +110,8 @@ public class GuiAchievements extends GuiScreen } else { - this.guiMapX -= (double)(par1 - this.mouseX); - this.guiMapY -= (double)(par2 - this.mouseY); + this.guiMapX -= (float)(par1 - this.mouseX); + this.guiMapY -= (float)(par2 - this.mouseY); this.field_74124_q = this.field_74117_m = this.guiMapX; this.field_74123_r = this.field_74115_n = this.guiMapY; } @@ -120,24 +120,24 @@ public class GuiAchievements extends GuiScreen this.mouseY = par2; } - if (this.field_74124_q < (double)guiMapTop) + if (this.field_74124_q < (float)guiMapTop) { - this.field_74124_q = (double)guiMapTop; + this.field_74124_q = (float)guiMapTop; } - if (this.field_74123_r < (double)guiMapLeft) + if (this.field_74123_r < (float)guiMapLeft) { - this.field_74123_r = (double)guiMapLeft; + this.field_74123_r = (float)guiMapLeft; } - if (this.field_74124_q >= (double)guiMapBottom) + if (this.field_74124_q >= (float)guiMapBottom) { - this.field_74124_q = (double)(guiMapBottom - 1); + this.field_74124_q = (float)(guiMapBottom - 1); } - if (this.field_74123_r >= (double)guiMapRight) + if (this.field_74123_r >= (float)guiMapRight) { - this.field_74123_r = (double)(guiMapRight - 1); + this.field_74123_r = (float)(guiMapRight - 1); } } else @@ -188,8 +188,8 @@ public class GuiAchievements extends GuiScreen protected void genAchievementBackground(int par1, int par2, float par3) { - int var4 = MathHelper.floor_double(this.field_74117_m + (this.guiMapX - this.field_74117_m) * (double)par3); - int var5 = MathHelper.floor_double(this.field_74115_n + (this.guiMapY - this.field_74115_n) * (double)par3); + int var4 = MathHelper.floor_double(this.field_74117_m + (this.guiMapX - this.field_74117_m) * (float)par3); + int var5 = MathHelper.floor_double(this.field_74115_n + (this.guiMapY - this.field_74115_n) * (float)par3); if (var4 < guiMapTop) { @@ -305,7 +305,7 @@ public class GuiAchievements extends GuiScreen var27 = var33.parentAchievement.displayRow * 24 - var5 + 11 + var11; boolean var28 = this.statFileWriter.hasAchievementUnlocked(var33); boolean var29 = this.statFileWriter.canUnlockAchievement(var33); - var30 = Math.sin((double)(Minecraft.getSystemTime() % 600L) / 600.0D * Math.PI * 2.0D) > 0.6D ? 255 : 130; + var30 = (float)Math.sin((float)(Minecraft.getSystemTime() % 600L) / 600.0D * (float)Math.PI * 2.0D) > 0.6D ? 255 : 130; int var31 = -16777216; if (var28) @@ -348,7 +348,7 @@ public class GuiAchievements extends GuiScreen } else if (this.statFileWriter.canUnlockAchievement(var35)) { - var38 = Math.sin((double)(Minecraft.getSystemTime() % 600L) / 600.0D * Math.PI * 2.0D) < 0.6D ? 0.6F : 0.8F; + var38 = (float)Math.sin((float)(Minecraft.getSystemTime() % 600L) / 600.0D * (float)Math.PI * 2.0D) < 0.6D ? 0.6F : 0.8F; GL11.glColor4f(var38, var38, var38, 1.0F); } else diff --git a/src/minecraft/net/minecraft/src/GuiContainerCreative.java b/src/minecraft/net/minecraft/src/GuiContainerCreative.java index 38e325d..4a4e0e4 100644 --- a/src/minecraft/net/minecraft/src/GuiContainerCreative.java +++ b/src/minecraft/net/minecraft/src/GuiContainerCreative.java @@ -458,7 +458,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer var1 = -1; } - this.currentScroll = (float)((double)this.currentScroll - (double)var1 / (double)var2); + this.currentScroll = (float)((float)this.currentScroll - (float)var1 / (float)var2); if (this.currentScroll < 0.0F) { diff --git a/src/minecraft/net/minecraft/src/GuiEnchantment.java b/src/minecraft/net/minecraft/src/GuiEnchantment.java index 443ad1d..a8cae62 100644 --- a/src/minecraft/net/minecraft/src/GuiEnchantment.java +++ b/src/minecraft/net/minecraft/src/GuiEnchantment.java @@ -104,8 +104,8 @@ public class GuiEnchantment extends GuiContainer GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); float var11 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.25F; float var12 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.75F; - var11 = (var11 - (float)MathHelper.truncateDoubleToInt((double)var11)) * 1.6F - 0.3F; - var12 = (var12 - (float)MathHelper.truncateDoubleToInt((double)var12)) * 1.6F - 0.3F; + var11 = (var11 - (float)MathHelper.truncateDoubleToInt((float)var11)) * 1.6F - 0.3F; + var12 = (var12 - (float)MathHelper.truncateDoubleToInt((float)var12)) * 1.6F - 0.3F; if (var11 < 0.0F) { diff --git a/src/minecraft/net/minecraft/src/GuiIngame.java b/src/minecraft/net/minecraft/src/GuiIngame.java index c547611..e7131b4 100644 --- a/src/minecraft/net/minecraft/src/GuiIngame.java +++ b/src/minecraft/net/minecraft/src/GuiIngame.java @@ -297,8 +297,8 @@ public class GuiIngame extends Gui if (this.mc.thePlayer.isInsideOfMaterial(Material.water)) { var25 = this.mc.thePlayer.getAir(); - var26 = MathHelper.ceiling_double_int((double)(var25 - 2) * 10.0D / 300.0D); - var52 = MathHelper.ceiling_double_int((double)var25 * 10.0D / 300.0D) - var26; + var26 = MathHelper.ceiling_double_int((float)(var25 - 2) * 10.0D / 300.0D); + var52 = MathHelper.ceiling_double_int((float)var25 * 10.0D / 300.0D) - var26; for (var28 = 0; var28 < var26 + var52; ++var28) { @@ -415,7 +415,7 @@ public class GuiIngame extends Gui this.drawString(var8, String.format("x: %s", mc.thePlayer.posXBig.setScale(5, RoundingMode.HALF_DOWN).toPlainString()), 2, 64, 14737632); this.drawString(var8, String.format("y: %.3f (feet pos, %.3f eyes pos)", new Object[] {Double.valueOf(this.mc.thePlayer.boundingBox.minY), Double.valueOf(this.mc.thePlayer.posY)}), 2, 72, 14737632); this.drawString(var8, String.format("z: %s", mc.thePlayer.posZBig.setScale(5, RoundingMode.HALF_DOWN).toPlainString()), 2, 80, 14737632); - this.drawString(var8, "f: " + (MathHelper.floor_double((double)(this.mc.thePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3), 2, 88, 14737632); + this.drawString(var8, "f: " + (MathHelper.floor_double((float)(this.mc.thePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3), 2, 88, 14737632); BigInteger x = MathHelper.floor_double_BigInteger(this.mc.thePlayer.posX); var22 = MathHelper.floor_double(this.mc.thePlayer.posY); BigInteger z = MathHelper.floor_double_BigInteger(this.mc.thePlayer.posZ); @@ -602,9 +602,9 @@ public class GuiIngame extends Gui GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("%blur%/misc/pumpkinblur.png")); Tessellator var3 = Tessellator.instance; var3.startDrawingQuads(); - var3.addVertexWithUV(0.0D, (double)par2, -90.0D, 0.0D, 1.0D); - var3.addVertexWithUV((double)par1, (double)par2, -90.0D, 1.0D, 1.0D); - var3.addVertexWithUV((double)par1, 0.0D, -90.0D, 1.0D, 0.0D); + var3.addVertexWithUV(0.0D, (float)par2, -90.0D, 0.0D, 1.0D); + var3.addVertexWithUV((float)par1, (float)par2, -90.0D, 1.0D, 1.0D); + var3.addVertexWithUV((float)par1, 0.0D, -90.0D, 1.0D, 0.0D); var3.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D); var3.draw(); GL11.glDepthMask(true); @@ -630,7 +630,7 @@ public class GuiIngame extends Gui par1 = 1.0F; } - this.prevVignetteBrightness = (float)((double)this.prevVignetteBrightness + (double)(par1 - this.prevVignetteBrightness) * 0.01D); + this.prevVignetteBrightness = (float)((float)this.prevVignetteBrightness + (float)(par1 - this.prevVignetteBrightness) * 0.01D); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDepthMask(false); GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_COLOR); @@ -638,9 +638,9 @@ public class GuiIngame extends Gui GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("%blur%/misc/vignette.png")); Tessellator var4 = Tessellator.instance; var4.startDrawingQuads(); - var4.addVertexWithUV(0.0D, (double)par3, -90.0D, 0.0D, 1.0D); - var4.addVertexWithUV((double)par2, (double)par3, -90.0D, 1.0D, 1.0D); - var4.addVertexWithUV((double)par2, 0.0D, -90.0D, 1.0D, 0.0D); + var4.addVertexWithUV(0.0D, (float)par3, -90.0D, 0.0D, 1.0D); + var4.addVertexWithUV((float)par2, (float)par3, -90.0D, 1.0D, 1.0D); + var4.addVertexWithUV((float)par2, 0.0D, -90.0D, 1.0D, 0.0D); var4.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D); var4.draw(); GL11.glDepthMask(true); @@ -673,10 +673,10 @@ public class GuiIngame extends Gui float var7 = (float)(Block.portal.blockIndexInTexture / 16 + 1) / 16.0F; Tessellator var8 = Tessellator.instance; var8.startDrawingQuads(); - var8.addVertexWithUV(0.0D, (double)par3, -90.0D, (double)var4, (double)var7); - var8.addVertexWithUV((double)par2, (double)par3, -90.0D, (double)var6, (double)var7); - var8.addVertexWithUV((double)par2, 0.0D, -90.0D, (double)var6, (double)var5); - var8.addVertexWithUV(0.0D, 0.0D, -90.0D, (double)var4, (double)var5); + var8.addVertexWithUV(0.0D, (float)par3, -90.0D, (float)var4, (float)var7); + var8.addVertexWithUV((float)par2, (float)par3, -90.0D, (float)var6, (float)var7); + var8.addVertexWithUV((float)par2, 0.0D, -90.0D, (float)var6, (float)var5); + var8.addVertexWithUV(0.0D, 0.0D, -90.0D, (float)var4, (float)var5); var8.draw(); GL11.glDepthMask(true); GL11.glEnable(GL11.GL_DEPTH_TEST); diff --git a/src/minecraft/net/minecraft/src/GuiInventory.java b/src/minecraft/net/minecraft/src/GuiInventory.java index e161bd7..5c28297 100644 --- a/src/minecraft/net/minecraft/src/GuiInventory.java +++ b/src/minecraft/net/minecraft/src/GuiInventory.java @@ -96,10 +96,10 @@ public class GuiInventory extends InventoryEffectRenderer GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-((float)Math.atan((double)(par5 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); - par0Minecraft.thePlayer.renderYawOffset = (float)Math.atan((double)(par4 / 40.0F)) * 20.0F; - par0Minecraft.thePlayer.rotationYaw = (float)Math.atan((double)(par4 / 40.0F)) * 40.0F; - par0Minecraft.thePlayer.rotationPitch = -((float)Math.atan((double)(par5 / 40.0F))) * 20.0F; + GL11.glRotatef(-((float)Math.atan((float)(par5 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); + par0Minecraft.thePlayer.renderYawOffset = (float)Math.atan((float)(par4 / 40.0F)) * 20.0F; + par0Minecraft.thePlayer.rotationYaw = (float)Math.atan((float)(par4 / 40.0F)) * 40.0F; + par0Minecraft.thePlayer.rotationPitch = -((float)Math.atan((float)(par5 / 40.0F))) * 20.0F; par0Minecraft.thePlayer.rotationYawHead = par0Minecraft.thePlayer.rotationYaw; GL11.glTranslatef(0.0F, par0Minecraft.thePlayer.yOffset, 0.0F); RenderManager.instance.playerViewY = 180.0F; diff --git a/src/minecraft/net/minecraft/src/GuiMainMenu.java b/src/minecraft/net/minecraft/src/GuiMainMenu.java index 4856df7..0c95a0c 100644 --- a/src/minecraft/net/minecraft/src/GuiMainMenu.java +++ b/src/minecraft/net/minecraft/src/GuiMainMenu.java @@ -304,10 +304,10 @@ public class GuiMainMenu extends GuiScreen var4.startDrawingQuads(); var4.setColorRGBA_I(16777215, 255 / (var6 + 1)); float var11 = 0.0F; - var4.addVertexWithUV(-1.0D, -1.0D, 1.0D, (double)(0.0F + var11), (double)(0.0F + var11)); - var4.addVertexWithUV(1.0D, -1.0D, 1.0D, (double)(1.0F - var11), (double)(0.0F + var11)); - var4.addVertexWithUV(1.0D, 1.0D, 1.0D, (double)(1.0F - var11), (double)(1.0F - var11)); - var4.addVertexWithUV(-1.0D, 1.0D, 1.0D, (double)(0.0F + var11), (double)(1.0F - var11)); + var4.addVertexWithUV(-1.0D, -1.0D, 1.0D, (float)(0.0F + var11), (float)(0.0F + var11)); + var4.addVertexWithUV(1.0D, -1.0D, 1.0D, (float)(1.0F - var11), (float)(0.0F + var11)); + var4.addVertexWithUV(1.0D, 1.0D, 1.0D, (float)(1.0F - var11), (float)(1.0F - var11)); + var4.addVertexWithUV(-1.0D, 1.0D, 1.0D, (float)(0.0F + var11), (float)(1.0F - var11)); var4.draw(); GL11.glPopMatrix(); } @@ -348,10 +348,10 @@ public class GuiMainMenu extends GuiScreen int var5 = this.width; int var6 = this.height; float var7 = (float)(var4 - var3 / 2) / 256.0F; - var2.addVertexWithUV((double)var5, (double)var6, (double)this.zLevel, (double)(0.0F + var7), 0.0D); - var2.addVertexWithUV((double)var5, 0.0D, (double)this.zLevel, (double)(1.0F + var7), 0.0D); - var2.addVertexWithUV(0.0D, 0.0D, (double)this.zLevel, (double)(1.0F + var7), 1.0D); - var2.addVertexWithUV(0.0D, (double)var6, (double)this.zLevel, (double)(0.0F + var7), 1.0D); + var2.addVertexWithUV((float)var5, (float)var6, (float)this.zLevel, (float)(0.0F + var7), 0.0D); + var2.addVertexWithUV((float)var5, 0.0D, (float)this.zLevel, (float)(1.0F + var7), 0.0D); + var2.addVertexWithUV(0.0D, 0.0D, (float)this.zLevel, (float)(1.0F + var7), 1.0D); + var2.addVertexWithUV(0.0D, (float)var6, (float)this.zLevel, (float)(0.0F + var7), 1.0D); } var2.draw(); @@ -386,10 +386,10 @@ public class GuiMainMenu extends GuiScreen var4.setColorRGBA_F(1.0F, 1.0F, 1.0F, 1.0F); int var8 = this.width; int var9 = this.height; - var4.addVertexWithUV(0.0D, (double)var9, (double)this.zLevel, (double)(0.5F - var6), (double)(0.5F + var7)); - var4.addVertexWithUV((double)var8, (double)var9, (double)this.zLevel, (double)(0.5F - var6), (double)(0.5F - var7)); - var4.addVertexWithUV((double)var8, 0.0D, (double)this.zLevel, (double)(0.5F + var6), (double)(0.5F - var7)); - var4.addVertexWithUV(0.0D, 0.0D, (double)this.zLevel, (double)(0.5F + var6), (double)(0.5F + var7)); + var4.addVertexWithUV(0.0D, (float)var9, (float)this.zLevel, (float)(0.5F - var6), (float)(0.5F + var7)); + var4.addVertexWithUV((float)var8, (float)var9, (float)this.zLevel, (float)(0.5F - var6), (float)(0.5F - var7)); + var4.addVertexWithUV((float)var8, 0.0D, (float)this.zLevel, (float)(0.5F + var6), (float)(0.5F - var7)); + var4.addVertexWithUV(0.0D, 0.0D, (float)this.zLevel, (float)(0.5F + var6), (float)(0.5F + var7)); var4.draw(); } @@ -408,7 +408,7 @@ public class GuiMainMenu extends GuiScreen GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/title/mclogo.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - if ((double)this.updateCounter < 1.0E-4D) + if ((float)this.updateCounter < 1.0E-4D) { this.drawTexturedModalRect(var6 + 0, var7 + 0, 0, 0, 99, 44); this.drawTexturedModalRect(var6 + 99, var7 + 0, 129, 0, 27, 44); @@ -426,7 +426,7 @@ public class GuiMainMenu extends GuiScreen GL11.glPushMatrix(); GL11.glTranslatef((float)(this.width / 2 + 90), 70.0F, 0.0F); GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); - float var8 = 1.8F - MathHelper.abs(MathHelper.sin((float)(Minecraft.getSystemTime() % 1000L) / 1000.0F * (float)Math.PI * 2.0F) * 0.1F); + float var8 = 1.8F - MathHelper.abs(MathHelper.sin((float)(Minecraft.getSystemTime() % 1000L) / 1000.0F * (float)(float)Math.PI * 2.0F) * 0.1F); var8 = var8 * 100.0F / (float)(this.fontRenderer.getStringWidth(this.splashText) + 32); GL11.glScalef(var8, var8, var8); this.drawCenteredString(this.fontRenderer, this.splashText, 0, -8, 16776960); diff --git a/src/minecraft/net/minecraft/src/GuiNewChat.java b/src/minecraft/net/minecraft/src/GuiNewChat.java index 350337f..50da088 100644 --- a/src/minecraft/net/minecraft/src/GuiNewChat.java +++ b/src/minecraft/net/minecraft/src/GuiNewChat.java @@ -54,7 +54,7 @@ public class GuiNewChat extends Gui if (var9 < 200 || var3) { - double var10 = (double)var9 / 200.0D; + double var10 = (float)var9 / 200.0D; var10 = 1.0D - var10; var10 *= 10.0D; diff --git a/src/minecraft/net/minecraft/src/GuiParticle.java b/src/minecraft/net/minecraft/src/GuiParticle.java index 636218f..cbaf9c1 100644 --- a/src/minecraft/net/minecraft/src/GuiParticle.java +++ b/src/minecraft/net/minecraft/src/GuiParticle.java @@ -39,12 +39,12 @@ public class GuiParticle extends Gui while (var2.hasNext()) { Particle var3 = (Particle)var2.next(); - int var4 = (int)(var3.prevPosX + (var3.posX - var3.prevPosX) * (double)par1 - 4.0D); - int var5 = (int)(var3.prevPosY + (var3.posY - var3.prevPosY) * (double)par1 - 4.0D); - float var6 = (float)(var3.prevTintAlpha + (var3.tintAlpha - var3.prevTintAlpha) * (double)par1); - float var7 = (float)(var3.prevTintRed + (var3.tintRed - var3.prevTintRed) * (double)par1); - float var8 = (float)(var3.prevTintGreen + (var3.tintGreen - var3.prevTintGreen) * (double)par1); - float var9 = (float)(var3.prevTintBlue + (var3.tintBlue - var3.prevTintBlue) * (double)par1); + int var4 = (int)(var3.prevPosX + (var3.posX - var3.prevPosX) * (float)par1 - 4.0D); + int var5 = (int)(var3.prevPosY + (var3.posY - var3.prevPosY) * (float)par1 - 4.0D); + float var6 = (float)(var3.prevTintAlpha + (var3.tintAlpha - var3.prevTintAlpha) * (float)par1); + float var7 = (float)(var3.prevTintRed + (var3.tintRed - var3.prevTintRed) * (float)par1); + float var8 = (float)(var3.prevTintGreen + (var3.tintGreen - var3.prevTintGreen) * (float)par1); + float var9 = (float)(var3.prevTintBlue + (var3.tintBlue - var3.prevTintBlue) * (float)par1); GL11.glColor4f(var7, var8, var9, var6); this.drawTexturedModalRect(var4, var5, 40, 0, 8, 8); } diff --git a/src/minecraft/net/minecraft/src/GuiScreen.java b/src/minecraft/net/minecraft/src/GuiScreen.java index 35b8819..63edb55 100644 --- a/src/minecraft/net/minecraft/src/GuiScreen.java +++ b/src/minecraft/net/minecraft/src/GuiScreen.java @@ -256,10 +256,10 @@ public class GuiScreen extends Gui float var3 = 32.0F; var2.startDrawingQuads(); var2.setColorOpaque_I(4210752); - var2.addVertexWithUV(0.0D, (double)this.height, 0.0D, 0.0D, (double)((float)this.height / var3 + (float)par1)); - var2.addVertexWithUV((double)this.width, (double)this.height, 0.0D, (double)((float)this.width / var3), (double)((float)this.height / var3 + (float)par1)); - var2.addVertexWithUV((double)this.width, 0.0D, 0.0D, (double)((float)this.width / var3), (double)par1); - var2.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, (double)par1); + var2.addVertexWithUV(0.0D, (float)this.height, 0.0D, 0.0D, (float)((float)this.height / var3 + (float)par1)); + var2.addVertexWithUV((float)this.width, (float)this.height, 0.0D, (float)((float)this.width / var3), (float)((float)this.height / var3 + (float)par1)); + var2.addVertexWithUV((float)this.width, 0.0D, 0.0D, (float)((float)this.width / var3), (float)par1); + var2.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, (float)par1); var2.draw(); } diff --git a/src/minecraft/net/minecraft/src/GuiSlot.java b/src/minecraft/net/minecraft/src/GuiSlot.java index a769c2f..49721bf 100644 --- a/src/minecraft/net/minecraft/src/GuiSlot.java +++ b/src/minecraft/net/minecraft/src/GuiSlot.java @@ -331,10 +331,10 @@ public abstract class GuiSlot float var17 = 32.0F; var18.startDrawingQuads(); var18.setColorOpaque_I(2105376); - var18.addVertexWithUV((double)this.left, (double)this.bottom, 0.0D, (double)((float)this.left / var17), (double)((float)(this.bottom + (int)this.amountScrolled) / var17)); - var18.addVertexWithUV((double)this.right, (double)this.bottom, 0.0D, (double)((float)this.right / var17), (double)((float)(this.bottom + (int)this.amountScrolled) / var17)); - var18.addVertexWithUV((double)this.right, (double)this.top, 0.0D, (double)((float)this.right / var17), (double)((float)(this.top + (int)this.amountScrolled) / var17)); - var18.addVertexWithUV((double)this.left, (double)this.top, 0.0D, (double)((float)this.left / var17), (double)((float)(this.top + (int)this.amountScrolled) / var17)); + var18.addVertexWithUV((float)this.left, (float)this.bottom, 0.0D, (float)((float)this.left / var17), (float)((float)(this.bottom + (int)this.amountScrolled) / var17)); + var18.addVertexWithUV((float)this.right, (float)this.bottom, 0.0D, (float)((float)this.right / var17), (float)((float)(this.bottom + (int)this.amountScrolled) / var17)); + var18.addVertexWithUV((float)this.right, (float)this.top, 0.0D, (float)((float)this.right / var17), (float)((float)(this.top + (int)this.amountScrolled) / var17)); + var18.addVertexWithUV((float)this.left, (float)this.top, 0.0D, (float)((float)this.left / var17), (float)((float)(this.top + (int)this.amountScrolled) / var17)); var18.draw(); var9 = this.width / 2 - 92 - 16; var10 = this.top + 4 - (int)this.amountScrolled; @@ -361,15 +361,15 @@ public abstract class GuiSlot GL11.glDisable(GL11.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorOpaque_I(8421504); - var18.addVertexWithUV((double)var14, (double)(var20 + var13 + 2), 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)var15, (double)(var20 + var13 + 2), 0.0D, 1.0D, 1.0D); - var18.addVertexWithUV((double)var15, (double)(var20 - 2), 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)var14, (double)(var20 - 2), 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)var14, (float)(var20 + var13 + 2), 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)var15, (float)(var20 + var13 + 2), 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)var15, (float)(var20 - 2), 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)var14, (float)(var20 - 2), 0.0D, 0.0D, 0.0D); var18.setColorOpaque_I(0); - var18.addVertexWithUV((double)(var14 + 1), (double)(var20 + var13 + 1), 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)(var15 - 1), (double)(var20 + var13 + 1), 0.0D, 1.0D, 1.0D); - var18.addVertexWithUV((double)(var15 - 1), (double)(var20 - 1), 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)(var14 + 1), (double)(var20 - 1), 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)(var14 + 1), (float)(var20 + var13 + 1), 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)(var15 - 1), (float)(var20 + var13 + 1), 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)(var15 - 1), (float)(var20 - 1), 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)(var14 + 1), (float)(var20 - 1), 0.0D, 0.0D, 0.0D); var18.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); } @@ -389,19 +389,19 @@ public abstract class GuiSlot GL11.glDisable(GL11.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorRGBA_I(0, 0); - var18.addVertexWithUV((double)this.left, (double)(this.top + var19), 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)this.right, (double)(this.top + var19), 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)this.left, (float)(this.top + var19), 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)this.right, (float)(this.top + var19), 0.0D, 1.0D, 1.0D); var18.setColorRGBA_I(0, 255); - var18.addVertexWithUV((double)this.right, (double)this.top, 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)this.left, (double)this.top, 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)this.right, (float)this.top, 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)this.left, (float)this.top, 0.0D, 0.0D, 0.0D); var18.draw(); var18.startDrawingQuads(); var18.setColorRGBA_I(0, 255); - var18.addVertexWithUV((double)this.left, (double)this.bottom, 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)this.right, (double)this.bottom, 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)this.left, (float)this.bottom, 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)this.right, (float)this.bottom, 0.0D, 1.0D, 1.0D); var18.setColorRGBA_I(0, 0); - var18.addVertexWithUV((double)this.right, (double)(this.bottom - var19), 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)this.left, (double)(this.bottom - var19), 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)this.right, (float)(this.bottom - var19), 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)this.left, (float)(this.bottom - var19), 0.0D, 0.0D, 0.0D); var18.draw(); var20 = this.func_77209_d(); @@ -428,24 +428,24 @@ public abstract class GuiSlot var18.startDrawingQuads(); var18.setColorRGBA_I(0, 255); - var18.addVertexWithUV((double)var5, (double)this.bottom, 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)var6, (double)this.bottom, 0.0D, 1.0D, 1.0D); - var18.addVertexWithUV((double)var6, (double)this.top, 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)var5, (double)this.top, 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)var5, (float)this.bottom, 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)var6, (float)this.bottom, 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)var6, (float)this.top, 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)var5, (float)this.top, 0.0D, 0.0D, 0.0D); var18.draw(); var18.startDrawingQuads(); var18.setColorRGBA_I(8421504, 255); - var18.addVertexWithUV((double)var5, (double)(var14 + var13), 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)var6, (double)(var14 + var13), 0.0D, 1.0D, 1.0D); - var18.addVertexWithUV((double)var6, (double)var14, 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)var5, (double)var14, 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)var5, (float)(var14 + var13), 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)var6, (float)(var14 + var13), 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)var6, (float)var14, 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)var5, (float)var14, 0.0D, 0.0D, 0.0D); var18.draw(); var18.startDrawingQuads(); var18.setColorRGBA_I(12632256, 255); - var18.addVertexWithUV((double)var5, (double)(var14 + var13 - 1), 0.0D, 0.0D, 1.0D); - var18.addVertexWithUV((double)(var6 - 1), (double)(var14 + var13 - 1), 0.0D, 1.0D, 1.0D); - var18.addVertexWithUV((double)(var6 - 1), (double)var14, 0.0D, 1.0D, 0.0D); - var18.addVertexWithUV((double)var5, (double)var14, 0.0D, 0.0D, 0.0D); + var18.addVertexWithUV((float)var5, (float)(var14 + var13 - 1), 0.0D, 0.0D, 1.0D); + var18.addVertexWithUV((float)(var6 - 1), (float)(var14 + var13 - 1), 0.0D, 1.0D, 1.0D); + var18.addVertexWithUV((float)(var6 - 1), (float)var14, 0.0D, 1.0D, 0.0D); + var18.addVertexWithUV((float)var5, (float)var14, 0.0D, 0.0D, 0.0D); var18.draw(); } @@ -472,11 +472,11 @@ public abstract class GuiSlot float var6 = 32.0F; var5.startDrawingQuads(); var5.setColorRGBA_I(4210752, par4); - var5.addVertexWithUV(0.0D, (double)par2, 0.0D, 0.0D, (double)((float)par2 / var6)); - var5.addVertexWithUV((double)this.width, (double)par2, 0.0D, (double)((float)this.width / var6), (double)((float)par2 / var6)); + var5.addVertexWithUV(0.0D, (float)par2, 0.0D, 0.0D, (float)((float)par2 / var6)); + var5.addVertexWithUV((float)this.width, (float)par2, 0.0D, (float)((float)this.width / var6), (float)((float)par2 / var6)); var5.setColorRGBA_I(4210752, par3); - var5.addVertexWithUV((double)this.width, (double)par1, 0.0D, (double)((float)this.width / var6), (double)((float)par1 / var6)); - var5.addVertexWithUV(0.0D, (double)par1, 0.0D, 0.0D, (double)((float)par1 / var6)); + var5.addVertexWithUV((float)this.width, (float)par1, 0.0D, (float)((float)this.width / var6), (float)((float)par1 / var6)); + var5.addVertexWithUV(0.0D, (float)par1, 0.0D, 0.0D, (float)((float)par1 / var6)); var5.draw(); } } diff --git a/src/minecraft/net/minecraft/src/GuiStats.java b/src/minecraft/net/minecraft/src/GuiStats.java index 47d4740..86e99c0 100644 --- a/src/minecraft/net/minecraft/src/GuiStats.java +++ b/src/minecraft/net/minecraft/src/GuiStats.java @@ -142,10 +142,10 @@ public class GuiStats extends GuiScreen this.mc.renderEngine.bindTexture(var5); Tessellator var10 = Tessellator.instance; var10.startDrawingQuads(); - var10.addVertexWithUV((double)(par1 + 0), (double)(par2 + 18), (double)this.zLevel, (double)((float)(par3 + 0) * 0.0078125F), (double)((float)(par4 + 18) * 0.0078125F)); - var10.addVertexWithUV((double)(par1 + 18), (double)(par2 + 18), (double)this.zLevel, (double)((float)(par3 + 18) * 0.0078125F), (double)((float)(par4 + 18) * 0.0078125F)); - var10.addVertexWithUV((double)(par1 + 18), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + 18) * 0.0078125F), (double)((float)(par4 + 0) * 0.0078125F)); - var10.addVertexWithUV((double)(par1 + 0), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + 0) * 0.0078125F), (double)((float)(par4 + 0) * 0.0078125F)); + var10.addVertexWithUV((float)(par1 + 0), (float)(par2 + 18), (float)this.zLevel, (float)((float)(par3 + 0) * 0.0078125F), (float)((float)(par4 + 18) * 0.0078125F)); + var10.addVertexWithUV((float)(par1 + 18), (float)(par2 + 18), (float)this.zLevel, (float)((float)(par3 + 18) * 0.0078125F), (float)((float)(par4 + 18) * 0.0078125F)); + var10.addVertexWithUV((float)(par1 + 18), (float)(par2 + 0), (float)this.zLevel, (float)((float)(par3 + 18) * 0.0078125F), (float)((float)(par4 + 0) * 0.0078125F)); + var10.addVertexWithUV((float)(par1 + 0), (float)(par2 + 0), (float)this.zLevel, (float)((float)(par3 + 0) * 0.0078125F), (float)((float)(par4 + 0) * 0.0078125F)); var10.draw(); } diff --git a/src/minecraft/net/minecraft/src/GuiTextField.java b/src/minecraft/net/minecraft/src/GuiTextField.java index 6c2b9c1..b690325 100644 --- a/src/minecraft/net/minecraft/src/GuiTextField.java +++ b/src/minecraft/net/minecraft/src/GuiTextField.java @@ -556,10 +556,10 @@ public class GuiTextField extends Gui GL11.glEnable(GL11.GL_COLOR_LOGIC_OP); GL11.glLogicOp(GL11.GL_OR_REVERSE); var6.startDrawingQuads(); - var6.addVertex((double)par1, (double)par4, 0.0D); - var6.addVertex((double)par3, (double)par4, 0.0D); - var6.addVertex((double)par3, (double)par2, 0.0D); - var6.addVertex((double)par1, (double)par2, 0.0D); + var6.addVertex((float)par1, (float)par4, 0.0D); + var6.addVertex((float)par3, (float)par4, 0.0D); + var6.addVertex((float)par3, (float)par2, 0.0D); + var6.addVertex((float)par1, (float)par2, 0.0D); var6.draw(); GL11.glDisable(GL11.GL_COLOR_LOGIC_OP); GL11.glEnable(GL11.GL_TEXTURE_2D); diff --git a/src/minecraft/net/minecraft/src/GuiTexturePackSlot.java b/src/minecraft/net/minecraft/src/GuiTexturePackSlot.java index d7f5f01..aa3b4c2 100644 --- a/src/minecraft/net/minecraft/src/GuiTexturePackSlot.java +++ b/src/minecraft/net/minecraft/src/GuiTexturePackSlot.java @@ -69,10 +69,10 @@ class GuiTexturePackSlot extends GuiSlot GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); par5Tessellator.startDrawingQuads(); par5Tessellator.setColorOpaque_I(16777215); - par5Tessellator.addVertexWithUV((double)par2, (double)(par3 + par4), 0.0D, 0.0D, 1.0D); - par5Tessellator.addVertexWithUV((double)(par2 + 32), (double)(par3 + par4), 0.0D, 1.0D, 1.0D); - par5Tessellator.addVertexWithUV((double)(par2 + 32), (double)par3, 0.0D, 1.0D, 0.0D); - par5Tessellator.addVertexWithUV((double)par2, (double)par3, 0.0D, 0.0D, 0.0D); + par5Tessellator.addVertexWithUV((float)par2, (float)(par3 + par4), 0.0D, 0.0D, 1.0D); + par5Tessellator.addVertexWithUV((float)(par2 + 32), (float)(par3 + par4), 0.0D, 1.0D, 1.0D); + par5Tessellator.addVertexWithUV((float)(par2 + 32), (float)par3, 0.0D, 1.0D, 0.0D); + par5Tessellator.addVertexWithUV((float)par2, (float)par3, 0.0D, 0.0D, 0.0D); par5Tessellator.draw(); this.parentTexturePackGui.drawString(GuiTexturePacks.func_73960_l(this.parentTexturePackGui), var6.func_77538_c(), par2 + 32 + 2, par3 + 1, 16777215); this.parentTexturePackGui.drawString(GuiTexturePacks.func_73963_m(this.parentTexturePackGui), var6.func_77531_d(), par2 + 32 + 2, par3 + 12, 8421504); diff --git a/src/minecraft/net/minecraft/src/GuiWinGame.java b/src/minecraft/net/minecraft/src/GuiWinGame.java index 918fdb1..0facd9f 100644 --- a/src/minecraft/net/minecraft/src/GuiWinGame.java +++ b/src/minecraft/net/minecraft/src/GuiWinGame.java @@ -145,10 +145,10 @@ public class GuiWinGame extends GuiScreen var9 *= var9; var9 = var9 * 96.0F / 255.0F; var4.setColorOpaque_F(var9, var9, var9); - var4.addVertexWithUV(0.0D, (double)this.height, (double)this.zLevel, 0.0D, (double)(var6 * var8)); - var4.addVertexWithUV((double)var5, (double)this.height, (double)this.zLevel, (double)((float)var5 * var8), (double)(var6 * var8)); - var4.addVertexWithUV((double)var5, 0.0D, (double)this.zLevel, (double)((float)var5 * var8), (double)(var7 * var8)); - var4.addVertexWithUV(0.0D, 0.0D, (double)this.zLevel, 0.0D, (double)(var7 * var8)); + var4.addVertexWithUV(0.0D, (float)this.height, (float)this.zLevel, 0.0D, (float)(var6 * var8)); + var4.addVertexWithUV((float)var5, (float)this.height, (float)this.zLevel, (float)((float)var5 * var8), (float)(var6 * var8)); + var4.addVertexWithUV((float)var5, 0.0D, (float)this.zLevel, (float)((float)var5 * var8), (float)(var7 * var8)); + var4.addVertexWithUV(0.0D, 0.0D, (float)this.zLevel, 0.0D, (float)(var7 * var8)); var4.draw(); } @@ -211,10 +211,10 @@ public class GuiWinGame extends GuiScreen var4.setColorRGBA_F(1.0F, 1.0F, 1.0F, 1.0F); var10 = this.width; int var13 = this.height; - var4.addVertexWithUV(0.0D, (double)var13, (double)this.zLevel, 0.0D, 1.0D); - var4.addVertexWithUV((double)var10, (double)var13, (double)this.zLevel, 1.0D, 1.0D); - var4.addVertexWithUV((double)var10, 0.0D, (double)this.zLevel, 1.0D, 0.0D); - var4.addVertexWithUV(0.0D, 0.0D, (double)this.zLevel, 0.0D, 0.0D); + var4.addVertexWithUV(0.0D, (float)var13, (float)this.zLevel, 0.0D, 1.0D); + var4.addVertexWithUV((float)var10, (float)var13, (float)this.zLevel, 1.0D, 1.0D); + var4.addVertexWithUV((float)var10, 0.0D, (float)this.zLevel, 1.0D, 0.0D); + var4.addVertexWithUV(0.0D, 0.0D, (float)this.zLevel, 0.0D, 0.0D); var4.draw(); GL11.glDisable(GL11.GL_BLEND); super.drawScreen(par1, par2, par3); diff --git a/src/minecraft/net/minecraft/src/Item.java b/src/minecraft/net/minecraft/src/Item.java index 8c39b3a..671bd43 100644 --- a/src/minecraft/net/minecraft/src/Item.java +++ b/src/minecraft/net/minecraft/src/Item.java @@ -561,18 +561,18 @@ public class Item float var4 = 1.0F; float var5 = par2EntityPlayer.prevRotationPitch + (par2EntityPlayer.rotationPitch - par2EntityPlayer.prevRotationPitch) * var4; float var6 = par2EntityPlayer.prevRotationYaw + (par2EntityPlayer.rotationYaw - par2EntityPlayer.prevRotationYaw) * var4; - double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * (double)var4; - double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * (double)var4 + 1.62D - (double)par2EntityPlayer.yOffset; - double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * (double)var4; + double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * (float)var4; + double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * (float)var4 + 1.62D - (float)par2EntityPlayer.yOffset; + double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * (float)var4; Vec3 var13 = Vec3.getVec3Pool().getVecFromPool(var7, var9, var11); - float var14 = MathHelper.cos(-var6 * 0.017453292F - (float)Math.PI); - float var15 = MathHelper.sin(-var6 * 0.017453292F - (float)Math.PI); + float var14 = MathHelper.cos(-var6 * 0.017453292F - (float)(float)Math.PI); + float var15 = MathHelper.sin(-var6 * 0.017453292F - (float)(float)Math.PI); float var16 = -MathHelper.cos(-var5 * 0.017453292F); float var17 = MathHelper.sin(-var5 * 0.017453292F); float var18 = var15 * var16; float var20 = var14 * var16; double var21 = 5.0D; - Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21); + Vec3 var23 = var13.addVector((float)var18 * var21, (float)var17 * var21, (float)var20 * var21); return par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3); } diff --git a/src/minecraft/net/minecraft/src/ItemBed.java b/src/minecraft/net/minecraft/src/ItemBed.java index 895d483..28c8546 100644 --- a/src/minecraft/net/minecraft/src/ItemBed.java +++ b/src/minecraft/net/minecraft/src/ItemBed.java @@ -20,7 +20,7 @@ public class ItemBed extends Item { ++par5; BlockBed var11 = (BlockBed)Block.bed; - int var12 = MathHelper.floor_double((double)(par2EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int var12 = MathHelper.floor_double((float)(par2EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; byte var13 = 0; byte var14 = 0; diff --git a/src/minecraft/net/minecraft/src/ItemBlock.java b/src/minecraft/net/minecraft/src/ItemBlock.java index a24b8c3..75404ad 100644 --- a/src/minecraft/net/minecraft/src/ItemBlock.java +++ b/src/minecraft/net/minecraft/src/ItemBlock.java @@ -88,7 +88,7 @@ public class ItemBlock extends Item Block.blocksList[this.blockID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer); } - par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((float)((float)par4.floatValue() + 0.5F), (float)((float)par5 + 0.5F), (float)((float)par6.floatValue() + 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } diff --git a/src/minecraft/net/minecraft/src/ItemBoat.java b/src/minecraft/net/minecraft/src/ItemBoat.java index c4ee323..3258603 100644 --- a/src/minecraft/net/minecraft/src/ItemBoat.java +++ b/src/minecraft/net/minecraft/src/ItemBoat.java @@ -21,18 +21,18 @@ public class ItemBoat extends Item float var4 = 1.0F; float var5 = par3EntityPlayer.prevRotationPitch + (par3EntityPlayer.rotationPitch - par3EntityPlayer.prevRotationPitch) * var4; float var6 = par3EntityPlayer.prevRotationYaw + (par3EntityPlayer.rotationYaw - par3EntityPlayer.prevRotationYaw) * var4; - double var7 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double)var4; - double var9 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double)var4 + 1.62D - (double)par3EntityPlayer.yOffset; - double var11 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double)var4; + double var7 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (float)var4; + double var9 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (float)var4 + 1.62D - (float)par3EntityPlayer.yOffset; + double var11 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (float)var4; Vec3 var13 = Vec3.getVec3Pool().getVecFromPool(var7, var9, var11); - float var14 = MathHelper.cos(-var6 * 0.017453292F - (float)Math.PI); - float var15 = MathHelper.sin(-var6 * 0.017453292F - (float)Math.PI); + float var14 = MathHelper.cos(-var6 * 0.017453292F - (float)(float)Math.PI); + float var15 = MathHelper.sin(-var6 * 0.017453292F - (float)(float)Math.PI); float var16 = -MathHelper.cos(-var5 * 0.017453292F); float var17 = MathHelper.sin(-var5 * 0.017453292F); float var18 = var15 * var16; float var20 = var14 * var16; double var21 = 5.0D; - Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21); + Vec3 var23 = var13.addVector((float)var18 * var21, (float)var17 * var21, (float)var20 * var21); MovingObjectPosition var24 = par2World.rayTraceBlocks_do(var13, var23, true); if (var24 == null) @@ -44,7 +44,7 @@ public class ItemBoat extends Item Vec3 var25 = par3EntityPlayer.getLook(var4); boolean var26 = false; float var27 = 1.0F; - List var28 = par2World.getEntitiesWithinAABBExcludingEntity(par3EntityPlayer, ((Entity)par3EntityPlayer).boundingBox.addCoord(var25.xCoord * var21, var25.yCoord * var21, var25.zCoord * var21).expand((double)var27, (double)var27, (double)var27)); + List var28 = par2World.getEntitiesWithinAABBExcludingEntity(par3EntityPlayer, ((Entity)par3EntityPlayer).boundingBox.addCoord(var25.xCoord * var21, var25.yCoord * var21, var25.zCoord * var21).expand((float)var27, (float)var27, (float)var27)); Iterator var29 = var28.iterator(); while (var29.hasNext()) @@ -54,7 +54,7 @@ public class ItemBoat extends Item if (var30.canBeCollidedWith()) { float var31 = var30.getCollisionBorderSize(); - AxisAlignedBB var32 = var30.boundingBox.expand((double)var31, (double)var31, (double)var31); + AxisAlignedBB var32 = var30.boundingBox.expand((float)var31, (float)var31, (float)var31); if (var32.isVecInside(var13)) { @@ -82,7 +82,7 @@ public class ItemBoat extends Item --var34; } - par2World.spawnEntityInWorld(new EntityBoat(par2World, (double)((float)var33.floatValue() + 0.5F), (double)((float)var34 + 1.0F), (double)((float)var35.floatValue() + 0.5F))); + par2World.spawnEntityInWorld(new EntityBoat(par2World, (float)((float)var33.floatValue() + 0.5F), (float)((float)var34 + 1.0F), (float)((float)var35.floatValue() + 0.5F))); } if (!par3EntityPlayer.capabilities.isCreativeMode) diff --git a/src/minecraft/net/minecraft/src/ItemBow.java b/src/minecraft/net/minecraft/src/ItemBow.java index 2b6ccf7..92a1599 100644 --- a/src/minecraft/net/minecraft/src/ItemBow.java +++ b/src/minecraft/net/minecraft/src/ItemBow.java @@ -23,7 +23,7 @@ public class ItemBow extends Item float var7 = (float)var6 / 20.0F; var7 = (var7 * var7 + var7 * 2.0F) / 3.0F; - if ((double)var7 < 0.1D) + if ((float)var7 < 0.1D) { return; } @@ -44,7 +44,7 @@ public class ItemBow extends Item if (var9 > 0) { - var8.setDamage(var8.getDamage() + (double)var9 * 0.5D + 0.5D); + var8.setDamage(var8.getDamage() + (float)var9 * 0.5D + 0.5D); } int var10 = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, par1ItemStack); diff --git a/src/minecraft/net/minecraft/src/ItemBucket.java b/src/minecraft/net/minecraft/src/ItemBucket.java index 1ccf5cf..2eab87c 100644 --- a/src/minecraft/net/minecraft/src/ItemBucket.java +++ b/src/minecraft/net/minecraft/src/ItemBucket.java @@ -21,9 +21,9 @@ public class ItemBucket extends Item public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { float var4 = 1.0F; - double var5 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double)var4; - double var7 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double)var4 + 1.62D - (double)par3EntityPlayer.yOffset; - double var9 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double)var4; + double var5 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (float)var4; + double var7 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (float)var4 + 1.62D - (float)par3EntityPlayer.yOffset; + double var9 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (float)var4; boolean var11 = this.isFull == 0; MovingObjectPosition var12 = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, var11); @@ -170,7 +170,7 @@ public class ItemBucket extends Item for (int var11 = 0; var11 < 8; ++var11) { - par1World.spawnParticle("largesmoke", (double)par8.doubleValue() + Math.random(), (double)par9 + Math.random(), (double)par10.doubleValue() + Math.random(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (float)par8.doubleValue() + Math.random(), (float)par9 + Math.random(), (float)par10.doubleValue() + Math.random(), 0.0D, 0.0D, 0.0D); } } else diff --git a/src/minecraft/net/minecraft/src/ItemDoor.java b/src/minecraft/net/minecraft/src/ItemDoor.java index cb31db7..3cdbda8 100644 --- a/src/minecraft/net/minecraft/src/ItemDoor.java +++ b/src/minecraft/net/minecraft/src/ItemDoor.java @@ -42,7 +42,7 @@ public class ItemDoor extends Item } else { - int var12 = MathHelper.floor_double((double)((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; + int var12 = MathHelper.floor_double((float)((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3; placeDoorBlock(par3World, par4, par5, par6, var12, var11); --par1ItemStack.stackSize; return true; diff --git a/src/minecraft/net/minecraft/src/ItemEnderEye.java b/src/minecraft/net/minecraft/src/ItemEnderEye.java index 15865cc..eb30d52 100644 --- a/src/minecraft/net/minecraft/src/ItemEnderEye.java +++ b/src/minecraft/net/minecraft/src/ItemEnderEye.java @@ -29,9 +29,9 @@ public class ItemEnderEye extends Item for (var13 = 0; var13 < 16; ++var13) { - double var14 = (double)((float)par4.floatValue() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); - double var16 = (double)((float)par5 + 0.8125F); - double var18 = (double)((float)par6.floatValue() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); + double var14 = (float)((float)par4.floatValue() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); + double var16 = (float)((float)par5 + 0.8125F); + double var18 = (float)((float)par6.floatValue() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); double var20 = 0.0D; double var22 = 0.0D; double var24 = 0.0D; @@ -156,7 +156,7 @@ public class ItemEnderEye extends Item if (var7 != null) { - EntityEnderEye var6 = new EntityEnderEye(par2World, par3EntityPlayer.posX, par3EntityPlayer.posY + 1.62D - (double)par3EntityPlayer.yOffset, par3EntityPlayer.posZ); + EntityEnderEye var6 = new EntityEnderEye(par2World, par3EntityPlayer.posX, par3EntityPlayer.posY + 1.62D - (float)par3EntityPlayer.yOffset, par3EntityPlayer.posZ); var6.moveTowards(var7.x.doubleValue(), var7.y, var7.z.doubleValue()); par2World.spawnEntityInWorld(var6); par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); diff --git a/src/minecraft/net/minecraft/src/ItemFireball.java b/src/minecraft/net/minecraft/src/ItemFireball.java index 187ec4a..4541e22 100644 --- a/src/minecraft/net/minecraft/src/ItemFireball.java +++ b/src/minecraft/net/minecraft/src/ItemFireball.java @@ -58,7 +58,7 @@ public class ItemFireball extends Item if (var11 == 0) { - par3World.playSoundEffect((double)par4.doubleValue() + 0.5D, (double)par5 + 0.5D, (double)par6.doubleValue() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + par3World.playSoundEffect((float)par4.doubleValue() + 0.5D, (float)par5 + 0.5D, (float)par6.doubleValue() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); par3World.setBlockWithNotify(par4, par5, par6, Block.fire.blockID); } diff --git a/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java b/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java index 48f3e31..8ca1099 100644 --- a/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java +++ b/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java @@ -54,7 +54,7 @@ public class ItemFlintAndSteel extends Item if (var11 == 0) { - par3World.playSoundEffect((double)par4.doubleValue() + 0.5D, (double)par5 + 0.5D, (double)par6.doubleValue() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + par3World.playSoundEffect((float)par4.doubleValue() + 0.5D, (float)par5 + 0.5D, (float)par6.doubleValue() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); par3World.setBlockWithNotify(par4, par5, par6, Block.fire.blockID); } diff --git a/src/minecraft/net/minecraft/src/ItemHoe.java b/src/minecraft/net/minecraft/src/ItemHoe.java index b596c01..3f6302e 100644 --- a/src/minecraft/net/minecraft/src/ItemHoe.java +++ b/src/minecraft/net/minecraft/src/ItemHoe.java @@ -33,7 +33,7 @@ public class ItemHoe extends Item else { Block var13 = Block.tilledField; - par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), var13.stepSound.getStepSound(), (var13.stepSound.getVolume() + 1.0F) / 2.0F, var13.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((float)((float)par4.floatValue() + 0.5F), (float)((float)par5 + 0.5F), (float)((float)par6.floatValue() + 0.5F), var13.stepSound.getStepSound(), (var13.stepSound.getVolume() + 1.0F) / 2.0F, var13.stepSound.getPitch() * 0.8F); if (par3World.isRemote) { diff --git a/src/minecraft/net/minecraft/src/ItemMap.java b/src/minecraft/net/minecraft/src/ItemMap.java index a8381c8..cce3875 100644 --- a/src/minecraft/net/minecraft/src/ItemMap.java +++ b/src/minecraft/net/minecraft/src/ItemMap.java @@ -55,8 +55,8 @@ public class ItemMap extends ItemMapBase int var6 = 1 << par3MapData.scale; int var7 = par3MapData.xCenter; int var8 = par3MapData.zCenter; - int var9 = MathHelper.floor_double(par2Entity.posX - (double)var7) / var6 + var4 / 2; - int var10 = MathHelper.floor_double(par2Entity.posZ - (double)var8) / var6 + var5 / 2; + int var9 = MathHelper.floor_double(par2Entity.posX - (float)var7) / var6 + var4 / 2; + int var10 = MathHelper.floor_double(par2Entity.posZ - (float)var8) / var6 + var5 / 2; int var11 = 128 / var6; if (par1World.provider.hasNoSky) @@ -172,7 +172,7 @@ public class ItemMap extends ItemMapBase } } - var31 += (double)var35 / (double)(var6 * var6); + var31 += (float)var35 / (float)(var6 * var6); ++var26[var36]; } } @@ -194,7 +194,7 @@ public class ItemMap extends ItemMapBase } } - double var41 = (var31 - var15) * 4.0D / (double)(var6 + 4) + ((double)(var12 + var17 & 1) - 0.5D) * 0.4D; + double var41 = (var31 - var15) * 4.0D / (float)(var6 + 4) + ((float)(var12 + var17 & 1) - 0.5D) * 0.4D; byte var42 = 1; if (var41 > 0.6D) @@ -215,7 +215,7 @@ public class ItemMap extends ItemMapBase if (var44 == MapColor.waterColor) { - var41 = (double)var30 * 0.1D + (double)(var12 + var17 & 1) * 0.2D; + var41 = (float)var30 * 0.1D + (float)(var12 + var17 & 1) * 0.2D; var42 = 1; if (var41 < 0.5D) diff --git a/src/minecraft/net/minecraft/src/ItemMinecart.java b/src/minecraft/net/minecraft/src/ItemMinecart.java index fa63a9f..b22f522 100644 --- a/src/minecraft/net/minecraft/src/ItemMinecart.java +++ b/src/minecraft/net/minecraft/src/ItemMinecart.java @@ -22,7 +22,7 @@ public class ItemMinecart extends Item { if (!par3World.isRemote) { - par3World.spawnEntityInWorld(new EntityMinecart(par3World, (double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), this.minecartType)); + par3World.spawnEntityInWorld(new EntityMinecart(par3World, (float)((float)par4.floatValue() + 0.5F), (float)((float)par5 + 0.5F), (float)((float)par6.floatValue() + 0.5F), this.minecartType)); } --par1ItemStack.stackSize; diff --git a/src/minecraft/net/minecraft/src/ItemMonsterPlacer.java b/src/minecraft/net/minecraft/src/ItemMonsterPlacer.java index e5def34..6fe60de 100644 --- a/src/minecraft/net/minecraft/src/ItemMonsterPlacer.java +++ b/src/minecraft/net/minecraft/src/ItemMonsterPlacer.java @@ -64,7 +64,7 @@ public class ItemMonsterPlacer extends Item var12 = 0.5D; } - if (spawnCreature(par3World, par1ItemStack.getItemDamage(), (double)par4.doubleValue() + 0.5D, (double)par5 + var12, (double)par6.doubleValue() + 0.5D) && !par2EntityPlayer.capabilities.isCreativeMode) + if (spawnCreature(par3World, par1ItemStack.getItemDamage(), (float)par4.doubleValue() + 0.5D, (float)par5 + var12, (float)par6.doubleValue() + 0.5D) && !par2EntityPlayer.capabilities.isCreativeMode) { --par1ItemStack.stackSize; } diff --git a/src/minecraft/net/minecraft/src/ItemReed.java b/src/minecraft/net/minecraft/src/ItemReed.java index ba412e7..5d290e7 100644 --- a/src/minecraft/net/minecraft/src/ItemReed.java +++ b/src/minecraft/net/minecraft/src/ItemReed.java @@ -76,7 +76,7 @@ public class ItemReed extends Item Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer); } - par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 .floatValue()+ 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((float)((float)par4.floatValue() + 0.5F), (float)((float)par5 + 0.5F), (float)((float)par6 .floatValue()+ 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } } diff --git a/src/minecraft/net/minecraft/src/ItemRenderer.java b/src/minecraft/net/minecraft/src/ItemRenderer.java index 3ccffa6..5455994 100644 --- a/src/minecraft/net/minecraft/src/ItemRenderer.java +++ b/src/minecraft/net/minecraft/src/ItemRenderer.java @@ -119,17 +119,17 @@ public class ItemRenderer float var7 = 0.0625F; par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(0.0F, 0.0F, 1.0F); - par1Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double)par2, (double)par5); - par1Tessellator.addVertexWithUV((double)var6, 0.0D, 0.0D, (double)par4, (double)par5); - par1Tessellator.addVertexWithUV((double)var6, 1.0D, 0.0D, (double)par4, (double)par3); - par1Tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, (double)par2, (double)par3); + par1Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (float)par2, (float)par5); + par1Tessellator.addVertexWithUV((float)var6, 0.0D, 0.0D, (float)par4, (float)par5); + par1Tessellator.addVertexWithUV((float)var6, 1.0D, 0.0D, (float)par4, (float)par3); + par1Tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, (float)par2, (float)par3); par1Tessellator.draw(); par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(0.0F, 0.0F, -1.0F); - par1Tessellator.addVertexWithUV(0.0D, 1.0D, (double)(0.0F - var7), (double)par2, (double)par3); - par1Tessellator.addVertexWithUV((double)var6, 1.0D, (double)(0.0F - var7), (double)par4, (double)par3); - par1Tessellator.addVertexWithUV((double)var6, 0.0D, (double)(0.0F - var7), (double)par4, (double)par5); - par1Tessellator.addVertexWithUV(0.0D, 0.0D, (double)(0.0F - var7), (double)par2, (double)par5); + par1Tessellator.addVertexWithUV(0.0D, 1.0D, (float)(0.0F - var7), (float)par2, (float)par3); + par1Tessellator.addVertexWithUV((float)var6, 1.0D, (float)(0.0F - var7), (float)par4, (float)par3); + par1Tessellator.addVertexWithUV((float)var6, 0.0D, (float)(0.0F - var7), (float)par4, (float)par5); + par1Tessellator.addVertexWithUV(0.0D, 0.0D, (float)(0.0F - var7), (float)par2, (float)par5); par1Tessellator.draw(); par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(-1.0F, 0.0F, 0.0F); @@ -143,10 +143,10 @@ public class ItemRenderer var9 = (float)var8 / 16.0F; var10 = par2 + (par4 - par2) * var9 - 0.001953125F; var11 = var6 * var9; - par1Tessellator.addVertexWithUV((double)var11, 0.0D, (double)(0.0F - var7), (double)var10, (double)par5); - par1Tessellator.addVertexWithUV((double)var11, 0.0D, 0.0D, (double)var10, (double)par5); - par1Tessellator.addVertexWithUV((double)var11, 1.0D, 0.0D, (double)var10, (double)par3); - par1Tessellator.addVertexWithUV((double)var11, 1.0D, (double)(0.0F - var7), (double)var10, (double)par3); + par1Tessellator.addVertexWithUV((float)var11, 0.0D, (float)(0.0F - var7), (float)var10, (float)par5); + par1Tessellator.addVertexWithUV((float)var11, 0.0D, 0.0D, (float)var10, (float)par5); + par1Tessellator.addVertexWithUV((float)var11, 1.0D, 0.0D, (float)var10, (float)par3); + par1Tessellator.addVertexWithUV((float)var11, 1.0D, (float)(0.0F - var7), (float)var10, (float)par3); } par1Tessellator.draw(); @@ -158,10 +158,10 @@ public class ItemRenderer var9 = (float)var8 / 16.0F; var10 = par2 + (par4 - par2) * var9 - 0.001953125F; var11 = var6 * var9 + 0.0625F; - par1Tessellator.addVertexWithUV((double)var11, 1.0D, (double)(0.0F - var7), (double)var10, (double)par3); - par1Tessellator.addVertexWithUV((double)var11, 1.0D, 0.0D, (double)var10, (double)par3); - par1Tessellator.addVertexWithUV((double)var11, 0.0D, 0.0D, (double)var10, (double)par5); - par1Tessellator.addVertexWithUV((double)var11, 0.0D, (double)(0.0F - var7), (double)var10, (double)par5); + par1Tessellator.addVertexWithUV((float)var11, 1.0D, (float)(0.0F - var7), (float)var10, (float)par3); + par1Tessellator.addVertexWithUV((float)var11, 1.0D, 0.0D, (float)var10, (float)par3); + par1Tessellator.addVertexWithUV((float)var11, 0.0D, 0.0D, (float)var10, (float)par5); + par1Tessellator.addVertexWithUV((float)var11, 0.0D, (float)(0.0F - var7), (float)var10, (float)par5); } par1Tessellator.draw(); @@ -173,10 +173,10 @@ public class ItemRenderer var9 = (float)var8 / 16.0F; var10 = par5 + (par3 - par5) * var9 - 0.001953125F; var11 = var6 * var9 + 0.0625F; - par1Tessellator.addVertexWithUV(0.0D, (double)var11, 0.0D, (double)par2, (double)var10); - par1Tessellator.addVertexWithUV((double)var6, (double)var11, 0.0D, (double)par4, (double)var10); - par1Tessellator.addVertexWithUV((double)var6, (double)var11, (double)(0.0F - var7), (double)par4, (double)var10); - par1Tessellator.addVertexWithUV(0.0D, (double)var11, (double)(0.0F - var7), (double)par2, (double)var10); + par1Tessellator.addVertexWithUV(0.0D, (float)var11, 0.0D, (float)par2, (float)var10); + par1Tessellator.addVertexWithUV((float)var6, (float)var11, 0.0D, (float)par4, (float)var10); + par1Tessellator.addVertexWithUV((float)var6, (float)var11, (float)(0.0F - var7), (float)par4, (float)var10); + par1Tessellator.addVertexWithUV(0.0D, (float)var11, (float)(0.0F - var7), (float)par2, (float)var10); } par1Tessellator.draw(); @@ -188,10 +188,10 @@ public class ItemRenderer var9 = (float)var8 / 16.0F; var10 = par5 + (par3 - par5) * var9 - 0.001953125F; var11 = var6 * var9; - par1Tessellator.addVertexWithUV((double)var6, (double)var11, 0.0D, (double)par4, (double)var10); - par1Tessellator.addVertexWithUV(0.0D, (double)var11, 0.0D, (double)par2, (double)var10); - par1Tessellator.addVertexWithUV(0.0D, (double)var11, (double)(0.0F - var7), (double)par2, (double)var10); - par1Tessellator.addVertexWithUV((double)var6, (double)var11, (double)(0.0F - var7), (double)par4, (double)var10); + par1Tessellator.addVertexWithUV((float)var6, (float)var11, 0.0D, (float)par4, (float)var10); + par1Tessellator.addVertexWithUV(0.0D, (float)var11, 0.0D, (float)par2, (float)var10); + par1Tessellator.addVertexWithUV(0.0D, (float)var11, (float)(0.0F - var7), (float)par2, (float)var10); + par1Tessellator.addVertexWithUV((float)var6, (float)var11, (float)(0.0F - var7), (float)par4, (float)var10); } par1Tessellator.draw(); @@ -258,9 +258,9 @@ public class ItemRenderer GL11.glPushMatrix(); var7 = 0.8F; var19 = var3.getSwingProgress(par1); - var21 = MathHelper.sin(var19 * (float)Math.PI); - var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI); - GL11.glTranslatef(-var10 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI * 2.0F) * 0.2F, -var21 * 0.2F); + var21 = MathHelper.sin(var19 * (float)(float)Math.PI); + var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI); + GL11.glTranslatef(-var10 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI * 2.0F) * 0.2F, -var21 * 0.2F); var19 = 1.0F - var4 / 45.0F + 0.1F; if (var19 < 0.0F) @@ -273,7 +273,7 @@ public class ItemRenderer var19 = 1.0F; } - var19 = -MathHelper.cos(var19 * (float)Math.PI) * 0.5F + 0.5F; + var19 = -MathHelper.cos(var19 * (float)(float)Math.PI) * 0.5F + 0.5F; GL11.glTranslatef(0.0F, 0.0F * var7 - (1.0F - var2) * 1.2F - var19 * 0.5F + 0.04F, -0.9F * var7); GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(var19 * -85.0F, 0.0F, 0.0F, 1.0F); @@ -298,8 +298,8 @@ public class ItemRenderer } var21 = var3.getSwingProgress(par1); - var10 = MathHelper.sin(var21 * var21 * (float)Math.PI); - var11 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); + var10 = MathHelper.sin(var21 * var21 * (float)(float)Math.PI); + var11 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)(float)Math.PI); GL11.glRotatef(-var10 * 20.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-var11 * 20.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-var11 * 80.0F, 1.0F, 0.0F, 0.0F); @@ -315,10 +315,10 @@ public class ItemRenderer GL11.glNormal3f(0.0F, 0.0F, -1.0F); var27.startDrawingQuads(); byte var28 = 7; - var27.addVertexWithUV((double)(0 - var28), (double)(128 + var28), 0.0D, 0.0D, 1.0D); - var27.addVertexWithUV((double)(128 + var28), (double)(128 + var28), 0.0D, 1.0D, 1.0D); - var27.addVertexWithUV((double)(128 + var28), (double)(0 - var28), 0.0D, 1.0D, 0.0D); - var27.addVertexWithUV((double)(0 - var28), (double)(0 - var28), 0.0D, 0.0D, 0.0D); + var27.addVertexWithUV((float)(0 - var28), (float)(128 + var28), 0.0D, 0.0D, 1.0D); + var27.addVertexWithUV((float)(128 + var28), (float)(128 + var28), 0.0D, 1.0D, 1.0D); + var27.addVertexWithUV((float)(128 + var28), (float)(0 - var28), 0.0D, 1.0D, 0.0D); + var27.addVertexWithUV((float)(0 - var28), (float)(0 - var28), 0.0D, 0.0D, 0.0D); var27.draw(); MapData var16 = Item.map.getMapData(var17, this.mc.theWorld); this.mapItemRenderer.renderMap(this.mc.thePlayer, this.mc.renderEngine, var16); @@ -342,7 +342,7 @@ public class ItemRenderer var11 = var11 * var11 * var11; var11 = var11 * var11 * var11; var12 = 1.0F - var11; - GL11.glTranslatef(0.0F, MathHelper.abs(MathHelper.cos(var21 / 4.0F * (float)Math.PI) * 0.1F) * (float)((double)var10 > 0.2D ? 1 : 0), 0.0F); + GL11.glTranslatef(0.0F, MathHelper.abs(MathHelper.cos(var21 / 4.0F * (float)(float)Math.PI) * 0.1F) * (float)((float)var10 > 0.2D ? 1 : 0), 0.0F); GL11.glTranslatef(var12 * 0.6F, -var12 * 0.5F, 0.0F); GL11.glRotatef(var12 * 90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(var12 * 10.0F, 1.0F, 0.0F, 0.0F); @@ -352,17 +352,17 @@ public class ItemRenderer else { var19 = var3.getSwingProgress(par1); - var21 = MathHelper.sin(var19 * (float)Math.PI); - var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI); - GL11.glTranslatef(-var10 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI * 2.0F) * 0.2F, -var21 * 0.2F); + var21 = MathHelper.sin(var19 * (float)(float)Math.PI); + var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI); + GL11.glTranslatef(-var10 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI * 2.0F) * 0.2F, -var21 * 0.2F); } GL11.glTranslatef(0.7F * var7, -0.65F * var7 - (1.0F - var2) * 0.6F, -0.9F * var7); GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); GL11.glEnable(GL12.GL_RESCALE_NORMAL); var19 = var3.getSwingProgress(par1); - var21 = MathHelper.sin(var19 * var19 * (float)Math.PI); - var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI); + var21 = MathHelper.sin(var19 * var19 * (float)(float)Math.PI); + var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI); GL11.glRotatef(-var21 * 20.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-var10 * 20.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-var10 * 80.0F, 1.0F, 0.0F, 0.0F); @@ -441,15 +441,15 @@ public class ItemRenderer GL11.glPushMatrix(); var7 = 0.8F; var19 = var3.getSwingProgress(par1); - var21 = MathHelper.sin(var19 * (float)Math.PI); - var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI); - GL11.glTranslatef(-var10 * 0.3F, MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI * 2.0F) * 0.4F, -var21 * 0.4F); + var21 = MathHelper.sin(var19 * (float)(float)Math.PI); + var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI); + GL11.glTranslatef(-var10 * 0.3F, MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI * 2.0F) * 0.4F, -var21 * 0.4F); GL11.glTranslatef(0.8F * var7, -0.75F * var7 - (1.0F - var2) * 0.6F, -0.9F * var7); GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); GL11.glEnable(GL12.GL_RESCALE_NORMAL); var19 = var3.getSwingProgress(par1); - var21 = MathHelper.sin(var19 * var19 * (float)Math.PI); - var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)Math.PI); + var21 = MathHelper.sin(var19 * var19 * (float)(float)Math.PI); + var10 = MathHelper.sin(MathHelper.sqrt_float(var19) * (float)(float)Math.PI); GL11.glRotatef(var10 * 70.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-var21 * 20.0F, 0.0F, 0.0F, 1.0F); GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTextureForDownloadableImage(this.mc.thePlayer.skinUrl, this.mc.thePlayer.getTexture())); @@ -553,10 +553,10 @@ public class ItemRenderer float var13 = (float)(par2 / 16) / 256.0F - var10; float var14 = ((float)(par2 / 16) + 15.99F) / 256.0F + var10; var3.startDrawingQuads(); - var3.addVertexWithUV((double)var5, (double)var7, (double)var9, (double)var12, (double)var14); - var3.addVertexWithUV((double)var6, (double)var7, (double)var9, (double)var11, (double)var14); - var3.addVertexWithUV((double)var6, (double)var8, (double)var9, (double)var11, (double)var13); - var3.addVertexWithUV((double)var5, (double)var8, (double)var9, (double)var12, (double)var13); + var3.addVertexWithUV((float)var5, (float)var7, (float)var9, (float)var12, (float)var14); + var3.addVertexWithUV((float)var6, (float)var7, (float)var9, (float)var11, (float)var14); + var3.addVertexWithUV((float)var6, (float)var8, (float)var9, (float)var11, (float)var13); + var3.addVertexWithUV((float)var5, (float)var8, (float)var9, (float)var12, (float)var13); var3.draw(); GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -583,10 +583,10 @@ public class ItemRenderer float var10 = -this.mc.thePlayer.rotationYaw / 64.0F; float var11 = this.mc.thePlayer.rotationPitch / 64.0F; var2.startDrawingQuads(); - var2.addVertexWithUV((double)var5, (double)var7, (double)var9, (double)(var4 + var10), (double)(var4 + var11)); - var2.addVertexWithUV((double)var6, (double)var7, (double)var9, (double)(0.0F + var10), (double)(var4 + var11)); - var2.addVertexWithUV((double)var6, (double)var8, (double)var9, (double)(0.0F + var10), (double)(0.0F + var11)); - var2.addVertexWithUV((double)var5, (double)var8, (double)var9, (double)(var4 + var10), (double)(0.0F + var11)); + var2.addVertexWithUV((float)var5, (float)var7, (float)var9, (float)(var4 + var10), (float)(var4 + var11)); + var2.addVertexWithUV((float)var6, (float)var7, (float)var9, (float)(0.0F + var10), (float)(var4 + var11)); + var2.addVertexWithUV((float)var6, (float)var8, (float)var9, (float)(0.0F + var10), (float)(0.0F + var11)); + var2.addVertexWithUV((float)var5, (float)var8, (float)var9, (float)(var4 + var10), (float)(0.0F + var11)); var2.draw(); GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -622,10 +622,10 @@ public class ItemRenderer GL11.glTranslatef((float)(-(var4 * 2 - 1)) * 0.24F, -0.3F, 0.0F); GL11.glRotatef((float)(var4 * 2 - 1) * 10.0F, 0.0F, 1.0F, 0.0F); var2.startDrawingQuads(); - var2.addVertexWithUV((double)var12, (double)var14, (double)var16, (double)var9, (double)var11); - var2.addVertexWithUV((double)var13, (double)var14, (double)var16, (double)var8, (double)var11); - var2.addVertexWithUV((double)var13, (double)var15, (double)var16, (double)var8, (double)var10); - var2.addVertexWithUV((double)var12, (double)var15, (double)var16, (double)var9, (double)var10); + var2.addVertexWithUV((float)var12, (float)var14, (float)var16, (float)var9, (float)var11); + var2.addVertexWithUV((float)var13, (float)var14, (float)var16, (float)var8, (float)var11); + var2.addVertexWithUV((float)var13, (float)var15, (float)var16, (float)var8, (float)var10); + var2.addVertexWithUV((float)var12, (float)var15, (float)var16, (float)var9, (float)var10); var2.draw(); GL11.glPopMatrix(); } diff --git a/src/minecraft/net/minecraft/src/ItemSign.java b/src/minecraft/net/minecraft/src/ItemSign.java index 68f9b02..0e925af 100644 --- a/src/minecraft/net/minecraft/src/ItemSign.java +++ b/src/minecraft/net/minecraft/src/ItemSign.java @@ -60,7 +60,7 @@ public class ItemSign extends Item { if (par7 == 1) { - int var11 = MathHelper.floor_double((double)((par2EntityPlayer.rotationYaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15; + int var11 = MathHelper.floor_double((float)((par2EntityPlayer.rotationYaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15; par3World.setBlockAndMetadataWithNotify(par4, par5, par6, Block.signPost.blockID, var11); } else diff --git a/src/minecraft/net/minecraft/src/ItemSlab.java b/src/minecraft/net/minecraft/src/ItemSlab.java index 4166fe6..41f97f7 100644 --- a/src/minecraft/net/minecraft/src/ItemSlab.java +++ b/src/minecraft/net/minecraft/src/ItemSlab.java @@ -64,7 +64,7 @@ public class ItemSlab extends ItemBlock { if (par3World.checkIfAABBIsClear(this.field_77890_c.getCollisionBoundingBoxFromPool(par3World, par4, par5, par6)) && par3World.setBlockAndMetadataWithNotify(par4, par5, par6, this.field_77890_c.blockID, var13)) { - par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((float)((float)par4.floatValue() + 0.5F), (float)((float)par5 + 0.5F), (float)((float)par6.floatValue() + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } @@ -174,7 +174,7 @@ public class ItemSlab extends ItemBlock { if (par3World.checkIfAABBIsClear(this.field_77890_c.getCollisionBoundingBoxFromPool(par3World, par4, par5, par6)) && par3World.setBlockAndMetadataWithNotify(par4, par5, par6, this.field_77890_c.blockID, var10)) { - par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((float)((float)par4.floatValue() + 0.5F), (float)((float)par5 + 0.5F), (float)((float)par6.floatValue() + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } diff --git a/src/minecraft/net/minecraft/src/ItemSword.java b/src/minecraft/net/minecraft/src/ItemSword.java index 565fb6a..2b2908f 100644 --- a/src/minecraft/net/minecraft/src/ItemSword.java +++ b/src/minecraft/net/minecraft/src/ItemSword.java @@ -38,7 +38,7 @@ public class ItemSword extends Item public boolean func_77660_a(ItemStack par1ItemStack, World par2World, int par3, BigInteger par4, int par5, BigInteger par6, EntityLiving par7EntityLiving) { - if ((double)Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D) + if ((float)Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D) { par1ItemStack.damageItem(2, par7EntityLiving); } diff --git a/src/minecraft/net/minecraft/src/ItemTool.java b/src/minecraft/net/minecraft/src/ItemTool.java index 7dd60d2..1e99926 100644 --- a/src/minecraft/net/minecraft/src/ItemTool.java +++ b/src/minecraft/net/minecraft/src/ItemTool.java @@ -60,7 +60,7 @@ public class ItemTool extends Item public boolean func_77660_a(ItemStack par1ItemStack, World par2World, int par3, BigInteger par4, int par5, BigInteger par6, EntityLiving par7EntityLiving) { - if ((double)Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D) + if ((float)Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D) { par1ItemStack.damageItem(1, par7EntityLiving); } diff --git a/src/minecraft/net/minecraft/src/LoadingScreenRenderer.java b/src/minecraft/net/minecraft/src/LoadingScreenRenderer.java index 0667b0c..e684647 100644 --- a/src/minecraft/net/minecraft/src/LoadingScreenRenderer.java +++ b/src/minecraft/net/minecraft/src/LoadingScreenRenderer.java @@ -123,9 +123,9 @@ public class LoadingScreenRenderer implements IProgressUpdate float var9 = 32.0F; var7.startDrawingQuads(); var7.setColorOpaque_I(4210752); - var7.addVertexWithUV(0.0D, (double)var6, 0.0D, 0.0D, (double)((float)var6 / var9)); - var7.addVertexWithUV((double)var5, (double)var6, 0.0D, (double)((float)var5 / var9), (double)((float)var6 / var9)); - var7.addVertexWithUV((double)var5, 0.0D, 0.0D, (double)((float)var5 / var9), 0.0D); + var7.addVertexWithUV(0.0D, (float)var6, 0.0D, 0.0D, (float)((float)var6 / var9)); + var7.addVertexWithUV((float)var5, (float)var6, 0.0D, (float)((float)var5 / var9), (float)((float)var6 / var9)); + var7.addVertexWithUV((float)var5, 0.0D, 0.0D, (float)((float)var5 / var9), 0.0D); var7.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, 0.0D); var7.draw(); @@ -138,15 +138,15 @@ public class LoadingScreenRenderer implements IProgressUpdate GL11.glDisable(GL11.GL_TEXTURE_2D); var7.startDrawingQuads(); var7.setColorOpaque_I(8421504); - var7.addVertex((double)var12, (double)var13, 0.0D); - var7.addVertex((double)var12, (double)(var13 + var11), 0.0D); - var7.addVertex((double)(var12 + var10), (double)(var13 + var11), 0.0D); - var7.addVertex((double)(var12 + var10), (double)var13, 0.0D); + var7.addVertex((float)var12, (float)var13, 0.0D); + var7.addVertex((float)var12, (float)(var13 + var11), 0.0D); + var7.addVertex((float)(var12 + var10), (float)(var13 + var11), 0.0D); + var7.addVertex((float)(var12 + var10), (float)var13, 0.0D); var7.setColorOpaque_I(8454016); - var7.addVertex((double)var12, (double)var13, 0.0D); - var7.addVertex((double)var12, (double)(var13 + var11), 0.0D); - var7.addVertex((double)(var12 + par1), (double)(var13 + var11), 0.0D); - var7.addVertex((double)(var12 + par1), (double)var13, 0.0D); + var7.addVertex((float)var12, (float)var13, 0.0D); + var7.addVertex((float)var12, (float)(var13 + var11), 0.0D); + var7.addVertex((float)(var12 + par1), (float)(var13 + var11), 0.0D); + var7.addVertex((float)(var12 + par1), (float)var13, 0.0D); var7.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); } diff --git a/src/minecraft/net/minecraft/src/MapData.java b/src/minecraft/net/minecraft/src/MapData.java index 801d1c6..ffed5b7 100644 --- a/src/minecraft/net/minecraft/src/MapData.java +++ b/src/minecraft/net/minecraft/src/MapData.java @@ -125,17 +125,17 @@ public class MapData extends WorldSavedData if (!var4.entityplayerObj.isDead && var4.entityplayerObj.inventory.hasItemStack(par2ItemStack)) { - float var5 = (float)(var4.entityplayerObj.posX - (double)this.xCenter) / (float)(1 << this.scale); - float var6 = (float)(var4.entityplayerObj.posZ - (double)this.zCenter) / (float)(1 << this.scale); + float var5 = (float)(var4.entityplayerObj.posX - (float)this.xCenter) / (float)(1 << this.scale); + float var6 = (float)(var4.entityplayerObj.posZ - (float)this.zCenter) / (float)(1 << this.scale); byte var7 = 64; byte var8 = 64; if (var5 >= (float)(-var7) && var6 >= (float)(-var8) && var5 <= (float)var7 && var6 <= (float)var8) { byte var9 = 0; - byte var10 = (byte)((int)((double)(var5 * 2.0F) + 0.5D)); - byte var11 = (byte)((int)((double)(var6 * 2.0F) + 0.5D)); - byte var12 = (byte)((int)((double)var4.entityplayerObj.rotationYaw * 16.0D / 360.0D)); + byte var10 = (byte)((int)((float)(var5 * 2.0F) + 0.5D)); + byte var11 = (byte)((int)((float)(var6 * 2.0F) + 0.5D)); + byte var12 = (byte)((int)((float)var4.entityplayerObj.rotationYaw * 16.0D / 360.0D)); if (this.dimension < 0) { diff --git a/src/minecraft/net/minecraft/src/MapGenCaves.java b/src/minecraft/net/minecraft/src/MapGenCaves.java index e4b959d..728313b 100644 --- a/src/minecraft/net/minecraft/src/MapGenCaves.java +++ b/src/minecraft/net/minecraft/src/MapGenCaves.java @@ -18,8 +18,8 @@ public class MapGenCaves extends MapGenBase */ protected void generateCaveNode(long par1, BigInteger par3, BigInteger par4, byte[] par5ArrayOfByte, double par6, double par8, double par10, float par12, float par13, float par14, int par15, int par16, double par17) { - double var19 = (double)(par3.shiftLeft(4).add(BigInteger.valueOf(8)).doubleValue()); - double var21 = (double)(par4.shiftLeft(4).add(BigInteger.valueOf(8)).doubleValue()); + double var19 = (float)(par3.shiftLeft(4).add(BigInteger.valueOf(8)).doubleValue()); + double var21 = (float)(par4.shiftLeft(4).add(BigInteger.valueOf(8)).doubleValue()); float var23 = 0.0F; float var24 = 0.0F; Random var25 = new Random(par1); @@ -42,13 +42,13 @@ public class MapGenCaves extends MapGenBase for (boolean var28 = var25.nextInt(6) == 0; par15 < par16; ++par15) { - double var29 = 1.5D + (double)(MathHelper.sin((float)par15 * (float)Math.PI / (float)par16) * par12 * 1.0F); + double var29 = 1.5D + (float)(MathHelper.sin((float)par15 * (float)(float)Math.PI / (float)par16) * par12 * 1.0F); double var31 = var29 * par17; float var33 = MathHelper.cos(par14); float var34 = MathHelper.sin(par14); - par6 += (double)(MathHelper.cos(par13) * var33); - par8 += (double)var34; - par10 += (double)(MathHelper.sin(par13) * var33); + par6 += (float)(MathHelper.cos(par13) * var33); + par8 += (float)var34; + par10 += (float)(MathHelper.sin(par13) * var33); if (var28) { @@ -68,8 +68,8 @@ public class MapGenCaves extends MapGenBase if (!var54 && par15 == var27 && par12 > 1.0F && par16 > 0) { - this.generateCaveNode(var25.nextLong(), par3, par4, par5ArrayOfByte, par6, par8, par10, var25.nextFloat() * 0.5F + 0.5F, par13 - ((float)Math.PI / 2F), par14 / 3.0F, par15, par16, 1.0D); - this.generateCaveNode(var25.nextLong(), par3, par4, par5ArrayOfByte, par6, par8, par10, var25.nextFloat() * 0.5F + 0.5F, par13 + ((float)Math.PI / 2F), par14 / 3.0F, par15, par16, 1.0D); + this.generateCaveNode(var25.nextLong(), par3, par4, par5ArrayOfByte, par6, par8, par10, var25.nextFloat() * 0.5F + 0.5F, par13 - ((float)(float)Math.PI / 2F), par14 / 3.0F, par15, par16, 1.0D); + this.generateCaveNode(var25.nextLong(), par3, par4, par5ArrayOfByte, par6, par8, par10, var25.nextFloat() * 0.5F + 0.5F, par13 + ((float)(float)Math.PI / 2F), par14 / 3.0F, par15, par16, 1.0D); return; } @@ -77,8 +77,8 @@ public class MapGenCaves extends MapGenBase { double var35 = par6 - var19; double var37 = par10 - var21; - double var39 = (double)(par16 - par15); - double var41 = (double)(par12 + 2.0F + 16.0F); + double var39 = (float)(par16 - par15); + double var41 = (float)(par12 + 2.0F + 16.0F); if (var35 * var35 + var37 * var37 - var39 * var39 > var41 * var41) { @@ -136,11 +136,11 @@ public class MapGenCaves extends MapGenBase { for (var42 = var55; var42 < var36; ++var42) { - double var59 = ((double)(par3.shiftLeft(4).add(BigInteger.valueOf(var42))).doubleValue() + 0.5D - par6) / var29; + double var59 = ((float)(par3.shiftLeft(4).add(BigInteger.valueOf(var42))).doubleValue() + 0.5D - par6) / var29; for (var45 = var57; var45 < var40; ++var45) { - double var46 = ((double)(par4.shiftLeft(4).add(BigInteger.valueOf(var45))).doubleValue() + 0.5D - par10) / var29; + double var46 = ((float)(par4.shiftLeft(4).add(BigInteger.valueOf(var45))).doubleValue() + 0.5D - par10) / var29; int var48 = (var42 * 16 + var45) * 128 + var38; boolean var49 = false; @@ -148,7 +148,7 @@ public class MapGenCaves extends MapGenBase { for (int var50 = var38 - 1; var50 >= var56; --var50) { - double var51 = ((double)var50 + 0.5D - par8) / var31; + double var51 = ((float)var50 + 0.5D - par8) / var31; if (var51 > -0.7D && var59 * var59 + var51 * var51 + var46 * var46 < 1.0D) { @@ -207,9 +207,9 @@ public class MapGenCaves extends MapGenBase for (int var8 = 0; var8 < var7; ++var8) { - double var9 = (double)(par2 * 16 + this.rand.nextInt(16)); - double var11 = (double)this.rand.nextInt(this.rand.nextInt(120) + 8); - double var13 = (double)(par3 * 16 + this.rand.nextInt(16)); + double var9 = (float)(par2 * 16 + this.rand.nextInt(16)); + double var11 = (float)this.rand.nextInt(this.rand.nextInt(120) + 8); + double var13 = (float)(par3 * 16 + this.rand.nextInt(16)); int var15 = 1; if (this.rand.nextInt(4) == 0) @@ -220,7 +220,7 @@ public class MapGenCaves extends MapGenBase for (int var16 = 0; var16 < var15; ++var16) { - float var17 = this.rand.nextFloat() * (float)Math.PI * 2.0F; + float var17 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; float var18 = (this.rand.nextFloat() - 0.5F) * 2.0F / 8.0F; float var19 = this.rand.nextFloat() * 2.0F + this.rand.nextFloat(); diff --git a/src/minecraft/net/minecraft/src/MapGenCavesHell.java b/src/minecraft/net/minecraft/src/MapGenCavesHell.java index 9a0a198..1597290 100644 --- a/src/minecraft/net/minecraft/src/MapGenCavesHell.java +++ b/src/minecraft/net/minecraft/src/MapGenCavesHell.java @@ -17,8 +17,8 @@ public class MapGenCavesHell extends MapGenBase */ protected void generateCaveNode(int par1, int par2, byte[] par3ArrayOfByte, double par4, double par6, double par8, float par10, float par11, float par12, int par13, int par14, double par15) { - double var17 = (double)(par1 * 16 + 8); - double var19 = (double)(par2 * 16 + 8); + double var17 = (float)(par1 * 16 + 8); + double var19 = (float)(par2 * 16 + 8); float var21 = 0.0F; float var22 = 0.0F; Random var23 = new Random(this.rand.nextLong()); @@ -41,13 +41,13 @@ public class MapGenCavesHell extends MapGenBase for (boolean var26 = var23.nextInt(6) == 0; par13 < par14; ++par13) { - double var27 = 1.5D + (double)(MathHelper.sin((float)par13 * (float)Math.PI / (float)par14) * par10 * 1.0F); + double var27 = 1.5D + (float)(MathHelper.sin((float)par13 * (float)(float)Math.PI / (float)par14) * par10 * 1.0F); double var29 = var27 * par15; float var31 = MathHelper.cos(par12); float var32 = MathHelper.sin(par12); - par4 += (double)(MathHelper.cos(par11) * var31); - par6 += (double)var32; - par8 += (double)(MathHelper.sin(par11) * var31); + par4 += (float)(MathHelper.cos(par11) * var31); + par6 += (float)var32; + par8 += (float)(MathHelper.sin(par11) * var31); if (var26) { @@ -67,8 +67,8 @@ public class MapGenCavesHell extends MapGenBase if (!var51 && par13 == var25 && par10 > 1.0F) { - this.generateCaveNode(par1, par2, par3ArrayOfByte, par4, par6, par8, var23.nextFloat() * 0.5F + 0.5F, par11 - ((float)Math.PI / 2F), par12 / 3.0F, par13, par14, 1.0D); - this.generateCaveNode(par1, par2, par3ArrayOfByte, par4, par6, par8, var23.nextFloat() * 0.5F + 0.5F, par11 + ((float)Math.PI / 2F), par12 / 3.0F, par13, par14, 1.0D); + this.generateCaveNode(par1, par2, par3ArrayOfByte, par4, par6, par8, var23.nextFloat() * 0.5F + 0.5F, par11 - ((float)(float)Math.PI / 2F), par12 / 3.0F, par13, par14, 1.0D); + this.generateCaveNode(par1, par2, par3ArrayOfByte, par4, par6, par8, var23.nextFloat() * 0.5F + 0.5F, par11 + ((float)(float)Math.PI / 2F), par12 / 3.0F, par13, par14, 1.0D); return; } @@ -76,8 +76,8 @@ public class MapGenCavesHell extends MapGenBase { double var33 = par4 - var17; double var35 = par8 - var19; - double var37 = (double)(par14 - par13); - double var39 = (double)(par10 + 2.0F + 16.0F); + double var37 = (float)(par14 - par13); + double var39 = (float)(par10 + 2.0F + 16.0F); if (var33 * var33 + var35 * var35 - var37 * var37 > var39 * var39) { @@ -155,16 +155,16 @@ public class MapGenCavesHell extends MapGenBase { for (var40 = var52; var40 < var34; ++var40) { - double var56 = ((double)(var40 + par1 * 16) + 0.5D - par4) / var27; + double var56 = ((float)(var40 + par1 * 16) + 0.5D - par4) / var27; for (var43 = var54; var43 < var38; ++var43) { - double var44 = ((double)(var43 + par2 * 16) + 0.5D - par8) / var27; + double var44 = ((float)(var43 + par2 * 16) + 0.5D - par8) / var27; int var46 = (var40 * 16 + var43) * 128 + var36; for (int var47 = var36 - 1; var47 >= var53; --var47) { - double var48 = ((double)var47 + 0.5D - par6) / var29; + double var48 = ((float)var47 + 0.5D - par6) / var29; if (var48 > -0.7D && var56 * var56 + var48 * var48 + var44 * var44 < 1.0D) { @@ -205,9 +205,9 @@ public class MapGenCavesHell extends MapGenBase for (int var8 = 0; var8 < var7; ++var8) { - double var9 = (double)(par2 * 16 + this.rand.nextInt(16)); - double var11 = (double)this.rand.nextInt(128); - double var13 = (double)(par3 * 16 + this.rand.nextInt(16)); + double var9 = (float)(par2 * 16 + this.rand.nextInt(16)); + double var11 = (float)this.rand.nextInt(128); + double var13 = (float)(par3 * 16 + this.rand.nextInt(16)); int var15 = 1; if (this.rand.nextInt(4) == 0) @@ -218,7 +218,7 @@ public class MapGenCavesHell extends MapGenBase for (int var16 = 0; var16 < var15; ++var16) { - float var17 = this.rand.nextFloat() * (float)Math.PI * 2.0F; + float var17 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; float var18 = (this.rand.nextFloat() - 0.5F) * 2.0F / 8.0F; float var19 = this.rand.nextFloat() * 2.0F + this.rand.nextFloat(); this.generateCaveNode(par4, par5, par6ArrayOfByte, var9, var11, var13, var19 * 2.0F, var17, var18, 0, 0, 0.5D); diff --git a/src/minecraft/net/minecraft/src/MapGenRavine.java b/src/minecraft/net/minecraft/src/MapGenRavine.java index 073ca31..b42220d 100644 --- a/src/minecraft/net/minecraft/src/MapGenRavine.java +++ b/src/minecraft/net/minecraft/src/MapGenRavine.java @@ -10,8 +10,8 @@ public class MapGenRavine extends MapGenBase protected void generateRavine(long par1, int par3, int par4, byte[] par5ArrayOfByte, double par6, double par8, double par10, float par12, float par13, float par14, int par15, int par16, double par17) { Random var19 = new Random(par1); - double var20 = (double)(par3 * 16 + 8); - double var22 = (double)(par4 * 16 + 8); + double var20 = (float)(par3 * 16 + 8); + double var22 = (float)(par4 * 16 + 8); float var24 = 0.0F; float var25 = 0.0F; @@ -43,15 +43,15 @@ public class MapGenRavine extends MapGenBase for (; par15 < par16; ++par15) { - double var54 = 1.5D + (double)(MathHelper.sin((float)par15 * (float)Math.PI / (float)par16) * par12 * 1.0F); + double var54 = 1.5D + (float)(MathHelper.sin((float)par15 * (float)(float)Math.PI / (float)par16) * par12 * 1.0F); double var30 = var54 * par17; - var54 *= (double)var19.nextFloat() * 0.25D + 0.75D; - var30 *= (double)var19.nextFloat() * 0.25D + 0.75D; + var54 *= (float)var19.nextFloat() * 0.25D + 0.75D; + var30 *= (float)var19.nextFloat() * 0.25D + 0.75D; float var32 = MathHelper.cos(par14); float var33 = MathHelper.sin(par14); - par6 += (double)(MathHelper.cos(par13) * var32); - par8 += (double)var33; - par10 += (double)(MathHelper.sin(par13) * var32); + par6 += (float)(MathHelper.cos(par13) * var32); + par8 += (float)var33; + par10 += (float)(MathHelper.sin(par13) * var32); par14 *= 0.7F; par14 += var25 * 0.05F; par13 += var24 * 0.05F; @@ -64,8 +64,8 @@ public class MapGenRavine extends MapGenBase { double var34 = par6 - var20; double var36 = par10 - var22; - double var38 = (double)(par16 - par15); - double var40 = (double)(par12 + 2.0F + 16.0F); + double var38 = (float)(par16 - par15); + double var40 = (float)(par12 + 2.0F + 16.0F); if (var34 * var34 + var36 * var36 - var38 * var38 > var40 * var40) { @@ -143,11 +143,11 @@ public class MapGenRavine extends MapGenBase { for (var41 = var55; var41 < var35; ++var41) { - double var59 = ((double)(var41 + par3 * 16) + 0.5D - par6) / var54; + double var59 = ((float)(var41 + par3 * 16) + 0.5D - par6) / var54; for (var44 = var57; var44 < var39; ++var44) { - double var45 = ((double)(var44 + par4 * 16) + 0.5D - par10) / var54; + double var45 = ((float)(var44 + par4 * 16) + 0.5D - par10) / var54; int var47 = (var41 * 16 + var44) * 128 + var37; boolean var48 = false; @@ -155,9 +155,9 @@ public class MapGenRavine extends MapGenBase { for (int var49 = var37 - 1; var49 >= var56; --var49) { - double var50 = ((double)var49 + 0.5D - par8) / var30; + double var50 = ((float)var49 + 0.5D - par8) / var30; - if ((var59 * var59 + var45 * var45) * (double)this.field_75046_d[var49] + var50 * var50 / 6.0D < 1.0D) + if ((var59 * var59 + var45 * var45) * (float)this.field_75046_d[var49] + var50 * var50 / 6.0D < 1.0D) { byte var52 = par5ArrayOfByte[var47]; @@ -207,14 +207,14 @@ public class MapGenRavine extends MapGenBase { if (this.rand.nextInt(50) == 0) { - double var7 = (double)(par2 * 16 + this.rand.nextInt(16)); - double var9 = (double)(this.rand.nextInt(this.rand.nextInt(40) + 8) + 20); - double var11 = (double)(par3 * 16 + this.rand.nextInt(16)); + double var7 = (float)(par2 * 16 + this.rand.nextInt(16)); + double var9 = (float)(this.rand.nextInt(this.rand.nextInt(40) + 8) + 20); + double var11 = (float)(par3 * 16 + this.rand.nextInt(16)); byte var13 = 1; for (int var14 = 0; var14 < var13; ++var14) { - float var15 = this.rand.nextFloat() * (float)Math.PI * 2.0F; + float var15 = this.rand.nextFloat() * (float)(float)Math.PI * 2.0F; float var16 = (this.rand.nextFloat() - 0.5F) * 2.0F / 8.0F; float var17 = (this.rand.nextFloat() * 2.0F + this.rand.nextFloat()) * 2.0F; this.generateRavine(this.rand.nextLong(), par4, par5, par6ArrayOfByte, var7, var9, var11, var17, var15, var16, 0, 0, 3.0D); diff --git a/src/minecraft/net/minecraft/src/MapGenStronghold.java b/src/minecraft/net/minecraft/src/MapGenStronghold.java index 54b28e5..75380d2 100644 --- a/src/minecraft/net/minecraft/src/MapGenStronghold.java +++ b/src/minecraft/net/minecraft/src/MapGenStronghold.java @@ -28,13 +28,13 @@ public class MapGenStronghold extends MapGenStructure { Random var3 = new Random(); var3.setSeed(this.worldObj.getSeed()); - double var4 = var3.nextDouble() * Math.PI * 2.0D; + double var4 = var3.nextDouble() * (float)Math.PI * 2.0D; for (int var6 = 0; var6 < this.structureCoords.length; ++var6) { double var7 = (1.25D + var3.nextDouble()) * 32.0D; - int var9 = (int)Math.round(Math.cos(var4) * var7); - int var10 = (int)Math.round(Math.sin(var4) * var7); + int var9 = (int)Math.round((float)Math.cos(var4) * var7); + int var10 = (int)Math.round((float)Math.sin(var4) * var7); ArrayList var11 = new ArrayList(); Collections.addAll(var11, this.allowedBiomeGenBases); ChunkPosition var12 = this.worldObj.getWorldChunkManager().findBiomePosition(BigInteger.valueOf((var9 << 4) + 8), BigInteger.valueOf((var10 << 4) + 8), 112, var11, var3); @@ -54,7 +54,7 @@ public class MapGenStronghold extends MapGenStructure } this.structureCoords[var6] = new ChunkCoordIntPair(x, z); - var4 += (Math.PI * 2D) / (double)this.structureCoords.length; + var4 += ((float)Math.PI * 2D) / (float)this.structureCoords.length; } this.ranBiomeCheck = true; diff --git a/src/minecraft/net/minecraft/src/MapGenStructure.java b/src/minecraft/net/minecraft/src/MapGenStructure.java index 6e7da38..3aa0b6e 100644 --- a/src/minecraft/net/minecraft/src/MapGenStructure.java +++ b/src/minecraft/net/minecraft/src/MapGenStructure.java @@ -110,7 +110,7 @@ public abstract class MapGenStructure extends MapGenBase var20 = var19.x.subtract(par2).intValue(); var21 = var19.y - par3; var22 = var19.z.subtract(par4).intValue(); - var23 = (double)(var20 + var20 * var21 * var21 + var22 * var22); + var23 = (float)(var20 + var20 * var21 * var21 + var22 * var22); if (var23 < var13) { @@ -139,7 +139,7 @@ public abstract class MapGenStructure extends MapGenBase var20 = var19.x.subtract(par2).intValue(); var21 = var19.y - par3; var22 = var19.z.subtract(par4).intValue(); - var23 = (double)(var20 + var20 * var21 * var21 + var22 * var22); + var23 = (float)(var20 + var20 * var21 * var21 + var22 * var22); if (var23 < var13) { diff --git a/src/minecraft/net/minecraft/src/MapItemRenderer.java b/src/minecraft/net/minecraft/src/MapItemRenderer.java index 9e3def7..41e108e 100644 --- a/src/minecraft/net/minecraft/src/MapItemRenderer.java +++ b/src/minecraft/net/minecraft/src/MapItemRenderer.java @@ -77,10 +77,10 @@ public class MapItemRenderer GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDisable(GL11.GL_ALPHA_TEST); var17.startDrawingQuads(); - var17.addVertexWithUV((double)((float)(var15 + 0) + var18), (double)((float)(var16 + 128) - var18), -0.009999999776482582D, 0.0D, 1.0D); - var17.addVertexWithUV((double)((float)(var15 + 128) - var18), (double)((float)(var16 + 128) - var18), -0.009999999776482582D, 1.0D, 1.0D); - var17.addVertexWithUV((double)((float)(var15 + 128) - var18), (double)((float)(var16 + 0) + var18), -0.009999999776482582D, 1.0D, 0.0D); - var17.addVertexWithUV((double)((float)(var15 + 0) + var18), (double)((float)(var16 + 0) + var18), -0.009999999776482582D, 0.0D, 0.0D); + var17.addVertexWithUV((float)((float)(var15 + 0) + var18), (float)((float)(var16 + 128) - var18), -0.009999999776482582D, 0.0D, 1.0D); + var17.addVertexWithUV((float)((float)(var15 + 128) - var18), (float)((float)(var16 + 128) - var18), -0.009999999776482582D, 1.0D, 1.0D); + var17.addVertexWithUV((float)((float)(var15 + 128) - var18), (float)((float)(var16 + 0) + var18), -0.009999999776482582D, 1.0D, 0.0D); + var17.addVertexWithUV((float)((float)(var15 + 0) + var18), (float)((float)(var16 + 0) + var18), -0.009999999776482582D, 0.0D, 0.0D); var17.draw(); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_BLEND); @@ -100,10 +100,10 @@ public class MapItemRenderer float var23 = (float)(var20.iconSize % 4 + 1) / 4.0F; float var24 = (float)(var20.iconSize / 4 + 1) / 4.0F; var17.startDrawingQuads(); - var17.addVertexWithUV(-1.0D, 1.0D, 0.0D, (double)var21, (double)var22); - var17.addVertexWithUV(1.0D, 1.0D, 0.0D, (double)var23, (double)var22); - var17.addVertexWithUV(1.0D, -1.0D, 0.0D, (double)var23, (double)var24); - var17.addVertexWithUV(-1.0D, -1.0D, 0.0D, (double)var21, (double)var24); + var17.addVertexWithUV(-1.0D, 1.0D, 0.0D, (float)var21, (float)var22); + var17.addVertexWithUV(1.0D, 1.0D, 0.0D, (float)var23, (float)var22); + var17.addVertexWithUV(1.0D, -1.0D, 0.0D, (float)var23, (float)var24); + var17.addVertexWithUV(-1.0D, -1.0D, 0.0D, (float)var21, (float)var24); var17.draw(); GL11.glPopMatrix(); } diff --git a/src/minecraft/net/minecraft/src/MathHelper.java b/src/minecraft/net/minecraft/src/MathHelper.java index 4c02b95..f4fabf4 100644 --- a/src/minecraft/net/minecraft/src/MathHelper.java +++ b/src/minecraft/net/minecraft/src/MathHelper.java @@ -31,7 +31,7 @@ public class MathHelper public static final float sqrt_float(float par0) { - return (float)Math.sqrt((double)par0); + return (float)Math.sqrt((float)par0); } public static final float sqrt_double(double par0) @@ -62,7 +62,7 @@ public class MathHelper public static int floor_double(double par0) { int var2 = (int)par0; - return par0 < (double)var2 ? var2 - 1 : var2; + return par0 < (float)var2 ? var2 - 1 : var2; } /** @@ -71,7 +71,7 @@ public class MathHelper public static long floor_double_long(double par0) { long var2 = (long)par0; - return par0 < (double)var2 ? var2 - 1L : var2; + return par0 < (float)var2 ? var2 - 1L : var2; } public static BigInteger floor_double_BigInteger(double val) { @@ -121,7 +121,7 @@ public class MathHelper public static int ceiling_double_int(double par0) { int var2 = (int)par0; - return par0 > (double)var2 ? var2 + 1 : var2; + return par0 > (float)var2 ? var2 + 1 : var2; } /** @@ -198,7 +198,7 @@ public class MathHelper var1 += var6; } - return (double)var1 / (double)par0ArrayOfLong.length; + return (float)var1 / (float)par0ArrayOfLong.length; } /** @@ -245,7 +245,7 @@ public class MathHelper { for (int var0 = 0; var0 < 65536; ++var0) { - SIN_TABLE[var0] = (float)Math.sin((double)var0 * Math.PI * 2.0D / 65536.0D); + SIN_TABLE[var0] = (float)(float)Math.sin((float)var0 * (float)Math.PI * 2.0D / 65536.0D); } } } diff --git a/src/minecraft/net/minecraft/src/ModelBiped.java b/src/minecraft/net/minecraft/src/ModelBiped.java index 4561128..a836ea9 100644 --- a/src/minecraft/net/minecraft/src/ModelBiped.java +++ b/src/minecraft/net/minecraft/src/ModelBiped.java @@ -91,37 +91,37 @@ public class ModelBiped extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.bipedHead.rotateAngleY = par4 / (180F / (float)Math.PI); - this.bipedHead.rotateAngleX = par5 / (180F / (float)Math.PI); + this.bipedHead.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.bipedHead.rotateAngleX = par5 / (180F / (float)(float)Math.PI); this.bipedHeadwear.rotateAngleY = this.bipedHead.rotateAngleY; this.bipedHeadwear.rotateAngleX = this.bipedHead.rotateAngleX; - this.bipedRightArm.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 2.0F * par2 * 0.5F; + this.bipedRightArm.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 2.0F * par2 * 0.5F; this.bipedLeftArm.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 2.0F * par2 * 0.5F; this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedRightLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2; - this.bipedLeftLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; + this.bipedLeftLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2; this.bipedRightLeg.rotateAngleY = 0.0F; this.bipedLeftLeg.rotateAngleY = 0.0F; if (this.isRiding) { - this.bipedRightArm.rotateAngleX += -((float)Math.PI / 5F); - this.bipedLeftArm.rotateAngleX += -((float)Math.PI / 5F); - this.bipedRightLeg.rotateAngleX = -((float)Math.PI * 2F / 5F); - this.bipedLeftLeg.rotateAngleX = -((float)Math.PI * 2F / 5F); - this.bipedRightLeg.rotateAngleY = ((float)Math.PI / 10F); - this.bipedLeftLeg.rotateAngleY = -((float)Math.PI / 10F); + this.bipedRightArm.rotateAngleX += -((float)(float)Math.PI / 5F); + this.bipedLeftArm.rotateAngleX += -((float)(float)Math.PI / 5F); + this.bipedRightLeg.rotateAngleX = -((float)(float)Math.PI * 2F / 5F); + this.bipedLeftLeg.rotateAngleX = -((float)(float)Math.PI * 2F / 5F); + this.bipedRightLeg.rotateAngleY = ((float)(float)Math.PI / 10F); + this.bipedLeftLeg.rotateAngleY = -((float)(float)Math.PI / 10F); } if (this.heldItemLeft != 0) { - this.bipedLeftArm.rotateAngleX = this.bipedLeftArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * (float)this.heldItemLeft; + this.bipedLeftArm.rotateAngleX = this.bipedLeftArm.rotateAngleX * 0.5F - ((float)(float)Math.PI / 10F) * (float)this.heldItemLeft; } if (this.heldItemRight != 0) { - this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * (float)this.heldItemRight; + this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - ((float)(float)Math.PI / 10F) * (float)this.heldItemRight; } this.bipedRightArm.rotateAngleY = 0.0F; @@ -132,7 +132,7 @@ public class ModelBiped extends ModelBase if (this.onGround > -9990.0F) { var7 = this.onGround; - this.bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(var7) * (float)Math.PI * 2.0F) * 0.2F; + this.bipedBody.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(var7) * (float)(float)Math.PI * 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; @@ -144,11 +144,11 @@ public class ModelBiped extends ModelBase var7 *= var7; var7 *= var7; var7 = 1.0F - var7; - var8 = MathHelper.sin(var7 * (float)Math.PI); - float var9 = MathHelper.sin(this.onGround * (float)Math.PI) * -(this.bipedHead.rotateAngleX - 0.7F) * 0.75F; - this.bipedRightArm.rotateAngleX = (float)((double)this.bipedRightArm.rotateAngleX - ((double)var8 * 1.2D + (double)var9)); + var8 = MathHelper.sin(var7 * (float)(float)Math.PI); + float var9 = MathHelper.sin(this.onGround * (float)(float)Math.PI) * -(this.bipedHead.rotateAngleX - 0.7F) * 0.75F; + this.bipedRightArm.rotateAngleX = (float)((float)this.bipedRightArm.rotateAngleX - ((float)var8 * 1.2D + (float)var9)); this.bipedRightArm.rotateAngleY += this.bipedBody.rotateAngleY * 2.0F; - this.bipedRightArm.rotateAngleZ = MathHelper.sin(this.onGround * (float)Math.PI) * -0.4F; + this.bipedRightArm.rotateAngleZ = MathHelper.sin(this.onGround * (float)(float)Math.PI) * -0.4F; } if (this.isSneak) @@ -185,8 +185,8 @@ public class ModelBiped extends ModelBase this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleY = -(0.1F - var7 * 0.6F) + this.bipedHead.rotateAngleY; this.bipedLeftArm.rotateAngleY = 0.1F - var7 * 0.6F + this.bipedHead.rotateAngleY + 0.4F; - this.bipedRightArm.rotateAngleX = -((float)Math.PI / 2F) + this.bipedHead.rotateAngleX; - this.bipedLeftArm.rotateAngleX = -((float)Math.PI / 2F) + this.bipedHead.rotateAngleX; + this.bipedRightArm.rotateAngleX = -((float)(float)Math.PI / 2F) + this.bipedHead.rotateAngleX; + this.bipedLeftArm.rotateAngleX = -((float)(float)Math.PI / 2F) + this.bipedHead.rotateAngleX; this.bipedRightArm.rotateAngleX -= var7 * 1.2F - var8 * 0.4F; this.bipedLeftArm.rotateAngleX -= var7 * 1.2F - var8 * 0.4F; this.bipedRightArm.rotateAngleZ += MathHelper.cos(par3 * 0.09F) * 0.05F + 0.05F; diff --git a/src/minecraft/net/minecraft/src/ModelBlaze.java b/src/minecraft/net/minecraft/src/ModelBlaze.java index f44780d..7514cf4 100644 --- a/src/minecraft/net/minecraft/src/ModelBlaze.java +++ b/src/minecraft/net/minecraft/src/ModelBlaze.java @@ -44,7 +44,7 @@ public class ModelBlaze extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - float var7 = par3 * (float)Math.PI * -0.1F; + float var7 = par3 * (float)(float)Math.PI * -0.1F; int var8; for (var8 = 0; var8 < 4; ++var8) @@ -55,7 +55,7 @@ public class ModelBlaze extends ModelBase ++var7; } - var7 = ((float)Math.PI / 4F) + par3 * (float)Math.PI * 0.03F; + var7 = ((float)(float)Math.PI / 4F) + par3 * (float)(float)Math.PI * 0.03F; for (var8 = 4; var8 < 8; ++var8) { @@ -65,7 +65,7 @@ public class ModelBlaze extends ModelBase ++var7; } - var7 = 0.47123894F + par3 * (float)Math.PI * -0.05F; + var7 = 0.47123894F + par3 * (float)(float)Math.PI * -0.05F; for (var8 = 8; var8 < 12; ++var8) { @@ -75,7 +75,7 @@ public class ModelBlaze extends ModelBase ++var7; } - this.field_78105_b.rotateAngleY = par4 / (180F / (float)Math.PI); - this.field_78105_b.rotateAngleX = par5 / (180F / (float)Math.PI); + this.field_78105_b.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.field_78105_b.rotateAngleX = par5 / (180F / (float)(float)Math.PI); } } diff --git a/src/minecraft/net/minecraft/src/ModelBoat.java b/src/minecraft/net/minecraft/src/ModelBoat.java index b12537e..f8636e2 100644 --- a/src/minecraft/net/minecraft/src/ModelBoat.java +++ b/src/minecraft/net/minecraft/src/ModelBoat.java @@ -25,10 +25,10 @@ public class ModelBoat extends ModelBase this.boatSides[3].setRotationPoint(0.0F, (float)var4, (float)(-var3 / 2 + 1)); this.boatSides[4].addBox((float)(-var1 / 2 + 2), (float)(-var2 - 1), -1.0F, var1 - 4, var2, 2, 0.0F); this.boatSides[4].setRotationPoint(0.0F, (float)var4, (float)(var3 / 2 - 1)); - this.boatSides[0].rotateAngleX = ((float)Math.PI / 2F); - this.boatSides[1].rotateAngleY = ((float)Math.PI * 3F / 2F); - this.boatSides[2].rotateAngleY = ((float)Math.PI / 2F); - this.boatSides[3].rotateAngleY = (float)Math.PI; + this.boatSides[0].rotateAngleX = ((float)(float)Math.PI / 2F); + this.boatSides[1].rotateAngleY = ((float)(float)Math.PI * 3F / 2F); + this.boatSides[2].rotateAngleY = ((float)(float)Math.PI / 2F); + this.boatSides[3].rotateAngleY = (float)(float)Math.PI; } /** diff --git a/src/minecraft/net/minecraft/src/ModelBook.java b/src/minecraft/net/minecraft/src/ModelBook.java index d8a3207..a374e74 100644 --- a/src/minecraft/net/minecraft/src/ModelBook.java +++ b/src/minecraft/net/minecraft/src/ModelBook.java @@ -27,7 +27,7 @@ public class ModelBook extends ModelBase { this.coverRight.setRotationPoint(0.0F, 0.0F, -1.0F); this.coverLeft.setRotationPoint(0.0F, 0.0F, 1.0F); - this.bookSpine.rotateAngleY = ((float)Math.PI / 2F); + this.bookSpine.rotateAngleY = ((float)(float)Math.PI / 2F); } /** @@ -51,7 +51,7 @@ public class ModelBook extends ModelBase public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { float var7 = (MathHelper.sin(par1 * 0.02F) * 0.1F + 1.25F) * par4; - this.coverRight.rotateAngleY = (float)Math.PI + var7; + this.coverRight.rotateAngleY = (float)(float)Math.PI + var7; this.coverLeft.rotateAngleY = -var7; this.pagesRight.rotateAngleY = var7; this.pagesLeft.rotateAngleY = -var7; diff --git a/src/minecraft/net/minecraft/src/ModelChicken.java b/src/minecraft/net/minecraft/src/ModelChicken.java index 519edbc..8a93405 100644 --- a/src/minecraft/net/minecraft/src/ModelChicken.java +++ b/src/minecraft/net/minecraft/src/ModelChicken.java @@ -86,15 +86,15 @@ public class ModelChicken extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.head.rotateAngleX = -(par5 / (180F / (float)Math.PI)); - this.head.rotateAngleY = par4 / (180F / (float)Math.PI); + this.head.rotateAngleX = -(par5 / (180F / (float)(float)Math.PI)); + this.head.rotateAngleY = par4 / (180F / (float)(float)Math.PI); this.bill.rotateAngleX = this.head.rotateAngleX; this.bill.rotateAngleY = this.head.rotateAngleY; this.chin.rotateAngleX = this.head.rotateAngleX; this.chin.rotateAngleY = this.head.rotateAngleY; - this.body.rotateAngleX = ((float)Math.PI / 2F); + this.body.rotateAngleX = ((float)(float)Math.PI / 2F); this.rightLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2; - this.leftLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; + this.leftLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2; this.rightWing.rotateAngleZ = par3; this.leftWing.rotateAngleZ = -par3; } diff --git a/src/minecraft/net/minecraft/src/ModelCreeper.java b/src/minecraft/net/minecraft/src/ModelCreeper.java index 13a507d..1f40b8f 100644 --- a/src/minecraft/net/minecraft/src/ModelCreeper.java +++ b/src/minecraft/net/minecraft/src/ModelCreeper.java @@ -60,11 +60,11 @@ public class ModelCreeper extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.head.rotateAngleY = par4 / (180F / (float)Math.PI); - this.head.rotateAngleX = par5 / (180F / (float)Math.PI); + this.head.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.head.rotateAngleX = par5 / (180F / (float)(float)Math.PI); this.leg1.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2; - this.leg2.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; - this.leg3.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; + this.leg2.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2; + this.leg3.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2; this.leg4.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2; } } diff --git a/src/minecraft/net/minecraft/src/ModelDragon.java b/src/minecraft/net/minecraft/src/ModelDragon.java index 2ce138b..527fd38 100644 --- a/src/minecraft/net/minecraft/src/ModelDragon.java +++ b/src/minecraft/net/minecraft/src/ModelDragon.java @@ -137,8 +137,8 @@ public class ModelDragon extends ModelBase GL11.glPushMatrix(); EntityDragon var8 = (EntityDragon)par1Entity; float var9 = var8.prevAnimTime + (var8.animTime - var8.prevAnimTime) * this.partialTicks; - this.jaw.rotateAngleX = (float)(Math.sin((double)(var9 * (float)Math.PI * 2.0F)) + 1.0D) * 0.2F; - float var10 = (float)(Math.sin((double)(var9 * (float)Math.PI * 2.0F - 1.0F)) + 1.0D); + this.jaw.rotateAngleX = (float)((float)Math.sin((float)(var9 * (float)(float)Math.PI * 2.0F)) + 1.0D) * 0.2F; + float var10 = (float)((float)Math.sin((float)(var9 * (float)(float)Math.PI * 2.0F - 1.0F)) + 1.0D); var10 = (var10 * var10 * 1.0F + var10 * 2.0F) * 0.05F; GL11.glTranslatef(0.0F, var10 - 2.0F, -3.0F); GL11.glRotatef(var10 * 2.0F, 1.0F, 0.0F, 0.0F); @@ -147,9 +147,9 @@ public class ModelDragon extends ModelBase float var14 = 1.5F; double[] var15 = var8.getMovementOffsets(6, this.partialTicks); float var16 = this.updateRotations(var8.getMovementOffsets(5, this.partialTicks)[0] - var8.getMovementOffsets(10, this.partialTicks)[0]); - float var17 = this.updateRotations(var8.getMovementOffsets(5, this.partialTicks)[0] + (double)(var16 / 2.0F)); + float var17 = this.updateRotations(var8.getMovementOffsets(5, this.partialTicks)[0] + (float)(var16 / 2.0F)); var11 += 2.0F; - float var18 = var9 * (float)Math.PI * 2.0F; + float var18 = var9 * (float)(float)Math.PI * 2.0F; var11 = 20.0F; float var12 = -12.0F; float var21; @@ -157,16 +157,16 @@ public class ModelDragon extends ModelBase for (int var19 = 0; var19 < 5; ++var19) { double[] var20 = var8.getMovementOffsets(5 - var19, this.partialTicks); - var21 = (float)Math.cos((double)((float)var19 * 0.45F + var18)) * 0.15F; - this.neck.rotateAngleY = this.updateRotations(var20[0] - var15[0]) * (float)Math.PI / 180.0F * var14; - this.neck.rotateAngleX = var21 + (float)(var20[1] - var15[1]) * (float)Math.PI / 180.0F * var14 * 5.0F; - this.neck.rotateAngleZ = -this.updateRotations(var20[0] - (double)var17) * (float)Math.PI / 180.0F * var14; + var21 = (float)(float)Math.cos((float)((float)var19 * 0.45F + var18)) * 0.15F; + this.neck.rotateAngleY = this.updateRotations(var20[0] - var15[0]) * (float)(float)Math.PI / 180.0F * var14; + this.neck.rotateAngleX = var21 + (float)(var20[1] - var15[1]) * (float)(float)Math.PI / 180.0F * var14 * 5.0F; + this.neck.rotateAngleZ = -this.updateRotations(var20[0] - (float)var17) * (float)(float)Math.PI / 180.0F * var14; this.neck.rotationPointY = var11; this.neck.rotationPointZ = var12; this.neck.rotationPointX = var13; - var11 = (float)((double)var11 + Math.sin((double)this.neck.rotateAngleX) * 10.0D); - var12 = (float)((double)var12 - Math.cos((double)this.neck.rotateAngleY) * Math.cos((double)this.neck.rotateAngleX) * 10.0D); - var13 = (float)((double)var13 - Math.sin((double)this.neck.rotateAngleY) * Math.cos((double)this.neck.rotateAngleX) * 10.0D); + var11 = (float)((float)var11 + (float)Math.sin((float)this.neck.rotateAngleX) * 10.0D); + var12 = (float)((float)var12 - (float)Math.cos((float)this.neck.rotateAngleY) * (float)Math.cos((float)this.neck.rotateAngleX) * 10.0D); + var13 = (float)((float)var13 - (float)Math.sin((float)this.neck.rotateAngleY) * (float)Math.cos((float)this.neck.rotateAngleX) * 10.0D); this.neck.render(par7); } @@ -174,8 +174,8 @@ public class ModelDragon extends ModelBase this.head.rotationPointZ = var12; this.head.rotationPointX = var13; double[] var22 = var8.getMovementOffsets(0, this.partialTicks); - this.head.rotateAngleY = this.updateRotations(var22[0] - var15[0]) * (float)Math.PI / 180.0F * 1.0F; - this.head.rotateAngleZ = -this.updateRotations(var22[0] - (double)var17) * (float)Math.PI / 180.0F * 1.0F; + this.head.rotateAngleY = this.updateRotations(var22[0] - var15[0]) * (float)(float)Math.PI / 180.0F * 1.0F; + this.head.rotateAngleZ = -this.updateRotations(var22[0] - (float)var17) * (float)(float)Math.PI / 180.0F * 1.0F; this.head.render(par7); GL11.glPushMatrix(); GL11.glTranslatef(0.0F, 1.0F, 0.0F); @@ -187,11 +187,11 @@ public class ModelDragon extends ModelBase for (int var23 = 0; var23 < 2; ++var23) { GL11.glEnable(GL11.GL_CULL_FACE); - var21 = var9 * (float)Math.PI * 2.0F; - this.wing.rotateAngleX = 0.125F - (float)Math.cos((double)var21) * 0.2F; + var21 = var9 * (float)(float)Math.PI * 2.0F; + this.wing.rotateAngleX = 0.125F - (float)(float)Math.cos((float)var21) * 0.2F; this.wing.rotateAngleY = 0.25F; - this.wing.rotateAngleZ = (float)(Math.sin((double)var21) + 0.125D) * 0.8F; - this.wingTip.rotateAngleZ = -((float)(Math.sin((double)(var21 + 2.0F)) + 0.5D)) * 0.75F; + this.wing.rotateAngleZ = (float)((float)Math.sin((float)var21) + 0.125D) * 0.8F; + this.wingTip.rotateAngleZ = -((float)((float)Math.sin((float)(var21 + 2.0F)) + 0.5D)) * 0.75F; this.rearLeg.rotateAngleX = 1.0F + var10 * 0.1F; this.rearLegTip.rotateAngleX = 0.5F + var10 * 0.1F; this.rearFoot.rotateAngleX = 0.75F + var10 * 0.1F; @@ -212,8 +212,8 @@ public class ModelDragon extends ModelBase GL11.glPopMatrix(); GL11.glCullFace(GL11.GL_BACK); GL11.glDisable(GL11.GL_CULL_FACE); - float var24 = -((float)Math.sin((double)(var9 * (float)Math.PI * 2.0F))) * 0.0F; - var18 = var9 * (float)Math.PI * 2.0F; + float var24 = -((float)(float)Math.sin((float)(var9 * (float)(float)Math.PI * 2.0F))) * 0.0F; + var18 = var9 * (float)(float)Math.PI * 2.0F; var11 = 10.0F; var12 = 60.0F; var13 = 0.0F; @@ -222,16 +222,16 @@ public class ModelDragon extends ModelBase for (int var25 = 0; var25 < 12; ++var25) { var22 = var8.getMovementOffsets(12 + var25, this.partialTicks); - var24 = (float)((double)var24 + Math.sin((double)((float)var25 * 0.45F + var18)) * 0.05000000074505806D); - this.neck.rotateAngleY = (this.updateRotations(var22[0] - var15[0]) * var14 + 180.0F) * (float)Math.PI / 180.0F; - this.neck.rotateAngleX = var24 + (float)(var22[1] - var15[1]) * (float)Math.PI / 180.0F * var14 * 5.0F; - this.neck.rotateAngleZ = this.updateRotations(var22[0] - (double)var17) * (float)Math.PI / 180.0F * var14; + var24 = (float)((float)var24 + (float)Math.sin((float)((float)var25 * 0.45F + var18)) * 0.05000000074505806D); + this.neck.rotateAngleY = (this.updateRotations(var22[0] - var15[0]) * var14 + 180.0F) * (float)(float)Math.PI / 180.0F; + this.neck.rotateAngleX = var24 + (float)(var22[1] - var15[1]) * (float)(float)Math.PI / 180.0F * var14 * 5.0F; + this.neck.rotateAngleZ = this.updateRotations(var22[0] - (float)var17) * (float)(float)Math.PI / 180.0F * var14; this.neck.rotationPointY = var11; this.neck.rotationPointZ = var12; this.neck.rotationPointX = var13; - var11 = (float)((double)var11 + Math.sin((double)this.neck.rotateAngleX) * 10.0D); - var12 = (float)((double)var12 - Math.cos((double)this.neck.rotateAngleY) * Math.cos((double)this.neck.rotateAngleX) * 10.0D); - var13 = (float)((double)var13 - Math.sin((double)this.neck.rotateAngleY) * Math.cos((double)this.neck.rotateAngleX) * 10.0D); + var11 = (float)((float)var11 + (float)Math.sin((float)this.neck.rotateAngleX) * 10.0D); + var12 = (float)((float)var12 - (float)Math.cos((float)this.neck.rotateAngleY) * (float)Math.cos((float)this.neck.rotateAngleX) * 10.0D); + var13 = (float)((float)var13 - (float)Math.sin((float)this.neck.rotateAngleY) * (float)Math.cos((float)this.neck.rotateAngleX) * 10.0D); this.neck.render(par7); } diff --git a/src/minecraft/net/minecraft/src/ModelEnderman.java b/src/minecraft/net/minecraft/src/ModelEnderman.java index eb423a5..2791a30 100644 --- a/src/minecraft/net/minecraft/src/ModelEnderman.java +++ b/src/minecraft/net/minecraft/src/ModelEnderman.java @@ -48,10 +48,10 @@ public class ModelEnderman extends ModelBiped this.bipedBody.rotationPointZ = -0.0F; this.bipedRightLeg.rotateAngleX -= 0.0F; this.bipedLeftLeg.rotateAngleX -= 0.0F; - this.bipedRightArm.rotateAngleX = (float)((double)this.bipedRightArm.rotateAngleX * 0.5D); - this.bipedLeftArm.rotateAngleX = (float)((double)this.bipedLeftArm.rotateAngleX * 0.5D); - this.bipedRightLeg.rotateAngleX = (float)((double)this.bipedRightLeg.rotateAngleX * 0.5D); - this.bipedLeftLeg.rotateAngleX = (float)((double)this.bipedLeftLeg.rotateAngleX * 0.5D); + this.bipedRightArm.rotateAngleX = (float)((float)this.bipedRightArm.rotateAngleX * 0.5D); + this.bipedLeftArm.rotateAngleX = (float)((float)this.bipedLeftArm.rotateAngleX * 0.5D); + this.bipedRightLeg.rotateAngleX = (float)((float)this.bipedRightLeg.rotateAngleX * 0.5D); + this.bipedLeftLeg.rotateAngleX = (float)((float)this.bipedLeftLeg.rotateAngleX * 0.5D); float var8 = 0.4F; if (this.bipedRightArm.rotateAngleX > var8) diff --git a/src/minecraft/net/minecraft/src/ModelIronGolem.java b/src/minecraft/net/minecraft/src/ModelIronGolem.java index bfc10ef..d14d8b4 100644 --- a/src/minecraft/net/minecraft/src/ModelIronGolem.java +++ b/src/minecraft/net/minecraft/src/ModelIronGolem.java @@ -72,8 +72,8 @@ public class ModelIronGolem extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.ironGolemHead.rotateAngleY = par4 / (180F / (float)Math.PI); - this.ironGolemHead.rotateAngleX = par5 / (180F / (float)Math.PI); + this.ironGolemHead.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.ironGolemHead.rotateAngleX = par5 / (180F / (float)(float)Math.PI); this.field_78175_e.rotateAngleX = -1.5F * this.func_78172_a(par1, 13.0F) * par2; this.field_78173_f.rotateAngleX = 1.5F * this.func_78172_a(par1, 13.0F) * par2; this.field_78175_e.rotateAngleY = 0.0F; diff --git a/src/minecraft/net/minecraft/src/ModelMinecart.java b/src/minecraft/net/minecraft/src/ModelMinecart.java index 8d83ff4..7381a1d 100644 --- a/src/minecraft/net/minecraft/src/ModelMinecart.java +++ b/src/minecraft/net/minecraft/src/ModelMinecart.java @@ -28,11 +28,11 @@ public class ModelMinecart extends ModelBase this.sideModels[3].setRotationPoint(0.0F, (float)var4, (float)(-var3 / 2 + 1)); this.sideModels[4].addBox((float)(-var1 / 2 + 2), (float)(-var2 - 1), -1.0F, var1 - 4, var2, 2, 0.0F); this.sideModels[4].setRotationPoint(0.0F, (float)var4, (float)(var3 / 2 - 1)); - this.sideModels[0].rotateAngleX = ((float)Math.PI / 2F); - this.sideModels[1].rotateAngleY = ((float)Math.PI * 3F / 2F); - this.sideModels[2].rotateAngleY = ((float)Math.PI / 2F); - this.sideModels[3].rotateAngleY = (float)Math.PI; - this.sideModels[5].rotateAngleX = -((float)Math.PI / 2F); + this.sideModels[0].rotateAngleX = ((float)(float)Math.PI / 2F); + this.sideModels[1].rotateAngleY = ((float)(float)Math.PI * 3F / 2F); + this.sideModels[2].rotateAngleY = ((float)(float)Math.PI / 2F); + this.sideModels[3].rotateAngleY = (float)(float)Math.PI; + this.sideModels[5].rotateAngleX = -((float)(float)Math.PI / 2F); } /** diff --git a/src/minecraft/net/minecraft/src/ModelOcelot.java b/src/minecraft/net/minecraft/src/ModelOcelot.java index 2d31574..8cc981c 100644 --- a/src/minecraft/net/minecraft/src/ModelOcelot.java +++ b/src/minecraft/net/minecraft/src/ModelOcelot.java @@ -95,31 +95,31 @@ public class ModelOcelot extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.field_78156_g.rotateAngleX = par5 / (180F / (float)Math.PI); - this.field_78156_g.rotateAngleY = par4 / (180F / (float)Math.PI); + this.field_78156_g.rotateAngleX = par5 / (180F / (float)(float)Math.PI); + this.field_78156_g.rotateAngleY = par4 / (180F / (float)(float)Math.PI); if (this.field_78163_i != 3) { - this.field_78162_h.rotateAngleX = ((float)Math.PI / 2F); + this.field_78162_h.rotateAngleX = ((float)(float)Math.PI / 2F); if (this.field_78163_i == 2) { this.field_78161_a.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.0F * par2; this.field_78159_b.rotateAngleX = MathHelper.cos(par1 * 0.6662F + 0.3F) * 1.0F * par2; - this.field_78160_c.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI + 0.3F) * 1.0F * par2; - this.field_78157_d.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.0F * par2; - this.field_78155_f.rotateAngleX = 1.7278761F + ((float)Math.PI / 10F) * MathHelper.cos(par1) * par2; + this.field_78160_c.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI + 0.3F) * 1.0F * par2; + this.field_78157_d.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.0F * par2; + this.field_78155_f.rotateAngleX = 1.7278761F + ((float)(float)Math.PI / 10F) * MathHelper.cos(par1) * par2; } else { this.field_78161_a.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.0F * par2; - this.field_78159_b.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.0F * par2; - this.field_78160_c.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.0F * par2; + this.field_78159_b.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.0F * par2; + this.field_78160_c.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.0F * par2; this.field_78157_d.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.0F * par2; if (this.field_78163_i == 1) { - this.field_78155_f.rotateAngleX = 1.7278761F + ((float)Math.PI / 4F) * MathHelper.cos(par1) * par2; + this.field_78155_f.rotateAngleX = 1.7278761F + ((float)(float)Math.PI / 4F) * MathHelper.cos(par1) * par2; } else { @@ -157,21 +157,21 @@ public class ModelOcelot extends ModelBase ++this.field_78158_e.rotationPointY; this.field_78155_f.rotationPointY += -4.0F; this.field_78155_f.rotationPointZ += 2.0F; - this.field_78158_e.rotateAngleX = ((float)Math.PI / 2F); - this.field_78155_f.rotateAngleX = ((float)Math.PI / 2F); + this.field_78158_e.rotateAngleX = ((float)(float)Math.PI / 2F); + this.field_78155_f.rotateAngleX = ((float)(float)Math.PI / 2F); this.field_78163_i = 0; } else if (var5.isSprinting()) { this.field_78155_f.rotationPointY = this.field_78158_e.rotationPointY; this.field_78155_f.rotationPointZ += 2.0F; - this.field_78158_e.rotateAngleX = ((float)Math.PI / 2F); - this.field_78155_f.rotateAngleX = ((float)Math.PI / 2F); + this.field_78158_e.rotateAngleX = ((float)(float)Math.PI / 2F); + this.field_78155_f.rotateAngleX = ((float)(float)Math.PI / 2F); this.field_78163_i = 2; } else if (var5.isSitting()) { - this.field_78162_h.rotateAngleX = ((float)Math.PI / 4F); + this.field_78162_h.rotateAngleX = ((float)(float)Math.PI / 4F); this.field_78162_h.rotationPointY += -4.0F; this.field_78162_h.rotationPointZ += 5.0F; this.field_78156_g.rotationPointY += -3.3F; @@ -185,7 +185,7 @@ public class ModelOcelot extends ModelBase this.field_78160_c.rotateAngleX = this.field_78157_d.rotateAngleX = -0.15707964F; this.field_78160_c.rotationPointY = this.field_78157_d.rotationPointY = 15.8F; this.field_78160_c.rotationPointZ = this.field_78157_d.rotationPointZ = -7.0F; - this.field_78161_a.rotateAngleX = this.field_78159_b.rotateAngleX = -((float)Math.PI / 2F); + this.field_78161_a.rotateAngleX = this.field_78159_b.rotateAngleX = -((float)(float)Math.PI / 2F); this.field_78161_a.rotationPointY = this.field_78159_b.rotationPointY = 21.0F; this.field_78161_a.rotationPointZ = this.field_78159_b.rotationPointZ = 1.0F; this.field_78163_i = 3; diff --git a/src/minecraft/net/minecraft/src/ModelQuadruped.java b/src/minecraft/net/minecraft/src/ModelQuadruped.java index 5b81000..6fcc3de 100644 --- a/src/minecraft/net/minecraft/src/ModelQuadruped.java +++ b/src/minecraft/net/minecraft/src/ModelQuadruped.java @@ -74,12 +74,12 @@ public class ModelQuadruped extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.head.rotateAngleX = par5 / (180F / (float)Math.PI); - this.head.rotateAngleY = par4 / (180F / (float)Math.PI); - this.body.rotateAngleX = ((float)Math.PI / 2F); + this.head.rotateAngleX = par5 / (180F / (float)(float)Math.PI); + this.head.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.body.rotateAngleX = ((float)(float)Math.PI / 2F); this.leg1.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2; - this.leg2.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; - this.leg3.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; + this.leg2.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2; + this.leg3.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2; this.leg4.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2; } } diff --git a/src/minecraft/net/minecraft/src/ModelRenderer.java b/src/minecraft/net/minecraft/src/ModelRenderer.java index 2f8fa35..d3faa92 100644 --- a/src/minecraft/net/minecraft/src/ModelRenderer.java +++ b/src/minecraft/net/minecraft/src/ModelRenderer.java @@ -172,17 +172,17 @@ public class ModelRenderer if (this.rotateAngleZ != 0.0F) { - GL11.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL11.glRotatef(this.rotateAngleZ * (180F / (float)(float)Math.PI), 0.0F, 0.0F, 1.0F); } if (this.rotateAngleY != 0.0F) { - GL11.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL11.glRotatef(this.rotateAngleY * (180F / (float)(float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL11.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL11.glRotatef(this.rotateAngleX * (180F / (float)(float)Math.PI), 1.0F, 0.0F, 0.0F); } GL11.glCallList(this.displayList); @@ -220,17 +220,17 @@ public class ModelRenderer if (this.rotateAngleY != 0.0F) { - GL11.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL11.glRotatef(this.rotateAngleY * (180F / (float)(float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL11.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL11.glRotatef(this.rotateAngleX * (180F / (float)(float)Math.PI), 1.0F, 0.0F, 0.0F); } if (this.rotateAngleZ != 0.0F) { - GL11.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL11.glRotatef(this.rotateAngleZ * (180F / (float)(float)Math.PI), 0.0F, 0.0F, 1.0F); } GL11.glCallList(this.displayList); @@ -266,17 +266,17 @@ public class ModelRenderer if (this.rotateAngleZ != 0.0F) { - GL11.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL11.glRotatef(this.rotateAngleZ * (180F / (float)(float)Math.PI), 0.0F, 0.0F, 1.0F); } if (this.rotateAngleY != 0.0F) { - GL11.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL11.glRotatef(this.rotateAngleY * (180F / (float)(float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL11.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL11.glRotatef(this.rotateAngleX * (180F / (float)(float)Math.PI), 1.0F, 0.0F, 0.0F); } } } diff --git a/src/minecraft/net/minecraft/src/ModelSilverfish.java b/src/minecraft/net/minecraft/src/ModelSilverfish.java index 1d3ad35..f85951b 100644 --- a/src/minecraft/net/minecraft/src/ModelSilverfish.java +++ b/src/minecraft/net/minecraft/src/ModelSilverfish.java @@ -78,8 +78,8 @@ public class ModelSilverfish extends ModelBase { for (int var7 = 0; var7 < this.silverfishBodyParts.length; ++var7) { - this.silverfishBodyParts[var7].rotateAngleY = MathHelper.cos(par3 * 0.9F + (float)var7 * 0.15F * (float)Math.PI) * (float)Math.PI * 0.05F * (float)(1 + Math.abs(var7 - 2)); - this.silverfishBodyParts[var7].rotationPointX = MathHelper.sin(par3 * 0.9F + (float)var7 * 0.15F * (float)Math.PI) * (float)Math.PI * 0.2F * (float)Math.abs(var7 - 2); + this.silverfishBodyParts[var7].rotateAngleY = MathHelper.cos(par3 * 0.9F + (float)var7 * 0.15F * (float)(float)Math.PI) * (float)(float)Math.PI * 0.05F * (float)(1 + Math.abs(var7 - 2)); + this.silverfishBodyParts[var7].rotationPointX = MathHelper.sin(par3 * 0.9F + (float)var7 * 0.15F * (float)(float)Math.PI) * (float)(float)Math.PI * 0.2F * (float)Math.abs(var7 - 2); } this.silverfishWings[0].rotateAngleY = this.silverfishBodyParts[2].rotateAngleY; diff --git a/src/minecraft/net/minecraft/src/ModelSnowMan.java b/src/minecraft/net/minecraft/src/ModelSnowMan.java index 4a8f1da..3fc6450 100644 --- a/src/minecraft/net/minecraft/src/ModelSnowMan.java +++ b/src/minecraft/net/minecraft/src/ModelSnowMan.java @@ -35,15 +35,15 @@ public class ModelSnowMan extends ModelBase public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { super.setRotationAngles(par1, par2, par3, par4, par5, par6); - this.field_78195_c.rotateAngleY = par4 / (180F / (float)Math.PI); - this.field_78195_c.rotateAngleX = par5 / (180F / (float)Math.PI); - this.field_78196_a.rotateAngleY = par4 / (180F / (float)Math.PI) * 0.25F; + this.field_78195_c.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.field_78195_c.rotateAngleX = par5 / (180F / (float)(float)Math.PI); + this.field_78196_a.rotateAngleY = par4 / (180F / (float)(float)Math.PI) * 0.25F; float var7 = MathHelper.sin(this.field_78196_a.rotateAngleY); float var8 = MathHelper.cos(this.field_78196_a.rotateAngleY); this.field_78192_d.rotateAngleZ = 1.0F; this.field_78193_e.rotateAngleZ = -1.0F; this.field_78192_d.rotateAngleY = 0.0F + this.field_78196_a.rotateAngleY; - this.field_78193_e.rotateAngleY = (float)Math.PI + this.field_78196_a.rotateAngleY; + this.field_78193_e.rotateAngleY = (float)(float)Math.PI + this.field_78196_a.rotateAngleY; this.field_78192_d.rotationPointX = var8 * 5.0F; this.field_78192_d.rotationPointZ = -var7 * 5.0F; this.field_78193_e.rotationPointX = -var8 * 5.0F; diff --git a/src/minecraft/net/minecraft/src/ModelSpider.java b/src/minecraft/net/minecraft/src/ModelSpider.java index 2f7a861..4f74ddc 100644 --- a/src/minecraft/net/minecraft/src/ModelSpider.java +++ b/src/minecraft/net/minecraft/src/ModelSpider.java @@ -98,9 +98,9 @@ public class ModelSpider extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.spiderHead.rotateAngleY = par4 / (180F / (float)Math.PI); - this.spiderHead.rotateAngleX = par5 / (180F / (float)Math.PI); - float var7 = ((float)Math.PI / 4F); + this.spiderHead.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.spiderHead.rotateAngleX = par5 / (180F / (float)(float)Math.PI); + float var7 = ((float)(float)Math.PI / 4F); this.spiderLeg1.rotateAngleZ = -var7; this.spiderLeg2.rotateAngleZ = var7; this.spiderLeg3.rotateAngleZ = -var7 * 0.74F; @@ -120,13 +120,13 @@ public class ModelSpider extends ModelBase this.spiderLeg7.rotateAngleY = -var9 * 2.0F + var8; this.spiderLeg8.rotateAngleY = var9 * 2.0F - var8; float var10 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + 0.0F) * 0.4F) * par2; - float var11 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + (float)Math.PI) * 0.4F) * par2; - float var12 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + ((float)Math.PI / 2F)) * 0.4F) * par2; - float var13 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + ((float)Math.PI * 3F / 2F)) * 0.4F) * par2; + float var11 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + (float)(float)Math.PI) * 0.4F) * par2; + float var12 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + ((float)(float)Math.PI / 2F)) * 0.4F) * par2; + float var13 = -(MathHelper.cos(par1 * 0.6662F * 2.0F + ((float)(float)Math.PI * 3F / 2F)) * 0.4F) * par2; float var14 = Math.abs(MathHelper.sin(par1 * 0.6662F + 0.0F) * 0.4F) * par2; - float var15 = Math.abs(MathHelper.sin(par1 * 0.6662F + (float)Math.PI) * 0.4F) * par2; - float var16 = Math.abs(MathHelper.sin(par1 * 0.6662F + ((float)Math.PI / 2F)) * 0.4F) * par2; - float var17 = Math.abs(MathHelper.sin(par1 * 0.6662F + ((float)Math.PI * 3F / 2F)) * 0.4F) * par2; + float var15 = Math.abs(MathHelper.sin(par1 * 0.6662F + (float)(float)Math.PI) * 0.4F) * par2; + float var16 = Math.abs(MathHelper.sin(par1 * 0.6662F + ((float)(float)Math.PI / 2F)) * 0.4F) * par2; + float var17 = Math.abs(MathHelper.sin(par1 * 0.6662F + ((float)(float)Math.PI * 3F / 2F)) * 0.4F) * par2; this.spiderLeg1.rotateAngleY += var10; this.spiderLeg2.rotateAngleY += -var10; this.spiderLeg3.rotateAngleY += var11; diff --git a/src/minecraft/net/minecraft/src/ModelSquid.java b/src/minecraft/net/minecraft/src/ModelSquid.java index 3a8c9b0..fec0741 100644 --- a/src/minecraft/net/minecraft/src/ModelSquid.java +++ b/src/minecraft/net/minecraft/src/ModelSquid.java @@ -18,14 +18,14 @@ public class ModelSquid extends ModelBase for (int var2 = 0; var2 < this.squidTentacles.length; ++var2) { this.squidTentacles[var2] = new ModelRenderer(this, 48, 0); - double var3 = (double)var2 * Math.PI * 2.0D / (double)this.squidTentacles.length; - float var5 = (float)Math.cos(var3) * 5.0F; - float var6 = (float)Math.sin(var3) * 5.0F; + double var3 = (float)var2 * (float)Math.PI * 2.0D / (float)this.squidTentacles.length; + float var5 = (float)(float)Math.cos(var3) * 5.0F; + float var6 = (float)(float)Math.sin(var3) * 5.0F; this.squidTentacles[var2].addBox(-1.0F, 0.0F, -1.0F, 2, 18, 2); this.squidTentacles[var2].rotationPointX = var5; this.squidTentacles[var2].rotationPointZ = var6; this.squidTentacles[var2].rotationPointY = (float)(31 + var1); - var3 = (double)var2 * Math.PI * -2.0D / (double)this.squidTentacles.length + (Math.PI / 2D); + var3 = (float)var2 * (float)Math.PI * -2.0D / (float)this.squidTentacles.length + ((float)Math.PI / 2D); this.squidTentacles[var2].rotateAngleY = (float)var3; } } diff --git a/src/minecraft/net/minecraft/src/ModelVillager.java b/src/minecraft/net/minecraft/src/ModelVillager.java index c44cfd1..05bd88b 100644 --- a/src/minecraft/net/minecraft/src/ModelVillager.java +++ b/src/minecraft/net/minecraft/src/ModelVillager.java @@ -57,13 +57,13 @@ public class ModelVillager extends ModelBase */ public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { - this.field_78191_a.rotateAngleY = par4 / (180F / (float)Math.PI); - this.field_78191_a.rotateAngleX = par5 / (180F / (float)Math.PI); + this.field_78191_a.rotateAngleY = par4 / (180F / (float)(float)Math.PI); + this.field_78191_a.rotateAngleX = par5 / (180F / (float)(float)Math.PI); this.field_78190_c.rotationPointY = 3.0F; this.field_78190_c.rotationPointZ = -1.0F; this.field_78190_c.rotateAngleX = -0.75F; this.field_78187_d.rotateAngleX = MathHelper.cos(par1 * 0.6662F) * 1.4F * par2 * 0.5F; - this.field_78188_e.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2 * 0.5F; + this.field_78188_e.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)(float)Math.PI) * 1.4F * par2 * 0.5F; this.field_78187_d.rotateAngleY = 0.0F; this.field_78188_e.rotateAngleY = 0.0F; } diff --git a/src/minecraft/net/minecraft/src/ModelWolf.java b/src/minecraft/net/minecraft/src/ModelWolf.java index d28c4f0..221afaf 100644 --- a/src/minecraft/net/minecraft/src/ModelWolf.java +++ b/src/minecraft/net/minecraft/src/ModelWolf.java @@ -121,15 +121,15 @@ public class ModelWolf extends ModelBase if (var5.isSitting()) { this.wolfMane.setRotationPoint(-1.0F, 16.0F, -3.0F); - this.wolfMane.rotateAngleX = ((float)Math.PI * 2F / 5F); + this.wolfMane.rotateAngleX = ((float)(float)Math.PI * 2F / 5F); this.wolfMane.rotateAngleY = 0.0F; this.wolfBody.setRotationPoint(0.0F, 18.0F, 0.0F); - this.wolfBody.rotateAngleX = ((float)Math.PI / 4F); + this.wolfBody.rotateAngleX = ((float)(float)Math.PI / 4F); this.wolfTail.setRotationPoint(-1.0F, 21.0F, 6.0F); this.wolfLeg1.setRotationPoint(-2.5F, 22.0F, 2.0F); - this.wolfLeg1.rotateAngleX = ((float)Math.PI * 3F / 2F); + this.wolfLeg1.rotateAngleX = ((float)(float)Math.PI * 3F / 2F); this.wolfLeg2.setRotationPoint(0.5F, 22.0F, 2.0F); - this.wolfLeg2.rotateAngleX = ((float)Math.PI * 3F / 2F); + this.wolfLeg2.rotateAngleX = ((float)(float)Math.PI * 3F / 2F); this.wolfLeg3.rotateAngleX = 5.811947F; this.wolfLeg3.setRotationPoint(-2.49F, 17.0F, -4.0F); this.wolfLeg4.rotateAngleX = 5.811947F; @@ -138,7 +138,7 @@ public class ModelWolf extends ModelBase else { this.wolfBody.setRotationPoint(0.0F, 14.0F, 2.0F); - this.wolfBody.rotateAngleX = ((float)Math.PI / 2F); + this.wolfBody.rotateAngleX = ((float)(float)Math.PI / 2F); this.wolfMane.setRotationPoint(-1.0F, 14.0F, -3.0F); this.wolfMane.rotateAngleX = this.wolfBody.rotateAngleX; this.wolfTail.setRotationPoint(-1.0F, 12.0F, 8.0F); @@ -147,8 +147,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(par2 * 0.6662F) * 1.4F * par3; - this.wolfLeg2.rotateAngleX = MathHelper.cos(par2 * 0.6662F + (float)Math.PI) * 1.4F * par3; - this.wolfLeg3.rotateAngleX = MathHelper.cos(par2 * 0.6662F + (float)Math.PI) * 1.4F * par3; + this.wolfLeg2.rotateAngleX = MathHelper.cos(par2 * 0.6662F + (float)(float)Math.PI) * 1.4F * par3; + this.wolfLeg3.rotateAngleX = MathHelper.cos(par2 * 0.6662F + (float)(float)Math.PI) * 1.4F * par3; this.wolfLeg4.rotateAngleX = MathHelper.cos(par2 * 0.6662F) * 1.4F * par3; } @@ -170,8 +170,8 @@ public class ModelWolf extends ModelBase public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { super.setRotationAngles(par1, par2, par3, par4, par5, par6); - this.wolfHeadMain.rotateAngleX = par5 / (180F / (float)Math.PI); - this.wolfHeadMain.rotateAngleY = par4 / (180F / (float)Math.PI); + this.wolfHeadMain.rotateAngleX = par5 / (180F / (float)(float)Math.PI); + this.wolfHeadMain.rotateAngleY = par4 / (180F / (float)(float)Math.PI); this.wolfTail.rotateAngleX = par3; } } diff --git a/src/minecraft/net/minecraft/src/ModelZombie.java b/src/minecraft/net/minecraft/src/ModelZombie.java index 33e0cf2..99f91d3 100644 --- a/src/minecraft/net/minecraft/src/ModelZombie.java +++ b/src/minecraft/net/minecraft/src/ModelZombie.java @@ -8,14 +8,14 @@ public class ModelZombie extends ModelBiped public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6) { super.setRotationAngles(par1, par2, par3, par4, par5, par6); - float var7 = MathHelper.sin(this.onGround * (float)Math.PI); - float var8 = MathHelper.sin((1.0F - (1.0F - this.onGround) * (1.0F - this.onGround)) * (float)Math.PI); + float var7 = MathHelper.sin(this.onGround * (float)(float)Math.PI); + float var8 = MathHelper.sin((1.0F - (1.0F - this.onGround) * (1.0F - this.onGround)) * (float)(float)Math.PI); this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F; this.bipedRightArm.rotateAngleY = -(0.1F - var7 * 0.6F); this.bipedLeftArm.rotateAngleY = 0.1F - var7 * 0.6F; - this.bipedRightArm.rotateAngleX = -((float)Math.PI / 2F); - this.bipedLeftArm.rotateAngleX = -((float)Math.PI / 2F); + this.bipedRightArm.rotateAngleX = -((float)(float)Math.PI / 2F); + this.bipedLeftArm.rotateAngleX = -((float)(float)Math.PI / 2F); this.bipedRightArm.rotateAngleX -= var7 * 1.2F - var8 * 0.4F; this.bipedLeftArm.rotateAngleX -= var7 * 1.2F - var8 * 0.4F; this.bipedRightArm.rotateAngleZ += MathHelper.cos(par3 * 0.09F) * 0.05F + 0.05F; diff --git a/src/minecraft/net/minecraft/src/MovementInputFromOptions.java b/src/minecraft/net/minecraft/src/MovementInputFromOptions.java index c6d6616..c2a6506 100644 --- a/src/minecraft/net/minecraft/src/MovementInputFromOptions.java +++ b/src/minecraft/net/minecraft/src/MovementInputFromOptions.java @@ -39,8 +39,8 @@ public class MovementInputFromOptions extends MovementInput if (this.sneak) { - this.moveStrafe = (float)((double)this.moveStrafe * 0.3D); - this.moveForward = (float)((double)this.moveForward * 0.3D); + this.moveStrafe = (float)((float)this.moveStrafe * 0.3D); + this.moveForward = (float)((float)this.moveForward * 0.3D); } } } diff --git a/src/minecraft/net/minecraft/src/NetClientHandler.java b/src/minecraft/net/minecraft/src/NetClientHandler.java index 04a2409..bbea2c4 100644 --- a/src/minecraft/net/minecraft/src/NetClientHandler.java +++ b/src/minecraft/net/minecraft/src/NetClientHandler.java @@ -161,13 +161,13 @@ public class NetClientHandler extends NetHandler public void handlePickupSpawn(Packet21PickupSpawn par1Packet21PickupSpawn) { - double var2 = (double)par1Packet21PickupSpawn.xPosition / 32.0D; - double var4 = (double)par1Packet21PickupSpawn.yPosition / 32.0D; - double var6 = (double)par1Packet21PickupSpawn.zPosition / 32.0D; + double var2 = (float)par1Packet21PickupSpawn.xPosition / 32.0D; + double var4 = (float)par1Packet21PickupSpawn.yPosition / 32.0D; + double var6 = (float)par1Packet21PickupSpawn.zPosition / 32.0D; EntityItem var8 = new EntityItem(this.worldClient, var2, var4, var6, new ItemStack(par1Packet21PickupSpawn.itemID, par1Packet21PickupSpawn.count, par1Packet21PickupSpawn.itemDamage)); - var8.motionX = (double)par1Packet21PickupSpawn.rotation / 128.0D; - var8.motionY = (double)par1Packet21PickupSpawn.pitch / 128.0D; - var8.motionZ = (double)par1Packet21PickupSpawn.roll / 128.0D; + var8.motionX = (float)par1Packet21PickupSpawn.rotation / 128.0D; + var8.motionY = (float)par1Packet21PickupSpawn.pitch / 128.0D; + var8.motionZ = (float)par1Packet21PickupSpawn.roll / 128.0D; var8.serverPosX = par1Packet21PickupSpawn.xPosition; var8.serverPosY = par1Packet21PickupSpawn.yPosition; var8.serverPosZ = par1Packet21PickupSpawn.zPosition; @@ -176,9 +176,9 @@ public class NetClientHandler extends NetHandler public void handleVehicleSpawn(Packet23VehicleSpawn par1Packet23VehicleSpawn) { - double var2 = (double)par1Packet23VehicleSpawn.xPosition / 32.0D; - double var4 = (double)par1Packet23VehicleSpawn.yPosition / 32.0D; - double var6 = (double)par1Packet23VehicleSpawn.zPosition / 32.0D; + double var2 = (float)par1Packet23VehicleSpawn.xPosition / 32.0D; + double var4 = (float)par1Packet23VehicleSpawn.yPosition / 32.0D; + double var6 = (float)par1Packet23VehicleSpawn.zPosition / 32.0D; Object var8 = null; if (par1Packet23VehicleSpawn.type == 10) @@ -222,12 +222,12 @@ public class NetClientHandler extends NetHandler } else if (par1Packet23VehicleSpawn.type == 63) { - var8 = new EntityFireball(this.worldClient, var2, var4, var6, (double)par1Packet23VehicleSpawn.speedX / 8000.0D, (double)par1Packet23VehicleSpawn.speedY / 8000.0D, (double)par1Packet23VehicleSpawn.speedZ / 8000.0D); + var8 = new EntityFireball(this.worldClient, var2, var4, var6, (float)par1Packet23VehicleSpawn.speedX / 8000.0D, (float)par1Packet23VehicleSpawn.speedY / 8000.0D, (float)par1Packet23VehicleSpawn.speedZ / 8000.0D); par1Packet23VehicleSpawn.throwerEntityId = 0; } else if (par1Packet23VehicleSpawn.type == 64) { - var8 = new EntitySmallFireball(this.worldClient, var2, var4, var6, (double)par1Packet23VehicleSpawn.speedX / 8000.0D, (double)par1Packet23VehicleSpawn.speedY / 8000.0D, (double)par1Packet23VehicleSpawn.speedZ / 8000.0D); + var8 = new EntitySmallFireball(this.worldClient, var2, var4, var6, (float)par1Packet23VehicleSpawn.speedX / 8000.0D, (float)par1Packet23VehicleSpawn.speedY / 8000.0D, (float)par1Packet23VehicleSpawn.speedZ / 8000.0D); par1Packet23VehicleSpawn.throwerEntityId = 0; } else if (par1Packet23VehicleSpawn.type == 62) @@ -300,7 +300,7 @@ public class NetClientHandler extends NetHandler } } - ((Entity)var8).setVelocity((double)par1Packet23VehicleSpawn.speedX / 8000.0D, (double)par1Packet23VehicleSpawn.speedY / 8000.0D, (double)par1Packet23VehicleSpawn.speedZ / 8000.0D); + ((Entity)var8).setVelocity((float)par1Packet23VehicleSpawn.speedX / 8000.0D, (float)par1Packet23VehicleSpawn.speedY / 8000.0D, (float)par1Packet23VehicleSpawn.speedZ / 8000.0D); } } } @@ -310,7 +310,7 @@ public class NetClientHandler extends NetHandler */ public void handleEntityExpOrb(Packet26EntityExpOrb par1Packet26EntityExpOrb) { - EntityXPOrb var2 = new EntityXPOrb(this.worldClient, (double)par1Packet26EntityExpOrb.posX, (double)par1Packet26EntityExpOrb.posY, (double)par1Packet26EntityExpOrb.posZ, par1Packet26EntityExpOrb.xpValue); + EntityXPOrb var2 = new EntityXPOrb(this.worldClient, (float)par1Packet26EntityExpOrb.posX, (float)par1Packet26EntityExpOrb.posY, (float)par1Packet26EntityExpOrb.posZ, par1Packet26EntityExpOrb.xpValue); var2.serverPosX = par1Packet26EntityExpOrb.posX; var2.serverPosY = par1Packet26EntityExpOrb.posY; var2.serverPosZ = par1Packet26EntityExpOrb.posZ; @@ -325,9 +325,9 @@ public class NetClientHandler extends NetHandler */ public void handleWeather(Packet71Weather par1Packet71Weather) { - double var2 = (double)par1Packet71Weather.posX / 32.0D; - double var4 = (double)par1Packet71Weather.posY / 32.0D; - double var6 = (double)par1Packet71Weather.posZ / 32.0D; + double var2 = (float)par1Packet71Weather.posX / 32.0D; + double var4 = (float)par1Packet71Weather.posY / 32.0D; + double var6 = (float)par1Packet71Weather.posZ / 32.0D; EntityLightningBolt var8 = null; if (par1Packet71Weather.isLightningBolt == 1) @@ -365,7 +365,7 @@ public class NetClientHandler extends NetHandler if (var2 != null) { - var2.setVelocity((double)par1Packet28EntityVelocity.motionX / 8000.0D, (double)par1Packet28EntityVelocity.motionY / 8000.0D, (double)par1Packet28EntityVelocity.motionZ / 8000.0D); + var2.setVelocity((float)par1Packet28EntityVelocity.motionX / 8000.0D, (float)par1Packet28EntityVelocity.motionY / 8000.0D, (float)par1Packet28EntityVelocity.motionZ / 8000.0D); } } @@ -384,15 +384,15 @@ public class NetClientHandler extends NetHandler public void handleNamedEntitySpawn(Packet20NamedEntitySpawn par1Packet20NamedEntitySpawn) { - double var2 = (double)par1Packet20NamedEntitySpawn.xPosition / 32.0D; - double var4 = (double)par1Packet20NamedEntitySpawn.yPosition / 32.0D; - double var6 = (double)par1Packet20NamedEntitySpawn.zPosition / 32.0D; + double var2 = (float)par1Packet20NamedEntitySpawn.xPosition / 32.0D; + double var4 = (float)par1Packet20NamedEntitySpawn.yPosition / 32.0D; + double var6 = (float)par1Packet20NamedEntitySpawn.zPosition / 32.0D; float var8 = (float)(par1Packet20NamedEntitySpawn.rotation * 360) / 256.0F; float var9 = (float)(par1Packet20NamedEntitySpawn.pitch * 360) / 256.0F; EntityOtherPlayerMP var10 = new EntityOtherPlayerMP(this.mc.theWorld, par1Packet20NamedEntitySpawn.name); - var10.prevPosX = var10.lastTickPosX = (double)(var10.serverPosX = par1Packet20NamedEntitySpawn.xPosition); - var10.prevPosY = var10.lastTickPosY = (double)(var10.serverPosY = par1Packet20NamedEntitySpawn.yPosition); - var10.prevPosZ = var10.lastTickPosZ = (double)(var10.serverPosZ = par1Packet20NamedEntitySpawn.zPosition); + var10.prevPosX = var10.lastTickPosX = (float)(var10.serverPosX = par1Packet20NamedEntitySpawn.xPosition); + var10.prevPosY = var10.lastTickPosY = (float)(var10.serverPosY = par1Packet20NamedEntitySpawn.yPosition); + var10.prevPosZ = var10.lastTickPosZ = (float)(var10.serverPosZ = par1Packet20NamedEntitySpawn.zPosition); int var11 = par1Packet20NamedEntitySpawn.currentItem; if (var11 == 0) @@ -423,9 +423,9 @@ public class NetClientHandler extends NetHandler var2.serverPosX = par1Packet34EntityTeleport.xPosition; var2.serverPosY = par1Packet34EntityTeleport.yPosition; var2.serverPosZ = par1Packet34EntityTeleport.zPosition; - double var3 = (double)var2.serverPosX / 32.0D; - double var5 = (double)var2.serverPosY / 32.0D + 0.015625D; - double var7 = (double)var2.serverPosZ / 32.0D; + double var3 = (float)var2.serverPosX / 32.0D; + double var5 = (float)var2.serverPosY / 32.0D + 0.015625D; + double var7 = (float)var2.serverPosZ / 32.0D; float var9 = (float)(par1Packet34EntityTeleport.yaw * 360) / 256.0F; float var10 = (float)(par1Packet34EntityTeleport.pitch * 360) / 256.0F; var2.setPositionAndRotation2(var3, var5, var7, var9, var10, 3); @@ -441,9 +441,9 @@ public class NetClientHandler extends NetHandler var2.serverPosX += par1Packet30Entity.xPosition; var2.serverPosY += par1Packet30Entity.yPosition; var2.serverPosZ += par1Packet30Entity.zPosition; - double var3 = (double)var2.serverPosX / 32.0D; - double var5 = (double)var2.serverPosY / 32.0D; - double var7 = (double)var2.serverPosZ / 32.0D; + double var3 = (float)var2.serverPosX / 32.0D; + double var5 = (float)var2.serverPosY / 32.0D; + double var7 = (float)var2.serverPosZ / 32.0D; float var9 = par1Packet30Entity.rotating ? (float)(par1Packet30Entity.yaw * 360) / 256.0F : var2.rotationYaw; float var10 = par1Packet30Entity.rotating ? (float)(par1Packet30Entity.pitch * 360) / 256.0F : var2.rotationPitch; var2.setPositionAndRotation2(var3, var5, var7, var9, var10, 3); @@ -731,9 +731,9 @@ public class NetClientHandler extends NetHandler public void handleMobSpawn(Packet24MobSpawn par1Packet24MobSpawn) { - double var2 = (double)par1Packet24MobSpawn.xPosition / 32.0D; - double var4 = (double)par1Packet24MobSpawn.yPosition / 32.0D; - double var6 = (double)par1Packet24MobSpawn.zPosition / 32.0D; + double var2 = (float)par1Packet24MobSpawn.xPosition / 32.0D; + double var4 = (float)par1Packet24MobSpawn.yPosition / 32.0D; + double var6 = (float)par1Packet24MobSpawn.zPosition / 32.0D; float var8 = (float)(par1Packet24MobSpawn.yaw * 360) / 256.0F; float var9 = (float)(par1Packet24MobSpawn.pitch * 360) / 256.0F; EntityLiving var10 = (EntityLiving)EntityList.createEntityByID(par1Packet24MobSpawn.type, this.mc.theWorld); @@ -758,9 +758,9 @@ public class NetClientHandler extends NetHandler var10.entityId = par1Packet24MobSpawn.entityId; var10.setPositionAndRotation(var2, var4, var6, var8, var9); - var10.motionX = (double)((float)par1Packet24MobSpawn.velocityX / 8000.0F); - var10.motionY = (double)((float)par1Packet24MobSpawn.velocityY / 8000.0F); - var10.motionZ = (double)((float)par1Packet24MobSpawn.velocityZ / 8000.0F); + var10.motionX = (float)((float)par1Packet24MobSpawn.velocityX / 8000.0F); + var10.motionY = (float)((float)par1Packet24MobSpawn.velocityY / 8000.0F); + var10.motionZ = (float)((float)par1Packet24MobSpawn.velocityZ / 8000.0F); this.worldClient.addEntityToWorld(par1Packet24MobSpawn.entityId, var10); List var17 = par1Packet24MobSpawn.getMetadata(); @@ -869,9 +869,9 @@ public class NetClientHandler extends NetHandler Explosion var2 = new Explosion(this.mc.theWorld, (Entity)null, par1Packet60Explosion.explosionX, par1Packet60Explosion.explosionY, par1Packet60Explosion.explosionZ, par1Packet60Explosion.explosionSize); var2.field_77281_g = par1Packet60Explosion.field_73613_e; var2.doExplosionB(true); - this.mc.thePlayer.motionX += (double)par1Packet60Explosion.func_73607_d(); - this.mc.thePlayer.motionY += (double)par1Packet60Explosion.func_73609_f(); - this.mc.thePlayer.motionZ += (double)par1Packet60Explosion.func_73608_g(); + this.mc.thePlayer.motionX += (float)par1Packet60Explosion.func_73607_d(); + this.mc.thePlayer.motionY += (float)par1Packet60Explosion.func_73609_f(); + this.mc.thePlayer.motionZ += (float)par1Packet60Explosion.func_73608_g(); } public void handleOpenWindow(Packet100OpenWindow par1Packet100OpenWindow) diff --git a/src/minecraft/net/minecraft/src/NetServerHandler.java b/src/minecraft/net/minecraft/src/NetServerHandler.java index f846cbe..45ecd6d 100644 --- a/src/minecraft/net/minecraft/src/NetServerHandler.java +++ b/src/minecraft/net/minecraft/src/NetServerHandler.java @@ -274,7 +274,7 @@ public class NetServerHandler extends NetHandler } float var27 = 0.0625F; - boolean var28 = var2.getCollidingBoundingBoxes(this.playerEntity, ((Entity)this.playerEntity).boundingBox.copy().contract((double)var27, (double)var27, (double)var27)).isEmpty(); + boolean var28 = var2.getCollidingBoundingBoxes(this.playerEntity, ((Entity)this.playerEntity).boundingBox.copy().contract((float)var27, (float)var27, (float)var27)).isEmpty(); if (this.playerEntity.onGround && !par1Packet10Flying.onGround && var15 > 0.0D) { @@ -304,7 +304,7 @@ public class NetServerHandler extends NetHandler } this.playerEntity.setPositionAndRotation(var5, var7, var9, var11, var12); - boolean var32 = var2.getCollidingBoundingBoxes(this.playerEntity, ((Entity)this.playerEntity).boundingBox.copy().contract((double)var27, (double)var27, (double)var27)).isEmpty(); + boolean var32 = var2.getCollidingBoundingBoxes(this.playerEntity, ((Entity)this.playerEntity).boundingBox.copy().contract((float)var27, (float)var27, (float)var27)).isEmpty(); if (var28 && (var31 || !var32) && !this.playerEntity.isPlayerSleeping()) { @@ -312,7 +312,7 @@ public class NetServerHandler extends NetHandler return; } - AxisAlignedBB var33 = ((Entity)this.playerEntity).boundingBox.copy().expand((double)var27, (double)var27, (double)var27).addCoord(0.0D, -0.55D, 0.0D); + AxisAlignedBB var33 = ((Entity)this.playerEntity).boundingBox.copy().expand((float)var27, (float)var27, (float)var27).addCoord(0.0D, -0.55D, 0.0D); if (!this.mcServer.isFlightAllowed() && !this.playerEntity.theItemInWorldManager.isCreative() && !var2.isAABBNonEmpty(var33)) { @@ -389,9 +389,9 @@ public class NetServerHandler extends NetHandler if (var4) { - double var8 = this.playerEntity.posX - ((double)var5.doubleValue() + 0.5D); - double var10 = this.playerEntity.posY - ((double)var6 + 0.5D) + 1.5D; - double var12 = this.playerEntity.posZ - ((double)var7.doubleValue() + 0.5D); + double var8 = this.playerEntity.posX - ((float)var5.doubleValue() + 0.5D); + double var10 = this.playerEntity.posY - ((float)var6 + 0.5D) + 1.5D; + double var12 = this.playerEntity.posZ - ((float)var7.doubleValue() + 0.5D); double var14 = var8 * var8 + var10 * var10 + var12 * var12; if (var14 > 36.0D) @@ -445,9 +445,9 @@ public class NetServerHandler extends NetHandler } else if (par1Packet14BlockDig.status == 3) { - double var11 = this.playerEntity.posX - ((double)var5.doubleValue() + 0.5D); - double var13 = this.playerEntity.posY - ((double)var6 + 0.5D); - double var15 = this.playerEntity.posZ - ((double)var7.doubleValue() + 0.5D); + double var11 = this.playerEntity.posX - ((float)var5.doubleValue() + 0.5D); + double var13 = this.playerEntity.posY - ((float)var6 + 0.5D); + double var15 = this.playerEntity.posZ - ((float)var7.doubleValue() + 0.5D); double var17 = var11 * var11 + var13 * var13 + var15 * var15; if (var17 < 256.0D) @@ -496,7 +496,7 @@ public class NetServerHandler extends NetHandler var12 = var11; } - if (this.field_72587_r && this.playerEntity.getDistanceSq((double)var5.doubleValue() + 0.5D, (double)var6 + 0.5D, (double)var7.doubleValue() + 0.5D) < 64.0D && (var12.compareTo(BigInteger.valueOf(16)) > 0 || var9)) + if (this.field_72587_r && this.playerEntity.getDistanceSq((float)var5.doubleValue() + 0.5D, (float)var6 + 0.5D, (float)var7.doubleValue() + 0.5D) < 64.0D && (var12.compareTo(BigInteger.valueOf(16)) > 0 || var9)) { this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, var2, var3, var5, var6, var7, var8, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); } diff --git a/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java b/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java index 8c0b18b..ffbb034 100644 --- a/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java +++ b/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java @@ -49,18 +49,18 @@ public class NoiseGeneratorOctaves extends NoiseGenerator for (int var16 = 0; var16 < this.octaves; ++var16) { - double var17 = (double)par2.doubleValue() * var27 * par8; - double var19 = (double)par3.doubleValue() * var27 * par10; - double var21 = (double)par4.doubleValue() * var27 * par12; + double var17 = (float)par2.doubleValue() * var27 * par8; + double var19 = (float)par3.doubleValue() * var27 * par10; + double var21 = (float)par4.doubleValue() * var27 * par12; if(!DISABLE_MODULO) { long var23 = MathHelper.floor_double_long(var17); long var25 = MathHelper.floor_double_long(var21); - var17 -= (double)var23; - var21 -= (double)var25; + var17 -= (float)var23; + var21 -= (float)var25; var23 %= 16777216L; var25 %= 16777216L; - var17 += (double)var23; - var21 += (double)var25; + var17 += (float)var23; + var21 += (float)var25; } this.generatorCollection[var16].populateNoiseArray(par1ArrayOfDouble, var17, var19, var21, par5, par6, par7, par8 * var27, par10 * var27, par12 * var27, var27); var27 /= 2.0D; diff --git a/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin.java b/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin.java index fcd6d5b..fa67805 100644 --- a/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin.java +++ b/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin.java @@ -47,7 +47,7 @@ public class NoiseGeneratorPerlin extends NoiseGenerator public final double grad2d(int par1, double par2, double par4) { int var6 = par1 & 15; - double var7 = (double)(1 - ((var6 & 8) >> 3)) * par2; + double var7 = (float)(1 - ((var6 & 8) >> 3)) * par2; double var9 = var6 < 4 ? 0.0D : (var6 != 12 && var6 != 14 ? par4 : par2); return ((var6 & 1) == 0 ? var7 : -var7) + ((var6 & 2) == 0 ? var9 : -var9); } @@ -91,30 +91,30 @@ public class NoiseGeneratorPerlin extends NoiseGenerator for (int var30 = 0; var30 < par8; ++var30) { - var31 = par2 + (double)var30 * par11 + this.xCoord; + var31 = par2 + (float)var30 * par11 + this.xCoord; int var78 = (int)var31; - if (var31 < (double)var78) + if (var31 < (float)var78) { --var78; } int var34 = var78 & 255; - var31 -= (double)var78; + var31 -= (float)var78; var35 = var31 * var31 * var31 * (var31 * (var31 * 6.0D - 15.0D) + 10.0D); for (var37 = 0; var37 < par10; ++var37) { - var38 = par6 + (double)var37 * par15 + this.zCoord; + var38 = par6 + (float)var37 * par15 + this.zCoord; var40 = (int)var38; - if (var38 < (double)var40) + if (var38 < (float)var40) { --var40; } var41 = var40 & 255; - var38 -= (double)var40; + var38 -= (float)var40; var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D); var19 = this.permutations[var34] + 0; int var66 = this.permutations[var19] + var41; @@ -146,44 +146,44 @@ public class NoiseGeneratorPerlin extends NoiseGenerator for (var37 = 0; var37 < par8; ++var37) { - var38 = par2 + (double)var37 * par11 + this.xCoord; + var38 = par2 + (float)var37 * par11 + this.xCoord; var40 = (int)var38; - if (var38 < (double)var40) + if (var38 < (float)var40) { --var40; } var41 = var40 & 255; - var38 -= (double)var40; + var38 -= (float)var40; var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D); for (int var44 = 0; var44 < par10; ++var44) { - double var45 = par6 + (double)var44 * par15 + this.zCoord; + double var45 = par6 + (float)var44 * par15 + this.zCoord; int var47 = (int)var45; - if (var45 < (double)var47) + if (var45 < (float)var47) { --var47; } int var48 = var47 & 255; - var45 -= (double)var47; + var45 -= (float)var47; double var49 = var45 * var45 * var45 * (var45 * (var45 * 6.0D - 15.0D) + 10.0D); for (int var51 = 0; var51 < par9; ++var51) { - double var52 = par4 + (double)var51 * par13 + this.yCoord; + double var52 = par4 + (float)var51 * par13 + this.yCoord; int var54 = (int)var52; - if (var52 < (double)var54) + if (var52 < (float)var54) { --var54; } int var55 = var54 & 255; - var52 -= (double)var54; + var52 -= (float)var54; double var56 = var52 * var52 * var52 * (var52 * (var52 * 6.0D - 15.0D) + 10.0D); if (var51 == 0 || var55 != var22) diff --git a/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin2.java b/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin2.java index b05128b..00a7761 100644 --- a/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin2.java +++ b/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin2.java @@ -47,7 +47,7 @@ public class NoiseGeneratorPerlin2 extends NoiseGenerator public final double grad2d(int par1, double par2, double par4) { int var6 = par1 & 15; - double var7 = (double)(1 - ((var6 & 8) >> 3)) * par2; + double var7 = (float)(1 - ((var6 & 8) >> 3)) * par2; double var9 = var6 < 4 ? 0.0D : (var6 != 12 && var6 != 14 ? par4 : par2); return ((var6 & 1) == 0 ? var7 : -var7) + ((var6 & 2) == 0 ? var9 : -var9); } @@ -94,30 +94,30 @@ public class NoiseGeneratorPerlin2 extends NoiseGenerator for (int var30 = 0; var30 < par8; ++var30) { - var31 = par2 + (double)var30 * par11 + this.xCoord; + var31 = par2 + (float)var30 * par11 + this.xCoord; double var78 = floor(var31); - if (var31 < (double)var78) + if (var31 < (float)var78) { --var78; } int var34 = (int) (var78 % 256D) & 255; - var31 -= (double)var78; + var31 -= (float)var78; var35 = var31 * var31 * var31 * (var31 * (var31 * 6.0D - 15.0D) + 10.0D); for (var37 = 0; var37 < par10; ++var37) { - var38 = par6 + (double)var37 * par15 + this.zCoord; + var38 = par6 + (float)var37 * par15 + this.zCoord; double var40 = floor(var38); - if (var38 < (double)var40) + if (var38 < (float)var40) { --var40; } var41 = (int) (var40 % 256D) & 255; - var38 -= (double)var40; + var38 -= (float)var40; var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D); var19 = this.permutations[var34] + 0; int var66 = this.permutations[var19] + var41; @@ -149,44 +149,44 @@ public class NoiseGeneratorPerlin2 extends NoiseGenerator for (var37 = 0; var37 < par8; ++var37) { - var38 = par2 + (double)var37 * par11 + this.xCoord; + var38 = par2 + (float)var37 * par11 + this.xCoord; double var40 = floor(var38); - if (var38 < (double)var40) + if (var38 < (float)var40) { --var40; } var41 = (int) (var40 % 256D) & 255; - var38 -= (double)var40; + var38 -= (float)var40; var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D); for (int var44 = 0; var44 < par10; ++var44) { - double var45 = par6 + (double)var44 * par15 + this.zCoord; + double var45 = par6 + (float)var44 * par15 + this.zCoord; double var47 = floor(var45); - if (var45 < (double)var47) + if (var45 < (float)var47) { --var47; } int var48 = (int) (var47 % 256D) & 255; - var45 -= (double)var47; + var45 -= (float)var47; double var49 = var45 * var45 * var45 * (var45 * (var45 * 6.0D - 15.0D) + 10.0D); for (int var51 = 0; var51 < par9; ++var51) { - double var52 = par4 + (double)var51 * par13 + this.yCoord; + double var52 = par4 + (float)var51 * par13 + this.yCoord; double var54 = floor(var52); - if (var52 < (double)var54) + if (var52 < (float)var54) { --var54; } int var55 = (int) (var54 % 256D) & 255; - var52 -= (double)var54; + var52 -= (float)var54; double var56 = var52 * var52 * var52 * (var52 * (var52 * 6.0D - 15.0D) + 10.0D); if (var51 == 0 || var55 != var22) diff --git a/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin64.java b/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin64.java index bb29c0b..f5eeb00 100644 --- a/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin64.java +++ b/src/minecraft/net/minecraft/src/NoiseGeneratorPerlin64.java @@ -47,7 +47,7 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator public final double grad2d(int par1, double par2, double par4) { int var6 = par1 & 15; - double var7 = (double)(1 - ((var6 & 8) >> 3)) * par2; + double var7 = (float)(1 - ((var6 & 8) >> 3)) * par2; double var9 = var6 < 4 ? 0.0D : (var6 != 12 && var6 != 14 ? par4 : par2); return ((var6 & 1) == 0 ? var7 : -var7) + ((var6 & 2) == 0 ? var9 : -var9); } @@ -91,30 +91,30 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator for (int var30 = 0; var30 < par8; ++var30) { - var31 = par2 + (double)var30 * par11 + this.xCoord; + var31 = par2 + (float)var30 * par11 + this.xCoord; int var78 = (int)var31; - if (var31 < (double)var78) + if (var31 < (float)var78) { --var78; } int var34 = var78 & 255; - var31 -= (double)var78; + var31 -= (float)var78; var35 = var31 * var31 * var31 * (var31 * (var31 * 6.0D - 15.0D) + 10.0D); for (var37 = 0; var37 < par10; ++var37) { - var38 = par6 + (double)var37 * par15 + this.zCoord; + var38 = par6 + (float)var37 * par15 + this.zCoord; var40 = (long)var38; - if (var38 < (double)var40) + if (var38 < (float)var40) { --var40; } var41 = (int) (var40 & 255); - var38 -= (double)var40; + var38 -= (float)var40; var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D); var19 = this.permutations[var34] + 0; int var66 = (int) (this.permutations[var19] + var41); @@ -146,44 +146,44 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator for (var37 = 0; var37 < par8; ++var37) { - var38 = par2 + (double)var37 * par11 + this.xCoord; + var38 = par2 + (float)var37 * par11 + this.xCoord; var40 = (long)var38; - if (var38 < (double)var40) + if (var38 < (float)var40) { --var40; } var41 = (int) (var40 & 255); - var38 -= (double)var40; + var38 -= (float)var40; var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D); for (int var44 = 0; var44 < par10; ++var44) { - double var45 = par6 + (double)var44 * par15 + this.zCoord; + double var45 = par6 + (float)var44 * par15 + this.zCoord; long var47 = (long)var45; - if (var45 < (double)var47) + if (var45 < (float)var47) { --var47; } int var48 = (int) (var47 & 255); - var45 -= (double)var47; + var45 -= (float)var47; double var49 = var45 * var45 * var45 * (var45 * (var45 * 6.0D - 15.0D) + 10.0D); for (int var51 = 0; var51 < par9; ++var51) { - double var52 = par4 + (double)var51 * par13 + this.yCoord; + double var52 = par4 + (float)var51 * par13 + this.yCoord; long var54 = (long)var52; - if (var52 < (double)var54) + if (var52 < (float)var54) { --var54; } int var55 = (int) (var54 & 255); - var52 -= (double)var54; + var52 -= (float)var54; double var56 = var52 * var52 * var52 * (var52 * (var52 * 6.0D - 15.0D) + 10.0D); if (var51 == 0 || var55 != var22) diff --git a/src/minecraft/net/minecraft/src/Packet62LevelSound.java b/src/minecraft/net/minecraft/src/Packet62LevelSound.java index 66b8572..2ba4ebb 100644 --- a/src/minecraft/net/minecraft/src/Packet62LevelSound.java +++ b/src/minecraft/net/minecraft/src/Packet62LevelSound.java @@ -73,17 +73,17 @@ public class Packet62LevelSound extends Packet public double func_73572_f() { - return (double)((float)this.field_73577_b / 8.0F); + return (float)((float)this.field_73577_b / 8.0F); } public double func_73568_g() { - return (double)((float)this.field_73578_c / 8.0F); + return (float)((float)this.field_73578_c / 8.0F); } public double func_73569_h() { - return (double)((float)this.field_73575_d / 8.0F); + return (float)((float)this.field_73575_d / 8.0F); } public float func_73571_i() diff --git a/src/minecraft/net/minecraft/src/Particle.java b/src/minecraft/net/minecraft/src/Particle.java index cb5a7f9..6a9dfb3 100644 --- a/src/minecraft/net/minecraft/src/Particle.java +++ b/src/minecraft/net/minecraft/src/Particle.java @@ -37,7 +37,7 @@ public class Particle this.setDead(); } - this.tintAlpha = 2.0D - (double)this.timeTick / (double)this.timeLimit * 2.0D; + this.tintAlpha = 2.0D - (float)this.timeTick / (float)this.timeLimit * 2.0D; if (this.tintAlpha > 1.0D) { diff --git a/src/minecraft/net/minecraft/src/PathEntity.java b/src/minecraft/net/minecraft/src/PathEntity.java index 5e44663..3dce37a 100644 --- a/src/minecraft/net/minecraft/src/PathEntity.java +++ b/src/minecraft/net/minecraft/src/PathEntity.java @@ -74,9 +74,9 @@ public class PathEntity */ public Vec3 getVectorFromIndex(Entity par1Entity, int par2) { - double var3 = (double)this.points[par2].xCoord.doubleValue() + (double)((int)(par1Entity.width + 1.0F)) * 0.5D; - double var5 = (double)this.points[par2].yCoord; - double var7 = (double)this.points[par2].zCoord.doubleValue() + (double)((int)(par1Entity.width + 1.0F)) * 0.5D; + double var3 = (float)this.points[par2].xCoord.doubleValue() + (float)((int)(par1Entity.width + 1.0F)) * 0.5D; + double var5 = (float)this.points[par2].yCoord; + double var7 = (float)this.points[par2].zCoord.doubleValue() + (float)((int)(par1Entity.width + 1.0F)) * 0.5D; return Vec3.getVec3Pool().getVecFromPool(var3, var5, var7); } diff --git a/src/minecraft/net/minecraft/src/PathFinder.java b/src/minecraft/net/minecraft/src/PathFinder.java index cf8a3ea..57f9f9c 100644 --- a/src/minecraft/net/minecraft/src/PathFinder.java +++ b/src/minecraft/net/minecraft/src/PathFinder.java @@ -50,7 +50,7 @@ public class PathFinder */ public PathEntity createEntityPathTo(Entity par1Entity, BigInteger par2, int par3, BigInteger par4, float par5) { - return this.createEntityPathTo(par1Entity, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), par5); + return this.createEntityPathTo(par1Entity, (float)((float)par2.floatValue() + 0.5F), (float)((float)par3 + 0.5F), (float)((float)par4.floatValue() + 0.5F), par5); } /** @@ -81,7 +81,7 @@ public class PathFinder } PathPoint var15 = this.openPoint(MathHelper.floor_double_BigInteger(par1Entity.boundingBox.minX), var10, MathHelper.floor_double_BigInteger(par1Entity.boundingBox.minZ)); - PathPoint var12 = this.openPoint(MathHelper.floor_double_BigInteger(par2 - (double)(par1Entity.width / 2.0F)), MathHelper.floor_double(par4), MathHelper.floor_double_BigInteger(par6 - (double)(par1Entity.width / 2.0F))); + PathPoint var12 = this.openPoint(MathHelper.floor_double_BigInteger(par2 - (float)(par1Entity.width / 2.0F)), MathHelper.floor_double(par4), MathHelper.floor_double_BigInteger(par6 - (float)(par1Entity.width / 2.0F))); PathPoint var13 = new PathPoint(MathHelper.floor_double_BigInteger(par1Entity.width + 1.0F), MathHelper.floor_float(par1Entity.height + 1.0F), MathHelper.floor_double_BigInteger(par1Entity.width + 1.0F)); PathEntity var14 = this.addToPath(par1Entity, var15, var12, var13, par8); this.isPathingInWater = var9; diff --git a/src/minecraft/net/minecraft/src/PathNavigate.java b/src/minecraft/net/minecraft/src/PathNavigate.java index b60b5cc..ab39641 100644 --- a/src/minecraft/net/minecraft/src/PathNavigate.java +++ b/src/minecraft/net/minecraft/src/PathNavigate.java @@ -122,7 +122,7 @@ public class PathNavigate */ public boolean tryMoveToXYZ(double par1, double par3, double par5, float par7) { - PathEntity var8 = this.getPathToXYZ((double)MathHelper.floor_double(par1), (double)((int)par3), (double)MathHelper.floor_double(par5)); + PathEntity var8 = this.getPathToXYZ((float)MathHelper.floor_double(par1), (float)((int)par3), (float)MathHelper.floor_double(par5)); return this.setPath(var8, par7); } @@ -233,7 +233,7 @@ public class PathNavigate for (var4 = this.currentPath.getCurrentPathIndex(); var4 < var2; ++var4) { - if (var1.squareDistanceTo(this.currentPath.getVectorFromIndex(this.theEntity, var4)) < (double)var8) + if (var1.squareDistanceTo(this.currentPath.getVectorFromIndex(this.theEntity, var4)) < (float)var8) { this.currentPath.setCurrentPathIndex(var4 + 1); } @@ -284,7 +284,7 @@ public class PathNavigate private Vec3 getEntityPosition() { - return Vec3.getVec3Pool().getVecFromPool(this.theEntity.posX, (double)this.getPathableYPos(), this.theEntity.posZ); + return Vec3.getVec3Pool().getVecFromPool(this.theEntity.posX, (float)this.getPathableYPos(), this.theEntity.posZ); } /** @@ -389,8 +389,8 @@ public class PathNavigate par5 -= 2; double var16 = 1.0D / Math.abs(var8); double var18 = 1.0D / Math.abs(var10); - double var20 = (double)(var6.doubleValue()) - par1Vec3.xCoord; - double var22 = (double)(var7.doubleValue()) - par1Vec3.zCoord; + double var20 = (float)(var6.doubleValue()) - par1Vec3.xCoord; + double var22 = (float)(var7.doubleValue()) - par1Vec3.zCoord; if (var8 >= 0.0D) { @@ -457,8 +457,8 @@ public class PathNavigate { for (int var15 = -radiusZ; var15 < radiusZ; ++var15) { - double var16 = (double)var14 + 0.5D - par7Vec3.xCoord; - double var18 = (double)var15 + 0.5D - par7Vec3.zCoord; + double var16 = (float)var14 + 0.5D - par7Vec3.xCoord; + double var18 = (float)var15 + 0.5D - par7Vec3.zCoord; if (var16 * par8 + var18 * par10 >= 0.0D) { @@ -502,8 +502,8 @@ public class PathNavigate { for (int var14 = radiusZ; var14 < +radiusZ; ++var14) { - double var15 = (double)var12 + 0.5D - par7Vec3.xCoord; - double var17 = (double)var14 + 0.5D - par7Vec3.zCoord; + double var15 = (float)var12 + 0.5D - par7Vec3.xCoord; + double var17 = (float)var14 + 0.5D - par7Vec3.zCoord; if (var15 * par8 + var17 * par10 >= 0.0D) { diff --git a/src/minecraft/net/minecraft/src/PositionTextureVertex.java b/src/minecraft/net/minecraft/src/PositionTextureVertex.java index a66d352..2b728ab 100644 --- a/src/minecraft/net/minecraft/src/PositionTextureVertex.java +++ b/src/minecraft/net/minecraft/src/PositionTextureVertex.java @@ -8,7 +8,7 @@ public class PositionTextureVertex public PositionTextureVertex(float par1, float par2, float par3, float par4, float par5) { - this(Vec3.createVectorHelper((double)par1, (double)par2, (double)par3), par4, par5); + this(Vec3.createVectorHelper((float)par1, (float)par2, (float)par3), par4, par5); } public PositionTextureVertex setTexturePosition(float par1, float par2) diff --git a/src/minecraft/net/minecraft/src/Potion.java b/src/minecraft/net/minecraft/src/Potion.java index 60ff26a..c3ccc05 100644 --- a/src/minecraft/net/minecraft/src/Potion.java +++ b/src/minecraft/net/minecraft/src/Potion.java @@ -153,7 +153,7 @@ public class Potion { if (this.id == harm.id && !par2EntityLiving.isEntityUndead() || this.id == heal.id && par2EntityLiving.isEntityUndead()) { - var6 = (int)(par4 * (double)(6 << par3) + 0.5D); + var6 = (int)(par4 * (float)(6 << par3) + 0.5D); if (par1EntityLiving == null) { @@ -167,7 +167,7 @@ public class Potion } else { - var6 = (int)(par4 * (double)(6 << par3) + 0.5D); + var6 = (int)(par4 * (float)(6 << par3) + 0.5D); par2EntityLiving.heal(var6); } } diff --git a/src/minecraft/net/minecraft/src/PotionHelper.java b/src/minecraft/net/minecraft/src/PotionHelper.java index 8edb0e0..ec22739 100644 --- a/src/minecraft/net/minecraft/src/PotionHelper.java +++ b/src/minecraft/net/minecraft/src/PotionHelper.java @@ -390,11 +390,11 @@ public class PotionHelper { var8 = 1200 * (var8 * 3 + (var8 - 1) * 2); var8 >>= var9; - var8 = (int)Math.round((double)var8 * var6.getEffectiveness()); + var8 = (int)Math.round((float)var8 * var6.getEffectiveness()); if ((par0 & 16384) != 0) { - var8 = (int)Math.round((double)var8 * 0.75D + 0.5D); + var8 = (int)Math.round((float)var8 * 0.75D + 0.5D); } } diff --git a/src/minecraft/net/minecraft/src/Profiler.java b/src/minecraft/net/minecraft/src/Profiler.java index ccf237e..5e522bc 100644 --- a/src/minecraft/net/minecraft/src/Profiler.java +++ b/src/minecraft/net/minecraft/src/Profiler.java @@ -91,7 +91,7 @@ public class Profiler if (var5 > 100000000L) { - System.out.println("Something\'s taking too long! \'" + this.profilingSection + "\' took aprox " + (double)var5 / 1000000.0D + " ms"); + System.out.println("Something\'s taking too long! \'" + this.profilingSection + "\' took aprox " + (float)var5 / 1000000.0D + " ms"); } this.profilingSection = !this.sectionList.isEmpty() ? (String)this.sectionList.get(this.sectionList.size() - 1) : ""; @@ -152,8 +152,8 @@ public class Profiler if (var12.length() > par1Str.length() && var12.startsWith(par1Str) && var12.indexOf(".", par1Str.length() + 1) < 0) { long var13 = ((Long)this.profilingMap.get(var12)).longValue(); - double var15 = (double)var13 * 100.0D / (double)var8; - double var17 = (double)var13 * 100.0D / (double)var3; + double var15 = (float)var13 * 100.0D / (float)var8; + double var17 = (float)var13 * 100.0D / (float)var3; String var19 = var12.substring(par1Str.length()); var7.add(new ProfilerResult(var19, var15, var17)); } @@ -169,11 +169,11 @@ public class Profiler if ((float)var8 > var20) { - var7.add(new ProfilerResult("unspecified", (double)((float)var8 - var20) * 100.0D / (double)var8, (double)((float)var8 - var20) * 100.0D / (double)var3)); + var7.add(new ProfilerResult("unspecified", (float)((float)var8 - var20) * 100.0D / (float)var8, (float)((float)var8 - var20) * 100.0D / (float)var3)); } Collections.sort(var7); - var7.add(0, new ProfilerResult(par1Str, 100.0D, (double)var8 * 100.0D / (double)var3)); + var7.add(0, new ProfilerResult(par1Str, 100.0D, (float)var8 * 100.0D / (float)var3)); return var7; } } diff --git a/src/minecraft/net/minecraft/src/RandomPositionGenerator.java b/src/minecraft/net/minecraft/src/RandomPositionGenerator.java index 7003bc1..5ef97cd 100644 --- a/src/minecraft/net/minecraft/src/RandomPositionGenerator.java +++ b/src/minecraft/net/minecraft/src/RandomPositionGenerator.java @@ -57,8 +57,8 @@ public class RandomPositionGenerator if (par0EntityCreature.hasHome()) { - double var11 = (double)(par0EntityCreature.getHomePosition().getDistanceSquared(MathHelper.floor_double_BigInteger(par0EntityCreature.posX), MathHelper.floor_double(par0EntityCreature.posY), MathHelper.floor_double_BigInteger(par0EntityCreature.posZ)) + 4.0F); - double var13 = (double)(par0EntityCreature.getMaximumHomeDistance() + (float)par1); + double var11 = (float)(par0EntityCreature.getHomePosition().getDistanceSquared(MathHelper.floor_double_BigInteger(par0EntityCreature.posX), MathHelper.floor_double(par0EntityCreature.posY), MathHelper.floor_double_BigInteger(par0EntityCreature.posZ)) + 4.0F); + double var13 = (float)(par0EntityCreature.getMaximumHomeDistance() + (float)par1); var10 = var11 < var13 * var13; } else @@ -72,7 +72,7 @@ public class RandomPositionGenerator int var17 = var4.nextInt(2 * par2) - par2; int var14 = var4.nextInt(2 * par1) - par1; - if (par3Vec3 == null || (double)var12 * par3Vec3.xCoord + (double)var14 * par3Vec3.zCoord >= 0.0D) + if (par3Vec3 == null || (float)var12 * par3Vec3.xCoord + (float)var14 * par3Vec3.zCoord >= 0.0D) { BigInteger x = MathHelper.floor_double_BigInteger(par0EntityCreature.posX).add(BigInteger.valueOf(var12)); var17 += MathHelper.floor_double(par0EntityCreature.posY); @@ -96,7 +96,7 @@ public class RandomPositionGenerator if (var5) { - return Vec3.getVec3Pool().getVecFromPool((double)var6.doubleValue(), (double)var7, (double)var8.doubleValue()); + return Vec3.getVec3Pool().getVecFromPool((float)var6.doubleValue(), (float)var7, (float)var8.doubleValue()); } else { diff --git a/src/minecraft/net/minecraft/src/Render.java b/src/minecraft/net/minecraft/src/Render.java index 70fbed9..f3b4bb6 100644 --- a/src/minecraft/net/minecraft/src/Render.java +++ b/src/minecraft/net/minecraft/src/Render.java @@ -106,10 +106,10 @@ public abstract class Render var12 = var24; } - var17.addVertexWithUV((double)(var18 - var19), (double)(0.0F - var21), (double)var22, (double)var13, (double)var15); - var17.addVertexWithUV((double)(-var18 - var19), (double)(0.0F - var21), (double)var22, (double)var12, (double)var15); - var17.addVertexWithUV((double)(-var18 - var19), (double)(1.4F - var21), (double)var22, (double)var12, (double)var14); - var17.addVertexWithUV((double)(var18 - var19), (double)(1.4F - var21), (double)var22, (double)var13, (double)var14); + var17.addVertexWithUV((float)(var18 - var19), (float)(0.0F - var21), (float)var22, (float)var13, (float)var15); + var17.addVertexWithUV((float)(-var18 - var19), (float)(0.0F - var21), (float)var22, (float)var12, (float)var15); + var17.addVertexWithUV((float)(-var18 - var19), (float)(1.4F - var21), (float)var22, (float)var12, (float)var14); + var17.addVertexWithUV((float)(var18 - var19), (float)(1.4F - var21), (float)var22, (float)var13, (float)var14); var20 -= 0.45F; var21 -= 0.45F; var18 *= 0.9F; @@ -152,15 +152,15 @@ public abstract class Render } } - double var36 = par1Entity.lastTickPosX + (par1Entity.posX - par1Entity.lastTickPosX) * (double)par9; - double var15 = par1Entity.lastTickPosY + (par1Entity.posY - par1Entity.lastTickPosY) * (double)par9 + (double)par1Entity.getShadowSize(); - double var17 = par1Entity.lastTickPosZ + (par1Entity.posZ - par1Entity.lastTickPosZ) * (double)par9; - BigInteger var19 = MathHelper.floor_double_BigInteger(var36 - (double)var12); - BigInteger var20 = MathHelper.floor_double_BigInteger(var36 + (double)var12); - int var21 = MathHelper.floor_double(var15 - (double)var12); + double var36 = par1Entity.lastTickPosX + (par1Entity.posX - par1Entity.lastTickPosX) * (float)par9; + double var15 = par1Entity.lastTickPosY + (par1Entity.posY - par1Entity.lastTickPosY) * (float)par9 + (float)par1Entity.getShadowSize(); + double var17 = par1Entity.lastTickPosZ + (par1Entity.posZ - par1Entity.lastTickPosZ) * (float)par9; + BigInteger var19 = MathHelper.floor_double_BigInteger(var36 - (float)var12); + BigInteger var20 = MathHelper.floor_double_BigInteger(var36 + (float)var12); + int var21 = MathHelper.floor_double(var15 - (float)var12); int var22 = MathHelper.floor_double(var15); - BigInteger var23 = MathHelper.floor_double_BigInteger(var17 - (double)var12); - BigInteger var24 = MathHelper.floor_double_BigInteger(var17 + (double)var12); + BigInteger var23 = MathHelper.floor_double_BigInteger(var17 - (float)var12); + BigInteger var24 = MathHelper.floor_double_BigInteger(var17 + (float)var12); double var25 = par2 - var36; double var27 = par4 - var15; double var29 = par6 - var17; @@ -178,7 +178,7 @@ public abstract class Render if (var35 > 0 && var11.getBlockLightValue(var32, var33, var34) > 3) { - this.renderShadowOnBlock(Block.blocksList[var35], par2, par4 + (double)par1Entity.getShadowSize(), par6, var32, var33, var34, par8, var12, var25, var27 + (double)par1Entity.getShadowSize(), var29); + this.renderShadowOnBlock(Block.blocksList[var35], par2, par4 + (float)par1Entity.getShadowSize(), par6, var32, var33, var34, par8, var12, var25, var27 + (float)par1Entity.getShadowSize(), var29); } } } @@ -209,7 +209,7 @@ public abstract class Render if (par1Block.renderAsNormalBlock()) { - double var20 = ((double)par11 - (par4 - ((double)par9 + par15)) / 2.0D) * 0.5D * (double)this.getWorldFromRenderManager().getLightBrightness(par8, par9, par10); + double var20 = ((float)par11 - (par4 - ((float)par9 + par15)) / 2.0D) * 0.5D * (float)this.getWorldFromRenderManager().getLightBrightness(par8, par9, par10); if (var20 >= 0.0D) { @@ -219,19 +219,19 @@ public abstract class Render } var19.setColorRGBA_F(1.0F, 1.0F, 1.0F, (float)var20); - double var22 = (double)par8.doubleValue() + par1Block.minX + par13; - double var24 = (double)par8.doubleValue() + par1Block.maxX + par13; - double var26 = (double)par9 + par1Block.minY + par15 + 0.015625D; - double var28 = (double)par10.doubleValue() + par1Block.minZ + par17; - double var30 = (double)par10.doubleValue() + par1Block.maxZ + par17; - float var32 = (float)((par2 - var22) / 2.0D / (double)par12 + 0.5D); - float var33 = (float)((par2 - var24) / 2.0D / (double)par12 + 0.5D); - float var34 = (float)((par6 - var28) / 2.0D / (double)par12 + 0.5D); - float var35 = (float)((par6 - var30) / 2.0D / (double)par12 + 0.5D); - var19.addVertexWithUV(var22, var26, var28, (double)var32, (double)var34); - var19.addVertexWithUV(var22, var26, var30, (double)var32, (double)var35); - var19.addVertexWithUV(var24, var26, var30, (double)var33, (double)var35); - var19.addVertexWithUV(var24, var26, var28, (double)var33, (double)var34); + double var22 = (float)par8.doubleValue() + par1Block.minX + par13; + double var24 = (float)par8.doubleValue() + par1Block.maxX + par13; + double var26 = (float)par9 + par1Block.minY + par15 + 0.015625D; + double var28 = (float)par10.doubleValue() + par1Block.minZ + par17; + double var30 = (float)par10.doubleValue() + par1Block.maxZ + par17; + float var32 = (float)((par2 - var22) / 2.0D / (float)par12 + 0.5D); + float var33 = (float)((par2 - var24) / 2.0D / (float)par12 + 0.5D); + float var34 = (float)((par6 - var28) / 2.0D / (float)par12 + 0.5D); + float var35 = (float)((par6 - var30) / 2.0D / (float)par12 + 0.5D); + var19.addVertexWithUV(var22, var26, var28, (float)var32, (float)var34); + var19.addVertexWithUV(var22, var26, var30, (float)var32, (float)var35); + var19.addVertexWithUV(var24, var26, var30, (float)var33, (float)var35); + var19.addVertexWithUV(var24, var26, var28, (float)var33, (float)var34); } } } @@ -331,7 +331,7 @@ public abstract class Render if (this.renderManager.options.fancyGraphics && this.shadowSize > 0.0F) { double var10 = this.renderManager.getDistanceToCamera(par1Entity.posX, par1Entity.posY, par1Entity.posZ); - float var12 = (float)((1.0D - var10 / 256.0D) * (double)this.shadowOpaque); + float var12 = (float)((1.0D - var10 / 256.0D) * (float)this.shadowOpaque); if (var12 > 0.0F) { diff --git a/src/minecraft/net/minecraft/src/RenderArrow.java b/src/minecraft/net/minecraft/src/RenderArrow.java index 8ddb7c9..0f28308 100644 --- a/src/minecraft/net/minecraft/src/RenderArrow.java +++ b/src/minecraft/net/minecraft/src/RenderArrow.java @@ -37,17 +37,17 @@ public class RenderArrow extends Render GL11.glTranslatef(-4.0F, 0.0F, 0.0F); GL11.glNormal3f(var20, 0.0F, 0.0F); var10.startDrawingQuads(); - var10.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)var16, (double)var18); - var10.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)var17, (double)var18); - var10.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)var17, (double)var19); - var10.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)var16, (double)var19); + var10.addVertexWithUV(-7.0D, -2.0D, -2.0D, (float)var16, (float)var18); + var10.addVertexWithUV(-7.0D, -2.0D, 2.0D, (float)var17, (float)var18); + var10.addVertexWithUV(-7.0D, 2.0D, 2.0D, (float)var17, (float)var19); + var10.addVertexWithUV(-7.0D, 2.0D, -2.0D, (float)var16, (float)var19); var10.draw(); GL11.glNormal3f(-var20, 0.0F, 0.0F); var10.startDrawingQuads(); - var10.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)var16, (double)var18); - var10.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)var17, (double)var18); - var10.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)var17, (double)var19); - var10.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)var16, (double)var19); + var10.addVertexWithUV(-7.0D, 2.0D, -2.0D, (float)var16, (float)var18); + var10.addVertexWithUV(-7.0D, 2.0D, 2.0D, (float)var17, (float)var18); + var10.addVertexWithUV(-7.0D, -2.0D, 2.0D, (float)var17, (float)var19); + var10.addVertexWithUV(-7.0D, -2.0D, -2.0D, (float)var16, (float)var19); var10.draw(); for (int var23 = 0; var23 < 4; ++var23) @@ -55,10 +55,10 @@ public class RenderArrow extends Render GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); GL11.glNormal3f(0.0F, 0.0F, var20); var10.startDrawingQuads(); - var10.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double)var12, (double)var14); - var10.addVertexWithUV(8.0D, -2.0D, 0.0D, (double)var13, (double)var14); - var10.addVertexWithUV(8.0D, 2.0D, 0.0D, (double)var13, (double)var15); - var10.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double)var12, (double)var15); + var10.addVertexWithUV(-8.0D, -2.0D, 0.0D, (float)var12, (float)var14); + var10.addVertexWithUV(8.0D, -2.0D, 0.0D, (float)var13, (float)var14); + var10.addVertexWithUV(8.0D, 2.0D, 0.0D, (float)var13, (float)var15); + var10.addVertexWithUV(-8.0D, 2.0D, 0.0D, (float)var12, (float)var15); var10.draw(); } diff --git a/src/minecraft/net/minecraft/src/RenderBlocks.java b/src/minecraft/net/minecraft/src/RenderBlocks.java index cd5d642..7e8d5d9 100644 --- a/src/minecraft/net/minecraft/src/RenderBlocks.java +++ b/src/minecraft/net/minecraft/src/RenderBlocks.java @@ -508,15 +508,15 @@ public class RenderBlocks int var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0); int var28 = (var27 & 15) << 4; int var29 = var27 & 240; - double var30 = (float)((float)var28 / 256.0F); - double var32 = ((float)(var28 + 16) - 0.01D) / 256.0D; - double var34 = (float)((float)var29 / 256.0F); - double var36 = ((float)(var29 + 16) - 0.01D) / 256.0D; - double var38 = (float)par2.floatValue() + par1Block.minX; - double var40 = (float)par2.floatValue() + par1Block.maxX; - double var42 = (float)par3 + par1Block.minY + 0.1875D; - double var44 = (float)par4.floatValue() + par1Block.minZ; - double var46 = (float)par4.floatValue() + par1Block.maxZ; + float var30 = (float)((float)var28 / 256.0F); + float var32 = ((float)(var28 + 16) - 0.01F) / 256.0F; + float var34 = (float)((float)var29 / 256.0F); + float var36 = ((float)(var29 + 16) - 0.01F) / 256.0F; + float var38 = (float)par2.floatValue() + par1Block.minX; + float var40 = (float)par2.floatValue() + par1Block.maxX; + float var42 = (float)par3 + par1Block.minY + 0.1875F; + float var44 = (float)par4.floatValue() + par1Block.minZ; + float var46 = (float)par4.floatValue() + par1Block.maxZ; var5.addVertexWithUV(var38, var42, var46, var30, var36); var5.addVertexWithUV(var38, var42, var44, var30, var34); var5.addVertexWithUV(var40, var42, var44, var32, var34); @@ -527,17 +527,17 @@ public class RenderBlocks var28 = (var27 & 15) << 4; var29 = var27 & 240; var30 = (float)((float)var28 / 256.0F); - var32 = ((float)(var28 + 16) - 0.01D) / 256.0D; + var32 = ((float)(var28 + 16) - 0.01F) / 256.0F; var34 = (float)((float)var29 / 256.0F); - var36 = ((float)(var29 + 16) - 0.01D) / 256.0D; + var36 = ((float)(var29 + 16) - 0.01F) / 256.0F; var38 = var30; var40 = var32; var42 = var34; var44 = var34; var46 = var30; - double var48 = var32; - double var50 = var36; - double var52 = var36; + float var48 = var32; + float var50 = var36; + float var52 = var36; if (var7 == 0) { @@ -565,11 +565,11 @@ public class RenderBlocks var52 = var34; } - double var54 = (float)(FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) + par1Block.minX; - double var56 = (float)(FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) + par1Block.maxX; - double var58 = (float)(FIX_RENDERER ? par3 & 0xF : par3) + par1Block.maxY; - double var60 = (float)(FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) + par1Block.minZ; - double var62 = (float)(FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) + par1Block.maxZ; + float var54 = (float)(FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) + par1Block.minX; + float var56 = (float)(FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) + par1Block.maxX; + float var58 = (float)(FIX_RENDERER ? par3 & 0xF : par3) + par1Block.maxY; + float var60 = (float)(FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) + par1Block.minZ; + float var62 = (float)(FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) + par1Block.maxZ; var5.addVertexWithUV(var56, var58, var62, var46, var50); var5.addVertexWithUV(var56, var58, var60, var38, var42); var5.addVertexWithUV(var54, var58, var60, var40, var44); @@ -602,7 +602,7 @@ public class RenderBlocks if (var64 != 2 && (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE), 2))) { - var5.setBrightness(par1Block.minZ > 0.0D ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); + var5.setBrightness(par1Block.minZ > 0.0F ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); var5.setColorOpaque_F(var11, var11, var11); this.flipTexture = var65 == 2; this.renderEastFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2)); @@ -610,7 +610,7 @@ public class RenderBlocks if (var64 != 3 && (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4.add(BigInteger.ONE), 3))) { - var5.setBrightness(par1Block.maxZ < 1.0D ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); + var5.setBrightness(par1Block.maxZ < 1.0F ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); var5.setColorOpaque_F(var11, var11, var11); this.flipTexture = var65 == 3; this.renderWestFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3)); @@ -618,7 +618,7 @@ public class RenderBlocks if (var64 != 4 && (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4, 4))) { - var5.setBrightness(par1Block.minZ > 0.0D ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); + var5.setBrightness(par1Block.minZ > 0.0F ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); var5.setColorOpaque_F(var12, var12, var12); this.flipTexture = var65 == 4; this.renderNorthFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4)); @@ -626,7 +626,7 @@ public class RenderBlocks if (var64 != 5 && (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2.add(BigInteger.ONE), par3, par4, 5))) { - var5.setBrightness(par1Block.maxZ < 1.0D ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); + var5.setBrightness(par1Block.maxZ < 1.0F ? var25 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); var5.setColorOpaque_F(var12, var12, var12); this.flipTexture = var65 == 5; this.renderSouthFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5)); @@ -679,8 +679,8 @@ public class RenderBlocks int var35 = (var34 & 15) << 4; int var36 = var34 & 240; - double var14 = (float)((float)var36 / 256.0F); - double var16 = (float)(((float)var36 + 15.99F) / 256.0F); + float var14 = (float)((float)var36 / 256.0F); + float var16 = (float)(((float)var36 + 15.99F) / 256.0F); int var18 = this.blockAccess.getBlockMetadata(par2, par3, par4); if(FIX_RENDERER) { @@ -691,9 +691,9 @@ public class RenderBlocks for (int var19 = 0; var19 < 3; ++var19) { - double var20 = (float)var19 * Math.PI * 2.0D / 3.0D + (Math.PI / 2D); - double var22 = (float)(((float)var35 + 8.0F) / 256.0F); - double var24 = (float)(((float)var35 + 15.99F) / 256.0F); + float var20 = (float)var19 * (float)(float)Math.PI * 2.0F / 3.0F + ((float)(float)Math.PI / 2F); + float var22 = (float)(((float)var35 + 8.0F) / 256.0F); + float var24 = (float)(((float)var35 + 15.99F) / 256.0F); if ((var18 & 1 << var19) != 0) { @@ -701,10 +701,10 @@ public class RenderBlocks var24 = (float)(((float)var35 + 0.0F) / 256.0F); } - double var26 = (par2).floatValue() + 0.5D; - double var28 = (par2).floatValue() + 0.5D + Math.sin(var20) * 8.0D / 16.0D; - double var30 = (par4).floatValue() + 0.5D; - double var32 = (par4).floatValue() + 0.5D + Math.cos(var20) * 8.0D / 16.0D; + float var26 = (par2).floatValue() + 0.5F; + float var28 = (par2).floatValue() + 0.5F + (float)(float)Math.sin(var20) * 8.0F / 16.0F; + float var30 = (par4).floatValue() + 0.5F; + float var32 = (par4).floatValue() + 0.5F + (float)(float)Math.cos(var20) * 8.0F / 16.0F; var5.addVertexWithUV(var26, par3 + 1, var30, var22, var14); var5.addVertexWithUV(var26, par3, var30, var22, var16); var5.addVertexWithUV(var28, par3, var32, var24, var16); @@ -790,29 +790,29 @@ public class RenderBlocks Tessellator var6 = tessellator; var6.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4)); var6.setColorOpaque_F(1.0F, 1.0F, 1.0F); - double var7 = 0.4000000059604645D; - double var9 = 0.5D - var7; - double var11 = 0.20000000298023224D; + float var7 = 0.4000000059604645F; + float var9 = 0.5F - var7; + float var11 = 0.20000000298023224F; if (var5 == 1) { - this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) - var9, (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()), -var7, 0.0D); + this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) - var9, (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()), -var7, 0.0F); } else if (var5 == 2) { - this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) + var9, (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()), var7, 0.0D); + this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()) + var9, (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()), var7, 0.0F); } else if (var5 == 3) { - this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()), (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) - var9, 0.0D, -var7); + this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()), (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) - var9, 0.0F, -var7); } else if (var5 == 4) { - this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()), (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) + var9, 0.0D, var7); + this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()), (FIX_RENDERER ? par3 & 0xF : par3) + var11, (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()) + var9, 0.0F, var7); } else { - this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()), (FIX_RENDERER ? par3 & 0xF : par3), (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()), 0.0D, 0.0D); + this.renderTorchAtAngle(par1Block, (FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue()), (FIX_RENDERER ? par3 & 0xF : par3), (FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()), 0.0F, 0.0F); } return true; @@ -835,53 +835,53 @@ public class RenderBlocks par3 &= 0xF; par4 = BigInteger.valueOf(par4.intValue() & 0xF); } - double var9 = -0.1875D; - double var11 = 0.0D; - double var13 = 0.0D; - double var15 = 0.0D; - double var17 = 0.0D; + float var9 = -0.1875F; + float var11 = 0.0F; + float var13 = 0.0F; + float var15 = 0.0F; + float var17 = 0.0F; switch (var6) { case 0: - var17 = -0.3125D; - var13 = BlockRedstoneRepeater.repeaterTorchOffset[var7]; + var17 = -0.3125F; + var13 = (float)BlockRedstoneRepeater.repeaterTorchOffset[var7]; break; case 1: - var15 = 0.3125D; - var11 = -BlockRedstoneRepeater.repeaterTorchOffset[var7]; + var15 = 0.3125F; + var11 = (float) -BlockRedstoneRepeater.repeaterTorchOffset[var7]; break; case 2: - var17 = 0.3125D; - var13 = -BlockRedstoneRepeater.repeaterTorchOffset[var7]; + var17 = 0.3125F; + var13 = (float) -BlockRedstoneRepeater.repeaterTorchOffset[var7]; break; case 3: - var15 = -0.3125D; - var11 = BlockRedstoneRepeater.repeaterTorchOffset[var7]; + var15 = -0.3125F; + var11 = (float) BlockRedstoneRepeater.repeaterTorchOffset[var7]; } - this.renderTorchAtAngle(par1Block, par2.floatValue() + var11, (float)par3 + var9, par4.floatValue() + var13, 0.0D, 0.0D); - this.renderTorchAtAngle(par1Block, par2.floatValue() + var15, (float)par3 + var9, par4.floatValue() + var17, 0.0D, 0.0D); + this.renderTorchAtAngle(par1Block, par2.floatValue() + var11, (float)par3 + var9, par4.floatValue() + var13, 0.0F, 0.0F); + this.renderTorchAtAngle(par1Block, par2.floatValue() + var15, (float)par3 + var9, par4.floatValue() + var17, 0.0F, 0.0F); int var19 = par1Block.getBlockTextureFromSide(1); int var20 = (var19 & 15) << 4; int var21 = var19 & 240; - double var22 = (float)((float)var20 / 256.0F); - double var24 = (float)(((float)var20 + 15.99F) / 256.0F); - double var26 = (float)((float)var21 / 256.0F); - double var28 = (float)(((float)var21 + 15.99F) / 256.0F); - double var30 = 0.125D; - double var32 = par2.add(BigInteger.ONE).floatValue(); - double var34 = par2.add(BigInteger.ONE).floatValue(); - double var36 = par2.floatValue(); - double var38 = par2.floatValue(); - double var40 = par4.floatValue(); - double var42 = par4.add(BigInteger.ONE).floatValue(); - double var44 = par4.add(BigInteger.ONE).floatValue(); - double var46 = par4.floatValue(); - double var48 = (float)par3 + var30; + float var22 = (float)((float)var20 / 256.0F); + float var24 = (float)(((float)var20 + 15.99F) / 256.0F); + float var26 = (float)((float)var21 / 256.0F); + float var28 = (float)(((float)var21 + 15.99F) / 256.0F); + float var30 = 0.125F; + float var32 = par2.add(BigInteger.ONE).floatValue(); + float var34 = par2.add(BigInteger.ONE).floatValue(); + float var36 = par2.floatValue(); + float var38 = par2.floatValue(); + float var40 = par4.floatValue(); + float var42 = par4.add(BigInteger.ONE).floatValue(); + float var44 = par4.add(BigInteger.ONE).floatValue(); + float var46 = par4.floatValue(); + float var48 = (float)par3 + var30; if (var6 == 2) { @@ -1041,7 +1041,7 @@ public class RenderBlocks /** * Render piston rod up/down */ - private void renderPistonRodUD(double par1, double par3, double par5, double par7, double par9, double par11, float par13, double par14) + private void renderPistonRodUD(float par1, float par3, float par5, float par7, float par9, float par11, float par13, float par14) { int var16 = 108; @@ -1053,10 +1053,10 @@ public class RenderBlocks int var17 = (var16 & 15) << 4; int var18 = var16 & 240; Tessellator var19 = tessellator; - double var20 = (float)((float)(var17 + 0) / 256.0F); - double var22 = (float)((float)(var18 + 0) / 256.0F); - double var24 = ((float)var17 + par14 - 0.01D) / 256.0D; - double var26 = ((float)((float)var18 + 4.0F) - 0.01D) / 256.0D; + float var20 = (float)((float)(var17 + 0) / 256.0F); + float var22 = (float)((float)(var18 + 0) / 256.0F); + float var24 = ((float)var17 + par14 - 0.01F) / 256.0F; + float var26 = ((float)((float)var18 + 4.0F) - 0.01F) / 256.0F; var19.setColorOpaque_F(par13, par13, par13); var19.addVertexWithUV(par1, par7, par9, var24, var22); var19.addVertexWithUV(par1, par5, par9, var20, var22); @@ -1067,7 +1067,7 @@ public class RenderBlocks /** * Render piston rod south/north */ - private void renderPistonRodSN(double par1, double par3, double par5, double par7, double par9, double par11, float par13, double par14) + private void renderPistonRodSN(float par1, float par3, float par5, float par7, float par9, float par11, float par13, float par14) { int var16 = 108; @@ -1079,10 +1079,10 @@ public class RenderBlocks int var17 = (var16 & 15) << 4; int var18 = var16 & 240; Tessellator var19 = tessellator; - double var20 = (float)((float)(var17 + 0) / 256.0F); - double var22 = (float)((float)(var18 + 0) / 256.0F); - double var24 = ((float)var17 + par14 - 0.01D) / 256.0D; - double var26 = ((float)((float)var18 + 4.0F) - 0.01D) / 256.0D; + float var20 = (float)((float)(var17 + 0) / 256.0F); + float var22 = (float)((float)(var18 + 0) / 256.0F); + float var24 = ((float)var17 + par14 - 0.01F) / 256.0F; + float var26 = ((float)((float)var18 + 4.0F) - 0.01F) / 256.0F; var19.setColorOpaque_F(par13, par13, par13); var19.addVertexWithUV(par1, par5, par11, var24, var22); var19.addVertexWithUV(par1, par5, par9, var20, var22); @@ -1093,7 +1093,7 @@ public class RenderBlocks /** * Render piston rod east/west */ - private void renderPistonRodEW(double par1, double par3, double par5, double par7, double par9, double par11, float par13, double par14) + private void renderPistonRodEW(float par1, float par3, float par5, float par7, float par9, float par11, float par13, float par14) { int var16 = 108; @@ -1105,10 +1105,10 @@ public class RenderBlocks int var17 = (var16 & 15) << 4; int var18 = var16 & 240; Tessellator var19 = tessellator; - double var20 = (float)((float)(var17 + 0) / 256.0F); - double var22 = (float)((float)(var18 + 0) / 256.0F); - double var24 = ((float)var17 + par14 - 0.01D) / 256.0D; - double var26 = ((float)((float)var18 + 4.0F) - 0.01D) / 256.0D; + float var20 = (float)((float)(var17 + 0) / 256.0F); + float var22 = (float)((float)(var18 + 0) / 256.0F); + float var24 = ((float)var17 + par14 - 0.01F) / 256.0F; + float var26 = ((float)((float)var18 + 4.0F) - 0.01F) / 256.0F; var19.setColorOpaque_F(par13, par13, par13); var19.addVertexWithUV(par3, par5, par9, var24, var22); var19.addVertexWithUV(par1, par5, par9, var20, var22); @@ -1136,7 +1136,7 @@ public class RenderBlocks int var7 = BlockPistonExtension.getDirectionMeta(var6); float var11 = par1Block.getBlockBrightness(this.blockAccess, par2, par3, par4); float var12 = par5 ? 1.0F : 0.5F; - double var13 = par5 ? 16.0D : 8.0D; + float var13 = par5 ? 16.0F : 8.0F; switch (var7) { @@ -1228,7 +1228,7 @@ public class RenderBlocks int var7 = BlockPistonExtension.getDirectionMeta(var6); float var11 = par1Block.getBlockBrightness(this.blockAccess, realX, realY, realZ); float var12 = par5 ? 1.0F : 0.5F; - double var13 = par5 ? 16.0D : 8.0D; + float var13 = par5 ? 16.0F : 8.0F; switch (var7) { @@ -1400,10 +1400,10 @@ public class RenderBlocks float var22 = 0.0625F; float var23 = 0.0625F; float var24 = 0.625F; - var21[0] = Vec3.getVec3Pool().getVecFromPool((float)(-var22), 0.0D, (float)(-var23)); - var21[1] = Vec3.getVec3Pool().getVecFromPool((float)var22, 0.0D, (float)(-var23)); - var21[2] = Vec3.getVec3Pool().getVecFromPool((float)var22, 0.0D, (float)var23); - var21[3] = Vec3.getVec3Pool().getVecFromPool((float)(-var22), 0.0D, (float)var23); + var21[0] = Vec3.getVec3Pool().getVecFromPool((float)(-var22), 0.0F, (float)(-var23)); + var21[1] = Vec3.getVec3Pool().getVecFromPool((float)var22, 0.0F, (float)(-var23)); + var21[2] = Vec3.getVec3Pool().getVecFromPool((float)var22, 0.0F, (float)var23); + var21[3] = Vec3.getVec3Pool().getVecFromPool((float)(-var22), 0.0F, (float)var23); var21[4] = Vec3.getVec3Pool().getVecFromPool((float)(-var22), (float)var24, (float)(-var23)); var21[5] = Vec3.getVec3Pool().getVecFromPool((float)var22, (float)var24, (float)(-var23)); var21[6] = Vec3.getVec3Pool().getVecFromPool((float)var22, (float)var24, (float)var23); @@ -1419,29 +1419,29 @@ public class RenderBlocks { if (var7) { - var21[var25].zCoord -= 0.0625D; - var21[var25].rotateAroundX(((float)Math.PI * 2F / 9F)); + var21[var25].zCoord -= 0.0625F; + var21[var25].rotateAroundX(((float)(float)Math.PI * 2F / 9F)); } else { - var21[var25].zCoord += 0.0625D; - var21[var25].rotateAroundX(-((float)Math.PI * 2F / 9F)); + var21[var25].zCoord += 0.0625F; + var21[var25].rotateAroundX(-((float)(float)Math.PI * 2F / 9F)); } if (var6 == 0 || var6 == 7) { - var21[var25].rotateAroundZ((float)Math.PI); + var21[var25].rotateAroundZ((float)(float)Math.PI); } if (var6 == 6 || var6 == 0) { - var21[var25].rotateAroundY(((float)Math.PI / 2F)); + var21[var25].rotateAroundY(((float)(float)Math.PI / 2F)); } if (var6 > 0 && var6 < 5) { - var21[var25].yCoord -= 0.375D; - var21[var25].rotateAroundX(((float)Math.PI / 2F)); + var21[var25].yCoord -= 0.375F; + var21[var25].rotateAroundX(((float)(float)Math.PI / 2F)); if (var6 == 4) { @@ -1450,34 +1450,34 @@ public class RenderBlocks if (var6 == 3) { - var21[var25].rotateAroundY((float)Math.PI); + var21[var25].rotateAroundY((float)(float)Math.PI); } if (var6 == 2) { - var21[var25].rotateAroundY(((float)Math.PI / 2F)); + var21[var25].rotateAroundY(((float)(float)Math.PI / 2F)); } if (var6 == 1) { - var21[var25].rotateAroundY(-((float)Math.PI / 2F)); + var21[var25].rotateAroundY(-((float)(float)Math.PI / 2F)); } - var21[var25].xCoord += par2.floatValue() + 0.5D; + var21[var25].xCoord += par2.floatValue() + 0.5F; var21[var25].yCoord += (float)((float)par3 + 0.5F); - var21[var25].zCoord += par4.floatValue() + 0.5D; + var21[var25].zCoord += par4.floatValue() + 0.5F; } else if (var6 != 0 && var6 != 7) { - var21[var25].xCoord += par2.floatValue() + 0.5D; + var21[var25].xCoord += par2.floatValue() + 0.5F; var21[var25].yCoord += (float)((float)par3 + 0.125F); - var21[var25].zCoord += par4.floatValue() + 0.5D; + var21[var25].zCoord += par4.floatValue() + 0.5F; } else { - var21[var25].xCoord += par2.floatValue() + 0.5D; + var21[var25].xCoord += par2.floatValue() + 0.5F; var21[var25].yCoord += (float)((float)par3 + 0.875F); - var21[var25].zCoord += par4.floatValue() + 0.5D; + var21[var25].zCoord += par4.floatValue() + 0.5F; } } @@ -1633,10 +1633,10 @@ public class RenderBlocks float var26 = 0.046875F; float var27 = 0.046875F; float var28 = 0.3125F; - var25[0] = Vec3.getVec3Pool().getVecFromPool((float)(-var26), 0.0D, (float)(-var27)); - var25[1] = Vec3.getVec3Pool().getVecFromPool((float)var26, 0.0D, (float)(-var27)); - var25[2] = Vec3.getVec3Pool().getVecFromPool((float)var26, 0.0D, (float)var27); - var25[3] = Vec3.getVec3Pool().getVecFromPool((float)(-var26), 0.0D, (float)var27); + var25[0] = Vec3.getVec3Pool().getVecFromPool((float)(-var26), 0.0F, (float)(-var27)); + var25[1] = Vec3.getVec3Pool().getVecFromPool((float)var26, 0.0F, (float)(-var27)); + var25[2] = Vec3.getVec3Pool().getVecFromPool((float)var26, 0.0F, (float)var27); + var25[3] = Vec3.getVec3Pool().getVecFromPool((float)(-var26), 0.0F, (float)var27); var25[4] = Vec3.getVec3Pool().getVecFromPool((float)(-var26), (float)var28, (float)(-var27)); var25[5] = Vec3.getVec3Pool().getVecFromPool((float)var26, (float)var28, (float)(-var27)); var25[6] = Vec3.getVec3Pool().getVecFromPool((float)var26, (float)var28, (float)var27); @@ -1644,25 +1644,25 @@ public class RenderBlocks for (int var29 = 0; var29 < 8; ++var29) { - var25[var29].zCoord += 0.0625D; + var25[var29].zCoord += 0.0625F; if (var9) { var25[var29].rotateAroundX(0.5235988F); - var25[var29].yCoord -= 0.4375D; + var25[var29].yCoord -= 0.4375F; } else if (var8) { var25[var29].rotateAroundX(0.08726647F); - var25[var29].yCoord -= 0.4375D; + var25[var29].yCoord -= 0.4375F; } else { - var25[var29].rotateAroundX(-((float)Math.PI * 2F / 9F)); - var25[var29].yCoord -= 0.375D; + var25[var29].rotateAroundX(-((float)(float)Math.PI * 2F / 9F)); + var25[var29].yCoord -= 0.375F; } - var25[var29].rotateAroundX(((float)Math.PI / 2F)); + var25[var29].rotateAroundX(((float)(float)Math.PI / 2F)); if (var7 == 2) { @@ -1671,22 +1671,22 @@ public class RenderBlocks if (var7 == 0) { - var25[var29].rotateAroundY((float)Math.PI); + var25[var29].rotateAroundY((float)(float)Math.PI); } if (var7 == 1) { - var25[var29].rotateAroundY(((float)Math.PI / 2F)); + var25[var29].rotateAroundY(((float)(float)Math.PI / 2F)); } if (var7 == 3) { - var25[var29].rotateAroundY(-((float)Math.PI / 2F)); + var25[var29].rotateAroundY(-((float)(float)Math.PI / 2F)); } - var25[var29].xCoord += par2.floatValue() + 0.5D; + var25[var29].xCoord += par2.floatValue() + 0.5F; var25[var29].yCoord += (float)((float)par3 + 0.3125F); - var25[var29].zCoord += par4.floatValue() + 0.5D; + var25[var29].zCoord += par4.floatValue() + 0.5F; } Vec3 var61 = null; @@ -1760,10 +1760,10 @@ public class RenderBlocks float var62 = 0.09375F; float var38 = 0.09375F; float var39 = 0.03125F; - var25[0] = Vec3.getVec3Pool().getVecFromPool((float)(-var62), 0.0D, (float)(-var38)); - var25[1] = Vec3.getVec3Pool().getVecFromPool((float)var62, 0.0D, (float)(-var38)); - var25[2] = Vec3.getVec3Pool().getVecFromPool((float)var62, 0.0D, (float)var38); - var25[3] = Vec3.getVec3Pool().getVecFromPool((float)(-var62), 0.0D, (float)var38); + var25[0] = Vec3.getVec3Pool().getVecFromPool((float)(-var62), 0.0F, (float)(-var38)); + var25[1] = Vec3.getVec3Pool().getVecFromPool((float)var62, 0.0F, (float)(-var38)); + var25[2] = Vec3.getVec3Pool().getVecFromPool((float)var62, 0.0F, (float)var38); + var25[3] = Vec3.getVec3Pool().getVecFromPool((float)(-var62), 0.0F, (float)var38); var25[4] = Vec3.getVec3Pool().getVecFromPool((float)(-var62), (float)var39, (float)(-var38)); var25[5] = Vec3.getVec3Pool().getVecFromPool((float)var62, (float)var39, (float)(-var38)); var25[6] = Vec3.getVec3Pool().getVecFromPool((float)var62, (float)var39, (float)var38); @@ -1771,18 +1771,18 @@ public class RenderBlocks for (int var40 = 0; var40 < 8; ++var40) { - var25[var40].zCoord += 0.21875D; + var25[var40].zCoord += 0.21875F; if (var9) { - var25[var40].yCoord -= 0.09375D; - var25[var40].zCoord -= 0.1625D; + var25[var40].yCoord -= 0.09375F; + var25[var40].zCoord -= 0.1625F; var25[var40].rotateAroundX(0.0F); } else if (var8) { - var25[var40].yCoord += 0.015625D; - var25[var40].zCoord -= 0.171875D; + var25[var40].yCoord += 0.015625F; + var25[var40].zCoord -= 0.171875F; var25[var40].rotateAroundX(0.17453294F); } else @@ -1797,22 +1797,22 @@ public class RenderBlocks if (var7 == 0) { - var25[var40].rotateAroundY((float)Math.PI); + var25[var40].rotateAroundY((float)(float)Math.PI); } if (var7 == 1) { - var25[var40].rotateAroundY(((float)Math.PI / 2F)); + var25[var40].rotateAroundY(((float)(float)Math.PI / 2F)); } if (var7 == 3) { - var25[var40].rotateAroundY(-((float)Math.PI / 2F)); + var25[var40].rotateAroundY(-((float)(float)Math.PI / 2F)); } - var25[var40].xCoord += par2.floatValue() + 0.5D; + var25[var40].xCoord += par2.floatValue() + 0.5F; var25[var40].yCoord += (float)((float)par3 + 0.3125F); - var25[var40].zCoord += par4.floatValue() + 0.5D; + var25[var40].zCoord += par4.floatValue() + 0.5F; } byte var63 = 5; @@ -1881,63 +1881,63 @@ public class RenderBlocks if (var8) { - double var64 = var25[0].yCoord; + float var64 = (float)var25[0].yCoord; float var46 = 0.03125F; float var47 = 0.5F - var46 / 2.0F; float var48 = var47 + var46; int var49 = (Block.tripWire.blockIndexInTexture & 15) << 4; int var50 = Block.tripWire.blockIndexInTexture & 240; - double var51 = (float)((float)var49 / 256.0F); - double var53 = (float)((float)(var49 + 16) / 256.0F); - double var55 = (float)((float)(var50 + (var8 ? 2 : 0)) / 256.0F); - double var57 = (float)((float)(var50 + (var8 ? 4 : 2)) / 256.0F); - double var59 = (float)(var10 ? 3.5F : 1.5F) / 16.0D; + float var51 = (float)((float)var49 / 256.0F); + float var53 = (float)((float)(var49 + 16) / 256.0F); + float var55 = (float)((float)(var50 + (var8 ? 2 : 0)) / 256.0F); + float var57 = (float)((float)(var50 + (var8 ? 4 : 2)) / 256.0F); + float var59 = (float)(var10 ? 3.5F : 1.5F) / 16.0F; var17 = par1Block.getBlockBrightness(this.blockAccess, ox, oy, oz) * 0.75F; var5.setColorOpaque_F(var17, var17, var17); if (var7 == 2) { - var5.addVertexWithUV((float)((float)par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.25D, var51, var55); - var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.25D, var51, var57); + var5.addVertexWithUV((float)((float)par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.25F, var51, var55); + var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.25F, var51, var57); var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue(), var53, var57); var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue(), var53, var55); - var5.addVertexWithUV((float)(par2.floatValue() + var47), var64, par4.floatValue() + 0.5D, var51, var55); - var5.addVertexWithUV((float)(par2.floatValue() + var48), var64, par4.floatValue() + 0.5D, var51, var57); - var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.25D, var53, var57); - var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.25D, var53, var55); + var5.addVertexWithUV((float)(par2.floatValue() + var47), var64, par4.floatValue() + 0.5F, var51, var55); + var5.addVertexWithUV((float)(par2.floatValue() + var48), var64, par4.floatValue() + 0.5F, var51, var57); + var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.25F, var53, var57); + var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.25F, var53, var55); } else if (var7 == 0) { - var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.75D, var51, var55); - var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.75D, var51, var57); - var5.addVertexWithUV((float)(par2.floatValue() + var48), var64, par4.floatValue() + 0.5D, var53, var57); - var5.addVertexWithUV((float)(par2.floatValue() + var47), var64, par4.floatValue() + 0.5D, var53, var55); + var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.75F, var51, var55); + var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.75F, var51, var57); + var5.addVertexWithUV((float)(par2.floatValue() + var48), var64, par4.floatValue() + 0.5F, var53, var57); + var5.addVertexWithUV((float)(par2.floatValue() + var47), var64, par4.floatValue() + 0.5F, var53, var55); var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.add(BigInteger.ONE).floatValue(), var51, var55); var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.add(BigInteger.ONE).floatValue(), var51, var57); - var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.75D, var53, var57); - var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.75D, var53, var55); + var5.addVertexWithUV((float)(par2.floatValue() + var48), (float)par3 + var59, par4.floatValue() + 0.75F, var53, var57); + var5.addVertexWithUV((float)(par2.floatValue() + var47), (float)par3 + var59, par4.floatValue() + 0.75F, var53, var55); } else if (var7 == 1) { var5.addVertexWithUV(par2.floatValue(), (float)par3 + var59, (float)(par4.floatValue() + var48), var51, var57); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var59, (float)(par4.floatValue() + var48), var53, var57); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var59, (float)(par4.floatValue() + var47), var53, var55); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var59, (float)(par4.floatValue() + var48), var53, var57); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var59, (float)(par4.floatValue() + var47), var53, var55); var5.addVertexWithUV(par2.floatValue(), (float)par3 + var59, (float)(par4.floatValue() + var47), var51, var55); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var59, (float)(par4.floatValue() + var48), var51, var57); - var5.addVertexWithUV(par2.floatValue() + 0.5D, var64, (float)(par4.floatValue() + var48), var53, var57); - var5.addVertexWithUV(par2.floatValue() + 0.5D, var64, (float)(par4.floatValue() + var47), var53, var55); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var59, (float)(par4.floatValue() + var47), var51, var55); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var59, (float)(par4.floatValue() + var48), var51, var57); + var5.addVertexWithUV(par2.floatValue() + 0.5F, var64, (float)(par4.floatValue() + var48), var53, var57); + var5.addVertexWithUV(par2.floatValue() + 0.5F, var64, (float)(par4.floatValue() + var47), var53, var55); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var59, (float)(par4.floatValue() + var47), var51, var55); } else { - var5.addVertexWithUV(par2.floatValue() + 0.5D, var64, (float)(par4.floatValue() + var48), var51, var57); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var59, (float)(par4.floatValue() + var48), var53, var57); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var59, (float)(par4.floatValue() + var47), var53, var55); - var5.addVertexWithUV(par2.floatValue() + 0.5D, var64, (float)(par4.floatValue() + var47), var51, var55); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var59, (float)(par4.floatValue() + var48), var51, var57); + var5.addVertexWithUV(par2.floatValue() + 0.5F, var64, (float)(par4.floatValue() + var48), var51, var57); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var59, (float)(par4.floatValue() + var48), var53, var57); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var59, (float)(par4.floatValue() + var47), var53, var55); + var5.addVertexWithUV(par2.floatValue() + 0.5F, var64, (float)(par4.floatValue() + var47), var51, var55); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var59, (float)(par4.floatValue() + var48), var51, var57); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)par3 + var59, (float)(par4.floatValue() + var48), var53, var57); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)par3 + var59, (float)(par4.floatValue() + var47), var53, var55); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var59, (float)(par4.floatValue() + var47), var51, var55); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var59, (float)(par4.floatValue() + var47), var51, var55); } } @@ -1962,11 +1962,11 @@ public class RenderBlocks var5.setColorOpaque_F(var10, var10, var10); int var11 = (var6 & 15) << 4; int var12 = var6 & 240; - double var13 = (float)((float)var11 / 256.0F); - double var15 = (float)((float)(var11 + 16) / 256.0F); - double var17 = (float)((float)(var12 + (var8 ? 2 : 0)) / 256.0F); - double var19 = (float)((float)(var12 + (var8 ? 4 : 2)) / 256.0F); - double var21 = (float)(var9 ? 3.5F : 1.5F) / 16.0D; + float var13 = (float)((float)var11 / 256.0F); + float var15 = (float)((float)(var11 + 16) / 256.0F); + float var17 = (float)((float)(var12 + (var8 ? 2 : 0)) / 256.0F); + float var19 = (float)((float)(var12 + (var8 ? 4 : 2)) / 256.0F); + float var21 = (float)(var9 ? 3.5F : 1.5F) / 16.0F; boolean var23 = BlockTripWire.func_72148_a(this.blockAccess, par2, par3, par4, var7, 1); boolean var24 = BlockTripWire.func_72148_a(this.blockAccess, par2, par3, par4, var7, 3); boolean var25 = BlockTripWire.func_72148_a(this.blockAccess, par2, par3, par4, var7, 2); @@ -1989,48 +1989,48 @@ public class RenderBlocks if (var25) { - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25D, var13, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25D, var13, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25F, var13, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25F, var13, var19); var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue(), var15, var19); var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue(), var15, var17); var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue(), var15, var17); var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue(), var15, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25D, var13, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25D, var13, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25F, var13, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25F, var13, var17); } if (var25 || var26 && !var24 && !var23) { - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5D, var13, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5D, var13, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25D, var15, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25D, var15, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25D, var15, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25D, var15, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5D, var13, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5D, var13, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5F, var13, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5F, var13, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25F, var15, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25F, var15, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.25F, var15, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.25F, var15, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5F, var13, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5F, var13, var17); } if (var26 || var25 && !var24 && !var23) { - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75D, var13, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75D, var13, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5D, var15, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5D, var15, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5D, var15, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5D, var15, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75D, var13, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75D, var13, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75F, var13, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75F, var13, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5F, var15, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5F, var15, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.5F, var15, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.5F, var15, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75F, var13, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75F, var13, var17); } if (var26) { var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.add(BigInteger.ONE).floatValue(), var13, var17); var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.add(BigInteger.ONE).floatValue(), var13, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75D, var15, var19); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75D, var15, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75D, var15, var17); - var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75D, var15, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75F, var15, var19); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75F, var15, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.floatValue() + 0.75F, var15, var17); + var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.floatValue() + 0.75F, var15, var19); var5.addVertexWithUV((float)(par2.floatValue() + var29), (float)par3 + var21, par4.add(BigInteger.ONE).floatValue(), var13, var19); var5.addVertexWithUV((float)(par2.floatValue() + var28), (float)par3 + var21, par4.add(BigInteger.ONE).floatValue(), var13, var17); } @@ -2038,49 +2038,49 @@ public class RenderBlocks if (var23) { var5.addVertexWithUV(par2.floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); var5.addVertexWithUV(par2.floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); var5.addVertexWithUV(par2.floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); var5.addVertexWithUV(par2.floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); } if (var23 || var24 && !var25 && !var26) { - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.25D, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.25F, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); } if (var24 || var23 && !var25 && !var26) { - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.5D, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.5F, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); } if (var24) { - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var28), var13, var17); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var28), var15, var17); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)par3 + var21, (float)(par4.floatValue() + var29), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.75D, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); + var5.addVertexWithUV(par2.floatValue() + 0.75F, (float)par3 + var21, (float)(par4.floatValue() + var29), var13, var19); } return true; @@ -2106,18 +2106,18 @@ public class RenderBlocks var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4)); int var7 = (var6 & 15) << 4; int var8 = var6 & 240; - double var9 = (float)((float)var7 / 256.0F); - double var11 = (float)(((float)var7 + 15.99F) / 256.0F); - double var13 = (float)((float)var8 / 256.0F); - double var15 = (float)(((float)var8 + 15.99F) / 256.0F); + float var9 = (float)((float)var7 / 256.0F); + float var11 = (float)(((float)var7 + 15.99F) / 256.0F); + float var13 = (float)((float)var8 / 256.0F); + float var15 = (float)(((float)var8 + 15.99F) / 256.0F); float var17 = 1.4F; - double var20; - double var22; - double var24; - double var26; - double var28; - double var30; - double var32; + float var20; + float var22; + float var24; + float var26; + float var28; + float var30; + float var32; if (!this.blockAccess.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && !Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 - 1, par4)) { @@ -2191,14 +2191,14 @@ public class RenderBlocks if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 + 1, par4)) { - var20 = par2.floatValue() + 0.5D + 0.5D; - var22 = par2.floatValue() + 0.5D - 0.5D; - var24 = par4.floatValue() + 0.5D + 0.5D; - var26 = par4.floatValue() + 0.5D - 0.5D; - var28 = par2.floatValue() + 0.5D - 0.5D; - var30 = par2.floatValue() + 0.5D + 0.5D; - var32 = par4.floatValue() + 0.5D - 0.5D; - double var34 = par4.floatValue() + 0.5D + 0.5D; + var20 = par2.floatValue() + 0.5F + 0.5F; + var22 = par2.floatValue() + 0.5F - 0.5F; + var24 = par4.floatValue() + 0.5F + 0.5F; + var26 = par4.floatValue() + 0.5F - 0.5F; + var28 = par2.floatValue() + 0.5F - 0.5F; + var30 = par2.floatValue() + 0.5F + 0.5F; + var32 = par4.floatValue() + 0.5F - 0.5F; + float var34 = par4.floatValue() + 0.5F + 0.5F; var9 = (float)((float)var7 / 256.0F); var11 = (float)(((float)var7 + 15.99F) / 256.0F); var13 = (float)((float)var8 / 256.0F); @@ -2241,14 +2241,14 @@ public class RenderBlocks } else { - double var18 = par2.floatValue() + 0.5D + 0.2D; - var20 = par2.floatValue() + 0.5D - 0.2D; - var22 = par4.floatValue() + 0.5D + 0.2D; - var24 = par4.floatValue() + 0.5D - 0.2D; - var26 = par2.floatValue() + 0.5D - 0.3D; - var28 = par2.floatValue() + 0.5D + 0.3D; - var30 = par4.floatValue() + 0.5D - 0.3D; - var32 = par4.floatValue() + 0.5D + 0.3D; + float var18 = par2.floatValue() + 0.5F + 0.2F; + var20 = par2.floatValue() + 0.5F - 0.2F; + var22 = par4.floatValue() + 0.5F + 0.2F; + var24 = par4.floatValue() + 0.5F - 0.2F; + var26 = par2.floatValue() + 0.5F - 0.3F; + var28 = par2.floatValue() + 0.5F + 0.3F; + var30 = par4.floatValue() + 0.5F - 0.3F; + var32 = par4.floatValue() + 0.5F + 0.3F; var5.addVertexWithUV(var26, (float)((float)par3 + var17), par4.add(BigInteger.ONE).floatValue(), var11, var13); var5.addVertexWithUV(var18, par3, par4.add(BigInteger.ONE).floatValue(), var11, var15); var5.addVertexWithUV(var18, par3, par4.floatValue(), var9, var15); @@ -2269,14 +2269,14 @@ public class RenderBlocks var5.addVertexWithUV(par2.floatValue(), par3, var22, var11, var15); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, var22, var9, var15); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)par3 + var17), var30, var9, var13); - var18 = par2.floatValue() + 0.5D - 0.5D; - var20 = par2.floatValue() + 0.5D + 0.5D; - var22 = par4.floatValue() + 0.5D - 0.5D; - var24 = par4.floatValue() + 0.5D + 0.5D; - var26 = par2.floatValue() + 0.5D - 0.4D; - var28 = par2.floatValue() + 0.5D + 0.4D; - var30 = par4.floatValue() + 0.5D - 0.4D; - var32 = par4.floatValue() + 0.5D + 0.4D; + var18 = par2.floatValue() + 0.5F - 0.5F; + var20 = par2.floatValue() + 0.5F + 0.5F; + var22 = par4.floatValue() + 0.5F - 0.5F; + var24 = par4.floatValue() + 0.5F + 0.5F; + var26 = par2.floatValue() + 0.5F - 0.4F; + var28 = par2.floatValue() + 0.5F + 0.4F; + var30 = par4.floatValue() + 0.5F - 0.4F; + var32 = par4.floatValue() + 0.5F + 0.4F; var5.addVertexWithUV(var26, (float)((float)par3 + var17), par4.floatValue(), var9, var13); var5.addVertexWithUV(var18, par3, par4.floatValue(), var9, var15); var5.addVertexWithUV(var18, par3, par4.add(BigInteger.ONE).floatValue(), var11, var15); @@ -2316,18 +2316,18 @@ public class RenderBlocks var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, realX, realY, realZ)); int var7 = (var6 & 15) << 4; int var8 = var6 & 240; - double var9 = (float)((float)var7 / 256.0F); - double var11 = (float)(((float)var7 + 15.99F) / 256.0F); - double var13 = (float)((float)var8 / 256.0F); - double var15 = (float)(((float)var8 + 15.99F) / 256.0F); + float var9 = (float)((float)var7 / 256.0F); + float var11 = (float)(((float)var7 + 15.99F) / 256.0F); + float var13 = (float)((float)var8 / 256.0F); + float var15 = (float)(((float)var8 + 15.99F) / 256.0F); float var17 = 1.4F; - double var20; - double var22; - double var24; - double var26; - double var28; - double var30; - double var32; + float var20; + float var22; + float var24; + float var26; + float var28; + float var30; + float var32; if (!this.blockAccess.doesBlockHaveSolidTopSurface(realX, realY - 1, realZ) && !Block.fire.canBlockCatchFire(this.blockAccess, realX, realY - 1, realZ)) { @@ -2401,14 +2401,14 @@ public class RenderBlocks if (Block.fire.canBlockCatchFire(this.blockAccess, realX, realY + 1, realZ)) { - var20 = par2.floatValue() + 0.5D + 0.5D; - var22 = par2.floatValue() + 0.5D - 0.5D; - var24 = par4.floatValue() + 0.5D + 0.5D; - var26 = par4.floatValue() + 0.5D - 0.5D; - var28 = par2.floatValue() + 0.5D - 0.5D; - var30 = par2.floatValue() + 0.5D + 0.5D; - var32 = par4.floatValue() + 0.5D - 0.5D; - double var34 = par4.floatValue() + 0.5D + 0.5D; + var20 = par2.floatValue() + 0.5F + 0.5F; + var22 = par2.floatValue() + 0.5F - 0.5F; + var24 = par4.floatValue() + 0.5F + 0.5F; + var26 = par4.floatValue() + 0.5F - 0.5F; + var28 = par2.floatValue() + 0.5F - 0.5F; + var30 = par2.floatValue() + 0.5F + 0.5F; + var32 = par4.floatValue() + 0.5F - 0.5F; + float var34 = par4.floatValue() + 0.5F + 0.5F; var9 = (float)((float)var7 / 256.0F); var11 = (float)(((float)var7 + 15.99F) / 256.0F); var13 = (float)((float)var8 / 256.0F); @@ -2451,14 +2451,14 @@ public class RenderBlocks } else { - double var18 = par2.floatValue() + 0.5D + 0.2D; - var20 = par2.floatValue() + 0.5D - 0.2D; - var22 = par4.floatValue() + 0.5D + 0.2D; - var24 = par4.floatValue() + 0.5D - 0.2D; - var26 = par2.floatValue() + 0.5D - 0.3D; - var28 = par2.floatValue() + 0.5D + 0.3D; - var30 = par4.floatValue() + 0.5D - 0.3D; - var32 = par4.floatValue() + 0.5D + 0.3D; + float var18 = par2.floatValue() + 0.5F + 0.2F; + var20 = par2.floatValue() + 0.5F - 0.2F; + var22 = par4.floatValue() + 0.5F + 0.2F; + var24 = par4.floatValue() + 0.5F - 0.2F; + var26 = par2.floatValue() + 0.5F - 0.3F; + var28 = par2.floatValue() + 0.5F + 0.3F; + var30 = par4.floatValue() + 0.5F - 0.3F; + var32 = par4.floatValue() + 0.5F + 0.3F; var5.addVertexWithUV(var26, (float)((float)par3 + var17), par4.add(BigInteger.ONE).floatValue(), var11, var13); var5.addVertexWithUV(var18, par3, par4.add(BigInteger.ONE).floatValue(), var11, var15); var5.addVertexWithUV(var18, par3, par4.floatValue(), var9, var15); @@ -2479,14 +2479,14 @@ public class RenderBlocks var5.addVertexWithUV(par2.floatValue(), par3, var22, var11, var15); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, var22, var9, var15); var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)par3 + var17), var30, var9, var13); - var18 = par2.floatValue() + 0.5D - 0.5D; - var20 = par2.floatValue() + 0.5D + 0.5D; - var22 = par4.floatValue() + 0.5D - 0.5D; - var24 = par4.floatValue() + 0.5D + 0.5D; - var26 = par2.floatValue() + 0.5D - 0.4D; - var28 = par2.floatValue() + 0.5D + 0.4D; - var30 = par4.floatValue() + 0.5D - 0.4D; - var32 = par4.floatValue() + 0.5D + 0.4D; + var18 = par2.floatValue() + 0.5F - 0.5F; + var20 = par2.floatValue() + 0.5F + 0.5F; + var22 = par4.floatValue() + 0.5F - 0.5F; + var24 = par4.floatValue() + 0.5F + 0.5F; + var26 = par2.floatValue() + 0.5F - 0.4F; + var28 = par2.floatValue() + 0.5F + 0.4F; + var30 = par4.floatValue() + 0.5F - 0.4F; + var32 = par4.floatValue() + 0.5F + 0.4F; var5.addVertexWithUV(var26, (float)((float)par3 + var17), par4.floatValue(), var9, var13); var5.addVertexWithUV(var18, par3, par4.floatValue(), var9, var15); var5.addVertexWithUV(var18, par3, par4.add(BigInteger.ONE).floatValue(), var11, var15); @@ -2554,10 +2554,10 @@ public class RenderBlocks var5.setColorOpaque_F(var10, var11, var12); int var13 = (var7 & 15) << 4; int var14 = var7 & 240; - double var15 = (float)((float)var13 / 256.0F); - double var17 = (float)(((float)var13 + 15.99F) / 256.0F); - double var19 = (float)((float)var14 / 256.0F); - double var21 = (float)(((float)var14 + 15.99F) / 256.0F); + float var15 = (float)((float)var13 / 256.0F); + float var17 = (float)(((float)var13 + 15.99F) / 256.0F); + float var19 = (float)((float)var14 / 256.0F); + float var21 = (float)(((float)var14 + 15.99F) / 256.0F); boolean var29 = BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4, 1) || !this.blockAccess.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) && BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, par2.subtract(BigInteger.ONE), par3 - 1, par4, -1); boolean var30 = BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, par2.add(BigInteger.ONE), par3, par4, 3) || !this.blockAccess.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) && BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, par2.add(BigInteger.ONE), par3 - 1, par4, -1); boolean var31 = BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE), 2) || !this.blockAccess.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) && BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, par2, par3 - 1, par4.subtract(BigInteger.ONE), -1); @@ -2619,7 +2619,7 @@ public class RenderBlocks if (!var29) { - var15 += 0.01953125D; + var15 += 0.01953125F; } if (!var30) @@ -2629,7 +2629,7 @@ public class RenderBlocks if (!var30) { - var17 -= 0.01953125D; + var17 -= 0.01953125F; } if (!var31) @@ -2639,7 +2639,7 @@ public class RenderBlocks if (!var31) { - var19 += 0.01953125D; + var19 += 0.01953125F; } if (!var32) @@ -2649,42 +2649,42 @@ public class RenderBlocks if (!var32) { - var21 -= 0.01953125D; + var21 -= 0.01953125F; } - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21 + 0.0625D); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21 + 0.0625D); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21 + 0.0625F); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21 + 0.0625F); } else if (var38 == 1) { - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21 + 0.0625D); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21 + 0.0625D); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21 + 0.0625F); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21 + 0.0625F); } else if (var38 == 2) { - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var15, var21); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var17, var19); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var15, var21); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var17, var19); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21 + 0.0625D); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var15, var21 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var17, var19 + 0.0625D); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21 + 0.0625F); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var15, var21 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var17, var19 + 0.0625F); } if (!this.blockAccess.isBlockNormalCube(par2, par3 + 1, par4)) @@ -2697,57 +2697,57 @@ public class RenderBlocks if (this.blockAccess.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) && this.blockAccess.getBlockId(par2.subtract(BigInteger.ONE), par3 + 1, par4) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.floatValue(), var15, var21); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.floatValue(), var15, var21); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.floatValue(), var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21 + 0.0625D); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.floatValue(), var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21 + 0.0625F); } if (this.blockAccess.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) && this.blockAccess.getBlockId(par2.add(BigInteger.ONE), par3 + 1, par4) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.floatValue(), var15, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.floatValue(), var15, var19); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.floatValue(), var15, var19 + 0.0625D); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.floatValue(), var15, var19 + 0.0625F); } if (this.blockAccess.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) && this.blockAccess.getBlockId(par2, par3 + 1, par4.subtract(BigInteger.ONE)) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625D, var15, var21); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var21); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var19); - var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625D, var15, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625F, var15, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var21); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var19); + var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625F, var15, var19); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625D, var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var21 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625D, var15, var19 + 0.0625D); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625F, var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var21 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625F, var15, var19 + 0.0625F); } if (this.blockAccess.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)) && this.blockAccess.getBlockId(par2, par3 + 1, par4.add(BigInteger.ONE)) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var19); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var19); - var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var21); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var19); + var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var21); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var21 + 0.0625D); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var21 + 0.0625F); } } @@ -2791,10 +2791,10 @@ public class RenderBlocks var5.setColorOpaque_F(var10, var11, var12); int var13 = (var7 & 15) << 4; int var14 = var7 & 240; - double var15 = (float)((float)var13 / 256.0F); - double var17 = (float)(((float)var13 + 15.99F) / 256.0F); - double var19 = (float)((float)var14 / 256.0F); - double var21 = (float)(((float)var14 + 15.99F) / 256.0F); + float var15 = (float)((float)var13 / 256.0F); + float var17 = (float)(((float)var13 + 15.99F) / 256.0F); + float var19 = (float)((float)var14 / 256.0F); + float var21 = (float)(((float)var14 + 15.99F) / 256.0F); boolean var29 = BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, realX.subtract(BigInteger.ONE), realY, realZ, 1) || !this.blockAccess.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) && BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, realX.subtract(BigInteger.ONE), realY - 1, realZ, -1); boolean var30 = BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, realX.add(BigInteger.ONE), realY, realZ, 3) || !this.blockAccess.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) && BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, realX.add(BigInteger.ONE), realY - 1, realZ, -1); boolean var31 = BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, realX, realY, par4.subtract(BigInteger.ONE), 2) || !this.blockAccess.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) && BlockRedstoneWire.isPowerProviderOrWire(this.blockAccess, realX, realY - 1, realZ.subtract(BigInteger.ONE), -1); @@ -2856,7 +2856,7 @@ public class RenderBlocks if (!var29) { - var15 += 0.01953125D; + var15 += 0.01953125F; } if (!var30) @@ -2866,7 +2866,7 @@ public class RenderBlocks if (!var30) { - var17 -= 0.01953125D; + var17 -= 0.01953125F; } if (!var31) @@ -2876,7 +2876,7 @@ public class RenderBlocks if (!var31) { - var19 += 0.01953125D; + var19 += 0.01953125F; } if (!var32) @@ -2886,42 +2886,42 @@ public class RenderBlocks if (!var32) { - var21 -= 0.01953125D; + var21 -= 0.01953125F; } - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21 + 0.0625D); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21 + 0.0625D); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21 + 0.0625F); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21 + 0.0625F); } else if (var38 == 1) { - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21 + 0.0625D); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var17, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var15, var21 + 0.0625D); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21 + 0.0625F); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var17, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var15, var21 + 0.0625F); } else if (var38 == 2) { - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var15, var21); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var17, var19); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var15, var21); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var17, var19); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var37, var17, var21 + 0.0625D); - var5.addVertexWithUV((float)var35, (float)par3 + 0.015625D, (float)var36, var15, var21 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var36, var15, var19 + 0.0625D); - var5.addVertexWithUV((float)var34, (float)par3 + 0.015625D, (float)var37, var17, var19 + 0.0625D); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var37, var17, var21 + 0.0625F); + var5.addVertexWithUV((float)var35, (float)par3 + 0.015625F, (float)var36, var15, var21 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var36, var15, var19 + 0.0625F); + var5.addVertexWithUV((float)var34, (float)par3 + 0.015625F, (float)var37, var17, var19 + 0.0625F); } if (!this.blockAccess.isBlockNormalCube(realX, realY + 1, realZ)) @@ -2934,57 +2934,57 @@ public class RenderBlocks if (this.blockAccess.isBlockNormalCube(realX.subtract(BigInteger.ONE), realY, realZ) && this.blockAccess.getBlockId(realX.subtract(BigInteger.ONE), realY + 1, realZ) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.floatValue(), var15, var21); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.floatValue(), var15, var21); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, par3, par4.floatValue(), var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.floatValue() + 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21 + 0.0625D); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, par3, par4.floatValue(), var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.floatValue() + 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var21 + 0.0625F); } if (this.blockAccess.isBlockNormalCube(realX.add(BigInteger.ONE), realY, realZ) && this.blockAccess.getBlockId(realX.add(BigInteger.ONE), realY + 1, realZ) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.floatValue(), var15, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.floatValue(), var15, var19); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625D, par3, par4.floatValue(), var15, var19 + 0.0625D); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.add(BigInteger.ONE).floatValue(), var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue(), var17, var21 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, (float)((float)(par3 + 1) + 0.021875F), par4.floatValue(), var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue() - 0.015625F, par3, par4.floatValue(), var15, var19 + 0.0625F); } if (this.blockAccess.isBlockNormalCube(realX, realY, realZ.subtract(BigInteger.ONE)) && this.blockAccess.getBlockId(realX, realY + 1, realZ.subtract(BigInteger.ONE)) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625D, var15, var21); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var21); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var19); - var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625D, var15, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625F, var15, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var21); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var19); + var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625F, var15, var19); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625D, var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var21 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625D, var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625D, var15, var19 + 0.0625D); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.floatValue() + 0.015625F, var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var21 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.floatValue() + 0.015625F, var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), par3, par4.floatValue() + 0.015625F, var15, var19 + 0.0625F); } if (this.blockAccess.isBlockNormalCube(realX, realY, realZ.add(BigInteger.ONE)) && this.blockAccess.getBlockId(realX, realY + 1, realZ.add(BigInteger.ONE)) == Block.redstoneWire.blockID) { var5.setColorOpaque_F(var8 * var10, var8 * var11, var8 * var12); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var19); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var19); - var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var21); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var21); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var19); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var19); + var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var21); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var21); var5.setColorOpaque_F(var8, var8, var8); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var19 + 0.0625D); - var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var19 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625D, var15, var21 + 0.0625D); - var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625D, var17, var21 + 0.0625D); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var19 + 0.0625F); + var5.addVertexWithUV(par2.add(BigInteger.ONE).floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var19 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), par3, par4.add(BigInteger.ONE).floatValue() - 0.015625F, var15, var21 + 0.0625F); + var5.addVertexWithUV(par2.floatValue(), (float)((float)(par3 + 1) + 0.021875F), par4.add(BigInteger.ONE).floatValue() - 0.015625F, var17, var21 + 0.0625F); } } return true; @@ -3020,23 +3020,23 @@ public class RenderBlocks int var8 = (var7 & 15) << 4; int var9 = var7 & 240; - double var10 = (float)((float)var8 / 256.0F); - double var12 = (float)(((float)var8 + 15.99F) / 256.0F); - double var14 = (float)((float)var9 / 256.0F); - double var16 = (float)(((float)var9 + 15.99F) / 256.0F); - double var18 = 0.0625D; - double var20 = par2.add(BigInteger.ONE).floatValue(); - double var22 = par2.add(BigInteger.ONE).floatValue(); - double var24 = par2.floatValue(); - double var26 = par2.floatValue(); - double var28 = par4.floatValue(); - double var30 = par4.add(BigInteger.ONE).floatValue(); - double var32 = par4.add(BigInteger.ONE).floatValue(); - double var34 = par4.floatValue(); - double var36 = (float)par3 + var18; - double var38 = (float)par3 + var18; - double var40 = (float)par3 + var18; - double var42 = (float)par3 + var18; + float var10 = (float)((float)var8 / 256.0F); + float var12 = (float)(((float)var8 + 15.99F) / 256.0F); + float var14 = (float)((float)var9 / 256.0F); + float var16 = (float)(((float)var9 + 15.99F) / 256.0F); + float var18 = 0.0625F; + float var20 = par2.add(BigInteger.ONE).floatValue(); + float var22 = par2.add(BigInteger.ONE).floatValue(); + float var24 = par2.floatValue(); + float var26 = par2.floatValue(); + float var28 = par4.floatValue(); + float var30 = par4.add(BigInteger.ONE).floatValue(); + float var32 = par4.add(BigInteger.ONE).floatValue(); + float var34 = par4.floatValue(); + float var36 = (float)par3 + var18; + float var38 = (float)par3 + var18; + float var40 = (float)par3 + var18; + float var42 = (float)par3 + var18; if (var6 != 1 && var6 != 2 && var6 != 3 && var6 != 7) { @@ -3107,13 +3107,13 @@ public class RenderBlocks var5.setColorOpaque_F(var7, var7, var7); int var22 = (var6 & 15) << 4; int var8 = var6 & 240; - double var9 = (float)((float)var22 / 256.0F); - double var11 = (float)(((float)var22 + 15.99F) / 256.0F); - double var13 = (float)((float)var8 / 256.0F); - double var15 = (float)(((float)var8 + 15.99F) / 256.0F); + float var9 = (float)((float)var22 / 256.0F); + float var11 = (float)(((float)var22 + 15.99F) / 256.0F); + float var13 = (float)((float)var8 / 256.0F); + float var15 = (float)(((float)var8 + 15.99F) / 256.0F); int var17 = this.blockAccess.getBlockMetadata(par2, par3, par4); - double var18 = 0.0D; - double var20 = 0.05000000074505806D; + float var18 = 0.0F; + float var20 = 0.05000000074505806F; if(FIX_RENDERER) { par2 = BigInteger.valueOf(par2.intValue() & 0xF); @@ -3178,11 +3178,11 @@ public class RenderBlocks var5.setColorOpaque_F(var7 * var9, var7 * var10, var7 * var11); var8 = (var6 & 15) << 4; int var21 = var6 & 240; - double var22 = (float)((float)var8 / 256.0F); - double var12 = (float)(((float)var8 + 15.99F) / 256.0F); - double var14 = (float)((float)var21 / 256.0F); - double var16 = (float)(((float)var21 + 15.99F) / 256.0F); - double var18 = 0.05000000074505806D; + float var22 = (float)((float)var8 / 256.0F); + float var12 = (float)(((float)var8 + 15.99F) / 256.0F); + float var14 = (float)((float)var21 / 256.0F); + float var16 = (float)(((float)var21 + 15.99F) / 256.0F); + float var18 = 0.05000000074505806F; int var20 = this.blockAccess.getBlockMetadata(par2, par3, par4); BigInteger originalX = par2, originalZ = par4; int originalY = par3; @@ -3294,19 +3294,19 @@ public class RenderBlocks var68 = (var65 & 15) << 4; int var15 = var65 & 240; - double var16 = (float)((float)var68 / 256.0F); - double var18 = (float)(((float)var68 + 7.99F) / 256.0F); - double var20 = (float)(((float)var68 + 15.99F) / 256.0F); - double var22 = (float)((float)var15 / 256.0F); - double var24 = (float)(((float)var15 + 15.99F) / 256.0F); + float var16 = (float)((float)var68 / 256.0F); + float var18 = (float)(((float)var68 + 7.99F) / 256.0F); + float var20 = (float)(((float)var68 + 15.99F) / 256.0F); + float var22 = (float)((float)var15 / 256.0F); + float var24 = (float)(((float)var15 + 15.99F) / 256.0F); int var26 = (var67 & 15) << 4; int var27 = var67 & 240; - double var28 = (float)((float)(var26 + 7) / 256.0F); - double var30 = (float)(((float)var26 + 8.99F) / 256.0F); - double var32 = (float)((float)var27 / 256.0F); - double var34 = (float)((float)(var27 + 8) / 256.0F); - double var36 = (float)(((float)var27 + 15.99F) / 256.0F); - double x, y, z; + float var28 = (float)((float)(var26 + 7) / 256.0F); + float var30 = (float)(((float)var26 + 8.99F) / 256.0F); + float var32 = (float)((float)var27 / 256.0F); + float var34 = (float)((float)(var27 + 8) / 256.0F); + float var36 = (float)(((float)var27 + 15.99F) / 256.0F); + float x, y, z; if(FIX_RENDERER) { x = par2.intValue() & 0xF; y = par3 & 0xF; @@ -3316,16 +3316,16 @@ public class RenderBlocks y = par3; z = par4.floatValue(); } - double var38 = x; - double var40 = x + 0.5D; - double var42 = x + 1D; - double var44 = z; - double var46 = z + 0.5D; - double var48 = z + 1D; - double var50 = x + 0.5D - 0.0625D; - double var52 = x + 0.5D + 0.0625D; - double var54 = z + 0.5D - 0.0625D; - double var56 = z + 0.5D + 0.0625D; + float var38 = x; + float var40 = x + 0.5F; + float var42 = x + 1F; + float var44 = z; + float var46 = z + 0.5F; + float var48 = z + 1F; + float var50 = x + 0.5F - 0.0625F; + float var52 = x + 0.5F + 0.0625F; + float var54 = z + 0.5F - 0.0625F; + float var56 = z + 0.5F + 0.0625F; boolean var58 = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2, par3, par4.subtract(BigInteger.ONE))); boolean var59 = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2, par3, par4.add(BigInteger.ONE))); boolean var60 = par1BlockPane.canThisPaneConnectToThisBlockID(this.blockAccess.getBlockId(par2.subtract(BigInteger.ONE), par3, par4)); @@ -3360,26 +3360,26 @@ public class RenderBlocks if (var62 || par3 < var5 - 1 && this.blockAccess.isAirBlock(par2.subtract(BigInteger.ONE), par3 + 1, par4)) { - var6.addVertexWithUV(var38, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var36); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var36); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var56, var30, var36); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var54, var28, var36); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var34); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var36); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var36); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var56, var30, var36); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var54, var28, var36); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var34); } if (var63 || par3 > 1 && this.blockAccess.isAirBlock(par2.subtract(BigInteger.ONE), par3 - 1, par4)) { - var6.addVertexWithUV(var38, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var36); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var36); - var6.addVertexWithUV(var38, (float)y - 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var38, (float)y - 0.01D, var56, var30, var36); - var6.addVertexWithUV(var38, (float)y - 0.01D, var54, var28, var36); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var34); + var6.addVertexWithUV(var38, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var36); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var36); + var6.addVertexWithUV(var38, (float)y - 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var38, (float)y - 0.01F, var56, var30, var36); + var6.addVertexWithUV(var38, (float)y - 0.01F, var54, var28, var36); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var34); } } else if (!var60 && var61) @@ -3407,26 +3407,26 @@ public class RenderBlocks if (var62 || par3 < var5 - 1 && this.blockAccess.isAirBlock(par2.add(BigInteger.ONE), par3 + 1, par4)) { - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var32); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var32); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var56, var30, var32); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var34); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var54, var28, var32); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var32); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var32); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var56, var30, var32); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var34); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var54, var28, var32); } if (var63 || par3 > 1 && this.blockAccess.isAirBlock(par2.add(BigInteger.ONE), par3 - 1, par4)) { - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var32); - var6.addVertexWithUV(var42, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var42, (float)y - 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var32); - var6.addVertexWithUV(var42, (float)y - 0.01D, var56, var30, var32); - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var34); - var6.addVertexWithUV(var42, (float)y - 0.01D, var54, var28, var32); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var32); + var6.addVertexWithUV(var42, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var42, (float)y - 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var32); + var6.addVertexWithUV(var42, (float)y - 0.01F, var56, var30, var32); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var34); + var6.addVertexWithUV(var42, (float)y - 0.01F, var54, var28, var32); } } } @@ -3443,77 +3443,77 @@ public class RenderBlocks if (var62) { - var6.addVertexWithUV(var38, y + 1 + 0.01D, var56, var30, var36); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var56, var30, var32); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var54, var28, var32); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var54, var28, var36); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var56, var30, var36); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var56, var30, var32); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var54, var28, var32); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var54, var28, var36); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var56, var30, var36); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var56, var30, var32); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var54, var28, var32); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var54, var28, var36); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var56, var30, var36); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var56, var30, var32); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var54, var28, var32); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var54, var28, var36); } else { if (par3 < var5 - 1 && this.blockAccess.isAirBlock(par2.subtract(BigInteger.ONE), par3 + 1, par4)) { - var6.addVertexWithUV(var38, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var36); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var36); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var56, var30, var36); - var6.addVertexWithUV(var38, y + 1 + 0.01D, var54, var28, var36); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var34); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var36); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var36); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var56, var30, var36); + var6.addVertexWithUV(var38, y + 1 + 0.01F, var54, var28, var36); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var34); } if (par3 < var5 - 1 && this.blockAccess.isAirBlock(par2.add(BigInteger.ONE), par3 + 1, par4)) { - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var32); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var32); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var56, var30, var32); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, y + 1 + 0.01D, var54, var28, var34); - var6.addVertexWithUV(var42, y + 1 + 0.01D, var54, var28, var32); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var32); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var32); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var56, var30, var32); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, y + 1 + 0.01F, var54, var28, var34); + var6.addVertexWithUV(var42, y + 1 + 0.01F, var54, var28, var32); } } if (var63) { - var6.addVertexWithUV(var38, (float)y - 0.01D, var56, var30, var36); - var6.addVertexWithUV(var42, (float)y - 0.01D, var56, var30, var32); - var6.addVertexWithUV(var42, (float)y - 0.01D, var54, var28, var32); - var6.addVertexWithUV(var38, (float)y - 0.01D, var54, var28, var36); - var6.addVertexWithUV(var42, (float)y - 0.01D, var56, var30, var36); - var6.addVertexWithUV(var38, (float)y - 0.01D, var56, var30, var32); - var6.addVertexWithUV(var38, (float)y - 0.01D, var54, var28, var32); - var6.addVertexWithUV(var42, (float)y - 0.01D, var54, var28, var36); + var6.addVertexWithUV(var38, (float)y - 0.01F, var56, var30, var36); + var6.addVertexWithUV(var42, (float)y - 0.01F, var56, var30, var32); + var6.addVertexWithUV(var42, (float)y - 0.01F, var54, var28, var32); + var6.addVertexWithUV(var38, (float)y - 0.01F, var54, var28, var36); + var6.addVertexWithUV(var42, (float)y - 0.01F, var56, var30, var36); + var6.addVertexWithUV(var38, (float)y - 0.01F, var56, var30, var32); + var6.addVertexWithUV(var38, (float)y - 0.01F, var54, var28, var32); + var6.addVertexWithUV(var42, (float)y - 0.01F, var54, var28, var36); } else { if (par3 > 1 && this.blockAccess.isAirBlock(par2.subtract(BigInteger.ONE), par3 - 1, par4)) { - var6.addVertexWithUV(var38, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var36); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var36); - var6.addVertexWithUV(var38, (float)y - 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var38, (float)y - 0.01D, var56, var30, var36); - var6.addVertexWithUV(var38, (float)y - 0.01D, var54, var28, var36); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var34); + var6.addVertexWithUV(var38, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var36); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var36); + var6.addVertexWithUV(var38, (float)y - 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var38, (float)y - 0.01F, var56, var30, var36); + var6.addVertexWithUV(var38, (float)y - 0.01F, var54, var28, var36); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var34); } if (par3 > 1 && this.blockAccess.isAirBlock(par2.add(BigInteger.ONE), par3 - 1, par4)) { - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var32); - var6.addVertexWithUV(var42, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var42, (float)y - 0.01D, var54, var28, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var32); - var6.addVertexWithUV(var42, (float)y - 0.01D, var56, var30, var32); - var6.addVertexWithUV(var40, (float)y - 0.01D, var56, var30, var34); - var6.addVertexWithUV(var40, (float)y - 0.01D, var54, var28, var34); - var6.addVertexWithUV(var42, (float)y - 0.01D, var54, var28, var32); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var32); + var6.addVertexWithUV(var42, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var42, (float)y - 0.01F, var54, var28, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var32); + var6.addVertexWithUV(var42, (float)y - 0.01F, var56, var30, var32); + var6.addVertexWithUV(var40, (float)y - 0.01F, var56, var30, var34); + var6.addVertexWithUV(var40, (float)y - 0.01F, var54, var28, var34); + var6.addVertexWithUV(var42, (float)y - 0.01F, var54, var28, var32); } } } @@ -3730,17 +3730,17 @@ public class RenderBlocks } var5.setColorOpaque_F(var6 * var8, var6 * var9, var6 * var10); - double var19 = FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(); - double var20 = FIX_RENDERER ? par3 & 0xF :(float)par3; - double var15 = FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(); + float var19 = FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(); + float var20 = FIX_RENDERER ? par3 & 0xF :(float)par3; + float var15 = FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(); if (par1Block == Block.tallGrass) { long var17 = (long)(par2.longValue() * 3129871) ^ (long)par4.longValue() * 116129781L ^ (long)par3; var17 = var17 * var17 * 42317861L + var17 * 11L; - var19 += ((float)((float)(var17 >> 16 & 15L) / 15.0F) - 0.5D) * 0.5D; - var20 += ((float)((float)(var17 >> 20 & 15L) / 15.0F) - 1.0D) * 0.2D; - var15 += ((float)((float)(var17 >> 24 & 15L) / 15.0F) - 0.5D) * 0.5D; + var19 += ((float)((float)(var17 >> 16 & 15L) / 15.0F) - 0.5F) * 0.5F; + var20 += ((float)((float)(var17 >> 20 & 15L) / 15.0F) - 1.0F) * 0.2F; + var15 += ((float)((float)(var17 >> 24 & 15L) / 15.0F) - 0.5F) * 0.5F; } this.drawCrossedSquares(par1Block, this.blockAccess.getBlockMetadata(par2, par3, par4), var19, var20, var15); @@ -3781,7 +3781,7 @@ public class RenderBlocks } else { - this.renderBlockStemSmall(var5, this.blockAccess.getBlockMetadata(par2, par3, par4), 0.5D, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), (float)((float)(FIX_RENDERER ? par3 & 0xF : par3) - 0.0625F), FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()); + this.renderBlockStemSmall(var5, this.blockAccess.getBlockMetadata(par2, par3, par4), 0.5F, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), (float)((float)(FIX_RENDERER ? par3 & 0xF : par3) - 0.0625F), FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()); this.renderBlockStemBig(var5, this.blockAccess.getBlockMetadata(par2, par3, par4), var15, var5.maxY, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), (float)((float)(FIX_RENDERER ? par3 & 0xF : par3) - 0.0625F), FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue()); } @@ -3803,7 +3803,7 @@ public class RenderBlocks /** * Renders a torch at the given coordinates, with the base slanting at the given delta */ - public void renderTorchAtAngle(Block par1Block, double par2, double par4, double par6, double par8, double par10) + public void renderTorchAtAngle(Block par1Block, float par2, float par4, float par6, float par8, float par10) { Tessellator var12 = tessellator; int var13 = par1Block.getBlockTextureFromSide(0); @@ -3819,44 +3819,44 @@ public class RenderBlocks float var17 = ((float)var14 + 15.99F) / 256.0F; float var18 = (float)var15 / 256.0F; float var19 = ((float)var15 + 15.99F) / 256.0F; - double var20 = (float)var16 + 0.02734375D; - double var22 = (float)var18 + 0.0234375D; - double var24 = (float)var16 + 0.03515625D; - double var26 = (float)var18 + 0.03125D; - par2 += 0.5D; - par6 += 0.5D; - double var28 = par2 - 0.5D; - double var30 = par2 + 0.5D; - double var32 = par6 - 0.5D; - double var34 = par6 + 0.5D; - double var36 = 0.0625D; - double var38 = 0.625D; - var12.addVertexWithUV(par2 + par8 * (1.0D - var38) - var36, par4 + var38, par6 + par10 * (1.0D - var38) - var36, var20, var22); - var12.addVertexWithUV(par2 + par8 * (1.0D - var38) - var36, par4 + var38, par6 + par10 * (1.0D - var38) + var36, var20, var26); - var12.addVertexWithUV(par2 + par8 * (1.0D - var38) + var36, par4 + var38, par6 + par10 * (1.0D - var38) + var36, var24, var26); - var12.addVertexWithUV(par2 + par8 * (1.0D - var38) + var36, par4 + var38, par6 + par10 * (1.0D - var38) - var36, var24, var22); - var12.addVertexWithUV(par2 - var36, par4 + 1.0D, var32, (float)var16, (float)var18); - var12.addVertexWithUV(par2 - var36 + par8, par4 + 0.0D, var32 + par10, (float)var16, (float)var19); - var12.addVertexWithUV(par2 - var36 + par8, par4 + 0.0D, var34 + par10, (float)var17, (float)var19); - var12.addVertexWithUV(par2 - var36, par4 + 1.0D, var34, (float)var17, (float)var18); - var12.addVertexWithUV(par2 + var36, par4 + 1.0D, var34, (float)var16, (float)var18); - var12.addVertexWithUV(par2 + par8 + var36, par4 + 0.0D, var34 + par10, (float)var16, (float)var19); - var12.addVertexWithUV(par2 + par8 + var36, par4 + 0.0D, var32 + par10, (float)var17, (float)var19); - var12.addVertexWithUV(par2 + var36, par4 + 1.0D, var32, (float)var17, (float)var18); - var12.addVertexWithUV(var28, par4 + 1.0D, par6 + var36, (float)var16, (float)var18); - var12.addVertexWithUV(var28 + par8, par4 + 0.0D, par6 + var36 + par10, (float)var16, (float)var19); - var12.addVertexWithUV(var30 + par8, par4 + 0.0D, par6 + var36 + par10, (float)var17, (float)var19); - var12.addVertexWithUV(var30, par4 + 1.0D, par6 + var36, (float)var17, (float)var18); - var12.addVertexWithUV(var30, par4 + 1.0D, par6 - var36, (float)var16, (float)var18); - var12.addVertexWithUV(var30 + par8, par4 + 0.0D, par6 - var36 + par10, (float)var16, (float)var19); - var12.addVertexWithUV(var28 + par8, par4 + 0.0D, par6 - var36 + par10, (float)var17, (float)var19); - var12.addVertexWithUV(var28, par4 + 1.0D, par6 - var36, (float)var17, (float)var18); + float var20 = (float)var16 + 0.02734375F; + float var22 = (float)var18 + 0.0234375F; + float var24 = (float)var16 + 0.03515625F; + float var26 = (float)var18 + 0.03125F; + par2 += 0.5F; + par6 += 0.5F; + float var28 = par2 - 0.5F; + float var30 = par2 + 0.5F; + float var32 = par6 - 0.5F; + float var34 = par6 + 0.5F; + float var36 = 0.0625F; + float var38 = 0.625F; + var12.addVertexWithUV(par2 + par8 * (1.0F - var38) - var36, par4 + var38, par6 + par10 * (1.0F - var38) - var36, var20, var22); + var12.addVertexWithUV(par2 + par8 * (1.0F - var38) - var36, par4 + var38, par6 + par10 * (1.0F - var38) + var36, var20, var26); + var12.addVertexWithUV(par2 + par8 * (1.0F - var38) + var36, par4 + var38, par6 + par10 * (1.0F - var38) + var36, var24, var26); + var12.addVertexWithUV(par2 + par8 * (1.0F - var38) + var36, par4 + var38, par6 + par10 * (1.0F - var38) - var36, var24, var22); + var12.addVertexWithUV(par2 - var36, par4 + 1.0F, var32, (float)var16, (float)var18); + var12.addVertexWithUV(par2 - var36 + par8, par4 + 0.0F, var32 + par10, (float)var16, (float)var19); + var12.addVertexWithUV(par2 - var36 + par8, par4 + 0.0F, var34 + par10, (float)var17, (float)var19); + var12.addVertexWithUV(par2 - var36, par4 + 1.0F, var34, (float)var17, (float)var18); + var12.addVertexWithUV(par2 + var36, par4 + 1.0F, var34, (float)var16, (float)var18); + var12.addVertexWithUV(par2 + par8 + var36, par4 + 0.0F, var34 + par10, (float)var16, (float)var19); + var12.addVertexWithUV(par2 + par8 + var36, par4 + 0.0F, var32 + par10, (float)var17, (float)var19); + var12.addVertexWithUV(par2 + var36, par4 + 1.0F, var32, (float)var17, (float)var18); + var12.addVertexWithUV(var28, par4 + 1.0F, par6 + var36, (float)var16, (float)var18); + var12.addVertexWithUV(var28 + par8, par4 + 0.0F, par6 + var36 + par10, (float)var16, (float)var19); + var12.addVertexWithUV(var30 + par8, par4 + 0.0F, par6 + var36 + par10, (float)var17, (float)var19); + var12.addVertexWithUV(var30, par4 + 1.0F, par6 + var36, (float)var17, (float)var18); + var12.addVertexWithUV(var30, par4 + 1.0F, par6 - var36, (float)var16, (float)var18); + var12.addVertexWithUV(var30 + par8, par4 + 0.0F, par6 - var36 + par10, (float)var16, (float)var19); + var12.addVertexWithUV(var28 + par8, par4 + 0.0F, par6 - var36 + par10, (float)var17, (float)var19); + var12.addVertexWithUV(var28, par4 + 1.0F, par6 - var36, (float)var17, (float)var18); } /** * Utility function to draw crossed swuares */ - public void drawCrossedSquares(Block par1Block, int par2, double par3, double par5, double par7) + public void drawCrossedSquares(Block par1Block, int par2, float par3, float par5, float par7) { Tessellator var9 = tessellator; int var10 = par1Block.getBlockTextureFromSideAndMetadata(0, par2); @@ -3868,36 +3868,36 @@ public class RenderBlocks int var11 = (var10 & 15) << 4; int var12 = var10 & 240; - double var13 = (float)((float)var11 / 256.0F); - double var15 = (float)(((float)var11 + 15.99F) / 256.0F); - double var17 = (float)((float)var12 / 256.0F); - double var19 = (float)(((float)var12 + 15.99F) / 256.0F); - double var21 = par3 + 0.5D - 0.45D; - double var23 = par3 + 0.5D + 0.45D; - double var25 = par7 + 0.5D - 0.45D; - double var27 = par7 + 0.5D + 0.45D; - var9.addVertexWithUV(var21, par5 + 1.0D, var25, var13, var17); - var9.addVertexWithUV(var21, par5 + 0.0D, var25, var13, var19); - var9.addVertexWithUV(var23, par5 + 0.0D, var27, var15, var19); - var9.addVertexWithUV(var23, par5 + 1.0D, var27, var15, var17); - var9.addVertexWithUV(var23, par5 + 1.0D, var27, var13, var17); - var9.addVertexWithUV(var23, par5 + 0.0D, var27, var13, var19); - var9.addVertexWithUV(var21, par5 + 0.0D, var25, var15, var19); - var9.addVertexWithUV(var21, par5 + 1.0D, var25, var15, var17); - var9.addVertexWithUV(var21, par5 + 1.0D, var27, var13, var17); - var9.addVertexWithUV(var21, par5 + 0.0D, var27, var13, var19); - var9.addVertexWithUV(var23, par5 + 0.0D, var25, var15, var19); - var9.addVertexWithUV(var23, par5 + 1.0D, var25, var15, var17); - var9.addVertexWithUV(var23, par5 + 1.0D, var25, var13, var17); - var9.addVertexWithUV(var23, par5 + 0.0D, var25, var13, var19); - var9.addVertexWithUV(var21, par5 + 0.0D, var27, var15, var19); - var9.addVertexWithUV(var21, par5 + 1.0D, var27, var15, var17); + float var13 = (float)((float)var11 / 256.0F); + float var15 = (float)(((float)var11 + 15.99F) / 256.0F); + float var17 = (float)((float)var12 / 256.0F); + float var19 = (float)(((float)var12 + 15.99F) / 256.0F); + float var21 = par3 + 0.5F - 0.45F; + float var23 = par3 + 0.5F + 0.45F; + float var25 = par7 + 0.5F - 0.45F; + float var27 = par7 + 0.5F + 0.45F; + var9.addVertexWithUV(var21, par5 + 1.0F, var25, var13, var17); + var9.addVertexWithUV(var21, par5 + 0.0F, var25, var13, var19); + var9.addVertexWithUV(var23, par5 + 0.0F, var27, var15, var19); + var9.addVertexWithUV(var23, par5 + 1.0F, var27, var15, var17); + var9.addVertexWithUV(var23, par5 + 1.0F, var27, var13, var17); + var9.addVertexWithUV(var23, par5 + 0.0F, var27, var13, var19); + var9.addVertexWithUV(var21, par5 + 0.0F, var25, var15, var19); + var9.addVertexWithUV(var21, par5 + 1.0F, var25, var15, var17); + var9.addVertexWithUV(var21, par5 + 1.0F, var27, var13, var17); + var9.addVertexWithUV(var21, par5 + 0.0F, var27, var13, var19); + var9.addVertexWithUV(var23, par5 + 0.0F, var25, var15, var19); + var9.addVertexWithUV(var23, par5 + 1.0F, var25, var15, var17); + var9.addVertexWithUV(var23, par5 + 1.0F, var25, var13, var17); + var9.addVertexWithUV(var23, par5 + 0.0F, var25, var13, var19); + var9.addVertexWithUV(var21, par5 + 0.0F, var27, var15, var19); + var9.addVertexWithUV(var21, par5 + 1.0F, var27, var15, var17); } /** * Render block stem small */ - public void renderBlockStemSmall(Block par1Block, int par2, double par3, double par5, double par7, double par9) + public void renderBlockStemSmall(Block par1Block, int par2, float par3, float par5, float par7, float par9) { Tessellator var11 = tessellator; int var12 = par1Block.getBlockTextureFromSideAndMetadata(0, par2); @@ -3909,29 +3909,29 @@ public class RenderBlocks int var13 = (var12 & 15) << 4; int var14 = var12 & 240; - double var15 = (float)((float)var13 / 256.0F); - double var17 = (float)(((float)var13 + 15.99F) / 256.0F); - double var19 = (float)((float)var14 / 256.0F); - double var21 = ((float)var14 + 15.989999771118164D * par3) / 256.0D; - double var23 = par5 + 0.5D - 0.44999998807907104D; - double var25 = par5 + 0.5D + 0.44999998807907104D; - double var27 = par9 + 0.5D - 0.44999998807907104D; - double var29 = par9 + 0.5D + 0.44999998807907104D; + float var15 = (float)((float)var13 / 256.0F); + float var17 = (float)(((float)var13 + 15.99F) / 256.0F); + float var19 = (float)((float)var14 / 256.0F); + float var21 = ((float)var14 + 15.989999771118164F * par3) / 256.0F; + float var23 = par5 + 0.5F - 0.44999998807907104F; + float var25 = par5 + 0.5F + 0.44999998807907104F; + float var27 = par9 + 0.5F - 0.44999998807907104F; + float var29 = par9 + 0.5F + 0.44999998807907104F; var11.addVertexWithUV(var23, par7 + par3, var27, var15, var19); - var11.addVertexWithUV(var23, par7 + 0.0D, var27, var15, var21); - var11.addVertexWithUV(var25, par7 + 0.0D, var29, var17, var21); + var11.addVertexWithUV(var23, par7 + 0.0F, var27, var15, var21); + var11.addVertexWithUV(var25, par7 + 0.0F, var29, var17, var21); var11.addVertexWithUV(var25, par7 + par3, var29, var17, var19); var11.addVertexWithUV(var25, par7 + par3, var29, var15, var19); - var11.addVertexWithUV(var25, par7 + 0.0D, var29, var15, var21); - var11.addVertexWithUV(var23, par7 + 0.0D, var27, var17, var21); + var11.addVertexWithUV(var25, par7 + 0.0F, var29, var15, var21); + var11.addVertexWithUV(var23, par7 + 0.0F, var27, var17, var21); var11.addVertexWithUV(var23, par7 + par3, var27, var17, var19); var11.addVertexWithUV(var23, par7 + par3, var29, var15, var19); - var11.addVertexWithUV(var23, par7 + 0.0D, var29, var15, var21); - var11.addVertexWithUV(var25, par7 + 0.0D, var27, var17, var21); + var11.addVertexWithUV(var23, par7 + 0.0F, var29, var15, var21); + var11.addVertexWithUV(var25, par7 + 0.0F, var27, var17, var21); var11.addVertexWithUV(var25, par7 + par3, var27, var17, var19); var11.addVertexWithUV(var25, par7 + par3, var27, var15, var19); - var11.addVertexWithUV(var25, par7 + 0.0D, var27, var15, var21); - var11.addVertexWithUV(var23, par7 + 0.0D, var29, var17, var21); + var11.addVertexWithUV(var25, par7 + 0.0F, var27, var15, var21); + var11.addVertexWithUV(var23, par7 + 0.0F, var29, var17, var21); var11.addVertexWithUV(var23, par7 + par3, var29, var17, var19); } @@ -3951,10 +3951,10 @@ public class RenderBlocks int var7 = (var6 & 15) << 4; int var8 = var6 & 240; float var9 = 0.015625F; - double var10 = (float)((float)var7 / 256.0F); - double var12 = (float)(((float)var7 + 15.99F) / 256.0F); - double var14 = (float)((float)var8 / 256.0F); - double var16 = (float)(((float)var8 + 15.99F) / 256.0F); + float var10 = (float)((float)var7 / 256.0F); + float var12 = (float)(((float)var7 + 15.99F) / 256.0F); + float var14 = (float)((float)var8 / 256.0F); + float var16 = (float)(((float)var8 + 15.99F) / 256.0F); long var18 = (long)(par2.longValue() * 3129871) ^ (long)par4.longValue() * 116129781L ^ (long)par3; var18 = var18 * var18 * 42317861L + var18 * 11L; int var20 = (int)(var18 >> 16 & 3L); @@ -3984,7 +3984,7 @@ public class RenderBlocks /** * Render block stem big */ - public void renderBlockStemBig(Block par1Block, int par2, int par3, double par4, double par6, double par8, double par10) + public void renderBlockStemBig(Block par1Block, int par2, int par3, float par4, float par6, float par8, float par10) { Tessellator var12 = tessellator; int var13 = par1Block.getBlockTextureFromSideAndMetadata(0, par2) + 16; @@ -3996,20 +3996,20 @@ public class RenderBlocks int var14 = (var13 & 15) << 4; int var15 = var13 & 240; - double var16 = (float)((float)var14 / 256.0F); - double var18 = (float)(((float)var14 + 15.99F) / 256.0F); - double var20 = (float)((float)var15 / 256.0F); - double var22 = ((float)var15 + 15.989999771118164D * par4) / 256.0D; - double var24 = par6 + 0.5D - 0.5D; - double var26 = par6 + 0.5D + 0.5D; - double var28 = par10 + 0.5D - 0.5D; - double var30 = par10 + 0.5D + 0.5D; - double var32 = par6 + 0.5D; - double var34 = par10 + 0.5D; + float var16 = (float)((float)var14 / 256.0F); + float var18 = (float)(((float)var14 + 15.99F) / 256.0F); + float var20 = (float)((float)var15 / 256.0F); + float var22 = ((float)var15 + 15.989999771118164F * par4) / 256.0F; + float var24 = par6 + 0.5F - 0.5F; + float var26 = par6 + 0.5F + 0.5F; + float var28 = par10 + 0.5F - 0.5F; + float var30 = par10 + 0.5F + 0.5F; + float var32 = par6 + 0.5F; + float var34 = par10 + 0.5F; if ((par3 + 1) / 2 % 2 == 1) { - double var36 = var18; + float var36 = var18; var18 = var16; var16 = var36; } @@ -4017,23 +4017,23 @@ public class RenderBlocks if (par3 < 2) { var12.addVertexWithUV(var24, par8 + par4, var34, var16, var20); - var12.addVertexWithUV(var24, par8 + 0.0D, var34, var16, var22); - var12.addVertexWithUV(var26, par8 + 0.0D, var34, var18, var22); + var12.addVertexWithUV(var24, par8 + 0.0F, var34, var16, var22); + var12.addVertexWithUV(var26, par8 + 0.0F, var34, var18, var22); var12.addVertexWithUV(var26, par8 + par4, var34, var18, var20); var12.addVertexWithUV(var26, par8 + par4, var34, var18, var20); - var12.addVertexWithUV(var26, par8 + 0.0D, var34, var18, var22); - var12.addVertexWithUV(var24, par8 + 0.0D, var34, var16, var22); + var12.addVertexWithUV(var26, par8 + 0.0F, var34, var18, var22); + var12.addVertexWithUV(var24, par8 + 0.0F, var34, var16, var22); var12.addVertexWithUV(var24, par8 + par4, var34, var16, var20); } else { var12.addVertexWithUV(var32, par8 + par4, var30, var16, var20); - var12.addVertexWithUV(var32, par8 + 0.0D, var30, var16, var22); - var12.addVertexWithUV(var32, par8 + 0.0D, var28, var18, var22); + var12.addVertexWithUV(var32, par8 + 0.0F, var30, var16, var22); + var12.addVertexWithUV(var32, par8 + 0.0F, var28, var18, var22); var12.addVertexWithUV(var32, par8 + par4, var28, var18, var20); var12.addVertexWithUV(var32, par8 + par4, var28, var18, var20); - var12.addVertexWithUV(var32, par8 + 0.0D, var28, var18, var22); - var12.addVertexWithUV(var32, par8 + 0.0D, var30, var16, var22); + var12.addVertexWithUV(var32, par8 + 0.0F, var28, var18, var22); + var12.addVertexWithUV(var32, par8 + 0.0F, var30, var16, var22); var12.addVertexWithUV(var32, par8 + par4, var30, var16, var20); } } @@ -4041,7 +4041,7 @@ public class RenderBlocks /** * Render block crops implementation */ - public void renderBlockCropsImpl(Block par1Block, int par2, double par3, double par5, double par7) + public void renderBlockCropsImpl(Block par1Block, int par2, float par3, float par5, float par7) { Tessellator var9 = tessellator; int var10 = par1Block.getBlockTextureFromSideAndMetadata(0, par2); @@ -4053,50 +4053,50 @@ public class RenderBlocks int var11 = (var10 & 15) << 4; int var12 = var10 & 240; - double var13 = (float)((float)var11 / 256.0F); - double var15 = (float)(((float)var11 + 15.99F) / 256.0F); - double var17 = (float)((float)var12 / 256.0F); - double var19 = (float)(((float)var12 + 15.99F) / 256.0F); - double var21 = par3 + 0.5D - 0.25D; - double var23 = par3 + 0.5D + 0.25D; - double var25 = par7 + 0.5D - 0.5D; - double var27 = par7 + 0.5D + 0.5D; - var9.addVertexWithUV(var21, par5 + 1.0D, var25, var13, var17); - var9.addVertexWithUV(var21, par5 + 0.0D, var25, var13, var19); - var9.addVertexWithUV(var21, par5 + 0.0D, var27, var15, var19); - var9.addVertexWithUV(var21, par5 + 1.0D, var27, var15, var17); - var9.addVertexWithUV(var21, par5 + 1.0D, var27, var13, var17); - var9.addVertexWithUV(var21, par5 + 0.0D, var27, var13, var19); - var9.addVertexWithUV(var21, par5 + 0.0D, var25, var15, var19); - var9.addVertexWithUV(var21, par5 + 1.0D, var25, var15, var17); - var9.addVertexWithUV(var23, par5 + 1.0D, var27, var13, var17); - var9.addVertexWithUV(var23, par5 + 0.0D, var27, var13, var19); - var9.addVertexWithUV(var23, par5 + 0.0D, var25, var15, var19); - var9.addVertexWithUV(var23, par5 + 1.0D, var25, var15, var17); - var9.addVertexWithUV(var23, par5 + 1.0D, var25, var13, var17); - var9.addVertexWithUV(var23, par5 + 0.0D, var25, var13, var19); - var9.addVertexWithUV(var23, par5 + 0.0D, var27, var15, var19); - var9.addVertexWithUV(var23, par5 + 1.0D, var27, var15, var17); - var21 = par3 + 0.5D - 0.5D; - var23 = par3 + 0.5D + 0.5D; - var25 = par7 + 0.5D - 0.25D; - var27 = par7 + 0.5D + 0.25D; - var9.addVertexWithUV(var21, par5 + 1.0D, var25, var13, var17); - var9.addVertexWithUV(var21, par5 + 0.0D, var25, var13, var19); - var9.addVertexWithUV(var23, par5 + 0.0D, var25, var15, var19); - var9.addVertexWithUV(var23, par5 + 1.0D, var25, var15, var17); - var9.addVertexWithUV(var23, par5 + 1.0D, var25, var13, var17); - var9.addVertexWithUV(var23, par5 + 0.0D, var25, var13, var19); - var9.addVertexWithUV(var21, par5 + 0.0D, var25, var15, var19); - var9.addVertexWithUV(var21, par5 + 1.0D, var25, var15, var17); - var9.addVertexWithUV(var23, par5 + 1.0D, var27, var13, var17); - var9.addVertexWithUV(var23, par5 + 0.0D, var27, var13, var19); - var9.addVertexWithUV(var21, par5 + 0.0D, var27, var15, var19); - var9.addVertexWithUV(var21, par5 + 1.0D, var27, var15, var17); - var9.addVertexWithUV(var21, par5 + 1.0D, var27, var13, var17); - var9.addVertexWithUV(var21, par5 + 0.0D, var27, var13, var19); - var9.addVertexWithUV(var23, par5 + 0.0D, var27, var15, var19); - var9.addVertexWithUV(var23, par5 + 1.0D, var27, var15, var17); + float var13 = (float)((float)var11 / 256.0F); + float var15 = (float)(((float)var11 + 15.99F) / 256.0F); + float var17 = (float)((float)var12 / 256.0F); + float var19 = (float)(((float)var12 + 15.99F) / 256.0F); + float var21 = par3 + 0.5F - 0.25F; + float var23 = par3 + 0.5F + 0.25F; + float var25 = par7 + 0.5F - 0.5F; + float var27 = par7 + 0.5F + 0.5F; + var9.addVertexWithUV(var21, par5 + 1.0F, var25, var13, var17); + var9.addVertexWithUV(var21, par5 + 0.0F, var25, var13, var19); + var9.addVertexWithUV(var21, par5 + 0.0F, var27, var15, var19); + var9.addVertexWithUV(var21, par5 + 1.0F, var27, var15, var17); + var9.addVertexWithUV(var21, par5 + 1.0F, var27, var13, var17); + var9.addVertexWithUV(var21, par5 + 0.0F, var27, var13, var19); + var9.addVertexWithUV(var21, par5 + 0.0F, var25, var15, var19); + var9.addVertexWithUV(var21, par5 + 1.0F, var25, var15, var17); + var9.addVertexWithUV(var23, par5 + 1.0F, var27, var13, var17); + var9.addVertexWithUV(var23, par5 + 0.0F, var27, var13, var19); + var9.addVertexWithUV(var23, par5 + 0.0F, var25, var15, var19); + var9.addVertexWithUV(var23, par5 + 1.0F, var25, var15, var17); + var9.addVertexWithUV(var23, par5 + 1.0F, var25, var13, var17); + var9.addVertexWithUV(var23, par5 + 0.0F, var25, var13, var19); + var9.addVertexWithUV(var23, par5 + 0.0F, var27, var15, var19); + var9.addVertexWithUV(var23, par5 + 1.0F, var27, var15, var17); + var21 = par3 + 0.5F - 0.5F; + var23 = par3 + 0.5F + 0.5F; + var25 = par7 + 0.5F - 0.25F; + var27 = par7 + 0.5F + 0.25F; + var9.addVertexWithUV(var21, par5 + 1.0F, var25, var13, var17); + var9.addVertexWithUV(var21, par5 + 0.0F, var25, var13, var19); + var9.addVertexWithUV(var23, par5 + 0.0F, var25, var15, var19); + var9.addVertexWithUV(var23, par5 + 1.0F, var25, var15, var17); + var9.addVertexWithUV(var23, par5 + 1.0F, var25, var13, var17); + var9.addVertexWithUV(var23, par5 + 0.0F, var25, var13, var19); + var9.addVertexWithUV(var21, par5 + 0.0F, var25, var15, var19); + var9.addVertexWithUV(var21, par5 + 1.0F, var25, var15, var17); + var9.addVertexWithUV(var23, par5 + 1.0F, var27, var13, var17); + var9.addVertexWithUV(var23, par5 + 0.0F, var27, var13, var19); + var9.addVertexWithUV(var21, par5 + 0.0F, var27, var15, var19); + var9.addVertexWithUV(var21, par5 + 1.0F, var27, var15, var17); + var9.addVertexWithUV(var21, par5 + 1.0F, var27, var13, var17); + var9.addVertexWithUV(var21, par5 + 0.0F, var27, var13, var19); + var9.addVertexWithUV(var23, par5 + 0.0F, var27, var15, var19); + var9.addVertexWithUV(var23, par5 + 1.0F, var27, var15, var17); } /** @@ -4124,15 +4124,15 @@ public class RenderBlocks float var15 = 1.0F; float var16 = 0.8F; float var17 = 0.6F; - double var18 = 0.0D; - double var20 = 1.0D; + float var18 = 0.0F; + float var20 = 1.0F; Material var22 = par1Block.blockMaterial; int var23 = this.blockAccess.getBlockMetadata(par2, par3, par4); - double var24 = (float)this.getFluidHeight(par2, par3, par4, var22); - double var26 = (float)this.getFluidHeight(par2, par3, par4.add(BigInteger.ONE), var22); - double var28 = (float)this.getFluidHeight(par2.add(BigInteger.ONE), par3, par4.add(BigInteger.ONE), var22); - double var30 = (float)this.getFluidHeight(par2.add(BigInteger.ONE), par3, par4, var22); - double var32 = 0.0010000000474974513D; + float var24 = (float)this.getFluidHeight(par2, par3, par4, var22); + float var26 = (float)this.getFluidHeight(par2, par3, par4.add(BigInteger.ONE), var22); + float var28 = (float)this.getFluidHeight(par2.add(BigInteger.ONE), par3, par4.add(BigInteger.ONE), var22); + float var30 = (float)this.getFluidHeight(par2.add(BigInteger.ONE), par3, par4, var22); + float var32 = 0.0010000000474974513F; int var34; if (this.renderAllFaces || var10) @@ -4153,8 +4153,8 @@ public class RenderBlocks var30 -= var32; int var36 = (var34 & 15) << 4; var37 = var34 & 240; - double var38 = ((float)var36 + 8.0D) / 256.0D; - double var40 = ((float)var37 + 8.0D) / 256.0D; + float var38 = ((float)var36 + 8.0F) / 256.0F; + float var40 = ((float)var37 + 8.0F) / 256.0F; if (var35 < -999.0F) { @@ -4166,8 +4166,8 @@ public class RenderBlocks var40 = (float)((float)(var37 + 16) / 256.0F); } - double var42 = (float)(MathHelper.sin(var35) * 8.0F) / 256.0D; - double var44 = (float)(MathHelper.cos(var35) * 8.0F) / 256.0D; + float var42 = (float)(MathHelper.sin(var35) * 8.0F) / 256.0F; + float var44 = (float)(MathHelper.cos(var35) * 8.0F) / 256.0F; var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4)); float var46 = 1.0F; var5.setColorOpaque_F(var15 * var46 * var7, var15 * var46 * var8, var15 * var46 * var9); @@ -4225,12 +4225,12 @@ public class RenderBlocks if (this.renderAllFaces || var12[var34]) { - double var41; - double var43; - double var45; - double var47; - double var49; - double var51; + float var41; + float var43; + float var45; + float var47; + float var49; + float var51; if (var34 == 0) { @@ -4299,11 +4299,11 @@ public class RenderBlocks } var13 = true; - double var53 = (float)((float)(var39 + 0) / 256.0F); - double var55 = ((float)(var39 + 16) - 0.01D) / 256.0D; - double var57 = ((float)var67 + (1.0D - var41) * 16.0D) / 256.0D; - double var59 = ((float)var67 + (1.0D - var43) * 16.0D) / 256.0D; - double var61 = ((float)(var67 + 16) - 0.01D) / 256.0D; + float var53 = (float)((float)(var39 + 0) / 256.0F); + float var55 = ((float)(var39 + 16) - 0.01F) / 256.0F; + float var57 = ((float)var67 + (1.0F - var41) * 16.0F) / 256.0F; + float var59 = ((float)var67 + (1.0F - var43) * 16.0F) / 256.0F; + float var61 = ((float)(var67 + 16) - 0.01F) / 256.0F; var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, var65, par3, var37)); float var63 = 1.0F; @@ -4391,7 +4391,7 @@ public class RenderBlocks } var11.setColorOpaque_F(var7 * var13, var7 * var13, var7 * var13); - this.renderBottomFace(par1Block, -0.5D, -0.5D, -0.5D, par1Block.getBlockTextureFromSideAndMetadata(0, par6)); + this.renderBottomFace(par1Block, -0.5F, -0.5F, -0.5F, par1Block.getBlockTextureFromSideAndMetadata(0, par6)); var13 = 1.0F; if (var13 < var12) @@ -4400,7 +4400,7 @@ public class RenderBlocks } var11.setColorOpaque_F(var8 * var13, var8 * var13, var8 * var13); - this.renderTopFace(par1Block, -0.5D, -0.5D, -0.5D, par1Block.getBlockTextureFromSideAndMetadata(1, par6)); + this.renderTopFace(par1Block, -0.5F, -0.5F, -0.5F, par1Block.getBlockTextureFromSideAndMetadata(1, par6)); var13 = 1.0F; if (var13 < var12) @@ -4409,7 +4409,7 @@ public class RenderBlocks } var11.setColorOpaque_F(var9 * var13, var9 * var13, var9 * var13); - this.renderEastFace(par1Block, -0.5D, -0.5D, -0.5D, par1Block.getBlockTextureFromSideAndMetadata(2, par6)); + this.renderEastFace(par1Block, -0.5F, -0.5F, -0.5F, par1Block.getBlockTextureFromSideAndMetadata(2, par6)); var13 = 1.0F; if (var13 < var12) @@ -4418,7 +4418,7 @@ public class RenderBlocks } var11.setColorOpaque_F(var9 * var13, var9 * var13, var9 * var13); - this.renderWestFace(par1Block, -0.5D, -0.5D, -0.5D, par1Block.getBlockTextureFromSideAndMetadata(3, par6)); + this.renderWestFace(par1Block, -0.5F, -0.5F, -0.5F, par1Block.getBlockTextureFromSideAndMetadata(3, par6)); var13 = 1.0F; if (var13 < var12) @@ -4427,7 +4427,7 @@ public class RenderBlocks } var11.setColorOpaque_F(var10 * var13, var10 * var13, var10 * var13); - this.renderNorthFace(par1Block, -0.5D, -0.5D, -0.5D, par1Block.getBlockTextureFromSideAndMetadata(4, par6)); + this.renderNorthFace(par1Block, -0.5F, -0.5F, -0.5F, par1Block.getBlockTextureFromSideAndMetadata(4, par6)); var13 = 1.0F; if (var13 < var12) @@ -4436,7 +4436,7 @@ public class RenderBlocks } var11.setColorOpaque_F(var10 * var13, var10 * var13, var10 * var13); - this.renderSouthFace(par1Block, -0.5D, -0.5D, -0.5D, par1Block.getBlockTextureFromSideAndMetadata(5, par6)); + this.renderSouthFace(par1Block, -0.5F, -0.5F, -0.5F, par1Block.getBlockTextureFromSideAndMetadata(5, par6)); var11.draw(); } @@ -4520,32 +4520,32 @@ public class RenderBlocks int var24 = var19; int var25 = var19; - if (par1Block.minY <= 0.0D) + if (par1Block.minY <= 0.0F) { var21 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4); } - if (par1Block.maxY >= 1.0D) + if (par1Block.maxY >= 1.0F) { var24 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4); } - if (par1Block.minX <= 0.0D) + if (par1Block.minX <= 0.0F) { var20 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4); } - if (par1Block.maxX >= 1.0D) + if (par1Block.maxX >= 1.0F) { var23 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4); } - if (par1Block.minZ <= 0.0D) + if (par1Block.minZ <= 0.0F) { var22 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE)); } - if (par1Block.maxZ >= 1.0D) + if (par1Block.maxZ >= 1.0F) { var25 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE)); } @@ -4587,7 +4587,7 @@ public class RenderBlocks { if (this.aoType > 0) { - if (par1Block.minY <= 0.0D) + if (par1Block.minY <= 0.0F) { --par3; } @@ -4645,7 +4645,7 @@ public class RenderBlocks this.aoBrightnessXYZPNP = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4.add(BigInteger.ONE)); } - if (par1Block.minY <= 0.0D) + if (par1Block.minY <= 0.0F) { ++par3; } @@ -4692,7 +4692,7 @@ public class RenderBlocks { if (this.aoType > 0) { - if (par1Block.maxY >= 1.0D) + if (par1Block.maxY >= 1.0F) { ++par3; } @@ -4750,7 +4750,7 @@ public class RenderBlocks this.aoBrightnessXYZPPP = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4.add(BigInteger.ONE)); } - if (par1Block.maxY >= 1.0D) + if (par1Block.maxY >= 1.0F) { --par3; } @@ -4799,7 +4799,7 @@ public class RenderBlocks { if (this.aoType > 0) { - if (par1Block.minZ <= 0.0D) + if (par1Block.minZ <= 0.0F) { par4 = par4.subtract(BigInteger.ONE); } @@ -4857,7 +4857,7 @@ public class RenderBlocks this.aoBrightnessXYZPPN = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3 + 1, par4); } - if (par1Block.minZ <= 0.0D) + if (par1Block.minZ <= 0.0F) { par4 = par4.add(BigInteger.ONE); } @@ -4924,7 +4924,7 @@ public class RenderBlocks { if (this.aoType > 0) { - if (par1Block.maxZ >= 1.0D) + if (par1Block.maxZ >= 1.0F) { par4 = par4.add(BigInteger.ONE); } @@ -4982,7 +4982,7 @@ public class RenderBlocks this.aoBrightnessXYZPPP = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3 + 1, par4); } - if (par1Block.maxZ >= 1.0D) + if (par1Block.maxZ >= 1.0F) { par4 = par4.subtract(BigInteger.ONE); } @@ -5049,7 +5049,7 @@ public class RenderBlocks { if (this.aoType > 0) { - if (par1Block.minX <= 0.0D) + if (par1Block.minX <= 0.0F) { par2 = par2.subtract(BigInteger.ONE); } @@ -5107,7 +5107,7 @@ public class RenderBlocks this.aoBrightnessXYZNPP = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4.add(BigInteger.ONE)); } - if (par1Block.minX <= 0.0D) + if (par1Block.minX <= 0.0F) { par2 = par2.add(BigInteger.ONE); } @@ -5174,7 +5174,7 @@ public class RenderBlocks { if (this.aoType > 0) { - if (par1Block.maxX >= 1.0D) + if (par1Block.maxX >= 1.0F) { par2 = par2.add(BigInteger.ONE); } @@ -5232,7 +5232,7 @@ public class RenderBlocks this.aoBrightnessXYZPPP = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4.add(BigInteger.ONE)); } - if (par1Block.maxX >= 1.0D) + if (par1Block.maxX >= 1.0F) { par2 = par2.subtract(BigInteger.ONE); } @@ -5364,7 +5364,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 - 1, par4, 0)) { - var8.setBrightness(par1Block.minY > 0.0D ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); + var8.setBrightness(par1Block.minY > 0.0F ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); var8.setColorOpaque_F(var17, var20, var23); if(FIX_RENDERER) this.renderBottomFace(par1Block, par2.intValue() & 0xF, (float)(par3 & 0xF), par4.intValue() & 0xF, par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0)); else this.renderBottomFace(par1Block, par2.floatValue(), (float)par3, par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0)); @@ -5373,7 +5373,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 + 1, par4, 1)) { - var8.setBrightness(par1Block.maxY < 1.0D ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); + var8.setBrightness(par1Block.maxY < 1.0F ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); var8.setColorOpaque_F(var14, var15, var16); if(FIX_RENDERER) this.renderTopFace(par1Block, par2.intValue() & 0xF, (float)(par3 & 0xF), par4.intValue() & 0xF, par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 1)); else this.renderTopFace(par1Block, par2.floatValue(), (float)par3, par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 1)); @@ -5384,7 +5384,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE), 2)) { - var8.setBrightness(par1Block.minZ > 0.0D ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); + var8.setBrightness(par1Block.minZ > 0.0F ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); var8.setColorOpaque_F(var18, var21, var24); var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); if(FIX_RENDERER) this.renderEastFace(par1Block, par2.intValue() & 0xF, (float)(par3 & 0xF), par4.intValue() & 0xF, var28); @@ -5402,7 +5402,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4.add(BigInteger.ONE), 3)) { - var8.setBrightness(par1Block.maxZ < 1.0D ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); + var8.setBrightness(par1Block.maxZ < 1.0F ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); var8.setColorOpaque_F(var18, var21, var24); var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); if(FIX_RENDERER) this.renderWestFace(par1Block, par2.intValue() & 0xF, (float)(par3 & 0xF), par4.intValue() & 0xF, var28); @@ -5420,7 +5420,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4, 4)) { - var8.setBrightness(par1Block.minX > 0.0D ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); + var8.setBrightness(par1Block.minX > 0.0F ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); var8.setColorOpaque_F(var19, var22, var25); var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); if(FIX_RENDERER) this.renderNorthFace(par1Block, par2.intValue() & 0xF, (float)(par3 & 0xF), par4.intValue() & 0xF, var28); @@ -5438,7 +5438,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2.add(BigInteger.ONE), par3, par4, 5)) { - var8.setBrightness(par1Block.maxX < 1.0D ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); + var8.setBrightness(par1Block.maxX < 1.0F ? var26 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); var8.setColorOpaque_F(var19, var22, var25); var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); if(FIX_RENDERER) this.renderSouthFace(par1Block, par2.intValue() & 0xF, (float)(par3 & 0xF), par4.intValue() & 0xF, var28); @@ -5471,16 +5471,16 @@ public class RenderBlocks int var11 = 5 + var9 * 2; int var12 = (var7 & 15) << 4; int var13 = var7 & 240; - double var14 = 15.0D - (float)var10; - double var16 = 15.0D; - double var18 = 4.0D; - double var20 = 4.0D + (float)var11; - double var22 = ((float)var12 + var14) / 256.0D; - double var24 = ((float)var12 + var16 - 0.01D) / 256.0D; - double var26 = ((float)var13 + var18) / 256.0D; - double var28 = ((float)var13 + var20 - 0.01D) / 256.0D; - double var30 = 0.0D; - double var32 = 0.0D; + float var14 = 15.0F - (float)var10; + float var16 = 15.0F; + float var18 = 4.0F; + float var20 = 4.0F + (float)var11; + float var22 = ((float)var12 + var14) / 256.0F; + float var24 = ((float)var12 + var16 - 0.01F) / 256.0F; + float var26 = ((float)var13 + var18) / 256.0F; + float var28 = ((float)var13 + var20 - 0.01F) / 256.0F; + float var30 = 0.0F; + float var32 = 0.0F; if(FIX_RENDERER) { par2 = BigInteger.valueOf(par2.intValue() & 0xF); @@ -5491,31 +5491,31 @@ public class RenderBlocks switch (var8) { case 0: - var30 = 8.0D - (float)(var10 / 2); - var32 = 15.0D - (float)var10; + var30 = 8.0F - (float)(var10 / 2); + var32 = 15.0F - (float)var10; break; case 1: - var30 = 1.0D; - var32 = 8.0D - (float)(var10 / 2); + var30 = 1.0F; + var32 = 8.0F - (float)(var10 / 2); break; case 2: - var30 = 8.0D - (float)(var10 / 2); - var32 = 1.0D; + var30 = 8.0F - (float)(var10 / 2); + var32 = 1.0F; break; case 3: - var30 = 15.0D - (float)var10; - var32 = 8.0D - (float)(var10 / 2); + var30 = 15.0F - (float)var10; + var32 = 8.0F - (float)(var10 / 2); } - double var34 = par2.floatValue() + var30 / 16.0D; - double var36 = par2.floatValue() + (var30 + (float)var10) / 16.0D; - double var38 = (float)par3 + (12.0D - (float)var11) / 16.0D; - double var40 = (float)par3 + 0.75D; - double var42 = par4.floatValue() + var32 / 16.0D; - double var44 = par4.floatValue() + (var32 + (float)var10) / 16.0D; + float var34 = par2.floatValue() + var30 / 16.0F; + float var36 = par2.floatValue() + (var30 + (float)var10) / 16.0F; + float var38 = (float)par3 + (12.0F - (float)var11) / 16.0F; + float var40 = (float)par3 + 0.75F; + float var42 = par4.floatValue() + var32 / 16.0F; + float var44 = par4.floatValue() + (var32 + (float)var10) / 16.0F; var5.addVertexWithUV(var34, var38, var42, var22, var28); var5.addVertexWithUV(var34, var38, var44, var24, var28); var5.addVertexWithUV(var34, var40, var44, var24, var26); @@ -5540,9 +5540,9 @@ public class RenderBlocks } var22 = (float)((float)(var12 + 0) / 256.0F); - var24 = ((float)(var12 + var46) - 0.01D) / 256.0D; + var24 = ((float)(var12 + var46) - 0.01F) / 256.0F; var26 = (float)((float)(var13 + 0) / 256.0F); - var28 = ((float)(var13 + var46) - 0.01D) / 256.0D; + var28 = ((float)(var13 + var46) - 0.01F) / 256.0F; var5.addVertexWithUV(var34, var40, var44, var22, var28); var5.addVertexWithUV(var36, var40, var44, var24, var28); var5.addVertexWithUV(var36, var40, var42, var24, var26); @@ -5552,47 +5552,47 @@ public class RenderBlocks var5.addVertexWithUV(var36, var38, var44, var24, var28); var5.addVertexWithUV(var34, var38, var44, var22, var28); var22 = (float)((float)(var12 + 12) / 256.0F); - var24 = ((float)(var12 + 16) - 0.01D) / 256.0D; + var24 = ((float)(var12 + 16) - 0.01F) / 256.0F; var26 = (float)((float)(var13 + 0) / 256.0F); - var28 = ((float)(var13 + 4) - 0.01D) / 256.0D; - var30 = 8.0D; - var32 = 0.0D; - double var47; + var28 = ((float)(var13 + 4) - 0.01F) / 256.0F; + var30 = 8.0F; + var32 = 0.0F; + float var47; switch (var8) { case 0: - var30 = 8.0D; - var32 = 12.0D; + var30 = 8.0F; + var32 = 12.0F; var47 = var22; var22 = var24; var24 = var47; break; case 1: - var30 = 0.0D; - var32 = 8.0D; + var30 = 0.0F; + var32 = 8.0F; break; case 2: - var30 = 8.0D; - var32 = 0.0D; + var30 = 8.0F; + var32 = 0.0F; break; case 3: - var30 = 12.0D; - var32 = 8.0D; + var30 = 12.0F; + var32 = 8.0F; var47 = var22; var22 = var24; var24 = var47; } - var34 = par2.floatValue() + var30 / 16.0D; - var36 = par2.floatValue() + (var30 + 4.0D) / 16.0D; - var38 = (float)par3 + 0.75D; - var40 = (float)par3 + 1.0D; - var42 = par4.floatValue() + var32 / 16.0D; - var44 = par4.floatValue() + (var32 + 4.0D) / 16.0D; + var34 = par2.floatValue() + var30 / 16.0F; + var36 = par2.floatValue() + (var30 + 4.0F) / 16.0F; + var38 = (float)par3 + 0.75F; + var40 = (float)par3 + 1.0F; + var42 = par4.floatValue() + var32 / 16.0F; + var44 = par4.floatValue() + (var32 + 4.0F) / 16.0F; if (var8 != 2 && var8 != 0) { @@ -5674,7 +5674,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 - 1, par4, 0)) { - var8.setBrightness(par1Block.minY > 0.0D ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); + var8.setBrightness(par1Block.minY > 0.0F ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); var8.setColorOpaque_F(var14, var18, var22); this.renderBottomFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0)); var9 = true; @@ -5682,7 +5682,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 + 1, par4, 1)) { - var8.setBrightness(par1Block.maxY < 1.0D ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); + var8.setBrightness(par1Block.maxY < 1.0F ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); var8.setColorOpaque_F(var15, var19, var23); this.renderTopFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 1)); var9 = true; @@ -5690,7 +5690,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE), 2)) { - var8.setBrightness(par1Block.minZ > 0.0D ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); + var8.setBrightness(par1Block.minZ > 0.0F ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); var8.setColorOpaque_F(var16, var20, var24); var8.addTranslation(0.0F, 0.0F, var26); this.renderEastFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2)); @@ -5700,7 +5700,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4.add(BigInteger.ONE), 3)) { - var8.setBrightness(par1Block.maxZ < 1.0D ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); + var8.setBrightness(par1Block.maxZ < 1.0F ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); var8.setColorOpaque_F(var16, var20, var24); var8.addTranslation(0.0F, 0.0F, -var26); this.renderWestFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3)); @@ -5710,7 +5710,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4, 4)) { - var8.setBrightness(par1Block.minX > 0.0D ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); + var8.setBrightness(par1Block.minX > 0.0F ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); var8.setColorOpaque_F(var17, var21, var25); var8.addTranslation(var26, 0.0F, 0.0F); this.renderNorthFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4)); @@ -5720,7 +5720,7 @@ public class RenderBlocks if (this.renderAllFaces || par1Block.shouldSideBeRendered(this.blockAccess, par2.add(BigInteger.ONE), par3, par4, 5)) { - var8.setBrightness(par1Block.maxX < 1.0D ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); + var8.setBrightness(par1Block.maxX < 1.0F ? var28 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); var8.setColorOpaque_F(var17, var21, var25); var8.addTranslation(-var26, 0.0F, 0.0F); this.renderSouthFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5)); @@ -6093,15 +6093,15 @@ public class RenderBlocks float var10 = 0.8F; float var11 = 0.6F; int var12 = par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4); - var5.setBrightness(par1Block.minY > 0.0D ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); + var5.setBrightness(par1Block.minY > 0.0F ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); var5.setColorOpaque_F(var8, var8, var8); this.renderBottomFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 0)); var7 = true; - var5.setBrightness(par1Block.maxY < 1.0D ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); + var5.setBrightness(par1Block.maxY < 1.0F ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 + 1, par4)); var5.setColorOpaque_F(var9, var9, var9); this.renderTopFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 1)); var7 = true; - var5.setBrightness(par1Block.minZ > 0.0D ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); + var5.setBrightness(par1Block.minZ > 0.0F ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.subtract(BigInteger.ONE))); var5.setColorOpaque_F(var10, var10, var10); int var14 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); @@ -6114,7 +6114,7 @@ public class RenderBlocks this.renderEastFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), var14); var7 = true; this.flipTexture = false; - var5.setBrightness(par1Block.maxZ < 1.0D ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); + var5.setBrightness(par1Block.maxZ < 1.0F ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4.add(BigInteger.ONE))); var5.setColorOpaque_F(var10, var10, var10); var14 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); @@ -6127,7 +6127,7 @@ public class RenderBlocks this.renderWestFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), var14); var7 = true; this.flipTexture = false; - var5.setBrightness(par1Block.minX > 0.0D ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); + var5.setBrightness(par1Block.minX > 0.0F ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.subtract(BigInteger.ONE), par3, par4)); var5.setColorOpaque_F(var11, var11, var11); var14 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); @@ -6140,7 +6140,7 @@ public class RenderBlocks this.renderNorthFace(par1Block, FIX_RENDERER ? par2.intValue() & 0xF : par2.floatValue(), FIX_RENDERER ? par3 & 0xF : par3, FIX_RENDERER ? par4.intValue() & 0xF : par4.floatValue(), var14); var7 = true; this.flipTexture = false; - var5.setBrightness(par1Block.maxX < 1.0D ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); + var5.setBrightness(par1Block.maxX < 1.0F ? var12 : par1Block.getMixedBrightnessForBlock(this.blockAccess, par2.add(BigInteger.ONE), par3, par4)); var5.setColorOpaque_F(var11, var11, var11); var14 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); @@ -6159,7 +6159,7 @@ public class RenderBlocks /** * Renders the given texture to the bottom face of the block. Args: block, x, y, z, texture */ - public void renderBottomFace(Block par1Block, double par2, double par4, double par6, int par8) + public void renderBottomFace(Block par1Block, float par2, float par4, float par6, int par8) { Tessellator var9 = tessellator; @@ -6170,34 +6170,34 @@ public class RenderBlocks int var10 = (par8 & 15) << 4; int var11 = par8 & 240; - double var12 = ((float)var10 + par1Block.minX * 16.0D) / 256.0D; - double var14 = ((float)var10 + par1Block.maxX * 16.0D - 0.01D) / 256.0D; - double var16 = ((float)var11 + par1Block.minZ * 16.0D) / 256.0D; - double var18 = ((float)var11 + par1Block.maxZ * 16.0D - 0.01D) / 256.0D; + float var12 = ((float)var10 + par1Block.minX * 16.0F) / 256.0F; + float var14 = ((float)var10 + par1Block.maxX * 16.0F - 0.01F) / 256.0F; + float var16 = ((float)var11 + par1Block.minZ * 16.0F) / 256.0F; + float var18 = ((float)var11 + par1Block.maxZ * 16.0F - 0.01F) / 256.0F; - if (par1Block.minX < 0.0D || par1Block.maxX > 1.0D) + if (par1Block.minX < 0.0F || par1Block.maxX > 1.0F) { var12 = (float)(((float)var10 + 0.0F) / 256.0F); var14 = (float)(((float)var10 + 15.99F) / 256.0F); } - if (par1Block.minZ < 0.0D || par1Block.maxZ > 1.0D) + if (par1Block.minZ < 0.0F || par1Block.maxZ > 1.0F) { var16 = (float)(((float)var11 + 0.0F) / 256.0F); var18 = (float)(((float)var11 + 15.99F) / 256.0F); } - double var20 = var14; - double var22 = var12; - double var24 = var16; - double var26 = var18; + float var20 = var14; + float var22 = var12; + float var24 = var16; + float var26 = var18; if (this.uvRotateBottom == 2) { - var12 = ((float)var10 + par1Block.minZ * 16.0D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.maxX * 16.0D) / 256.0D; - var14 = ((float)var10 + par1Block.maxZ * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.minX * 16.0D) / 256.0D; + var12 = ((float)var10 + par1Block.minZ * 16.0F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.maxX * 16.0F) / 256.0F; + var14 = ((float)var10 + par1Block.maxZ * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.minX * 16.0F) / 256.0F; var24 = var16; var26 = var18; var20 = var12; @@ -6207,10 +6207,10 @@ public class RenderBlocks } else if (this.uvRotateBottom == 1) { - var12 = ((float)(var10 + 16) - par1Block.maxZ * 16.0D) / 256.0D; - var16 = ((float)var11 + par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.maxX * 16.0D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.maxZ * 16.0F) / 256.0F; + var16 = ((float)var11 + par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.maxX * 16.0F) / 256.0F; var20 = var14; var22 = var12; var12 = var14; @@ -6220,21 +6220,21 @@ public class RenderBlocks } else if (this.uvRotateBottom == 3) { - var12 = ((float)(var10 + 16) - par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0D - 0.01D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.maxZ * 16.0D - 0.01D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0F - 0.01F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.maxZ * 16.0F - 0.01F) / 256.0F; var20 = var14; var22 = var12; var24 = var16; var26 = var18; } - double var28 = par2 + par1Block.minX; - double var30 = par2 + par1Block.maxX; - double var32 = par4 + par1Block.minY; - double var34 = par6 + par1Block.minZ; - double var36 = par6 + par1Block.maxZ; + float var28 = par2 + par1Block.minX; + float var30 = par2 + par1Block.maxX; + float var32 = par4 + par1Block.minY; + float var34 = par6 + par1Block.minZ; + float var36 = par6 + par1Block.maxZ; if (this.enableAO) { @@ -6263,7 +6263,7 @@ public class RenderBlocks /** * Renders the given texture to the top face of the block. Args: block, x, y, z, texture */ - public void renderTopFace(Block par1Block, double par2, double par4, double par6, int par8) + public void renderTopFace(Block par1Block, float par2, float par4, float par6, int par8) { Tessellator var9 = tessellator; @@ -6274,34 +6274,34 @@ public class RenderBlocks int var10 = (par8 & 15) << 4; int var11 = par8 & 240; - double var12 = ((float)var10 + par1Block.minX * 16.0D) / 256.0D; - double var14 = ((float)var10 + par1Block.maxX * 16.0D - 0.01D) / 256.0D; - double var16 = ((float)var11 + par1Block.minZ * 16.0D) / 256.0D; - double var18 = ((float)var11 + par1Block.maxZ * 16.0D - 0.01D) / 256.0D; + float var12 = ((float)var10 + par1Block.minX * 16.0F) / 256.0F; + float var14 = ((float)var10 + par1Block.maxX * 16.0F - 0.01F) / 256.0F; + float var16 = ((float)var11 + par1Block.minZ * 16.0F) / 256.0F; + float var18 = ((float)var11 + par1Block.maxZ * 16.0F - 0.01F) / 256.0F; - if (par1Block.minX < 0.0D || par1Block.maxX > 1.0D) + if (par1Block.minX < 0.0F || par1Block.maxX > 1.0F) { var12 = (float)(((float)var10 + 0.0F) / 256.0F); var14 = (float)(((float)var10 + 15.99F) / 256.0F); } - if (par1Block.minZ < 0.0D || par1Block.maxZ > 1.0D) + if (par1Block.minZ < 0.0F || par1Block.maxZ > 1.0F) { var16 = (float)(((float)var11 + 0.0F) / 256.0F); var18 = (float)(((float)var11 + 15.99F) / 256.0F); } - double var20 = var14; - double var22 = var12; - double var24 = var16; - double var26 = var18; + float var20 = var14; + float var22 = var12; + float var24 = var16; + float var26 = var18; if (this.uvRotateTop == 1) { - var12 = ((float)var10 + par1Block.minZ * 16.0D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.maxX * 16.0D) / 256.0D; - var14 = ((float)var10 + par1Block.maxZ * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.minX * 16.0D) / 256.0D; + var12 = ((float)var10 + par1Block.minZ * 16.0F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.maxX * 16.0F) / 256.0F; + var14 = ((float)var10 + par1Block.maxZ * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.minX * 16.0F) / 256.0F; var24 = var16; var26 = var18; var20 = var12; @@ -6311,10 +6311,10 @@ public class RenderBlocks } else if (this.uvRotateTop == 2) { - var12 = ((float)(var10 + 16) - par1Block.maxZ * 16.0D) / 256.0D; - var16 = ((float)var11 + par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.maxX * 16.0D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.maxZ * 16.0F) / 256.0F; + var16 = ((float)var11 + par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.maxX * 16.0F) / 256.0F; var20 = var14; var22 = var12; var12 = var14; @@ -6324,21 +6324,21 @@ public class RenderBlocks } else if (this.uvRotateTop == 3) { - var12 = ((float)(var10 + 16) - par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0D - 0.01D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.maxZ * 16.0D - 0.01D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0F - 0.01F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.maxZ * 16.0F - 0.01F) / 256.0F; var20 = var14; var22 = var12; var24 = var16; var26 = var18; } - double var28 = par2 + par1Block.minX; - double var30 = par2 + par1Block.maxX; - double var32 = par4 + par1Block.maxY; - double var34 = par6 + par1Block.minZ; - double var36 = par6 + par1Block.maxZ; + float var28 = par2 + par1Block.minX; + float var30 = par2 + par1Block.maxX; + float var32 = par4 + par1Block.maxY; + float var34 = par6 + par1Block.minZ; + float var36 = par6 + par1Block.maxZ; if (this.enableAO) { @@ -6367,7 +6367,7 @@ public class RenderBlocks /** * Renders the given texture to the east (z-negative) face of the block. Args: block, x, y, z, texture */ - public void renderEastFace(Block par1Block, double par2, double par4, double par6, int par8) + public void renderEastFace(Block par1Block, float par2, float par4, float par6, int par8) { Tessellator var9 = tessellator; @@ -6378,11 +6378,11 @@ public class RenderBlocks int var10 = (par8 & 15) << 4; int var11 = par8 & 240; - double var12 = ((float)var10 + par1Block.minX * 16.0D) / 256.0D; - double var14 = ((float)var10 + par1Block.maxX * 16.0D - 0.01D) / 256.0D; - double var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0D) / 256.0D; - double var18 = ((float)(var11 + 16) - par1Block.minY * 16.0D - 0.01D) / 256.0D; - double var20; + float var12 = ((float)var10 + par1Block.minX * 16.0F) / 256.0F; + float var14 = ((float)var10 + par1Block.maxX * 16.0F - 0.01F) / 256.0F; + float var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0F) / 256.0F; + float var18 = ((float)(var11 + 16) - par1Block.minY * 16.0F - 0.01F) / 256.0F; + float var20; if (this.flipTexture) { @@ -6391,29 +6391,29 @@ public class RenderBlocks var14 = var20; } - if (par1Block.minX < 0.0D || par1Block.maxX > 1.0D) + if (par1Block.minX < 0.0F || par1Block.maxX > 1.0F) { var12 = (float)(((float)var10 + 0.0F) / 256.0F); var14 = (float)(((float)var10 + 15.99F) / 256.0F); } - if (par1Block.minY < 0.0D || par1Block.maxY > 1.0D) + if (par1Block.minY < 0.0F || par1Block.maxY > 1.0F) { var16 = (float)(((float)var11 + 0.0F) / 256.0F); var18 = (float)(((float)var11 + 15.99F) / 256.0F); } var20 = var14; - double var22 = var12; - double var24 = var16; - double var26 = var18; + float var22 = var12; + float var24 = var16; + float var26 = var18; if (this.uvRotateEast == 2) { - var12 = ((float)var10 + par1Block.minY * 16.0D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)var10 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.maxX * 16.0D) / 256.0D; + var12 = ((float)var10 + par1Block.minY * 16.0F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)var10 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.maxX * 16.0F) / 256.0F; var24 = var16; var26 = var18; var20 = var12; @@ -6423,10 +6423,10 @@ public class RenderBlocks } else if (this.uvRotateEast == 1) { - var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0D) / 256.0D; - var16 = ((float)var11 + par1Block.maxX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.minY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.minX * 16.0D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0F) / 256.0F; + var16 = ((float)var11 + par1Block.maxX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.minY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.minX * 16.0F) / 256.0F; var20 = var14; var22 = var12; var12 = var14; @@ -6436,21 +6436,21 @@ public class RenderBlocks } else if (this.uvRotateEast == 3) { - var12 = ((float)(var10 + 16) - par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0D - 0.01D) / 256.0D; - var16 = ((float)var11 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.minY * 16.0D - 0.01D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0F - 0.01F) / 256.0F; + var16 = ((float)var11 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.minY * 16.0F - 0.01F) / 256.0F; var20 = var14; var22 = var12; var24 = var16; var26 = var18; } - double var28 = par2 + par1Block.minX; - double var30 = par2 + par1Block.maxX; - double var32 = par4 + par1Block.minY; - double var34 = par4 + par1Block.maxY; - double var36 = par6 + par1Block.minZ; + float var28 = par2 + par1Block.minX; + float var30 = par2 + par1Block.maxX; + float var32 = par4 + par1Block.minY; + float var34 = par4 + par1Block.maxY; + float var36 = par6 + par1Block.minZ; if (this.enableAO) { @@ -6479,7 +6479,7 @@ public class RenderBlocks /** * Renders the given texture to the west (z-positive) face of the block. Args: block, x, y, z, texture */ - public void renderWestFace(Block par1Block, double par2, double par4, double par6, int par8) + public void renderWestFace(Block par1Block, float par2, float par4, float par6, int par8) { Tessellator var9 = tessellator; @@ -6490,11 +6490,11 @@ public class RenderBlocks int var10 = (par8 & 15) << 4; int var11 = par8 & 240; - double var12 = ((float)var10 + par1Block.minX * 16.0D) / 256.0D; - double var14 = ((float)var10 + par1Block.maxX * 16.0D - 0.01D) / 256.0D; - double var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0D) / 256.0D; - double var18 = ((float)(var11 + 16) - par1Block.minY * 16.0D - 0.01D) / 256.0D; - double var20; + float var12 = ((float)var10 + par1Block.minX * 16.0F) / 256.0F; + float var14 = ((float)var10 + par1Block.maxX * 16.0F - 0.01F) / 256.0F; + float var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0F) / 256.0F; + float var18 = ((float)(var11 + 16) - par1Block.minY * 16.0F - 0.01F) / 256.0F; + float var20; if (this.flipTexture) { @@ -6503,29 +6503,29 @@ public class RenderBlocks var14 = var20; } - if (par1Block.minX < 0.0D || par1Block.maxX > 1.0D) + if (par1Block.minX < 0.0F || par1Block.maxX > 1.0F) { var12 = (float)(((float)var10 + 0.0F) / 256.0F); var14 = (float)(((float)var10 + 15.99F) / 256.0F); } - if (par1Block.minY < 0.0D || par1Block.maxY > 1.0D) + if (par1Block.minY < 0.0F || par1Block.maxY > 1.0F) { var16 = (float)(((float)var11 + 0.0F) / 256.0F); var18 = (float)(((float)var11 + 15.99F) / 256.0F); } var20 = var14; - double var22 = var12; - double var24 = var16; - double var26 = var18; + float var22 = var12; + float var24 = var16; + float var26 = var18; if (this.uvRotateWest == 1) { - var12 = ((float)var10 + par1Block.minY * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)var10 + par1Block.maxY * 16.0D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.maxX * 16.0D) / 256.0D; + var12 = ((float)var10 + par1Block.minY * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)var10 + par1Block.maxY * 16.0F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.maxX * 16.0F) / 256.0F; var24 = var16; var26 = var18; var20 = var12; @@ -6535,10 +6535,10 @@ public class RenderBlocks } else if (this.uvRotateWest == 2) { - var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0D) / 256.0D; - var16 = ((float)var11 + par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.minY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.maxX * 16.0D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0F) / 256.0F; + var16 = ((float)var11 + par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.minY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.maxX * 16.0F) / 256.0F; var20 = var14; var22 = var12; var12 = var14; @@ -6548,21 +6548,21 @@ public class RenderBlocks } else if (this.uvRotateWest == 3) { - var12 = ((float)(var10 + 16) - par1Block.minX * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0D - 0.01D) / 256.0D; - var16 = ((float)var11 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.minY * 16.0D - 0.01D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.minX * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.maxX * 16.0F - 0.01F) / 256.0F; + var16 = ((float)var11 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.minY * 16.0F - 0.01F) / 256.0F; var20 = var14; var22 = var12; var24 = var16; var26 = var18; } - double var28 = par2 + par1Block.minX; - double var30 = par2 + par1Block.maxX; - double var32 = par4 + par1Block.minY; - double var34 = par4 + par1Block.maxY; - double var36 = par6 + par1Block.maxZ; + float var28 = par2 + par1Block.minX; + float var30 = par2 + par1Block.maxX; + float var32 = par4 + par1Block.minY; + float var34 = par4 + par1Block.maxY; + float var36 = par6 + par1Block.maxZ; if (this.enableAO) { @@ -6591,7 +6591,7 @@ public class RenderBlocks /** * Renders the given texture to the north (x-negative) face of the block. Args: block, x, y, z, texture */ - public void renderNorthFace(Block par1Block, double par2, double par4, double par6, int par8) + public void renderNorthFace(Block par1Block, float par2, float par4, float par6, int par8) { Tessellator var9 = tessellator; @@ -6602,11 +6602,11 @@ public class RenderBlocks int var10 = (par8 & 15) << 4; int var11 = par8 & 240; - double var12 = ((float)var10 + par1Block.minZ * 16.0D) / 256.0D; - double var14 = ((float)var10 + par1Block.maxZ * 16.0D - 0.01D) / 256.0D; - double var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0D) / 256.0D; - double var18 = ((float)(var11 + 16) - par1Block.minY * 16.0D - 0.01D) / 256.0D; - double var20; + float var12 = ((float)var10 + par1Block.minZ * 16.0F) / 256.0F; + float var14 = ((float)var10 + par1Block.maxZ * 16.0F - 0.01F) / 256.0F; + float var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0F) / 256.0F; + float var18 = ((float)(var11 + 16) - par1Block.minY * 16.0F - 0.01F) / 256.0F; + float var20; if (this.flipTexture) { @@ -6615,29 +6615,29 @@ public class RenderBlocks var14 = var20; } - if (par1Block.minZ < 0.0D || par1Block.maxZ > 1.0D) + if (par1Block.minZ < 0.0F || par1Block.maxZ > 1.0F) { var12 = (float)(((float)var10 + 0.0F) / 256.0F); var14 = (float)(((float)var10 + 15.99F) / 256.0F); } - if (par1Block.minY < 0.0D || par1Block.maxY > 1.0D) + if (par1Block.minY < 0.0F || par1Block.maxY > 1.0F) { var16 = (float)(((float)var11 + 0.0F) / 256.0F); var18 = (float)(((float)var11 + 15.99F) / 256.0F); } var20 = var14; - double var22 = var12; - double var24 = var16; - double var26 = var18; + float var22 = var12; + float var24 = var16; + float var26 = var18; if (this.uvRotateNorth == 1) { - var12 = ((float)var10 + par1Block.minY * 16.0D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.maxZ * 16.0D) / 256.0D; - var14 = ((float)var10 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.minZ * 16.0D) / 256.0D; + var12 = ((float)var10 + par1Block.minY * 16.0F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.maxZ * 16.0F) / 256.0F; + var14 = ((float)var10 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.minZ * 16.0F) / 256.0F; var24 = var16; var26 = var18; var20 = var12; @@ -6647,10 +6647,10 @@ public class RenderBlocks } else if (this.uvRotateNorth == 2) { - var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0D) / 256.0D; - var16 = ((float)var11 + par1Block.minZ * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.minY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.maxZ * 16.0D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0F) / 256.0F; + var16 = ((float)var11 + par1Block.minZ * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.minY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.maxZ * 16.0F) / 256.0F; var20 = var14; var22 = var12; var12 = var14; @@ -6660,21 +6660,21 @@ public class RenderBlocks } else if (this.uvRotateNorth == 3) { - var12 = ((float)(var10 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.maxZ * 16.0D - 0.01D) / 256.0D; - var16 = ((float)var11 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.minY * 16.0D - 0.01D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.maxZ * 16.0F - 0.01F) / 256.0F; + var16 = ((float)var11 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.minY * 16.0F - 0.01F) / 256.0F; var20 = var14; var22 = var12; var24 = var16; var26 = var18; } - double var28 = par2 + par1Block.minX; - double var30 = par4 + par1Block.minY; - double var32 = par4 + par1Block.maxY; - double var34 = par6 + par1Block.minZ; - double var36 = par6 + par1Block.maxZ; + float var28 = par2 + par1Block.minX; + float var30 = par4 + par1Block.minY; + float var32 = par4 + par1Block.maxY; + float var34 = par6 + par1Block.minZ; + float var36 = par6 + par1Block.maxZ; if (this.enableAO) { @@ -6703,7 +6703,7 @@ public class RenderBlocks /** * Renders the given texture to the south (x-positive) face of the block. Args: block, x, y, z, texture */ - public void renderSouthFace(Block par1Block, double par2, double par4, double par6, int par8) + public void renderSouthFace(Block par1Block, float par2, float par4, float par6, int par8) { Tessellator var9 = tessellator; @@ -6714,11 +6714,11 @@ public class RenderBlocks int var10 = (par8 & 15) << 4; int var11 = par8 & 240; - double var12 = ((float)var10 + par1Block.minZ * 16.0D) / 256.0D; - double var14 = ((float)var10 + par1Block.maxZ * 16.0D - 0.01D) / 256.0D; - double var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0D) / 256.0D; - double var18 = ((float)(var11 + 16) - par1Block.minY * 16.0D - 0.01D) / 256.0D; - double var20; + float var12 = ((float)var10 + par1Block.minZ * 16.0F) / 256.0F; + float var14 = ((float)var10 + par1Block.maxZ * 16.0F - 0.01F) / 256.0F; + float var16 = ((float)(var11 + 16) - par1Block.maxY * 16.0F) / 256.0F; + float var18 = ((float)(var11 + 16) - par1Block.minY * 16.0F - 0.01F) / 256.0F; + float var20; if (this.flipTexture) { @@ -6727,29 +6727,29 @@ public class RenderBlocks var14 = var20; } - if (par1Block.minZ < 0.0D || par1Block.maxZ > 1.0D) + if (par1Block.minZ < 0.0F || par1Block.maxZ > 1.0F) { var12 = (float)(((float)var10 + 0.0F) / 256.0F); var14 = (float)(((float)var10 + 15.99F) / 256.0F); } - if (par1Block.minY < 0.0D || par1Block.maxY > 1.0D) + if (par1Block.minY < 0.0F || par1Block.maxY > 1.0F) { var16 = (float)(((float)var11 + 0.0F) / 256.0F); var18 = (float)(((float)var11 + 15.99F) / 256.0F); } var20 = var14; - double var22 = var12; - double var24 = var16; - double var26 = var18; + float var22 = var12; + float var24 = var16; + float var26 = var18; if (this.uvRotateSouth == 2) { - var12 = ((float)var10 + par1Block.minY * 16.0D) / 256.0D; - var16 = ((float)(var11 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var14 = ((float)var10 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)(var11 + 16) - par1Block.maxZ * 16.0D) / 256.0D; + var12 = ((float)var10 + par1Block.minY * 16.0F) / 256.0F; + var16 = ((float)(var11 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var14 = ((float)var10 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)(var11 + 16) - par1Block.maxZ * 16.0F) / 256.0F; var24 = var16; var26 = var18; var20 = var12; @@ -6759,10 +6759,10 @@ public class RenderBlocks } else if (this.uvRotateSouth == 1) { - var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0D) / 256.0D; - var16 = ((float)var11 + par1Block.maxZ * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.minY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.minZ * 16.0D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.maxY * 16.0F) / 256.0F; + var16 = ((float)var11 + par1Block.maxZ * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.minY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.minZ * 16.0F) / 256.0F; var20 = var14; var22 = var12; var12 = var14; @@ -6772,21 +6772,21 @@ public class RenderBlocks } else if (this.uvRotateSouth == 3) { - var12 = ((float)(var10 + 16) - par1Block.minZ * 16.0D) / 256.0D; - var14 = ((float)(var10 + 16) - par1Block.maxZ * 16.0D - 0.01D) / 256.0D; - var16 = ((float)var11 + par1Block.maxY * 16.0D) / 256.0D; - var18 = ((float)var11 + par1Block.minY * 16.0D - 0.01D) / 256.0D; + var12 = ((float)(var10 + 16) - par1Block.minZ * 16.0F) / 256.0F; + var14 = ((float)(var10 + 16) - par1Block.maxZ * 16.0F - 0.01F) / 256.0F; + var16 = ((float)var11 + par1Block.maxY * 16.0F) / 256.0F; + var18 = ((float)var11 + par1Block.minY * 16.0F - 0.01F) / 256.0F; var20 = var14; var22 = var12; var24 = var16; var26 = var18; } - double var28 = par2 + par1Block.maxX; - double var30 = par4 + par1Block.minY; - double var32 = par4 + par1Block.maxY; - double var34 = par6 + par1Block.minZ; - double var36 = par6 + par1Block.maxZ; + float var28 = par2 + par1Block.maxX; + float var30 = par4 + par1Block.minY; + float var32 = par4 + par1Block.maxY; + float var34 = par6 + par1Block.minZ; + float var36 = par6 + par1Block.maxZ; if (this.enableAO) { @@ -6848,7 +6848,7 @@ public class RenderBlocks { var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.drawCrossedSquares(par1Block, par2, -0.5D, -0.5D, -0.5D); + this.drawCrossedSquares(par1Block, par2, -0.5F, -0.5F, -0.5F); var4.draw(); } else if (var6 == 19) @@ -6856,7 +6856,7 @@ public class RenderBlocks var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); par1Block.setBlockBoundsForItemRender(); - this.renderBlockStemSmall(par1Block, par2, par1Block.maxY, -0.5D, -0.5D, -0.5D); + this.renderBlockStemSmall(par1Block, par2, par1Block.maxY, -0.5F, -0.5F, -0.5F); var4.draw(); } else if (var6 == 23) @@ -6873,34 +6873,34 @@ public class RenderBlocks var7 = 0.0625F; var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBottomFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(0)); + this.renderBottomFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(0)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 1.0F, 0.0F); - this.renderTopFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(1)); + this.renderTopFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(1)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, -1.0F); var4.addTranslation(0.0F, 0.0F, var7); - this.renderEastFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(2)); + this.renderEastFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(2)); var4.addTranslation(0.0F, 0.0F, -var7); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, 1.0F); var4.addTranslation(0.0F, 0.0F, -var7); - this.renderWestFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(3)); + this.renderWestFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(3)); var4.addTranslation(0.0F, 0.0F, var7); var4.draw(); var4.startDrawingQuads(); var4.setNormal(-1.0F, 0.0F, 0.0F); var4.addTranslation(var7, 0.0F, 0.0F); - this.renderNorthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(4)); + this.renderNorthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(4)); var4.addTranslation(-var7, 0.0F, 0.0F); var4.draw(); var4.startDrawingQuads(); var4.setNormal(1.0F, 0.0F, 0.0F); var4.addTranslation(-var7, 0.0F, 0.0F); - this.renderSouthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(5)); + this.renderSouthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(5)); var4.addTranslation(var7, 0.0F, 0.0F); var4.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); @@ -6916,14 +6916,14 @@ public class RenderBlocks { var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBlockCropsImpl(par1Block, par2, -0.5D, -0.5D, -0.5D); + this.renderBlockCropsImpl(par1Block, par2, -0.5F, -0.5F, -0.5F); var4.draw(); } else if (var6 == 2) { var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderTorchAtAngle(par1Block, -0.5D, -0.5D, -0.5D, 0.0D, 0.0D); + this.renderTorchAtAngle(par1Block, -0.5F, -0.5F, -0.5F, 0.0F, 0.0F); var4.draw(); } else if (var6 == 10) @@ -6943,27 +6943,27 @@ public class RenderBlocks GL11.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBottomFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(0)); + this.renderBottomFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(0)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 1.0F, 0.0F); - this.renderTopFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(1)); + this.renderTopFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(1)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, -1.0F); - this.renderEastFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(2)); + this.renderEastFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(2)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, 1.0F); - this.renderWestFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(3)); + this.renderWestFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(3)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(-1.0F, 0.0F, 0.0F); - this.renderNorthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(4)); + this.renderNorthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(4)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(1.0F, 0.0F, 0.0F); - this.renderSouthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(5)); + this.renderSouthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(5)); var4.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -7029,17 +7029,17 @@ public class RenderBlocks var14 += var17; par1Block.setBlockBounds(0.5F - var11, var13, 0.5F - var11, 0.5F + var11, var12, 0.5F + var11); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBottomFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(0)); + this.renderBottomFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(0)); var4.setNormal(0.0F, 1.0F, 0.0F); - this.renderTopFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(1)); + this.renderTopFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(1)); var4.setNormal(0.0F, 0.0F, -1.0F); - this.renderEastFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(2)); + this.renderEastFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(2)); var4.setNormal(0.0F, 0.0F, 1.0F); - this.renderWestFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(3)); + this.renderWestFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(3)); var4.setNormal(-1.0F, 0.0F, 0.0F); - this.renderNorthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(4)); + this.renderNorthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(4)); var4.setNormal(1.0F, 0.0F, 0.0F); - this.renderSouthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(5)); + this.renderSouthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(5)); } var4.draw(); @@ -7077,27 +7077,27 @@ public class RenderBlocks GL11.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBottomFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(0)); + this.renderBottomFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(0)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 1.0F, 0.0F); - this.renderTopFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(1)); + this.renderTopFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(1)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, -1.0F); - this.renderEastFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(2)); + this.renderEastFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(2)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, 1.0F); - this.renderWestFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(3)); + this.renderWestFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(3)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(-1.0F, 0.0F, 0.0F); - this.renderNorthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(4)); + this.renderNorthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(4)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(1.0F, 0.0F, 0.0F); - this.renderSouthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(5)); + this.renderSouthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(5)); var4.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -7130,27 +7130,27 @@ public class RenderBlocks GL11.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBottomFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(0)); + this.renderBottomFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(0)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 1.0F, 0.0F); - this.renderTopFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(1)); + this.renderTopFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(1)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, -1.0F); - this.renderEastFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(2)); + this.renderEastFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(2)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, 1.0F); - this.renderWestFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(3)); + this.renderWestFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(3)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(-1.0F, 0.0F, 0.0F); - this.renderNorthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(4)); + this.renderNorthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(4)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(1.0F, 0.0F, 0.0F); - this.renderSouthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSide(5)); + this.renderSouthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSide(5)); var4.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -7170,7 +7170,7 @@ public class RenderBlocks GL11.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); - this.renderBottomFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSideAndMetadata(0, par2)); + this.renderBottomFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSideAndMetadata(0, par2)); var4.draw(); if (var5 && this.useInventoryTint) @@ -7184,7 +7184,7 @@ public class RenderBlocks var4.startDrawingQuads(); var4.setNormal(0.0F, 1.0F, 0.0F); - this.renderTopFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSideAndMetadata(1, par2)); + this.renderTopFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSideAndMetadata(1, par2)); var4.draw(); if (var5 && this.useInventoryTint) @@ -7194,19 +7194,19 @@ public class RenderBlocks var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, -1.0F); - this.renderEastFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSideAndMetadata(2, par2)); + this.renderEastFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSideAndMetadata(2, par2)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(0.0F, 0.0F, 1.0F); - this.renderWestFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSideAndMetadata(3, par2)); + this.renderWestFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSideAndMetadata(3, par2)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(-1.0F, 0.0F, 0.0F); - this.renderNorthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSideAndMetadata(4, par2)); + this.renderNorthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSideAndMetadata(4, par2)); var4.draw(); var4.startDrawingQuads(); var4.setNormal(1.0F, 0.0F, 0.0F); - this.renderSouthFace(par1Block, 0.0D, 0.0D, 0.0D, par1Block.getBlockTextureFromSideAndMetadata(5, par2)); + this.renderSouthFace(par1Block, 0.0F, 0.0F, 0.0F, par1Block.getBlockTextureFromSideAndMetadata(5, par2)); var4.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/minecraft/net/minecraft/src/RenderDragon.java b/src/minecraft/net/minecraft/src/RenderDragon.java index 389a2d9..19b1a26 100644 --- a/src/minecraft/net/minecraft/src/RenderDragon.java +++ b/src/minecraft/net/minecraft/src/RenderDragon.java @@ -105,15 +105,15 @@ public class RenderDragon extends RenderLiving float var10 = (float)par1EntityDragon.healingEnderCrystal.innerRotation + par9; float var11 = MathHelper.sin(var10 * 0.2F) / 2.0F + 0.5F; var11 = (var11 * var11 + var11) * 0.2F; - float var12 = (float)(par1EntityDragon.healingEnderCrystal.posX - par1EntityDragon.posX - (par1EntityDragon.prevPosX - par1EntityDragon.posX) * (double)(1.0F - par9)); - float var13 = (float)((double)var11 + par1EntityDragon.healingEnderCrystal.posY - 1.0D - par1EntityDragon.posY - (par1EntityDragon.prevPosY - par1EntityDragon.posY) * (double)(1.0F - par9)); - float var14 = (float)(par1EntityDragon.healingEnderCrystal.posZ - par1EntityDragon.posZ - (par1EntityDragon.prevPosZ - par1EntityDragon.posZ) * (double)(1.0F - par9)); + float var12 = (float)(par1EntityDragon.healingEnderCrystal.posX - par1EntityDragon.posX - (par1EntityDragon.prevPosX - par1EntityDragon.posX) * (float)(1.0F - par9)); + float var13 = (float)((float)var11 + par1EntityDragon.healingEnderCrystal.posY - 1.0D - par1EntityDragon.posY - (par1EntityDragon.prevPosY - par1EntityDragon.posY) * (float)(1.0F - par9)); + float var14 = (float)(par1EntityDragon.healingEnderCrystal.posZ - par1EntityDragon.posZ - (par1EntityDragon.prevPosZ - par1EntityDragon.posZ) * (float)(1.0F - par9)); float var15 = MathHelper.sqrt_float(var12 * var12 + var14 * var14); float var16 = MathHelper.sqrt_float(var12 * var12 + var13 * var13 + var14 * var14); GL11.glPushMatrix(); GL11.glTranslatef((float)par2, (float)par4 + 2.0F, (float)par6); - GL11.glRotatef((float)(-Math.atan2((double)var14, (double)var12)) * 180.0F / (float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef((float)(-Math.atan2((double)var15, (double)var13)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef((float)(-Math.atan2((float)var14, (float)var12)) * 180.0F / (float)(float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef((float)(-Math.atan2((float)var15, (float)var13)) * 180.0F / (float)(float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); Tessellator var17 = Tessellator.instance; RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_CULL_FACE); @@ -126,13 +126,13 @@ public class RenderDragon extends RenderLiving for (int var21 = 0; var21 <= var20; ++var21) { - float var22 = MathHelper.sin((float)(var21 % var20) * (float)Math.PI * 2.0F / (float)var20) * 0.75F; - float var23 = MathHelper.cos((float)(var21 % var20) * (float)Math.PI * 2.0F / (float)var20) * 0.75F; + float var22 = MathHelper.sin((float)(var21 % var20) * (float)(float)Math.PI * 2.0F / (float)var20) * 0.75F; + float var23 = MathHelper.cos((float)(var21 % var20) * (float)(float)Math.PI * 2.0F / (float)var20) * 0.75F; float var24 = (float)(var21 % var20) * 1.0F / (float)var20; var17.setColorOpaque_I(0); - var17.addVertexWithUV((double)(var22 * 0.2F), (double)(var23 * 0.2F), 0.0D, (double)var24, (double)var19); + var17.addVertexWithUV((float)(var22 * 0.2F), (float)(var23 * 0.2F), 0.0D, (float)var24, (float)var19); var17.setColorOpaque_I(16777215); - var17.addVertexWithUV((double)var22, (double)var23, (double)var16, (double)var24, (double)var18); + var17.addVertexWithUV((float)var22, (float)var23, (float)var16, (float)var24, (float)var18); } var17.draw(); @@ -187,10 +187,10 @@ public class RenderDragon extends RenderLiving var3.setColorRGBA_I(16777215, (int)(255.0F * (1.0F - var5))); var3.addVertex(0.0D, 0.0D, 0.0D); var3.setColorRGBA_I(16711935, 0); - var3.addVertex(-0.866D * (double)var9, (double)var8, (double)(-0.5F * var9)); - var3.addVertex(0.866D * (double)var9, (double)var8, (double)(-0.5F * var9)); - var3.addVertex(0.0D, (double)var8, (double)(1.0F * var9)); - var3.addVertex(-0.866D * (double)var9, (double)var8, (double)(-0.5F * var9)); + var3.addVertex(-0.866D * (float)var9, (float)var8, (float)(-0.5F * var9)); + var3.addVertex(0.866D * (float)var9, (float)var8, (float)(-0.5F * var9)); + var3.addVertex(0.0D, (float)var8, (float)(1.0F * var9)); + var3.addVertex(-0.866D * (float)var9, (float)var8, (float)(-0.5F * var9)); var3.draw(); } diff --git a/src/minecraft/net/minecraft/src/RenderEnchantmentTable.java b/src/minecraft/net/minecraft/src/RenderEnchantmentTable.java index 7c2d6d3..e8baf27 100644 --- a/src/minecraft/net/minecraft/src/RenderEnchantmentTable.java +++ b/src/minecraft/net/minecraft/src/RenderEnchantmentTable.java @@ -14,24 +14,24 @@ public class RenderEnchantmentTable extends TileEntitySpecialRenderer GL11.glTranslatef(0.0F, 0.1F + MathHelper.sin(var9 * 0.1F) * 0.01F, 0.0F); float var10; - for (var10 = par1TileEntityEnchantmentTable.bookRotation2 - par1TileEntityEnchantmentTable.bookRotationPrev; var10 >= (float)Math.PI; var10 -= ((float)Math.PI * 2F)) + for (var10 = par1TileEntityEnchantmentTable.bookRotation2 - par1TileEntityEnchantmentTable.bookRotationPrev; var10 >= (float)(float)Math.PI; var10 -= ((float)(float)Math.PI * 2F)) { ; } - while (var10 < -(float)Math.PI) + while (var10 < -(float)(float)Math.PI) { - var10 += ((float)Math.PI * 2F); + var10 += ((float)(float)Math.PI * 2F); } float var11 = par1TileEntityEnchantmentTable.bookRotationPrev + var10 * par8; - GL11.glRotatef(-var11 * 180.0F / (float)Math.PI, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-var11 * 180.0F / (float)(float)Math.PI, 0.0F, 1.0F, 0.0F); GL11.glRotatef(80.0F, 0.0F, 0.0F, 1.0F); this.bindTextureByName("/item/book.png"); float var12 = par1TileEntityEnchantmentTable.pageFlipPrev + (par1TileEntityEnchantmentTable.pageFlip - par1TileEntityEnchantmentTable.pageFlipPrev) * par8 + 0.25F; float var13 = par1TileEntityEnchantmentTable.pageFlipPrev + (par1TileEntityEnchantmentTable.pageFlip - par1TileEntityEnchantmentTable.pageFlipPrev) * par8 + 0.75F; - var12 = (var12 - (float)MathHelper.truncateDoubleToInt((double)var12)) * 1.6F - 0.3F; - var13 = (var13 - (float)MathHelper.truncateDoubleToInt((double)var13)) * 1.6F - 0.3F; + var12 = (var12 - (float)MathHelper.truncateDoubleToInt((float)var12)) * 1.6F - 0.3F; + var13 = (var13 - (float)MathHelper.truncateDoubleToInt((float)var13)) * 1.6F - 0.3F; if (var12 < 0.0F) { diff --git a/src/minecraft/net/minecraft/src/RenderEndPortal.java b/src/minecraft/net/minecraft/src/RenderEndPortal.java index 8c9b919..1c62b2a 100644 --- a/src/minecraft/net/minecraft/src/RenderEndPortal.java +++ b/src/minecraft/net/minecraft/src/RenderEndPortal.java @@ -43,11 +43,11 @@ public class RenderEndPortal extends TileEntitySpecialRenderer var16 = 0.5F; } - float var18 = (float)(-(par4 + (double)var13)); + float var18 = (float)(-(par4 + (float)var13)); float var19 = var18 + ActiveRenderInfo.objectY; float var20 = var18 + var15 + ActiveRenderInfo.objectY; float var21 = var19 / var20; - var21 += (float)(par4 + (double)var13); + var21 += (float)(par4 + (float)var13); GL11.glTranslatef(var9, var21, var11); GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); GL11.glTexGeni(GL11.GL_T, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); @@ -87,10 +87,10 @@ public class RenderEndPortal extends TileEntitySpecialRenderer } var24.setColorRGBA_F(var21 * var17, var22 * var17, var23 * var17, 1.0F); - var24.addVertex(par2, par4 + (double)var13, par6); - var24.addVertex(par2, par4 + (double)var13, par6 + 1.0D); - var24.addVertex(par2 + 1.0D, par4 + (double)var13, par6 + 1.0D); - var24.addVertex(par2 + 1.0D, par4 + (double)var13, par6); + var24.addVertex(par2, par4 + (float)var13, par6); + var24.addVertex(par2, par4 + (float)var13, par6 + 1.0D); + var24.addVertex(par2 + 1.0D, par4 + (float)var13, par6 + 1.0D); + var24.addVertex(par2 + 1.0D, par4 + (float)var13, par6); var24.draw(); GL11.glPopMatrix(); GL11.glMatrixMode(GL11.GL_MODELVIEW); diff --git a/src/minecraft/net/minecraft/src/RenderFallingSand.java b/src/minecraft/net/minecraft/src/RenderFallingSand.java index 2b1e60b..f28a83a 100644 --- a/src/minecraft/net/minecraft/src/RenderFallingSand.java +++ b/src/minecraft/net/minecraft/src/RenderFallingSand.java @@ -28,7 +28,7 @@ public class RenderFallingSand extends Render this.renderBlocks.blockAccess = var11; Tessellator var12 = Tessellator.instance; var12.startDrawingQuads(); - var12.setTranslation((double)((float)(-MathHelper.floor_double(par1EntityFallingSand.posX)) - 0.5F), (double)((float)(-MathHelper.floor_double(par1EntityFallingSand.posY)) - 0.5F), (double)((float)(-MathHelper.floor_double(par1EntityFallingSand.posZ)) - 0.5F)); + var12.setTranslation((float)((float)(-MathHelper.floor_double(par1EntityFallingSand.posX)) - 0.5F), (float)((float)(-MathHelper.floor_double(par1EntityFallingSand.posY)) - 0.5F), (float)((float)(-MathHelper.floor_double(par1EntityFallingSand.posZ)) - 0.5F)); this.renderBlocks.renderBlockByRenderType(var10, MathHelper.floor_double_BigInteger(par1EntityFallingSand.posX), MathHelper.floor_double(par1EntityFallingSand.posY), MathHelper.floor_double_BigInteger(par1EntityFallingSand.posZ)); var12.setTranslation(0.0D, 0.0D, 0.0D); var12.draw(); diff --git a/src/minecraft/net/minecraft/src/RenderFireball.java b/src/minecraft/net/minecraft/src/RenderFireball.java index 81dd51f..04e6848 100644 --- a/src/minecraft/net/minecraft/src/RenderFireball.java +++ b/src/minecraft/net/minecraft/src/RenderFireball.java @@ -33,10 +33,10 @@ public class RenderFireball extends Render GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); var12.startDrawingQuads(); var12.setNormal(0.0F, 1.0F, 0.0F); - var12.addVertexWithUV((double)(0.0F - var18), (double)(0.0F - var19), 0.0D, (double)var13, (double)var16); - var12.addVertexWithUV((double)(var17 - var18), (double)(0.0F - var19), 0.0D, (double)var14, (double)var16); - var12.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15); - var12.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15); + var12.addVertexWithUV((float)(0.0F - var18), (float)(0.0F - var19), 0.0D, (float)var13, (float)var16); + var12.addVertexWithUV((float)(var17 - var18), (float)(0.0F - var19), 0.0D, (float)var14, (float)var16); + var12.addVertexWithUV((float)(var17 - var18), (float)(1.0F - var19), 0.0D, (float)var14, (float)var15); + var12.addVertexWithUV((float)(0.0F - var18), (float)(1.0F - var19), 0.0D, (float)var13, (float)var15); var12.draw(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); diff --git a/src/minecraft/net/minecraft/src/RenderFish.java b/src/minecraft/net/minecraft/src/RenderFish.java index fee49ea..5c0757a 100644 --- a/src/minecraft/net/minecraft/src/RenderFish.java +++ b/src/minecraft/net/minecraft/src/RenderFish.java @@ -30,10 +30,10 @@ public class RenderFish extends Render GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); var12.startDrawingQuads(); var12.setNormal(0.0F, 1.0F, 0.0F); - var12.addVertexWithUV((double)(0.0F - var18), (double)(0.0F - var19), 0.0D, (double)var13, (double)var16); - var12.addVertexWithUV((double)(var17 - var18), (double)(0.0F - var19), 0.0D, (double)var14, (double)var16); - var12.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15); - var12.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15); + var12.addVertexWithUV((float)(0.0F - var18), (float)(0.0F - var19), 0.0D, (float)var13, (float)var16); + var12.addVertexWithUV((float)(var17 - var18), (float)(0.0F - var19), 0.0D, (float)var14, (float)var16); + var12.addVertexWithUV((float)(var17 - var18), (float)(1.0F - var19), 0.0D, (float)var14, (float)var15); + var12.addVertexWithUV((float)(0.0F - var18), (float)(1.0F - var19), 0.0D, (float)var13, (float)var15); var12.draw(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); @@ -41,33 +41,33 @@ public class RenderFish extends Render if (par1EntityFishHook.angler != null) { float var20 = par1EntityFishHook.angler.getSwingProgress(par9); - float var21 = MathHelper.sin(MathHelper.sqrt_float(var20) * (float)Math.PI); + float var21 = MathHelper.sin(MathHelper.sqrt_float(var20) * (float)(float)Math.PI); Vec3 var22 = Vec3.getVec3Pool().getVecFromPool(-0.5D, 0.03D, 0.8D); - var22.rotateAroundX(-(par1EntityFishHook.angler.prevRotationPitch + (par1EntityFishHook.angler.rotationPitch - par1EntityFishHook.angler.prevRotationPitch) * par9) * (float)Math.PI / 180.0F); - var22.rotateAroundY(-(par1EntityFishHook.angler.prevRotationYaw + (par1EntityFishHook.angler.rotationYaw - par1EntityFishHook.angler.prevRotationYaw) * par9) * (float)Math.PI / 180.0F); + var22.rotateAroundX(-(par1EntityFishHook.angler.prevRotationPitch + (par1EntityFishHook.angler.rotationPitch - par1EntityFishHook.angler.prevRotationPitch) * par9) * (float)(float)Math.PI / 180.0F); + var22.rotateAroundY(-(par1EntityFishHook.angler.prevRotationYaw + (par1EntityFishHook.angler.rotationYaw - par1EntityFishHook.angler.prevRotationYaw) * par9) * (float)(float)Math.PI / 180.0F); var22.rotateAroundY(var21 * 0.5F); var22.rotateAroundX(-var21 * 0.7F); - double var23 = par1EntityFishHook.angler.prevPosX + (par1EntityFishHook.angler.posX - par1EntityFishHook.angler.prevPosX) * (double)par9 + var22.xCoord; - double var25 = par1EntityFishHook.angler.prevPosY + (par1EntityFishHook.angler.posY - par1EntityFishHook.angler.prevPosY) * (double)par9 + var22.yCoord; - double var27 = par1EntityFishHook.angler.prevPosZ + (par1EntityFishHook.angler.posZ - par1EntityFishHook.angler.prevPosZ) * (double)par9 + var22.zCoord; - double var29 = par1EntityFishHook.angler != Minecraft.getMinecraft().thePlayer ? (double)par1EntityFishHook.angler.getEyeHeight() : 0.0D; + double var23 = par1EntityFishHook.angler.prevPosX + (par1EntityFishHook.angler.posX - par1EntityFishHook.angler.prevPosX) * (float)par9 + var22.xCoord; + double var25 = par1EntityFishHook.angler.prevPosY + (par1EntityFishHook.angler.posY - par1EntityFishHook.angler.prevPosY) * (float)par9 + var22.yCoord; + double var27 = par1EntityFishHook.angler.prevPosZ + (par1EntityFishHook.angler.posZ - par1EntityFishHook.angler.prevPosZ) * (float)par9 + var22.zCoord; + double var29 = par1EntityFishHook.angler != Minecraft.getMinecraft().thePlayer ? (float)par1EntityFishHook.angler.getEyeHeight() : 0.0D; if (this.renderManager.options.thirdPersonView > 0 || par1EntityFishHook.angler != Minecraft.getMinecraft().thePlayer) { - float var31 = (par1EntityFishHook.angler.prevRenderYawOffset + (par1EntityFishHook.angler.renderYawOffset - par1EntityFishHook.angler.prevRenderYawOffset) * par9) * (float)Math.PI / 180.0F; - double var32 = (double)MathHelper.sin(var31); - double var34 = (double)MathHelper.cos(var31); - var23 = par1EntityFishHook.angler.prevPosX + (par1EntityFishHook.angler.posX - par1EntityFishHook.angler.prevPosX) * (double)par9 - var34 * 0.35D - var32 * 0.85D; - var25 = par1EntityFishHook.angler.prevPosY + var29 + (par1EntityFishHook.angler.posY - par1EntityFishHook.angler.prevPosY) * (double)par9 - 0.45D; - var27 = par1EntityFishHook.angler.prevPosZ + (par1EntityFishHook.angler.posZ - par1EntityFishHook.angler.prevPosZ) * (double)par9 - var32 * 0.35D + var34 * 0.85D; + float var31 = (par1EntityFishHook.angler.prevRenderYawOffset + (par1EntityFishHook.angler.renderYawOffset - par1EntityFishHook.angler.prevRenderYawOffset) * par9) * (float)(float)Math.PI / 180.0F; + double var32 = (float)MathHelper.sin(var31); + double var34 = (float)MathHelper.cos(var31); + var23 = par1EntityFishHook.angler.prevPosX + (par1EntityFishHook.angler.posX - par1EntityFishHook.angler.prevPosX) * (float)par9 - var34 * 0.35D - var32 * 0.85D; + var25 = par1EntityFishHook.angler.prevPosY + var29 + (par1EntityFishHook.angler.posY - par1EntityFishHook.angler.prevPosY) * (float)par9 - 0.45D; + var27 = par1EntityFishHook.angler.prevPosZ + (par1EntityFishHook.angler.posZ - par1EntityFishHook.angler.prevPosZ) * (float)par9 - var32 * 0.35D + var34 * 0.85D; } - double var46 = par1EntityFishHook.prevPosX + (par1EntityFishHook.posX - par1EntityFishHook.prevPosX) * (double)par9; - double var33 = par1EntityFishHook.prevPosY + (par1EntityFishHook.posY - par1EntityFishHook.prevPosY) * (double)par9 + 0.25D; - double var35 = par1EntityFishHook.prevPosZ + (par1EntityFishHook.posZ - par1EntityFishHook.prevPosZ) * (double)par9; - double var37 = (double)((float)(var23 - var46)); - double var39 = (double)((float)(var25 - var33)); - double var41 = (double)((float)(var27 - var35)); + double var46 = par1EntityFishHook.prevPosX + (par1EntityFishHook.posX - par1EntityFishHook.prevPosX) * (float)par9; + double var33 = par1EntityFishHook.prevPosY + (par1EntityFishHook.posY - par1EntityFishHook.prevPosY) * (float)par9 + 0.25D; + double var35 = par1EntityFishHook.prevPosZ + (par1EntityFishHook.posZ - par1EntityFishHook.prevPosZ) * (float)par9; + double var37 = (float)((float)(var23 - var46)); + double var39 = (float)((float)(var25 - var33)); + double var41 = (float)((float)(var27 - var35)); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_LIGHTING); var12.startDrawing(3); @@ -77,7 +77,7 @@ public class RenderFish extends Render for (int var44 = 0; var44 <= var43; ++var44) { float var45 = (float)var44 / (float)var43; - var12.addVertex(par2 + var37 * (double)var45, par4 + var39 * (double)(var45 * var45 + var45) * 0.5D + 0.25D, par6 + var41 * (double)var45); + var12.addVertex(par2 + var37 * (float)var45, par4 + var39 * (float)(var45 * var45 + var45) * 0.5D + 0.25D, par6 + var41 * (float)var45); } var12.draw(); diff --git a/src/minecraft/net/minecraft/src/RenderGlobal.java b/src/minecraft/net/minecraft/src/RenderGlobal.java index 986fe0b..4e3bb5c 100644 --- a/src/minecraft/net/minecraft/src/RenderGlobal.java +++ b/src/minecraft/net/minecraft/src/RenderGlobal.java @@ -192,10 +192,10 @@ public class RenderGlobal implements IWorldAccess for (var10 = -var7 * var8; var10 <= var7 * var8; var10 += var7) { var5.startDrawingQuads(); - var5.addVertex((double)(var9 + 0), (double)var6, (double)(var10 + 0)); - var5.addVertex((double)(var9 + var7), (double)var6, (double)(var10 + 0)); - var5.addVertex((double)(var9 + var7), (double)var6, (double)(var10 + var7)); - var5.addVertex((double)(var9 + 0), (double)var6, (double)(var10 + var7)); + var5.addVertex((float)(var9 + 0), (float)var6, (float)(var10 + 0)); + var5.addVertex((float)(var9 + var7), (float)var6, (float)(var10 + 0)); + var5.addVertex((float)(var9 + var7), (float)var6, (float)(var10 + var7)); + var5.addVertex((float)(var9 + 0), (float)var6, (float)(var10 + var7)); var5.draw(); } } @@ -210,10 +210,10 @@ public class RenderGlobal implements IWorldAccess { for (var10 = -var7 * var8; var10 <= var7 * var8; var10 += var7) { - var5.addVertex((double)(var9 + var7), (double)var6, (double)(var10 + 0)); - var5.addVertex((double)(var9 + 0), (double)var6, (double)(var10 + 0)); - var5.addVertex((double)(var9 + 0), (double)var6, (double)(var10 + var7)); - var5.addVertex((double)(var9 + var7), (double)var6, (double)(var10 + var7)); + var5.addVertex((float)(var9 + var7), (float)var6, (float)(var10 + 0)); + var5.addVertex((float)(var9 + 0), (float)var6, (float)(var10 + 0)); + var5.addVertex((float)(var9 + 0), (float)var6, (float)(var10 + var7)); + var5.addVertex((float)(var9 + var7), (float)var6, (float)(var10 + var7)); } } @@ -239,10 +239,10 @@ public class RenderGlobal implements IWorldAccess for (int var3 = 0; var3 < 1500; ++var3) { - double var4 = (double)(var1.nextFloat() * 2.0F - 1.0F); - double var6 = (double)(var1.nextFloat() * 2.0F - 1.0F); - double var8 = (double)(var1.nextFloat() * 2.0F - 1.0F); - double var10 = (double)(0.15F + var1.nextFloat() * 0.1F); + double var4 = (float)(var1.nextFloat() * 2.0F - 1.0F); + double var6 = (float)(var1.nextFloat() * 2.0F - 1.0F); + double var8 = (float)(var1.nextFloat() * 2.0F - 1.0F); + double var10 = (float)(0.15F + var1.nextFloat() * 0.1F); double var12 = var4 * var4 + var6 * var6 + var8 * var8; if (var12 < 1.0D && var12 > 0.01D) @@ -255,20 +255,20 @@ public class RenderGlobal implements IWorldAccess double var16 = var6 * 100.0D; double var18 = var8 * 100.0D; double var20 = Math.atan2(var4, var8); - double var22 = Math.sin(var20); - double var24 = Math.cos(var20); + double var22 = (float)Math.sin(var20); + double var24 = (float)Math.cos(var20); double var26 = Math.atan2(Math.sqrt(var4 * var4 + var8 * var8), var6); - double var28 = Math.sin(var26); - double var30 = Math.cos(var26); - double var32 = var1.nextDouble() * Math.PI * 2.0D; - double var34 = Math.sin(var32); - double var36 = Math.cos(var32); + double var28 = (float)Math.sin(var26); + double var30 = (float)Math.cos(var26); + double var32 = var1.nextDouble() * (float)Math.PI * 2.0D; + double var34 = (float)Math.sin(var32); + double var36 = (float)Math.cos(var32); for (int var38 = 0; var38 < 4; ++var38) { double var39 = 0.0D; - double var41 = (double)((var38 & 2) - 1) * var10; - double var43 = (double)((var38 + 1 & 2) - 1) * var10; + double var41 = (float)((var38 & 2) - 1) * var10; + double var43 = (float)((var38 + 1 & 2) - 1) * var10; double var47 = var41 * var36 - var43 * var34; double var49 = var43 * var36 + var41 * var34; double var53 = var47 * var28 + var39 * var30; @@ -419,13 +419,13 @@ public class RenderGlobal implements IWorldAccess this.countEntitiesRendered = 0; this.countEntitiesHidden = 0; EntityLiving var4 = this.mc.renderViewEntity; - RenderManager.renderPosX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (double)par3; - RenderManager.renderPosY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par3; - RenderManager.renderPosZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (double)par3; - TileEntityRenderer.staticPlayerX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (double)par3; - TileEntityRenderer.staticPlayerY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par3; - TileEntityRenderer.staticPlayerZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (double)par3; - this.mc.entityRenderer.enableLightmap((double)par3); + RenderManager.renderPosX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (float)par3; + RenderManager.renderPosY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (float)par3; + RenderManager.renderPosZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (float)par3; + TileEntityRenderer.staticPlayerX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (float)par3; + TileEntityRenderer.staticPlayerY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (float)par3; + TileEntityRenderer.staticPlayerZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (float)par3; + this.mc.entityRenderer.enableLightmap((float)par3); this.theWorld.theProfiler.endStartSection("global"); List var5 = this.theWorld.getLoadedEntityList(); this.countEntitiesTotal = var5.size(); @@ -466,7 +466,7 @@ public class RenderGlobal implements IWorldAccess TileEntityRenderer.instance.renderTileEntity(var9, par3); } - this.mc.entityRenderer.disableLightmap((double)par3); + this.mc.entityRenderer.disableLightmap((float)par3); this.theWorld.theProfiler.endSection(); } } @@ -708,9 +708,9 @@ public class RenderGlobal implements IWorldAccess if (this.cloudOffsetX % var25 == var23 % var25) { WorldRenderer var26 = this.sortedWorldRenderers[var23]; - float var27 = (float)((double)MathHelper.toBigDecimal(var26.posXMinus).subtract(var33).doubleValue()); - float var28 = (float)((double)var26.posYMinus - var7); - float var29 = (float)((double)MathHelper.toBigDecimal(var26.posZMinus).subtract(var9).doubleValue()); + float var27 = (float)((float)MathHelper.toBigDecimal(var26.posXMinus).subtract(var33).doubleValue()); + float var28 = (float)((float)var26.posYMinus - var7); + float var29 = (float)((float)MathHelper.toBigDecimal(var26.posZMinus).subtract(var9).doubleValue()); float var30 = var27 - var36; float var31 = var28 - var21; float var32 = var29 - var22; @@ -1035,10 +1035,10 @@ public class RenderGlobal implements IWorldAccess for (int var27 = 0; var27 <= var26; ++var27) { - var13 = (float)var27 * (float)Math.PI * 2.0F / (float)var26; + var13 = (float)var27 * (float)(float)Math.PI * 2.0F / (float)var26; float var14 = MathHelper.sin(var13); float var15 = MathHelper.cos(var13); - var23.addVertex((double)(var14 * 120.0F), (double)(var15 * 120.0F), (double)(-var15 * 40.0F * var24[3])); + var23.addVertex((float)(var14 * 120.0F), (float)(var15 * 120.0F), (float)(-var15 * 40.0F * var24[3])); } var23.draw(); @@ -1060,10 +1060,10 @@ public class RenderGlobal implements IWorldAccess var12 = 30.0F; GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.renderEngine.getTexture("/terrain/sun.png")); var23.startDrawingQuads(); - var23.addVertexWithUV((double)(-var12), 100.0D, (double)(-var12), 0.0D, 0.0D); - var23.addVertexWithUV((double)var12, 100.0D, (double)(-var12), 1.0D, 0.0D); - var23.addVertexWithUV((double)var12, 100.0D, (double)var12, 1.0D, 1.0D); - var23.addVertexWithUV((double)(-var12), 100.0D, (double)var12, 0.0D, 1.0D); + var23.addVertexWithUV((float)(-var12), 100.0D, (float)(-var12), 0.0D, 0.0D); + var23.addVertexWithUV((float)var12, 100.0D, (float)(-var12), 1.0D, 0.0D); + var23.addVertexWithUV((float)var12, 100.0D, (float)var12, 1.0D, 1.0D); + var23.addVertexWithUV((float)(-var12), 100.0D, (float)var12, 0.0D, 1.0D); var23.draw(); var12 = 20.0F; GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.renderEngine.getTexture("/terrain/moon_phases.png")); @@ -1075,10 +1075,10 @@ public class RenderGlobal implements IWorldAccess float var18 = (float)(var29 + 1) / 4.0F; float var19 = (float)(var30 + 1) / 2.0F; var23.startDrawingQuads(); - var23.addVertexWithUV((double)(-var12), -100.0D, (double)var12, (double)var18, (double)var19); - var23.addVertexWithUV((double)var12, -100.0D, (double)var12, (double)var16, (double)var19); - var23.addVertexWithUV((double)var12, -100.0D, (double)(-var12), (double)var16, (double)var17); - var23.addVertexWithUV((double)(-var12), -100.0D, (double)(-var12), (double)var18, (double)var17); + var23.addVertexWithUV((float)(-var12), -100.0D, (float)var12, (float)var18, (float)var19); + var23.addVertexWithUV((float)var12, -100.0D, (float)var12, (float)var16, (float)var19); + var23.addVertexWithUV((float)var12, -100.0D, (float)(-var12), (float)var16, (float)var17); + var23.addVertexWithUV((float)(-var12), -100.0D, (float)(-var12), (float)var18, (float)var17); var23.draw(); GL11.glDisable(GL11.GL_TEXTURE_2D); float var20 = this.theWorld.getStarBrightness(par1) * var8; @@ -1109,26 +1109,26 @@ public class RenderGlobal implements IWorldAccess var12 = -var10; var23.startDrawingQuads(); var23.setColorRGBA_I(0, 255); - var23.addVertex((double)(-var10), (double)var11, (double)var10); - var23.addVertex((double)var10, (double)var11, (double)var10); - var23.addVertex((double)var10, (double)var12, (double)var10); - var23.addVertex((double)(-var10), (double)var12, (double)var10); - var23.addVertex((double)(-var10), (double)var12, (double)(-var10)); - var23.addVertex((double)var10, (double)var12, (double)(-var10)); - var23.addVertex((double)var10, (double)var11, (double)(-var10)); - var23.addVertex((double)(-var10), (double)var11, (double)(-var10)); - var23.addVertex((double)var10, (double)var12, (double)(-var10)); - var23.addVertex((double)var10, (double)var12, (double)var10); - var23.addVertex((double)var10, (double)var11, (double)var10); - var23.addVertex((double)var10, (double)var11, (double)(-var10)); - var23.addVertex((double)(-var10), (double)var11, (double)(-var10)); - var23.addVertex((double)(-var10), (double)var11, (double)var10); - var23.addVertex((double)(-var10), (double)var12, (double)var10); - var23.addVertex((double)(-var10), (double)var12, (double)(-var10)); - var23.addVertex((double)(-var10), (double)var12, (double)(-var10)); - var23.addVertex((double)(-var10), (double)var12, (double)var10); - var23.addVertex((double)var10, (double)var12, (double)var10); - var23.addVertex((double)var10, (double)var12, (double)(-var10)); + var23.addVertex((float)(-var10), (float)var11, (float)var10); + var23.addVertex((float)var10, (float)var11, (float)var10); + var23.addVertex((float)var10, (float)var12, (float)var10); + var23.addVertex((float)(-var10), (float)var12, (float)var10); + var23.addVertex((float)(-var10), (float)var12, (float)(-var10)); + var23.addVertex((float)var10, (float)var12, (float)(-var10)); + var23.addVertex((float)var10, (float)var11, (float)(-var10)); + var23.addVertex((float)(-var10), (float)var11, (float)(-var10)); + var23.addVertex((float)var10, (float)var12, (float)(-var10)); + var23.addVertex((float)var10, (float)var12, (float)var10); + var23.addVertex((float)var10, (float)var11, (float)var10); + var23.addVertex((float)var10, (float)var11, (float)(-var10)); + var23.addVertex((float)(-var10), (float)var11, (float)(-var10)); + var23.addVertex((float)(-var10), (float)var11, (float)var10); + var23.addVertex((float)(-var10), (float)var12, (float)var10); + var23.addVertex((float)(-var10), (float)var12, (float)(-var10)); + var23.addVertex((float)(-var10), (float)var12, (float)(-var10)); + var23.addVertex((float)(-var10), (float)var12, (float)var10); + var23.addVertex((float)var10, (float)var12, (float)var10); + var23.addVertex((float)var10, (float)var12, (float)(-var10)); var23.draw(); } @@ -1161,7 +1161,7 @@ public class RenderGlobal implements IWorldAccess else { GL11.glDisable(GL11.GL_CULL_FACE); - float var2 = (float)(this.mc.renderViewEntity.lastTickPosY + (this.mc.renderViewEntity.posY - this.mc.renderViewEntity.lastTickPosY) * (double)par1); + float var2 = (float)(this.mc.renderViewEntity.lastTickPosY + (this.mc.renderViewEntity.posY - this.mc.renderViewEntity.lastTickPosY) * (float)par1); byte var3 = 32; int var4 = 256 / var3; Tessellator var5 = Tessellator.instance; @@ -1185,16 +1185,16 @@ public class RenderGlobal implements IWorldAccess } var10 = 4.8828125E-4F; - double var24 = (double)((float)this.cloudOffsetX + par1); - double var13 = this.mc.renderViewEntity.prevPosX + (this.mc.renderViewEntity.posX - this.mc.renderViewEntity.prevPosX) * (double)par1 + var24 * 0.029999999329447746D; - double var15 = this.mc.renderViewEntity.prevPosZ + (this.mc.renderViewEntity.posZ - this.mc.renderViewEntity.prevPosZ) * (double)par1; + double var24 = (float)((float)this.cloudOffsetX + par1); + double var13 = this.mc.renderViewEntity.prevPosX + (this.mc.renderViewEntity.posX - this.mc.renderViewEntity.prevPosX) * (float)par1 + var24 * 0.029999999329447746D; + double var15 = this.mc.renderViewEntity.prevPosZ + (this.mc.renderViewEntity.posZ - this.mc.renderViewEntity.prevPosZ) * (float)par1; int var17 = MathHelper.floor_double(var13 / 2048.0D); int var18 = MathHelper.floor_double(var15 / 2048.0D); - var13 -= (double)(var17 * 2048); - var15 -= (double)(var18 * 2048); + var13 -= (float)(var17 * 2048); + var15 -= (float)(var18 * 2048); float var19 = this.theWorld.provider.getCloudHeight() - var2 + 0.33F; - float var20 = (float)(var13 * (double)var10); - float var21 = (float)(var15 * (double)var10); + float var20 = (float)(var13 * (float)var10); + float var21 = (float)(var15 * (float)var10); var5.startDrawingQuads(); var5.setColorRGBA_F(var7, var8, var9, 0.8F); @@ -1202,10 +1202,10 @@ public class RenderGlobal implements IWorldAccess { for (int var23 = -var3 * var4; var23 < var3 * var4; var23 += var3) { - var5.addVertexWithUV((double)(var22 + 0), (double)var19, (double)(var23 + var3), (double)((float)(var22 + 0) * var10 + var20), (double)((float)(var23 + var3) * var10 + var21)); - var5.addVertexWithUV((double)(var22 + var3), (double)var19, (double)(var23 + var3), (double)((float)(var22 + var3) * var10 + var20), (double)((float)(var23 + var3) * var10 + var21)); - var5.addVertexWithUV((double)(var22 + var3), (double)var19, (double)(var23 + 0), (double)((float)(var22 + var3) * var10 + var20), (double)((float)(var23 + 0) * var10 + var21)); - var5.addVertexWithUV((double)(var22 + 0), (double)var19, (double)(var23 + 0), (double)((float)(var22 + 0) * var10 + var20), (double)((float)(var23 + 0) * var10 + var21)); + var5.addVertexWithUV((float)(var22 + 0), (float)var19, (float)(var23 + var3), (float)((float)(var22 + 0) * var10 + var20), (float)((float)(var23 + var3) * var10 + var21)); + var5.addVertexWithUV((float)(var22 + var3), (float)var19, (float)(var23 + var3), (float)((float)(var22 + var3) * var10 + var20), (float)((float)(var23 + var3) * var10 + var21)); + var5.addVertexWithUV((float)(var22 + var3), (float)var19, (float)(var23 + 0), (float)((float)(var22 + var3) * var10 + var20), (float)((float)(var23 + 0) * var10 + var21)); + var5.addVertexWithUV((float)(var22 + 0), (float)var19, (float)(var23 + 0), (float)((float)(var22 + 0) * var10 + var20), (float)((float)(var23 + 0) * var10 + var21)); } } @@ -1228,18 +1228,18 @@ public class RenderGlobal implements IWorldAccess public void renderCloudsFancy(float par1) { GL11.glDisable(GL11.GL_CULL_FACE); - float var2 = (float)(this.mc.renderViewEntity.lastTickPosY + (this.mc.renderViewEntity.posY - this.mc.renderViewEntity.lastTickPosY) * (double)par1); + float var2 = (float)(this.mc.renderViewEntity.lastTickPosY + (this.mc.renderViewEntity.posY - this.mc.renderViewEntity.lastTickPosY) * (float)par1); Tessellator var3 = Tessellator.instance; float var4 = 12.0F; float var5 = 4.0F; - double var6 = (double)((float)this.cloudOffsetX + par1); - double var8 = (this.mc.renderViewEntity.prevPosX + (this.mc.renderViewEntity.posX - this.mc.renderViewEntity.prevPosX) * (double)par1 + var6 * 0.029999999329447746D) / (double)var4; - double var10 = (this.mc.renderViewEntity.prevPosZ + (this.mc.renderViewEntity.posZ - this.mc.renderViewEntity.prevPosZ) * (double)par1) / (double)var4 + 0.33000001311302185D; + double var6 = (float)((float)this.cloudOffsetX + par1); + double var8 = (this.mc.renderViewEntity.prevPosX + (this.mc.renderViewEntity.posX - this.mc.renderViewEntity.prevPosX) * (float)par1 + var6 * 0.029999999329447746D) / (float)var4; + double var10 = (this.mc.renderViewEntity.prevPosZ + (this.mc.renderViewEntity.posZ - this.mc.renderViewEntity.prevPosZ) * (float)par1) / (float)var4 + 0.33000001311302185D; float var12 = this.theWorld.provider.getCloudHeight() - var2 + 0.33F; int var13 = MathHelper.floor_double(var8 / 2048.0D); int var14 = MathHelper.floor_double(var10 / 2048.0D); - var8 -= (double)(var13 * 2048); - var10 -= (double)(var14 * 2048); + var8 -= (float)(var13 * 2048); + var10 -= (float)(var14 * 2048); GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.renderEngine.getTexture("/environment/clouds.png")); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -1266,8 +1266,8 @@ public class RenderGlobal implements IWorldAccess var21 = 0.00390625F; var19 = (float)MathHelper.floor_double(var8) * var21; var20 = (float)MathHelper.floor_double(var10) * var21; - float var22 = (float)(var8 - (double)MathHelper.floor_double(var8)); - float var23 = (float)(var10 - (double)MathHelper.floor_double(var10)); + float var22 = (float)(var8 - (float)MathHelper.floor_double(var8)); + float var23 = (float)(var10 - (float)MathHelper.floor_double(var10)); byte var24 = 8; byte var25 = 4; float var26 = 9.765625E-4F; @@ -1309,20 +1309,20 @@ public class RenderGlobal implements IWorldAccess { var3.setColorRGBA_F(var16 * 0.7F, var17 * 0.7F, var18 * 0.7F, 0.8F); var3.setNormal(0.0F, -1.0F, 0.0F); - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + 0.0F), (double)(var33 + (float)var24), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + 0.0F), (double)(var33 + (float)var24), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + 0.0F), (double)(var33 + 0.0F), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + 0.0F), (double)(var33 + 0.0F), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + 0.0F), (float)(var33 + (float)var24), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + 0.0F), (float)(var33 + (float)var24), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + 0.0F), (float)(var33 + 0.0F), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + 0.0F), (float)(var33 + 0.0F), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); } if (var12 <= var5 + 1.0F) { var3.setColorRGBA_F(var16, var17, var18, 0.8F); var3.setNormal(0.0F, 1.0F, 0.0F); - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + var5 - var26), (double)(var33 + (float)var24), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + var5 - var26), (double)(var33 + (float)var24), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + var5 - var26), (double)(var33 + 0.0F), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + var5 - var26), (double)(var33 + 0.0F), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + var5 - var26), (float)(var33 + (float)var24), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + var5 - var26), (float)(var33 + (float)var24), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + var5 - var26), (float)(var33 + 0.0F), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + var5 - var26), (float)(var33 + 0.0F), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); } var3.setColorRGBA_F(var16 * 0.9F, var17 * 0.9F, var18 * 0.9F, 0.8F); @@ -1334,10 +1334,10 @@ public class RenderGlobal implements IWorldAccess for (var34 = 0; var34 < var24; ++var34) { - var3.addVertexWithUV((double)(var32 + (float)var34 + 0.0F), (double)(var12 + 0.0F), (double)(var33 + (float)var24), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var34 + 0.0F), (double)(var12 + var5), (double)(var33 + (float)var24), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var34 + 0.0F), (double)(var12 + var5), (double)(var33 + 0.0F), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var34 + 0.0F), (double)(var12 + 0.0F), (double)(var33 + 0.0F), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 0.0F), (float)(var12 + 0.0F), (float)(var33 + (float)var24), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 0.0F), (float)(var12 + var5), (float)(var33 + (float)var24), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 0.0F), (float)(var12 + var5), (float)(var33 + 0.0F), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 0.0F), (float)(var12 + 0.0F), (float)(var33 + 0.0F), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); } } @@ -1347,10 +1347,10 @@ public class RenderGlobal implements IWorldAccess for (var34 = 0; var34 < var24; ++var34) { - var3.addVertexWithUV((double)(var32 + (float)var34 + 1.0F - var26), (double)(var12 + 0.0F), (double)(var33 + (float)var24), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var34 + 1.0F - var26), (double)(var12 + var5), (double)(var33 + (float)var24), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + (float)var24) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var34 + 1.0F - var26), (double)(var12 + var5), (double)(var33 + 0.0F), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var34 + 1.0F - var26), (double)(var12 + 0.0F), (double)(var33 + 0.0F), (double)((var30 + (float)var34 + 0.5F) * var21 + var19), (double)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 1.0F - var26), (float)(var12 + 0.0F), (float)(var33 + (float)var24), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 1.0F - var26), (float)(var12 + var5), (float)(var33 + (float)var24), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + (float)var24) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 1.0F - var26), (float)(var12 + var5), (float)(var33 + 0.0F), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var34 + 1.0F - var26), (float)(var12 + 0.0F), (float)(var33 + 0.0F), (float)((var30 + (float)var34 + 0.5F) * var21 + var19), (float)((var31 + 0.0F) * var21 + var20)); } } @@ -1362,10 +1362,10 @@ public class RenderGlobal implements IWorldAccess for (var34 = 0; var34 < var24; ++var34) { - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + var5), (double)(var33 + (float)var34 + 0.0F), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + var5), (double)(var33 + (float)var34 + 0.0F), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + 0.0F), (double)(var33 + (float)var34 + 0.0F), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + 0.0F), (double)(var33 + (float)var34 + 0.0F), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + var5), (float)(var33 + (float)var34 + 0.0F), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + var5), (float)(var33 + (float)var34 + 0.0F), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + 0.0F), (float)(var33 + (float)var34 + 0.0F), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + 0.0F), (float)(var33 + (float)var34 + 0.0F), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); } } @@ -1375,10 +1375,10 @@ public class RenderGlobal implements IWorldAccess for (var34 = 0; var34 < var24; ++var34) { - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + var5), (double)(var33 + (float)var34 + 1.0F - var26), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + var5), (double)(var33 + (float)var34 + 1.0F - var26), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + (float)var24), (double)(var12 + 0.0F), (double)(var33 + (float)var34 + 1.0F - var26), (double)((var30 + (float)var24) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); - var3.addVertexWithUV((double)(var32 + 0.0F), (double)(var12 + 0.0F), (double)(var33 + (float)var34 + 1.0F - var26), (double)((var30 + 0.0F) * var21 + var19), (double)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + var5), (float)(var33 + (float)var34 + 1.0F - var26), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + var5), (float)(var33 + (float)var34 + 1.0F - var26), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + (float)var24), (float)(var12 + 0.0F), (float)(var33 + (float)var34 + 1.0F - var26), (float)((var30 + (float)var24) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); + var3.addVertexWithUV((float)(var32 + 0.0F), (float)(var12 + 0.0F), (float)(var33 + (float)var34 + 1.0F - var26), (float)((var30 + 0.0F) * var21 + var19), (float)((var31 + (float)var34 + 0.5F) * var21 + var20)); } } @@ -1591,9 +1591,9 @@ public class RenderGlobal implements IWorldAccess public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3) { - double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double)par3; - double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double)par3; - double var8 = par2EntityPlayer.lastTickPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.lastTickPosZ) * (double)par3; + double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (float)par3; + double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (float)par3; + double var8 = par2EntityPlayer.lastTickPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.lastTickPosZ) * (float)par3; if (!this.field_72738_E.isEmpty()) { @@ -1614,9 +1614,9 @@ public class RenderGlobal implements IWorldAccess while (var11.hasNext()) { DestroyBlockProgress var12 = (DestroyBlockProgress)var11.next(); - double var13 = (double)var12.func_73110_b().doubleValue() - var4; - double var15 = (double)var12.func_73109_c() - var6; - double var17 = (double)var12.func_73108_d().doubleValue() - var8; + double var13 = (float)var12.func_73110_b().doubleValue() - var4; + double var15 = (float)var12.func_73109_c() - var6; + double var17 = (float)var12.func_73108_d().doubleValue() - var8; if (var13 * var13 + var15 * var15 + var17 * var17 > 1024.0D) { @@ -1666,10 +1666,10 @@ public class RenderGlobal implements IWorldAccess if (var7 > 0) { Block.blocksList[var7].setBlockBoundsBasedOnState(this.theWorld, par2MovingObjectPosition.blockX, par2MovingObjectPosition.blockY, par2MovingObjectPosition.blockZ); - double var8 = par1EntityPlayer.lastTickPosX + (par1EntityPlayer.posX - par1EntityPlayer.lastTickPosX) * (double)par5; - double var10 = par1EntityPlayer.lastTickPosY + (par1EntityPlayer.posY - par1EntityPlayer.lastTickPosY) * (double)par5; - double var12 = par1EntityPlayer.lastTickPosZ + (par1EntityPlayer.posZ - par1EntityPlayer.lastTickPosZ) * (double)par5; - this.drawOutlinedBoundingBox(Block.blocksList[var7].getSelectedBoundingBoxFromPool(this.theWorld, par2MovingObjectPosition.blockX, par2MovingObjectPosition.blockY, par2MovingObjectPosition.blockZ).expand((double)var6, (double)var6, (double)var6).getOffsetBoundingBox(-var8, -var10, -var12)); + double var8 = par1EntityPlayer.lastTickPosX + (par1EntityPlayer.posX - par1EntityPlayer.lastTickPosX) * (float)par5; + double var10 = par1EntityPlayer.lastTickPosY + (par1EntityPlayer.posY - par1EntityPlayer.lastTickPosY) * (float)par5; + double var12 = par1EntityPlayer.lastTickPosZ + (par1EntityPlayer.posZ - par1EntityPlayer.lastTickPosZ) * (float)par5; + this.drawOutlinedBoundingBox(Block.blocksList[var7].getSelectedBoundingBoxFromPool(this.theWorld, par2MovingObjectPosition.blockX, par2MovingObjectPosition.blockY, par2MovingObjectPosition.blockZ).expand((float)var6, (float)var6, (float)var6).getOffsetBoundingBox(-var8, -var10, -var12)); } GL11.glDepthMask(true); @@ -2080,31 +2080,31 @@ public class RenderGlobal implements IWorldAccess switch (par2) { case 1000: - this.theWorld.playSound(par3.doubleValue(), (double)par4, par5.doubleValue(), "random.click", 1.0F, 1.0F); + this.theWorld.playSound(par3.doubleValue(), (float)par4, par5.doubleValue(), "random.click", 1.0F, 1.0F); break; case 1001: - this.theWorld.playSound(par3.doubleValue(), (double)par4, par5.doubleValue(), "random.click", 1.0F, 1.2F); + this.theWorld.playSound(par3.doubleValue(), (float)par4, par5.doubleValue(), "random.click", 1.0F, 1.2F); break; case 1002: - this.theWorld.playSound(par3.doubleValue(), (double)par4, par5.doubleValue(), "random.bow", 1.0F, 1.2F); + this.theWorld.playSound(par3.doubleValue(), (float)par4, par5.doubleValue(), "random.bow", 1.0F, 1.2F); break; case 1003: if (Math.random() < 0.5D) { - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "random.door_open", 1.0F, this.theWorld.rand.nextFloat() * 0.1F + 0.9F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "random.door_open", 1.0F, this.theWorld.rand.nextFloat() * 0.1F + 0.9F); } else { - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "random.door_close", 1.0F, this.theWorld.rand.nextFloat() * 0.1F + 0.9F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "random.door_close", 1.0F, this.theWorld.rand.nextFloat() * 0.1F + 0.9F); } break; case 1004: - this.theWorld.playSound((double)((float)par3.floatValue() + 0.5F), (double)((float)par4 + 0.5F), (double)((float)par5.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (var7.nextFloat() - var7.nextFloat()) * 0.8F); + this.theWorld.playSound((float)((float)par3.floatValue() + 0.5F), (float)((float)par4 + 0.5F), (float)((float)par5.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (var7.nextFloat() - var7.nextFloat()) * 0.8F); break; case 1005: @@ -2120,41 +2120,41 @@ public class RenderGlobal implements IWorldAccess break; case 1007: - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.ghast.charge", 10.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.ghast.charge", 10.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); break; case 1008: - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.ghast.fireball", 10.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.ghast.fireball", 10.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); break; case 1010: - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.zombie.wood", 2.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.zombie.wood", 2.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); break; case 1011: - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.zombie.metal", 2.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.zombie.metal", 2.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); break; case 1012: - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.zombie.woodbreak", 2.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "mob.zombie.woodbreak", 2.0F, (var7.nextFloat() - var7.nextFloat()) * 0.2F + 1.0F); break; case 2000: int var33 = par6 % 3 - 1; int var9 = par6 / 3 % 3 - 1; - var10 = par3.doubleValue() + (double)var33 * 0.6D + 0.5D; - var12 = (double)par4 + 0.5D; - double var34 = par5.doubleValue() + (double)var9 * 0.6D + 0.5D; + var10 = par3.doubleValue() + (float)var33 * 0.6D + 0.5D; + var12 = (float)par4 + 0.5D; + double var34 = par5.doubleValue() + (float)var9 * 0.6D + 0.5D; for (int var36 = 0; var36 < 10; ++var36) { double var37 = var7.nextDouble() * 0.2D + 0.01D; - double var38 = var10 + (double)var33 * 0.01D + (var7.nextDouble() - 0.5D) * (double)var9 * 0.5D; + double var38 = var10 + (float)var33 * 0.01D + (var7.nextDouble() - 0.5D) * (float)var9 * 0.5D; var39 = var12 + (var7.nextDouble() - 0.5D) * 0.5D; - var23 = var34 + (double)var9 * 0.01D + (var7.nextDouble() - 0.5D) * (double)var33 * 0.5D; - var25 = (double)var33 * var37 + var7.nextGaussian() * 0.01D; + var23 = var34 + (float)var9 * 0.01D + (var7.nextDouble() - 0.5D) * (float)var33 * 0.5D; + var25 = (float)var33 * var37 + var7.nextGaussian() * 0.01D; var27 = -0.03D + var7.nextGaussian() * 0.01D; - var29 = (double)var9 * var37 + var7.nextGaussian() * 0.01D; + var29 = (float)var9 * var37 + var7.nextGaussian() * 0.01D; this.spawnParticle("smoke", var38, var39, var23, var25, var27, var29); } @@ -2174,7 +2174,7 @@ public class RenderGlobal implements IWorldAccess case 2002: var8 = par3.doubleValue(); - var10 = (double)par4; + var10 = (float)par4; var12 = par5.doubleValue(); var14 = "iconcrack_" + Item.potion.shiftedIndex; @@ -2197,10 +2197,10 @@ public class RenderGlobal implements IWorldAccess for (var20 = 0; var20 < 100; ++var20) { var39 = var7.nextDouble() * 4.0D; - var23 = var7.nextDouble() * Math.PI * 2.0D; - var25 = Math.cos(var23) * var39; + var23 = var7.nextDouble() * (float)Math.PI * 2.0D; + var25 = (float)Math.cos(var23) * var39; var27 = 0.01D + var7.nextDouble() * 0.5D; - var29 = Math.sin(var23) * var39; + var29 = (float)Math.sin(var23) * var39; EntityFX var31 = this.func_72726_b(var19, var8 + var25 * 0.1D, var10 + 0.3D, var12 + var29 * 0.1D, var25, var27, var29); if (var31 != null) @@ -2211,12 +2211,12 @@ public class RenderGlobal implements IWorldAccess } } - this.theWorld.playSound(par3.doubleValue() + 0.5D, (double)par4 + 0.5D, par5.doubleValue() + 0.5D, "random.glass", 1.0F, this.theWorld.rand.nextFloat() * 0.1F + 0.9F); + this.theWorld.playSound(par3.doubleValue() + 0.5D, (float)par4 + 0.5D, par5.doubleValue() + 0.5D, "random.glass", 1.0F, this.theWorld.rand.nextFloat() * 0.1F + 0.9F); break; case 2003: var8 = par3.doubleValue() + 0.5D; - var10 = (double)par4; + var10 = (float)par4; var12 = par5.doubleValue() + 0.5D; var14 = "iconcrack_" + Item.eyeOfEnder.shiftedIndex; @@ -2225,10 +2225,10 @@ public class RenderGlobal implements IWorldAccess this.spawnParticle(var14, var8, var10, var12, var7.nextGaussian() * 0.15D, var7.nextDouble() * 0.2D, var7.nextGaussian() * 0.15D); } - for (double var35 = 0.0D; var35 < (Math.PI * 2D); var35 += 0.15707963267948966D) + for (double var35 = 0.0D; var35 < ((float)Math.PI * 2D); var35 += 0.15707963267948966D) { - this.spawnParticle("portal", var8 + Math.cos(var35) * 5.0D, var10 - 0.4D, var12 + Math.sin(var35) * 5.0D, Math.cos(var35) * -5.0D, 0.0D, Math.sin(var35) * -5.0D); - this.spawnParticle("portal", var8 + Math.cos(var35) * 5.0D, var10 - 0.4D, var12 + Math.sin(var35) * 5.0D, Math.cos(var35) * -7.0D, 0.0D, Math.sin(var35) * -7.0D); + this.spawnParticle("portal", var8 + (float)Math.cos(var35) * 5.0D, var10 - 0.4D, var12 + (float)Math.sin(var35) * 5.0D, (float)Math.cos(var35) * -5.0D, 0.0D, (float)Math.sin(var35) * -5.0D); + this.spawnParticle("portal", var8 + (float)Math.cos(var35) * 5.0D, var10 - 0.4D, var12 + (float)Math.sin(var35) * 5.0D, (float)Math.cos(var35) * -7.0D, 0.0D, (float)Math.sin(var35) * -7.0D); } return; @@ -2236,9 +2236,9 @@ public class RenderGlobal implements IWorldAccess case 2004: for (int var21 = 0; var21 < 20; ++var21) { - double var22 = par3.doubleValue() + 0.5D + ((double)this.theWorld.rand.nextFloat() - 0.5D) * 2.0D; - double var24 = (double)par4 + 0.5D + ((double)this.theWorld.rand.nextFloat() - 0.5D) * 2.0D; - double var26 = par5.doubleValue() + 0.5D + ((double)this.theWorld.rand.nextFloat() - 0.5D) * 2.0D; + double var22 = par3.doubleValue() + 0.5D + ((float)this.theWorld.rand.nextFloat() - 0.5D) * 2.0D; + double var24 = (float)par4 + 0.5D + ((float)this.theWorld.rand.nextFloat() - 0.5D) * 2.0D; + double var26 = par5.doubleValue() + 0.5D + ((float)this.theWorld.rand.nextFloat() - 0.5D) * 2.0D; this.theWorld.spawnParticle("smoke", var22, var24, var26, 0.0D, 0.0D, 0.0D); this.theWorld.spawnParticle("flame", var22, var24, var26, 0.0D, 0.0D, 0.0D); } diff --git a/src/minecraft/net/minecraft/src/RenderIronGolem.java b/src/minecraft/net/minecraft/src/RenderIronGolem.java index 9dcdce1..e001241 100644 --- a/src/minecraft/net/minecraft/src/RenderIronGolem.java +++ b/src/minecraft/net/minecraft/src/RenderIronGolem.java @@ -22,7 +22,7 @@ public class RenderIronGolem extends RenderLiving { super.rotateCorpse(par1EntityIronGolem, par2, par3, par4); - if ((double)par1EntityIronGolem.legYaw >= 0.01D) + if ((float)par1EntityIronGolem.legYaw >= 0.01D) { float var5 = 13.0F; float var6 = par1EntityIronGolem.field_70754_ba - par1EntityIronGolem.legYaw * (1.0F - par4) + 6.0F; @@ -39,7 +39,7 @@ public class RenderIronGolem extends RenderLiving { GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glPushMatrix(); - GL11.glRotatef(5.0F + 180.0F * this.field_77050_a.ironGolemRightArm.rotateAngleX / (float)Math.PI, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(5.0F + 180.0F * this.field_77050_a.ironGolemRightArm.rotateAngleX / (float)(float)Math.PI, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(-0.6875F, 1.25F, -0.9375F); GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); float var3 = 0.8F; diff --git a/src/minecraft/net/minecraft/src/RenderItem.java b/src/minecraft/net/minecraft/src/RenderItem.java index ceaf4d1..4b5a469 100644 --- a/src/minecraft/net/minecraft/src/RenderItem.java +++ b/src/minecraft/net/minecraft/src/RenderItem.java @@ -31,7 +31,7 @@ public class RenderItem extends Render ItemStack var10 = par1EntityItem.item; GL11.glPushMatrix(); float var11 = MathHelper.sin(((float)par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F; - float var12 = (((float)par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI); + float var12 = (((float)par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)(float)Math.PI); byte var13 = 1; if (par1EntityItem.item.stackSize > 1) @@ -173,10 +173,10 @@ public class RenderItem extends Render GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); var3.startDrawingQuads(); var3.setNormal(0.0F, 1.0F, 0.0F); - var3.addVertexWithUV((double)(0.0F - var9), (double)(0.0F - var10), 0.0D, (double)var4, (double)var7); - var3.addVertexWithUV((double)(var8 - var9), (double)(0.0F - var10), 0.0D, (double)var5, (double)var7); - var3.addVertexWithUV((double)(var8 - var9), (double)(1.0F - var10), 0.0D, (double)var5, (double)var6); - var3.addVertexWithUV((double)(0.0F - var9), (double)(1.0F - var10), 0.0D, (double)var4, (double)var6); + var3.addVertexWithUV((float)(0.0F - var9), (float)(0.0F - var10), 0.0D, (float)var4, (float)var7); + var3.addVertexWithUV((float)(var8 - var9), (float)(0.0F - var10), 0.0D, (float)var5, (float)var7); + var3.addVertexWithUV((float)(var8 - var9), (float)(1.0F - var10), 0.0D, (float)var5, (float)var6); + var3.addVertexWithUV((float)(0.0F - var9), (float)(1.0F - var10), 0.0D, (float)var4, (float)var6); var3.draw(); GL11.glPopMatrix(); } @@ -330,10 +330,10 @@ public class RenderItem extends Render } var11.startDrawingQuads(); - var11.addVertexWithUV((double)(par2 + 0), (double)(par3 + par5), (double)this.zLevel, (double)((var9 + (float)par5 * var12) * var7), (double)((var10 + (float)par5) * var8)); - var11.addVertexWithUV((double)(par2 + par4), (double)(par3 + par5), (double)this.zLevel, (double)((var9 + (float)par4 + (float)par5 * var12) * var7), (double)((var10 + (float)par5) * var8)); - var11.addVertexWithUV((double)(par2 + par4), (double)(par3 + 0), (double)this.zLevel, (double)((var9 + (float)par4) * var7), (double)((var10 + 0.0F) * var8)); - var11.addVertexWithUV((double)(par2 + 0), (double)(par3 + 0), (double)this.zLevel, (double)((var9 + 0.0F) * var7), (double)((var10 + 0.0F) * var8)); + var11.addVertexWithUV((float)(par2 + 0), (float)(par3 + par5), (float)this.zLevel, (float)((var9 + (float)par5 * var12) * var7), (float)((var10 + (float)par5) * var8)); + var11.addVertexWithUV((float)(par2 + par4), (float)(par3 + par5), (float)this.zLevel, (float)((var9 + (float)par4 + (float)par5 * var12) * var7), (float)((var10 + (float)par5) * var8)); + var11.addVertexWithUV((float)(par2 + par4), (float)(par3 + 0), (float)this.zLevel, (float)((var9 + (float)par4) * var7), (float)((var10 + 0.0F) * var8)); + var11.addVertexWithUV((float)(par2 + 0), (float)(par3 + 0), (float)this.zLevel, (float)((var9 + 0.0F) * var7), (float)((var10 + 0.0F) * var8)); var11.draw(); } } @@ -358,8 +358,8 @@ public class RenderItem extends Render if (par3ItemStack.isItemDamaged()) { - int var11 = (int)Math.round(13.0D - (double)par3ItemStack.getItemDamageForDisplay() * 13.0D / (double)par3ItemStack.getMaxDamage()); - int var7 = (int)Math.round(255.0D - (double)par3ItemStack.getItemDamageForDisplay() * 255.0D / (double)par3ItemStack.getMaxDamage()); + int var11 = (int)Math.round(13.0D - (float)par3ItemStack.getItemDamageForDisplay() * 13.0D / (float)par3ItemStack.getMaxDamage()); + int var7 = (int)Math.round(255.0D - (float)par3ItemStack.getItemDamageForDisplay() * 255.0D / (float)par3ItemStack.getMaxDamage()); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_TEXTURE_2D); @@ -385,10 +385,10 @@ public class RenderItem extends Render { par1Tessellator.startDrawingQuads(); par1Tessellator.setColorOpaque_I(par6); - par1Tessellator.addVertex((double)(par2 + 0), (double)(par3 + 0), 0.0D); - par1Tessellator.addVertex((double)(par2 + 0), (double)(par3 + par5), 0.0D); - par1Tessellator.addVertex((double)(par2 + par4), (double)(par3 + par5), 0.0D); - par1Tessellator.addVertex((double)(par2 + par4), (double)(par3 + 0), 0.0D); + par1Tessellator.addVertex((float)(par2 + 0), (float)(par3 + 0), 0.0D); + par1Tessellator.addVertex((float)(par2 + 0), (float)(par3 + par5), 0.0D); + par1Tessellator.addVertex((float)(par2 + par4), (float)(par3 + par5), 0.0D); + par1Tessellator.addVertex((float)(par2 + par4), (float)(par3 + 0), 0.0D); par1Tessellator.draw(); } @@ -402,10 +402,10 @@ public class RenderItem extends Render float var8 = 0.00390625F; Tessellator var9 = Tessellator.instance; var9.startDrawingQuads(); - var9.addVertexWithUV((double)(par1 + 0), (double)(par2 + par6), (double)this.zLevel, (double)((float)(par3 + 0) * var7), (double)((float)(par4 + par6) * var8)); - var9.addVertexWithUV((double)(par1 + par5), (double)(par2 + par6), (double)this.zLevel, (double)((float)(par3 + par5) * var7), (double)((float)(par4 + par6) * var8)); - var9.addVertexWithUV((double)(par1 + par5), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + par5) * var7), (double)((float)(par4 + 0) * var8)); - var9.addVertexWithUV((double)(par1 + 0), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + 0) * var7), (double)((float)(par4 + 0) * var8)); + var9.addVertexWithUV((float)(par1 + 0), (float)(par2 + par6), (float)this.zLevel, (float)((float)(par3 + 0) * var7), (float)((float)(par4 + par6) * var8)); + var9.addVertexWithUV((float)(par1 + par5), (float)(par2 + par6), (float)this.zLevel, (float)((float)(par3 + par5) * var7), (float)((float)(par4 + par6) * var8)); + var9.addVertexWithUV((float)(par1 + par5), (float)(par2 + 0), (float)this.zLevel, (float)((float)(par3 + par5) * var7), (float)((float)(par4 + 0) * var8)); + var9.addVertexWithUV((float)(par1 + 0), (float)(par2 + 0), (float)this.zLevel, (float)((float)(par3 + 0) * var7), (float)((float)(par4 + 0) * var8)); var9.draw(); } diff --git a/src/minecraft/net/minecraft/src/RenderLightningBolt.java b/src/minecraft/net/minecraft/src/RenderLightningBolt.java index 3a6edd3..72dc970 100644 --- a/src/minecraft/net/minecraft/src/RenderLightningBolt.java +++ b/src/minecraft/net/minecraft/src/RenderLightningBolt.java @@ -25,8 +25,8 @@ public class RenderLightningBolt extends Render { var11[var18] = var13; var12[var18] = var15; - var13 += (double)(var17.nextInt(11) - 5); - var15 += (double)(var17.nextInt(11) - 5); + var13 += (float)(var17.nextInt(11) - 5); + var15 += (float)(var17.nextInt(11) - 5); } for (int var45 = 0; var45 < 4; ++var45) @@ -58,30 +58,30 @@ public class RenderLightningBolt extends Render if (var19 == 0) { - var22 += (double)(var46.nextInt(11) - 5); - var24 += (double)(var46.nextInt(11) - 5); + var22 += (float)(var46.nextInt(11) - 5); + var24 += (float)(var46.nextInt(11) - 5); } else { - var22 += (double)(var46.nextInt(31) - 15); - var24 += (double)(var46.nextInt(31) - 15); + var22 += (float)(var46.nextInt(31) - 15); + var24 += (float)(var46.nextInt(31) - 15); } var10.startDrawing(5); float var31 = 0.5F; var10.setColorRGBA_F(0.9F * var31, 0.9F * var31, 1.0F * var31, 0.3F); - double var32 = 0.1D + (double)var45 * 0.2D; + double var32 = 0.1D + (float)var45 * 0.2D; if (var19 == 0) { - var32 *= (double)var26 * 0.1D + 1.0D; + var32 *= (float)var26 * 0.1D + 1.0D; } - double var34 = 0.1D + (double)var45 * 0.2D; + double var34 = 0.1D + (float)var45 * 0.2D; if (var19 == 0) { - var34 *= (double)(var26 - 1) * 0.1D + 1.0D; + var34 *= (float)(var26 - 1) * 0.1D + 1.0D; } for (int var36 = 0; var36 < 5; ++var36) @@ -112,8 +112,8 @@ public class RenderLightningBolt extends Render var43 += var34 * 2.0D; } - var10.addVertex(var41 + var22, par4 + (double)(var26 * 16), var43 + var24); - var10.addVertex(var37 + var27, par4 + (double)((var26 + 1) * 16), var39 + var29); + var10.addVertex(var41 + var22, par4 + (float)(var26 * 16), var43 + var24); + var10.addVertex(var37 + var27, par4 + (float)((var26 + 1) * 16), var39 + var29); } var10.draw(); diff --git a/src/minecraft/net/minecraft/src/RenderLiving.java b/src/minecraft/net/minecraft/src/RenderLiving.java index 082c6c6..da00907 100644 --- a/src/minecraft/net/minecraft/src/RenderLiving.java +++ b/src/minecraft/net/minecraft/src/RenderLiving.java @@ -323,7 +323,7 @@ public class RenderLiving extends Render { double var10 = par1EntityLiving.getDistanceSqToEntity(this.renderManager.livingPlayer); - if (var10 <= (double)(par9 * par9)) + if (var10 <= (float)(par9 * par9)) { FontRenderer var12 = this.getFontRendererFromRenderManager(); float var13 = 1.6F; @@ -351,10 +351,10 @@ public class RenderLiving extends Render var15.startDrawingQuads(); int var17 = var12.getStringWidth(par2Str) / 2; var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - var15.addVertex((double)(-var17 - 1), (double)(-1 + var16), 0.0D); - var15.addVertex((double)(-var17 - 1), (double)(8 + var16), 0.0D); - var15.addVertex((double)(var17 + 1), (double)(8 + var16), 0.0D); - var15.addVertex((double)(var17 + 1), (double)(-1 + var16), 0.0D); + var15.addVertex((float)(-var17 - 1), (float)(-1 + var16), 0.0D); + var15.addVertex((float)(-var17 - 1), (float)(8 + var16), 0.0D); + var15.addVertex((float)(var17 + 1), (float)(8 + var16), 0.0D); + var15.addVertex((float)(var17 + 1), (float)(-1 + var16), 0.0D); var15.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, 553648127); diff --git a/src/minecraft/net/minecraft/src/RenderManager.java b/src/minecraft/net/minecraft/src/RenderManager.java index c891b47..d76f7a7 100644 --- a/src/minecraft/net/minecraft/src/RenderManager.java +++ b/src/minecraft/net/minecraft/src/RenderManager.java @@ -145,9 +145,9 @@ public class RenderManager this.playerViewY += 180.0F; } - this.viewerPosX = par4EntityLiving.lastTickPosX + (par4EntityLiving.posX - par4EntityLiving.lastTickPosX) * (double)par6; - this.viewerPosY = par4EntityLiving.lastTickPosY + (par4EntityLiving.posY - par4EntityLiving.lastTickPosY) * (double)par6; - this.viewerPosZ = par4EntityLiving.lastTickPosZ + (par4EntityLiving.posZ - par4EntityLiving.lastTickPosZ) * (double)par6; + this.viewerPosX = par4EntityLiving.lastTickPosX + (par4EntityLiving.posX - par4EntityLiving.lastTickPosX) * (float)par6; + this.viewerPosY = par4EntityLiving.lastTickPosY + (par4EntityLiving.posY - par4EntityLiving.lastTickPosY) * (float)par6; + this.viewerPosZ = par4EntityLiving.lastTickPosZ + (par4EntityLiving.posZ - par4EntityLiving.lastTickPosZ) * (float)par6; } /** @@ -155,9 +155,9 @@ public class RenderManager */ public void renderEntity(Entity par1Entity, float par2) { - double var3 = par1Entity.lastTickPosX + (par1Entity.posX - par1Entity.lastTickPosX) * (double)par2; - double var5 = par1Entity.lastTickPosY + (par1Entity.posY - par1Entity.lastTickPosY) * (double)par2; - double var7 = par1Entity.lastTickPosZ + (par1Entity.posZ - par1Entity.lastTickPosZ) * (double)par2; + double var3 = par1Entity.lastTickPosX + (par1Entity.posX - par1Entity.lastTickPosX) * (float)par2; + double var5 = par1Entity.lastTickPosY + (par1Entity.posY - par1Entity.lastTickPosY) * (float)par2; + double var7 = par1Entity.lastTickPosZ + (par1Entity.posZ - par1Entity.lastTickPosZ) * (float)par2; float var9 = par1Entity.prevRotationYaw + (par1Entity.rotationYaw - par1Entity.prevRotationYaw) * par2; int var10 = par1Entity.getBrightnessForRender(par2); diff --git a/src/minecraft/net/minecraft/src/RenderMinecart.java b/src/minecraft/net/minecraft/src/RenderMinecart.java index 40ad100..86ad43f 100644 --- a/src/minecraft/net/minecraft/src/RenderMinecart.java +++ b/src/minecraft/net/minecraft/src/RenderMinecart.java @@ -22,9 +22,9 @@ public class RenderMinecart extends Render float var13 = (((float)(var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var14 = (((float)(var10 >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; GL11.glTranslatef(var12, var13, var14); - double var15 = par1EntityMinecart.lastTickPosX + (par1EntityMinecart.posX - par1EntityMinecart.lastTickPosX) * (double)par9; - double var17 = par1EntityMinecart.lastTickPosY + (par1EntityMinecart.posY - par1EntityMinecart.lastTickPosY) * (double)par9; - double var19 = par1EntityMinecart.lastTickPosZ + (par1EntityMinecart.posZ - par1EntityMinecart.lastTickPosZ) * (double)par9; + double var15 = par1EntityMinecart.lastTickPosX + (par1EntityMinecart.posX - par1EntityMinecart.lastTickPosX) * (float)par9; + double var17 = par1EntityMinecart.lastTickPosY + (par1EntityMinecart.posY - par1EntityMinecart.lastTickPosY) * (float)par9; + double var19 = par1EntityMinecart.lastTickPosZ + (par1EntityMinecart.posZ - par1EntityMinecart.lastTickPosZ) * (float)par9; double var21 = 0.30000001192092896D; Vec3 var23 = par1EntityMinecart.func_70489_a(var15, var17, var19); float var24 = par1EntityMinecart.prevRotationPitch + (par1EntityMinecart.rotationPitch - par1EntityMinecart.prevRotationPitch) * par9; @@ -52,7 +52,7 @@ public class RenderMinecart extends Render if (var27.lengthVector() != 0.0D) { var27 = var27.normalize(); - par8 = (float)(Math.atan2(var27.zCoord, var27.xCoord) * 180.0D / Math.PI); + par8 = (float)(Math.atan2(var27.zCoord, var27.xCoord) * 180.0D / (float)Math.PI); var24 = (float)(Math.atan(var27.yCoord) * 73.0D); } } diff --git a/src/minecraft/net/minecraft/src/RenderPainting.java b/src/minecraft/net/minecraft/src/RenderPainting.java index 4629e26..42f3ec2 100644 --- a/src/minecraft/net/minecraft/src/RenderPainting.java +++ b/src/minecraft/net/minecraft/src/RenderPainting.java @@ -61,35 +61,35 @@ public class RenderPainting extends Render Tessellator var32 = Tessellator.instance; var32.startDrawingQuads(); var32.setNormal(0.0F, 0.0F, -1.0F); - var32.addVertexWithUV((double)var12, (double)var15, (double)var8, (double)var17, (double)var18); - var32.addVertexWithUV((double)var13, (double)var15, (double)var8, (double)var16, (double)var18); - var32.addVertexWithUV((double)var13, (double)var14, (double)var8, (double)var16, (double)var19); - var32.addVertexWithUV((double)var12, (double)var14, (double)var8, (double)var17, (double)var19); + var32.addVertexWithUV((float)var12, (float)var15, (float)var8, (float)var17, (float)var18); + var32.addVertexWithUV((float)var13, (float)var15, (float)var8, (float)var16, (float)var18); + var32.addVertexWithUV((float)var13, (float)var14, (float)var8, (float)var16, (float)var19); + var32.addVertexWithUV((float)var12, (float)var14, (float)var8, (float)var17, (float)var19); var32.setNormal(0.0F, 0.0F, 1.0F); - var32.addVertexWithUV((double)var12, (double)var14, (double)var9, (double)var20, (double)var22); - var32.addVertexWithUV((double)var13, (double)var14, (double)var9, (double)var21, (double)var22); - var32.addVertexWithUV((double)var13, (double)var15, (double)var9, (double)var21, (double)var23); - var32.addVertexWithUV((double)var12, (double)var15, (double)var9, (double)var20, (double)var23); + var32.addVertexWithUV((float)var12, (float)var14, (float)var9, (float)var20, (float)var22); + var32.addVertexWithUV((float)var13, (float)var14, (float)var9, (float)var21, (float)var22); + var32.addVertexWithUV((float)var13, (float)var15, (float)var9, (float)var21, (float)var23); + var32.addVertexWithUV((float)var12, (float)var15, (float)var9, (float)var20, (float)var23); var32.setNormal(0.0F, 1.0F, 0.0F); - var32.addVertexWithUV((double)var12, (double)var14, (double)var8, (double)var24, (double)var26); - var32.addVertexWithUV((double)var13, (double)var14, (double)var8, (double)var25, (double)var26); - var32.addVertexWithUV((double)var13, (double)var14, (double)var9, (double)var25, (double)var27); - var32.addVertexWithUV((double)var12, (double)var14, (double)var9, (double)var24, (double)var27); + var32.addVertexWithUV((float)var12, (float)var14, (float)var8, (float)var24, (float)var26); + var32.addVertexWithUV((float)var13, (float)var14, (float)var8, (float)var25, (float)var26); + var32.addVertexWithUV((float)var13, (float)var14, (float)var9, (float)var25, (float)var27); + var32.addVertexWithUV((float)var12, (float)var14, (float)var9, (float)var24, (float)var27); var32.setNormal(0.0F, -1.0F, 0.0F); - var32.addVertexWithUV((double)var12, (double)var15, (double)var9, (double)var24, (double)var26); - var32.addVertexWithUV((double)var13, (double)var15, (double)var9, (double)var25, (double)var26); - var32.addVertexWithUV((double)var13, (double)var15, (double)var8, (double)var25, (double)var27); - var32.addVertexWithUV((double)var12, (double)var15, (double)var8, (double)var24, (double)var27); + var32.addVertexWithUV((float)var12, (float)var15, (float)var9, (float)var24, (float)var26); + var32.addVertexWithUV((float)var13, (float)var15, (float)var9, (float)var25, (float)var26); + var32.addVertexWithUV((float)var13, (float)var15, (float)var8, (float)var25, (float)var27); + var32.addVertexWithUV((float)var12, (float)var15, (float)var8, (float)var24, (float)var27); var32.setNormal(-1.0F, 0.0F, 0.0F); - var32.addVertexWithUV((double)var12, (double)var14, (double)var9, (double)var29, (double)var30); - var32.addVertexWithUV((double)var12, (double)var15, (double)var9, (double)var29, (double)var31); - var32.addVertexWithUV((double)var12, (double)var15, (double)var8, (double)var28, (double)var31); - var32.addVertexWithUV((double)var12, (double)var14, (double)var8, (double)var28, (double)var30); + var32.addVertexWithUV((float)var12, (float)var14, (float)var9, (float)var29, (float)var30); + var32.addVertexWithUV((float)var12, (float)var15, (float)var9, (float)var29, (float)var31); + var32.addVertexWithUV((float)var12, (float)var15, (float)var8, (float)var28, (float)var31); + var32.addVertexWithUV((float)var12, (float)var14, (float)var8, (float)var28, (float)var30); var32.setNormal(1.0F, 0.0F, 0.0F); - var32.addVertexWithUV((double)var13, (double)var14, (double)var8, (double)var29, (double)var30); - var32.addVertexWithUV((double)var13, (double)var15, (double)var8, (double)var29, (double)var31); - var32.addVertexWithUV((double)var13, (double)var15, (double)var9, (double)var28, (double)var31); - var32.addVertexWithUV((double)var13, (double)var14, (double)var9, (double)var28, (double)var30); + var32.addVertexWithUV((float)var13, (float)var14, (float)var8, (float)var29, (float)var30); + var32.addVertexWithUV((float)var13, (float)var15, (float)var8, (float)var29, (float)var31); + var32.addVertexWithUV((float)var13, (float)var15, (float)var9, (float)var28, (float)var31); + var32.addVertexWithUV((float)var13, (float)var14, (float)var9, (float)var28, (float)var30); var32.draw(); } } @@ -98,27 +98,27 @@ public class RenderPainting extends Render private void func_77008_a(EntityPainting par1EntityPainting, float par2, float par3) { BigInteger var4 = MathHelper.floor_double_BigInteger(par1EntityPainting.posX); - int var5 = MathHelper.floor_double(par1EntityPainting.posY + (double)(par3 / 16.0F)); + int var5 = MathHelper.floor_double(par1EntityPainting.posY + (float)(par3 / 16.0F)); BigInteger var6 = MathHelper.floor_double_BigInteger(par1EntityPainting.posZ); if (par1EntityPainting.direction == 0) { - var4 = MathHelper.floor_double_BigInteger(par1EntityPainting.posX + (double)(par2 / 16.0F)); + var4 = MathHelper.floor_double_BigInteger(par1EntityPainting.posX + (float)(par2 / 16.0F)); } if (par1EntityPainting.direction == 1) { - var6 = MathHelper.floor_double_BigInteger(par1EntityPainting.posZ - (double)(par2 / 16.0F)); + var6 = MathHelper.floor_double_BigInteger(par1EntityPainting.posZ - (float)(par2 / 16.0F)); } if (par1EntityPainting.direction == 2) { - var4 = MathHelper.floor_double_BigInteger(par1EntityPainting.posX - (double)(par2 / 16.0F)); + var4 = MathHelper.floor_double_BigInteger(par1EntityPainting.posX - (float)(par2 / 16.0F)); } if (par1EntityPainting.direction == 3) { - var6 = MathHelper.floor_double_BigInteger(par1EntityPainting.posZ + (double)(par2 / 16.0F)); + var6 = MathHelper.floor_double_BigInteger(par1EntityPainting.posZ + (float)(par2 / 16.0F)); } int var7 = this.renderManager.worldObj.getLightBrightnessForSkyBlocks(var4, var5, var6, 0); diff --git a/src/minecraft/net/minecraft/src/RenderPlayer.java b/src/minecraft/net/minecraft/src/RenderPlayer.java index a6c8527..eb207a1 100644 --- a/src/minecraft/net/minecraft/src/RenderPlayer.java +++ b/src/minecraft/net/minecraft/src/RenderPlayer.java @@ -75,7 +75,7 @@ public class RenderPlayer extends RenderLiving } this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = par1EntityPlayer.isSneaking(); - double var13 = par4 - (double)par1EntityPlayer.yOffset; + double var13 = par4 - (float)par1EntityPlayer.yOffset; if (par1EntityPlayer.isSneaking() && !(par1EntityPlayer instanceof EntityPlayerSP)) { @@ -100,7 +100,7 @@ public class RenderPlayer extends RenderLiving double var10 = par1EntityPlayer.getDistanceSqToEntity(this.renderManager.livingPlayer); float var12 = par1EntityPlayer.isSneaking() ? 32.0F : 64.0F; - if (var10 < (double)(var12 * var12)) + if (var10 < (float)(var12 * var12)) { String var13 = par1EntityPlayer.username; @@ -123,10 +123,10 @@ public class RenderPlayer extends RenderLiving var15.startDrawingQuads(); int var16 = var14.getStringWidth(var13) / 2; var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - var15.addVertex((double)(-var16 - 1), -1.0D, 0.0D); - var15.addVertex((double)(-var16 - 1), 8.0D, 0.0D); - var15.addVertex((double)(var16 + 1), 8.0D, 0.0D); - var15.addVertex((double)(var16 + 1), -1.0D, 0.0D); + var15.addVertex((float)(-var16 - 1), -1.0D, 0.0D); + var15.addVertex((float)(-var16 - 1), 8.0D, 0.0D); + var15.addVertex((float)(var16 + 1), 8.0D, 0.0D); + var15.addVertex((float)(var16 + 1), -1.0D, 0.0D); var15.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); @@ -201,12 +201,12 @@ public class RenderPlayer extends RenderLiving { GL11.glPushMatrix(); GL11.glTranslatef(0.0F, 0.0F, 0.125F); - double var20 = par1EntityPlayer.field_71091_bM + (par1EntityPlayer.field_71094_bP - par1EntityPlayer.field_71091_bM) * (double)par2 - (par1EntityPlayer.prevPosX + (par1EntityPlayer.posX - par1EntityPlayer.prevPosX) * (double)par2); - double var23 = par1EntityPlayer.field_71096_bN + (par1EntityPlayer.field_71095_bQ - par1EntityPlayer.field_71096_bN) * (double)par2 - (par1EntityPlayer.prevPosY + (par1EntityPlayer.posY - par1EntityPlayer.prevPosY) * (double)par2); - double var8 = par1EntityPlayer.field_71097_bO + (par1EntityPlayer.field_71085_bR - par1EntityPlayer.field_71097_bO) * (double)par2 - (par1EntityPlayer.prevPosZ + (par1EntityPlayer.posZ - par1EntityPlayer.prevPosZ) * (double)par2); + double var20 = par1EntityPlayer.field_71091_bM + (par1EntityPlayer.field_71094_bP - par1EntityPlayer.field_71091_bM) * (float)par2 - (par1EntityPlayer.prevPosX + (par1EntityPlayer.posX - par1EntityPlayer.prevPosX) * (float)par2); + double var23 = par1EntityPlayer.field_71096_bN + (par1EntityPlayer.field_71095_bQ - par1EntityPlayer.field_71096_bN) * (float)par2 - (par1EntityPlayer.prevPosY + (par1EntityPlayer.posY - par1EntityPlayer.prevPosY) * (float)par2); + double var8 = par1EntityPlayer.field_71097_bO + (par1EntityPlayer.field_71085_bR - par1EntityPlayer.field_71097_bO) * (float)par2 - (par1EntityPlayer.prevPosZ + (par1EntityPlayer.posZ - par1EntityPlayer.prevPosZ) * (float)par2); var10 = par1EntityPlayer.prevRenderYawOffset + (par1EntityPlayer.renderYawOffset - par1EntityPlayer.prevRenderYawOffset) * par2; - double var11 = (double)MathHelper.sin(var10 * (float)Math.PI / 180.0F); - double var13 = (double)(-MathHelper.cos(var10 * (float)Math.PI / 180.0F)); + double var11 = (float)MathHelper.sin(var10 * (float)(float)Math.PI / 180.0F); + double var13 = (float)(-MathHelper.cos(var10 * (float)(float)Math.PI / 180.0F)); float var15 = (float)var23 * 10.0F; if (var15 < -6.0F) @@ -355,7 +355,7 @@ public class RenderPlayer extends RenderLiving { if (par1EntityPlayer.isEntityAlive() && par1EntityPlayer.isPlayerSleeping()) { - super.renderLivingAt(par1EntityPlayer, par2 + (double)par1EntityPlayer.field_71079_bU, par4 + (double)par1EntityPlayer.field_71082_cx, par6 + (double)par1EntityPlayer.field_71089_bV); + super.renderLivingAt(par1EntityPlayer, par2 + (float)par1EntityPlayer.field_71079_bU, par4 + (float)par1EntityPlayer.field_71082_cx, par6 + (float)par1EntityPlayer.field_71089_bV); } else { diff --git a/src/minecraft/net/minecraft/src/RenderSnowball.java b/src/minecraft/net/minecraft/src/RenderSnowball.java index 216c255..c0ef6f1 100644 --- a/src/minecraft/net/minecraft/src/RenderSnowball.java +++ b/src/minecraft/net/minecraft/src/RenderSnowball.java @@ -62,10 +62,10 @@ public class RenderSnowball extends Render GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); - par1Tessellator.addVertexWithUV((double)(0.0F - var8), (double)(0.0F - var9), 0.0D, (double)var3, (double)var6); - par1Tessellator.addVertexWithUV((double)(var7 - var8), (double)(0.0F - var9), 0.0D, (double)var4, (double)var6); - par1Tessellator.addVertexWithUV((double)(var7 - var8), (double)(var7 - var9), 0.0D, (double)var4, (double)var5); - par1Tessellator.addVertexWithUV((double)(0.0F - var8), (double)(var7 - var9), 0.0D, (double)var3, (double)var5); + par1Tessellator.addVertexWithUV((float)(0.0F - var8), (float)(0.0F - var9), 0.0D, (float)var3, (float)var6); + par1Tessellator.addVertexWithUV((float)(var7 - var8), (float)(0.0F - var9), 0.0D, (float)var4, (float)var6); + par1Tessellator.addVertexWithUV((float)(var7 - var8), (float)(var7 - var9), 0.0D, (float)var4, (float)var5); + par1Tessellator.addVertexWithUV((float)(0.0F - var8), (float)(var7 - var9), 0.0D, (float)var3, (float)var5); par1Tessellator.draw(); } } diff --git a/src/minecraft/net/minecraft/src/RenderSorter.java b/src/minecraft/net/minecraft/src/RenderSorter.java index 816b0c3..fd7d30a 100644 --- a/src/minecraft/net/minecraft/src/RenderSorter.java +++ b/src/minecraft/net/minecraft/src/RenderSorter.java @@ -24,8 +24,8 @@ public class RenderSorter implements Comparator } else { - double var3 = (double)par1WorldRenderer.distanceToEntitySquared(this.baseEntity); - double var5 = (double)par2WorldRenderer.distanceToEntitySquared(this.baseEntity); + double var3 = (float)par1WorldRenderer.distanceToEntitySquared(this.baseEntity); + double var5 = (float)par2WorldRenderer.distanceToEntitySquared(this.baseEntity); return var3 < var5 ? 1 : (var3 > var5 ? -1 : (par1WorldRenderer.chunkIndex < par2WorldRenderer.chunkIndex ? 1 : -1)); } } diff --git a/src/minecraft/net/minecraft/src/RenderVillager.java b/src/minecraft/net/minecraft/src/RenderVillager.java index 44c8a7e..8341f03 100644 --- a/src/minecraft/net/minecraft/src/RenderVillager.java +++ b/src/minecraft/net/minecraft/src/RenderVillager.java @@ -35,7 +35,7 @@ public class RenderVillager extends RenderLiving if (par1EntityVillager.getGrowingAge() < 0) { - var3 = (float)((double)var3 * 0.5D); + var3 = (float)((float)var3 * 0.5D); this.shadowSize = 0.25F; } else diff --git a/src/minecraft/net/minecraft/src/RenderXPOrb.java b/src/minecraft/net/minecraft/src/RenderXPOrb.java index 716e52f..44b3d66 100644 --- a/src/minecraft/net/minecraft/src/RenderXPOrb.java +++ b/src/minecraft/net/minecraft/src/RenderXPOrb.java @@ -46,10 +46,10 @@ public class RenderXPOrb extends Render var11.startDrawingQuads(); var11.setColorRGBA_I(var24, 128); var11.setNormal(0.0F, 1.0F, 0.0F); - var11.addVertexWithUV((double)(0.0F - var17), (double)(0.0F - var18), 0.0D, (double)var12, (double)var15); - var11.addVertexWithUV((double)(var16 - var17), (double)(0.0F - var18), 0.0D, (double)var13, (double)var15); - var11.addVertexWithUV((double)(var16 - var17), (double)(1.0F - var18), 0.0D, (double)var13, (double)var14); - var11.addVertexWithUV((double)(0.0F - var17), (double)(1.0F - var18), 0.0D, (double)var12, (double)var14); + var11.addVertexWithUV((float)(0.0F - var17), (float)(0.0F - var18), 0.0D, (float)var12, (float)var15); + var11.addVertexWithUV((float)(var16 - var17), (float)(0.0F - var18), 0.0D, (float)var13, (float)var15); + var11.addVertexWithUV((float)(var16 - var17), (float)(1.0F - var18), 0.0D, (float)var13, (float)var14); + var11.addVertexWithUV((float)(0.0F - var17), (float)(1.0F - var18), 0.0D, (float)var12, (float)var14); var11.draw(); GL11.glDisable(GL11.GL_BLEND); GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/minecraft/net/minecraft/src/ScaledResolution.java b/src/minecraft/net/minecraft/src/ScaledResolution.java index c93703c..4101aa1 100644 --- a/src/minecraft/net/minecraft/src/ScaledResolution.java +++ b/src/minecraft/net/minecraft/src/ScaledResolution.java @@ -25,8 +25,8 @@ public class ScaledResolution ++this.scaleFactor; } - this.scaledWidthD = (double)this.scaledWidth / (double)this.scaleFactor; - this.scaledHeightD = (double)this.scaledHeight / (double)this.scaleFactor; + this.scaledWidthD = (float)this.scaledWidth / (float)this.scaleFactor; + this.scaledHeightD = (float)this.scaledHeight / (float)this.scaleFactor; this.scaledWidth = MathHelper.ceiling_double_int(this.scaledWidthD); this.scaledHeight = MathHelper.ceiling_double_int(this.scaledHeightD); } diff --git a/src/minecraft/net/minecraft/src/ServerConfigurationManager.java b/src/minecraft/net/minecraft/src/ServerConfigurationManager.java index 41f6298..253ae33 100644 --- a/src/minecraft/net/minecraft/src/ServerConfigurationManager.java +++ b/src/minecraft/net/minecraft/src/ServerConfigurationManager.java @@ -302,7 +302,7 @@ public abstract class ServerConfigurationManager if (var8 != null) { - var6.setLocationAndAngles((double)((float)var8.posX.floatValue() + 0.5F), (double)((float)var8.posY + 0.1F), (double)((float)var8.posZ.floatValue() + 0.5F), 0.0F, 0.0F); + var6.setLocationAndAngles((float)((float)var8.posX.floatValue() + 0.5F), (float)((float)var8.posY + 0.1F), (float)((float)var8.posZ.floatValue() + 0.5F), 0.0F, 0.0F); var6.setSpawnChunk(var4); } else @@ -368,9 +368,9 @@ public abstract class ServerConfigurationManager else { ChunkCoordinates var12 = var5.getEntrancePortalLocation(); - var6 = (double)var12.posX.doubleValue(); - par1EntityPlayerMP.posY = (double)var12.posY; - var8 = (double)var12.posZ.doubleValue(); + var6 = (float)var12.posX.doubleValue(); + par1EntityPlayerMP.posY = (float)var12.posY; + var8 = (float)var12.posZ.doubleValue(); par1EntityPlayerMP.setLocationAndAngles(var6, par1EntityPlayerMP.posY, var8, 90.0F, 0.0F); if (par1EntityPlayerMP.isEntityAlive()) @@ -381,8 +381,8 @@ public abstract class ServerConfigurationManager if (var3 != 1) { - var6 = (double)MathHelper.clamp_int((int)var6, -29999872, 29999872); - var8 = (double)MathHelper.clamp_int((int)var8, -29999872, 29999872); + var6 = (float)MathHelper.clamp_int((int)var6, -29999872, 29999872); + var8 = (float)MathHelper.clamp_int((int)var8, -29999872, 29999872); if (par1EntityPlayerMP.isEntityAlive()) { diff --git a/src/minecraft/net/minecraft/src/SoundManager.java b/src/minecraft/net/minecraft/src/SoundManager.java index 3939f7c..942abd9 100644 --- a/src/minecraft/net/minecraft/src/SoundManager.java +++ b/src/minecraft/net/minecraft/src/SoundManager.java @@ -183,12 +183,12 @@ public class SoundManager if (par1EntityLiving != null) { float var3 = par1EntityLiving.prevRotationYaw + (par1EntityLiving.rotationYaw - par1EntityLiving.prevRotationYaw) * par2; - double var4 = par1EntityLiving.prevPosX + (par1EntityLiving.posX - par1EntityLiving.prevPosX) * (double)par2; - double var6 = par1EntityLiving.prevPosY + (par1EntityLiving.posY - par1EntityLiving.prevPosY) * (double)par2; - double var8 = par1EntityLiving.prevPosZ + (par1EntityLiving.posZ - par1EntityLiving.prevPosZ) * (double)par2; + double var4 = par1EntityLiving.prevPosX + (par1EntityLiving.posX - par1EntityLiving.prevPosX) * (float)par2; + double var6 = par1EntityLiving.prevPosY + (par1EntityLiving.posY - par1EntityLiving.prevPosY) * (float)par2; + double var8 = par1EntityLiving.prevPosZ + (par1EntityLiving.posZ - par1EntityLiving.prevPosZ) * (float)par2; if(Float.isInfinite((float)var4) || Float.isInfinite((float)var6) || Float.isInfinite((float)var8)) return; - float var10 = MathHelper.cos(-var3 * 0.017453292F - (float)Math.PI); - float var11 = MathHelper.sin(-var3 * 0.017453292F - (float)Math.PI); + float var10 = MathHelper.cos(-var3 * 0.017453292F - (float)(float)Math.PI); + float var11 = MathHelper.sin(-var3 * 0.017453292F - (float)(float)Math.PI); float var12 = -var11; float var13 = 0.0F; float var14 = -var10; diff --git a/src/minecraft/net/minecraft/src/SpawnerAnimals.java b/src/minecraft/net/minecraft/src/SpawnerAnimals.java index 773b310..0538076 100644 --- a/src/minecraft/net/minecraft/src/SpawnerAnimals.java +++ b/src/minecraft/net/minecraft/src/SpawnerAnimals.java @@ -124,7 +124,7 @@ public final class SpawnerAnimals // float var24 = (float)var18; // float var25 = (float)var19 + 0.5F; // -// if (par0WorldServer.getClosestPlayer((double)var23, (double)var24, (double)var25, 24.0D) == null) +// if (par0WorldServer.getClosestPlayer((float)var23, (float)var24, (float)var25, 24.0D) == null) // { // float var26 = var23 - (float)var31.posX; // float var27 = var24 - (float)var31.posY; @@ -155,7 +155,7 @@ public final class SpawnerAnimals // return var3; // } // -// var38.setLocationAndAngles((double)var23, (double)var24, (double)var25, par0WorldServer.rand.nextFloat() * 360.0F, 0.0F); +// var38.setLocationAndAngles((float)var23, (float)var24, (float)var25, par0WorldServer.rand.nextFloat() * 360.0F, 0.0F); // // if (var38.getCanSpawnHere()) // { @@ -221,7 +221,7 @@ public final class SpawnerAnimals if (par0EntityLiving instanceof EntitySpider && par1World.rand.nextInt(100) == 0) { EntitySkeleton var7 = new EntitySkeleton(par1World); - var7.setLocationAndAngles((double)par2, (double)par3, (double)par4, par0EntityLiving.rotationYaw, 0.0F); + var7.setLocationAndAngles((float)par2, (float)par3, (float)par4, par0EntityLiving.rotationYaw, 0.0F); par1World.spawnEntityInWorld(var7); var7.mountEntity(par0EntityLiving); } @@ -234,7 +234,7 @@ public final class SpawnerAnimals for (int var5 = 0; var5 < 2; ++var5) { EntityOcelot var6 = new EntityOcelot(par1World); - var6.setLocationAndAngles((double)par2, (double)par3, (double)par4, par0EntityLiving.rotationYaw, 0.0F); + var6.setLocationAndAngles((float)par2, (float)par3, (float)par4, par0EntityLiving.rotationYaw, 0.0F); var6.setGrowingAge(-24000); par1World.spawnEntityInWorld(var6); } @@ -285,7 +285,7 @@ public final class SpawnerAnimals // continue; // } // -// var21.setLocationAndAngles((double)var18, (double)var19, (double)var20, par6Random.nextFloat() * 360.0F, 0.0F); +// var21.setLocationAndAngles((float)var18, (float)var19, (float)var20, par6Random.nextFloat() * 360.0F, 0.0F); // par0World.spawnEntityInWorld(var21); // creatureSpecificInit(var21, par0World, var18, var19, var20); // var15 = true; diff --git a/src/minecraft/net/minecraft/src/StatTypeDistance.java b/src/minecraft/net/minecraft/src/StatTypeDistance.java index 18a1f26..d3d74e4 100644 --- a/src/minecraft/net/minecraft/src/StatTypeDistance.java +++ b/src/minecraft/net/minecraft/src/StatTypeDistance.java @@ -7,7 +7,7 @@ final class StatTypeDistance implements IStatType */ public String format(int par1) { - double var2 = (double)par1 / 100.0D; + double var2 = (float)par1 / 100.0D; double var4 = var2 / 1000.0D; return var4 > 0.5D ? StatBase.getDecimalFormat().format(var4) + " km" : (var2 > 0.5D ? StatBase.getDecimalFormat().format(var2) + " m" : par1 + " cm"); } diff --git a/src/minecraft/net/minecraft/src/StatTypeTime.java b/src/minecraft/net/minecraft/src/StatTypeTime.java index a587334..030dbe0 100644 --- a/src/minecraft/net/minecraft/src/StatTypeTime.java +++ b/src/minecraft/net/minecraft/src/StatTypeTime.java @@ -7,7 +7,7 @@ final class StatTypeTime implements IStatType */ public String format(int par1) { - double var2 = (double)par1 / 20.0D; + double var2 = (float)par1 / 20.0D; double var4 = var2 / 60.0D; double var6 = var4 / 60.0D; double var8 = var6 / 24.0D; diff --git a/src/minecraft/net/minecraft/src/Teleporter.java b/src/minecraft/net/minecraft/src/Teleporter.java index 1bc7328..fba0990 100644 --- a/src/minecraft/net/minecraft/src/Teleporter.java +++ b/src/minecraft/net/minecraft/src/Teleporter.java @@ -44,7 +44,7 @@ public class Teleporter } } - par2Entity.setLocationAndAngles((double)var3.doubleValue(), (double)var4, (double)var5.doubleValue(), par2Entity.rotationYaw, 0.0F); + par2Entity.setLocationAndAngles((float)var3.doubleValue(), (float)var4, (float)var5.doubleValue(), par2Entity.rotationYaw, 0.0F); par2Entity.motionX = par2Entity.motionY = par2Entity.motionZ = 0.0D; } } @@ -66,12 +66,12 @@ public class Teleporter for (int var11 = - var3; var11 <= + var3; ++var11) { BigInteger x = BigInteger.valueOf(var11).add(var9); - double var12 = (double)x.doubleValue() + 0.5D - par2Entity.posX; + double var12 = (float)x.doubleValue() + 0.5D - par2Entity.posX; for (int var14 = - var3; var14 <= + var3; ++var14) { BigInteger z = BigInteger.valueOf(var14).add(var10); - double var15 = (double)z.doubleValue() + 0.5D - par2Entity.posZ; + double var15 = (float)z.doubleValue() + 0.5D - par2Entity.posZ; for (int var17 = par1World.getActualHeight() - 1; var17 >= 0; --var17) { @@ -82,7 +82,7 @@ public class Teleporter --var17; } - var18 = (double)var17 + 0.5D - par2Entity.posY; + var18 = (float)var17 + 0.5D - par2Entity.posY; double var20 = var12 * var12 + var18 * var18 + var15 * var15; if (var4 < 0.0D || var20 < var4) @@ -99,9 +99,9 @@ public class Teleporter if (var4 >= 0.0D) { - double var22 = (double)var6.doubleValue() + 0.5D; - double var16 = (double)var7 + 0.5D; - var18 = (double)var8.doubleValue() + 0.5D; + double var22 = (float)var6.doubleValue() + 0.5D; + double var16 = (float)var7 + 0.5D; + var18 = (float)var8.doubleValue() + 0.5D; if (par1World.getBlockId(var6.subtract(BigInteger.ONE), var7, var8) == Block.portal.blockID) { @@ -168,12 +168,12 @@ public class Teleporter // for (var14 = - var3; var14 <= + var3; ++var14) // { // BigInteger x = BigInteger.valueOf(var14).add(var6); -// var15 = (double)x.doubleValue() + 0.5D - par2Entity.posX; +// var15 = (float)x.doubleValue() + 0.5D - par2Entity.posX; // // for (var17 = - var3; var17 <= + var3; ++var17) // { // BigInteger z = BigInteger.valueOf(var17).add(var8); -// var18 = (double)z.doubleValue() + 0.5D - par2Entity.posZ; +// var18 = (float)z.doubleValue() + 0.5D - par2Entity.posZ; // label274: // // for (var20 = par1World.getActualHeight() - 1; var20 >= 0; --var20) @@ -214,7 +214,7 @@ public class Teleporter // } // } // -// var32 = (double)var20 + 0.5D - par2Entity.posY; +// var32 = (float)var20 + 0.5D - par2Entity.posY; // var33 = var15 * var15 + var32 * var32 + var18 * var18; // // if (var4 < 0.0D || var33 < var4) @@ -235,11 +235,11 @@ public class Teleporter // { // for (var14 = var6 - var3; var14 <= var6 + var3; ++var14) // { -// var15 = (double)var14 + 0.5D - par2Entity.posX; +// var15 = (float)var14 + 0.5D - par2Entity.posX; // // for (var17 = var8 - var3; var17 <= var8 + var3; ++var17) // { -// var18 = (double)var17 + 0.5D - par2Entity.posZ; +// var18 = (float)var17 + 0.5D - par2Entity.posZ; // label222: // // for (var20 = par1World.getActualHeight() - 1; var20 >= 0; --var20) @@ -271,7 +271,7 @@ public class Teleporter // } // } // -// var32 = (double)var20 + 0.5D - par2Entity.posY; +// var32 = (float)var20 + 0.5D - par2Entity.posY; // var33 = var15 * var15 + var32 * var32 + var18 * var18; // // if (var4 < 0.0D || var33 < var4) diff --git a/src/minecraft/net/minecraft/src/Tessellator.java b/src/minecraft/net/minecraft/src/Tessellator.java index 8ad5c03..fbb6276 100644 --- a/src/minecraft/net/minecraft/src/Tessellator.java +++ b/src/minecraft/net/minecraft/src/Tessellator.java @@ -588,9 +588,9 @@ public class Tessellator */ public void addTranslation(float par1, float par2, float par3) { - this.xOffset += (double)par1; - this.yOffset += (double)par2; - this.zOffset += (double)par3; + this.xOffset += (float)par1; + this.yOffset += (float)par2; + this.zOffset += (float)par3; } public void setDontTranslate(boolean dontTranslate) { diff --git a/src/minecraft/net/minecraft/src/TextureCompassFX.java b/src/minecraft/net/minecraft/src/TextureCompassFX.java index 79a6dbd..ca5d3b8 100644 --- a/src/minecraft/net/minecraft/src/TextureCompassFX.java +++ b/src/minecraft/net/minecraft/src/TextureCompassFX.java @@ -64,26 +64,26 @@ public class TextureCompassFX extends TextureFX if (this.mc.theWorld != null && this.mc.thePlayer != null) { ChunkCoordinates var21 = this.mc.theWorld.getSpawnPoint(); - double var23 = (double)var21.posX.doubleValue() - this.mc.thePlayer.posX; - double var25 = (double)var21.posZ.doubleValue() - this.mc.thePlayer.posZ; - var20 = (double)(this.mc.thePlayer.rotationYaw - 90.0F) * Math.PI / 180.0D - Math.atan2(var25, var23); + double var23 = (float)var21.posX.doubleValue() - this.mc.thePlayer.posX; + double var25 = (float)var21.posZ.doubleValue() - this.mc.thePlayer.posZ; + var20 = (float)(this.mc.thePlayer.rotationYaw - 90.0F) * (float)Math.PI / 180.0D - Math.atan2(var25, var23); if (!this.mc.theWorld.provider.isSurfaceWorld()) { - var20 = Math.random() * Math.PI * 2.0D; + var20 = Math.random() * (float)Math.PI * 2.0D; } } double var22; - for (var22 = var20 - this.field_76868_i; var22 < -Math.PI; var22 += (Math.PI * 2D)) + for (var22 = var20 - this.field_76868_i; var22 < -(float)Math.PI; var22 += ((float)Math.PI * 2D)) { ; } - while (var22 >= Math.PI) + while (var22 >= (float)Math.PI) { - var22 -= (Math.PI * 2D); + var22 -= ((float)Math.PI * 2D); } if (var22 < -1.0D) @@ -99,8 +99,8 @@ public class TextureCompassFX extends TextureFX this.field_76866_j += var22 * 0.1D; this.field_76866_j *= 0.8D; this.field_76868_i += this.field_76866_j; - double var24 = Math.sin(this.field_76868_i); - double var26 = Math.cos(this.field_76868_i); + double var24 = (float)Math.sin(this.field_76868_i); + double var26 = (float)Math.cos(this.field_76868_i); int var9; int var10; int var11; @@ -115,8 +115,8 @@ public class TextureCompassFX extends TextureFX for (var9 = -4; var9 <= 4; ++var9) { - var10 = (int)(8.5D + var26 * (double)var9 * 0.3D); - var11 = (int)(7.5D - var24 * (double)var9 * 0.3D * 0.5D); + var10 = (int)(8.5D + var26 * (float)var9 * 0.3D); + var11 = (int)(7.5D - var24 * (float)var9 * 0.3D * 0.5D); var12 = var11 * 16 + var10; var13 = 100; var14 = 100; @@ -141,8 +141,8 @@ public class TextureCompassFX extends TextureFX for (var9 = -8; var9 <= 16; ++var9) { - var10 = (int)(8.5D + var24 * (double)var9 * 0.3D); - var11 = (int)(7.5D + var26 * (double)var9 * 0.3D * 0.5D); + var10 = (int)(8.5D + var24 * (float)var9 * 0.3D); + var11 = (int)(7.5D + var26 * (float)var9 * 0.3D * 0.5D); var12 = var11 * 16 + var10; var13 = var9 >= 0 ? 255 : 100; var14 = var9 >= 0 ? 20 : 100; diff --git a/src/minecraft/net/minecraft/src/TextureLavaFX.java b/src/minecraft/net/minecraft/src/TextureLavaFX.java index 66a7cfa..a113258 100644 --- a/src/minecraft/net/minecraft/src/TextureLavaFX.java +++ b/src/minecraft/net/minecraft/src/TextureLavaFX.java @@ -27,8 +27,8 @@ public class TextureLavaFX extends TextureFX for (var2 = 0; var2 < 16; ++var2) { var3 = 0.0F; - int var4 = (int)(MathHelper.sin((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); - var5 = (int)(MathHelper.sin((float)var1 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); + int var4 = (int)(MathHelper.sin((float)var2 * (float)(float)Math.PI * 2.0F / 16.0F) * 1.2F); + var5 = (int)(MathHelper.sin((float)var1 * (float)(float)Math.PI * 2.0F / 16.0F) * 1.2F); for (var6 = var1 - 1; var6 <= var1 + 1; ++var6) { diff --git a/src/minecraft/net/minecraft/src/TextureLavaFlowFX.java b/src/minecraft/net/minecraft/src/TextureLavaFlowFX.java index e7757c3..b6fe37e 100644 --- a/src/minecraft/net/minecraft/src/TextureLavaFlowFX.java +++ b/src/minecraft/net/minecraft/src/TextureLavaFlowFX.java @@ -30,8 +30,8 @@ public class TextureLavaFlowFX extends TextureFX for (var2 = 0; var2 < 16; ++var2) { var3 = 0.0F; - int var4 = (int)(MathHelper.sin((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); - var5 = (int)(MathHelper.sin((float)var1 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); + int var4 = (int)(MathHelper.sin((float)var2 * (float)(float)Math.PI * 2.0F / 16.0F) * 1.2F); + var5 = (int)(MathHelper.sin((float)var1 * (float)(float)Math.PI * 2.0F / 16.0F) * 1.2F); for (var6 = var1 - 1; var6 <= var1 + 1; ++var6) { diff --git a/src/minecraft/net/minecraft/src/TexturePortalFX.java b/src/minecraft/net/minecraft/src/TexturePortalFX.java index 9143747..fb520a2 100644 --- a/src/minecraft/net/minecraft/src/TexturePortalFX.java +++ b/src/minecraft/net/minecraft/src/TexturePortalFX.java @@ -52,7 +52,7 @@ public class TexturePortalFX extends TextureFX } float var11 = var9 * var9 + var10 * var10; - float var12 = (float)Math.atan2((double)var10, (double)var9) + ((float)var2 / 32.0F * (float)Math.PI * 2.0F - var11 * 10.0F + (float)(var6 * 2)) * (float)(var6 * 2 - 1); + float var12 = (float)Math.atan2((float)var10, (float)var9) + ((float)var2 / 32.0F * (float)(float)Math.PI * 2.0F - var11 * 10.0F + (float)(var6 * 2)) * (float)(var6 * 2 - 1); var12 = (MathHelper.sin(var12) + 1.0F) / 2.0F; var12 /= var11 + 1.0F; var5 += var12 * 0.5F; diff --git a/src/minecraft/net/minecraft/src/TextureWatchFX.java b/src/minecraft/net/minecraft/src/TextureWatchFX.java index 8ed0ff4..42886dd 100644 --- a/src/minecraft/net/minecraft/src/TextureWatchFX.java +++ b/src/minecraft/net/minecraft/src/TextureWatchFX.java @@ -48,24 +48,24 @@ public class TextureWatchFX extends TextureFX if (this.mc.theWorld != null && this.mc.thePlayer != null) { float var3 = this.mc.theWorld.getCelestialAngle(1.0F); - var1 = (double)(-var3 * (float)Math.PI * 2.0F); + var1 = (float)(-var3 * (float)(float)Math.PI * 2.0F); if (!this.mc.theWorld.provider.isSurfaceWorld()) { - var1 = Math.random() * Math.PI * 2.0D; + var1 = Math.random() * (float)Math.PI * 2.0D; } } double var22; - for (var22 = var1 - this.field_76861_j; var22 < -Math.PI; var22 += (Math.PI * 2D)) + for (var22 = var1 - this.field_76861_j; var22 < -(float)Math.PI; var22 += ((float)Math.PI * 2D)) { ; } - while (var22 >= Math.PI) + while (var22 >= (float)Math.PI) { - var22 -= (Math.PI * 2D); + var22 -= ((float)Math.PI * 2D); } if (var22 < -1.0D) @@ -81,8 +81,8 @@ public class TextureWatchFX extends TextureFX this.field_76862_k += var22 * 0.1D; this.field_76862_k *= 0.8D; this.field_76861_j += this.field_76862_k; - double var5 = Math.sin(this.field_76861_j); - double var7 = Math.cos(this.field_76861_j); + double var5 = (float)Math.sin(this.field_76861_j); + double var7 = (float)Math.cos(this.field_76861_j); for (int var9 = 0; var9 < 256; ++var9) { @@ -93,8 +93,8 @@ public class TextureWatchFX extends TextureFX if (var11 == var13 && var12 == 0 && var13 > 0) { - double var14 = -((double)(var9 % 16) / 15.0D - 0.5D); - double var16 = (double)(var9 / 16) / 15.0D - 0.5D; + double var14 = -((float)(var9 % 16) / 15.0D - 0.5D); + double var16 = (float)(var9 / 16) / 15.0D - 0.5D; int var18 = var11; int var19 = (int)((var14 * var7 + var16 * var5 + 0.5D) * 16.0D); int var20 = (int)((var16 * var7 - var14 * var5 + 0.5D) * 16.0D); diff --git a/src/minecraft/net/minecraft/src/TexturedQuad.java b/src/minecraft/net/minecraft/src/TexturedQuad.java index e126f2f..b640152 100644 --- a/src/minecraft/net/minecraft/src/TexturedQuad.java +++ b/src/minecraft/net/minecraft/src/TexturedQuad.java @@ -56,7 +56,7 @@ public class TexturedQuad for (int var6 = 0; var6 < 4; ++var6) { PositionTextureVertex var7 = this.vertexPositions[var6]; - par1Tessellator.addVertexWithUV((double)((float)var7.vector3D.xCoord * par2), (double)((float)var7.vector3D.yCoord * par2), (double)((float)var7.vector3D.zCoord * par2), (double)var7.texturePositionX, (double)var7.texturePositionY); + par1Tessellator.addVertexWithUV((float)((float)var7.vector3D.xCoord * par2), (float)((float)var7.vector3D.yCoord * par2), (float)((float)var7.vector3D.zCoord * par2), (float)var7.texturePositionX, (float)var7.texturePositionY); } par1Tessellator.draw(); diff --git a/src/minecraft/net/minecraft/src/TileEntity.java b/src/minecraft/net/minecraft/src/TileEntity.java index 6aa42eb..7a8f279 100644 --- a/src/minecraft/net/minecraft/src/TileEntity.java +++ b/src/minecraft/net/minecraft/src/TileEntity.java @@ -163,9 +163,9 @@ public class TileEntity */ public double getDistanceFrom(double par1, double par3, double par5) { - double var7 = (double)this.xCoord.doubleValue() + 0.5D - par1; - double var9 = (double)this.yCoord + 0.5D - par3; - double var11 = (double)this.zCoord.doubleValue() + 0.5D - par5; + double var7 = (float)this.xCoord.doubleValue() + 0.5D - par1; + double var9 = (float)this.yCoord + 0.5D - par3; + double var11 = (float)this.zCoord.doubleValue() + 0.5D - par5; return var7 * var7 + var9 * var9 + var11 * var11; } diff --git a/src/minecraft/net/minecraft/src/TileEntityBrewingStand.java b/src/minecraft/net/minecraft/src/TileEntityBrewingStand.java index 69b5f3b..5c2f78c 100644 --- a/src/minecraft/net/minecraft/src/TileEntityBrewingStand.java +++ b/src/minecraft/net/minecraft/src/TileEntityBrewingStand.java @@ -293,7 +293,7 @@ public class TileEntityBrewingStand extends TileEntity implements IInventory */ public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord.doubleValue() + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord.doubleValue() + 0.5D) <= 64.0D; + return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((float)this.xCoord.doubleValue() + 0.5D, (float)this.yCoord + 0.5D, (float)this.zCoord.doubleValue() + 0.5D) <= 64.0D; } public void openChest() {} diff --git a/src/minecraft/net/minecraft/src/TileEntityChest.java b/src/minecraft/net/minecraft/src/TileEntityChest.java index 87eb247..d49c4a3 100644 --- a/src/minecraft/net/minecraft/src/TileEntityChest.java +++ b/src/minecraft/net/minecraft/src/TileEntityChest.java @@ -183,7 +183,7 @@ public class TileEntityChest extends TileEntity implements IInventory */ public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord.doubleValue() + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord.doubleValue() + 0.5D) <= 64.0D; + return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((float)this.xCoord.doubleValue() + 0.5D, (float)this.yCoord + 0.5D, (float)this.zCoord.doubleValue() + 0.5D) <= 64.0D; } /** @@ -271,8 +271,8 @@ public class TileEntityChest extends TileEntity implements IInventory if (this.numUsingPlayers > 0 && this.lidAngle == 0.0F && this.adjacentChestZNeg == null && this.adjacentChestXNeg == null) { - double var2 = (double)this.xCoord.doubleValue() + 0.5D; - var4 = (double)this.zCoord.doubleValue() + 0.5D; + double var2 = (float)this.xCoord.doubleValue() + 0.5D; + var4 = (float)this.zCoord.doubleValue() + 0.5D; if (this.adjacentChestZPosition != null) { @@ -284,7 +284,7 @@ public class TileEntityChest extends TileEntity implements IInventory var2 += 0.5D; } - this.worldObj.playSoundEffect(var2, (double)this.yCoord + 0.5D, var4, "random.chestopen", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); + this.worldObj.playSoundEffect(var2, (float)this.yCoord + 0.5D, var4, "random.chestopen", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (this.numUsingPlayers == 0 && this.lidAngle > 0.0F || this.numUsingPlayers > 0 && this.lidAngle < 1.0F) @@ -309,8 +309,8 @@ public class TileEntityChest extends TileEntity implements IInventory if (this.lidAngle < var3 && var8 >= var3 && this.adjacentChestZNeg == null && this.adjacentChestXNeg == null) { - var4 = (double)this.xCoord.doubleValue() + 0.5D; - double var6 = (double)this.zCoord.doubleValue() + 0.5D; + var4 = (float)this.xCoord.doubleValue() + 0.5D; + double var6 = (float)this.zCoord.doubleValue() + 0.5D; if (this.adjacentChestZPosition != null) { @@ -322,7 +322,7 @@ public class TileEntityChest extends TileEntity implements IInventory var4 += 0.5D; } - this.worldObj.playSoundEffect(var4, (double)this.yCoord + 0.5D, var6, "random.chestclosed", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); + this.worldObj.playSoundEffect(var4, (float)this.yCoord + 0.5D, var6, "random.chestclosed", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (this.lidAngle < 0.0F) diff --git a/src/minecraft/net/minecraft/src/TileEntityChestRenderer.java b/src/minecraft/net/minecraft/src/TileEntityChestRenderer.java index 2fac6e0..1b71b0a 100644 --- a/src/minecraft/net/minecraft/src/TileEntityChestRenderer.java +++ b/src/minecraft/net/minecraft/src/TileEntityChestRenderer.java @@ -116,7 +116,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer var12 = 1.0F - var12; var12 = 1.0F - var12 * var12 * var12; - var14.chestLid.rotateAngleX = -(var12 * (float)Math.PI / 2.0F); + var14.chestLid.rotateAngleX = -(var12 * (float)(float)Math.PI / 2.0F); var14.renderAll(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); diff --git a/src/minecraft/net/minecraft/src/TileEntityDispenser.java b/src/minecraft/net/minecraft/src/TileEntityDispenser.java index 0b75856..d2dfd77 100644 --- a/src/minecraft/net/minecraft/src/TileEntityDispenser.java +++ b/src/minecraft/net/minecraft/src/TileEntityDispenser.java @@ -191,7 +191,7 @@ public class TileEntityDispenser extends TileEntity implements IInventory */ public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord.doubleValue() + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord.doubleValue() + 0.5D) <= 64.0D; + return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((float)this.xCoord.doubleValue() + 0.5D, (float)this.yCoord + 0.5D, (float)this.zCoord.doubleValue() + 0.5D) <= 64.0D; } public void openChest() {} diff --git a/src/minecraft/net/minecraft/src/TileEntityEnchantmentTable.java b/src/minecraft/net/minecraft/src/TileEntityEnchantmentTable.java index 059fd21..3f9edad 100644 --- a/src/minecraft/net/minecraft/src/TileEntityEnchantmentTable.java +++ b/src/minecraft/net/minecraft/src/TileEntityEnchantmentTable.java @@ -36,12 +36,12 @@ public class TileEntityEnchantmentTable extends TileEntity this.bookRotationPrev = this.bookRotation2; double x = this.xCoord.doubleValue(), z = this.zCoord.doubleValue(); - EntityPlayer var1 = this.worldObj.getClosestPlayer((double)(x + 0.5F), (double)((float)this.yCoord + 0.5F), (double)(z + 0.5F), 3.0D); + EntityPlayer var1 = this.worldObj.getClosestPlayer((float)(x + 0.5F), (float)((float)this.yCoord + 0.5F), (float)(z + 0.5F), 3.0D); if (var1 != null) { - double var2 = var1.posX - (double)(x + 0.5F); - double var4 = var1.posZ - (double)(z + 0.5F); + double var2 = var1.posX - (float)(x + 0.5F); + double var4 = var1.posZ - (float)(z + 0.5F); this.bookRotation = (float)Math.atan2(var4, var2); this.bookSpread += 0.1F; @@ -62,36 +62,36 @@ public class TileEntityEnchantmentTable extends TileEntity this.bookSpread -= 0.1F; } - while (this.bookRotation2 >= (float)Math.PI) + while (this.bookRotation2 >= (float)(float)Math.PI) { - this.bookRotation2 -= ((float)Math.PI * 2F); + this.bookRotation2 -= ((float)(float)Math.PI * 2F); } - while (this.bookRotation2 < -(float)Math.PI) + while (this.bookRotation2 < -(float)(float)Math.PI) { - this.bookRotation2 += ((float)Math.PI * 2F); + this.bookRotation2 += ((float)(float)Math.PI * 2F); } - while (this.bookRotation >= (float)Math.PI) + while (this.bookRotation >= (float)(float)Math.PI) { - this.bookRotation -= ((float)Math.PI * 2F); + this.bookRotation -= ((float)(float)Math.PI * 2F); } - while (this.bookRotation < -(float)Math.PI) + while (this.bookRotation < -(float)(float)Math.PI) { - this.bookRotation += ((float)Math.PI * 2F); + this.bookRotation += ((float)(float)Math.PI * 2F); } float var7; - for (var7 = this.bookRotation - this.bookRotation2; var7 >= (float)Math.PI; var7 -= ((float)Math.PI * 2F)) + for (var7 = this.bookRotation - this.bookRotation2; var7 >= (float)(float)Math.PI; var7 -= ((float)(float)Math.PI * 2F)) { ; } - while (var7 < -(float)Math.PI) + while (var7 < -(float)(float)Math.PI) { - var7 += ((float)Math.PI * 2F); + var7 += ((float)(float)Math.PI * 2F); } this.bookRotation2 += var7 * 0.4F; diff --git a/src/minecraft/net/minecraft/src/TileEntityEnderChest.java b/src/minecraft/net/minecraft/src/TileEntityEnderChest.java index ea1503a..31dc8e9 100644 --- a/src/minecraft/net/minecraft/src/TileEntityEnderChest.java +++ b/src/minecraft/net/minecraft/src/TileEntityEnderChest.java @@ -33,9 +33,9 @@ public class TileEntityEnderChest extends TileEntity if (this.numUsingPlayers > 0 && this.lidAngle == 0.0F) { - double var2 = (double)this.xCoord.doubleValue() + 0.5D; - var4 = (double)this.zCoord.doubleValue() + 0.5D; - this.worldObj.playSoundEffect(var2, (double)this.yCoord + 0.5D, var4, "random.chestopen", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); + double var2 = (float)this.xCoord.doubleValue() + 0.5D; + var4 = (float)this.zCoord.doubleValue() + 0.5D; + this.worldObj.playSoundEffect(var2, (float)this.yCoord + 0.5D, var4, "random.chestopen", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (this.numUsingPlayers == 0 && this.lidAngle > 0.0F || this.numUsingPlayers > 0 && this.lidAngle < 1.0F) @@ -60,9 +60,9 @@ public class TileEntityEnderChest extends TileEntity if (this.lidAngle < var3 && var8 >= var3) { - var4 = (double)this.xCoord.doubleValue() + 0.5D; - double var6 = (double)this.zCoord.doubleValue() + 0.5D; - this.worldObj.playSoundEffect(var4, (double)this.yCoord + 0.5D, var6, "random.chestclosed", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); + var4 = (float)this.xCoord.doubleValue() + 0.5D; + double var6 = (float)this.zCoord.doubleValue() + 0.5D; + this.worldObj.playSoundEffect(var4, (float)this.yCoord + 0.5D, var6, "random.chestclosed", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); } if (this.lidAngle < 0.0F) @@ -106,6 +106,6 @@ public class TileEntityEnderChest extends TileEntity public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord.doubleValue() + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord.doubleValue() + 0.5D) <= 64.0D; + return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((float)this.xCoord.doubleValue() + 0.5D, (float)this.yCoord + 0.5D, (float)this.zCoord.doubleValue() + 0.5D) <= 64.0D; } } diff --git a/src/minecraft/net/minecraft/src/TileEntityEnderChestRenderer.java b/src/minecraft/net/minecraft/src/TileEntityEnderChestRenderer.java index e4e6ddf..3cb9bbb 100644 --- a/src/minecraft/net/minecraft/src/TileEntityEnderChestRenderer.java +++ b/src/minecraft/net/minecraft/src/TileEntityEnderChestRenderer.java @@ -50,7 +50,7 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer float var11 = par1TileEntityEnderChest.prevLidAngle + (par1TileEntityEnderChest.lidAngle - par1TileEntityEnderChest.prevLidAngle) * par8; var11 = 1.0F - var11; var11 = 1.0F - var11 * var11 * var11; - this.field_76900_a.chestLid.rotateAngleX = -(var11 * (float)Math.PI / 2.0F); + this.field_76900_a.chestLid.rotateAngleX = -(var11 * (float)(float)Math.PI / 2.0F); this.field_76900_a.renderAll(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); diff --git a/src/minecraft/net/minecraft/src/TileEntityFurnace.java b/src/minecraft/net/minecraft/src/TileEntityFurnace.java index fe8c87e..a679e85 100644 --- a/src/minecraft/net/minecraft/src/TileEntityFurnace.java +++ b/src/minecraft/net/minecraft/src/TileEntityFurnace.java @@ -352,7 +352,7 @@ public class TileEntityFurnace extends TileEntity implements IInventory */ public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord.doubleValue() + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord.doubleValue() + 0.5D) <= 64.0D; + return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((float)this.xCoord.doubleValue() + 0.5D, (float)this.yCoord + 0.5D, (float)this.zCoord.doubleValue() + 0.5D) <= 64.0D; } public void openChest() {} diff --git a/src/minecraft/net/minecraft/src/TileEntityMobSpawner.java b/src/minecraft/net/minecraft/src/TileEntityMobSpawner.java index 1800e4a..1783542 100644 --- a/src/minecraft/net/minecraft/src/TileEntityMobSpawner.java +++ b/src/minecraft/net/minecraft/src/TileEntityMobSpawner.java @@ -42,7 +42,7 @@ public class TileEntityMobSpawner extends TileEntity */ public boolean anyPlayerInRange() { - return this.worldObj.getClosestPlayer((double)this.xCoord.doubleValue() + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord.doubleValue() + 0.5D, 16.0D) != null; + return this.worldObj.getClosestPlayer((float)this.xCoord.doubleValue() + 0.5D, (float)this.yCoord + 0.5D, (float)this.zCoord.doubleValue() + 0.5D, 16.0D) != null; } /** @@ -55,9 +55,9 @@ public class TileEntityMobSpawner extends TileEntity { if (this.worldObj.isRemote) { - double var1 = (double)((float)this.xCoord.floatValue() + this.worldObj.rand.nextFloat()); - double var3 = (double)((float)this.yCoord + this.worldObj.rand.nextFloat()); - double var5 = (double)((float)this.zCoord.floatValue() + this.worldObj.rand.nextFloat()); + double var1 = (float)((float)this.xCoord.floatValue() + this.worldObj.rand.nextFloat()); + double var3 = (float)((float)this.yCoord + this.worldObj.rand.nextFloat()); + double var5 = (float)((float)this.zCoord.floatValue() + this.worldObj.rand.nextFloat()); this.worldObj.spawnParticle("smoke", var1, var3, var5, 0.0D, 0.0D, 0.0D); this.worldObj.spawnParticle("flame", var1, var3, var5, 0.0D, 0.0D, 0.0D); this.yaw2 = this.yaw % 360.0D; @@ -85,7 +85,7 @@ public class TileEntityMobSpawner extends TileEntity return; } - int var12 = this.worldObj.getEntitiesWithinAABB(var2.getClass(), AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)this.xCoord.doubleValue(), (double)this.yCoord, (double)this.zCoord.doubleValue(), (double)(this.xCoord.add(BigInteger.ONE).doubleValue()), (double)(this.yCoord + 1), (double)(this.zCoord.add(BigInteger.ONE).doubleValue())).expand(8.0D, 4.0D, 8.0D)).size(); + int var12 = this.worldObj.getEntitiesWithinAABB(var2.getClass(), AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)this.xCoord.doubleValue(), (float)this.yCoord, (float)this.zCoord.doubleValue(), (float)(this.xCoord.add(BigInteger.ONE).doubleValue()), (float)(this.yCoord + 1), (float)(this.zCoord.add(BigInteger.ONE).doubleValue())).expand(8.0D, 4.0D, 8.0D)).size(); if (var12 >= 6) { @@ -95,9 +95,9 @@ public class TileEntityMobSpawner extends TileEntity if (var2 != null) { - double var4 = (double)this.xCoord.doubleValue() + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D; - double var6 = (double)(this.yCoord + this.worldObj.rand.nextInt(3) - 1); - double var8 = (double)this.zCoord.doubleValue() + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D; + double var4 = (float)this.xCoord.doubleValue() + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D; + double var6 = (float)(this.yCoord + this.worldObj.rand.nextInt(3) - 1); + double var8 = (float)this.zCoord.doubleValue() + (this.worldObj.rand.nextDouble() - this.worldObj.rand.nextDouble()) * 4.0D; EntityLiving var10 = var2 instanceof EntityLiving ? (EntityLiving)var2 : null; var2.setLocationAndAngles(var4, var6, var8, this.worldObj.rand.nextFloat() * 360.0F, 0.0F); diff --git a/src/minecraft/net/minecraft/src/TileEntityMobSpawnerRenderer.java b/src/minecraft/net/minecraft/src/TileEntityMobSpawnerRenderer.java index 28ecd06..3d7e432 100644 --- a/src/minecraft/net/minecraft/src/TileEntityMobSpawnerRenderer.java +++ b/src/minecraft/net/minecraft/src/TileEntityMobSpawnerRenderer.java @@ -23,7 +23,7 @@ public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer var9.setWorld(par1TileEntityMobSpawner.func_70314_l()); float var10 = 0.4375F; GL11.glTranslatef(0.0F, 0.4F, 0.0F); - GL11.glRotatef((float)(par1TileEntityMobSpawner.yaw2 + (par1TileEntityMobSpawner.yaw - par1TileEntityMobSpawner.yaw2) * (double)par8) * 10.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef((float)(par1TileEntityMobSpawner.yaw2 + (par1TileEntityMobSpawner.yaw - par1TileEntityMobSpawner.yaw2) * (float)par8) * 10.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, -0.4F, 0.0F); GL11.glScalef(var10, var10, var10); diff --git a/src/minecraft/net/minecraft/src/TileEntityPiston.java b/src/minecraft/net/minecraft/src/TileEntityPiston.java index 0af7950..169ac9a 100644 --- a/src/minecraft/net/minecraft/src/TileEntityPiston.java +++ b/src/minecraft/net/minecraft/src/TileEntityPiston.java @@ -122,7 +122,7 @@ public class TileEntityPiston extends TileEntity while (var5.hasNext()) { Entity var6 = (Entity)var5.next(); - var6.moveEntity((double)(par2 * (float)x), (double)(par2 * (float)Facing.offsetsYForSide[this.storedOrientation]), (double)(par2 * (float)z)); + var6.moveEntity((float)(par2 * (float)x), (float)(par2 * (float)Facing.offsetsYForSide[this.storedOrientation]), (float)(par2 * (float)z)); } this.pushedObjects.clear(); diff --git a/src/minecraft/net/minecraft/src/TileEntityRenderer.java b/src/minecraft/net/minecraft/src/TileEntityRenderer.java index e185c99..286991b 100644 --- a/src/minecraft/net/minecraft/src/TileEntityRenderer.java +++ b/src/minecraft/net/minecraft/src/TileEntityRenderer.java @@ -113,9 +113,9 @@ public class TileEntityRenderer this.fontRenderer = par3FontRenderer; this.playerYaw = par4EntityLiving.prevRotationYaw + (par4EntityLiving.rotationYaw - par4EntityLiving.prevRotationYaw) * par5; this.playerPitch = par4EntityLiving.prevRotationPitch + (par4EntityLiving.rotationPitch - par4EntityLiving.prevRotationPitch) * par5; - this.playerX = par4EntityLiving.lastTickPosX + (par4EntityLiving.posX - par4EntityLiving.lastTickPosX) * (double)par5; - this.playerY = par4EntityLiving.lastTickPosY + (par4EntityLiving.posY - par4EntityLiving.lastTickPosY) * (double)par5; - this.playerZ = par4EntityLiving.lastTickPosZ + (par4EntityLiving.posZ - par4EntityLiving.lastTickPosZ) * (double)par5; + this.playerX = par4EntityLiving.lastTickPosX + (par4EntityLiving.posX - par4EntityLiving.lastTickPosX) * (float)par5; + this.playerY = par4EntityLiving.lastTickPosY + (par4EntityLiving.posY - par4EntityLiving.lastTickPosY) * (float)par5; + this.playerZ = par4EntityLiving.lastTickPosZ + (par4EntityLiving.posZ - par4EntityLiving.lastTickPosZ) * (float)par5; } /** @@ -130,7 +130,7 @@ public class TileEntityRenderer int var5 = var3 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var4 / 1.0F, (float)var5 / 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.renderTileEntityAt(par1TileEntity, (double)par1TileEntity.xCoord.doubleValue() - staticPlayerX, (double)par1TileEntity.yCoord - staticPlayerY, (double)par1TileEntity.zCoord.doubleValue() - staticPlayerZ, par2); + this.renderTileEntityAt(par1TileEntity, (float)par1TileEntity.xCoord.doubleValue() - staticPlayerX, (float)par1TileEntity.yCoord - staticPlayerY, (float)par1TileEntity.zCoord.doubleValue() - staticPlayerZ, par2); } } diff --git a/src/minecraft/net/minecraft/src/TileEntityRendererPiston.java b/src/minecraft/net/minecraft/src/TileEntityRendererPiston.java index a0afb6b..d4365f2 100644 --- a/src/minecraft/net/minecraft/src/TileEntityRendererPiston.java +++ b/src/minecraft/net/minecraft/src/TileEntityRendererPiston.java @@ -31,7 +31,7 @@ public class TileEntityRendererPiston extends TileEntitySpecialRenderer } var10.startDrawingQuads(); - var10.setTranslation((double)((float)par2 - (float)par1TileEntityPiston.xCoord.floatValue() + par1TileEntityPiston.getOffsetX(par8)), (double)((float)par4 - (float)par1TileEntityPiston.yCoord + par1TileEntityPiston.getOffsetY(par8)), (double)((float)par6 - (float)par1TileEntityPiston.zCoord.floatValue() + par1TileEntityPiston.getOffsetZ(par8))); + var10.setTranslation((float)((float)par2 - (float)par1TileEntityPiston.xCoord.floatValue() + par1TileEntityPiston.getOffsetX(par8)), (float)((float)par4 - (float)par1TileEntityPiston.yCoord + par1TileEntityPiston.getOffsetY(par8)), (float)((float)par6 - (float)par1TileEntityPiston.zCoord.floatValue() + par1TileEntityPiston.getOffsetZ(par8))); var10.setColorOpaque(1, 1, 1); if (var9 == Block.pistonExtension && par1TileEntityPiston.getProgress(par8) < 0.5F) @@ -43,7 +43,7 @@ public class TileEntityRendererPiston extends TileEntitySpecialRenderer Block.pistonExtension.setHeadTexture(((BlockPistonBase)var9).getPistonExtensionTexture()); this.blockRenderer.renderPistonExtensionAllFaces(Block.pistonExtension, par1TileEntityPiston.xCoord, par1TileEntityPiston.yCoord, par1TileEntityPiston.zCoord, par1TileEntityPiston.getProgress(par8) < 0.5F); Block.pistonExtension.clearHeadTexture(); - var10.setTranslation((double)((float)par2 - (float)par1TileEntityPiston.xCoord.floatValue()), (double)((float)par4 - (float)par1TileEntityPiston.yCoord), (double)((float)par6 - (float)par1TileEntityPiston.zCoord.floatValue())); + var10.setTranslation((float)((float)par2 - (float)par1TileEntityPiston.xCoord.floatValue()), (float)((float)par4 - (float)par1TileEntityPiston.yCoord), (float)((float)par6 - (float)par1TileEntityPiston.zCoord.floatValue())); this.blockRenderer.renderPistonBaseAllFaces(var9, par1TileEntityPiston.xCoord, par1TileEntityPiston.yCoord, par1TileEntityPiston.zCoord); } else diff --git a/src/minecraft/net/minecraft/src/Timer.java b/src/minecraft/net/minecraft/src/Timer.java index 4e96327..5e97b2f 100644 --- a/src/minecraft/net/minecraft/src/Timer.java +++ b/src/minecraft/net/minecraft/src/Timer.java @@ -65,7 +65,7 @@ public class Timer long var1 = Minecraft.getSystemTime(); long var3 = var1 - this.lastSyncSysClock; long var5 = System.nanoTime() / 1000000L; - double var7 = (double)var5 / 1000.0D; + double var7 = (float)var5 / 1000.0D; if (var3 <= 1000L && var3 >= 0L) { @@ -74,7 +74,7 @@ public class Timer if (this.field_74285_i > 1000L) { long var9 = var5 - this.lastSyncHRClock; - double var11 = (double)this.field_74285_i / (double)var9; + double var11 = (float)this.field_74285_i / (float)var9; this.timeSyncAdjustment += (var11 - this.timeSyncAdjustment) * 0.20000000298023224D; this.lastSyncHRClock = var5; this.field_74285_i = 0L; @@ -104,7 +104,7 @@ public class Timer var13 = 1.0D; } - this.elapsedPartialTicks = (float)((double)this.elapsedPartialTicks + var13 * (double)this.timerSpeed * (double)this.ticksPerSecond); + this.elapsedPartialTicks = (float)((float)this.elapsedPartialTicks + var13 * (float)this.timerSpeed * (float)this.ticksPerSecond); this.elapsedTicks = (int)this.elapsedPartialTicks; this.elapsedPartialTicks -= (float)this.elapsedTicks; diff --git a/src/minecraft/net/minecraft/src/Vec3.java b/src/minecraft/net/minecraft/src/Vec3.java index 6e2cf66..8cc4e5e 100644 --- a/src/minecraft/net/minecraft/src/Vec3.java +++ b/src/minecraft/net/minecraft/src/Vec3.java @@ -73,7 +73,7 @@ public class Vec3 */ public Vec3 normalize() { - double var1 = (double)MathHelper.sqrt_double(this.xCoord * this.xCoord + this.yCoord * this.yCoord + this.zCoord * this.zCoord); + double var1 = (float)MathHelper.sqrt_double(this.xCoord * this.xCoord + this.yCoord * this.yCoord + this.zCoord * this.zCoord); return var1 < 1.0E-4D ? getVec3Pool().getVecFromPool(0.0D, 0.0D, 0.0D) : getVec3Pool().getVecFromPool(this.xCoord / var1, this.yCoord / var1, this.zCoord / var1); } @@ -107,7 +107,7 @@ public class Vec3 double var2 = par1Vec3.xCoord - this.xCoord; double var4 = par1Vec3.yCoord - this.yCoord; double var6 = par1Vec3.zCoord - this.zCoord; - return (double)MathHelper.sqrt_double(var2 * var2 + var4 * var4 + var6 * var6); + return (float)MathHelper.sqrt_double(var2 * var2 + var4 * var4 + var6 * var6); } /** @@ -137,7 +137,7 @@ public class Vec3 */ public double lengthVector() { - return (double)MathHelper.sqrt_double(this.xCoord * this.xCoord + this.yCoord * this.yCoord + this.zCoord * this.zCoord); + return (float)MathHelper.sqrt_double(this.xCoord * this.xCoord + this.yCoord * this.yCoord + this.zCoord * this.zCoord); } /** @@ -216,8 +216,8 @@ public class Vec3 float var2 = MathHelper.cos(par1); float var3 = MathHelper.sin(par1); double var4 = this.xCoord; - double var6 = this.yCoord * (double)var2 + this.zCoord * (double)var3; - double var8 = this.zCoord * (double)var2 - this.yCoord * (double)var3; + double var6 = this.yCoord * (float)var2 + this.zCoord * (float)var3; + double var8 = this.zCoord * (float)var2 - this.yCoord * (float)var3; this.xCoord = var4; this.yCoord = var6; this.zCoord = var8; @@ -230,9 +230,9 @@ public class Vec3 { float var2 = MathHelper.cos(par1); float var3 = MathHelper.sin(par1); - double var4 = this.xCoord * (double)var2 + this.zCoord * (double)var3; + double var4 = this.xCoord * (float)var2 + this.zCoord * (float)var3; double var6 = this.yCoord; - double var8 = this.zCoord * (double)var2 - this.xCoord * (double)var3; + double var8 = this.zCoord * (float)var2 - this.xCoord * (float)var3; this.xCoord = var4; this.yCoord = var6; this.zCoord = var8; @@ -245,8 +245,8 @@ public class Vec3 { float var2 = MathHelper.cos(par1); float var3 = MathHelper.sin(par1); - double var4 = this.xCoord * (double)var2 + this.yCoord * (double)var3; - double var6 = this.yCoord * (double)var2 - this.xCoord * (double)var3; + double var4 = this.xCoord * (float)var2 + this.yCoord * (float)var3; + double var6 = this.yCoord * (float)var2 - this.xCoord * (float)var3; double var8 = this.zCoord; this.xCoord = var4; this.yCoord = var6; diff --git a/src/minecraft/net/minecraft/src/Village.java b/src/minecraft/net/minecraft/src/Village.java index 5eecb9b..1b01fb8 100644 --- a/src/minecraft/net/minecraft/src/Village.java +++ b/src/minecraft/net/minecraft/src/Village.java @@ -81,7 +81,7 @@ public class Village if (this.isInRange(var8, var9, var10) && this.isValidIronGolemSpawningLocation(var8, var9, var10, par4, par5, par6)) { - return Vec3.getVec3Pool().getVecFromPool((double)var8.doubleValue(), (double)var9, (double)var10.doubleValue()); + return Vec3.getVec3Pool().getVecFromPool((float)var8.doubleValue(), (float)var9, (float)var10.doubleValue()); } } @@ -122,13 +122,13 @@ public class Village private void updateNumIronGolems() { - List var1 = this.worldObj.getEntitiesWithinAABB(EntityIronGolem.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)(this.center.posX.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (double)(this.center.posY - 4), (double)(this.center.posZ.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (double)(this.center.posX.add(BigInteger.valueOf(this.villageRadius))).doubleValue(), (double)(this.center.posY + 4), (double)(this.center.posZ.add(BigInteger.valueOf(this.villageRadius))).doubleValue())); + List var1 = this.worldObj.getEntitiesWithinAABB(EntityIronGolem.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)(this.center.posX.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (float)(this.center.posY - 4), (float)(this.center.posZ.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (float)(this.center.posX.add(BigInteger.valueOf(this.villageRadius))).doubleValue(), (float)(this.center.posY + 4), (float)(this.center.posZ.add(BigInteger.valueOf(this.villageRadius))).doubleValue())); this.numIronGolems = var1.size(); } private void updateNumVillagers() { - List var1 = this.worldObj.getEntitiesWithinAABB(EntityVillager.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)(this.center.posX.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (double)(this.center.posY - 4), (double)(this.center.posX.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (double)(this.center.posX.add(BigInteger.valueOf(this.villageRadius))).doubleValue(), (double)(this.center.posY + 4), (double)(this.center.posZ.add(BigInteger.valueOf(this.villageRadius))).doubleValue())); + List var1 = this.worldObj.getEntitiesWithinAABB(EntityVillager.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)(this.center.posX.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (float)(this.center.posY - 4), (float)(this.center.posX.subtract(BigInteger.valueOf(this.villageRadius))).doubleValue(), (float)(this.center.posX.add(BigInteger.valueOf(this.villageRadius))).doubleValue(), (float)(this.center.posY + 4), (float)(this.center.posZ.add(BigInteger.valueOf(this.villageRadius))).doubleValue())); this.numVillagers = var1.size(); } @@ -391,7 +391,7 @@ public class Village var4 = (VillageDoorInfo)var3.next(); } - this.villageRadius = Math.max(32, (int)Math.sqrt((double)var2.doubleValue()) + 1); + this.villageRadius = Math.max(32, (int)Math.sqrt((float)var2.doubleValue()) + 1); } } } diff --git a/src/minecraft/net/minecraft/src/VillageSiege.java b/src/minecraft/net/minecraft/src/VillageSiege.java index a307924..52ceabd 100644 --- a/src/minecraft/net/minecraft/src/VillageSiege.java +++ b/src/minecraft/net/minecraft/src/VillageSiege.java @@ -53,7 +53,7 @@ public class VillageSiege { float var2 = this.worldObj.getCelestialAngle(0.0F); - if ((double)var2 < 0.5D || (double)var2 > 0.501D) + if ((float)var2 < 0.5D || (float)var2 > 0.501D) { return; } @@ -119,9 +119,9 @@ public class VillageSiege { if (var7 < 10) { - this.field_75532_g = var4.posX.add(MathHelper.toBigInteger((double)(MathHelper.cos(this.worldObj.rand.nextFloat() * (float)Math.PI * 2.0F) * var5) * 0.9D)); + this.field_75532_g = var4.posX.add(MathHelper.toBigInteger((float)(MathHelper.cos(this.worldObj.rand.nextFloat() * (float)(float)Math.PI * 2.0F) * var5) * 0.9D)); this.field_75538_h = var4.posY; - this.field_75539_i = var4.posZ.add(MathHelper.toBigInteger((double)(MathHelper.sin(this.worldObj.rand.nextFloat() * (float)Math.PI * 2.0F) * var5) * 0.9D)); + this.field_75539_i = var4.posZ.add(MathHelper.toBigInteger((float)(MathHelper.sin(this.worldObj.rand.nextFloat() * (float)(float)Math.PI * 2.0F) * var5) * 0.9D)); var6 = false; Iterator var8 = this.worldObj.villageCollectionObj.func_75540_b().iterator(); @@ -205,7 +205,7 @@ public class VillageSiege if (this.field_75531_f.isInRange(var5, var6, var7) && SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, this.worldObj, var5, var6, var7)) { - return Vec3.getVec3Pool().getVecFromPool((double)var5.doubleValue(), (double)var6, (double)var7.doubleValue()); + return Vec3.getVec3Pool().getVecFromPool((float)var5.doubleValue(), (float)var6, (float)var7.doubleValue()); } } diff --git a/src/minecraft/net/minecraft/src/World.java b/src/minecraft/net/minecraft/src/World.java index b84e549..39cb32d 100644 --- a/src/minecraft/net/minecraft/src/World.java +++ b/src/minecraft/net/minecraft/src/World.java @@ -940,11 +940,11 @@ public abstract class World implements IBlockAccess if (var5.compareTo(var8) == 1) { - var15 = (double)var8.doubleValue() + 1.0D; + var15 = (float)var8.doubleValue() + 1.0D; } else if (var5.compareTo(var8) == -1) { - var15 = (double)var8.doubleValue() + 0.0D; + var15 = (float)var8.doubleValue() + 0.0D; } else { @@ -953,11 +953,11 @@ public abstract class World implements IBlockAccess if (var6 > var9) { - var17 = (double)var9 + 1.0D; + var17 = (float)var9 + 1.0D; } else if (var6 < var9) { - var17 = (double)var9 + 0.0D; + var17 = (float)var9 + 0.0D; } else { @@ -966,11 +966,11 @@ public abstract class World implements IBlockAccess if (var7.compareTo(var10) == 1) { - var19 = (double)var10.doubleValue() + 1.0D; + var19 = (float)var10.doubleValue() + 1.0D; } else if (var7.compareTo(var10) == -1) { - var19 = (double)var10.doubleValue() + 0.0D; + var19 = (float)var10.doubleValue() + 0.0D; } else { @@ -1057,7 +1057,7 @@ public abstract class World implements IBlockAccess ++var34.xCoord; } - var9 = (int)(var34.yCoord = (double)MathHelper.floor_double(par1Vec3.yCoord)); + var9 = (int)(var34.yCoord = (float)MathHelper.floor_double(par1Vec3.yCoord)); if (var42 == 1) { @@ -1114,14 +1114,14 @@ public abstract class World implements IBlockAccess while (var5.hasNext()) { IWorldAccess var6 = (IWorldAccess)var5.next(); - var6.playSound(par2Str, par1Entity.posX, par1Entity.posY - (double)par1Entity.yOffset, par1Entity.posZ, par3, par4); + var6.playSound(par2Str, par1Entity.posX, par1Entity.posY - (float)par1Entity.yOffset, par1Entity.posZ, par3, par4); } } } /** * Play a sound effect. Many many parameters for this function. Not sure what they do, but a classic call is : - * (double)i + 0.5D, (double)j + 0.5D, (double)k + 0.5D, 'random.door_open', 1.0F, world.rand.nextFloat() * 0.1F + + * (float)i + 0.5D, (float)j + 0.5D, (float)k + 0.5D, 'random.door_open', 1.0F, world.rand.nextFloat() * 0.1F + * 0.9F with i,j,k position of the block. */ public void playSoundEffect(double par1, double par3, double par5, String par7Str, float par8, float par9) @@ -1408,7 +1408,7 @@ public abstract class World implements IBlockAccess public int calculateSkylightSubtracted(float par1) { float var2 = this.getCelestialAngle(par1); - float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.5F); + float var3 = 1.0F - (MathHelper.cos(var2 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.5F); if (var3 < 0.0F) { @@ -1421,8 +1421,8 @@ public abstract class World implements IBlockAccess } var3 = 1.0F - var3; - var3 = (float)((double)var3 * (1.0D - (double)(this.getRainStrength(par1) * 5.0F) / 16.0D)); - var3 = (float)((double)var3 * (1.0D - (double)(this.getWeightedThunderStrength(par1) * 5.0F) / 16.0D)); + var3 = (float)((float)var3 * (1.0D - (float)(this.getRainStrength(par1) * 5.0F) / 16.0D)); + var3 = (float)((float)var3 * (1.0D - (float)(this.getWeightedThunderStrength(par1) * 5.0F) / 16.0D)); var3 = 1.0F - var3; return (int)(var3 * 11.0F); } @@ -1430,7 +1430,7 @@ public abstract class World implements IBlockAccess public float func_72971_b(float par1) { float var2 = this.getCelestialAngle(par1); - float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.2F); + float var3 = 1.0F - (MathHelper.cos(var2 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.2F); if (var3 < 0.0F) { @@ -1443,8 +1443,8 @@ public abstract class World implements IBlockAccess } var3 = 1.0F - var3; - var3 = (float)((double)var3 * (1.0D - (double)(this.getRainStrength(par1) * 5.0F) / 16.0D)); - var3 = (float)((double)var3 * (1.0D - (double)(this.getWeightedThunderStrength(par1) * 5.0F) / 16.0D)); + var3 = (float)((float)var3 * (1.0D - (float)(this.getRainStrength(par1) * 5.0F) / 16.0D)); + var3 = (float)((float)var3 * (1.0D - (float)(this.getWeightedThunderStrength(par1) * 5.0F) / 16.0D)); return var3 * 0.8F + 0.2F; } @@ -1454,7 +1454,7 @@ public abstract class World implements IBlockAccess public Vec3 getSkyColor(Entity par1Entity, float par2) { float var3 = this.getCelestialAngle(par2); - float var4 = MathHelper.cos(var3 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; + float var4 = MathHelper.cos(var3 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.5F; if (var4 < 0.0F) { @@ -1516,7 +1516,7 @@ public abstract class World implements IBlockAccess var12 = var12 * (1.0F - var15) + 1.0F * var15; } - return Vec3.getVec3Pool().getVecFromPool((double)var10, (double)var11, (double)var12); + return Vec3.getVec3Pool().getVecFromPool((float)var10, (float)var11, (float)var12); } /** @@ -1538,13 +1538,13 @@ public abstract class World implements IBlockAccess public float getCelestialAngleRadians(float par1) { float var2 = this.getCelestialAngle(par1); - return var2 * (float)Math.PI * 2.0F; + return var2 * (float)(float)Math.PI * 2.0F; } public Vec3 drawClouds(float par1) { float var2 = this.getCelestialAngle(par1); - float var3 = MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; + float var3 = MathHelper.cos(var2 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.5F; if (var3 < 0.0F) { @@ -1586,7 +1586,7 @@ public abstract class World implements IBlockAccess var6 = var6 * var10 + var9 * (1.0F - var10); } - return Vec3.getVec3Pool().getVecFromPool((double)var4, (double)var5, (double)var6); + return Vec3.getVec3Pool().getVecFromPool((float)var4, (float)var5, (float)var6); } /** @@ -1636,7 +1636,7 @@ public abstract class World implements IBlockAccess public float getStarBrightness(float par1) { float var2 = this.getCelestialAngle(par1); - float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.25F); + float var3 = 1.0F - (MathHelper.cos(var2 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.25F); if (var3 < 0.0F) { @@ -1895,12 +1895,12 @@ public abstract class World implements IBlockAccess par1Entity.posZ = par1Entity.lastTickPosZ; } - if (Double.isNaN((double)par1Entity.rotationPitch) || Double.isInfinite((double)par1Entity.rotationPitch)) + if (Double.isNaN((float)par1Entity.rotationPitch) || Double.isInfinite((float)par1Entity.rotationPitch)) { par1Entity.rotationPitch = par1Entity.prevRotationPitch; } - if (Double.isNaN((double)par1Entity.rotationYaw) || Double.isInfinite((double)par1Entity.rotationYaw)) + if (Double.isNaN((float)par1Entity.rotationYaw) || Double.isInfinite((float)par1Entity.rotationYaw)) { par1Entity.rotationYaw = par1Entity.prevRotationYaw; } @@ -2138,9 +2138,9 @@ public abstract class World implements IBlockAccess if (var15 != null && var15.blockMaterial == par2Material) { - double var16 = (double)((float)(var13 + 1) - BlockFluid.getFluidHeightPercent(this.getBlockMetadata(var12, var13, var14))); + double var16 = (float)((float)(var13 + 1) - BlockFluid.getFluidHeightPercent(this.getBlockMetadata(var12, var13, var14))); - if ((double)var7 >= var16) + if ((float)var7 >= var16) { var10 = true; var15.velocityToAddToEntity(this, var12, var13, var14, par3Entity, var11); @@ -2220,11 +2220,11 @@ public abstract class World implements IBlockAccess if (var12 != null && var12.blockMaterial == par2Material) { int var13 = this.getBlockMetadata(var9, var10, var11); - double var14 = (double)(var10 + 1); + double var14 = (float)(var10 + 1); if (var13 < 8) { - var14 = (double)(var10 + 1) - (double)var13 / 8.0D; + var14 = (float)(var10 + 1) - (float)var13 / 8.0D; } if (var14 >= par1AxisAlignedBB.minY) @@ -2270,15 +2270,15 @@ public abstract class World implements IBlockAccess int var9 = 0; int var10 = 0; - for (float var11 = 0.0F; var11 <= 1.0F; var11 = (float)((double)var11 + var3)) + for (float var11 = 0.0F; var11 <= 1.0F; var11 = (float)((float)var11 + var3)) { - for (float var12 = 0.0F; var12 <= 1.0F; var12 = (float)((double)var12 + var5)) + for (float var12 = 0.0F; var12 <= 1.0F; var12 = (float)((float)var12 + var5)) { - for (float var13 = 0.0F; var13 <= 1.0F; var13 = (float)((double)var13 + var7)) + for (float var13 = 0.0F; var13 <= 1.0F; var13 = (float)((float)var13 + var7)) { - double var14 = par2AxisAlignedBB.minX + (par2AxisAlignedBB.maxX - par2AxisAlignedBB.minX) * (double)var11; - double var16 = par2AxisAlignedBB.minY + (par2AxisAlignedBB.maxY - par2AxisAlignedBB.minY) * (double)var12; - double var18 = par2AxisAlignedBB.minZ + (par2AxisAlignedBB.maxZ - par2AxisAlignedBB.minZ) * (double)var13; + double var14 = par2AxisAlignedBB.minX + (par2AxisAlignedBB.maxX - par2AxisAlignedBB.minX) * (float)var11; + double var16 = par2AxisAlignedBB.minY + (par2AxisAlignedBB.maxY - par2AxisAlignedBB.minY) * (float)var12; + double var18 = par2AxisAlignedBB.minZ + (par2AxisAlignedBB.maxZ - par2AxisAlignedBB.minZ) * (float)var13; if (this.rayTraceBlocks(Vec3.getVec3Pool().getVecFromPool(var14, var16, var18), par1Vec3) == null) { @@ -2618,11 +2618,11 @@ public abstract class World implements IBlockAccess if (this.worldInfo.isRaining()) { - this.rainingStrength = (float)((double)this.rainingStrength + 0.01D); + this.rainingStrength = (float)((float)this.rainingStrength + 0.01D); } else { - this.rainingStrength = (float)((double)this.rainingStrength - 0.01D); + this.rainingStrength = (float)((float)this.rainingStrength - 0.01D); } if (this.rainingStrength < 0.0F) @@ -2639,11 +2639,11 @@ public abstract class World implements IBlockAccess if (this.worldInfo.isThundering()) { - this.thunderingStrength = (float)((double)this.thunderingStrength + 0.01D); + this.thunderingStrength = (float)((float)this.thunderingStrength + 0.01D); } else { - this.thunderingStrength = (float)((double)this.thunderingStrength - 0.01D); + this.thunderingStrength = (float)((float)this.thunderingStrength - 0.01D); } if (this.thunderingStrength < 0.0F) @@ -2727,11 +2727,11 @@ public abstract class World implements IBlockAccess // // if (var8 == 0 && this.getFullBlockLightValue(var5, var7, var6) <= this.rand.nextInt(8) && this.getSavedLightValue(EnumSkyBlock.Sky, var5, var7, var6) <= 0) // { -// EntityPlayer var9 = this.getClosestPlayer((double)var5 + 0.5D, (double)var7 + 0.5D, (double)var6 + 0.5D, 8.0D); +// EntityPlayer var9 = this.getClosestPlayer((float)var5 + 0.5D, (float)var7 + 0.5D, (float)var6 + 0.5D, 8.0D); // -// if (var9 != null && var9.getDistanceSq((double)var5 + 0.5D, (double)var7 + 0.5D, (double)var6 + 0.5D) > 4.0D) +// if (var9 != null && var9.getDistanceSq((float)var5 + 0.5D, (float)var7 + 0.5D, (float)var6 + 0.5D) > 4.0D) // { -// this.playSoundEffect((double)var5 + 0.5D, (double)var7 + 0.5D, (double)var6 + 0.5D, "ambient.cave.cave", 0.7F, 0.8F + this.rand.nextFloat() * 0.2F); +// this.playSoundEffect((float)var5 + 0.5D, (float)var7 + 0.5D, (float)var6 + 0.5D, "ambient.cave.cave", 0.7F, 0.8F + this.rand.nextFloat() * 0.2F); // this.ambientTickCountdown = this.rand.nextInt(12000) + 6000; // } // } @@ -3663,7 +3663,7 @@ public abstract class World implements IBlockAccess */ public boolean isThundering() { - return (double)this.getWeightedThunderStrength(1.0F) > 0.9D; + return (float)this.getWeightedThunderStrength(1.0F) > 0.9D; } /** @@ -3671,7 +3671,7 @@ public abstract class World implements IBlockAccess */ public boolean isRaining() { - return (double)this.getRainStrength(1.0F) > 0.2D; + return (float)this.getRainStrength(1.0F) > 0.2D; } public boolean canLightningStrikeAt(BigInteger par1, int par2, BigInteger par3) diff --git a/src/minecraft/net/minecraft/src/WorldClient.java b/src/minecraft/net/minecraft/src/WorldClient.java index 2327c5e..7cc4d16 100644 --- a/src/minecraft/net/minecraft/src/WorldClient.java +++ b/src/minecraft/net/minecraft/src/WorldClient.java @@ -274,11 +274,11 @@ public class WorldClient extends World if (this.worldInfo.isRaining()) { - this.rainingStrength = (float)((double)this.rainingStrength + 0.01D); + this.rainingStrength = (float)((float)this.rainingStrength + 0.01D); } else { - this.rainingStrength = (float)((double)this.rainingStrength - 0.01D); + this.rainingStrength = (float)((float)this.rainingStrength - 0.01D); } if (this.rainingStrength < 0.0F) @@ -295,11 +295,11 @@ public class WorldClient extends World if (this.worldInfo.isThundering()) { - this.thunderingStrength = (float)((double)this.thunderingStrength + 0.01D); + this.thunderingStrength = (float)((float)this.thunderingStrength + 0.01D); } else { - this.thunderingStrength = (float)((double)this.thunderingStrength - 0.01D); + this.thunderingStrength = (float)((float)this.thunderingStrength - 0.01D); } if (this.thunderingStrength < 0.0F) @@ -328,7 +328,7 @@ public class WorldClient extends World if (var10 == 0 && this.rand.nextInt(8) > var8 && this.provider.getWorldHasVoidParticles()) { - this.spawnParticle("depthsuspend", (double)((float)var7.floatValue() + this.rand.nextFloat()), (double)((float)var8 + this.rand.nextFloat()), (double)((float)var9.floatValue() + this.rand.nextFloat()), 0.0D, 0.0D, 0.0D); + this.spawnParticle("depthsuspend", (float)((float)var7.floatValue() + this.rand.nextFloat()), (float)((float)var8 + this.rand.nextFloat()), (float)((float)var9.floatValue() + this.rand.nextFloat()), 0.0D, 0.0D, 0.0D); } else if (var10 > 0) { @@ -421,7 +421,7 @@ public class WorldClient extends World var10 *= par8; } - if (this.mc.renderViewEntity.getDistanceSq(par1, par3, par5) < (double)(var10 * var10)) + if (this.mc.renderViewEntity.getDistanceSq(par1, par3, par5) < (float)(var10 * var10)) { this.mc.sndManager.playSound(par7Str, (float)par1, (float)par3, (float)par5, par8, par9); } diff --git a/src/minecraft/net/minecraft/src/WorldGenBigTree.java b/src/minecraft/net/minecraft/src/WorldGenBigTree.java index 09c02e8..e4c1f97 100644 --- a/src/minecraft/net/minecraft/src/WorldGenBigTree.java +++ b/src/minecraft/net/minecraft/src/WorldGenBigTree.java @@ -56,14 +56,14 @@ public class WorldGenBigTree extends WorldGenerator // */ // void generateLeafNodeList() // { -// this.height = (int)((double)this.heightLimit * this.heightAttenuation); +// this.height = (int)((float)this.heightLimit * this.heightAttenuation); // // if (this.height >= this.heightLimit) // { // this.height = this.heightLimit - 1; // } // -// int var1 = (int)(1.382D + Math.pow(this.leafDensity * (double)this.heightLimit / 13.0D, 2.0D)); +// int var1 = (int)(1.382D + Math.pow(this.leafDensity * (float)this.heightLimit / 13.0D, 2.0D)); // // if (var1 < 1) // { @@ -98,26 +98,26 @@ public class WorldGenBigTree extends WorldGenerator // { // for (double var9 = 0.5D; var7 < var1; ++var7) // { -// double var11 = this.scaleWidth * (double)var8 * ((double)this.rand.nextFloat() + 0.328D); -// double var13 = (double)this.rand.nextFloat() * 2.0D * Math.PI; -// int var15 = MathHelper.floor_double(var11 * Math.sin(var13) + (double)this.x + var9); -// int var16 = MathHelper.floor_double(var11 * Math.cos(var13) + (double)this.z + var9); +// double var11 = this.scaleWidth * (float)var8 * ((float)this.rand.nextFloat() + 0.328D); +// double var13 = (float)this.rand.nextFloat() * 2.0D * (float)Math.PI; +// int var15 = MathHelper.floor_double(var11 * (float)Math.sin(var13) + (float)this.x + var9); +// int var16 = MathHelper.floor_double(var11 * (float)Math.cos(var13) + (float)this.z + var9); // int[] var17 = new int[] {var15, var3, var16}; // int[] var18 = new int[] {var15, var3 + this.leafDistanceLimit, var16}; // // if (this.checkBlockLine(var17, var18) == -1) // { // int[] var19 = new int[] {this.x, this.y, this.z}; -// double var20 = Math.sqrt(Math.pow((double)Math.abs(this.x - var17[0]), 2.0D) + Math.pow((double)Math.abs(this.z - var17[2]), 2.0D)); +// double var20 = Math.sqrt(Math.pow((float)Math.abs(this.x - var17[0]), 2.0D) + Math.pow((float)Math.abs(this.z - var17[2]), 2.0D)); // double var22 = var20 * this.branchSlope; // -// if ((double)var17[1] - var22 > (double)var5) +// if ((float)var17[1] - var22 > (float)var5) // { // var19[1] = var5; // } // else // { -// var19[1] = (int)((double)var17[1] - var22); +// var19[1] = (int)((float)var17[1] - var22); // } // // if (this.checkBlockLine(var19, var17) == -1) @@ -142,7 +142,7 @@ public class WorldGenBigTree extends WorldGenerator // // void genTreeLayer(int par1, int par2, int par3, float par4, byte par5, int par6) // { -// int var7 = (int)((double)par4 + 0.618D); +// int var7 = (int)((float)par4 + 0.618D); // byte var8 = otherCoordPairs[par5]; // byte var9 = otherCoordPairs[par5 + 3]; // int[] var10 = new int[] {par1, par2, par3}; @@ -157,9 +157,9 @@ public class WorldGenBigTree extends WorldGenerator // // while (var13 <= var7) // { -// double var15 = Math.pow((double)Math.abs(var12) + 0.5D, 2.0D) + Math.pow((double)Math.abs(var13) + 0.5D, 2.0D); +// double var15 = Math.pow((float)Math.abs(var12) + 0.5D, 2.0D) + Math.pow((float)Math.abs(var13) + 0.5D, 2.0D); // -// if (var15 > (double)(par4 * par4)) +// if (var15 > (float)(par4 * par4)) // { // ++var13; // } @@ -187,7 +187,7 @@ public class WorldGenBigTree extends WorldGenerator // */ // float layerSize(int par1) // { -// if ((double)par1 < (double)((float)this.heightLimit) * 0.3D) +// if ((float)par1 < (float)((float)this.heightLimit) * 0.3D) // { // return -1.618F; // } @@ -207,7 +207,7 @@ public class WorldGenBigTree extends WorldGenerator // } // else // { -// var4 = (float)Math.sqrt(Math.pow((double)Math.abs(var2), 2.0D) - Math.pow((double)Math.abs(var3), 2.0D)); +// var4 = (float)Math.sqrt(Math.pow((float)Math.abs(var2), 2.0D) - Math.pow((float)Math.abs(var3), 2.0D)); // } // // var4 *= 0.5F; @@ -268,16 +268,16 @@ public class WorldGenBigTree extends WorldGenerator // var9 = -1; // } // -// double var10 = (double)var4[var7] / (double)var4[var6]; -// double var12 = (double)var4[var8] / (double)var4[var6]; +// double var10 = (float)var4[var7] / (float)var4[var6]; +// double var12 = (float)var4[var8] / (float)var4[var6]; // int[] var14 = new int[] {0, 0, 0}; // int var15 = 0; // // for (int var16 = var4[var6] + var9; var15 != var16; var15 += var9) // { -// var14[var6] = MathHelper.floor_double((double)(par1ArrayOfInteger[var6] + var15) + 0.5D); -// var14[var7] = MathHelper.floor_double((double)par1ArrayOfInteger[var7] + (double)var15 * var10 + 0.5D); -// var14[var8] = MathHelper.floor_double((double)par1ArrayOfInteger[var8] + (double)var15 * var12 + 0.5D); +// var14[var6] = MathHelper.floor_double((float)(par1ArrayOfInteger[var6] + var15) + 0.5D); +// var14[var7] = MathHelper.floor_double((float)par1ArrayOfInteger[var7] + (float)var15 * var10 + 0.5D); +// var14[var8] = MathHelper.floor_double((float)par1ArrayOfInteger[var8] + (float)var15 * var12 + 0.5D); // byte var17 = 0; // int var18 = Math.abs(var14[0] - par1ArrayOfInteger[0]); // int var19 = Math.abs(var14[2] - par1ArrayOfInteger[2]); @@ -321,7 +321,7 @@ public class WorldGenBigTree extends WorldGenerator // */ // boolean leafNodeNeedsBase(int par1) // { -// return (double)par1 >= (double)this.heightLimit * 0.2D; +// return (float)par1 >= (float)this.heightLimit * 0.2D; // } // // /** @@ -413,8 +413,8 @@ public class WorldGenBigTree extends WorldGenerator // var8 = -1; // } // -// double var9 = (double)var3[var6] / (double)var3[var5]; -// double var11 = (double)var3[var7] / (double)var3[var5]; +// double var9 = (float)var3[var6] / (float)var3[var5]; +// double var11 = (float)var3[var7] / (float)var3[var5]; // int[] var13 = new int[] {0, 0, 0}; // int var14 = 0; // int var15; @@ -422,8 +422,8 @@ public class WorldGenBigTree extends WorldGenerator // for (var15 = var3[var5] + var8; var14 != var15; var14 += var8) // { // var13[var5] = par1ArrayOfInteger[var5] + var14; -// var13[var6] = MathHelper.floor_double((double)par1ArrayOfInteger[var6] + (double)var14 * var9); -// var13[var7] = MathHelper.floor_double((double)par1ArrayOfInteger[var7] + (double)var14 * var11); +// var13[var6] = MathHelper.floor_double((float)par1ArrayOfInteger[var6] + (float)var14 * var9); +// var13[var7] = MathHelper.floor_double((float)par1ArrayOfInteger[var7] + (float)var14 * var11); // int var16 = this.worldObj.getBlockId(var13[0], var13[1], var13[2]); // // if (var16 != 0 && var16 != Block.leaves.blockID) diff --git a/src/minecraft/net/minecraft/src/WorldGenHugeTrees.java b/src/minecraft/net/minecraft/src/WorldGenHugeTrees.java index e23f515..6cfd8b6 100644 --- a/src/minecraft/net/minecraft/src/WorldGenHugeTrees.java +++ b/src/minecraft/net/minecraft/src/WorldGenHugeTrees.java @@ -85,7 +85,7 @@ public class WorldGenHugeTrees extends WorldGenerator for (int var14 = par4 + var6 - 2 - par2Random.nextInt(4); var14 > par4 + var6 / 2; var14 -= 2 + par2Random.nextInt(4)) { - float var15 = par2Random.nextFloat() * (float)Math.PI * 2.0F; + float var15 = par2Random.nextFloat() * (float)(float)Math.PI * 2.0F; BigInteger var11 = par3.add(BigInteger.valueOf((int)(0.5F + MathHelper.cos(var15) * 4.0F))); BigInteger var12 = par5.add(BigInteger.valueOf((int)(0.5F + MathHelper.sin(var15) * 4.0F))); this.growLeaves(par1World, var11, var12, var14, 0, par2Random); diff --git a/src/minecraft/net/minecraft/src/WorldGenLakes.java b/src/minecraft/net/minecraft/src/WorldGenLakes.java index 0f711f4..3de1cc7 100644 --- a/src/minecraft/net/minecraft/src/WorldGenLakes.java +++ b/src/minecraft/net/minecraft/src/WorldGenLakes.java @@ -45,9 +45,9 @@ public class WorldGenLakes extends WorldGenerator { for (int var23 = 1; var23 < 7; ++var23) { - double var24 = ((double)var21 - var15) / (var9 / 2.0D); - double var26 = ((double)var23 - var17) / (var11 / 2.0D); - double var28 = ((double)var22 - var19) / (var13 / 2.0D); + double var24 = ((float)var21 - var15) / (var9 / 2.0D); + double var26 = ((float)var23 - var17) / (var11 / 2.0D); + double var28 = ((float)var22 - var19) / (var13 / 2.0D); double var30 = var24 * var24 + var26 * var26 + var28 * var28; if (var30 < 1.0D) diff --git a/src/minecraft/net/minecraft/src/WorldGenMinable.java b/src/minecraft/net/minecraft/src/WorldGenMinable.java index ceddb66..477593b 100644 --- a/src/minecraft/net/minecraft/src/WorldGenMinable.java +++ b/src/minecraft/net/minecraft/src/WorldGenMinable.java @@ -19,22 +19,22 @@ public class WorldGenMinable extends WorldGenerator public boolean generate(World par1World, Random par2Random, BigInteger par3, int par4, BigInteger par5) { - float var6 = par2Random.nextFloat() * (float)Math.PI; - double var7 = (double)((float)(par3.add(BigInteger.valueOf(8)).floatValue()) + MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); - double var9 = (double)((float)(par3.add(BigInteger.valueOf(8)).floatValue()) - MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); - double var11 = (double)((float)(par5.add(BigInteger.valueOf(8)).floatValue()) + MathHelper.cos(var6) * (float)this.numberOfBlocks / 8.0F); - double var13 = (double)((float)(par5.add(BigInteger.valueOf(8)).floatValue()) - MathHelper.cos(var6) * (float)this.numberOfBlocks / 8.0F); - double var15 = (double)(par4 + par2Random.nextInt(3) - 2); - double var17 = (double)(par4 + par2Random.nextInt(3) - 2); + float var6 = par2Random.nextFloat() * (float)(float)Math.PI; + double var7 = (float)((float)(par3.add(BigInteger.valueOf(8)).floatValue()) + MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); + double var9 = (float)((float)(par3.add(BigInteger.valueOf(8)).floatValue()) - MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); + double var11 = (float)((float)(par5.add(BigInteger.valueOf(8)).floatValue()) + MathHelper.cos(var6) * (float)this.numberOfBlocks / 8.0F); + double var13 = (float)((float)(par5.add(BigInteger.valueOf(8)).floatValue()) - MathHelper.cos(var6) * (float)this.numberOfBlocks / 8.0F); + double var15 = (float)(par4 + par2Random.nextInt(3) - 2); + double var17 = (float)(par4 + par2Random.nextInt(3) - 2); for (int var19 = 0; var19 <= this.numberOfBlocks; ++var19) { - double var20 = var7 + (var9 - var7) * (double)var19 / (double)this.numberOfBlocks; - double var22 = var15 + (var17 - var15) * (double)var19 / (double)this.numberOfBlocks; - double var24 = var11 + (var13 - var11) * (double)var19 / (double)this.numberOfBlocks; - double var26 = par2Random.nextDouble() * (double)this.numberOfBlocks / 16.0D; - double var28 = (double)(MathHelper.sin((float)var19 * (float)Math.PI / (float)this.numberOfBlocks) + 1.0F) * var26 + 1.0D; - double var30 = (double)(MathHelper.sin((float)var19 * (float)Math.PI / (float)this.numberOfBlocks) + 1.0F) * var26 + 1.0D; + double var20 = var7 + (var9 - var7) * (float)var19 / (float)this.numberOfBlocks; + double var22 = var15 + (var17 - var15) * (float)var19 / (float)this.numberOfBlocks; + double var24 = var11 + (var13 - var11) * (float)var19 / (float)this.numberOfBlocks; + double var26 = par2Random.nextDouble() * (float)this.numberOfBlocks / 16.0D; + double var28 = (float)(MathHelper.sin((float)var19 * (float)(float)Math.PI / (float)this.numberOfBlocks) + 1.0F) * var26 + 1.0D; + double var30 = (float)(MathHelper.sin((float)var19 * (float)(float)Math.PI / (float)this.numberOfBlocks) + 1.0F) * var26 + 1.0D; BigInteger var32 = MathHelper.floor_double_BigInteger(var20 - var28 / 2.0D); int var33 = MathHelper.floor_double(var22 - var30 / 2.0D); BigInteger var34 = MathHelper.floor_double_BigInteger(var24 - var28 / 2.0D); @@ -44,19 +44,19 @@ public class WorldGenMinable extends WorldGenerator for (BigInteger var38 = var32; var38.compareTo(var35) <= 0; var38 = var38.add(BigInteger.ONE)) { - double var39 = ((double)var38.doubleValue() + 0.5D - var20) / (var28 / 2.0D); + double var39 = ((float)var38.doubleValue() + 0.5D - var20) / (var28 / 2.0D); if (var39 * var39 < 1.0D) { for (int var41 = var33; var41 <= var36; ++var41) { - double var42 = ((double)var41 + 0.5D - var22) / (var30 / 2.0D); + double var42 = ((float)var41 + 0.5D - var22) / (var30 / 2.0D); if (var39 * var39 + var42 * var42 < 1.0D) { for (BigInteger var44 = var34; var44.compareTo(var37) <= 0; var44 = var44.add(BigInteger.ONE)) { - double var45 = ((double)var44.doubleValue() + 0.5D - var24) / (var28 / 2.0D); + double var45 = ((float)var44.doubleValue() + 0.5D - var24) / (var28 / 2.0D); if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.stone.blockID) { diff --git a/src/minecraft/net/minecraft/src/WorldGenSpikes.java b/src/minecraft/net/minecraft/src/WorldGenSpikes.java index 871e9d1..53d4f5a 100644 --- a/src/minecraft/net/minecraft/src/WorldGenSpikes.java +++ b/src/minecraft/net/minecraft/src/WorldGenSpikes.java @@ -54,7 +54,7 @@ public class WorldGenSpikes extends WorldGenerator } EntityEnderCrystal var13 = new EntityEnderCrystal(par1World); - var13.setLocationAndAngles((double)((float)par3.floatValue() + 0.5F), (double)(par4 + var6), (double)((float)par5.floatValue() + 0.5F), par2Random.nextFloat() * 360.0F, 0.0F); + var13.setLocationAndAngles((float)((float)par3.floatValue() + 0.5F), (float)(par4 + var6), (float)((float)par5.floatValue() + 0.5F), par2Random.nextFloat() * 360.0F, 0.0F); par1World.spawnEntityInWorld(var13); par1World.setBlockWithNotify(par3, par4 + var6, par5, Block.bedrock.blockID); return true; diff --git a/src/minecraft/net/minecraft/src/WorldManager.java b/src/minecraft/net/minecraft/src/WorldManager.java index ffacd9a..070869b 100644 --- a/src/minecraft/net/minecraft/src/WorldManager.java +++ b/src/minecraft/net/minecraft/src/WorldManager.java @@ -42,7 +42,7 @@ public class WorldManager implements IWorldAccess */ public void playSound(String par1Str, double par2, double par4, double par6, float par8, float par9) { - this.mcServer.getConfigurationManager().sendToAllNear(par2, par4, par6, par8 > 1.0F ? (double)(16.0F * par8) : 16.0D, this.field_72782_b.provider.worldType, new Packet62LevelSound(par1Str, par2, par4, par6, par8, par9)); + this.mcServer.getConfigurationManager().sendToAllNear(par2, par4, par6, par8 > 1.0F ? (float)(16.0F * par8) : 16.0D, this.field_72782_b.provider.worldType, new Packet62LevelSound(par1Str, par2, par4, par6, par8, par9)); } /** @@ -75,7 +75,7 @@ public class WorldManager implements IWorldAccess */ public void playAuxSFX(EntityPlayer par1EntityPlayer, int par2, BigInteger par3, int par4, BigInteger par5, int par6) { - this.mcServer.getConfigurationManager().sendToAllNearExcept(par1EntityPlayer, (double)par3.doubleValue(), (double)par4, (double)par5.doubleValue(), 64.0D, this.field_72782_b.provider.worldType, new Packet61DoorChange(par2, par3, par4, par5, par6)); + this.mcServer.getConfigurationManager().sendToAllNearExcept(par1EntityPlayer, (float)par3.doubleValue(), (float)par4, (float)par5.doubleValue(), 64.0D, this.field_72782_b.provider.worldType, new Packet61DoorChange(par2, par3, par4, par5, par6)); } /** @@ -92,9 +92,9 @@ public class WorldManager implements IWorldAccess if (var7 != null && var7.worldObj == this.field_72782_b && var7.entityId != par1) { - double var8 = (double)par2.doubleValue() - var7.posX; - double var10 = (double)par3 - var7.posY; - double var12 = (double)par4.doubleValue() - var7.posZ; + double var8 = (float)par2.doubleValue() - var7.posX; + double var10 = (float)par3 - var7.posY; + double var12 = (float)par4.doubleValue() - var7.posZ; if (var8 * var8 + var10 * var10 + var12 * var12 < 1024.0D) { diff --git a/src/minecraft/net/minecraft/src/WorldProvider.java b/src/minecraft/net/minecraft/src/WorldProvider.java index dbd33c0..8380426 100644 --- a/src/minecraft/net/minecraft/src/WorldProvider.java +++ b/src/minecraft/net/minecraft/src/WorldProvider.java @@ -106,7 +106,7 @@ public abstract class WorldProvider } float var6 = var5; - var5 = 1.0F - (float)((Math.cos((double)var5 * Math.PI) + 1.0D) / 2.0D); + var5 = 1.0F - (float)(((float)Math.cos((float)var5 * (float)Math.PI) + 1.0D) / 2.0D); var5 = var6 + (var5 - var6) / 3.0F; return var5; } @@ -130,13 +130,13 @@ public abstract class WorldProvider public float[] calcSunriseSunsetColors(float par1, float par2) { float var3 = 0.4F; - float var4 = MathHelper.cos(par1 * (float)Math.PI * 2.0F) - 0.0F; + float var4 = MathHelper.cos(par1 * (float)(float)Math.PI * 2.0F) - 0.0F; float var5 = -0.0F; if (var4 >= var5 - var3 && var4 <= var5 + var3) { float var6 = (var4 - var5) / var3 * 0.5F + 0.5F; - float var7 = 1.0F - (1.0F - MathHelper.sin(var6 * (float)Math.PI)) * 0.99F; + float var7 = 1.0F - (1.0F - MathHelper.sin(var6 * (float)(float)Math.PI)) * 0.99F; var7 *= var7; this.colorsSunriseSunset[0] = var6 * 0.3F + 0.7F; this.colorsSunriseSunset[1] = var6 * var6 * 0.7F + 0.2F; @@ -155,7 +155,7 @@ public abstract class WorldProvider */ public Vec3 getFogColor(float par1, float par2) { - float var3 = MathHelper.cos(par1 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; + float var3 = MathHelper.cos(par1 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.5F; if (var3 < 0.0F) { @@ -173,7 +173,7 @@ public abstract class WorldProvider var4 *= var3 * 0.94F + 0.06F; var5 *= var3 * 0.94F + 0.06F; var6 *= var3 * 0.91F + 0.09F; - return Vec3.getVec3Pool().getVecFromPool((double)var4, (double)var5, (double)var6); + return Vec3.getVec3Pool().getVecFromPool((float)var4, (float)var5, (float)var6); } /** diff --git a/src/minecraft/net/minecraft/src/WorldProviderEnd.java b/src/minecraft/net/minecraft/src/WorldProviderEnd.java index 4670665..0e1623c 100644 --- a/src/minecraft/net/minecraft/src/WorldProviderEnd.java +++ b/src/minecraft/net/minecraft/src/WorldProviderEnd.java @@ -44,7 +44,7 @@ public class WorldProviderEnd extends WorldProvider public Vec3 getFogColor(float par1, float par2) { int var3 = 10518688; - float var4 = MathHelper.cos(par1 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; + float var4 = MathHelper.cos(par1 * (float)(float)Math.PI * 2.0F) * 2.0F + 0.5F; if (var4 < 0.0F) { @@ -62,7 +62,7 @@ public class WorldProviderEnd extends WorldProvider var5 *= var4 * 0.0F + 0.15F; var6 *= var4 * 0.0F + 0.15F; var7 *= var4 * 0.0F + 0.15F; - return Vec3.getVec3Pool().getVecFromPool((double)var5, (double)var6, (double)var7); + return Vec3.getVec3Pool().getVecFromPool((float)var5, (float)var6, (float)var7); } public boolean isSkyColored() diff --git a/src/minecraft/net/minecraft/src/WorldRenderer.java b/src/minecraft/net/minecraft/src/WorldRenderer.java index 374a4a4..ead0237 100644 --- a/src/minecraft/net/minecraft/src/WorldRenderer.java +++ b/src/minecraft/net/minecraft/src/WorldRenderer.java @@ -114,9 +114,9 @@ public class WorldRenderer this.posZMinus = par3.subtract(BigInteger.valueOf(posZClip)); float var4 = 6.0F; BigDecimal offset = BigDecimal.valueOf(var4); - this.rendererBoundingBox = new BigDecimalAABB(MathHelper.toBigDecimal(par1).subtract(offset), (double)((float)par2 - var4), MathHelper.toBigDecimal(par3).subtract(offset), MathHelper.toBigDecimal(par1.add(BigInteger.valueOf(16))).add(offset), (double)((float)(par2 + 16) + var4), MathHelper.toBigDecimal(par3.add(BigInteger.valueOf(16))).add(offset)); + this.rendererBoundingBox = new BigDecimalAABB(MathHelper.toBigDecimal(par1).subtract(offset), (float)((float)par2 - var4), MathHelper.toBigDecimal(par3).subtract(offset), MathHelper.toBigDecimal(par1.add(BigInteger.valueOf(16))).add(offset), (float)((float)(par2 + 16) + var4), MathHelper.toBigDecimal(par3.add(BigInteger.valueOf(16))).add(offset)); GL11.glNewList(this.glRenderList + 2, GL11.GL_COMPILE); - RenderItem.renderAABB(AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)this.posXClip - var4), (double)((float)this.posYClip - var4), (double)((float)this.posZClip - var4), (double)((float)(this.posXClip + 16) + var4), (double)((float)(this.posYClip + 16) + var4), (double)((float)(this.posZClip + 16) + var4))); + RenderItem.renderAABB(AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((float)((float)this.posXClip - var4), (float)((float)this.posYClip - var4), (float)((float)this.posZClip - var4), (float)((float)(this.posXClip + 16) + var4), (float)((float)(this.posYClip + 16) + var4), (float)((float)(this.posZClip + 16) + var4))); GL11.glEndList(); this.markDirty(); } @@ -186,7 +186,7 @@ public class WorldRenderer var14 = true; tessellator.reset(); tessellator.startDrawingQuads(); - if(!Minecraft.FIX_RENDERER) tessellator.setTranslation((double)(-this.posX.doubleValue()), (double)(-this.posY), (double)(-this.posZ.doubleValue())); + if(!Minecraft.FIX_RENDERER) tessellator.setTranslation((float)(-this.posX.doubleValue()), (float)(-this.posY), (float)(-this.posZ.doubleValue())); } Block var23 = Block.blocksList[var18]; @@ -281,9 +281,9 @@ public class WorldRenderer */ public float distanceToEntitySquared(Entity par1Entity) { - float var2 = (float)(par1Entity.posX - (double)this.posXPlus.doubleValue()); - float var3 = (float)(par1Entity.posY - (double)this.posYPlus); - float var4 = (float)(par1Entity.posZ - (double)this.posZPlus.doubleValue()); + float var2 = (float)(par1Entity.posX - (float)this.posXPlus.doubleValue()); + float var3 = (float)(par1Entity.posY - (float)this.posYPlus); + float var4 = (float)(par1Entity.posZ - (float)this.posZPlus.doubleValue()); return var2 * var2 + var3 * var3 + var4 * var4; } diff --git a/src/minecraft/net/minecraft/src/WorldServer.java b/src/minecraft/net/minecraft/src/WorldServer.java index 66960d6..53d899c 100644 --- a/src/minecraft/net/minecraft/src/WorldServer.java +++ b/src/minecraft/net/minecraft/src/WorldServer.java @@ -279,7 +279,7 @@ public class WorldServer extends World if (this.canLightningStrikeAt(x, var11, z)) { - this.addWeatherEffect(new EntityLightningBolt(this, (double)x.doubleValue(), (double)var11, (double)z.doubleValue())); + this.addWeatherEffect(new EntityLightningBolt(this, (float)x.doubleValue(), (float)var11, (float)z.doubleValue())); this.lastLightningBolt = 2; } } @@ -884,7 +884,7 @@ public class WorldServer extends World if (this.onBlockEventReceived(var3)) { - this.mcServer.getConfigurationManager().sendToAllNear((double)var3.getX().doubleValue(), (double)var3.getY(), (double)var3.getZ().doubleValue(), 64.0D, this.provider.worldType, new Packet54PlayNoteBlock(var3.getX(), var3.getY(), var3.getZ(), var3.getBlockID(), var3.getEventID(), var3.getEventParameter())); + this.mcServer.getConfigurationManager().sendToAllNear((float)var3.getX().doubleValue(), (float)var3.getY(), (float)var3.getZ().doubleValue(), 64.0D, this.provider.worldType, new Packet54PlayNoteBlock(var3.getX(), var3.getY(), var3.getZ(), var3.getBlockID(), var3.getEventID(), var3.getEventParameter())); } }