Make crafting directional

This simplifies the usage a lot, otherwise you had to take into account all six sides at all times.

Author: rubensworks

src/main/java/org/cyclops/structurecrafting/block/BlockStructuredCrafter.java

@@ -1,14 +1,18 @@
 package org.cyclops.structurecrafting.block;
 
-import net.minecraft.block.Block;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyDirection;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import org.cyclops.cyclopscore.config.configurable.ConfigurableBlock;
+import org.cyclops.cyclopscore.block.property.BlockProperty;
 import org.cyclops.cyclopscore.config.configurable.ConfigurableBlockContainer;
 import org.cyclops.cyclopscore.config.extendedconfig.ExtendedConfig;
-import org.cyclops.structurecrafting.craft.WorldCraftingMatrix;
 import org.cyclops.structurecrafting.tileentity.TileStructuredCrafter;
 
 /**
@@ -17,6 +21,9 @@
  */
 public class BlockStructuredCrafter extends ConfigurableBlockContainer {
 
+    @BlockProperty
+    public static final PropertyDirection FACING = PropertyDirection.create("facing", Lists.newArrayList(EnumFacing.VALUES));
+
     private static BlockStructuredCrafter _instance = null;
 
     /**
@@ -38,4 +45,10 @@ public BlockStructuredCrafter(ExtendedConfig eConfig) {
         setStepSound(soundTypeStone);
     }
 
+    @Override
+    public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ,
+                                     int meta, EntityLivingBase placer) {
+        return this.getDefaultState().withProperty(FACING, facing.getOpposite());
+    }
+
 }

src/main/java/org/cyclops/structurecrafting/craft/WorldCraftingMatrix.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.Pair;
 import org.cyclops.structurecrafting.StructuredCrafting;
+import org.cyclops.structurecrafting.block.BlockStructuredCrafter;
 import org.cyclops.structurecrafting.craft.provider.IItemStackProvider;
 import org.cyclops.structurecrafting.craft.provider.IItemStackProviderRegistry;
 
@@ -40,7 +41,7 @@ public WorldCraftingMatrix(World world, BlockPos centerPos, EnumFacing.Axis axis
 
     protected BlockPos addInAxis(BlockPos pos, EnumFacing.Axis axis, int i, int j) {
         if(axis == EnumFacing.Axis.X) {
-            return pos.add(0, i, j);
+            return pos.add(0, j, i);
         } else if(axis == EnumFacing.Axis.Y) {
             return pos.add(i, 0, j);
         } else if(axis == EnumFacing.Axis.Z) {
@@ -86,7 +87,6 @@ public boolean craft() {
 
         BlockPos[] positions = new BlockPos[9];
         IItemStackProvider[] providers = new IItemStackProvider[9];
-
         // Set crafting grid
         for(int i = -1; i < 2; i++) {
             for(int j = -1; j < 2; j++) {
@@ -123,14 +123,10 @@ public boolean craft() {
         return false;
     }
 
-    public static WorldCraftingMatrix[] deriveMatrices(World world, BlockPos centerPos) {
-        final WorldCraftingMatrix[] matrices = new WorldCraftingMatrix[6]; // Test for all faces of the center position.
-        for(int i = 0; i < EnumFacing.values().length; i++) {
-            EnumFacing side = EnumFacing.values()[i];
-            matrices[i] = new WorldCraftingMatrix(world, centerPos.offset(side), side.getAxis(),
-                    centerPos.offset(side.getOpposite()), side.getOpposite());
-        }
-        return matrices;
+    public static WorldCraftingMatrix deriveMatrix(World world, BlockPos centerPos) {
+        EnumFacing side = ((EnumFacing) world.getBlockState(centerPos).getValue(BlockStructuredCrafter.FACING)).getOpposite();
+        return new WorldCraftingMatrix(world, centerPos.offset(side), side.getAxis(),
+                centerPos.offset(side.getOpposite()), side.getOpposite());
     }
 
 }

src/main/java/org/cyclops/structurecrafting/tileentity/TileStructuredCrafter.java

@@ -21,10 +21,8 @@ public TileStructuredCrafter() {
     protected void updateTileEntity() {
         tickOffset = (tickOffset + 1) % SPEED;
         if(!worldObj.isRemote && tickOffset == 0 && worldObj.isBlockPowered(getPos())) {
-            WorldCraftingMatrix[] matrices = WorldCraftingMatrix.deriveMatrices(worldObj, pos);
-            for (WorldCraftingMatrix matrix : matrices) {
-                if (matrix.craft()) break;
-            }
+            WorldCraftingMatrix matrix = WorldCraftingMatrix.deriveMatrix(worldObj, pos);
+            matrix.craft();
         }
     }
 

src/main/resources/assets/structuredcrafting/blockstates/structuredCrafter.json

@@ -1,6 +1,11 @@
 {
   "variants": {
-    "normal":    { "model": "structuredcrafting:structured_crafter" },
-    "inventory": { "model": "structuredcrafting:structured_crafter" }
+    "facing=south": { "model": "structuredcrafting:structured_crafter", "x": 90 },
+    "facing=west" : { "model": "structuredcrafting:structured_crafter", "x": 90, "y": 90 },
+    "facing=north": { "model": "structuredcrafting:structured_crafter", "x": 90, "y": 180 },
+    "facing=east" : { "model": "structuredcrafting:structured_crafter", "x": 90, "y": 270 },
+    "facing=up" :   { "model": "structuredcrafting:structured_crafter", "x": 180 },
+    "facing=down" : { "model": "structuredcrafting:structured_crafter" },
+    "inventory"   : { "model": "structuredcrafting:structured_crafter" }
   }
 }

src/main/resources/assets/structuredcrafting/models/block/structured_crafter.json

@@ -2,11 +2,11 @@
     "parent": "block/cube_all",
     "textures": {
         "particle": "structuredcrafting:blocks/structuredCrafter_front",
-        "down": "blocks/cobblestone",
-        "up": "structuredcrafting:blocks/structuredCrafter_top",
-        "north": "structuredcrafting:blocks/structuredCrafter_front",
-        "east": "structuredcrafting:blocks/structuredCrafter_side",
-        "south": "structuredcrafting:blocks/structuredCrafter_side",
-        "west": "structuredcrafting:blocks/structuredCrafter_front"
+        "down"    : "structuredcrafting:blocks/structuredCrafter_down",
+        "up"      : "structuredcrafting:blocks/structuredCrafter_top",
+        "north"   : "structuredcrafting:blocks/structuredCrafter_front",
+        "east"    : "structuredcrafting:blocks/structuredCrafter_side",
+        "south"   : "structuredcrafting:blocks/structuredCrafter_side",
+        "west"    : "structuredcrafting:blocks/structuredCrafter_front"
     }
 }