From d14aed63a498275e431c3a3f6d4ebabccda734d9 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 8 May 2016 16:31:26 +0200
Subject: [PATCH] Crafter shows direction it is placed

---
 CHANGELOG.md                                      |  1 -
 src/main/java/refinedstorage/block/BlockBase.java |  7 ++++++-
 src/main/java/refinedstorage/gui/GuiCrafter.java  |  2 +-
 .../refinedstorage/blockstates/crafter.json       | 15 ++++++++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 243d2980d..d27f47ec2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,6 @@
 WIP
 
 **TODO**
-- Crafter direction
 - Textures
 - Update wiki
 
diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java
index 5ccdd1ada..814e2ec8f 100755
--- a/src/main/java/refinedstorage/block/BlockBase.java
+++ b/src/main/java/refinedstorage/block/BlockBase.java
@@ -108,7 +108,12 @@ public abstract class BlockBase extends Block {
         if (tile instanceof TileBase) {
             EnumFacing facing = BlockPistonBase.getFacingFromEntity(pos, player);
 
-            if (player.isSneaking() && (blockPlaced == RefinedStorageBlocks.IMPORTER || blockPlaced == RefinedStorageBlocks.EXPORTER || blockPlaced == RefinedStorageBlocks.EXTERNAL_STORAGE || blockPlaced == RefinedStorageBlocks.CONSTRUCTOR || blockPlaced == RefinedStorageBlocks.DESTRUCTOR)) {
+            if (player.isSneaking() && (blockPlaced == RefinedStorageBlocks.IMPORTER ||
+                blockPlaced == RefinedStorageBlocks.EXPORTER ||
+                blockPlaced == RefinedStorageBlocks.EXTERNAL_STORAGE ||
+                blockPlaced == RefinedStorageBlocks.CONSTRUCTOR ||
+                blockPlaced == RefinedStorageBlocks.DESTRUCTOR ||
+                blockPlaced == RefinedStorageBlocks.CRAFTER)) {
                 facing = facing.getOpposite();
             }
 
diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java
index 2dd14f9ef..cf1dcf2fd 100755
--- a/src/main/java/refinedstorage/gui/GuiCrafter.java
+++ b/src/main/java/refinedstorage/gui/GuiCrafter.java
@@ -66,7 +66,7 @@ public class GuiCrafter extends GuiBase {
 
                 float scale = 0.5f;
                 GlStateManager.scale(scale, scale, 1);
-                drawString(calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 5 : 20), scale), calculateOffsetOnScale(y + 6, scale), text);
+                drawString(calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 1 : 20), scale), calculateOffsetOnScale(y + 6, scale), text);
 
                 GlStateManager.popMatrix();
             }
diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafter.json b/src/main/resources/assets/refinedstorage/blockstates/crafter.json
index 1e6f04f88..244b27d5e 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/crafter.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/crafter.json
@@ -1,15 +1,18 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "cube_all",
+    "model": "orientable",
     "textures": {
-      "all": "refinedstorage:blocks/crafter"
+      "side": "refinedstorage:blocks/side",
+      "top": "refinedstorage:blocks/side",
+      "front": "refinedstorage:blocks/crafter"
     }
   },
   "variants": {
     "inventory": [
       {
-        "transform": "forge:default-block"
+        "transform": "forge:default-block",
+        "y": 0
       }
     ],
     "connected": {
@@ -20,16 +23,22 @@
     },
     "direction": {
       "north": {
+        "y": 0
       },
       "east": {
+        "y": 90
       },
       "south": {
+        "y": 180
       },
       "west": {
+        "y": 270
       },
       "up": {
+        "x": 270
       },
       "down": {
+        "x": 90
       }
     }
   }