tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Updated version # for mods in build prop file

Browse source
This commit is contained in:
Robert S 2014-08-06 22:35:04 -04:00
parent 8c7b2bf9f6
commit d751b54b3a
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.properties
View file

@ -2,12 +2,12 @@ dir.development=./
dir.mcp=${dir.development}forge/mcp
version.minecraft=1.7.10
version.forge=10.13.0.1179
version.universalelectricity=3.1.+
version.resonantengine=1.2.+
version.cclib=1.0.0.61
version.cccore=0.9.0.9
version.fmp=1.0.0.244
version.nei=1.6.1.9
version.universalelectricity=4.0.+
version.resonantengine=2.0.+
version.cclib=1.1.1.99
version.cccore=1.0.3.23
version.fmp=1.1.0.300
version.nei=1.0.3.44
version.mod.major=0
version.mod.minor=3
version.mod.revis=4

17
src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java
View file

@ -2,7 +2,6 @@ package resonantinduction.atomic.machine.accelerator;
import java.util.List;
import atomic.Atomic;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
@ -186,10 +185,10 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData
Vector3 dongLi = new Vector3();
dongLi.add(this.movementDirection);
dongLi.scale(acceleration);
this.motionX = Math.min(dongLi.x + this.motionX, TileAccelerator.clientParticleVelocity);
this.motionY = Math.min(dongLi.y + this.motionY, TileAccelerator.clientParticleVelocity);
this.motionZ = Math.min(dongLi.z + this.motionZ, TileAccelerator.clientParticleVelocity);
dongLi.multiply(acceleration);
this.motionX = Math.min(dongLi.x() + this.motionX, TileAccelerator.clientParticleVelocity);
this.motionY = Math.min(dongLi.y() + this.motionY, TileAccelerator.clientParticleVelocity);
this.motionZ = Math.min(dongLi.z() + this.motionZ, TileAccelerator.clientParticleVelocity);
this.isAirBorne = true;
this.lastTickPosX = this.posX;
@ -233,11 +232,11 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData
Vector3 youBian = new Vector3(this).floor();
youBian.add(youFangXiang);
if (zuoBian.getBlock(this.worldObj) == 0)
if (zuoBian.getBlock(this.worldObj) == null)
{
this.movementDirection = zuoFangXiang;
}
else if (youBian.getBlock(this.worldObj) == 0)
else if (youBian.getBlock(this.worldObj) == null)
{
this.movementDirection = youFangXiang;
}
@ -255,7 +254,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData
public void explode()
{
this.worldObj.playSoundAtEntity(this, Reference.PREFIX + "antimatter", 1.5f, 1f - this.worldObj.rand.nextFloat() * 0.3f);
this.worldObj.playSoundAtEntity(this, Reference.prefix() + "antimatter", 1.5f, 1f - this.worldObj.rand.nextFloat() * 0.3f);
if (!this.worldObj.isRemote)
{
@ -319,7 +318,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData
@Override
protected void writeEntityToNBT(NBTTagCompound nbt)
{
nbt.setTag("jiqi", this.movementVector.writeToNBT(new NBTTagCompound()));
nbt.setTag("jiqi", this.movementVector.writeNBT(new NBTTagCompound()));
nbt.setByte("fangXiang", (byte) this.movementDirection.ordinal());
}