From 52a00a816f8b86efa278cef0f22ba4956f3205d1 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 17 Mar 2014 22:56:03 +0800 Subject: [PATCH] Changed crushing recipes to now be in crusher --- .../main/java/resonantinduction/mechanical/Mechanical.java | 3 +-- .../mechanical/process/grinder/TileGrindingWheel.java | 6 ++---- .../core/grid/fluid/FluidPressureNode.java | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java index ef4e49ba..541cd084 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -162,8 +162,6 @@ public class Mechanical GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockConveyorBelt, 4), "III", "GGG", 'I', Item.ingotIron, 'G', itemGear)); GameRegistry.addRecipe(new ShapedOreRecipe(blockManipulator, "SSS", "SRS", "SCS", 'S', Item.ingotIron, 'C', blockConveyorBelt, 'R', Block.blockRedstone)); GameRegistry.addRecipe(new ShapedOreRecipe(blockDetector, "SWS", "SRS", "SWS", 'S', Item.ingotIron, 'W', UniversalRecipe.WIRE.get())); - // GameRegistry.addRecipe(new ShapedOreRecipe(blockRejector, "S S", "SPS", "SRS", 'P', - // Block.pistonBase, 'S', Item.ingotIron, 'R', Item.redstone)); GameRegistry.addRecipe(new ShapedOreRecipe(blockSorter, "SSS", "SPS", "SRS", 'P', Block.pistonStickyBase, 'S', Item.ingotIron, 'R', Block.blockRedstone)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockWindTurbine, 1, 0), "CWC", "WGW", "CWC", 'G', itemGear, 'C', Block.cloth, 'W', Item.stick)); @@ -182,6 +180,7 @@ public class Mechanical GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemPipe, 1, EnumPipeMaterial.STEEL.ordinal()), "BBB", " ", "BBB", 'B', "ingotSteel")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemPipe, 1, EnumPipeMaterial.FIBERGLASS.ordinal()), "BBB", " ", "BBB", 'B', Item.diamond)); + GameRegistry.addRecipe(new ShapedOreRecipe(blockMechanicalPiston, "SGS", "SPS", "SRS", 'P', Block.pistonBase, 'S', Item.ingotIron, 'R', Item.redstone, 'G', new ItemStack(itemGear, 1, 2))); GameRegistry.addRecipe(new ShapedOreRecipe(blockGrinderWheel, "III", "LGL", "III", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'L', "logWood", 'G', itemGear)); GameRegistry.addRecipe(new ShapedOreRecipe(blockMixer, "IGI", "IGI", "IGI", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'G', itemGear)); } diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java b/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java index 25fba639..f71dbe77 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java @@ -200,16 +200,14 @@ public class TileGrindingWheel extends TileMechanical implements IRotatable public boolean canGrind(ItemStack itemStack) { - // TODO: We don't have a crusher yet, so our grinder currently crushes ores. - return MachineRecipes.INSTANCE.getOutput(RecipeType.CRUSHER.name(), itemStack).length > 0 || MachineRecipes.INSTANCE.getOutput(RecipeType.GRINDER.name(), itemStack).length > 0; + return MachineRecipes.INSTANCE.getOutput(RecipeType.GRINDER.name(), itemStack).length > 0; } private boolean doGrind(EntityItem entity) { ItemStack itemStack = entity.getEntityItem(); - // TODO: Remove this later on when crusher if complete. - RecipeResource[] results = ArrayUtils.addAll(MachineRecipes.INSTANCE.getOutput(RecipeType.CRUSHER.name(), itemStack), MachineRecipes.INSTANCE.getOutput(RecipeType.GRINDER.name(), itemStack)); + RecipeResource[] results = MachineRecipes.INSTANCE.getOutput(RecipeType.GRINDER.name(), itemStack); for (RecipeResource resource : results) { diff --git a/src/main/java/resonantinduction/core/grid/fluid/FluidPressureNode.java b/src/main/java/resonantinduction/core/grid/fluid/FluidPressureNode.java index 1e7f01e0..c90f47ab 100644 --- a/src/main/java/resonantinduction/core/grid/fluid/FluidPressureNode.java +++ b/src/main/java/resonantinduction/core/grid/fluid/FluidPressureNode.java @@ -88,7 +88,6 @@ public class FluidPressureNode extends Node> it = getConnections().entrySet().iterator(); while (it.hasNext())