diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java index fc85120..45e9ba5 100644 --- a/src/main/java/magicbees/bees/Allele.java +++ b/src/main/java/magicbees/bees/Allele.java @@ -10,6 +10,7 @@ import magicbees.bees.allele.effect.AlleleEffectSpawnMobWeighted; import magicbees.bees.allele.effect.AlleleEffectSpawnWisp; import magicbees.bees.allele.effect.AlleleEffectTransmuting; import magicbees.bees.allele.effect.TransmutationEffectController; +import magicbees.bees.allele.effect.TransmutationEffectLBotaniaLiving; import magicbees.bees.allele.effect.TransmutationEffectRailcraft; import magicbees.bees.allele.effect.TransmutationEffectVanilla; import magicbees.bees.allele.flowerProvider.FlowerProviderArsMagicaFlower; @@ -50,6 +51,7 @@ public class Allele implements IAllele { public static IAlleleEffect effectTransmuting; public static IAlleleEffect effectCrumbling; public static IAlleleEffect effectInvisibility; + public static IAlleleEffect effectDreaming; public static IAlleleEffect spawnBrainyZombie; public static IAlleleEffect spawnWisp; @@ -120,6 +122,11 @@ public class Allele implements IAllele { } else { Allele.spawnBlizz = (IAlleleEffect) Allele.getBaseAllele("effectNone"); } + + if (BotaniaHelper.isActive()) { + Allele.effectDreaming = new AlleleEffectTransmuting("Dreaming", false, + new TransmutationEffectController(new TransmutationEffectLBotaniaLiving()), 100); + } Allele.effectCleansing = new AlleleEffectCure("Curative", false); Allele.effectDigSpeed = new AlleleEffectPotion("DigSpeed", Potion.digSpeed, 15, false); @@ -127,12 +134,12 @@ public class Allele implements IAllele { Allele.effectSlowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false).setMalicious(); Allele.effectWithering = new AlleleEffectPotion("Withering", Potion.wither, 10, false).setMalicious(); - TransmutationEffectController controller = new TransmutationEffectController(new ITransmutationEffectLogic[] { + TransmutationEffectController controller = new TransmutationEffectController( new TransmutationEffectRailcraft(), new TransmutationEffectVanilla() - }); + ); MagicBeesAPI.transmutationEffectController = controller; - Allele.effectTransmuting = new AlleleEffectTransmuting("Transmuting", true, controller); + Allele.effectTransmuting = new AlleleEffectTransmuting("Transmuting", true, controller, 200); Allele.effectCrumbling = new AlleleEffectCrumbling("Crumbling", true); Allele.effectInvisibility = new AlleleEffectPotion("Invisibility", Potion.invisibility, 10, false); diff --git a/src/main/java/magicbees/bees/AlleleFlower.java b/src/main/java/magicbees/bees/AlleleFlower.java index d6bd69e..3eb9f2e 100644 --- a/src/main/java/magicbees/bees/AlleleFlower.java +++ b/src/main/java/magicbees/bees/AlleleFlower.java @@ -23,4 +23,9 @@ public class AlleleFlower extends Allele implements IAlleleFlowers return this.provider; } + @Override + public String getName() { + return this.provider.getDescription(); + } + } diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index fae460c..168c1b7 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -1357,7 +1357,7 @@ public class BeeGenomeManager { IAllele[] genome = getTemplateBotSomnolent(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BOT_DREAMING; - genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNormal"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm"); genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarger"); return genome; @@ -1367,6 +1367,7 @@ public class BeeGenomeManager { IAllele[] genome = getTemplateBotDreaming(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BOT_AELFHEIM; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectDreaming; return genome; } diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java index 4504c7f..61786e1 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java @@ -12,8 +12,8 @@ public class AlleleEffectTransmuting extends AlleleEffect { private TransmutationEffectController transmutationController; - public AlleleEffectTransmuting(String id, boolean isDominant, TransmutationEffectController effectController) { - super(id, isDominant, 200); + public AlleleEffectTransmuting(String id, boolean isDominant, TransmutationEffectController effectController, int timeoutBeeTicks) { + super(id, isDominant, timeoutBeeTicks); this.transmutationController = effectController; } diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java index 7cc577e..273e481 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java @@ -14,7 +14,7 @@ import net.minecraft.world.biome.BiomeGenBase; public class TransmutationEffectController implements ITransmutationEffectController { private List logicObjects; - public TransmutationEffectController(ITransmutationEffectLogic[] effectLogic) { + public TransmutationEffectController(ITransmutationEffectLogic... effectLogic) { logicObjects = new ArrayList(); for (ITransmutationEffectLogic logic : effectLogic) { logicObjects.add(logic); diff --git a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java index d6d95e3..8c95ea2 100644 --- a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java @@ -1,12 +1,10 @@ package magicbees.main.utils.compat; import magicbees.bees.BeeManager; -import magicbees.bees.BeeSpecies; import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; import magicbees.main.utils.compat.botania.BotaniaAPIDistanceHelper; -import magicbees.main.utils.compat.botania.SpeciesRecipeManaInfusion; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -17,13 +15,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.ManaItemHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.EnumBeeType; public class BotaniaHelper { @@ -63,6 +59,7 @@ public class BotaniaHelper { public static Block blockMysticalFlower; public static Block blockLivingRock; public static Block blockLivingWood; + public static Block blockDreamWood; public static Item itemPetal; public static Item itemManaPetal; @@ -130,6 +127,7 @@ public class BotaniaHelper { blockMysticalFlower = BlockInterface.getBlock(Name, "flower"); blockLivingRock = BlockInterface.getBlock(Name, "livingrock"); blockLivingWood = BlockInterface.getBlock(Name, "livingwood"); + blockDreamWood = BlockInterface.getBlock(Name, "dreamwood"); // Generate 16-colour flowers. mysticalFlowerVariants = new ItemStack[16]; diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java index da14094..2d35cc5 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -45,6 +45,7 @@ public class BotaniaAPIDistanceHelper { BotaniaAPI.manaInfusionRecipes.add(infusionBeeVazbee); tradeBeeAelfheim = new SpeciesRecipeElvenTrade(BeeSpecies.BOT_DREAMING, BeeSpecies.BOT_AELFHEIM); + BotaniaAPI.elvenTradeRecipes.add(tradeBeeAelfheim); LexiconEntry manasteelEntry = getLexiconEntryForName(BotaniaHelper.LEXICON_ENTRY_MANA_GEAR); manasteelEntry.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe)); diff --git a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java index 3ea53d1..2538759 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java @@ -15,8 +15,8 @@ public class SpeciesRecipeElvenTrade extends RecipeElvenTrade { private IAlleleBeeSpecies inputSpecies; public SpeciesRecipeElvenTrade(IAlleleBeeSpecies inSpecies, IAlleleBeeSpecies outSpecies) { - super(BeeManager.getDefaultItemStackForSpecies(inSpecies, EnumBeeType.DRONE), - BeeManager.getDefaultItemStackForSpecies(outSpecies, EnumBeeType.DRONE)); + super(BeeManager.getDefaultItemStackForSpecies(outSpecies, EnumBeeType.DRONE), + BeeManager.getDefaultItemStackForSpecies(inSpecies, EnumBeeType.DRONE)); inputSpecies = inSpecies; } @@ -33,6 +33,7 @@ public class SpeciesRecipeElvenTrade extends RecipeElvenTrade { if (BeeManager.beeRoot.isMember(inStack, EnumBeeType.DRONE.ordinal())) { IBee bee = BeeManager.beeRoot.getMember(inStack); if (bee.getGenome().getPrimary().equals(inputSpecies)) { + matchedStacks.add(inStack); found = true; break; } diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index f12fced..294d94f 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -454,6 +454,7 @@ magicbees.effectAblaze=Ablaze magicbees.effectManaDrainer=Vortex magicbees.effectAMWisp=Spiritual magicbees.effectTEBlizzy=Blizzy +magicbees.effectDreaming=Dreaming flowerProvider.book=Books flowerProvider.magic=Thaumic Flowers