diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 88b5b9207..57aef7644 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -270,9 +270,6 @@ public class ShredderRecipes extends SerializableRecipe { /* Misc recycling */ ShredderRecipes.setRecipe(ModBlocks.steel_poles, new ItemStack(ModItems.powder_steel_tiny, 3)); - ShredderRecipes.setRecipe(ModBlocks.pole_top, new ItemStack(ModItems.powder_tungsten, 4)); - ShredderRecipes.setRecipe(ModBlocks.tape_recorder, new ItemStack(ModItems.powder_steel, 1)); - ShredderRecipes.setRecipe(ModBlocks.pole_satellite_receiver, new ItemStack(ModItems.powder_steel, 5)); ShredderRecipes.setRecipe(ModBlocks.steel_roof, new ItemStack(ModItems.powder_steel_tiny, 13)); ShredderRecipes.setRecipe(ModBlocks.steel_wall, new ItemStack(ModItems.powder_steel_tiny, 13)); ShredderRecipes.setRecipe(ModBlocks.steel_corner, new ItemStack(ModItems.powder_steel_tiny, 26)); diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 79bd5571e..b224a5df0 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -748,7 +748,63 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(ModItems.ingot_copper, 8)) } ).setTier(2)); - + + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.machine_stirling), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_steel, 6)), + new AnvilOutput(new ItemStack(ModItems.ingot_copper, 8)), + new AnvilOutput(new ItemStack(ModItems.coil_copper, 4)), + new AnvilOutput(new ItemStack(ModItems.gear_large, 1)), + + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.machine_stirling, 1, 1), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_steel, 6)), + new AnvilOutput(new ItemStack(ModItems.ingot_copper, 8)), + new AnvilOutput(new ItemStack(ModItems.coil_copper, 4)), + + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.machine_stirling_steel), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_steel, 16)), + new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 6)), + new AnvilOutput(new ItemStack(ModItems.ingot_copper, 8)), + new AnvilOutput(new ItemStack(ModItems.coil_gold, 16)), + new AnvilOutput(new ItemStack(ModItems.gear_large,1, 1)), + + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModItems.gear_large,1, 1), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_steel, 8)), + new AnvilOutput(new ItemStack(ModItems.ingot_titanium, 1)), + + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModItems.gear_large), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_iron, 8)), + new AnvilOutput(new ItemStack(ModItems.ingot_copper, 1)), + + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.machine_stirling_steel, 1, 1), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_steel, 16)), + new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 6)), + new AnvilOutput(new ItemStack(ModItems.ingot_copper, 8)), + new AnvilOutput(new ItemStack(ModItems.coil_gold, 16)), + + } + ).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModBlocks.barrel_tcalloy), new AnvilOutput[] { @@ -821,7 +877,40 @@ public class AnvilRecipes { } ).setTier(2)); - + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.radiorec), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.plate_steel, 4)), + new AnvilOutput(new ItemStack(ModItems.wire_copper, 1)), + new AnvilOutput(new ItemStack(ModItems.circuit_red_copper, 1), 0.5F), + new AnvilOutput(new ItemStack(ModItems.ingot_polymer, 1), 0.25F), + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.tape_recorder), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.ingot_steel, 1)), + new AnvilOutput(new ItemStack(ModItems.ingot_tungsten, 1), 0.25F), + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.pole_top), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.ingot_tungsten, 3)), + new AnvilOutput(new ItemStack(ModItems.ingot_red_copper, 1)), + new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 2)), + new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 1), 0.5F), + } + ).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.pole_satellite_receiver), + new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.ingot_steel, 3)), + new AnvilOutput(new ItemStack(ModItems.ingot_steel, 2), 0.5F), + new AnvilOutput(new ItemStack(ModItems.circuit_red_copper, 1), 0.5F), + new AnvilOutput(new ItemStack(ModItems.wire_red_copper, 1)), + } + ).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModBlocks.filing_cabinet), new AnvilOutput[] { diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbility.java b/src/main/java/com/hbm/items/tool/ItemToolAbility.java index 7fcded778..43b6c885e 100644 --- a/src/main/java/com/hbm/items/tool/ItemToolAbility.java +++ b/src/main/java/com/hbm/items/tool/ItemToolAbility.java @@ -49,7 +49,7 @@ public class ItemToolAbility extends ItemTool implements IItemAbility, IDepthRoc public static enum EnumToolType { PICKAXE( - Sets.newHashSet(new Material[] { Material.iron, Material.anvil, Material.rock }), + Sets.newHashSet(new Material[] { Material.iron, Material.anvil, Material.rock, Material.glass }), Sets.newHashSet(new Block[] { Blocks.cobblestone, Blocks.double_stone_slab, Blocks.stone_slab, Blocks.stone, Blocks.sandstone, Blocks.mossy_cobblestone, Blocks.iron_ore, Blocks.iron_block, Blocks.coal_ore, Blocks.gold_block, Blocks.gold_ore, Blocks.diamond_ore, Blocks.diamond_block, Blocks.ice, Blocks.netherrack, Blocks.lapis_ore, Blocks.lapis_block, Blocks.redstone_ore, Blocks.lit_redstone_ore, Blocks.rail, Blocks.detector_rail, Blocks.golden_rail, Blocks.activator_rail }) ), AXE( @@ -61,7 +61,7 @@ public class ItemToolAbility extends ItemTool implements IItemAbility, IDepthRoc Sets.newHashSet(new Block[] { Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow_layer, Blocks.snow, Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium }) ), MINER( - Sets.newHashSet(new Material[] { Material.grass, Material.iron, Material.anvil, Material.rock, Material.clay, Material.sand, Material.ground, Material.snow, Material.craftedSnow }) + Sets.newHashSet(new Material[] { Material.grass, Material.iron, Material.anvil, Material.glass, Material.rock, Material.clay, Material.sand, Material.ground, Material.snow, Material.craftedSnow }) ); private EnumToolType(Set materials) {