From 0c7b7c2c40487fda9a90dff1177b50463db9075d Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 27 Dec 2016 11:24:31 +0100 Subject: [PATCH] Blacklist relays from being used with Phantomfaces Closes #531 --- .../mod/tile/TileEntityPhantomEnergyface.java | 2 +- .../mod/tile/TileEntityPhantomLiquiface.java | 2 +- src/main/resources/assets/actuallyadditions/lang/en_US.lang | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java index ba0bfcd9f..649306f90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java @@ -28,7 +28,7 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement public boolean isBoundThingInRange(){ if(super.isBoundThingInRange()){ TileEntity tile = this.world.getTileEntity(this.boundPosition); - if(tile != null){ + if(tile != null && !(tile instanceof TileEntityLaserRelayEnergy)){ for(EnumFacing facing : EnumFacing.values()){ if(tile.hasCapability(CapabilityEnergy.ENERGY, facing)){ return true; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java index 96539efad..6fde1ce30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java @@ -26,7 +26,7 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements public boolean isBoundThingInRange(){ if(super.isBoundThingInRange()){ TileEntity tile = this.world.getTileEntity(this.boundPosition); - if(tile != null){ + if(tile != null && !(tile instanceof TileEntityLaserRelayEnergy)){ for(EnumFacing facing : EnumFacing.values()){ if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)){ return true; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 3895c72ea..b0f740dbd 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -955,7 +955,7 @@ booklet.actuallyadditions.chapter.laserIntro.text.3=Hovering over Laser booklet.actuallyadditions.chapter.laserRelays.name=Energy Laser Relays booklet.actuallyadditions.chapter.laserRelays.text.1=The Energy Laser Relay is a block that can wirelessly transfer CF. When placing a Power Generator or Receiver next to the relay, it can receive Power from any other relay in the network and send power to any other relay as well. During an energy transfer, they have a slight Energy Loss, but nothing to worry about, especially because it's per transfer, so it doesn't matter how many Lasers are inbetween two machines, the loss will always be the same amount. -booklet.actuallyadditions.chapter.laserRelays.text.2=There are three tiers of Energy Laser Relay. They have different maximum amounts of energy to be transferred through them in one tick. The energy caps are, in order, , , and . Additionally, the energy loss is a bit higher every tier. Interconnecting different tiers is possible, however the lowest cap and highest loss of the two relays connected to the blocks involved in the transfer is considered. +booklet.actuallyadditions.chapter.laserRelays.text.2=There are three tiers of Energy Laser Relay. They have different maximum amounts of energy to be transferred through them in one tick. The energy caps are, in order, , , and . Additionally, the energy loss is a bit higher every tier. Interconnecting different tiers is possible, however the lowest cap and highest loss of the two relays connected to the blocks involved in the transfer is considered. Additionally, Energy Laser Relays can not be connected by Phantomfaces. booklet.actuallyadditions.chapter.blackLotus.name=Black Lotus booklet.actuallyadditions.chapter.blackLotus.text.1=Think of this: You need to craft black wool, black clay or anything else that needs black dye but you are just guilty about killing so many innocent squids? Well, the Black Lotus is exactly the thing you need! Just look around in the wild a bit, and you will find one, then being able to craft some Black Dye that can be used instead of Ink Sacs so that you don't need to kill poor squids and L any longer. @@ -1084,7 +1084,7 @@ booklet.actuallyadditions.chapter.empowerer.text.3=Because every mod booklet.actuallyadditions.chapter.empowerer.text.4=The Display Stand can also be used for other things! See the Blocks that use CF section for more info about it! booklet.actuallyadditions.chapter.fluidLaser.name=Fluid Laser Relays -booklet.actuallyadditions.chapter.fluidLaser.text.1=The Fluid Laser Relays work much in the same way that normal Laser Relays do, however the thing that makes the Fluid Laser Relay different from the Energy Laser Relay, however, is that it transfers fluids from internal tanks of blocks into other blocks. +booklet.actuallyadditions.chapter.fluidLaser.text.1=The Fluid Laser Relays work much in the same way that normal Laser Relays do, however the thing that makes the Fluid Laser Relay different from the Energy Laser Relay, however, is that it transfers fluids from internal tanks of blocks into other blocks. Fluid Laser Relays can not be connected by Phantomfaces. booklet.actuallyadditions.chapter.distributorItem.name=Item Distributor booklet.actuallyadditions.chapter.distributorItem.text.1=The Item Distributor is a simple way to split up items and make them go in different directions. The distributor will pull items into it from the top by itself, and then split them up and put them out into inventories connected to all of the other sides of it. It tries to do split the items equally, however this works best when inputting one item at a time, which its pulling feature does automatically.