diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java index 395cf27..26f2723 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java @@ -56,7 +56,7 @@ public class Allele implements IAllele { } public static IAlleleBeeSpecies getMagicSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele((new StringBuilder()).append("magicbees.species.").append(name.toLowerCase()) + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele((new StringBuilder()).append("magicbees.species").append(name) .toString()); } diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java index a66825a..8562a76 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java @@ -24,9 +24,44 @@ public class ExpensiveMutation implements IBeeMutation { } public static void mutate(){ - new ExpensiveMutation(Allele.getBaseSpecies("Hermitic"), Allele.getBaseSpecies("Edenic"), Genomes.getBalanced(), 0.8f); - new ExpensiveMutation(Allele.getBaseSpecies("Heroic"), GreedyBeeSpecies.ANNOYING, Genomes.getTedious(), 0.7f); - new ExpensiveMutation(Allele.getBaseSpecies("Phantasmal"), GreedyBeeSpecies.TEDIOUS, Genomes.getTedious(), 0.6f); + IAllele first; + IAllele second; + if(Ranger.extra) + first = Allele.getExtraSpecies("Relic"); + else + first = Allele.getBaseSpecies("Austere"); + second = Allele.getBaseSpecies("Hermitic"); + new ExpensiveMutation(first, second, Genomes.getBalanced(), 0.8f); + if(Ranger.magic) + first = Allele.getMagicSpecies("Draconic"); + else + first = Allele.getBaseSpecies("Heroic"); + new ExpensiveMutation(first, GreedyBeeSpecies.ANNOYING, Genomes.getTedious(), 0.7f); + if(Ranger.extra) + first = Allele.getExtraSpecies("Virulent"); + else if(Ranger.magic) + first = Allele.getMagicSpecies("Withering"); + else + first = Allele.getBaseSpecies("Demonic"); + new ExpensiveMutation(first, GreedyBeeSpecies.TEDIOUS, Genomes.getInsufferable(), 0.6f); + + new ExpensiveMutation(Allele.getBaseSpecies("Edenic"), GreedyBeeSpecies.INSUFFERABLE, Genomes.getInfinite(), 0.4f); + if(Ranger.magic) + first = Allele.getMagicSpecies("Doctoral"); + else if(Ranger.extra) + first = Allele.getExtraSpecies("Diamond"); + else + first = Allele.getBaseSpecies("Phantasmal"); + + new ExpensiveMutation(first, GreedyBeeSpecies.TRIPPY, Genomes.getCosmic(), 0.8f); + + if(Ranger.magic) + first = Allele.getMagicSpecies("Firey"); + else if(Ranger.extra) + first = Allele.getExtraSpecies("Volcanic"); + else + first = Allele.getBaseSpecies("Industrious"); + //new ExpensiveMutation(first, GreedyBeeSpecies.COSMIC, Genomes.getNeutronium(), 0.6f); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java index 05f3038..23aaa1c 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java @@ -1,5 +1,6 @@ package fox.spiteful.avaritia.compat.forestry; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; import fox.spiteful.avaritia.compat.Compat; @@ -18,9 +19,15 @@ public class Ranger { public static Item honeydew; public static Item comb; + public static boolean magic = false; + public static boolean extra = false; + public static EnumRarity trash = EnumHelper.addRarity("TRASH", EnumChatFormatting.DARK_GRAY, "Trash"); public static void stopForestFires() throws Compat.ItemNotFoundException { + magic = Loader.isModLoaded("MagicBees"); + extra = Loader.isModLoaded("ExtraBees"); + comb = Compat.getItem("Forestry", "beeCombs"); honey = Compat.getItem("Forestry", "honeyDrop"); honeydew = Compat.getItem("Forestry", "honeydew");