From 86549da4596ebcff39aa7b2b47c73dea8d0b813a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 14 Nov 2014 03:38:44 -0500 Subject: [PATCH] #1230 Conduit overlap --- .../crazypants/enderio/conduit/geom/Offset.java | 4 +++- .../crazypants/enderio/conduit/geom/Offsets.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offset.java b/src/main/java/crazypants/enderio/conduit/geom/Offset.java index 544e17f2..5dcdede0 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offset.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offset.java @@ -23,7 +23,9 @@ public enum Offset { EAST_DOWN(ForgeDirection.EAST, ForgeDirection.DOWN), WEST_DOWN(ForgeDirection.WEST, ForgeDirection.DOWN), SOUTH_DOWN(ForgeDirection.SOUTH, ForgeDirection.DOWN), - NORTH_DOWN(ForgeDirection.NORTH, ForgeDirection.DOWN); + NORTH_DOWN(ForgeDirection.NORTH, ForgeDirection.DOWN), + NORTH_EAST(ForgeDirection.NORTH, ForgeDirection.EAST), + NORTH_WEST(ForgeDirection.NORTH, ForgeDirection.WEST); public final int xOffset; public final int yOffset; diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java index e519f4a2..301553a0 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java @@ -37,15 +37,15 @@ public class Offsets { OFFSETS.put(key(IItemConduit.class, Axis.Y), Offset.EAST); OFFSETS.put(key(IItemConduit.class, Axis.Z), Offset.EAST); - OFFSETS.put(key(IGasConduit.class, Axis.NONE), Offset.NONE); - OFFSETS.put(key(IGasConduit.class, Axis.X), Offset.NONE); - OFFSETS.put(key(IGasConduit.class, Axis.Y), Offset.NONE); - OFFSETS.put(key(IGasConduit.class, Axis.Z), Offset.NONE); + OFFSETS.put(key(IGasConduit.class, Axis.NONE), Offset.NORTH_UP); + OFFSETS.put(key(IGasConduit.class, Axis.X), Offset.NORTH_UP); + OFFSETS.put(key(IGasConduit.class, Axis.Y), Offset.NORTH_EAST); + OFFSETS.put(key(IGasConduit.class, Axis.Z), Offset.WEST_UP); - OFFSETS.put(key(IMEConduit.class, Axis.NONE), Offset.NONE); - OFFSETS.put(key(IMEConduit.class, Axis.X), Offset.NONE); - OFFSETS.put(key(IMEConduit.class, Axis.Y), Offset.NONE); - OFFSETS.put(key(IMEConduit.class, Axis.Z), Offset.NONE); + OFFSETS.put(key(IMEConduit.class, Axis.NONE), Offset.SOUTH_UP); + OFFSETS.put(key(IMEConduit.class, Axis.X), Offset.SOUTH_UP); + OFFSETS.put(key(IMEConduit.class, Axis.Y), Offset.NORTH_WEST); + OFFSETS.put(key(IMEConduit.class, Axis.Z), Offset.EAST_UP); }