AstralTransRocketries/Squake
1
0
Fork 0
mirror of https://github.com/squeek502/Squake.git synced 2025-08-03 17:58:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes

Browse Source
This commit is contained in:
squeek 2014-07-07 02:41:56 -07:00
parent a2a06ef64b
commit d9a2f344e4
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
java/squeek/quakemovement/QuakeClientPlayer.java
View File

@ -1,14 +1,13 @@
package squeek.quakemovement; package squeek.quakemovement;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import api.player.client.ClientPlayerAPI; import api.player.client.ClientPlayerAPI;
import api.player.client.ClientPlayerBase; import api.player.client.ClientPlayerBase;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
public class QuakeClientPlayer extends ClientPlayerBase { public class QuakeClientPlayer extends ClientPlayerBase {
@ -24,7 +23,8 @@ public class QuakeClientPlayer extends ClientPlayerBase {
super(playerapi); super(playerapi);
} }
public void moveEntityWithHeading( float sidemove, float forwardmove ) @Override
public void moveEntityWithHeading( float sidemove, float forwardmove )
{ {
double d0 = this.player.posX; double d0 = this.player.posX;
double d1 = this.player.posY; double d1 = this.player.posY;
@ -38,7 +38,8 @@ public class QuakeClientPlayer extends ClientPlayerBase {
this.player.addMovementStat(this.player.posX - d0, this.player.posY - d1, this.player.posZ - d2); this.player.addMovementStat(this.player.posX - d0, this.player.posY - d1, this.player.posZ - d2);
} }
public void beforeOnLivingUpdate() @Override
public void beforeOnLivingUpdate()
{ {
this.didJumpThisTick = false; this.didJumpThisTick = false;
if (Loader.isModLoaded("squeek_Speedometer")) if (Loader.isModLoaded("squeek_Speedometer"))
@ -60,7 +61,8 @@ public class QuakeClientPlayer extends ClientPlayerBase {
super.beforeOnLivingUpdate(); super.beforeOnLivingUpdate();
} }
public void onLivingUpdate() @Override
public void onLivingUpdate()
{ {
if (Loader.isModLoaded("squeek_Speedometer")) if (Loader.isModLoaded("squeek_Speedometer"))
{ {
@ -76,7 +78,8 @@ public class QuakeClientPlayer extends ClientPlayerBase {
super.onLivingUpdate(); super.onLivingUpdate();
} }
public void moveFlying(float sidemove, float forwardmove, float wishspeed) @Override
public void moveFlying(float sidemove, float forwardmove, float wishspeed)
{ {
if ((this.player.capabilities.isFlying && this.player.ridingEntity == null) || this.player.isInWater()) if ((this.player.capabilities.isFlying && this.player.ridingEntity == null) || this.player.isInWater())
{ {
@ -91,7 +94,8 @@ public class QuakeClientPlayer extends ClientPlayerBase {
} }
public void jump() @Override
public void jump()
{ {
super.jump(); super.jump();
@ -99,8 +103,8 @@ public class QuakeClientPlayer extends ClientPlayerBase {
if (this.player.isSprinting()) if (this.player.isSprinting())
{ {
float f = this.player.rotationYaw * 0.017453292F; float f = this.player.rotationYaw * 0.017453292F;
this.player.motionX += (double)(MathHelper.sin(f) * 0.2F); this.player.motionX += MathHelper.sin(f) * 0.2F;
this.player.motionZ -= (double)(MathHelper.cos(f) * 0.2F); this.player.motionZ -= MathHelper.cos(f) * 0.2F;
} }
quake_Jump(); quake_Jump();
@ -212,7 +216,7 @@ public class QuakeClientPlayer extends ClientPlayerBase {
{ {
// taken from sprint // taken from sprint
int j = MathHelper.floor_double(this.player.posX); int j = MathHelper.floor_double(this.player.posX);
int i = MathHelper.floor_double(this.player.posY - 0.20000000298023224D - (double)this.player.yOffset); int i = MathHelper.floor_double(this.player.posY - 0.20000000298023224D - this.player.yOffset);
int k = MathHelper.floor_double(this.player.posZ); int k = MathHelper.floor_double(this.player.posZ);
int l = this.player.worldObj.getBlockId(j, i, k); int l = this.player.worldObj.getBlockId(j, i, k);
@ -220,7 +224,7 @@ public class QuakeClientPlayer extends ClientPlayerBase {
{ {
for( int iParticle=0; iParticle < numParticles; iParticle++ ) for( int iParticle=0; iParticle < numParticles; iParticle++ )
{ {
this.player.worldObj.spawnParticle("tilecrack_" + l + "_" + this.player.worldObj.getBlockMetadata(j, i, k), this.player.posX + ((double)this.playerAPI.getRandField().nextFloat() - 0.5D) * (double)this.player.width, this.player.boundingBox.minY + 0.1D, this.player.posZ + ((double)this.playerAPI.getRandField().nextFloat() - 0.5D) * (double)this.player.width, -this.player.motionX * 4.0D, 1.5D, -this.player.motionZ * 4.0D); this.player.worldObj.spawnParticle("tilecrack_" + l + "_" + this.player.worldObj.getBlockMetadata(j, i, k), this.player.posX + (this.playerAPI.getRandField().nextFloat() - 0.5D) * this.player.width, this.player.boundingBox.minY + 0.1D, this.player.posZ + (this.playerAPI.getRandField().nextFloat() - 0.5D) * this.player.width, -this.player.motionX * 4.0D, 1.5D, -this.player.motionZ * 4.0D);
} }
} }
} }
@ -275,24 +279,24 @@ public class QuakeClientPlayer extends ClientPlayerBase {
{ {
float f5 = 0.15F; float f5 = 0.15F;
if (this.player.motionX < (double)(-f5)) if (this.player.motionX < (-f5))
{ {
this.player.motionX = (double)(-f5); this.player.motionX = (-f5);
} }
if (this.player.motionX > (double)f5) if (this.player.motionX > f5)
{ {
this.player.motionX = (double)f5; this.player.motionX = f5;
} }
if (this.player.motionZ < (double)(-f5)) if (this.player.motionZ < (-f5))
{ {
this.player.motionZ = (double)(-f5); this.player.motionZ = (-f5);
} }
if (this.player.motionZ > (double)f5) if (this.player.motionZ > f5)
{ {
this.player.motionZ = (double)f5; this.player.motionZ = f5;
} }
this.player.fallDistance = 0.0F; this.player.fallDistance = 0.0F;
@ -302,7 +306,7 @@ public class QuakeClientPlayer extends ClientPlayerBase {
this.player.motionY = -0.15D; this.player.motionY = -0.15D;
} }
boolean flag = this.player.isSneaking() && this.player instanceof EntityPlayer; boolean flag = this.player.isSneaking();
if (flag && this.player.motionY < 0.0D) if (flag && this.player.motionY < 0.0D)
{ {

3
java/squeek/quakemovement/QuakeServerPlayer.java
View File

@ -14,7 +14,8 @@ public class QuakeServerPlayer extends ServerPlayerBase {
super(playerapi); super(playerapi);
} }
public void fall( float fallDistance ) @Override
public void fall( float fallDistance )
{ {
wasVelocityChangedBeforeFall = this.playerAPI.getVelocityChangedField() || this.player.velocityChanged; wasVelocityChangedBeforeFall = this.playerAPI.getVelocityChangedField() || this.player.velocityChanged;