diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 36441b7ad..071e10681 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -36,7 +36,7 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock { public static ItemStack getOreByName(String name, int count) { for (int i = 0; i < types.length; i++) { if (types[i].equals(name)) { - return new ItemStack(ModBlocks.ore, count, i); + return new ItemStack(ModBlocks.ore2, count, i); } } throw new InvalidParameterException("The storage block " + name + " could not be found."); diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index ab6c13b86..bb44dc083 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -32,7 +32,7 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock { public static final String[] types = new String[] {"tungstensteel", "lodestone", "tellurium", "iridium_reinforced_tungstensteel", - "iridium_reinforced_stone", "ruby", "sapphire", "peridot", "yellowGarnet", "redGarnet"}; + "iridium_reinforced_stone", "ruby", "sapphire", "peridot", "yellowGarnet", "redGarnet", "copper", "tin"}; public BlockStorage2(Material material) { super(material); diff --git a/src/main/java/techreborn/client/container/ContainerGrinder.java b/src/main/java/techreborn/client/container/ContainerGrinder.java index 93c3f82e0..6166862a2 100644 --- a/src/main/java/techreborn/client/container/ContainerGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerGrinder.java @@ -58,5 +58,4 @@ public class ContainerGrinder extends ContainerCrafting { this.connectionStatus = value; } } - } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 5ab39015c..737b4fc69 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -19,6 +19,7 @@ import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.*; import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockOre; +import techreborn.blocks.BlockOre2; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage2; import techreborn.config.ConfigTechReborn; @@ -58,8 +59,20 @@ public class } static void addGrinderRecipes(){ + //Vanilla RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore), ItemDusts.getDustByName("iron", 2), 100, 20)); RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore), ItemDusts.getDustByName("gold", 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.coal), ItemDusts.getDustByName("coal", 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore), new ItemStack(Items.coal, 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15), 100, 20)); + + + //TechReborn + RecipeHandler.addRecipe(new GrinderRecipe(BlockOre2.getOreByName("copper"), ItemDusts.getDustByName("copper", 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(BlockOre2.getOreByName("tin"), ItemDusts.getDustByName("tin", 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(BlockOre.getOreByName("Lead"), ItemDusts.getDustByName("lead", 2), 100, 20)); + RecipeHandler.addRecipe(new GrinderRecipe(BlockOre.getOreByName("Silver"), ItemDusts.getDustByName("silver", 2), 100, 20)); + } static void addReactorRecipes(){ diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 9f2a2459f..c571a5892 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -62,6 +62,8 @@ tile.techreborn.machineFrame.advancedMachine.name=Advanced Machine Block tile.techreborn.machineFrame.machine.name=Machine Block tile.techreborn.ore2.copper.name=Copper Ore tile.techreborn.ore2.tin.name=Tin Ore +tile.techreborn.storage2.copper.name=Copper Block +tile.techreborn.storage2.tin.name=Tin Block #Blocks tile.techreborn.rubberlog.name=Rubber Wood