diff --git a/build.gradle b/build.gradle index d090e70..1fbadd1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,15 +17,21 @@ buildscript { apply plugin: 'forge' -version = "2.1.13" +version = "2.1.14" group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "magicbees" minecraft { - version = "1.7.2-10.12.0.1057" + version = "1.7.10-10.13.0.1188" assetDir = "eclipse/assets" } +dependencies { + + compile files("/libs/Thaumcraft-1.7.2-4.1.1.14.jar") + compile files("/libs/forestry_1.7.10-2.4.2.31-dev.jar") +} + processResources { // this will ensure that this task is redone when the versions change. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf..b761216 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 244a668..678d9d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 26 13:33:58 CDT 2014 +#Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/src/main/java/magicbees/bees/AlleleEffect.java b/src/main/java/magicbees/bees/AlleleEffect.java index bbd5d5f..a4abc5b 100644 --- a/src/main/java/magicbees/bees/AlleleEffect.java +++ b/src/main/java/magicbees/bees/AlleleEffect.java @@ -81,7 +81,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect min[2] = housing.getZCoord() - area[2] / 2; max[2] = housing.getZCoord() + area[2] / 2; - AxisAlignedBB bounds = AxisAlignedBB.getAABBPool().getAABB(min[0], min[1], min[2], max[0], max[1], max[2]); + AxisAlignedBB bounds = AxisAlignedBB.getBoundingBox(min[0], min[1], min[2], max[0], max[1], max[2]); return housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, bounds); } diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index c35546f..f78397e 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -4,7 +4,7 @@ package magicbees.bees; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; -import forestry.api.core.ItemInterface; +import magicbees.main.utils.ItemInterface; import forestry.api.genetics.IAllele; import magicbees.main.utils.compat.ExtraBeesHelper; import net.minecraft.item.ItemStack; @@ -1379,14 +1379,14 @@ public class BeeGenomeManager switch (beeType) { case PRINCESS: - taggedBee = ItemInterface.getItem("beePrincessGE"); + taggedBee = ItemInterface.getItemStack("beePrincessGE"); break; case QUEEN: - taggedBee = ItemInterface.getItem("beeQueenGE"); + taggedBee = ItemInterface.getItemStack("beeQueenGE"); break; case DRONE: default: - taggedBee = ItemInterface.getItem("beeDroneGE"); + taggedBee = ItemInterface.getItemStack("beeDroneGE"); break; } diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 773d56d..e2e1a02 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -1,5 +1,6 @@ package magicbees.bees; +import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.*; @@ -25,240 +26,940 @@ import java.util.*; public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { MYSTICAL("Mystical", "mysticum", - BeeClassification.VEILED, 0xAFFFB7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), + BeeClassification.VEILED, 0xAFFFB7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SORCEROUS("Sorcerous", "fascinatio", - BeeClassification.VEILED, 0xEA9A9A, EnumTemperature.HOT, EnumHumidity.ARID, false, false, true), + BeeClassification.VEILED, 0xEA9A9A, EnumTemperature.HOT, EnumHumidity.ARID, false, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, UNUSUAL("Unusual", "inusitatus", - BeeClassification.VEILED, 0x72D361, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), + BeeClassification.VEILED, 0x72D361, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ATTUNED("Attuned", "similis", - BeeClassification.VEILED, 0x0086A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), + BeeClassification.VEILED, 0x0086A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ELDRITCH("Eldritch", "prodigiosus", - BeeClassification.VEILED, 0x8D75A0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.VEILED, 0x8D75A0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ESOTERIC("Esoteric", "secretiore", - BeeClassification.ARCANE, 0x001099, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.ARCANE, 0x001099, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, MYSTERIOUS("Mysterious", "mysticus", - BeeClassification.ARCANE, 0x762bc2, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.ARCANE, 0x762bc2, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ARCANE("Arcane", "arcanus", - BeeClassification.ARCANE, 0xd242df, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.ARCANE, 0xd242df, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, CHARMED("Charmed", "larvatus", - BeeClassification.SUPERNATURAL, 0x48EEEC, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.SUPERNATURAL, 0x48EEEC, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ENCHANTED("Enchanted", "cantatus", - BeeClassification.SUPERNATURAL, 0x18e726, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.SUPERNATURAL, 0x18e726, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SUPERNATURAL("Supernatural", "coeleste", - BeeClassification.SUPERNATURAL, 0x005614, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.SUPERNATURAL, 0x005614, 0xFF9D60, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ETHEREAL("Ethereal", "diaphanum", - BeeClassification.MAGICAL, 0xBA3B3B, 0xEFF8FF, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.MAGICAL, 0xBA3B3B, 0xEFF8FF, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, WATERY("Watery", "aquatilis", - BeeClassification.MAGICAL, 0x313C5E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true), + BeeClassification.MAGICAL, 0x313C5E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, EARTHY("Earthen", "fictili", - BeeClassification.MAGICAL, 0x78822D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true), + BeeClassification.MAGICAL, 0x78822D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, FIREY("Firey", "ardens", - BeeClassification.MAGICAL, 0xD35119, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true), + BeeClassification.MAGICAL, 0xD35119, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, WINDY("Windy", "ventosum", - BeeClassification.MAGICAL, 0xFFFDBA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true), + BeeClassification.MAGICAL, 0xFFFDBA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, PUPIL("Pupil", "disciplina", - BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, false, true), + BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SCHOLARLY("Scholarly", "studiosis", - BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false), + BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SAVANT("Savant", "philologus", - BeeClassification.SCHOLARLY, 0xFFA042, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false), + BeeClassification.SCHOLARLY, 0xFFA042, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AWARE("Aware", "sensibilis", - BeeClassification.MAGICAL, 0x5E95B5, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.MAGICAL, 0x5E95B5, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SPIRIT("Spirit", "larva", - BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true), + BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SOUL("Soul", "anima", - BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false), + BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SKULKING("Skulking", "malevolens", - BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, GHASTLY("Ghastly", "pallens", - BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SPIDERY("Spidery", "araneolus", - BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SMOULDERING("Smouldering", "flagrantia", - BeeClassification.SKULKING, 0xFFC747, 0xEA8344, EnumTemperature.HELLISH, EnumHumidity.NORMAL, false, false), + BeeClassification.SKULKING, 0xFFC747, 0xEA8344, EnumTemperature.HELLISH, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TIMELY("Timely", "gallifreis", - BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, LORDLY("Lordly", "rassilonis", - BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, DOCTORAL("Doctoral", "medicus qui", - BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, INFERNAL("Infernal", "infernales", - BeeClassification.ABOMINABLE, 0xFF1C1C, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, true), + BeeClassification.ABOMINABLE, 0xFF1C1C, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, HATEFUL("Hateful", "odibilis", - BeeClassification.ABOMINABLE, 0xDB00DB, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), + BeeClassification.ABOMINABLE, 0xDB00DB, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SPITEFUL("Spiteful", "maligna", - BeeClassification.ABOMINABLE, 0x5FCC00, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), + BeeClassification.ABOMINABLE, 0x5FCC00, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, WITHERING("Withering", "vietus", - BeeClassification.ABOMINABLE, 0x5B5B5B, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), + BeeClassification.ABOMINABLE, 0x5B5B5B, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, OBLIVION("Oblivion", "oblivioni", - BeeClassification.EXTRINSIC, 0xD5C3E5, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + BeeClassification.EXTRINSIC, 0xD5C3E5, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, NAMELESS("Nameless", "sine nomine", - BeeClassification.EXTRINSIC, 0x8ca7cb, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, true), + BeeClassification.EXTRINSIC, 0x8ca7cb, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ABANDONED("Abandoned", "reliquit", - BeeClassification.EXTRINSIC, 0xc5cb8c, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, true), + BeeClassification.EXTRINSIC, 0xc5cb8c, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, FORLORN("Forlorn", "perditus", - BeeClassification.EXTRINSIC, 0xcba88c, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, true, false), + BeeClassification.EXTRINSIC, 0xcba88c, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, DRACONIC("Draconic", "draconic", - BeeClassification.EXTRINSIC, 0x9f56ad, 0x5a3b62, EnumTemperature.COLD, EnumHumidity.NORMAL, true, false), + BeeClassification.EXTRINSIC, 0x9f56ad, 0x5a3b62, EnumTemperature.COLD, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, IRON("Iron", "ferrus", - BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, GOLD("Gold", "aurum", - BeeClassification.METALLIC, 0x684B01, 0xFFFF0B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.METALLIC, 0x684B01, 0xFFFF0B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, COPPER("Copper", "aercus", - BeeClassification.METALLIC, 0x684B01, 0xFFC81A, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.METALLIC, 0x684B01, 0xFFC81A, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TIN("Tin", "stannum", - BeeClassification.METALLIC, 0x3E596D, 0xA6BACB, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.METALLIC, 0x3E596D, 0xA6BACB, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, SILVER("Silver", "argenteus", - BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, LEAD("Lead", "plumbeus", - BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ALUMINUM("Aluminum", "aluminium", - BeeClassification.METALLIC, 0xEDEDED, 0x767676, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.METALLIC, 0xEDEDED, 0x767676, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ARDITE("Ardite", "aurantiaco", - BeeClassification.METALLIC, 0x720000, 0xFF9E00, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + BeeClassification.METALLIC, 0x720000, 0xFF9E00, EnumTemperature.HOT, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, COBALT("Cobalt", "caeruleo", - BeeClassification.METALLIC, 0x03265F, 0x59AAEF, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + BeeClassification.METALLIC, 0x03265F, 0x59AAEF, EnumTemperature.HOT, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, MANYULLYN("Manyullyn", "manahmanah", - BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT, EnumHumidity.ARID, true, false), + BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT, EnumHumidity.ARID, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, DIAMOND("Diamond", "diamond", - BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, EMERALD("Emerald", "prasinus", - BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, APATITE("Apatite", "apatite", - BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, MUTABLE("Mutable", "mutable", - BeeClassification.TRANSMUTING, 0xDBB24C, 0xE0D5A6, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.TRANSMUTING, 0xDBB24C, 0xE0D5A6, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TRANSMUTING("Transmuting", "transmuting", - BeeClassification.TRANSMUTING, 0xDBB24C, 0xA2D2D8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.TRANSMUTING, 0xDBB24C, 0xA2D2D8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, CRUMBLING("Crumbling", "crumbling", - BeeClassification.TRANSMUTING, 0xDBB24C, 0xDBA4A4, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + BeeClassification.TRANSMUTING, 0xDBB24C, 0xDBA4A4, EnumTemperature.HOT, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, INVISIBLE("Invisible", "invisible", - BeeClassification.VEILED, 0xffccff, 0xffffff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.VEILED, 0xffccff, 0xffffff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, // --------- Thaumcraft Bees --------------------------------------------------------------------------------------- TC_AIR("TCAir", "aether", - BeeClassification.THAUMIC, 0xD9D636, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.THAUMIC, 0xD9D636, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_FIRE("TCFire", "praefervidus", - BeeClassification.THAUMIC, 0xE50B0B, 0x999999, EnumTemperature.HOT, EnumHumidity.ARID, true, true), + BeeClassification.THAUMIC, 0xE50B0B, 0x999999, EnumTemperature.HOT, EnumHumidity.ARID, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_WATER("TCWater", "umidus", - BeeClassification.THAUMIC, 0x36CFD9, 0x999999, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true), + BeeClassification.THAUMIC, 0x36CFD9, 0x999999, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_EARTH("TCEarth", "sordida", - BeeClassification.THAUMIC, 0x005100, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.THAUMIC, 0x005100, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_ORDER("TCOrder", "ordinatus", - BeeClassification.THAUMIC, 0xaa32fc, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.THAUMIC, 0xaa32fc, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_CHAOS("TCChaos", "tenebrarum", - BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_VIS("TCVis", "arcanus saecula", - BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_TAINT("TCFlux", "arcanus labe", - BeeClassification.THAUMIC, 0x91376A, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THAUMIC, 0x91376A, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_ATTRACT("TCAttractive", "tractus", - BeeClassification.THAUMIC, 0x96FFBC, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.THAUMIC, 0x96FFBC, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_REJUVENATING("TCRejuvenating", "arcanus vitae", - BeeClassification.THAUMIC, 0x91D0D9, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THAUMIC, 0x91D0D9, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_PURE("TCPure", "arcanus puritatem", - BeeClassification.THAUMIC, 0xb0092e, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THAUMIC, 0xb0092e, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_BRAINY("TCBrainy", "cerebrum", - BeeClassification.THAUMIC, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.THAUMIC, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_WISPY("TCWispy", "umbrabilis", - BeeClassification.THAUMIC, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THAUMIC, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_BATTY("TCBatty", "chiroptera", - BeeClassification.THAUMIC, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.THAUMIC, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_CHICKEN("TCChicken", "pullus", - BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_BEEF("TCBeef", "bubulae", - BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TC_PORK("TCPork", "porcina", - BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, // --------- Equivalent Exchange Bees ----------------------------------------------------------------------------- EE_MINIUM("EEMinium", "mutabilis", - BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, // --------- Ars Magica Bees -------------------------------------------------------------------------------------- AM_ESSENCE("AMEssence", "essentia", - BeeClassification.ESSENTIAL, 0x86BBC5, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.ESSENTIAL, 0x86BBC5, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_QUINTESSENCE("AMQuintessence", "cor essentia", - BeeClassification.ESSENTIAL, 0xE3A45B, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.ESSENTIAL, 0xE3A45B, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_EARTH("AMEarth", "magica terra", - BeeClassification.ESSENTIAL, 0xAA875E, 0xE3A55B, EnumTemperature.WARM, EnumHumidity.ARID, false, false), + BeeClassification.ESSENTIAL, 0xAA875E, 0xE3A55B, EnumTemperature.WARM, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_AIR("AMAir", "magica aer", - BeeClassification.ESSENTIAL, 0xD5EB9D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.ESSENTIAL, 0xD5EB9D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_FIRE("AMFire", "magica ignis", - BeeClassification.ESSENTIAL, 0x93451E, 0xE3A55B, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + BeeClassification.ESSENTIAL, 0x93451E, 0xE3A55B, EnumTemperature.HOT, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_WATER("AMWater", "magica aqua", - BeeClassification.ESSENTIAL, 0x3B7D8C, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false), + BeeClassification.ESSENTIAL, 0x3B7D8C, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_LIGHTNING("AMLightning", "magica fulgur", - BeeClassification.ESSENTIAL, 0xEBEFA1, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.ESSENTIAL, 0xEBEFA1, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_PLANT("AMPlant", "magica herba", - BeeClassification.ESSENTIAL, 0x49B549, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.ESSENTIAL, 0x49B549, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_ICE("AMIce", "magica glacium", - BeeClassification.ESSENTIAL, 0x86BAC6, 0xE3A55B, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + BeeClassification.ESSENTIAL, 0x86BAC6, 0xE3A55B, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, //AM_MAGMA("AMMagma", "magica torrens igneus", // BeeClassification.ESSENTIAL, 0x932B1E, 0xE3A55B, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), AM_ARCANE("AMArcane", "magica arcanum", - BeeClassification.ESSENTIAL, 0x76184D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.ESSENTIAL, 0x76184D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_VORTEX("AMVortex", "gurges", - BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, AM_WIGHT("AMWight", "vectem", - BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, //---------------------Thermal Expansion Bees--------------------------- TE_BLIZZY("TEBlizzy", "blizzard", - BeeClassification.ABOMINABLE, 0x0073C4, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + BeeClassification.ABOMINABLE, 0x0073C4, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_GELID("TEGelid", "cyro", - BeeClassification.ABOMINABLE, 0x4AAFF7, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true), + BeeClassification.ABOMINABLE, 0x4AAFF7, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_DANTE("TEDante", "inferno", - BeeClassification.ABOMINABLE, 0xF7AC4A, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), + BeeClassification.ABOMINABLE, 0xF7AC4A, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_PYRO("TEPyro", "pyromaniac", - BeeClassification.ABOMINABLE, 0xFA930C, EnumTemperature.HELLISH, EnumHumidity.ARID, true, true), + BeeClassification.ABOMINABLE, 0xFA930C, EnumTemperature.HELLISH, EnumHumidity.ARID, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_ELECTRUM("TEElectrum", "electrum", - BeeClassification.THERMAL, 0xEAF79E, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + BeeClassification.THERMAL, 0xEAF79E, EnumTemperature.HOT, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_PLATINUM("TEPlatinum", "platina", - BeeClassification.THERMAL, 0x9EE7F7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0x9EE7F7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_NICKEL("TENickel", "nickel", - BeeClassification.THERMAL, 0xB4C989, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0xB4C989, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_INVAR("TEInvar", "invar", - BeeClassification.THERMAL, 0xCDE3A1, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + BeeClassification.THERMAL, 0xCDE3A1, EnumTemperature.HOT, EnumHumidity.ARID, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_BRONZE("TEBronze", "pyropus", - BeeClassification.THERMAL, 0xB56D07, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0xB56D07, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_COAL("TECoal", "carbonis", - BeeClassification.THERMAL, 0x2E2D2D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0x2E2D2D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_DESTABILIZED("TEDestabilized", "electric", - BeeClassification.THERMAL, 0x5E0203, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0x5E0203, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_LUX("TELux", "lux", - BeeClassification.THERMAL, 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_WINSOME("TEWinsome", "cuniculus", - BeeClassification.ADORABLE, 0x096B67, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + BeeClassification.ADORABLE, 0x096B67, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, TE_ENDEARING("TEEndearing", "cognito", - BeeClassification.ADORABLE, 0x069E97, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true), + BeeClassification.ADORABLE, 0x069E97, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, //--------------------Redstone Arsenal Bees----------------------------- RSA_FLUXED("RSAFluxed", "Thermametallic electroflux", - BeeClassification.THERMAL, 0x9E060D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BeeClassification.THERMAL, 0x9E060D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false) + { + @Override + public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i) + { + return new ItemStack[0]; + } + }, ; @@ -1256,8 +1957,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider return value; } + @Override - public ItemStack[] getResearchBounty(World world, String researcher, IIndividual individual, int bountyLevel) + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { System.out.println("Bounty level: " + bountyLevel); ArrayList bounty = new ArrayList(); @@ -1292,6 +1994,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider return bounty.toArray(new ItemStack[bounty.size()]); } + @Override public String getEntityTexture() { diff --git a/src/main/java/magicbees/bees/TransmutationEffectRailcraft.java b/src/main/java/magicbees/bees/TransmutationEffectRailcraft.java index 5e1158f..c21a082 100644 --- a/src/main/java/magicbees/bees/TransmutationEffectRailcraft.java +++ b/src/main/java/magicbees/bees/TransmutationEffectRailcraft.java @@ -31,7 +31,7 @@ public class TransmutationEffectRailcraft implements ITransmutationEffectLogic { boolean flag = false; if (BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.FOREST) && - !BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.FROZEN)) + !BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.SNOWY)) { ItemStack item = GameRegistry.findItemStack("Railcraft", "cube.stone.quarried", 1); if (item != null) diff --git a/src/main/java/magicbees/bees/TransmutationEffectVanilla.java b/src/main/java/magicbees/bees/TransmutationEffectVanilla.java index f0fab03..e5c330a 100644 --- a/src/main/java/magicbees/bees/TransmutationEffectVanilla.java +++ b/src/main/java/magicbees/bees/TransmutationEffectVanilla.java @@ -21,7 +21,7 @@ public class TransmutationEffectVanilla implements ITransmutationEffectLogic private boolean trySpawnSandstone(World world, BiomeGenBase biome, ItemStack sourceBlock, int x, int y, int z) { boolean flag = false; - if (BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.DESERT) && + if (BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.SANDY) && OreDictionary.itemMatches(new ItemStack(Blocks.sand), sourceBlock, false)) { world.setBlock(x, y, z, Blocks.sandstone); diff --git a/src/main/java/magicbees/block/types/HiveType.java b/src/main/java/magicbees/block/types/HiveType.java index 1783759..be96260 100644 --- a/src/main/java/magicbees/block/types/HiveType.java +++ b/src/main/java/magicbees/block/types/HiveType.java @@ -74,7 +74,7 @@ public enum HiveType UNUSUAL.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.UNUSUAL.getGenome()), combs, 15)); UNUSUAL.drops.add(valiantDrop); - RESONANT.validBiomes.add(Type.DESERT); + RESONANT.validBiomes.add(Type.SANDY); RESONANT.validBiomes.add(Type.MAGICAL); RESONANT.drops.add(new HiveDrop(BeeSpecies.SORCEROUS.getGenome(), combs, 80).setIgnoblePercentage(0.7f)); RESONANT.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.SORCEROUS.getGenome()), combs, 20)); diff --git a/src/main/java/magicbees/item/ItemMagicHive.java b/src/main/java/magicbees/item/ItemMagicHive.java new file mode 100644 index 0000000..e1b657b --- /dev/null +++ b/src/main/java/magicbees/item/ItemMagicHive.java @@ -0,0 +1,27 @@ +package magicbees.item; + +import forestry.core.items.ItemForestryBlock; +import magicbees.block.types.HiveType; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +/** + * Created by Allen on 7/29/2014. + */ +public class ItemMagicHive extends ItemForestryBlock { + public ItemMagicHive(Block block) { + super(block); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + return getBlock().getUnlocalizedName() + "." + HiveType.getHiveFromMeta(itemstack.getItemDamage()).name().toLowerCase(); + } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) + { + return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(p_77653_1_) + ".name")).trim(); + } +} \ No newline at end of file diff --git a/src/main/java/magicbees/item/ItemThaumiumGrafter.java b/src/main/java/magicbees/item/ItemThaumiumGrafter.java index 426e405..8601e63 100644 --- a/src/main/java/magicbees/item/ItemThaumiumGrafter.java +++ b/src/main/java/magicbees/item/ItemThaumiumGrafter.java @@ -1,5 +1,6 @@ package magicbees.item; +import cpw.mods.fml.common.Optional; import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.compat.ThaumcraftHelper; @@ -18,6 +19,10 @@ import forestry.api.arboriculture.IToolGrafter; import java.util.HashSet; import java.util.Set; +@Optional.InterfaceList( + {@Optional.Interface(iface = "IRepairableExtended", modid = "Thaumcraft", striprefs = true), + @Optional.Interface(iface = "IToolGrafter", modid = "forestry", striprefs = true)} +) public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IToolGrafter { public ItemThaumiumGrafter() @@ -92,6 +97,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT /** * Return the enchantability factor of the item, most of the time is based on material. */ + @Optional.Method(modid = "Thaumcraft") public int getItemEnchantability() { return ThaumcraftApi.toolMatThaumium.getEnchantability(); @@ -100,6 +106,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT /** * Return the name for this tool's material. */ + @Optional.Method(modid = "Thaumcraft") public String getToolMaterialName() { return ThaumcraftApi.toolMatThaumium.toString(); @@ -108,6 +115,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT /** * Return whether this item is repairable in an anvil. */ + @Optional.Method(modid = "Thaumcraft") public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super.getIsRepairable @@ -115,6 +123,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT } @Override + @Optional.Method(modid = "Thaumcraft") public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantLevel) { boolean flag = false; diff --git a/src/main/java/magicbees/item/ItemThaumiumScoop.java b/src/main/java/magicbees/item/ItemThaumiumScoop.java index 9a1ef62..2d1fe14 100644 --- a/src/main/java/magicbees/item/ItemThaumiumScoop.java +++ b/src/main/java/magicbees/item/ItemThaumiumScoop.java @@ -1,5 +1,6 @@ package magicbees.item; +import cpw.mods.fml.common.Optional; import magicbees.main.CommonProxy; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; @@ -14,6 +15,10 @@ import forestry.api.core.IToolScoop; import java.util.HashSet; import java.util.Set; +@Optional.InterfaceList( + {@Optional.Interface(iface = "IRepairable", modid = "Thaumcraft", striprefs = true), + @Optional.Interface(iface = "IToolScoop", modid = "forestry", striprefs = true)} +) public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop { public ItemThaumiumScoop() diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index f084544..af4b4e6 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -227,11 +227,11 @@ public class Config GameRegistry.registerTileEntity(TileEntityEffectJar.class, TileEntityEffectJar.tileEntityName); hive = new BlockHive(); - GameRegistry.registerBlock(hive, "hive"); + GameRegistry.registerBlock(hive, ItemMagicHive.class, "hive"); for (HiveType t : HiveType.values()) { - hive.setHarvestLevel("scoop", t.ordinal(), 0); + hive.setHarvestLevel("scoop", 0, t.ordinal() ); } FMLLog.info("Replacing stupid-block with 'Here, have some delicious textures' ItemBlock. This is 100%% normal."); @@ -301,7 +301,7 @@ public class Config jellyBaby = new ItemFood(1, false).setAlwaysEdible() .setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f); jellyBaby.setUnlocalizedName(CommonProxy.DOMAIN + ":jellyBabies").setTextureName(CommonProxy.DOMAIN + ":jellyBabies"); - GameRegistry.registerItem(jellyBaby, CommonProxy.DOMAIN + ":jellyBabies"); + GameRegistry.registerItem(jellyBaby, "jellyBabies"); voidCapsule = new ItemCapsule(CapsuleType.VOID, this.CapsuleStackSizeMax); @@ -330,6 +330,7 @@ public class Config magnet.setBaseRange(MagnetBaseRange); magnet.setLevelMultiplier(MagnetLevelMultiplier); magnet.setMaximumLevel(MagnetMaxLevel); + GameRegistry.registerItem(magnet, "magnet", CommonProxy.DOMAIN); for (int level = 0; level <= 8; level++) { diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index f2baa09..47142b9 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -11,10 +11,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import magicbees.bees.BeeManager; import magicbees.bees.TransmutationEffectController; import magicbees.client.gui.GUIHandler; -import magicbees.main.utils.CraftingManager; -import magicbees.main.utils.IMCManager; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.*; import magicbees.main.utils.compat.*; import magicbees.world.WorldGeneratorHandler; @@ -54,9 +51,10 @@ public class MagicBees this.modConfig.setupBlocks(); this.modConfig.setupItems(); - LocalizationManager.setupLocalizationInfo(); + // LocalizationManager.setupLocalizationInfo(); new TransmutationEffectController(); + LogHelper.info("Preinit completed"); } @Mod.EventHandler @@ -72,6 +70,8 @@ public class MagicBees worldHandler = new WorldGeneratorHandler(); GameRegistry.registerWorldGenerator(worldHandler, 0); + + LogHelper.info("Init completed"); } @Mod.EventHandler @@ -98,6 +98,7 @@ public class MagicBees CraftingManager.registerLiquidContainers(); VersionInfo.doVersionCheck(); + LogHelper.info("Postinit completed"); } @Mod.EventHandler diff --git a/src/main/java/magicbees/main/utils/BlockInterface.java b/src/main/java/magicbees/main/utils/BlockInterface.java new file mode 100644 index 0000000..7857840 --- /dev/null +++ b/src/main/java/magicbees/main/utils/BlockInterface.java @@ -0,0 +1,17 @@ +package magicbees.main.utils; + +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +public class BlockInterface { + public static Block getBlock(String item) + { + return GameRegistry.findBlock("Forestry", item); + } + + public static Block getBlock(String modId, String item) + { + return GameRegistry.findBlock(modId, item); + } +} diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index bce6302..42fe673 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -1,8 +1,8 @@ package magicbees.main.utils; import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.core.BlockInterface; -import forestry.api.core.ItemInterface; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; import forestry.api.recipes.RecipeManagers; import magicbees.item.ItemCapsule; import magicbees.item.types.*; @@ -50,8 +50,7 @@ public class CraftingManager // Concentrated Fertilizer -> Forestry fertilizer input = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); - output = ItemInterface.getItem("fertilizerCompound"); - output.stackSize = 6; + output = ItemInterface.getItemStack("Forestry", "fertilizerCompound", 6); GameRegistry.addRecipe(output, new Object[] { " S ", " F ", " S ", 'F', input, @@ -63,12 +62,11 @@ public class CraftingManager 'S', Blocks.sand }); - output = output.copy(); - output.stackSize = 12; + output = output.copy(); GameRegistry.addRecipe(output, new Object[] { "aaa", "aFa", "aaa", 'F', input, - 'a', ItemInterface.getItem("ash") + 'a', ItemInterface.getItemStack("ash") }); // "bottling" Intellect drops @@ -92,7 +90,7 @@ public class CraftingManager }); output = new ItemStack(Config.hiveFrameMagic); - input = ItemInterface.getItem("frameUntreated"); + input = ItemInterface.getItemStack("frameUntreated"); GameRegistry.addRecipe(output, new Object[] { "www", "wfw", "www", 'w', Config.wax.getStackForType(WaxType.MAGIC), @@ -239,7 +237,7 @@ public class CraftingManager GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] { Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), - ItemInterface.getItem("frameProven") + ItemInterface.getItemStack("frameProven") }); // @@ -303,7 +301,7 @@ public class CraftingManager 'x', "shardEmerald" })); - GameRegistry.addRecipe(new ShapedOreRecipe(ItemInterface.getItem("apatite"), new Object[] { + GameRegistry.addRecipe(new ShapedOreRecipe(ItemInterface.getItemStack("apatite"), new Object[] { "xxx", "xxx", "xxx", 'x', Config.nuggets.getStackForType(NuggetType.APATITE) })); @@ -410,7 +408,7 @@ public class CraftingManager if (ArsMagicaHelper.isActive()) { - input = ItemInterface.getItem("apatite"); + input = ItemInterface.getItemStack("apatite"); output = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER, 4); GameRegistry.addShapelessRecipe(output, new Object[] { new ItemStack(Config.amEssence, 1, ArsMagicaHelper.EssenceType.EARTH.ordinal()), @@ -425,22 +423,22 @@ public class CraftingManager private static void setupCentrifugeRecipes() { - ItemStack beeswax = ItemInterface.getItem("beeswax"); - ItemStack propolis = ItemInterface.getItem("propolis"); + ItemStack beeswax = ItemInterface.getItemStack("beeswax"); + ItemStack propolis = ItemInterface.getItemStack("propolis"); propolis.setItemDamage(ForestryHelper.Propolis.PULSATING.ordinal()); // 20 is the 'average' time to centrifuge a comb. RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.MUNDANE), - new ItemStack[] {beeswax, ItemInterface.getItem("honeyDrop"), + new ItemStack[] {beeswax, ItemInterface.getItemStack("honeyDrop"), Config.wax.getStackForType(WaxType.MAGIC)}, new int[] {90, 60, 10}); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.MOLTEN), - new ItemStack[] {ItemInterface.getItem("refractoryWax"), - ItemInterface.getItem("honeyDrop")}, + new ItemStack[] {ItemInterface.getItemStack("refractoryWax"), + ItemInterface.getItemStack("honeyDrop")}, new int[] {86, 8}); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FORGOTTEN), new ItemStack[] {Config.wax.getStackForType(WaxType.AMNESIC), propolis, - ItemInterface.getItem("honeyDrop")}, + ItemInterface.getItemStack("honeyDrop")}, new int[] {50, 50, 22}); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.OCCULT), new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), GameRegistry.findItemStack("forestry", @@ -448,10 +446,10 @@ public class CraftingManager new int[] { 100, 60 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.OTHERWORLDLY), new ItemStack[] {beeswax, Config.wax.getStackForType(WaxType.MAGIC), - ItemInterface.getItem("honeyDrop") }, + ItemInterface.getItemStack("honeyDrop") }, new int[] { 50, 20, 100 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.PAPERY), - new ItemStack[] {ItemInterface.getItem("beeswax"), + new ItemStack[] {ItemInterface.getItemStack("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Items.paper) }, new int[] { 80, 20, 5 }); @@ -461,8 +459,8 @@ public class CraftingManager new int[] { 90, 40, 10 }); propolis.setItemDamage(ForestryHelper.Propolis.NORMAL.ordinal()); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FURTIVE), - new ItemStack[] {ItemInterface.getItem("beeswax"), propolis, - ItemInterface.getItem("honeydew") }, + new ItemStack[] {ItemInterface.getItemStack("beeswax"), propolis, + ItemInterface.getItemStack("honeydew") }, new int[] { 90, 20, 35 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SOUL), new ItemStack[] {Config.wax.getStackForType(WaxType.SOUL), GameRegistry.findItemStack("forestry", @@ -472,7 +470,7 @@ public class CraftingManager new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.pollen.getStackForType(PollenType.PHASED), new ItemStack(Config.fHoneydew, 1)}, new int[] {100, 5, 60}); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TRANSMUTED), - new ItemStack[] {ItemInterface.getItem("beeswax"), + new ItemStack[] {ItemInterface.getItemStack("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.UNSTABLE)}, new int[] {80, 80, 15}); @@ -540,9 +538,9 @@ public class CraftingManager new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Config.amItemResource), new ItemStack(Config.amItemResource) }, new int[] { 85, 10, 2 } ); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_POTENT), - new ItemStack[] {ItemInterface.getItem("beeswax"), - ItemInterface.getItem("refractoryWax"), - ItemInterface.getItem("honeydew")}, + new ItemStack[] {ItemInterface.getItemStack("beeswax"), + ItemInterface.getItemStack("refractoryWax"), + ItemInterface.getItemStack("honeydew")}, new int[] { 50, 50, 65 } ); } if (ThermalExpansionHelper.isActive()) @@ -570,17 +568,15 @@ public class CraftingManager ItemStack input; ItemStack output; - output = BlockInterface.getBlock("candle"); - output.stackSize = 24; + output = ItemInterface.getItemStack("Forestry", "candle", 24); RecipeManagers.carpenterManager.addRecipe(30, new FluidStack(FluidRegistry.WATER, 600), null, output, new Object[] { " S ", "WWW", "WWW", 'W', Config.wax, 'S', Items.string }); - output = BlockInterface.getBlock("candle"); - output.stackSize = 6; - input = ItemInterface.getItem("craftingMaterial"); + output = ItemInterface.getItemStack("Forestry", "candle", 6); + input = ItemInterface.getItemStack("craftingMaterial"); input.setItemDamage(ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()); // Set to Silk Wisp RecipeManagers.carpenterManager.addRecipe(30, new FluidStack(FluidRegistry.WATER, 600), null, output, new Object[] { "WSW", @@ -591,22 +587,22 @@ public class CraftingManager output = Config.miscResources.getStackForType(ResourceType.AROMATIC_LUMP, 2); RecipeManagers.carpenterManager.addRecipe(30, FluidRegistry.getFluidStack("honey", 1000), null, output, new Object[] { " P ", "JDJ", " P ", - 'P', ItemInterface.getItem("pollen"), - 'J', ItemInterface.getItem("royalJelly"), + 'P', ItemInterface.getItemStack("pollen"), + 'J', ItemInterface.getItemStack("royalJelly"), 'D', Config.drops.getStackForType(DropType.ENCHANTED) }); RecipeManagers.carpenterManager.addRecipe(30, FluidRegistry.getFluidStack("honey", 1000), null, output, new Object[] { " J ", "PDP", " J ", - 'P', ItemInterface.getItem("pollen"), - 'J', ItemInterface.getItem("royalJelly"), + 'P', ItemInterface.getItemStack("pollen"), + 'J', ItemInterface.getItemStack("royalJelly"), 'D', Config.drops.getStackForType(DropType.ENCHANTED) }); if (ThaumcraftHelper.isActive()) { // Carpenter recipes - input = ItemInterface.getItem("craftingMaterial"); + input = ItemInterface.getItemStack("craftingMaterial"); input.setItemDamage(3); // Set to Silk Mesh output = new ItemStack(Config.thaumaturgeBackpackT2); RecipeManagers.carpenterManager.addRecipe(200, new FluidStack(FluidRegistry.WATER, 1000), null, output, new Object[] { diff --git a/src/main/java/magicbees/main/utils/ItemInterface.java b/src/main/java/magicbees/main/utils/ItemInterface.java new file mode 100644 index 0000000..da04582 --- /dev/null +++ b/src/main/java/magicbees/main/utils/ItemInterface.java @@ -0,0 +1,39 @@ +package magicbees.main.utils; + +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemInterface { + public static ItemStack getItemStack(String item) + { + return GameRegistry.findItemStack("Forestry", item, 1); + } + + public static ItemStack getItemStack(String modId, String item, int stackSize) + { + return GameRegistry.findItemStack(modId, item, stackSize); + } + + public static Item getItem(String item) + { + Item i; + i = GameRegistry.findItem("Forestry", item); + if (i == null) + { + LogHelper.warn("Trying to get Item " + item + " from Forestry which does not exist!"); + } + return i; + } + + public static Item getItem(String modId, String item) + { + Item i; + i = GameRegistry.findItem(modId, item); + if (i == null) + { + LogHelper.warn("Trying to get Item " + item + " from " + modId + " which does not exist!"); + } + return i; + } +} diff --git a/src/main/java/magicbees/main/utils/LogHelper.java b/src/main/java/magicbees/main/utils/LogHelper.java new file mode 100644 index 0000000..53b3e8e --- /dev/null +++ b/src/main/java/magicbees/main/utils/LogHelper.java @@ -0,0 +1,27 @@ +package magicbees.main.utils; + +import cpw.mods.fml.common.FMLLog; +import org.apache.logging.log4j.Level; + +public class LogHelper +{ + public static void log(Level logLevel, Object object){ + FMLLog.log(VersionInfo.ModName, logLevel, "[MagicBees]: " + String.valueOf(object)); + } + + public static void all(Object object){ log(Level.ALL, object); } + + public static void debug(Object object){ log(Level.DEBUG, object); } + + public static void error(Object object){ log(Level.ERROR, object); } + + public static void fatal(Object object){ log(Level.FATAL, object); } + + public static void info(Object object){ log(Level.INFO, object); } + + public static void off(Object object){ log(Level.OFF, object); } + + public static void trace(Object object){ log(Level.TRACE, object); } + + public static void warn(Object object){ log(Level.WARN, object); } +} diff --git a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java index ab67f75..2e77cfa 100644 --- a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java @@ -2,6 +2,8 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.Loader; import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -69,12 +71,12 @@ public class ArsMagicaHelper try { Class clazz = Class.forName("am2.blocks.BlocksCommonProxy"); - Config.amResourceBlock = (Block)(clazz.getField("AMOres").get(null)); - Config.amBlackOrchid = (Block)(clazz.getField("blueOrchid").get(null)); - Config.amDesertNova = (Block)(clazz.getField("desertNova").get(null)); - Config.amAum = (Block)(clazz.getField("aum").get(null)); - Config.amWakebloom = (Block)(clazz.getField("wakebloom").get(null)); - Config.amTarmaRoot = (Block)(clazz.getField("tarmaRoot").get(null)); + Config.amResourceBlock = BlockInterface.getBlock(Name, "AMOres"); + Config.amBlackOrchid = BlockInterface.getBlock(Name, "blueOrchid"); + Config.amDesertNova = BlockInterface.getBlock(Name, "desertNova"); + Config.amAum = BlockInterface.getBlock(Name, "aum"); + Config.amWakebloom = BlockInterface.getBlock(Name, "wakebloom"); + Config.amTarmaRoot = BlockInterface.getBlock(Name, "tarmaRoot"); } catch (Exception e) { @@ -87,8 +89,8 @@ public class ArsMagicaHelper try { Class clazz = Class.forName("am2.items.ItemsCommonProxy"); - Config.amItemResource = (Item)(clazz.getField("itemOre").get(null)); - Config.amEssence = (Item)(clazz.getField("essence").get(null)); + Config.amItemResource = ItemInterface.getItem(Name, "itemOre"); + Config.amEssence = ItemInterface.getItem(Name, "essence"); } catch (Exception e) { diff --git a/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java b/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java index e800fb5..a448b88 100644 --- a/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java @@ -3,6 +3,7 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import magicbees.main.Config; +import magicbees.main.utils.ItemInterface; import net.minecraft.item.Item; public class EquivalentExchangeHelper @@ -40,7 +41,7 @@ public class EquivalentExchangeHelper try { Class itemClass = Class.forName("com.pahimar.ee3.item.ModItems"); - Config.eeMinuimShard = (Item)(itemClass.getField("miniumShard").get(null)); + Config.eeMinuimShard = ItemInterface.getItem("EE3", "miniumShard"); } catch (Exception e) { diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index 89787b8..4147c8b 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -3,7 +3,8 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.core.ItemInterface; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; import forestry.api.genetics.IAllele; import magicbees.bees.BeeManager; import magicbees.main.Config; @@ -111,8 +112,8 @@ public class ForestryHelper try { Class c = Class.forName("forestry.core.config.ForestryBlock"); - Config.fAlvearyBlock = (Block)(c.getField("alveary").get(null)); - Config.fHiveBlock = (Block)(c.getField("beehives").get(null)); + Config.fAlvearyBlock = BlockInterface.getBlock("alveary"); + Config.fHiveBlock = BlockInterface.getBlock("beehives"); } catch (Exception e) { @@ -122,11 +123,11 @@ public class ForestryHelper private static void getItems() { - Config.fBeeComb = ItemInterface.getItem("beeComb").getItem(); - Config.fPollen = ItemInterface.getItem("pollen").getItem(); - Config.fCraftingResource = ItemInterface.getItem("craftingMaterial").getItem(); - Config.fHoneyDrop = ItemInterface.getItem("honeyDrop").getItem(); - Config.fHoneydew = ItemInterface.getItem("honeydew").getItem(); + Config.fBeeComb = ItemInterface.getItem("beeComb"); + Config.fPollen = ItemInterface.getItem("pollen"); + Config.fCraftingResource = ItemInterface.getItem("craftingMaterial"); + Config.fHoneyDrop = ItemInterface.getItem("honeyDrop"); + Config.fHoneydew = ItemInterface.getItem("honeydew"); } public static IAllele[] getTemplateForestryForSpecies(String speciesName) diff --git a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java index 4080218..8b77c29 100644 --- a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java +++ b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java @@ -2,6 +2,7 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.registry.GameRegistry; import magicbees.main.Config; +import magicbees.main.utils.ItemInterface; import net.minecraft.item.ItemStack; public class RedstoneArsenalHelper @@ -64,12 +65,12 @@ public class RedstoneArsenalHelper private static void getBlocks() { - Config.rsaFluxBlock = GameRegistry.findItemStack("RedstoneArsenal", "blockElectrumFlux", 1); + Config.rsaFluxBlock = ItemInterface.getItemStack("RedstoneArsenal", "blockElectrumFlux", 1); } private static void getItems() { - Config.rsaFluxNugget = GameRegistry.findItemStack("RedstoneArsenal", "nuggetElectrumFlux", 1); + Config.rsaFluxNugget = ItemInterface.getItemStack("RedstoneArsenal", "nuggetElectrumFlux", 1); } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 8c09ed4..9d4ae36 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -1,8 +1,8 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.core.BlockInterface; -import forestry.api.core.ItemInterface; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.BlockInterface; import magicbees.item.types.PollenType; import magicbees.item.types.PropolisType; import magicbees.item.types.ResourceType; @@ -171,29 +171,29 @@ public class ThaumcraftHelper private static void getBlocks() { - Config.tcPlant = GameRegistry.findBlock(Name, "blockCustomPlant"); - Config.tcCandle = GameRegistry.findBlock(Name, "blockCandle"); - Config.tcCrystal = GameRegistry.findBlock(Name, "blockCrystal"); - Config.tcMarker = GameRegistry.findBlock(Name, "blockMarker"); - Config.tcJar = GameRegistry.findBlock(Name, "blockJar"); - Config.tcLog = GameRegistry.findBlock(Name, "blockMagicalLog"); - Config.tcLeaf = GameRegistry.findBlock(Name, "blockMagicalLeaves"); - Config.tcWarded = GameRegistry.findBlock(Name, "blockWarded"); + Config.tcPlant = BlockInterface.getBlock(Name, "blockCustomPlant"); + Config.tcCandle = BlockInterface.getBlock(Name, "blockCandle"); + Config.tcCrystal = BlockInterface.getBlock(Name, "blockCrystal"); + Config.tcMarker = BlockInterface.getBlock(Name, "blockMarker"); + Config.tcJar = BlockInterface.getBlock(Name, "blockJar"); + Config.tcLog = BlockInterface.getBlock(Name, "blockMagicalLog"); + Config.tcLeaf = BlockInterface.getBlock(Name, "blockMagicalLeaves"); + Config.tcWarded = BlockInterface.getBlock(Name, "blockWarded"); } private static void getItems() { - Config.tcFilledJar = GameRegistry.findItem(Name, "BlockJarFilledItem"); - Config.tcMiscResource = GameRegistry.findItem(Name, "ItemResource"); - //Config.tcEssentiaBottle = GameRegistry.findItem(Name, "BlockJarFilledItem"); - Config.tcShard = GameRegistry.findItem(Name, "ItemShard"); - Config.tcGolem = GameRegistry.findItem(Name, "ItemGolemPlacer"); + Config.tcFilledJar = ItemInterface.getItem(Name, "BlockJarFilledItem"); + Config.tcMiscResource = ItemInterface.getItem(Name, "ItemResource"); + //Config.tcEssentiaBottle = ItemInterface.getItem(Name, "BlockJarFilledItem"); + Config.tcShard = ItemInterface.getItem(Name, "ItemShard"); + Config.tcGolem = ItemInterface.getItem(Name, "ItemGolemPlacer"); //Config.tcWispEssence = ItemApi.getItem("itemWispEssence", 0).getItem(); - Config.tcNuggets = GameRegistry.findItem(Name, "ItemNugget"); - Config.tcShard = GameRegistry.findItem(Name, "ItemShard"); - Config.tcNuggetChicken = GameRegistry.findItem(Name, "ItemNuggetChicken"); - Config.tcNuggetBeef = GameRegistry.findItem(Name, "ItemNuggetBeef"); - Config.tcNuggetPork = GameRegistry.findItem(Name, "ItemNuggetPork"); + Config.tcNuggets = ItemInterface.getItem(Name, "ItemNugget"); + Config.tcShard = ItemInterface.getItem(Name, "ItemShard"); + Config.tcNuggetChicken = ItemInterface.getItem(Name, "ItemNuggetChicken"); + Config.tcNuggetBeef = ItemInterface.getItem(Name, "ItemNuggetBeef"); + Config.tcNuggetPork = ItemInterface.getItem(Name, "ItemNuggetPork"); } private static void addItemsToBackpack() @@ -463,7 +463,7 @@ public class ThaumcraftHelper list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)); - list.add(ItemInterface.getItem("frameProven")); + list.add(ItemInterface.getItemStack("frameProven")); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameOblivion), list); ResearchItem essenceOblivionR = new ResearchItem("MB_EssenceOblivion", category, new AspectList().add(Aspect.VOID, 2).add(Aspect.HUNGER, 1).add((Aspect)aspectTime, 1), @@ -499,7 +499,7 @@ public class ThaumcraftHelper list = new AspectList(new ItemStack(Blocks.log)); for (int i = 1; i <= 8; i++) { - item = forestry.api.core.BlockInterface.getBlock("log" + i); + item = ItemInterface.getItemStack("log" + i); if (item != null) { ThaumcraftApi.registerObjectTag(item, list); @@ -509,7 +509,7 @@ public class ThaumcraftHelper list = new AspectList(new ItemStack(Blocks.planks)); for (int i = 1; i <= 2; i++) { - item = BlockInterface.getBlock("planks" + i); + item = ItemInterface.getItemStack("planks" + i); if (item != null) { ThaumcraftApi.registerObjectTag(item, list); @@ -522,63 +522,63 @@ public class ThaumcraftHelper ThaumcraftApi.registerObjectTag(new ItemStack(Config.hive), list); list = new AspectList().add(Aspect.LIGHT, 1); - item = BlockInterface.getBlock("candle"); + item = ItemInterface.getItemStack("candle"); ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList().add(Aspect.DARKNESS, 1); - item = BlockInterface.getBlock("stump"); + item = ItemInterface.getItemStack("stump"); ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList(new ItemStack(Blocks.glass)).add(Aspect.SENSES, 1); - item = BlockInterface.getBlock("glass"); + item = ItemInterface.getItemStack("glass"); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList().add(Aspect.EARTH, 2).add(Aspect.WATER, 2); - item = BlockInterface.getBlock("soil"); + item = ItemInterface.getItemStack("soil"); ThaumcraftApi.registerObjectTag(item, new int[]{1}, list); list = new AspectList(new ItemStack(Blocks.leaves)); - item = BlockInterface.getBlock("leaves"); + item = ItemInterface.getItemStack("leaves"); ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList(new ItemStack(Blocks.sapling)); - item = forestry.api.core.BlockInterface.getBlock("saplingGE"); + item = ItemInterface.getItemStack("saplingGE"); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList()/*.add(Aspect.SEED, 1)*/.add(Aspect.PLANT, 1); - item = forestry.api.core.ItemInterface.getItem("pollenFertile"); + item = ItemInterface.getItemStack("pollenFertile"); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList().add(Aspect.CRYSTAL, 1).add(Aspect.EARTH, 2); - item = forestry.api.core.BlockInterface.getBlock("resources"); + item = ItemInterface.getItemStack("resources"); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()), list.copy()/*.add(Aspect.STONE, 2)*/); - item = forestry.api.core.ItemInterface.getItem("apatite"); + item = ItemInterface.getItemStack("apatite"); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()), list.copy().add(Aspect.CRYSTAL, 2)); list = new AspectList().add(Aspect.MOTION, 2).add(Aspect.FLIGHT, 1); - item = forestry.api.core.ItemInterface.getItem("beeDroneGE"); + item = ItemInterface.getItemStack("beeDroneGE"); ThaumcraftApi.registerObjectTag(item, list); list = list.copy().add(Aspect.GREED, 2).add(Aspect.EXCHANGE, 1); - item = forestry.api.core.ItemInterface.getItem("beePrincessGE"); + item = ItemInterface.getItemStack("beePrincessGE"); ThaumcraftApi.registerObjectTag(item, list); - item = forestry.api.core.ItemInterface.getItem("beeQueenGE"); + item = ItemInterface.getItemStack("beeQueenGE"); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList().add(Aspect.LIFE, 2).add(Aspect.EXCHANGE, 5); - item = forestry.api.core.ItemInterface.getItem("beeLarvaeGE"); + item = ItemInterface.getItemStack("beeLarvaeGE"); ThaumcraftApi.registerObjectTag(item, list); - item = forestry.api.core.ItemInterface.getItem("scoop"); + item = ItemInterface.getItemStack("scoop"); list = new AspectList(new ItemStack(item.getItem(), 1, 0)).add(Aspect.TOOL, 2); ThaumcraftApi.registerComplexObjectTag(item, list); - item = forestry.api.core.ItemInterface.getItem("grafter"); + item = ItemInterface.getItemStack("grafter"); list = new AspectList(new ItemStack(item.getItem(), 1, item.getItemDamage())).add(Aspect.TOOL, 2); ThaumcraftApi.registerComplexObjectTag(item, list); - item = forestry.api.core.ItemInterface.getItem("grafterProven"); + item = ItemInterface.getItemStack("grafterProven"); list = list.copy().add(Aspect.TOOL, 2).add(Aspect.EXCHANGE, 3); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()), list); @@ -586,7 +586,7 @@ public class ThaumcraftHelper ThaumcraftApi.registerObjectTag("beeComb", list); list = new AspectList().add(Aspect.SLIME, 1); - item = forestry.api.core.ItemInterface.getItem("propolis"); + item = ItemInterface.getItemStack("propolis"); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.NORMAL.ordinal()), list); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.SILKY.ordinal()), @@ -609,7 +609,7 @@ public class ThaumcraftHelper list.copy().add(Aspect.ENTROPY, 2)); list = new AspectList().add(Aspect.PLANT, 2); - item = forestry.api.core.ItemInterface.getItem("pollen"); + item = ItemInterface.getItemStack("pollen"); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.NORMAL.ordinal()), list); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), list.copy()/*.add(Aspect.ICE, 2)*/); @@ -619,7 +619,7 @@ public class ThaumcraftHelper list.copy().add((Aspect)aspectTime, 2)); list = new AspectList().add(Aspect.ORDER, 1); - item = forestry.api.core.ItemInterface.getItem("beeswax"); + item = ItemInterface.getItemStack("beeswax"); ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list.copy().add(Aspect.ORDER, 2)); ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.MAGIC.ordinal()), @@ -630,19 +630,19 @@ public class ThaumcraftHelper list.copy().add(Aspect.MIND, 2)); list = new AspectList().add(Aspect.EXCHANGE, 2).add(Aspect.LIFE, 2); - item = forestry.api.core.ItemInterface.getItem("honeyDrop"); + item = ItemInterface.getItemStack("honeyDrop"); ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); list = new AspectList().add(Aspect.LIFE, 2).add(Aspect.ENERGY, 2); - item = forestry.api.core.ItemInterface.getItem("honeydew"); + item = ItemInterface.getItemStack("honeydew"); ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); list = new AspectList().add(Aspect.GREED, 1).add(Aspect.LIFE, 4); - item = forestry.api.core.ItemInterface.getItem("royalJelly"); + item = ItemInterface.getItemStack("royalJelly"); ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); list = new AspectList().add(Aspect.FIRE, 1).add(Aspect.TRAP, 2); - item = forestry.api.core.ItemInterface.getItem("phosphor"); + item = ItemInterface.getItemStack("phosphor"); ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); item = Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE); diff --git a/src/main/java/magicbees/tileentity/EffectJarHousing.java b/src/main/java/magicbees/tileentity/EffectJarHousing.java index 156dae3..17c0066 100644 --- a/src/main/java/magicbees/tileentity/EffectJarHousing.java +++ b/src/main/java/magicbees/tileentity/EffectJarHousing.java @@ -1,5 +1,6 @@ package magicbees.tileentity; +import com.mojang.authlib.GameProfile; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -173,7 +174,7 @@ public class EffectJarHousing implements IBeeHousing } @Override - public String getOwnerName() + public GameProfile getOwnerName() { return this.jarEntity.getOwner(); } diff --git a/src/main/java/magicbees/tileentity/TileEntityEffectJar.java b/src/main/java/magicbees/tileentity/TileEntityEffectJar.java index 1c285c0..d14e807 100644 --- a/src/main/java/magicbees/tileentity/TileEntityEffectJar.java +++ b/src/main/java/magicbees/tileentity/TileEntityEffectJar.java @@ -1,5 +1,6 @@ package magicbees.tileentity; +import com.mojang.authlib.GameProfile; import magicbees.main.CommonProxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -12,11 +13,12 @@ import forestry.api.apiculture.IBee; import forestry.api.genetics.IEffectData; import net.minecraftforge.common.util.Constants; + public class TileEntityEffectJar extends TileEntity implements IInventory { public static final String tileEntityName = CommonProxy.DOMAIN + ".effectJar"; - private String ownerName; + private GameProfile ownerName; private EffectJarHousing housingLogic; private static final int SLOT_COUNT = 2; @@ -38,7 +40,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory public void setOwner(EntityPlayer player) { - this.ownerName = player.getCommandSenderName(); + this.ownerName = player.getGameProfile(); } @Override @@ -47,7 +49,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory return pass == 1; } - public String getOwner() + public GameProfile getOwner() { return this.ownerName; } diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..14e6c22 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: magicbees.main.MagicBees + diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang new file mode 100644 index 0000000..05956bd --- /dev/null +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -0,0 +1,514 @@ +language.name=English +language.region=US +language.code=en_US + +#Items +item.magicbees:jellyBabies.name=Handful of Jelly Babies +item.magicbees:thaumiumScoop.name=Thaumium Scoop +item.magicbees:thaumiumGrafter.name=Thaumium Grafter +item.magicbees:mysteriousMagnet.name=Mysterious Magnet +item.moonDial.name=Jade Moon Dial + +#Tiles +tile.planks.greatwood.name=Greatwood Planks +tile.slab.wood.greatwood.name=Greatwood Slab +tile.planks.silverwood.name=Silverwood Planks +tile.slab.wood.silverwood.name=Silverwood Slab +tile.effectJar.name=Bee Collector's Jar +tile.hive.curious.name=Curious Hive +tile.hive.unusual.name=Unusual Hive +tile.hive.deep.name=Deep Hive +tile.hive.resonant.name=Resonating Hive +tile.hive.infernal.name=Infernal Hive +tile.hive.oblivion.name=Oblivion Hive + +#Combs +comb.mundane=Mundane Comb +comb.molten=Molten Comb +comb.occult=Occult Comb +comb.otherworldly=Otherworldy Comb +comb.transmuted=Transmuting Comb +comb.paper=Papery Comb +comb.soul=Soul Comb +comb.furtive=Furtive Comb +comb.aware=Memory Comb +comb.time=Temporal Comb +comb.forgotten=Forgotten Comb +comb.air=Windy Comb +comb.fire=Firey Comb +comb.water=Watery Comb +comb.earth=Earthy Comb +comb.TCair=Glittering Windy Comb +comb.TCfire=Glittering Firey Comb +comb.TCwater=Glittering Watery Comb +comb.TCearth=Glittering Earthy Comb +comb.TCorder=Glittering Ordered Comb +comb.TCchaos=Glittering Entropic Comb +comb.essence=Essence Comb +comb.potent=Potent Comb +comb.TEcarbon=Carbon Comb +comb.TEelectric=Electric Comb +comb.TElux=Lux Comb +comb.TEendearing=Endearing Comb + +#Waxes +wax.magic=Magic Wax +wax.soul=Soulful Wax +wax.amnesic=Amnesic Wax + +#Drops +drop.enchanting=Enchanting Drop +drop.intellect=Intellect Drop +drop.destabilized=Destabilized Drop +drop.carbon=Carbon Drop +drop.lux=Lux Drop +drop.endearing=Endearing Drop + +#Pollens +pollen.unusual=Unusual Pollen +pollen.phased=Phased Pollen + +#Nuggets +nugget.iron=Iron Nugget +nugget.steel=Steel Nugget +nugget.copper=Copper Nugget +nugget.tin=Tin Nugget +nugget.silver=Silver Nugget +nugget.lead=Lead Nugget +nugget.diamond=Diamond Shard +nugget.emerald=Emerald Shard +nugget.apatite=Apatite Shard + +#Propolises +propolis.dull=Ordered Propolis +propolis.air=Breezey Propolis +propolis.fire=Burning Propolis +propolis.water=Flowing Propolis +propolis.earth=Stony Propolis +propolis.magic=Chaotic Propolis +propolis.unstable=Unstable Propolis + +#Misc resources +resource.fragment=Lore Fragment +resource.lump=Aromatic Lump +resource.fertilizer=Concentrated Compound +resource.skullChip=Wither Skeleton Bone Chip +resource.skullFragment=Wither Skeleton Skull Fragment +resource.dragonDust=Draconic Dust +resource.dragonChunk=Draconic Chunk +resource.essenceLife=Essence of False Life +resource.essenceDeath=Essence of a Shallow Grave +resource.essenceTime=Essence of Lost Time +resource.essenceDurability=Essence of Everlasting Durability +resource.essenceOblivion=Essence of Scornful Oblivion +resource.essenceMutable=Essence of Fickle Permanence +resource.TCairDust=Air Infused Dust +resource.TCfireDust=Fire Infused Dust +resource.TCwaterDust=Water Infused Dust +resource.TCearthDust=Earth Infused Dust +resource.TCorderDust=Order Infused Dust +resource.TCchaosDust=Chaos Infused Dust +resource.dimensionalSingularity=Dimensional Singularity +resource.startNode=Bees and Magic +resource.crystalAspect=Crystalized %s Aspect + +#Frames +item.frameMagic.name=Magic Frame +item.frameResilient.name=Resilient Frame +item.frameGentle.name=Gentle Frame +item.frameMetabolic.name=Metabolic Frame +item.frameNecrotic.name=Necrotic Frame +item.frameTemporal.name=Temporal Frame +item.frameOblivion.name=Oblivion Frame + +#Capsules +capsule.magic=%s Magic Capsule +capsule.void=%s Void Capsule + +#Liquids +liquid.=Empty +liquid.water=Water +liquid.lava=Lava +liquid.biomass=Biomass +liquid.bioethanol=Bioethanol +liquid.oil=Oil +liquid.fuel=Fuel +liquid.seedoil=Seed Oil +liquid.honey=Honey +liquid.juice=Juice +liquid.ice=Ice +liquid.milk=Milk +liquid.acid=Acid +liquid.poison=Poison +liquid.liquidnitrogen=Liquid Nitrogen +liquid.liquiddna=Liquid DNA +liquid.creosote=Creosote Oil +liquid.steam=Steam + +#Moondial +moon.full=Full Moon +moon.gibbousWaning=Waning Gibbous +moon.gibbousWaxing=Waxing Gibbous +moon.halfWaning=Waning Half +moon.halfWaxing=Waxing Half +moon.crescentWaning=Waning Crescent +moon.crescentWaxing=Waxing Crescent +moon.new=New Moon + +#Backpack +backpack.thaumaturge=Thaumaturge's Backpack + +#Itemgroups +itemGroup.magicBees=Magic Bees + +#Misc +misc.level=Level %s +misc.magnetActive=%s - Active +misc.magnetInactive=%s - Inactive + +#Research +research.requiresBlock=Requires a foundation of %s +research.requiresPhase=Occurs between the %s and %s +research.requiresPhaseSingle=During the %s +research.requiresNode=Only occurs when a node is near +research.requiresNodeSpecific=Only occurs within influence of a %s node +research.requiresBiome=Occurs within a %s biome +research.node.pure=Pure +research.node.dark=Dark +research.node.chaotic=Chaotic +research.block.crystals=Crystal Cluster + +#Species +magicbees.speciesMystical=Mystical +magicbees.speciesMystical.description=Common in many parts of the world, these bees have a little extra whimsy about them.|Apinomicon +magicbees.speciesSorcerous=Sorcerous +magicbees.speciesSorcerous.description=Fond of warm, dry environments, they seem to have the ability to conjure water from thin air.|Apinomicon +magicbees.speciesUnusual=Unusual +magicbees.speciesUnusual.description="A curious specimen for my collection!"|Junior Apiarist +magicbees.speciesAttuned=Attuned +magicbees.speciesAttuned.description=They fly as though guided by unseen threads through the air.|Apinomicon + +magicbees.speciesEldritch=Eldritch +magicbees.speciesEldritch.description=The potential that was locked within this bee's ancestors has now come to the fore.|Apinomicon + +magicbees.speciesEsoteric=Esoteric +magicbees.speciesEsoteric.description=An unusual crossbreed which seems to have magical properties.|Apinomicon +magicbees.speciesMysterious=Mysterious +magicbees.speciesMysterious.description=These bees have been to the end of the world and back, and their power has grown.|Apinomicon +magicbees.speciesArcane=Arcane +magicbees.speciesArcane.description="Their produce is charged with magic."|Azanor, Master Thaumaturge + +magicbees.speciesCharmed=Charmed +magicbees.speciesCharmed.description=Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon +magicbees.speciesEnchanted=Enchanted +magicbees.speciesEnchanted.description=Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon +magicbees.speciesSupernatural=Supernatural +magicbees.speciesSupernatural.description=These bees walk the line between this world and the unseen.|Apinomicon + +magicbees.speciesEthereal=Ethereal +magicbees.speciesEthereal.description=Ghostly, and charged with energy from beyond.|Apinomicon + +magicbees.speciesWatery=Watery +magicbees.speciesWatery.description=Fond of damp spots and flowing water.|Apinomicon +magicbees.speciesEarthen=Earthen +magicbees.speciesEarthen.description=They have an iron-strong connection with stone and dirt.|Apinomicon +magicbees.speciesFirey=Firey +magicbees.speciesFirey.description=As close as you can get to living flame without involving candescence.|Apinomicon +magicbees.speciesWindy=Windy +magicbees.speciesWindy.description=Rarely seen in flat, wide open spaces. Their territories are vast.|Apinomicon + +magicbees.speciesPupil=Pupil +magicbees.speciesPupil.description="What does that bee want with my paper?!"|Yorae, Librarian +magicbees.speciesScholarly=Scholarly +magicbees.speciesScholarly.description="I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian +magicbees.speciesSavant=Savant +magicbees.speciesSavant.description=lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk + +magicbees.speciesAware=Aware +magicbees.speciesAware.description="They can see into your soul!"|Florastar, Expert Beekeeper +magicbees.speciesSpirit=Spirit +magicbees.speciesSpirit.description=It is said these bees are able to contact the dead.|Apinomicon +magicbees.speciesSoul=Soul +magicbees.speciesSoul.description="The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts + +magicbees.speciesSkulking=Skulking +magicbees.speciesSkulking.description=These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon +magicbees.speciesGhastly=Ghastly +magicbees.speciesGhastly.description="*sigh*... Really, Myst?"|Taveria, irritated Apiarist +magicbees.speciesSpidery=Spidery +magicbees.speciesSpidery.description=Spiderbee; n. Does whatever a spider-bee does.|Unknown +magicbees.speciesSmouldering=Smouldering +magicbees.speciesSmouldering.description=The Skulking bees have become alight with the fire of the ever-burning Blazes.|Apinomicon + +magicbees.speciesTimely=Timely +magicbees.speciesTimely.description="An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist +magicbees.speciesLordly=Lordly +magicbees.speciesLordly.description=They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon +magicbees.speciesDoctoral=Doctoral +magicbees.speciesDoctoral.description="Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box + +magicbees.speciesInfernal=Infernal +magicbees.speciesInfernal.description=Spawned deep within the hellish realm, none have survived long enough to determine their abilities.|Apinomicon +magicbees.speciesHateful=Hateful +magicbees.speciesHateful.description=Continued exposure to the Nether has not improved their temperament in the least. Use caution.|Apinomicon +magicbees.speciesSpiteful=Spiteful +magicbees.speciesSpiteful.description=They guard their territory fiercely, with the zeal of fiends, and welts of fire.|Apinomicon +magicbees.speciesWithering=Withering +magicbees.speciesWithering.description=Their mere passing causes life to fail, slowly drawing all energy from their territory.|Apinomicon + +magicbees.speciesOblivion=Oblivion +magicbees.speciesOblivion.description=It is unclear whether these bees are native to this world, or some other.|Apinomicon +magicbees.speciesNameless=Nameless +magicbees.speciesNameless.description="Other naturalists have refused to study these bees. I must know why."|Tattered Research Notes +magicbees.speciesAbandoned=Abandoned +magicbees.speciesAbandoned.description="The more I study these bees, the more I feel they do not belong here, or anywhere else."|Tattered Research Notes +magicbees.speciesForlorn=Forlorn +magicbees.speciesForlorn.description="I am now convinced they were left in our universe on purpose by some unknowable beings."|Tattered Research Notes +magicbees.speciesDraconic=Draconic +magicbees.speciesDraconic.description="With a fel sound, they erupted from their hive. That was the last we ever saw of Gerald."|Tattered Research Notes + +magicbees.speciesIron=Ferrous +magicbees.speciesIron.description=Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon +magicbees.speciesGold=Auric +magicbees.speciesGold.description=Not all that glitters is gold.|Ancient Aphorism +magicbees.speciesCopper=Cuprum +magicbees.speciesCopper.description=A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon +magicbees.speciesTin=Stannum +magicbees.speciesTin.description=While metalic, these bees are suprisingly fragile.|Apinomicon +magicbees.speciesSilver=Argentum +magicbees.speciesSilver.description=While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon +magicbees.speciesLead=Plumbum +magicbees.speciesLead.description=A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon +magicbees.speciesAluminum=Aluminum +magicbees.speciesAluminum.description=Crinkly, shiny, and extremely malleable.|Apinomicon +magicbees.speciesArdite=Ardite +magicbees.speciesArdite.description=Fond of yellowish-orange material found in hellish areas.|Apinomicon +magicbees.speciesCobalt=Cobalt +magicbees.speciesCobalt.description=The unstable properties of this material seem to not affect the bees in the slightest.|Apinomicon +magicbees.speciesManyullyn=Manyullyn +magicbees.speciesManyullyn.description="Doot doo-dee-doot doot!" + +magicbees.speciesDiamond=Diamandi +magicbees.speciesDiamond.description=Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon +magicbees.speciesEmerald=Esmeraldi +magicbees.speciesEmerald.description=It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon +magicbees.speciesApatite=Apatine +magicbees.speciesApatite.description=Day and night the whining droned on. I barricaded the windows and hid in the cellar, but everywhere the high-pitched noise of the apatine bees penetrated the walls and drove me to distraction.|Beekeeping 101 + +magicbees.speciesMutable=Mutable +magicbees.speciesMutable.description=Changeable in nature, mercurial in personality.|Apinomicon +magicbees.speciesTransmuting=Transmuting +magicbees.speciesTransmuting.description="I could've sworn this was made out of stone yesterday!"|Sengir, Mad Apiarist +magicbees.speciesCrumbling=Crumbling +magicbees.speciesCrumbling.description=They have a corrosive effect on their surroundings, rapidly aging them.|Apinomicon + +magicbees.speciesInvisible=Invisible +magicbees.speciesInvisible.description=Easy to miss, their glassy body is difficult to spot in the countryside.|Apinomicon + +magicbees.speciesTCAir=Aer +magicbees.speciesTCAir.description="They work so fast it's breathtaking."|Sengir, Mad Apiarist +magicbees.speciesTCFire=Ignis +magicbees.speciesTCFire.description=Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary +magicbees.speciesTCWater=Aqua +magicbees.speciesTCWater.description="I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge +magicbees.speciesTCEarth=Solum +magicbees.speciesTCEarth.description="You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian +magicbees.speciesTCOrder=Ordered +magicbees.speciesTCOrder.description=Their combs are nearly perfect, each part mirroring the pattern of the whole.|Apinomicon +magicbees.speciesTCChaos=Chaotic +magicbees.speciesTCChaos.description=The social structure of their hives seems to vary day by day, making it more flexible and resillient than others, but significantly more unpredictable.|Apinomicon +magicbees.speciesTCVis=Vis +magicbees.speciesTCVis.description="They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes +magicbees.speciesTCPure=Pure +magicbees.speciesTCPure.description="It's like a bee janitor!"|MysteriousAges, Thaumaturge +magicbees.speciesTCFlux=Flux +magicbees.speciesTCFlux.description="I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge +magicbees.speciesTCAttractive=Attractive +magicbees.speciesTCAttractive.description=Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon +magicbees.speciesTCRejuvenating=Rejuvenating +magicbees.speciesTCRejuvenating.description=The hum of the hive is magical, and over time is absorbed by nearby nodes.|Apinomicon +magicbees.speciesTCBrainy=Brainy +magicbees.speciesTCBrainy.description=Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon +magicbees.speciesTCWispy=Wispy +magicbees.speciesTCWispy.description=Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon +magicbees.speciesTCBatty=Batty +magicbees.speciesTCBatty.description=They tend to attract bats to their hives through means unknown.|Apinomicon +magicbees.speciesTCChicken=Poultry +magicbees.speciesTCChicken.description="Cluck. Cluck cluck! ... You heard me."|Confused bee +magicbees.speciesTCBeef=Beefy +magicbees.speciesTCBeef.description="Moo, moo, moo. Wait, what?"|Confused bee +magicbees.speciesTCPork=Porcine +magicbees.speciesTCPork.description="Oink, oink. Er.... bzzz?"|Confused bee +magicbees.speciesEEMinium=Minium +magicbees.speciesEEMinium.description=It may be possible to exploit their mercurial and changeable nature.|Apinomicon +magicbees.speciesAMEssence=Essence +magicbees.speciesAMEssence.description=Drawing from motes of dust in the air and ground, they concentrate the energy +magicbees.speciesAMQuintessence=Quintessential +magicbees.speciesAMQuintessence.description=The heart of magic lies dormant in all things.|Apinomicon, preface +magicbees.speciesAMEarth=Terrestric +magicbees.speciesAMEarth.description=Empowered by the Earth, their produce is infused with its essence.|Apinomicon +magicbees.speciesAMAir=Aiolic +magicbees.speciesAMAir.description=Swift as the wind, and lighter than air.|Apinomicon +magicbees.speciesAMFire=Igneous +magicbees.speciesAMFire.description=Their colony can reach temperatures that boil water and melt metals.|Apinomicon +magicbees.speciesAMWater=Aqueous +magicbees.speciesAMWater.description=Through prolonged exposure to liquids, their combs are quite wet and heavy.|Apinomicon +magicbees.speciesAMLightning=Fulguric +magicbees.speciesAMLightning.description=They can travel vast distances in a blink, and are known for starting many wildfires.|Apinomicon +magicbees.speciesAMPlant=Fruticic +magicbees.speciesAMPlant.description=They have an affinity for all that is green and grows.|Apinomicon +magicbees.speciesAMIce=Glacic +magicbees.speciesAMIce.description="They keep stealing stuff from me, and I never see them. They're far too slippery."|MysteriousAges, incorrigible punster +magicbees.speciesAMMagma=Magmatic/entry> +magicbees.speciesAMMagma.description=As they fly by, they sear the surface of the landscape, eventually scouring all plants and fragile minerals away.|Apinomicon +magicbees.speciesAMArcane=Arcane +magicbees.speciesAMArcane.description="Curious creatures, though their produce is quite useful."|Mithion, Adept +magicbees.speciesAMVortex=Vortex +magicbees.speciesAMVortex.description=Ravenous for mana, they may be dangerous for any caster.|Apinomicon +magicbees.speciesAMWight=Wight +magicbees.speciesAMWight.description="They attract magical spirits; not always docile."|Mithion, Adept +magicbees.speciesTEBlizzy=Blizzy +magicbees.speciesTEBlizzy.description=Frigid and cold, like miniature snowmen.|Apinomicon +magicbees.speciesTEGelid=Gelid +magicbees.speciesTEGelid.description=Liquid coolant producers.|Apinomicon +magicbees.speciesTEDante=Dante +magicbees.speciesTEDante.description=Mixing bees in an inferno produces surprising results.|Apinomicon +magicbees.speciesTEPyro=Pyro +magicbees.speciesTEPyro.description=You Monster.|Everyone, to you. +magicbees.speciesTEElectrum=Electrum +magicbees.speciesTEElectrum.description=...|Apinomicon +magicbees.speciesTEPlatinum=Platinum +magicbees.speciesTEPlatinum.description=...|Apinomicon +magicbees.speciesTENickel=Nickel +magicbees.speciesTENickel.description=...|Apinomicon +magicbees.speciesTEInvar=Invar +magicbees.speciesTEInvar.description=...|Apinomicon +magicbees.speciesTEBronze=Tinker +magicbees.speciesTEBronze.description=...|Apinomicon +magicbees.speciesTECoal=Carbon +magicbees.speciesTECoal.description=...|Apinomicon +magicbees.speciesTEDestabilized=Destabilized +magicbees.speciesTEDestabilized.description=These bees started out unstable; they didn't get better with time.|Apinomicon +magicbees.speciesTELux=Lux +magicbees.speciesTELux.description=Let there be light...|Apinomicon +magicbees.speciesTEWinsome=Winsome +magicbees.speciesTEWinsome.description=....|Apinomicon +magicbees.speciesTEEndearing=Endearing +magicbees.speciesTEEndearing.description=....|Apinomicon +magicbees.speciesRSAFluxed=Fluxed +magicbees.speciesRSAFluxed.description=....|Apinomicon +magicbees.species= +magicbees.species.description= +magicbees.speedBlinding=Blinding +magicbees.effectCurative=Cleansing +magicbees.effectDigSpeed=Mining +magicbees.effectMoveSpeed=Swiftness +magicbees.effectSlowSpeed=Time Warp +magicbees.effectWithering=Withering +magicbees.effectTransmuting=Transmuting +magicbees.effectCrumbling=Crumbling +magicbees.effectInvisiblility=Invisibility +magicbees.effectNodeAttract=Aura Attract +magicbees.effectNodePurify=Purify Aura +magicbees.effectNodeFlux=Aura Flux +magicbees.effectNodeCharge=Aura Charge +magicbees.effectBrainy=Brainy +magicbees.effectBatty=Batty +magicbees.effectWispy=Wispy +magicbees.effectGhastly=Ghastly +magicbees.effectSpidery=Spidery +magicbees.effectAblaze=Ablaze +magicbees.effectManaDrainer=Vortex +magicbees.effectAMWisp=Spiritual +magicbees.effectTEBlizzy=Blizzy +flowerProvider.book=Books +flowerProvider.magic=Thaumic Flowers +flowerProvider.arsmagica=Exotic Flowers +flowerProvider.node=Node +classification.veiled=Veiled +classification.veiled.description=The curious species found scattered through the world may have abilities beyond one's reasoning.|Apinomicon +classification.arcane=Arcane +classification.arcane.description=These bees have inexplicable affinity for magic.|Apinomicon +classification.supernatural=Supernatural +classification.supernatural.description=No longer ordinary bees, they have been associated with many odd occurances.|Apinomicon +classification.scholarly=Scholarly +classification.scholarly.description=The caste of bees which have great intellect and deductive ability.|Apinomicon +classification.skulking=Skulking +classification.skulking.description=Unpleasant and malicious. Treat this group with caution.|Apinomicon +classification.magic=Aware +classification.magic.description=It is unclear whether they are sentient, but they have suprising awareness of their surroundings.|Apinomicon +classification.time=Time +classification.time.description=Though clever use of time travel, these bees accomplish twice as much in one day.|Apinomicon +classification.soul=Soulful +classification.soul.description=It would be eerie to think that they collected the souls of the deceased.|Apinomicon +classification.abominable=Abominable +classification.abominable.description=Spawned in the firey depths of the Nether, there is nothing pleasant about these creatures.|Apinomicon +classification.Extrinsic=Extrinsic +classification.Extrinsic.description=It is unknown whether these creatures gave rise to the family Apidae in this universe, or if these evolved seperately.|Apinomicon +classification.metallic=Metallic +classification.metallic.description=They collect fragments of metal and combine them into larger portions.|Apinomicon +classification.gem=Gem +classification.gem.description=They collect fragments of precious gems in their combs.|Apinomicon +classification.transmuting=Polymorphic +classification.transmuting.description=Reality seems to be somewhat volatile around bees of this family.|Apinomicon +classification.thaumic=Thaumic +classification.thaumic.description=These bees have an increased affinity to magic and aura.|Apinomicon +classification.fleshy=Fleshy +classification.fleshy.description=Through an unknown mechanism, these bees accrue chunks of animal flesh. Somehow, it's still edible.|Apinomicon +classification.alchemical=Alchemical +classification.alchemical.description=These bees have a changeable nature.|Apinomicon +classification.essential=Essential +classification.essential.description=These bees have an increased affinity for aspected magic.|Apinomicon + +tc.aspect.tempus=Time, Moment, Eternity +tc.research_category.MAGICBEES=Apimancy + + +tc.research_name.MB_Root=Apimancy +tc.research_text.MB_Root=[MB] Adding some sparkle to your buzz. +tc.research_page.MB_Root.1=Welcome to Apimancy! As a budding keeper of magical bees, there are a few things you should know before diving in. As your acceptance letter to the Academy of Austere Apimancers has mentioned, there are several new tools available to discover. These include some improved versions of Forestry tools, each with their own particular quirks and new frames for your apiaries. You may also discover that there are new bee strains available to discover, if you can coax them to live in certain conditions. The Forestry Escritoire will help you discover them and become the envy +tc.research_page.MB_Root.2=of your former, nonmagical colleagues. Also take note of the several new strains of wild bees that have appeared: these are the key to progressing into the magical lineages of your small winged charges. + +tc.research_name.MB_LoreFragment=Lore Fragments +tc.research_text.MB_LoreFragment=[MB] Research? More like BEEsearch! +tc.research_page.MB_LoreFragment.1=While experimenting with bee breeds, you may run accross a strain whose intellectual capabilities are a match for your own. Well, maybe, however unlikely that is. It's possible that they may unearth some obscure reference or a snippet of information that your great intellect may have missed while exploiting the greater mysteries of the universe.
Should your helpful buzzing friends happen to locate this sort of item for you, it may be possible to combine the scraps together into something a little more cohesive. + +tc.research_name.MB_FrameMagic=Magic Frame +tc.research_text.MB_FrameMagic=[MB] Putting magic into beekeeping contexts +tc.research_page.MB_FrameMagic.1=The Magic Frame is a simple improvement over your regular, run-of-the-mill Untreated Frames. Still fairly simple to produce, it is capable of lasting three times longer in an apiary than Untreated Frames before becoming unuseable. The enchantable properties of the Magic Frame enable it to be used with several of the special essences involved in Apimancy where other frames would reject the infusion of magics. + +tc.research_name.MB_Scoop=Thaumium Scoop +tc.research_text.MB_Scoop=[MB] Handled with care. +tc.research_page.MB_Scoop.1=Normal scoops are fragile, and prone to breakage. As an authority in Apimancy, you can do better. By adding some Thaumium to the handle, and lacing it with a measure of order, your new scoop will last up to three times longer!
In addition, the Thaumium in the device will accept the Repair enchantment. + +tc.research_name.MB_Grafter=Thaumium Grafter +tc.research_text.MB_Grafter=[MB] Saplings for every occasion. +tc.research_page.MB_Grafter.1=Simple grafters are almost uselessly fragile, and while Proven Grafters are useful, the rarity of emeralds makes them annoying to procure. The solution? Make it yourself!
The Thaumium Grafter, like the Thaumium Scoop, is a tougher, enchantable version of the most basic of the Arborimancer's tools. Use caution though, for although the Repair enchantment can be applied to the grafter, its unusual properties make it exhausting to use. + +tc.research_name.MB_EssenceLife=Essence of False Life +tc.research_text.MB_EssenceLife=[MB] A rose by any other name. . . +tc.research_page.MB_EssenceLife.1=Simple to create by means of magic, this essence has unusual properties when exposed to bees. When combined with an everyday apiary frame, it has the effect of greatly extending the lifespan of a working hive. + +tc.research_name.MB_EssenceDeath=Essence of a Shallow Grave +tc.research_text.MB_EssenceDeath=[MB] Not quite six feet under. +tc.reseacrh_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime.
The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs. + +tc.research_name.MB_EssenceArmor=Essence of Everlasting Durability +tc.research_text.MB_EssenceArmor=[MB] The rubber to your glue +tc.research_page.MB_EssenceArmor.1=This is the distilled essence of protection, bound to last forever, or until the magics stored within it weaken and eventually break. But until then, it's invincible. Mostly.
While Magic Frames are useful, they are a tad fragile. This essence takes the enchantments you weave into Magic frames to an entirely new level. Combine the essence with a magic frame, and it should have a vastly extended lifespan. + +tc.research_name.MB_EssenceUnstable=Essence of Fickle Permanence +tc.research_text.MB_EssenceUnstable=[MB] Assured in unsurity +tc.research_page.MB_EssenceUnstable.1=Unstable by nature, the Essence of Fickle Permanence has the side effect of causing normally stable objects and systems to become somewhat unreliable. While this may mostly be a bad thing, Apimancers have discovered that exposing a hive to the essence has the duel effects of both causing the bees to work faster, and the offspring to have higher mutation rates. + +tc.research_name.MB_EssenceTime=Essence of Lost Time +tc.research_text.MB_EssenceTime=[MB] No time like the unmoment +tc.research_page.MB_EssenceTime.1=Time is a fickle thing. It comes and it goes, but where exactly does it go to? As a respectable thaumaturge, it has become possible to trap these wasted moments and save them in a magical form. So, now that it is possible to collect extra time from the world, it seems only appropriate that they are used in a place that would be useful. It would be too dangerous to attempt to access these moments yourself for the moment, but perhaps it would be simple to allow your bees access to this untapped lump of time.
By combining the essence with a Magic Frame as usual will suffice to extend the lifespan of bees in your keeping by several times. + +tc.research_name.MB_DimensionalSingularity=Dimensional Singularity +tc.research_text.MB_DimensionalSingularity=[MB] Quantum flux for them, unlimited storage for you +tc.research_page.MB_DimensionalSingularity.1=While it may appear similar to the Portable Hole, it serves as a two-way link with another place, which is... probably uninhabited. It should be possible to utilize these singularities to store materials outside of your dimensional understanding - which of course means that they won't clutter up your inventory. As they are now, they are not particularly useful, but there should be ways to unlock their potential. + +tc.research_name.MB_EssenceOblivion=Essence of Scornful Oblivion +tc.research_text.MB_EssenceOblivion=[MB] Cast aside with malice +tc.research_page.MB_EssenceOblivion.1=Breeding bees for mutations can be aggrivating, especially whith long-lived species. With a little cleverness and only the slightest hint of smugness, you have found a way to utilize the Dimensional Singularity in a manner that only sucks away the life force of your tiny flying friends, bit by bit. Well, maybe significant amounts all at once. It's probably not going to affect them too badly.
It may be somewhat tricky to obtain more than one of the §5Dragon Eggs§0 nessecary to obtain more than one of these. Perhaps there is a bee species that can assist with the limitation. diff --git a/src/main/resources/assets/magicbees/lang/en_US.xml b/src/main/resources/assets/magicbees/lang/en_US.xml deleted file mode 100644 index 45bd871..0000000 --- a/src/main/resources/assets/magicbees/lang/en_US.xml +++ /dev/null @@ -1,546 +0,0 @@ - - - - - Handful of Jelly Babies - Thaumium Scoop - Thaumium Grafter - Mysterious Magnet - - - Jade Moon Dial - - - Greatwood Planks - Greatwood Slab - Silverwood Planks - Silverwood Slab - Bee Collector's Jar - Curious Hive - Unusual Hive - Deep Hive - Resonating Hive - Infernal Hive - Oblivion Hive - - - Mundane Comb - Molten Comb - Occult Comb - Otherworldy Comb - Transmuting Comb - Papery Comb - Soul Comb - Furtive Comb - Memory Comb - Temporal Comb - Forgotten Comb - - Windy Comb - Firey Comb - Watery Comb - Earthy Comb - - Glittering Windy Comb - Glittering Firey Comb - Glittering Watery Comb - Glittering Earthy Comb - Glittering Ordered Comb - Glittering Entropic Comb - - Essence Comb - Potent Comb - - Carbon Comb - Electric Comb - Lux Comb - Endearing Comb - - - Magic Wax - Soulful Wax - Amnesic Wax - - - Enchanting Drop - Intellect Drop - - Destabilized Drop - Carbon Drop - Lux Drop - Endearing Drop - - - Unusual Pollen - Phased Pollen - - - Iron Nugget - Steel Nugget - Copper Nugget - Tin Nugget - Silver Nugget - Lead Nugget - Diamond Shard - Emerald Shard - Apatite Shard - - - Ordered Propolis - Breezey Propolis - Burning Propolis - Flowing Propolis - Stony Propolis - Chaotic Propolis - Unstable Propolis - - - Lore Fragment - Aromatic Lump - Concentrated Compound - Wither Skeleton Bone Chip - Wither Skeleton Skull Fragment - Draconic Dust - Draconic Chunk - Essence of False Life - Essence of a Shallow Grave - Essence of Lost Time - Essence of Everlasting Durability - Essence of Scornful Oblivion - Essence of Fickle Permanence - Air Infused Dust - Fire Infused Dust - Water Infused Dust - Earth Infused Dust - Order Infused Dust - Chaos Infused Dust - Dimensional Singularity - Bees and Magic - Crystalized %s Aspect - - - Magic Frame - Resilient Frame - Gentle Frame - Metabolic Frame - Necrotic Frame - Temporal Frame - Oblivion Frame - - - %s Magic Capsule - %s Void Capsule - - - Empty - Water - Lava - Biomass - Bioethanol - Oil - Fuel - Seed Oil - Honey - Juice - Ice - Milk - Acid - Poison - Liquid Nitrogen - Liquid DNA - Creosote Oil - Steam - - - Full Moon - Waning Gibbous - Waxing Gibbous - Waning Half - Waxing Half - Waning Crescent - Waxing Crescent - New Moon - - - Thaumaturge's Backpack - Magic Bees - Level %s - %s - Active - %s - Inactive - - - Requires a foundation of %s - Occurs between the %s and %s - During the %s - Only occurs when a node is near - Only occurs within influence of a %s node - Occurs within a %s biome - Pure - Dark - Chaotic - Crystal Cluster - - - Mystical - Common in many parts of the world, these bees have a little extra whimsy about them.|Apinomicon - Sorcerous - Fond of warm, dry environments, they seem to have the ability to conjure water from thin air.|Apinomicon - Unusual - "A curious specimen for my collection!"|Junior Apiarist - Attuned - They fly as though guided by unseen threads through the air.|Apinomicon - - Eldritch - The potential that was locked within this bee's ancestors has now come to the fore.|Apinomicon - - Esoteric - An unusual crossbreed which seems to have magical properties.|Apinomicon - Mysterious - These bees have been to the end of the world and back, and their power has grown.|Apinomicon - Arcane - "Their produce is charged with magic."|Azanor, Master Thaumaturge - - Charmed - Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon - Enchanted - Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon - Supernatural - These bees walk the line between this world and the unseen.|Apinomicon - - Ethereal - Ghostly, and charged with energy from beyond.|Apinomicon - - Watery - Fond of damp spots and flowing water.|Apinomicon - Earthen - They have an iron-strong connection with stone and dirt.|Apinomicon - Firey - As close as you can get to living flame without involving candescence.|Apinomicon - Windy - Rarely seen in flat, wide open spaces. Their territories are vast.|Apinomicon - - Pupil - "What does that bee want with my paper?!"|Yorae, Librarian - Scholarly - "I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian - Savant - lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk - - Aware - "They can see into your soul!"|Florastar, Expert Beekeeper - Spirit - It is said these bees are able to contact the dead.|Apinomicon - Soul - "The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts - - Skulking - These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon - Ghastly - "*sigh*... Really, Myst?"|Taveria, irritated Apiarist - Spidery - Spiderbee; n. Does whatever a spider-bee does.|Unknown - Smouldering - The Skulking bees have become alight with the fire of the ever-burning Blazes.|Apinomicon - - Timely - "An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist - Lordly - They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon - Doctoral - "Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box - - Infernal - Spawned deep within the hellish realm, none have survived long enough to determine their abilities.|Apinomicon - Hateful - Continued exposure to the Nether has not improved their temperament in the least. Use caution.|Apinomicon - Spiteful - They guard their territory fiercely, with the zeal of fiends, and welts of fire.|Apinomicon - Withering - Their mere passing causes life to fail, slowly drawing all energy from their territory.|Apinomicon - - Oblivion - It is unclear whether these bees are native to this world, or some other.|Apinomicon - Nameless - "Other naturalists have refused to study these bees. I must know why."|Tattered Research Notes - Abandoned - "The more I study these bees, the more I feel they do not belong here, or anywhere else."|Tattered Research Notes - Forlorn - "I am now convinced they were left in our universe on purpose by some unknowable beings."|Tattered Research Notes - Draconic - "With a fel sound, they erupted from their hive. That was the last we ever saw of Gerald."|Tattered Research Notes - - Ferrous - Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon - Auric - Not all that glitters is gold.|Ancient Aphorism - Cuprum - A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon - Stannum - While metalic, these bees are suprisingly fragile.|Apinomicon - Argentum - While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon - Plumbum - A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon - Aluminum - Crinkly, shiny, and extremely malleable.|Apinomicon - Ardite - Fond of yellowish-orange material found in hellish areas.|Apinomicon - Cobalt - The unstable properties of this material seem to not affect the bees in the slightest.|Apinomicon - Manyullyn - "Doot doo-dee-doot doot!" - - Diamandi - Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon - Esmeraldi - It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon - Apatine - Day and night the whining droned on. I barricaded the windows and hid in the cellar, but everywhere the high-pitched noise of the apatine bees penetrated the walls and drove me to distraction.|Beekeeping 101 - - Mutable - Changeable in nature, mercurial in personality.|Apinomicon - Transmuting - "I could've sworn this was made out of stone yesterday!"|Sengir, Mad Apiarist - Crumbling - They have a corrosive effect on their surroundings, rapidly aging them.|Apinomicon - - Invisible - Easy to miss, their glassy body is difficult to spot in the countryside.|Apinomicon - - Aer - "They work so fast it's breathtaking."|Sengir, Mad Apiarist - Ignis - Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary - Aqua - "I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge - Solum - "You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian - Ordered - Their combs are nearly perfect, each part mirroring the pattern of the whole.|Apinomicon - Chaotic - The social structure of their hives seems to vary day by day, making it more flexible and resillient than others, but significantly more unpredictable.|Apinomicon - - Vis - "They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes - Pure - "It's like a bee janitor!"|MysteriousAges, Thaumaturge - Flux - "I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge - Attractive - Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon - Rejuvenating - The hum of the hive is magical, and over time is absorbed by nearby nodes.|Apinomicon - - Brainy - Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon - Wispy - Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon - Batty - They tend to attract bats to their hives through means unknown.|Apinomicon - - Poultry - "Cluck. Cluck cluck! ... You heard me."|Confused bee - Beefy - "Moo, moo, moo. Wait, what?"|Confused bee - Porcine - "Oink, oink. Er.... bzzz?"|Confused bee - - Minium - It may be possible to exploit their mercurial and changeable nature.|Apinomicon - - Essence - Drawing from motes of dust in the air and ground, they concentrate the energy - Quintessential - The heart of magic lies dormant in all things.|Apinomicon, preface - - Terrestric - Empowered by the Earth, their produce is infused with its essence.|Apinomicon - Aiolic - Swift as the wind, and lighter than air.|Apinomicon - Igneous - Their colony can reach temperatures that boil water and melt metals.|Apinomicon - Aqueous - Through prolonged exposure to liquids, their combs are quite wet and heavy.|Apinomicon - - Fulguric - They can travel vast distances in a blink, and are known for starting many wildfires.|Apinomicon - Fruticic - They have an affinity for all that is green and grows.|Apinomicon - Glacic - "They keep stealing stuff from me, and I never see them. They're far too slippery."|MysteriousAges, incorrigible punster - Magmatic/entry> - As they fly by, they sear the surface of the landscape, eventually scouring all plants and fragile minerals away.|Apinomicon - - Arcane - "Curious creatures, though their produce is quite useful."|Mithion, Adept - - Vortex - Ravenous for mana, they may be dangerous for any caster.|Apinomicon - Wight - "They attract magical spirits; not always docile."|Mithion, Adept - - Blizzy - Frigid and cold, like miniature snowmen.|Apinomicon - Gelid - Liquid coolant producers.|Apinomicon - Dante - Mixing bees in an inferno produces surprising results.|Apinomicon - Pyro - You Monster.|Everyone, to you. - Electrum - ...|Apinomicon - Platinum - ...|Apinomicon - Nickel - ...|Apinomicon - Invar - ...|Apinomicon - Tinker - ...|Apinomicon - Carbon - ...|Apinomicon - Destabilized - These bees started out unstable; they didn't get better with time.|Apinomicon - Lux - Let there be light...|Apinomicon - Winsome - ....|Apinomicon - Endearing - ....|Apinomicon - - Fluxed - ....|Apinomicon - - - - - - Blinding - Cleansing - Mining - Swiftness - Time Warp - Withering - Transmuting - Crumbling - Invisibility - Aura Attract - Purify Aura - Aura Flux - Aura Charge - Brainy - Batty - Wispy - Ghastly - Spidery - Ablaze - Vortex - Spiritual - Blizzy - Books - Thaumic Flowers - Exotic Flowers - Node - - - Veiled - The curious species found scattered through the world may have abilities beyond one's reasoning.|Apinomicon - Arcane - These bees have inexplicable affinity for magic.|Apinomicon - Supernatural - No longer ordinary bees, they have been associated with many odd occurances.|Apinomicon - Scholarly - The caste of bees which have great intellect and deductive ability.|Apinomicon - Skulking - Unpleasant and malicious. Treat this group with caution.|Apinomicon - Aware - It is unclear whether they are sentient, but they have suprising awareness of their surroundings.|Apinomicon - Time - Though clever use of time travel, these bees accomplish twice as much in one day.|Apinomicon - Soulful - It would be eerie to think that they collected the souls of the deceased.|Apinomicon - Abominable - Spawned in the firey depths of the Nether, there is nothing pleasant about these creatures.|Apinomicon - Extrinsic - It is unknown whether these creatures gave rise to the family Apidae in this universe, or if these evolved seperately.|Apinomicon - Metallic - They collect fragments of metal and combine them into larger portions.|Apinomicon - Gem - They collect fragments of precious gems in their combs.|Apinomicon - Polymorphic - Reality seems to be somewhat volatile around bees of this family.|Apinomicon - Thaumic - These bees have an increased affinity to magic and aura.|Apinomicon - Fleshy - Through an unknown mechanism, these bees accrue chunks of animal flesh. Somehow, it's still edible.|Apinomicon - Alchemical - These bees have a changeable nature.|Apinomicon - Essential - These bees have an increased affinity for aspected magic.|Apinomicon - - - Time, Moment, Eternity - Apimancy - - - Apimancy - [MB] Adding some sparkle to your buzz. - Welcome to Apimancy! As a budding keeper of magical bees, there are a few things you should know before diving in. As your acceptance letter to the Academy of Austere Apimancers has mentioned, there are several new tools available to discover. These include some improved versions of Forestry tools, each with their own particular quirks and new frames for your apiaries. ##horizontalRule## You may also discover that there are new bee strains available to discover, if you can coax them to live in certain conditions. The Forestry Escritoire will help you discover them and become the envy - of your former, nonmagical colleagues. Also take note of the several new strains of wild bees that have appeared: these are the key to progressing into the magical lineages of your small winged charges. - - Lore Fragments - [MB] Research? More like BEEsearch! - While experimenting with bee breeds, you may run accross a strain whose intellectual capabilities are a match for your own. Well, maybe, however unlikely that is. It's possible that they may unearth some obscure reference or a snippet of information that your great intellect may have missed while exploiting the greater mysteries of the universe. ##lineBreak## Should your helpful buzzing friends happen to locate this sort of item for you, it may be possible to combine the scraps together into something a little more cohesive. - - Magic Frame - [MB] Putting magic into beekeeping contexts - The Magic Frame is a simple improvement over your regular, run-of-the-mill Untreated Frames. Still fairly simple to produce, it is capable of lasting three times longer in an apiary than Untreated Frames before becoming unuseable. The enchantable properties of the Magic Frame enable it to be used with several of the special essences involved in Apimancy where other frames would reject the infusion of magics. - - Thaumium Scoop - [MB] Handled with care. - Normal scoops are fragile, and prone to breakage. As an authority in Apimancy, you can do better. By adding some Thaumium to the handle, and lacing it with a measure of order, your new scoop will last up to three times longer! ##lineBreak## In addition, the Thaumium in the device will accept the Repair enchantment. - - Thaumium Grafter - [MB] Saplings for every occasion. - Simple grafters are almost uselessly fragile, and while Proven Grafters are useful, the rarity of emeralds makes them annoying to procure. The solution? Make it yourself! ##lineBreak## The Thaumium Grafter, like the Thaumium Scoop, is a tougher, enchantable version of the most basic of the Arborimancer's tools. Use caution though, for although the Repair enchantment can be applied to the grafter, its unusual properties make it exhausting to use. - - Essence of False Life - [MB] A rose by any other name. . . - Simple to create by means of magic, this essence has unusual properties when exposed to bees. When combined with an everyday apiary frame, it has the effect of greatly extending the lifespan of a working hive. - - Essence of a Shallow Grave - [MB] Not quite six feet under. - The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. ##lineBreak## The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs. - - Essence of Everlasting Durability - [MB] The rubber to your glue - This is the distilled essence of protection, bound to last forever, or until the magics stored within it weaken and eventually break. But until then, it's invincible. Mostly. ##lineBreak## While Magic Frames are useful, they are a tad fragile. This essence takes the enchantments you weave into Magic frames to an entirely new level. Combine the essence with a magic frame, and it should have a vastly extended lifespan. - - Essence of Fickle Permanence - [MB] Assured in unsurity - Unstable by nature, the Essence of Fickle Permanence has the side effect of causing normally stable objects and systems to become somewhat unreliable. While this may mostly be a bad thing, Apimancers have discovered that exposing a hive to the essence has the duel effects of both causing the bees to work faster, and the offspring to have higher mutation rates. - - Essence of Lost Time - [MB] No time like the unmoment - Time is a fickle thing. It comes and it goes, but where exactly does it go to? As a respectable thaumaturge, it has become possible to trap these wasted moments and save them in a magical form. So, now that it is possible to collect extra time from the world, it seems only appropriate that they are used in a place that would be useful. It would be too dangerous to attempt to access these moments yourself for the moment, but perhaps it would be simple to allow your bees access to this untapped lump of time. ##lineBreak## By combining the essence with a Magic Frame as usual will suffice to extend the lifespan of bees in your keeping by several times. - - Dimensional Singularity - [MB] Quantum flux for them, unlimited storage for you - While it may appear similar to the Portable Hole, it serves as a two-way link with another place, which is... probably uninhabited. It should be possible to utilize these singularities to store materials outside of your dimensional understanding - which of course means that they won't clutter up your inventory. As they are now, they are not particularly useful, but there should be ways to unlock their potential. - - Essence of Scornful Oblivion - [MB] Cast aside with malice - Breeding bees for mutations can be aggrivating, especially whith long-lived species. With a little cleverness and only the slightest hint of smugness, you have found a way to utilize the Dimensional Singularity in a manner that only sucks away the life force of your tiny flying friends, bit by bit. Well, maybe significant amounts all at once. It's probably not going to affect them too badly. ##lineBreak## It may be somewhat tricky to obtain more than one of the §5Dragon Eggs§0 nessecary to obtain more than one of these. Perhaps there is a bee species that can assist with the limitation. - -