From 65a7469433c5d4ba7cece673ced2a808ff154e98 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 27 Mar 2016 21:19:54 -0400 Subject: [PATCH] Side config fixes --- .../tile/component/TileComponentConfig.java | 6 ++- .../mekanism/common/util/MekanismUtils.java | 43 +++++++++++++++++-- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index b074c2675..02677c02e 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -67,9 +67,11 @@ public class TileComponentConfig implements ITileComponent for(byte b = 0; b < 6; b++) { - if(getConfig(type)[b] == dataIndex) + int side = MekanismUtils.getBaseOrientation(b, facing); + + if(getConfig(type)[side] == dataIndex) { - ret.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(b, facing))); + ret.add(ForgeDirection.getOrientation(b)); } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 891968aa1..8e5262720 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -515,12 +515,49 @@ public final class MekanismUtils */ public static int getBaseOrientation(int side, int blockFacing) { - if(side == 0 || side == 1) + if(blockFacing == 0) { + if(side == 0) + { + return 2; + } + else if(side == 1) + { + return 3; + } + else if(side == 2) + { + return 1; + } + else if(side == 3) + { + return 0; + } + return side; } - - if(blockFacing == 3 || side == 1 || side == 0) + else if(blockFacing == 1) + { + if(side == 0) + { + return 3; + } + else if(side == 1) + { + return 2; + } + else if(side == 2) + { + return 0; + } + else if(side == 3) + { + return 1; + } + + return side; + } + else if(blockFacing == 3 || side == 1 || side == 0) { if(side == 2 || side == 3) {