From f54f3652b563e395cf71ce9185b617937e90f55d Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 25 Jan 2014 00:07:44 +0800 Subject: [PATCH] Added hammer and imprint recipes --- src/main/java/resonantinduction/api/recipe/RecipeUtils.java | 4 ++-- src/main/java/resonantinduction/archaic/Archaic.java | 3 +++ .../resonantinduction/core/resource/item/ItemOreResource.java | 1 + .../mechanical/process/BlockGrinderWheel.java | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/resonantinduction/api/recipe/RecipeUtils.java b/src/main/java/resonantinduction/api/recipe/RecipeUtils.java index 4709f35a..bc709592 100644 --- a/src/main/java/resonantinduction/api/recipe/RecipeUtils.java +++ b/src/main/java/resonantinduction/api/recipe/RecipeUtils.java @@ -90,13 +90,13 @@ public class RecipeUtils public boolean equals(Object obj) { if (obj instanceof OreDictResource) - {System.out.println(name +" VS " +((OreDictResource) obj).name); + { return this.name.equals(((OreDictResource) obj).name); } if (obj instanceof ItemStackResource) { - return this.name.equals(OreDictionary.getOreName(OreDictionary.getOreID(((ItemStackResource) obj).itemStack))); + return this.name.equals(OreDictionary.getOreName(OreDictionary.getOreID(((ItemStackResource) obj).itemStack))); } return false; diff --git a/src/main/java/resonantinduction/archaic/Archaic.java b/src/main/java/resonantinduction/archaic/Archaic.java index dc879f50..15872318 100644 --- a/src/main/java/resonantinduction/archaic/Archaic.java +++ b/src/main/java/resonantinduction/archaic/Archaic.java @@ -121,5 +121,8 @@ public class Archaic GameRegistry.addRecipe(new ShapedOreRecipe(blockHotPlate, "SSS", "III", 'I', Item.ingotIron, 'S', Block.stone)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockHotPlate, 1, 1), "HHH", "WWW", 'H', new ItemStack(blockHotPlate, 1, 0), 'W', UniversalRecipe.WIRE.get())); + + GameRegistry.addRecipe(new ShapedOreRecipe(itemImprint, "PPP", "PIP", "PPP", 'P', Item.paper, 'I', new ItemStack(Item.dyePowder, 0))); + GameRegistry.addRecipe(new ShapedOreRecipe(itemHammer, "CC ", "CS ", " S", 'C', Block.cobblestone, 'S', Item.stick)); } } diff --git a/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java index a9803070..2313e7fd 100644 --- a/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java +++ b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java @@ -24,6 +24,7 @@ public class ItemOreResource extends ItemRI public ItemOreResource(int id, String name) { super(name, id); + setHasSubtypes(true); } @Override diff --git a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java index 79f1f5bd..920d0d87 100644 --- a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java @@ -63,6 +63,8 @@ public class BlockGrinderWheel extends BlockRIRotatable implements ITileEntityPr { entity.setPosition(entity.posX, entity.posY - 1.2, entity.posZ); } + + ((EntityItem) entity).age--; } else {