diff options
Diffstat (limited to 'src/main/java/tectech')
| -rw-r--r-- | src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeData.java | 35 | ||||
| -rw-r--r-- | src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergy.java | 38 |
2 files changed, 4 insertions, 69 deletions
diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeData.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeData.java index f78e0b92bb..32eac04846 100644 --- a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeData.java +++ b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeData.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -189,7 +188,8 @@ public class MTEPipeData extends MetaPipeEntity implements IConnectsToDataPipe, for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { IGregTechTileEntity gregTechTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(side); - if (gregTechTileEntity != null && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeData neighbor) { + if (gregTechTileEntity != null && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeData neighbor + && neighbor.isConnectedAtSide(side.getOpposite())) { neighbor.mConnections &= ~side.getOpposite().flag; neighbor.connectionCount--; } @@ -224,37 +224,6 @@ public class MTEPipeData extends MetaPipeEntity implements IConnectsToDataPipe, } @Override - public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, float aX, - float aY, float aZ, ItemStack aTool) { - IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); - - if (this.isConnectedAtSide(wrenchingSide)) { - this.mConnections &= ~wrenchingSide.flag; - this.connectionCount--; - - IGregTechTileEntity gregTechTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(wrenchingSide); - - if (gregTechTileEntity != null && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeData neighbor) { - neighbor.mConnections &= ~wrenchingSide.getOpposite().flag; - neighbor.connectionCount--; - } - - } else { - this.mConnections |= wrenchingSide.flag; - this.connectionCount++; - - IGregTechTileEntity gregTechTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(wrenchingSide); - - if (gregTechTileEntity != null && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeData neighbor) { - neighbor.mConnections |= wrenchingSide.getOpposite().flag; - neighbor.connectionCount--; - } - } - - return super.onWrenchRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ, aTool); - } - - @Override public boolean canConnectData(ForgeDirection side) { return true; } diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergy.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergy.java index 33219cb70c..e94f4d31ff 100644 --- a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergy.java +++ b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergy.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -156,8 +155,8 @@ public class MTEPipeEnergy extends MetaPipeEntity implements IConnectsToEnergyTu for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { IGregTechTileEntity gregTechTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(side); - if (gregTechTileEntity != null - && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeEnergy neighbor) { + if (gregTechTileEntity != null && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeEnergy neighbor + && neighbor.isConnectedAtSide(side.getOpposite())) { neighbor.mConnections &= ~side.getOpposite().flag; neighbor.connectionCount--; } @@ -192,39 +191,6 @@ public class MTEPipeEnergy extends MetaPipeEntity implements IConnectsToEnergyTu } @Override - public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, float aX, - float aY, float aZ, ItemStack aTool) { - IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); - - if (this.isConnectedAtSide(wrenchingSide)) { - this.mConnections &= ~wrenchingSide.flag; - this.connectionCount--; - - IGregTechTileEntity gregTechTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(wrenchingSide); - - if (gregTechTileEntity != null - && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeEnergy neighbor) { - neighbor.mConnections &= ~wrenchingSide.getOpposite().flag; - neighbor.connectionCount--; - } - - } else { - this.mConnections |= wrenchingSide.flag; - this.connectionCount++; - - IGregTechTileEntity gregTechTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(wrenchingSide); - - if (gregTechTileEntity != null - && gregTechTileEntity.getMetaTileEntity() instanceof MTEPipeEnergy neighbor) { - neighbor.mConnections |= wrenchingSide.getOpposite().flag; - neighbor.connectionCount--; - } - } - - return super.onWrenchRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ, aTool); - } - - @Override public void loadNBTData(NBTTagCompound nbtTagCompound) { active = nbtTagCompound.getBoolean("eActive"); } |