From 72b4a2fc50004e9080314755939ce6b81c9ebc1e Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 2 Nov 2014 22:52:11 +0800 Subject: [PATCH] Added the ability to set the output direction of Ender Rails --- ReleaseNotes.txt | 3 ++- gradle.properties | 2 +- resources/assets/enderio/lang/en_US.lang | 2 ++ .../enderio/rail/BlockEnderRail.java | 20 +++++++++---------- .../enderio/rail/EnderRailController.java | 17 ++++++++++++++-- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 99f4342e..2b243fcb 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -14,7 +14,8 @@ Changes - Removed mobs from EnderIO, moved to new mod EnderZoo - Redstone conduits will now output strong signal to blocks they are connected to (tterrag) - Machines now only respond to strong redstone signals (tterrag) -- #1181 Add dump buttons to vat tanks +- #1181 Add dump buttons to vat tanks (tterrag) +- Added the ability to set the output direction of Ender Rails Bugs - #1162 Infinite Broken-Spawner exploit with Twilight Forest diff --git a/gradle.properties b/gradle.properties index 8825e94f..604eb840 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -forge_version=10.13.0.1180 +forge_version=10.13.0.1208 mod_version=2.1.7 diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index cc5e2cbd..a8f06c0a 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -284,6 +284,8 @@ tile.blockEnderRail.tooltip.detailed.line1=Teleports minecarts when placed tile.blockEnderRail.tooltip.detailed.line2=on a Dimensional Transceiver tile.blockEnderRail.tooltip.detailed.line3=Set destinations using the tile.blockEnderRail.tooltip.detailed.line4=Transceiver's rail tab +tile.blockEnderRail.tooltip.detailed.line5=Set direction with a Shift-R-Click +tile.blockEnderRail.tooltip.detailed.line6=of a wrench enderio.trans.showChannels= diff --git a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java index 6d535eb5..6eaf76fc 100644 --- a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java +++ b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java @@ -23,6 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.transceiver.Channel; @@ -44,7 +45,7 @@ public class BlockEnderRail extends BlockRail implements IResourceTooltipProvide if(isEastWest(meta)) { result = ForgeDirection.EAST; } else { - result = ForgeDirection.NORTH; + result = ForgeDirection.SOUTH; } if(isReverse(meta)) { result = result.getOpposite(); @@ -106,15 +107,14 @@ public class BlockEnderRail extends BlockRail implements IResourceTooltipProvide @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - // //TODO: Don't let people decide which way the carts come out. Can't figure out how to reliably reverse directions - // if(ConduitUtil.isToolEquipped(player)) { - // if(!world.isRemote) { - // int meta = world.getBlockMetadata(x, y, z); - // meta = MetadataUtil.setBit(3, !MetadataUtil.isBitSet(3, meta), meta); - // world.setBlockMetadataWithNotify(x, y, z, meta, 2); - // } - // return true; - // } + if(ConduitUtil.isToolEquipped(player)) { + if(!world.isRemote) { + int meta = world.getBlockMetadata(x, y, z); + meta = MetadataUtil.setBit(3, !MetadataUtil.isBitSet(3, meta), meta); + world.setBlockMetadataWithNotify(x, y, z, meta, 2); + } + return true; + } return false; } diff --git a/src/main/java/crazypants/enderio/rail/EnderRailController.java b/src/main/java/crazypants/enderio/rail/EnderRailController.java index 3778c0e9..4c1b99c9 100644 --- a/src/main/java/crazypants/enderio/rail/EnderRailController.java +++ b/src/main/java/crazypants/enderio/rail/EnderRailController.java @@ -110,9 +110,13 @@ public class EnderRailController { if(failedSpawn) { doRandomSpawn(ent); } else { - TeleportUtil.spawn(transciever.getWorldObj(), ent); + EntityMinecart cart = null; if(ent instanceof EntityMinecart) { - EntityMinecart cart = (EntityMinecart) ent; + cart = (EntityMinecart) ent; + setCartDirection(cart); + } + TeleportUtil.spawn(transciever.getWorldObj(), ent); + if(cart != null) { newlySpawnedCarts.add(cart.getPersistentID()); CartLinkUtil.recreateLinks(cart); } @@ -123,6 +127,15 @@ 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; + + } + public void onTrainRecieved(List> toTeleport) { cartsToSpawn.addAll(toTeleport); }