diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 4a081dc62..574f74759 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -5,6 +5,7 @@ import ellpeck.actuallyadditions.config.ConfigCategories; public enum ConfigCrafting{ COMPOST("Compost", ConfigCategories.BLOCKS_CRAFTING), + XP_SOLIDIFIER("Experience Solidifier", ConfigCategories.BLOCKS_CRAFTING), WOOD_CASING("Wood Casing", ConfigCategories.BLOCKS_CRAFTING), STONE_CASING("Stone Casing", ConfigCategories.BLOCKS_CRAFTING), FISHING_NET("Fishing Net", ConfigCategories.BLOCKS_CRAFTING), @@ -103,6 +104,11 @@ public enum ConfigCrafting{ DRILL_PLACING("Drill Placing Upgrade", ConfigCategories.ITEMS_CRAFTING), DRILL_SILK_TOUCH("Drill Silk Touch Upgrade", ConfigCategories.ITEMS_CRAFTING), BATTERY("Battery", ConfigCategories.ITEMS_CRAFTING), + DOUBLE_BATTERY("Double Battery", ConfigCategories.ITEMS_CRAFTING), + TRIPLE_BATTERY("Triple Battery", ConfigCategories.ITEMS_CRAFTING), + QUADRUPLE_BATTERY("Quadruple Battery", ConfigCategories.ITEMS_CRAFTING), + QUINTUPLE_BATTERY("Quintuple Battery", ConfigCategories.ITEMS_CRAFTING), + BAT_WINGS("Wings Of The Bats", ConfigCategories.ITEMS_CRAFTING), ENERGIZER("Energizer", ConfigCategories.BLOCKS_CRAFTING), ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index a83558b32..35fe3649f 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -7,6 +7,7 @@ import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -25,6 +26,14 @@ public class BlockCrafting{ 'W', "plankWood", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()))); + //XP Solidifier + if(ConfigCrafting.XP_SOLIDIFIER.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier), + "XXX", "DCD", "XXX", + 'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()), + 'D', "blockDiamond", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + //Charcoal Block GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()), "CCC", "CCC", "CCC", @@ -309,7 +318,7 @@ public class BlockCrafting{ //Greenhouse Glass if(ConfigCrafting.GREENHOUSE_GLASS.isEnabled()) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3), "GSG", "SDS", "GSG", 'G', "blockGlass", 'D', Blocks.obsidian, diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 635abf082..543158abc 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -140,6 +140,46 @@ public class ItemCrafting{ 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + //Double Battery + if(ConfigCrafting.DOUBLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryDouble), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBattery), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Triple Battery + if(ConfigCrafting.TRIPLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBatteryDouble), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Quadruple Battery + if(ConfigCrafting.QUADRUPLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuadruple), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBatteryTriple), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Quintuple Battery + if(ConfigCrafting.QUINTUPLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuintuple), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBatteryQuadruple), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Bat Wings + if(ConfigCrafting.BAT_WINGS.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), + "WNW", "WDW", "WNW", + 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), + 'D', "blockDiamond", + 'N', new ItemStack(Items.nether_star))); + //Quartz if(ConfigCrafting.QUARTZ.isEnabled()) GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryDouble.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryDouble.png new file mode 100644 index 000000000..d4b1ae9f1 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryDouble.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuadruple.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuadruple.png new file mode 100644 index 000000000..24b55c5c0 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuadruple.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuintuple.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuintuple.png new file mode 100644 index 000000000..54ecbdb16 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuintuple.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryTriple.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryTriple.png new file mode 100644 index 000000000..739fc4f15 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryTriple.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMiscBatWing.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscBatWing.png new file mode 100644 index 000000000..2a86a9574 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscBatWing.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemWingsOfTheBats.png b/src/main/resources/assets/actuallyadditions/textures/items/itemWingsOfTheBats.png new file mode 100644 index 000000000..3e746b7cd Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemWingsOfTheBats.png differ