#1285 Ender Rail not adjusting the direction of RC locomotives when required

This commit is contained in:
CrazyPants committed 2014-12-12 00:31:00 +08:00
1 parent 965a891b2f
commit 6f459cda53
5 files changed
+64 -8

No files matched your search

@@ -6,22 +6,25 @@ import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.Loader;
public class CartLinkUtil implements ICartLinkUtil {
public static final ICartLinkUtil instance;
public static final ICartLinkUtil defaultInstance = new CartLinkUtil();
static {
ICartLinkUtil daInstance;
if(Loader.isModLoaded("Railcraft")) {
try {
daInstance = new RailcraftLinkUtil();
} catch (Exception e) {
daInstance = new CartLinkUtil();
daInstance = defaultInstance;
}
} else {
daInstance = new CartLinkUtil();
daInstance = defaultInstance;
}
instance = daInstance;
}
@@ -29,6 +32,13 @@ public class CartLinkUtil implements ICartLinkUtil {
private CartLinkUtil() {
}
@Override
public void setCartDirection(EntityMinecart cart, ForgeDirection dir) {
double velocity = Math.max(Math.abs(cart.motionX), Math.abs(cart.motionZ));
cart.motionX = dir.offsetX * velocity;
cart.motionZ = dir.offsetZ * velocity;
}
@Override
public int getNumberOfCartsInTrain(EntityMinecart cart) {
if(cart == null) {
@@ -130,10 +130,7 @@ public class EnderRailController {
private void setCartDirection(EntityMinecart cart) {
int meta = transciever.getWorldObj().getBlockMetadata(transciever.xCoord, transciever.yCoord + 1, transciever.zCoord);
ForgeDirection dir = BlockEnderRail.getDirection(meta);
double velocity = Math.max(Math.abs(cart.motionX), Math.abs(cart.motionZ));
cart.motionX = dir.offsetX * velocity;
cart.motionZ = dir.offsetZ * velocity;
CartLinkUtil.instance.setCartDirection(cart, dir);
}
public void onTrainRecieved(List<List<Entity>> toTeleport) {
@@ -5,6 +5,7 @@ import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface ICartLinkUtil {
@@ -18,4 +19,6 @@ public interface ICartLinkUtil {
void breakLinks(World worldObj, Entity entity);
void setCartDirection(EntityMinecart cart, ForgeDirection dir);
}
@@ -12,13 +12,58 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.vecmath.Vector3d;
public class RailcraftLinkUtil implements ICartLinkUtil {
private Class<?> directionalClass;
public RailcraftLinkUtil() throws Exception {
//Make sure the class we actually want to use exists, just in case the API changes
Class.forName("mods.railcraft.api.carts.CartTools");
try {
directionalClass = Class.forName("mods.railcraft.common.carts.IDirectionalCart");
} catch (Exception e) {
}
}
@Override
public void setCartDirection(EntityMinecart cart, ForgeDirection dir) {
if(!isDirectional(cart)) {
CartLinkUtil.defaultInstance.setCartDirection(cart, dir);
return;
}
ForgeDirection oldDir = getCurrentDir(cart);
CartLinkUtil.defaultInstance.setCartDirection(cart, dir);
ForgeDirection newDir = getCurrentDir(cart);
if(oldDir.getOpposite() == newDir) {
cart.rotationYaw += 180;
}
}
private boolean isDirectional(EntityMinecart cart) {
if(directionalClass == null) {
return false;
}
return directionalClass.isAssignableFrom(cart.getClass());
}
private ForgeDirection getCurrentDir(EntityMinecart cart) {
boolean isX = true;
boolean isNeg = cart.motionX < 0;
if(Math.abs(cart.motionZ) > Math.abs(cart.motionX)) {
isX = false;
isNeg = cart.motionZ < 0;
}
if(isX) {
return isNeg ? ForgeDirection.WEST : ForgeDirection.EAST;
}
return isNeg ? ForgeDirection.NORTH : ForgeDirection.SOUTH;
}
@Override