diff options
| author | Foghrye4 <foghrye4@gmail.com> | 2017-02-12 20:43:03 +0300 |
|---|---|---|
| committer | Foghrye4 <foghrye4@gmail.com> | 2017-02-12 20:43:03 +0300 |
| commit | 5cb4c6e24033cf337812390d99a6817d24d21eab (patch) | |
| tree | 695789855920199efd4702a7bb3e4bacfe58b9f0 /ihl/items_blocks/FlexibleCableItem.java | |
| parent | 8f22398517206aed21a7fd840f463332429fae35 (diff) | |
Removed explosion radius limitations. Explosion calculation optimized (reduced memory usage). One more detonator and explosive pack recipe. GT6 recipes for both chemical reactors and cryogenic distiller. Max stack size of muffle furnace is limited to 32. A lot of old features are removed.
Diffstat (limited to 'ihl/items_blocks/FlexibleCableItem.java')
| -rw-r--r-- | ihl/items_blocks/FlexibleCableItem.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ihl/items_blocks/FlexibleCableItem.java b/ihl/items_blocks/FlexibleCableItem.java index 7fd2583..9944f4c 100644 --- a/ihl/items_blocks/FlexibleCableItem.java +++ b/ihl/items_blocks/FlexibleCableItem.java @@ -28,7 +28,6 @@ import ihl.flexible_cable.AnchorTileEntity; import ihl.flexible_cable.NodeEntity;
import ihl.flexible_cable.PowerCableNodeEntity;
import ihl.interfaces.ICableHolder;
-import ihl.interfaces.IDataCableHolder;
import ihl.interfaces.IEnergyNetNode;
import ihl.interfaces.IMultiPowerCableHolder;
import ihl.interfaces.IWire;
@@ -100,8 +99,7 @@ public class FlexibleCableItem extends Item implements IWire { world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, "step.stone", 1.0F, 0.8F);
if (!world.isRemote && t != null
&& ((t instanceof IEnergyNetNode && !isDataCable)
- || (t instanceof IMultiPowerCableHolder && !isDataCable)
- || (t instanceof IDataCableHolder && isDataCable))
+ || (t instanceof IMultiPowerCableHolder && !isDataCable))
&& stack.stackTagCompound.getInteger("fullLength") >= 1) {
double ppx, ppy, ppz;
ICableHolder te;
@@ -138,10 +136,15 @@ public class FlexibleCableItem extends Item implements IWire { stack.stackTagCompound.setBoolean("firstConnection", false);
return false;
} else {
- if (t2 instanceof IMultiPowerCableHolder) {
- te = ((IMultiPowerCableHolder) t2).getEnergyNetNode(facing);
+ if (t instanceof IMultiPowerCableHolder) {
+ facing = ((IMultiPowerCableHolder) t).getSide(player);
+ if (facing == -1) {
+ return false;
+ } else {
+ te = ((IMultiPowerCableHolder) t).getEnergyNetNode(facing);
+ }
} else {
- te = (ICableHolder) t2;
+ te = (ICableHolder) t;
}
te.setCableCheck(true);
}
|
