From 8c7b2bf9f6185e512efd8bb59a33bbf556e12b3e Mon Sep 17 00:00:00 2001 From: Robert S Date: Wed, 6 Aug 2014 22:25:09 -0400 Subject: [PATCH] Updated build prop --- build.properties | 6 +++--- .../accelerator/ContainerAccelerator.java | 2 +- .../machine/accelerator/EntityParticle.java | 16 +++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/build.properties b/build.properties index 3afcc5640..044503643 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ dir.development=./ dir.mcp=${dir.development}forge/mcp -version.minecraft=1.6.4 -version.forge=9.11.1.964 +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 @@ -10,4 +10,4 @@ version.fmp=1.0.0.244 version.nei=1.6.1.9 version.mod.major=0 version.mod.minor=3 -version.mod.revis=1 \ No newline at end of file +version.mod.revis=4 \ No newline at end of file diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java b/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java index 6c77f464c..842d49241 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java @@ -41,7 +41,7 @@ public class ContainerAccelerator extends ContainerBase if (par1 > 2) { - if (itemStack.itemID == Atomic.itemCell.itemID) + if (itemStack.getItem() == Atomic.itemCell) { if (!this.mergeItemStack(itemStack, 1, 2, false)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java index 1193a995d..4161b664d 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java @@ -3,6 +3,7 @@ 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; import net.minecraft.entity.EntityLiving; @@ -19,7 +20,6 @@ import resonant.api.IElectromagnet; import resonant.lib.prefab.poison.PoisonRadiation; import resonantinduction.core.Reference; import universalelectricity.core.transform.vector.Vector3; -import universalelectricity.api.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; @@ -47,15 +47,15 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData public EntityParticle(World world, Vector3 pos, Vector3 movementVec, ForgeDirection dir) { this(world); - this.setPosition(pos.x, pos.y, pos.z); + this.setPosition(pos.x(), pos.y(), pos.z()); this.movementVector = movementVec; this.movementDirection = dir; } public static boolean canSpawnParticle(World world, Vector3 pos) { - Block block = Block.blocksList[pos.getBlock(world)]; - if (block != null && !block.isAirBlock(world, pos.xi(), pos.yi(), pos.zi())) + Block block = pos.getBlock(world); + if (block != null && !block.isAir(world, pos.xi(), pos.yi(), pos.zi())) { return false; } @@ -87,7 +87,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData } @Override - public void writeSpawnData(ByteArrayDataOutput data) + public void writeSpawnData(ByteBuf data) { data.writeInt(this.movementVector.xi()); data.writeInt(this.movementVector.yi()); @@ -96,11 +96,9 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData } @Override - public void readSpawnData(ByteArrayDataInput data) + public void readSpawnData(ByteBuf data) { - this.movementVector.x = data.readInt(); - this.movementVector.y = data.readInt(); - this.movementVector.z = data.readInt(); + this.movementVector = new Vector3(data); this.movementDirection = ForgeDirection.getOrientation(data.readInt()); }