diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 5e094d073..912dccd6c 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -104,7 +104,9 @@ public enum ConfigCrafting{ BATTERY("Battery", ConfigCategories.ITEMS_CRAFTING), ENERGIZER("Energizer", ConfigCategories.BLOCKS_CRAFTING), - ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING); + ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING), + + QUARTZ("Black Quartz in a Crafting Table (as a Backup if there's no Ores to be found anywhere)", ConfigCategories.ITEMS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 5814ccdfb..c4e8661dc 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -37,7 +37,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), "WSW", "SRS", "WSW", 'W', "plankWood", - 'R', "dustRedstone", + 'R', "logWood", 'S', "stickWood")); //Ender Casing @@ -190,7 +190,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), "WSW", "SRS", "WSW", 'W', "cobblestone", - 'R', "dustRedstone", + 'R', TheMiscItems.QUARTZ.getOredictName(), 'S', "stickWood")); //Quartz Block diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java index db0e4d820..d812b01da 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java @@ -16,9 +16,6 @@ public class CrusherCrafting{ public static void init(){ Util.logInfo("Initializing Crusher Recipes..."); - CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Items.bed), new ItemStack(Blocks.planks, 3), new ItemStack(Blocks.wool, 3), 100); - CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.wool, 1, Util.WILDCARD), new ItemStack(Items.string, 4)); - CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 10)); CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(InitItems.itemDust, 12, TheDusts.LAPIS.ordinal())); CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemDust, 1, TheDusts.COAL.ordinal())); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index cf4aed5c1..38c3d7e85 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -132,11 +132,17 @@ public class ItemCrafting{ 'I', "ingotIron", 'C', TheMiscItems.COIL_ADVANCED.getOredictName())); + //Quartz + if(ConfigCrafting.QUARTZ.isEnabled()) + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), + new ItemStack(Items.coal), + new ItemStack(Items.quartz))); + //Coil if(ConfigCrafting.COIL.isEnabled()) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), " R ", "RIR", " R ", - 'I', "ingotIron", + 'I', TheMiscItems.QUARTZ.getOredictName(), 'R', "dustRedstone")); //Cup diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java index a4c41d7eb..880ce8c01 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java @@ -5,7 +5,6 @@ import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.Util; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import org.apache.logging.log4j.Level; import java.util.ArrayList; @@ -26,7 +25,7 @@ public class CrusherRecipeManualRegistry{ public static void registerRecipe(String input, String outputOne, String outputTwo, int secondChance, int outputOneAmount, int outputTwoAmount){ ArrayList inputStacks = (ArrayList)OreDictionary.getOres(input, false); ArrayList outputOneStacks = (ArrayList)OreDictionary.getOres(outputOne, false); - ArrayList outputTwoStacks = (ArrayList)OreDictionary.getOres(outputTwo, false); + ArrayList outputTwoStacks = outputTwo.length() <= 0 ? null : (ArrayList)OreDictionary.getOres(outputTwo, false); if(inputStacks != null && !inputStacks.isEmpty()){ for(ItemStack anInput : inputStacks){ @@ -47,13 +46,13 @@ public class CrusherRecipeManualRegistry{ } else{ if(ConfigBoolValues.DO_CRUSHER_SPAM.isEnabled()) - ModUtil.LOGGER.log(Level.WARN, "Couldn't register Crusher Recipe! An Item with OreDictionary Registry '" + outputOne + "' doesn't exist! It should be the output of '" + input + "'!"); + ModUtil.LOGGER.warn("Couldn't register Crusher Recipe! An Item with OreDictionary Registry '" + outputOne + "' doesn't exist! It should be the output of '" + input + "'!"); } } } else{ if(ConfigBoolValues.DO_CRUSHER_SPAM.isEnabled()) - ModUtil.LOGGER.log(Level.WARN, "Couldn't register Crusher Recipe! Didn't find Items registered as '" + input + "'!"); + ModUtil.LOGGER.warn("Couldn't register Crusher Recipe! Didn't find Items registered as '"+input+"'!"); } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 8da251d0d..5eef799ed 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -420,7 +420,7 @@ tooltip.actuallyadditions.itemMiscDough.desc=Used to make things that involve do tooltip.actuallyadditions.itemMiscPaperCone.desc=Used to store foodstuffs! tooltip.actuallyadditions.itemMiscKnifeBlade.desc=Sharp like a tooth! A whale's tooth! tooltip.actuallyadditions.itemMiscKnifeHandle.desc=Fits comfortably in your hand. -tooltip.actuallyadditions.itemMiscBlackQuartz.desc=Used in the Quartz Enchanter! +tooltip.actuallyadditions.itemMiscBlackQuartz.desc=Used for crafting essential components! tooltip.actuallyadditions.itemMiscRing.desc=Used for crafting Effect Rings tooltip.actuallyadditions.blockMiscWoodCasing.desc=Not so sturdy Casing, used for Crafting