diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index b46e31a26..87f4f0321 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -68,6 +68,7 @@ public enum ConfigCrafting{ TOOL_EMERALD("Emerald Tools", ConfigCategories.ITEMS_CRAFTING), TOOL_OBSIDIAN("Obsidian Tools", ConfigCategories.ITEMS_CRAFTING), + TOOL_QUARTZ("Obsidian Tools", ConfigCategories.ITEMS_CRAFTING), RICE_BREAD("Rice Bread", ConfigCategories.FOOD_CRAFTING), RICE_DOUGH("Rice Dough", ConfigCategories.FOOD_CRAFTING), @@ -129,7 +130,12 @@ public enum ConfigCrafting{ IRON("Iron Ore -> Iron Dust + Gold Dust", ConfigCategories.CRUSHER_RECIPES, "Crusher"), TELE_STAFF("Tele Staff", ConfigCategories.ITEMS_CRAFTING), - CASING("Casing", ConfigCategories.BLOCKS_CRAFTING); + CASING("Casing", ConfigCategories.BLOCKS_CRAFTING), + ORE_MAGNET("Ore Magnet", ConfigCategories.BLOCKS_CRAFTING), + + MAGNET_RING("Magnet Ring", ConfigCategories.ITEMS_CRAFTING), + WATER_RING("Water Ring", ConfigCategories.ITEMS_CRAFTING), + GROWTH_RING("Growth Ring", ConfigCategories.ITEMS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java index cdaa11614..e83ed6eeb 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java @@ -147,10 +147,10 @@ public enum ConfigIntValues{ WATER_RING_RANGE("Water Ring: Range", ConfigCategories.MACHINE_VALUES, 3, 1, 10, "The Range of the Water Ring"), WATER_RING_ENERGY_USE("Magnet Ring: Energy Used", ConfigCategories.MACHINE_VALUES, 30, 0, 500, "The Amount of Energy the Water Ring uses per Block"), - ORE_MAGNET_MAX_TIMER("Ore Magnet: Max Timer", ConfigCategories.MACHINE_VALUES, 15, 1, 2000, "The approximate Time it takes for the Ore Magnet to search for a new block to mine"), + ORE_MAGNET_MAX_TIMER("Ore Magnet: Max Timer", ConfigCategories.MACHINE_VALUES, 20, 1, 2000, "The approximate Time it takes for the Ore Magnet to search for a new block to mine"), ORE_MAGNET_RANGE("Ore Magnet: Range", ConfigCategories.MACHINE_VALUES, 10, 1, 60, "The range of the Ore Magnet"), - ORE_MAGNET_OIL_USE("Ore Magnet: Oil Use", ConfigCategories.MACHINE_VALUES, 50, 0, 5000, "The amount of oil the Ore Magnet uses every Block"), - ORE_MAGNET_ENERGY_USE("Ore Magnet: Energy USe", ConfigCategories.MACHINE_VALUES, 500, 10, 10000, "The amount of Energy the Ore Magnet uses every tick"); + ORE_MAGNET_OIL_USE("Ore Magnet: Oil Use", ConfigCategories.MACHINE_VALUES, 30, 0, 5000, "The amount of oil the Ore Magnet uses every Block"), + ORE_MAGNET_ENERGY_USE("Ore Magnet: Energy USe", ConfigCategories.MACHINE_VALUES, 250, 10, 10000, "The amount of Energy the Ore Magnet uses every tick"); 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 3b194ebe1..200c0da75 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -114,6 +114,15 @@ public class BlockCrafting{ 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); + //Ore Magnet + if(ConfigCrafting.ORE_MAGNET.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOreMagnet), + "SSS", "CBC", "ISI", + 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'B', new ItemStack(InitItems.itemBatteryDouble), + 'I', new ItemStack(Blocks.iron_block))); + //Fermenting Barrel if(ConfigCrafting.FERMENTING_BARREL.isEnabled()) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFermentingBarrel), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index cece82ef0..db1720791 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -148,6 +148,31 @@ public class ItemCrafting{ 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + //Magnet Ring + if(ConfigCrafting.MAGNET_RING.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMagnetRing), + "RIB", "IOI", "BIR", + 'R', "dustRedstone", + 'I', "ingotIron", + 'B', new ItemStack(Items.dye, 1, 4), + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); + + //Growth Ring + if(ConfigCrafting.GROWTH_RING.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGrowthRing), + "SIS", "IOI", "SIS", + 'S', new ItemStack(Items.wheat_seeds), + 'I', "ingotIron", + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); + + //Water Ring + if(ConfigCrafting.WATER_RING.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWaterRemovalRing), + "BIB", "IOI", "BIB", + 'B', new ItemStack(Items.water_bucket), + 'I', "ingotIron", + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); + //Triple Battery if(ConfigCrafting.TRIPLE_BATTERY.isEnabled()) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java index 0d478d317..6f32d905e 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java @@ -3,6 +3,7 @@ package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -65,6 +66,58 @@ public class ToolCrafting{ 'O', new ItemStack(Items.emerald)); } + if(ConfigCrafting.TOOL_QUARTZ.isEnabled()){ + //Pickaxe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemPickaxeQuartz), + "EEE", " S ", " S ", + 'E', "gemQuartzBlack", + 'S', new ItemStack(Items.stick))); + + //Sword + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemSwordQuartz), + "E", "E", "S", + 'E', "gemQuartzBlack", + 'S', new ItemStack(Items.stick))); + + //Axe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemAxeQuartz), + "EE", "ES", " S", + 'E', "gemQuartzBlack", + 'S', new ItemStack(Items.stick))); + + //Shovel + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemShovelQuartz), + "E", "S", "S", + 'E', "gemQuartzBlack", + 'S', new ItemStack(Items.stick))); + + //Hoe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemHoeQuartz), + "EE", " S", " S", + 'E', "gemQuartzBlack", + 'S', new ItemStack(Items.stick))); + + //Helm + GameRegistry.addRecipe(new ItemStack(InitItems.itemHelmQuartz), + "OOO", "O O", + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + + //Chest + GameRegistry.addRecipe(new ItemStack(InitItems.itemChestQuartz), + "O O", "OOO", "OOO", + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + + //Legs + GameRegistry.addRecipe(new ItemStack(InitItems.itemPantsQuartz), + "OOO", "O O", "O O", + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + + //Boots + GameRegistry.addRecipe(new ItemStack(InitItems.itemBootsQuartz), + "O O", "O O", + 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + } + if(ConfigCrafting.TOOL_OBSIDIAN.isEnabled()){ //Pickaxe GameRegistry.addRecipe(new ItemStack(InitItems.itemPickaxeObsidian), diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index b3c6322fc..08771bc51 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -157,6 +157,7 @@ item.actuallyadditions.goldPaxel.name=Golden AIOT item.actuallyadditions.diamondPaxel.name=Diamond AIOT item.actuallyadditions.emeraldPaxel.name=Emerald AIOT item.actuallyadditions.obsidianPaxel.name=Obsidian AIOT +item.actuallyadditions.quartzPaxel.name=Black Quartz AIOT item.actuallyadditions.paxelTFCopper.name=TF Copper AIOT item.actuallyadditions.paxelTFTin.name=TF Tin AIOT @@ -347,6 +348,11 @@ item.actuallyadditions.itemAxeEmerald.name=Emerald Axe item.actuallyadditions.itemShovelEmerald.name=Emerald Shovel item.actuallyadditions.itemHoeEmerald.name=Emerald Hoe item.actuallyadditions.itemSwordEmerald.name=Emerald Sword +item.actuallyadditions.itemPickaxeQuartz.name=Black Quartz Pickaxe +item.actuallyadditions.itemAxeQuartz.name=Black Quartz Axe +item.actuallyadditions.itemShovelQuartz.name=Black Quartz Shovel +item.actuallyadditions.itemHoeQuartz.name=Black Quartz Hoe +item.actuallyadditions.itemSwordQuartz.name=Black Quartz Sword item.actuallyadditions.itemPickaxeObsidian.name=Obsidian Pickaxe item.actuallyadditions.itemAxeObsidian.name=Obsidian Axe item.actuallyadditions.itemShovelObsidian.name=Obsidian Shovel @@ -505,6 +511,11 @@ tooltip.actuallyadditions.itemAxeEmerald.desc=Mines Wood. tooltip.actuallyadditions.itemShovelEmerald.desc=Mines Dirt. tooltip.actuallyadditions.itemHoeEmerald.desc=Mines... uhm... yea. tooltip.actuallyadditions.itemSwordEmerald.desc=Mines... mobs? +tooltip.actuallyadditions.itemPickaxeQuartz.desc=Mines Stone. +tooltip.actuallyadditions.itemAxeQuartz.desc=Mines Wood. +tooltip.actuallyadditions.itemShovelQuartz.desc=Mines Dirt. +tooltip.actuallyadditions.itemHoeQuartz.desc=Mines... uhm... yea. +tooltip.actuallyadditions.itemSwordQuartz.desc=Mines... mobs? tooltip.actuallyadditions.itemPickaxeObsidian.desc=Mines Stone. Slooooowly. tooltip.actuallyadditions.itemAxeObsidian.desc=Mines Wood. Slooooowly. tooltip.actuallyadditions.itemShovelObsidian.desc=Mines Dirt. Slooooowly. @@ -564,6 +575,15 @@ tooltip.actuallyadditions.itemPantsEmerald.desc="Pants" is "Hose" in German! item.actuallyadditions.itemBootsEmerald.name=Emerald Boots tooltip.actuallyadditions.itemBootsEmerald.desc=I hope they fit good.. I hate it when boots don't fit.. +item.actuallyadditions.itemHelmQuartz.name=Black Quartz Helm +tooltip.actuallyadditions.itemHelmQuartz.desc=Dark like the night! +item.actuallyadditions.itemChestQuartz.name=Black Quartz Chestplate +tooltip.actuallyadditions.itemChestQuartz.desc=So dark! It's night time! +item.actuallyadditions.itemPantsQuartz.name=Black Quartz Pants +tooltip.actuallyadditions.itemPantsQuartz.desc="Pants" is "Hose" in German! +item.actuallyadditions.itemBootsQuartz.name=Black Quartz Boots +tooltip.actuallyadditions.itemBootsQuartz.desc=I hope they fit good.. I hate it when boots don't fit.. + info.actuallyadditions.gui.animals=Animals info.actuallyadditions.gui.enoughToBreed=Enough to breed! info.actuallyadditions.gui.tooMany=Too many to breed!