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

Updated build prop

Browse source
This commit is contained in:
Robert S 2014-08-06 22:25:09 -04:00
parent c6a9f23349
commit 8c7b2bf9f6
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.properties
View file

@ -1,7 +1,7 @@
dir.development=./ dir.development=./
dir.mcp=${dir.development}forge/mcp dir.mcp=${dir.development}forge/mcp
version.minecraft=1.6.4 version.minecraft=1.7.10
version.forge=9.11.1.964 version.forge=10.13.0.1179
version.universalelectricity=3.1.+ version.universalelectricity=3.1.+
version.resonantengine=1.2.+ version.resonantengine=1.2.+
version.cclib=1.0.0.61 version.cclib=1.0.0.61
@ -10,4 +10,4 @@ version.fmp=1.0.0.244
version.nei=1.6.1.9 version.nei=1.6.1.9
version.mod.major=0 version.mod.major=0
version.mod.minor=3 version.mod.minor=3
version.mod.revis=1 version.mod.revis=4

2
src/main/scala/resonantinduction/atomic/machine/accelerator/ContainerAccelerator.java
View file

@ -41,7 +41,7 @@ public class ContainerAccelerator extends ContainerBase
if (par1 > 2) if (par1 > 2)
{ {
if (itemStack.itemID == Atomic.itemCell.itemID) if (itemStack.getItem() == Atomic.itemCell)
{ {
if (!this.mergeItemStack(itemStack, 1, 2, false)) if (!this.mergeItemStack(itemStack, 1, 2, false))
{ {

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

@ -3,6 +3,7 @@ package resonantinduction.atomic.machine.accelerator;
import java.util.List; import java.util.List;
import atomic.Atomic; import atomic.Atomic;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
@ -19,7 +20,6 @@ import resonant.api.IElectromagnet;
import resonant.lib.prefab.poison.PoisonRadiation; import resonant.lib.prefab.poison.PoisonRadiation;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import universalelectricity.core.transform.vector.Vector3; import universalelectricity.core.transform.vector.Vector3;
import universalelectricity.api.vector.VectorHelper;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput; 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) public EntityParticle(World world, Vector3 pos, Vector3 movementVec, ForgeDirection dir)
{ {
this(world); this(world);
this.setPosition(pos.x, pos.y, pos.z); this.setPosition(pos.x(), pos.y(), pos.z());
this.movementVector = movementVec; this.movementVector = movementVec;
this.movementDirection = dir; this.movementDirection = dir;
} }
public static boolean canSpawnParticle(World world, Vector3 pos) public static boolean canSpawnParticle(World world, Vector3 pos)
{ {
Block block = Block.blocksList[pos.getBlock(world)]; Block block = pos.getBlock(world);
if (block != null && !block.isAirBlock(world, pos.xi(), pos.yi(), pos.zi())) if (block != null && !block.isAir(world, pos.xi(), pos.yi(), pos.zi()))
{ {
return false; return false;
} }
@ -87,7 +87,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData
} }
@Override @Override
public void writeSpawnData(ByteArrayDataOutput data) public void writeSpawnData(ByteBuf data)
{ {
data.writeInt(this.movementVector.xi()); data.writeInt(this.movementVector.xi());
data.writeInt(this.movementVector.yi()); data.writeInt(this.movementVector.yi());
@ -96,11 +96,9 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData
} }
@Override @Override
public void readSpawnData(ByteArrayDataInput data) public void readSpawnData(ByteBuf data)
{ {
this.movementVector.x = data.readInt(); this.movementVector = new Vector3(data);
this.movementVector.y = data.readInt();
this.movementVector.z = data.readInt();
this.movementDirection = ForgeDirection.getOrientation(data.readInt()); this.movementDirection = ForgeDirection.getOrientation(data.readInt());
} }