From 6f459cda536beaafa76338ce774de48a1d8cef0a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 12 Dec 2014 00:31:00 +0800 Subject: [PATCH] #1285 Ender Rail not adjusting the direction of RC locomotives when required --- ReleaseNotes.txt | 5 ++- .../crazypants/enderio/rail/CartLinkUtil.java | 14 +++++- .../enderio/rail/EnderRailController.java | 5 +-- .../enderio/rail/ICartLinkUtil.java | 3 ++ .../enderio/rail/RailcraftLinkUtil.java | 45 +++++++++++++++++++ 5 files changed, 64 insertions(+), 8 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 30c8423c..d727f89b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -28,6 +28,8 @@ Changes Bugs - #1268 Capacitor bank not honoring input redstone settings +- #1285 Ender Rail can no longer be rotated as the forge rotation code was messing with my bits +- #1285 Ender Rail not adjusting the direction of RC locomotives when required - #1297 EnderLiquidConduit writing excessive warning messages - #1333 Sound locator sometimes creates thousands of entities per frame - Sound locator entities not being rendered in some cases @@ -41,8 +43,7 @@ Bugs - #1361 Enlightened Fused Quartz is not blast resistant - #1366 Powered Spawner doesn't remain active when chunk loaded - #1373 Fluid Tank accepts fluid regardless of configuration -- #1383 Travel Anchor crash - +- #1383 Travel Anchor crash - RF Tools not charging in Killer Joe until he has attacked something diff --git a/src/main/java/crazypants/enderio/rail/CartLinkUtil.java b/src/main/java/crazypants/enderio/rail/CartLinkUtil.java index 867e4c6a..829da15b 100644 --- a/src/main/java/crazypants/enderio/rail/CartLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/CartLinkUtil.java @@ -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) { diff --git a/src/main/java/crazypants/enderio/rail/EnderRailController.java b/src/main/java/crazypants/enderio/rail/EnderRailController.java index 1b4261be..a6fcffcf 100644 --- a/src/main/java/crazypants/enderio/rail/EnderRailController.java +++ b/src/main/java/crazypants/enderio/rail/EnderRailController.java @@ -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> toTeleport) { diff --git a/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java b/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java index 85d7dc25..e68c3d4f 100644 --- a/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java @@ -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); + } diff --git a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java index 7dc45319..466defe5 100644 --- a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java @@ -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