From be652f2fd8c09f32b643a5441018042c269cfdb6 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sun, 21 Jun 2015 22:29:57 -0700 Subject: [PATCH] Tweaking Thaumcraft bee species products again. Closes #67. --- .../java/magicbees/bees/BeeProductHelper.java | 21 +++++++++--------- .../magicbees/main/utils/CraftingManager.java | 22 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index 6630a94..d414b4e 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -4,6 +4,7 @@ import magicbees.item.types.CombType; import magicbees.item.types.DropType; import magicbees.item.types.NuggetType; import magicbees.item.types.PollenType; +import magicbees.item.types.PropolisType; import magicbees.item.types.ResourceType; import magicbees.main.Config; import magicbees.main.utils.LogHelper; @@ -213,10 +214,10 @@ public class BeeProductHelper { } public static void initThaumcraftProducts() { - TC_AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 20); - TC_FIRE.addProduct(Config.combs.getStackForType(CombType.FIREY), 20); - TC_WATER.addProduct(Config.combs.getStackForType(CombType.WATERY), 20); - TC_EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 20); + TC_AIR.addProduct(Config.combs.getStackForType(CombType.TC_AIR), 20); + TC_FIRE.addProduct(Config.combs.getStackForType(CombType.TC_FIRE), 20); + TC_WATER.addProduct(Config.combs.getStackForType(CombType.TC_WATER), 20); + TC_EARTH.addProduct(Config.combs.getStackForType(CombType.TC_EARTH), 20); TC_ORDER.addProduct(Config.combs.getStackForType(CombType.TC_ORDER), 20); TC_CHAOS.addProduct(Config.combs.getStackForType(CombType.TC_CHAOS), 20); @@ -240,12 +241,12 @@ public class BeeProductHelper { SCHOLARLY.addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 2); SAVANT.addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 5); - TC_AIR.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal()), 5); - TC_FIRE.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 5); - TC_WATER.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 5); - TC_EARTH.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()), 5); - TC_ORDER.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.ORDER.ordinal()), 5); - TC_CHAOS.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.CHAOS.ordinal()), 5); + TC_AIR.addSpecialty(Config.propolis.getStackForType(PropolisType.AIR), 18); + TC_FIRE.addSpecialty(Config.propolis.getStackForType(PropolisType.FIRE), 18); + TC_WATER.addSpecialty(Config.propolis.getStackForType(PropolisType.WATER), 18); + TC_EARTH.addSpecialty(Config.propolis.getStackForType(PropolisType.EARTH), 18); + TC_ORDER.addSpecialty(Config.propolis.getStackForType(PropolisType.ORDER), 18); + TC_CHAOS.addSpecialty(Config.propolis.getStackForType(PropolisType.CHAOS), 18); TC_BRAINY.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 2); TC_CHICKEN.addSpecialty(new ItemStack(Config.tcNuggetChicken, 1), 9); diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index 63e6010..ca00568 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -478,30 +478,32 @@ public class CraftingManager Config.propolis.getStackForType(PropolisType.EARTH) }, new int[] { 100, 60, 80 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_ORDER), - new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.ORDER) }, - new int[] { 100, 80 }); + new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.redstone), + Config.propolis.getStackForType(PropolisType.ORDER) }, + new int[] { 100, 60, 80 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_CHAOS), - new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.CHAOS) }, - new int[] { 100, 80 }); + new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.gunpowder), + Config.propolis.getStackForType(PropolisType.CHAOS) }, + new int[] { 100, 60, 80 }); RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.AIR), new ItemStack[] { propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_AIR) }, - new int[] { 100, 65 }); + new int[] { 100, 90 }); RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.FIRE), new ItemStack[] { propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_FIRE) }, - new int[] { 100, 65 }); + new int[] { 100, 90 }); RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.WATER), new ItemStack[] { propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_WATER) }, - new int[] { 100, 65 }); + new int[] { 100, 90 }); RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.EARTH), new ItemStack[] { propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_EARTH) }, - new int[] { 100, 65 }); + new int[] { 100, 90 }); RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.ORDER), new ItemStack[] { propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_ORDER) }, - new int[] { 100, 65 }); + new int[] { 100, 90 }); RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.CHAOS), new ItemStack[] { propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_CHAOS) }, - new int[] { 100, 65 }); + new int[] { 100, 90 }); } if (ArsMagicaHelper.isActive())