Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Attempt at fixing rough NSWE movement

Browse source
This commit is contained in:
Aidan Brady 2013-08-03 02:23:07 -04:00
parent 011695b875
commit d12cf1070f
2 changed files with 130 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/resonantinduction/contractor/EntityContractorItem.java Normal file
View file

@ -0,0 +1,58 @@
package resonantinduction.contractor;
import java.lang.reflect.Method;
import java.util.Iterator;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.item.ItemExpireEvent;
/**
* Spinoff of EntityItem for Contractors.
* @author AidanBrady
*
*/
public class EntityContractorItem extends EntityItem
{
public boolean doGravityThisTick = true;
public EntityContractorItem(World par1World)
{
super(par1World);
}
@Override
public void onUpdate()
{
super.onUpdate();
if(!doGravityThisTick)
{
motionY = 0;
}
}
public static EntityContractorItem get(EntityItem entityItem)
{
EntityContractorItem item = new EntityContractorItem(entityItem.worldObj);
item.posX = entityItem.posX;
item.posY = entityItem.posY;
item.posZ = entityItem.posZ;
item.setEntityItemStack(entityItem.getEntityItem());
item.motionX = entityItem.motionX;
item.motionY = entityItem.motionY;
item.motionZ = entityItem.motionZ;
item.dataWatcher = entityItem.getDataWatcher();
return item;
}
}

123
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -36,69 +36,90 @@ public class TileEntityEMContractor extends TileEntity
if(entity instanceof EntityItem)
{
EntityItem entityItem = (EntityItem)entity;
switch(facing)
if(!(entityItem instanceof EntityContractorItem))
{
case DOWN:
entityItem.setPosition(xCoord+0.5, entityItem.posY, zCoord+0.5);
entityItem.motionX = 0;
entityItem.motionZ = 0;
entityItem.setDead();
EntityContractorItem newItem = EntityContractorItem.get(entityItem);
worldObj.spawnEntityInWorld(newItem);
entityItem = newItem;
}
if(entityItem instanceof EntityContractorItem)
{
switch(facing)
{
case DOWN:
entityItem.setPosition(xCoord+0.5, entityItem.posY, zCoord+0.5);
entityItem.motionY = Math.max(-MAX_SPEED, entityItem.motionY-ACCELERATION);
entityItem.motionX = 0;
entityItem.motionZ = 0;
entityItem.motionY = Math.max(-MAX_SPEED, entityItem.motionY-ACCELERATION);
entityItem.isAirBorne = true;
break;
case UP:
entityItem.setPosition(xCoord+0.5, entityItem.posY, zCoord+0.5);
entityItem.isAirBorne = true;
break;
case UP:
entityItem.setPosition(xCoord+0.5, entityItem.posY, zCoord+0.5);
entityItem.motionX = 0;
entityItem.motionZ = 0;
entityItem.motionX = 0;
entityItem.motionZ = 0;
entityItem.motionY = Math.min(MAX_SPEED, entityItem.motionY+ACCELERATION);
entityItem.isAirBorne = true;
break;
case NORTH:
((EntityContractorItem)entityItem).doGravityThisTick = false;
entityItem.motionY = Math.min(MAX_SPEED, entityItem.motionY+ACCELERATION);
entityItem.setPosition(entityItem.posX, yCoord+0.5, zCoord+0.5);
entityItem.isAirBorne = true;
break;
case NORTH:
entityItem.setPosition(entityItem.posX, yCoord+0.5, zCoord+0.5);
entityItem.motionY = 0;
entityItem.motionZ = 0;
entityItem.motionX = Math.min(MAX_SPEED, entityItem.motionZ+ACCELERATION);
entityItem.motionY = 0;
entityItem.motionZ = 0;
entityItem.isAirBorne = true;
break;
case SOUTH:
entityItem.setPosition(entityItem.posX, yCoord+0.5, zCoord+0.5);
entityItem.motionY = 0;
entityItem.motionZ = 0;
entityItem.motionX = Math.min(MAX_SPEED, entityItem.motionZ+ACCELERATION);
entityItem.isAirBorne = true;
break;
case SOUTH:
((EntityContractorItem)entityItem).doGravityThisTick = false;
entityItem.motionX = Math.max(-MAX_SPEED, entityItem.motionZ-ACCELERATION);
entityItem.setPosition(entityItem.posX, yCoord+0.5, zCoord+0.5);
entityItem.isAirBorne = true;
break;
case WEST:
entityItem.setPosition(xCoord+0.5, yCoord+0.5, entityItem.posZ);
entityItem.motionX = 0;
entityItem.motionY = 0;
entityItem.motionY = 0;
entityItem.motionZ = 0;
entityItem.motionX = Math.max(-MAX_SPEED, entityItem.motionZ-ACCELERATION);
entityItem.isAirBorne = true;
break;
case WEST:
((EntityContractorItem)entityItem).doGravityThisTick = false;
entityItem.motionZ = Math.min(MAX_SPEED, entityItem.motionX+ACCELERATION);
entityItem.setPosition(xCoord+0.5, yCoord+0.5, entityItem.posZ);
entityItem.isAirBorne = true;
break;
case EAST:
entityItem.setPosition(xCoord+0.5, yCoord+0.5, entityItem.posZ);
entityItem.motionX = 0;
entityItem.motionY = 0;
entityItem.motionX = 0;
entityItem.motionY = 0;
entityItem.motionZ = Math.min(MAX_SPEED, entityItem.motionX+ACCELERATION);
entityItem.isAirBorne = true;
break;
case EAST:
((EntityContractorItem)entityItem).doGravityThisTick = false;
entityItem.motionZ = Math.max(-MAX_SPEED, entityItem.motionX-ACCELERATION);
entityItem.setPosition(xCoord+0.5, yCoord+0.5, entityItem.posZ);
entityItem.isAirBorne = true;
break;
entityItem.motionX = 0;
entityItem.motionY = 0;
entityItem.motionZ = Math.max(-MAX_SPEED, entityItem.motionX-ACCELERATION);
entityItem.isAirBorne = true;
break;
}
}
}
}