From b8d12b1f9a74014fe9380d4f88d4f5ed22b5bfe7 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Thu, 11 Apr 2013 02:40:25 -0700 Subject: [PATCH] Lots of new bees, pulling out most dependencies on Thaumcraft 3 into helper; making it possible to run without. --- .../gfx/thaumicbees/items/items.png | Bin 65999 -> 11233 bytes thaumicbees_res/lang/thaumicbees/en_US.xml | 92 ++- thaumicbees_src/thaumicbees/bees/Allele.java | 47 +- .../bees/AlleleEffectAuraNodeCharge.java | 59 ++ .../thaumicbees/bees/BeeClassification.java | 15 +- .../thaumicbees/bees/BeeGenomeManager.java | 172 +++++ .../thaumicbees/bees/BeeMutation.java | 256 +++++-- .../thaumicbees/bees/BeeSpecies.java | 199 ++++- .../thaumicbees/block/BlockEffectJar.java | 2 +- .../thaumicbees/item/ItemMagicHiveFrame.java | 58 +- .../thaumicbees/item/ItemNugget.java | 63 ++ .../thaumicbees/item/types/CombType.java | 1 + .../thaumicbees/item/types/HiveFrameType.java | 2 + .../thaumicbees/item/types/NuggetType.java | 27 + .../thaumicbees/item/types/WaxType.java | 1 + thaumicbees_src/thaumicbees/main/Config.java | 166 +++-- .../thaumicbees/main/ThaumicBees.java | 32 +- .../main/utils/CompatabilityManager.java | 468 +----------- .../main/utils/CraftingManager.java | 480 ++++++------ .../thaumicbees/main/utils/VersionInfo.java | 2 +- .../compat/EquivalentExchangeHelper.java | 47 ++ .../main/utils/compat/ExtraBeesHelper.java | 34 + .../main/utils/compat/ForestryHelper.java | 26 +- .../main/utils/compat/ThaumcraftHelper.java | 688 +++++++++++++++++- 24 files changed, 1945 insertions(+), 992 deletions(-) create mode 100644 thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeCharge.java create mode 100644 thaumicbees_src/thaumicbees/item/ItemNugget.java create mode 100644 thaumicbees_src/thaumicbees/item/types/NuggetType.java create mode 100644 thaumicbees_src/thaumicbees/main/utils/compat/EquivalentExchangeHelper.java diff --git a/thaumicbees_res/gfx/thaumicbees/items/items.png b/thaumicbees_res/gfx/thaumicbees/items/items.png index 796cd17513b0108b5677074fa28238fd9e2a17c9..9301e6acf8209b01bb05563e4fa228df84634756 100644 GIT binary patch literal 11233 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 I{QT9w0psW4Z2$lO literal 65999 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

`uO2h<-&?j_zjJ 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 l1aAv>xZjiH7vk9T{{h2K!>Handful of Jelly Babies Thaumium Scoop Thaumium Grafter - + Greatwood Planks Greatwood Slab Silverwood Planks Silverwood Slab - + Occult Comb Otherworldy Comb @@ -24,18 +24,29 @@ Infused Comb Memory Comb Furtive Comb - + Soul Comb + Magic Wax - + Soulful Wax + Enchanting Drop Intellect Drop - + Unusual Pollen Phased Pollen - + + + Iron Nugget + Copper Nugget + Tin Nugget + Silver Nugget + Lead Nugget + Diamond Nugget + Emerald Nugget + Dull Propolis Breezey Propolis @@ -43,13 +54,13 @@ Flowing Propolis Stony Propolis Infused Propolis - + Lore Fragment Aromatic Lump Concentrated Compound Crystalized %s Aspect - + Magic Frame Resilient Frame @@ -57,11 +68,11 @@ Metabolic Frame Necrotic Frame Temporal Frame - + Magic Capsule Void Capsule - + Empty Water @@ -81,7 +92,7 @@ Liquid DNA Creosote Oil Steam - + Full Moon Waning Gibbous @@ -91,10 +102,10 @@ Waning Crescent Waxing Crescent New Moon - + Thaumaturge's Backpack - + Esoteric An unusual crossbreed which seems to have magical properties.|Apinomicon @@ -136,6 +147,8 @@ "I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge Node Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon + Aura + The hum of the hive is magical, and over time is absorbed by nearby nodes. Skulking These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon Brainy @@ -149,12 +162,40 @@ Ghastly "*sigh*... Really, Myst?"|Taveria, irritated Apiarist Timely - "An apiarist is never late. He arrives precicely when he means to!"|Sengir, Mad Apiarist + "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 - + Minium + "They're the least of your concern. Like, the Minium concern! ... get it?"|MysteriousAges, Former Comedian + Spirit + + Soul + "The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts + Iron + Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon + Gold + + Copper + + Tin + + Silver + + Lead + + Diamond + + Emerald + It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|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 + Cleansing Mining @@ -170,7 +211,7 @@ Books Magic Flowers Node - + Arcane @@ -182,10 +223,19 @@ Skulking - Vis + Aware - Time - - - + Time + + Soulful + + Alchemical + + Metallic + + Gem + + Fleshy + + \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index 272e1b0..60ef460 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -3,6 +3,7 @@ package thaumicbees.bees; import net.minecraft.potion.Potion; import thaumicbees.main.utils.compat.ThaumcraftHelper; import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IAlleleFlowers; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -10,13 +11,13 @@ public class Allele implements IAllele { public static AlleleInteger fertilityHighDominant; - public static AlleleFlower flowerBookshelf; - public static AlleleFlower flowerThaumcraft; - public static AlleleFlower flowerAuraNode; + public static IAlleleFlowers flowerBookshelf; + public static IAlleleFlowers flowerThaumcraft; + public static IAlleleFlowers flowerAuraNode; @Deprecated - public static AlleleFlower flowerNodePurify; + public static IAlleleFlowers flowerNodePurify; @Deprecated - public static AlleleFlower flowerNodeFluxify; + public static IAlleleFlowers flowerNodeFluxify; public static AlleleEffectCure cleansingEffect; public static AlleleEffectPotion digSpeed; @@ -29,35 +30,47 @@ public class Allele implements IAllele public static AlleleEffectAuraNodeAttract effectNodeAttract; public static AlleleEffectAuraNodePurify effectNodePurify; public static AlleleEffectAuraNodeFlux effectNodeFlux; + public static AlleleEffectAuraNodeCharge effectNodeCharge; public static void setupAdditionalAlleles() { Allele.fertilityHighDominant = new AlleleInteger("fertilityHighDominant", 3, true); Allele.flowerBookshelf = new AlleleFlower("flowerBookshelf", new FlowerProviderBookshelf(), true); - Allele.flowerThaumcraft = new AlleleFlower("flowerThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false); - Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", new FlowerProviderAuraNode(), true); - Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", new FlowerProviderAuraNode(), false); - Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNode(), false); - + if (ThaumcraftHelper.isActive()) + { + Allele.flowerThaumcraft = new AlleleFlower("flowerThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false); + Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", new FlowerProviderAuraNode(), true); + Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", new FlowerProviderAuraNode(), false); + Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNode(), false); + } + else + { + Allele.flowerThaumcraft = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); + Allele.flowerAuraNode = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); + Allele.flowerNodePurify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); + Allele.flowerNodeFluxify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); + } + + Allele.effectNodeAttract = new AlleleEffectAuraNodeAttract("effectNodeGeneration", false, 400); + Allele.effectNodePurify = new AlleleEffectAuraNodePurify("effectNodePurify", false, 600, 150); + Allele.effectNodeFlux = new AlleleEffectAuraNodeFlux("effectNodeFlux", true, 300, 300); + Allele.effectNodeCharge = new AlleleEffectAuraNodeCharge("effectNodeCharge", true, 1200); + Allele.cleansingEffect = new AlleleEffectCure("effectCurative", false); Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 15, false); Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 10, false); Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", Potion.moveSlowdown, 3, false); - - Allele.effectNodeAttract = new AlleleEffectAuraNodeAttract("effectNodeGeneration", false, 400); - Allele.effectNodePurify = new AlleleEffectAuraNodePurify("effectNodePurify", false, 600, 150); - Allele.effectNodeFlux = new AlleleEffectAuraNodeFlux("effectNodeFlux", true, 300, 300); Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("effectBrainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID); Allele.spawnBrainyZombie.setAggrosPlayerOnSpawn().setThrottle(800).setSpawnsOnPlayerNear(null).setMaxMobsInSpawnZone(2); - + Allele.spawnBats = new AlleleEffectSpawnMob("effectBatty", false, ThaumcraftHelper.Entity.FIREBAT.entityID); Allele.spawnBats.setThrottle(300).setSpawnsOnPlayerNear("Bat"); - + Allele.spawnWisp = new AlleleEffectSpawnWisp("effectWispy", false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive"); Allele.spawnWisp.setThrottle(1800).setChanceToSpawn(79); - + Allele.spawnGhast = new AlleleEffectSpawnMob("Ghast", false, "Ghast", "mob.ghast.moan"); Allele.spawnGhast.setThrottle(2060).setChanceToSpawn(10).setMaxMobsInSpawnZone(1); } diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeCharge.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeCharge.java new file mode 100644 index 0000000..6f24a25 --- /dev/null +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeCharge.java @@ -0,0 +1,59 @@ +package thaumicbees.bees; + +import net.minecraft.world.World; +import thaumcraft.api.EnumTag; +import thaumcraft.api.ObjectTags; +import thaumcraft.api.ThaumcraftApi; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; + +public class AlleleEffectAuraNodeCharge extends AlleleEffect +{ + + private int effectTimeout; + + AlleleEffectAuraNodeCharge(String id, boolean dominant, int timeout) + { + super(id, dominant); + this.effectTimeout = timeout; + } + + @Override + public IEffectData validateStorage(IEffectData storedData) + { + if (storedData == null) + { + storedData = new EffectData(1, 0, 0); + } + return storedData; + } + + @Override + public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) + { + int timeout = storedData.getInteger(0); + if (timeout >= this.effectTimeout) + { + World world = housing.getWorld(); + int x = housing.getXCoord(); + int y = housing.getYCoord(); + int z = housing.getZCoord(); + + EnumTag tag; + do + { + tag = EnumTag.values()[world.rand.nextInt(EnumTag.values().length)]; + } + while (tag == EnumTag.UNKNOWN || tag == EnumTag.WEATHER); + + ThaumcraftApi.increaseLowestAura(world, x, y, z, 1); + } + else + { + storedData.setInteger(0, timeout + 1); + } + return storedData; + } + +} diff --git a/thaumicbees_src/thaumicbees/bees/BeeClassification.java b/thaumicbees_src/thaumicbees/bees/BeeClassification.java index f8af328..e29051c 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeClassification.java +++ b/thaumicbees_src/thaumicbees/bees/BeeClassification.java @@ -13,12 +13,17 @@ import forestry.api.genetics.IClassification; public enum BeeClassification implements IClassification { ARCANE("Arcane", "Arcanus"), - SUPERNATURAL("Supernatural", ""), - SCHOLARLY("Scholarly", ""), - THAUMIC("Thaumic", ""), + SUPERNATURAL("Supernatural", "Occultus"), + SCHOLARLY("Scholarly", "Docto"), + THAUMIC("Thaumic", "Thaumis"), SKULKING("Skulking", ""), - VIS("Vis", ""), - TIME("Time", ""), + VIS("Vis", "Vis"), + TIME("Time", "Tempestivus"), + SOUL("Soul", "Animus"), + ALCHEMICAL("Alchemical", "Alchimia"), + METALLIC("Metallic", "Metallicis"), + GEM("Gem", "Lapidi"), + FLESHY("Fleshy", "Carnosa"), ; private String uID; diff --git a/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java b/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java index d0d5383..d2b4916 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java +++ b/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java @@ -333,6 +333,18 @@ public class BeeGenomeManager return genome; } + public static IAllele[] getTemplateAura() + { + IAllele[] genome = getTemplateBaseVis(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AURA; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeCharge; + genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode; + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone"); + + return genome; + } + private static IAllele[] getTemplateBaseMalevolent() { IAllele[] genome = getTemplateBaseThaumic(); @@ -467,6 +479,166 @@ public class BeeGenomeManager return genome; } + + private static IAllele[] getTemplateBaseAlchemical() + { + IAllele[] genome = getTemplateBaseThaumic(); + + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow"); + + return genome; + } + + public static IAllele[] getTemplateMinium() + { + IAllele[] genome = getTemplateBaseAlchemical(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MINIUM; + + return genome; + } + + private static IAllele[] getTemplateBaseSoul() + { + IAllele[] genome = getTemplateBaseThaumic(); + + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1"); + genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); + + return genome; + } + + public static IAllele[] getTemplateSpirit() + { + IAllele[] genome = getTemplateBaseSoul(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SPIRIT; + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortened"); + + return genome; + } + + public static IAllele[] getTemplateSoul() + { + IAllele[] genome = getTemplateBaseSoul(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SOUL; + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal"); + + return genome; + } + + private static IAllele[] getTemplateBaseMetallic() + { + IAllele[] genome = getTemplateBaseThaumic(); + + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlowest"); + genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow"); + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + + return genome; + } + + public static IAllele[] getTemplateIron() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.IRON; + + return genome; + } + + public static IAllele[] getTemplateGold() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.GOLD; + + return genome; + } + + public static IAllele[] getTemplateCopper() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.COPPER; + + return genome; + } + + public static IAllele[] getTemplateTin() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TIN; + + return genome; + } + + public static IAllele[] getTemplateSilver() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SILVER; + + return genome; + } + + public static IAllele[] getTemplateLead() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.LEAD; + + return genome; + } + + public static IAllele[] getTemplateDiamond() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.DIAMOND; + + return genome; + } + + public static IAllele[] getTemplateEmerald() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EMERALD; + + return genome; + } + + public static IAllele[] getTemplateChicken() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.CHICKEN; + + return genome; + } + + public static IAllele[] getTemplateBeef() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BEEF; + + return genome; + } + + public static IAllele[] getTemplatePork() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.PORK; + + return genome; + } public static ItemStack getBeeNBTForSpecies(BeeSpecies species, EnumBeeType beeType) { diff --git a/thaumicbees_src/thaumicbees/bees/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/BeeMutation.java index b9b5f9c..92f484d 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeMutation.java +++ b/thaumicbees_src/thaumicbees/bees/BeeMutation.java @@ -12,43 +12,70 @@ import thaumcraft.api.EnumNodeType; import thaumcraft.api.ThaumcraftApi; import thaumicbees.main.ThaumicBees; import thaumicbees.main.utils.MoonPhase; +import thaumicbees.main.utils.compat.EquivalentExchangeHelper; +import thaumicbees.main.utils.compat.ExtraBeesHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; public class BeeMutation implements IBeeMutation { - public static BeeMutation Esoteric; - public static BeeMutation Esoteric1; - public static BeeMutation Mysterious; - public static BeeMutation Mysterious1; - public static BeeMutation Arcane; - public static BeeMutation Charmed; - public static BeeMutation Enchanted; - public static BeeMutation Supernatural; - public static BeeMutation Stark; - public static BeeMutation Pupil; - public static BeeMutation Scholarly; - public static BeeMutation Savant; - public static BeeMutation Aware; - public static BeeMutation Vis; - public static BeeMutation Vis1; - public static BeeMutation Pure; - public static BeeMutation Flux; - public static BeeMutation Node; - public static BeeMutation Node1; - public static BeeMutation Skulking; - public static BeeMutation Brainy; - public static BeeMutation Gossamer; - public static BeeMutation Wispy; - public static BeeMutation Batty; - public static BeeMutation Ghastly; - public static BeeMutation Timely; - public static BeeMutation Lordly; - public static BeeMutation Doctoral; + private static BeeMutation Esoteric; + private static BeeMutation Esoteric1; + private static BeeMutation Mysterious; + private static BeeMutation Mysterious1; + private static BeeMutation Arcane; + private static BeeMutation Charmed; + private static BeeMutation Enchanted; + private static BeeMutation Supernatural; + private static BeeMutation Stark; + private static BeeMutation Fire; + private static BeeMutation Water; + private static BeeMutation Pupil; + private static BeeMutation Scholarly; + private static BeeMutation Savant; + private static BeeMutation Aware; + private static BeeMutation Vis; + private static BeeMutation Vis1; + private static BeeMutation Pure; + private static BeeMutation Flux; + private static BeeMutation Node; + private static BeeMutation Node1; + private static BeeMutation Skulking; + private static BeeMutation Brainy; + private static BeeMutation Gossamer; + private static BeeMutation Wispy; + private static BeeMutation Batty; + private static BeeMutation Ghastly; + private static BeeMutation Timely; + private static BeeMutation Lordly; + private static BeeMutation Doctoral; + private static BeeMutation Spirit; + private static BeeMutation Spirit1; + private static BeeMutation Soul; + private static BeeMutation Minium; + private static BeeMutation Iron; + private static BeeMutation Gold; + private static BeeMutation Copper; + private static BeeMutation Tin; + private static BeeMutation Silver; + private static BeeMutation Lead; + private static BeeMutation Diamond; + private static BeeMutation Emerald; + private static BeeMutation Lead1; + private static BeeMutation Lead2; + private static BeeMutation Beef; + private static BeeMutation Chicken; + private static BeeMutation Pork; + private static BeeMutation Aura; + private static BeeMutation Aura1; public static void setupMutations() { + IAlleleBeeSpecies baseA, baseB; + BeeMutation.Esoteric = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 10); BeeMutation.Esoteric1 = new BeeMutation(Allele.getBaseSpecies("Heroic"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 25); - BeeMutation.Mysterious = new BeeMutation(BeeSpecies.ESOTERIC, Allele.getBaseSpecies("Ended"), BeeSpecies.MYSTERIOUS, 10); + BeeMutation.Mysterious = new BeeMutation(Allele.getBaseSpecies("Ended"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 15); + BeeMutation.Mysterious1 = new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 4); BeeMutation.Arcane = new BeeMutation(BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, BeeSpecies.ARCANE, 8) .setMoonPhaseBonus(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT, 1.5f); BeeMutation.Charmed = new BeeMutation(Allele.getBaseSpecies("Diligent"), Allele.getBaseSpecies("Valiant"), BeeSpecies.CHARMED, 20); @@ -56,68 +83,137 @@ public class BeeMutation implements IBeeMutation BeeMutation.Supernatural = new BeeMutation(BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, BeeSpecies.SUPERNATURAL, 10) .setMoonPhaseBonus(MoonPhase.WAXING_GIBBOUS, MoonPhase.WANING_GIBBOUS, 1.5f); BeeMutation.Pupil = new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.ENCHANTED, BeeSpecies.PUPIL, 10); - BeeMutation.Scholarly = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.ARCANE, BeeSpecies.SCHOLARLY, 8); - BeeMutation.Savant = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.SCHOLARLY, BeeSpecies.SAVANT, 6); BeeMutation.Stark = new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.SUPERNATURAL, BeeSpecies.STARK, 8); - BeeMutation.Aware = new BeeMutation(Allele.getBaseSpecies("Demonic"), Allele.getBaseSpecies("Edenic"), BeeSpecies.AWARE, 12); - BeeMutation.Vis = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.ARCANE, BeeSpecies.VIS, 9) - .setAuraNodeRequired(40); - BeeMutation.Vis1 = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.STARK, BeeSpecies.VIS, 12) - .setAuraNodeRequired(80); - - BeeMutation.Pure = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.PURE, 7) - .setAuraNodeTypeRequired(5, EnumNodeType.PURE).setMoonPhaseBonus(MoonPhase.NEW, MoonPhase.NEW, 1.6f); - BeeMutation.Flux = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.FLUX, 7) - .setAuraNodeTypeRequired(30, EnumNodeType.UNSTABLE).setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 1.6f); - - BeeMutation.Node = new BeeMutation(BeeSpecies.VIS, BeeSpecies.VIS, BeeSpecies.NODE, 2) - .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WANING_HALF, MoonPhase.WANING_HALF); - BeeMutation.Node1 = new BeeMutation(BeeSpecies.VIS, BeeSpecies.VIS, BeeSpecies.NODE, 2) - .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WAXING_HALF); - - // Now we get into a little bit of branching... - if (ThaumicBees.getConfig().ExtraBeesInstalled) - { - setupMutationsExtraBeesBase(); - } - else - { - setupMutationsForestryBase(); - } - BeeMutation.Gossamer.setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.WANING_CRESCENT); - BeeMutation.Wispy = new BeeMutation(BeeSpecies.GOSSAMER, Allele.getBaseSpecies("Cultivated"), BeeSpecies.WISPY, 8); - BeeMutation.Timely = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.ENCHANTED, BeeSpecies.TIMELY, 10); BeeMutation.Lordly = new BeeMutation(BeeSpecies.TIMELY, Allele.getBaseSpecies("Imperial"), BeeSpecies.LORDLY, 9); BeeMutation.Doctoral = new BeeMutation(BeeSpecies.TIMELY, BeeSpecies.LORDLY, BeeSpecies.DOCTORAL, 7); - } - - private static void setupMutationsExtraBeesBase() - { - try + + BeeMutation.Minium = new BeeMutation(Allele.getBaseSpecies("Sinister"), BeeSpecies.MYSTERIOUS, BeeSpecies.MINIUM, 11); + + BeeMutation.Spirit = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.ENCHANTED, BeeSpecies.SPIRIT, 12); + BeeMutation.Spirit1 = new BeeMutation(Allele.getBaseSpecies("Fiendish"), Allele.getBaseSpecies("Ended"), BeeSpecies.SPIRIT, 20); + BeeMutation.Soul = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.SPIRIT, BeeSpecies.SOUL, 11); + + BeeMutation.Iron = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Diligent"), BeeSpecies.IRON, 10); + + baseA = (BeeSpecies.MINIUM.isActive()) ? BeeSpecies.MINIUM : Allele.getBaseSpecies("Imperial"); + baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD : BeeSpecies.IRON; + BeeMutation.Gold = new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 8); + + if (BeeSpecies.COPPER.isActive()) + { + BeeMutation.Copper = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Meadows"), BeeSpecies.COPPER, 12); + } + if (BeeSpecies.TIN.isActive()) + { + BeeMutation.Tin = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Forest"), BeeSpecies.TIN, 12); + } + if (BeeSpecies.SILVER.isActive()) + { + BeeMutation.Silver = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Modest"), BeeSpecies.SILVER, 10); + } + if (BeeSpecies.LEAD.isActive()) + { + if (BeeSpecies.COPPER.isActive()) + { + BeeMutation.Lead = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.COPPER, BeeSpecies.LEAD, 13); + } + if (BeeSpecies.TIN.isActive()) + { + BeeMutation.Lead1 = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.TIN, BeeSpecies.LEAD, 13); + } + BeeMutation.Lead2 = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Common"), BeeSpecies.LEAD, 9); + } + + BeeMutation.Diamond = new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 6); + baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial"); + BeeMutation.Emerald = new BeeMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD, 6); + + if (BeeSpecies.BEEF.isActive()) + { + BeeMutation.Beef = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.BEEF, 10); + } + if (BeeSpecies.CHICKEN.isActive()) + { + BeeMutation.Chicken = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.CHICKEN, 10); + } + if (BeeSpecies.PORK.isActive()) + { + BeeMutation.Pork = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.PORK, 10); + } + + // Now we get into a little bit of branching... + if (ExtraBeesHelper.isActive()) { BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, Allele.getExtraSpecies("desolate"), BeeSpecies.SKULKING, 10); - BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rotten"), BeeSpecies.BRAINY, 12); - BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("ancient"), BeeSpecies.GOSSAMER, 10); - BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rock"), BeeSpecies.BATTY, 14); BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("creeper"), BeeSpecies.GHASTLY, 13); } - catch (Exception e) + else { - FMLLog.warning("ThaumicBees encountered an error attempting to register mutations using Extra Bees species! Ensure Extra Bees was able to initialize correctly!"); - FMLLog.info("Could not use Extra Bees species for mutations. Falling back to Forestry defaults."); - setupMutationsForestryBase(); + BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, Allele.getBaseSpecies("Modest"), BeeSpecies.SKULKING, 10); + BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Austere"), BeeSpecies.GHASTLY, 13); + } + + if (ThaumcraftHelper.isActive()) + { + BeeMutation.Scholarly = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.ARCANE, BeeSpecies.SCHOLARLY, 8); + BeeMutation.Savant = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.SCHOLARLY, BeeSpecies.SAVANT, 6); + + BeeMutation.Aware = new BeeMutation(Allele.getBaseSpecies("Demonic"), Allele.getBaseSpecies("Edenic"), BeeSpecies.AWARE, 12); + BeeMutation.Vis = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.ARCANE, BeeSpecies.VIS, 9) + .setAuraNodeRequired(40); + BeeMutation.Vis1 = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.STARK, BeeSpecies.VIS, 12) + .setAuraNodeRequired(80); + BeeMutation.Pure = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.PURE, 7) + .setAuraNodeTypeRequired(5, EnumNodeType.PURE).setMoonPhaseBonus(MoonPhase.NEW, MoonPhase.NEW, 1.6f); + BeeMutation.Flux = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.FLUX, 7) + .setAuraNodeTypeRequired(30, EnumNodeType.UNSTABLE).setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 1.6f); + + BeeMutation.Node = new BeeMutation(BeeSpecies.PURE, BeeSpecies.FLUX, BeeSpecies.NODE, 2) + .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WANING_HALF, MoonPhase.WANING_HALF); + BeeMutation.Node1 = new BeeMutation(BeeSpecies.PURE, BeeSpecies.FLUX, BeeSpecies.NODE, 2) + .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WAXING_HALF); + + BeeMutation.Aura = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.AURA, 3) + .setMoonPhaseRestricted(MoonPhase.WANING_CRESCENT, MoonPhase.WANING_CRESCENT); + BeeMutation.Aura1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.AURA, 3) + .setMoonPhaseRestricted(MoonPhase.WAXING_CRESCENT, MoonPhase.WAXING_CRESCENT); + + if (ExtraBeesHelper.isActive()) + { + BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rotten"), BeeSpecies.BRAINY, 12); + BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("ancient"), BeeSpecies.GOSSAMER, 10); + BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rock"), BeeSpecies.BATTY, 14); + } + else + { + BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Sinister"), BeeSpecies.BRAINY, 10); + BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SUPERNATURAL, BeeSpecies.GOSSAMER, 10); + BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Frugal"), BeeSpecies.BATTY, 11); + } + + BeeMutation.Gossamer.setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.WANING_CRESCENT); + BeeMutation.Wispy = new BeeMutation(BeeSpecies.GOSSAMER, Allele.getBaseSpecies("Cultivated"), BeeSpecies.WISPY, 8); + } + else + { + BeeMutation.Fire = new BeeMutation(BeeSpecies.STARK, Allele.getBaseSpecies("Fiendish"), BeeSpecies.FIRE, 10); + if (ExtraBeesHelper.isActive()) + { + BeeMutation.Water = new BeeMutation(BeeSpecies.STARK, Allele.getExtraSpecies("ocean"), BeeSpecies.WATER, 12); + BeeMutation.Water = new BeeMutation(BeeSpecies.STARK, Allele.getExtraSpecies("river"), BeeSpecies.WATER, 8); + } + else + { + BeeMutation.Water = new BeeMutation(BeeSpecies.STARK, Allele.getBaseSpecies("Marshy"), BeeSpecies.WATER, 10); + } + } + + if (EquivalentExchangeHelper.isActive()) + { + BeeMutation.Minium = new BeeMutation(Allele.getBaseSpecies("Frugal"), BeeSpecies.PUPIL, BeeSpecies.MINIUM, 10); } - } - - private static void setupMutationsForestryBase() - { - BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, Allele.getBaseSpecies("Modest"), BeeSpecies.SKULKING, 10); - BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Sinister"), BeeSpecies.BRAINY, 10); - BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SUPERNATURAL, BeeSpecies.GOSSAMER, 10); - BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Frugal"), BeeSpecies.BATTY, 11); - BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Austere"), BeeSpecies.GHASTLY, 13); } private IAllele parent1; diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index 7b71522..0ef77e4 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -13,10 +13,12 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import thaumicbees.item.types.CombType; import thaumicbees.item.types.DropType; +import thaumicbees.item.types.NuggetType; import thaumicbees.item.types.PollenType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.Config; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -25,6 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; public enum BeeSpecies implements IAlleleBeeSpecies { @@ -68,6 +71,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies BeeClassification.VIS, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), NODE("Node", "conficiens", BeeClassification.VIS, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + AURA("Aura", "arcanus vitae", + BeeClassification.VIS, 0x91D0D9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), SKULKING("Skulking", "malevolens", BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), BRAINY("Brainy", "cerebrum", @@ -77,7 +82,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies WISPY("Wispy", "umbrabilis", BeeClassification.SKULKING, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), BATTY("Batty", "chiroptera", - BeeClassification.SKULKING, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false,true), + BeeClassification.SKULKING, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), GHASTLY("Ghastly", "pallens", BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), TIMELY("Timely", "gallifreis", @@ -86,10 +91,96 @@ public enum BeeSpecies implements IAlleleBeeSpecies BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), DOCTORAL("Doctoral", "medicus qui", BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + MINIUM("Minium", "mutabilis", + BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + SPIRIT("Spirit", "larva", + BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true), + SOUL("Soul", "anima", + BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false), + IRON("Iron", "ferrus", + BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + GOLD("Gold", "aurum", + BeeClassification.METALLIC, 0x684B01, 0xFFFF0B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + COPPER("Copper", "aercus", + BeeClassification.METALLIC, 0x684B01, 0xFFC81A, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + TIN("Tin", "stannum", + BeeClassification.METALLIC, 0x3E596D, 0xA6BACB, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + SILVER("Silver", "argenteus", + BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + LEAD("Lead", "plumbeus", + BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + DIAMOND("Diamond", "diamond", + BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + EMERALD("Emerald", "prasinus", + BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + CHICKEN("Chicken", "pullus", + BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BEEF("Beef", "bubulae", + BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + PORK("Pork", "porcina", + BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), ; public static void setupBeeSpecies() { + // Species must be set inactive prior to registration. + if (ThaumcraftHelper.isActive()) + { + AIR.addSpecialty(new ItemStack(Config.tcNuggets, 1, ThaumcraftHelper.NuggetType.QUICKSILVER.ordinal()), 8); + EARTH.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), 6); + BRAINY.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 2); + CHICKEN.addSpecialty(new ItemStack(Config.tcNuggetChicken, 1), 9); + BEEF.addSpecialty(new ItemStack(Config.tcNuggetBeef, 1), 9); + PORK.addSpecialty(new ItemStack(Config.tcNuggetPork, 1), 9); + } + else + { + SCHOLARLY.setInactive(); + SAVANT.setInactive(); + AIR.setInactive(); + EARTH.setInactive(); + INFUSED.setInactive(); + PURE.setInactive(); + FLUX.setInactive(); + NODE.setInactive(); + AURA.setInactive(); + BRAINY.setInactive(); + GOSSAMER.setInactive(); + WISPY.setInactive(); + BATTY.setInactive(); + CHICKEN.setInactive(); + BEEF.setInactive(); + PORK.setInactive(); + } + + if (EquivalentExchangeHelper.isActive()) + { + MINIUM.addSpecialty(new ItemStack(Config.eeMinuimShard), 6); + } + else + { + MINIUM.setInactive(); + } + + // Oredict bees + if (OreDictionary.getOres("ingotCopper").size() <= 0) + { + COPPER.setInactive(); + } + if (OreDictionary.getOres("ingotTin").size() <= 0) + { + TIN.setInactive(); + } + if (OreDictionary.getOres("ingotSilver").size() <= 0) + { + SILVER.setInactive(); + } + if (OreDictionary.getOres("ingotLead").size() <= 0) + { + LEAD.setInactive(); + } + + ESOTERIC.addProduct(Config.combs.getStackForType(CombType.OCCULT), 20) .setGenome(BeeGenomeManager.getTemplateEsoteric()) .register(); @@ -112,7 +203,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies .register(); PUPIL.addProduct(Config.combs.getStackForType(CombType.PAPERY), 20) .setGenome(BeeGenomeManager.getTemplatePupil()) - .register(); + .register(); SCHOLARLY.addProduct(Config.combs.getStackForType(CombType.PAPERY), 25) .addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 2) .setGenome(BeeGenomeManager.getTemplateScholarly()) @@ -120,17 +211,15 @@ public enum BeeSpecies implements IAlleleBeeSpecies SAVANT.addProduct(Config.combs.getStackForType(CombType.PAPERY), 40) .addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 5) .setGenome(BeeGenomeManager.getTemplateSavant()) - .register(); + .register(); STARK.addProduct(Config.combs.getStackForType(CombType.STARK), 10) .setGenome(BeeGenomeManager.getTemplateStark()) - .register(); + .register(); AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 9) - .addSpecialty(new ItemStack(Config.tcNuggets, 1, ThaumcraftHelper.NuggetType.QUICKSILVER.ordinal()), 8) .setGenome(BeeGenomeManager.getTemplateAir()) .register(); FIRE.addProduct(Config.combs.getStackForType(CombType.FIREY), 15) - .addSpecialty(new ItemStack(Item.blazePowder), 8) - .setGenome(BeeGenomeManager.getTemplateFire()) + .addSpecialty(new ItemStack(Item.blazePowder), 4).setGenome(BeeGenomeManager.getTemplateFire()) .register(); WATER.addProduct(Config.combs.getStackForType(CombType.WATERY), 20) .addSpecialty(new ItemStack(Block.ice), 1) @@ -138,7 +227,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies .setGenome(BeeGenomeManager.getTemplateWater()) .register(); EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 30) - .addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), 6) .setGenome(BeeGenomeManager.getTemplateEarth()) .register(); INFUSED.addProduct(Config.combs.getStackForType(CombType.INFUSED), 20) @@ -146,27 +234,33 @@ public enum BeeSpecies implements IAlleleBeeSpecies .register(); AWARE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18) .setGenome(BeeGenomeManager.getTemplateAware()) - .register(); + .register(); VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25) .setGenome(BeeGenomeManager.getTemplateVis()) .register(); PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) .setGenome(BeeGenomeManager.getTemplatePure()) - .register(); + .register(); FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) .setGenome(BeeGenomeManager.getTemplateFlux()) - .register(); + .register(); NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) .setGenome(BeeGenomeManager.getTemplateNode()) - .register(); + .register(); + AURA.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + .setGenome(BeeGenomeManager.getTemplateNode()) + .register(); SKULKING.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) .setGenome(BeeGenomeManager.getTemplateSkulking()) - .register(); + .register(); BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) .addProduct(new ItemStack(Item.rottenFlesh), 6) - .addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 2) .setGenome(BeeGenomeManager.getTemplateBrainy()) .register(); + BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + .addSpecialty(new ItemStack(Item.gunpowder), 4) + .setGenome(BeeGenomeManager.getTemplateBatty()) + .register(); GOSSAMER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 15) .setGenome(BeeGenomeManager.getTemplateGossamer()) .register(); @@ -174,10 +268,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies .addSpecialty(new ItemStack(Config.fCraftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 4) .setGenome(BeeGenomeManager.getTemplateWispy()) .register(); - BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) - .addSpecialty(new ItemStack(Item.gunpowder), 4) - .setGenome(BeeGenomeManager.getTemplateBatty()) - .register(); GHASTLY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 8) .addSpecialty(new ItemStack(Item.ghastTear), 2) .setGenome(BeeGenomeManager.getTemplateGhastly()) @@ -197,6 +287,56 @@ public enum BeeSpecies implements IAlleleBeeSpecies .addSpecialty(new ItemStack(Config.jellyBaby), 7) .setGenome(BeeGenomeManager.getTemplateDoctoral()) .register(); + MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16) + .setGenome(BeeGenomeManager.getTemplateMinium()) + .register(); + SPIRIT.addProduct(Config.combs.getStackForType(CombType.SOUL), 13) + .setGenome(BeeGenomeManager.getTemplateSpirit()) + .register(); + SOUL.addProduct(Config.combs.getStackForType(CombType.SOUL), 24) + .setGenome(BeeGenomeManager.getTemplateSoul()) + .register(); + IRON.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.IRON), 8) + .setGenome(BeeGenomeManager.getTemplateIron()) + .register(); + GOLD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(new ItemStack(Item.goldNugget, 1), 6) + .setGenome(BeeGenomeManager.getTemplateGold()) + .register(); + COPPER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.COPPER), 9) + .setGenome(BeeGenomeManager.getTemplateCopper()) + .register(); + TIN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.TIN), 9) + .setGenome(BeeGenomeManager.getTemplateTin()) + .register(); + SILVER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.SILVER), 6) + .setGenome(BeeGenomeManager.getTemplateSilver()) + .register(); + LEAD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.LEAD), 7) + .setGenome(BeeGenomeManager.getTemplateLead()) + .register(); + DIAMOND.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.DIAMOND), 3) + .setGenome(BeeGenomeManager.getTemplateDiamond()) + .register(); + EMERALD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.EMERALD), 2) + .setGenome(BeeGenomeManager.getTemplateEmerald()) + .register(); + CHICKEN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplateChicken()) + .register(); + BEEF.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplateBeef()) + .register(); + PORK.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplatePork()) + .register(); } private String binomial; @@ -209,6 +349,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies private boolean hasEffect; private boolean isSecret; private boolean isCounted; + private boolean isActive; private IClassification branch; private HashMap products; private HashMap specialty; @@ -216,14 +357,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies private String uid; private boolean dominant; + private final static boolean defaultSecretSetting = false; + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, classification, 0, firstColour, 0xFF6E0D, preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant); + this(speciesName, genusName, classification, 0, firstColour, 0xFF6E0D, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant); } private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant); + this(speciesName, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant); } private BeeSpecies(String speciesName, String genusName, IClassification classification, int body, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant) @@ -245,6 +388,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies specialty = new HashMap(); this.branch = classification; this.branch.addMemberSpecies(this); + this.isActive = true; } public BeeSpecies setGenome(IAllele genome[]) @@ -314,6 +458,17 @@ public enum BeeSpecies implements IAlleleBeeSpecies { return hasEffect; } + + public BeeSpecies setInactive() + { + this.isActive = false; + return this; + } + + public boolean isActive() + { + return this.isActive; + } public boolean isSecret() { @@ -371,6 +526,10 @@ public enum BeeSpecies implements IAlleleBeeSpecies private BeeSpecies register() { BeeManager.breedingManager.registerBeeTemplate(this.getGenome()); + if (!this.isActive) + { + AlleleManager.alleleRegistry.blacklistAllele(this.getUID()); + } return this; } diff --git a/thaumicbees_src/thaumicbees/block/BlockEffectJar.java b/thaumicbees_src/thaumicbees/block/BlockEffectJar.java index 4425116..aef2d2c 100644 --- a/thaumicbees_src/thaumicbees/block/BlockEffectJar.java +++ b/thaumicbees_src/thaumicbees/block/BlockEffectJar.java @@ -21,7 +21,7 @@ public class BlockEffectJar extends BlockContainer @Override public TileEntity createNewTileEntity(World w) { - return new TileEntityEffectJar(w); + return new TileEntityEffectJar(); } } diff --git a/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java b/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java index 83c2971..26756b8 100644 --- a/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java +++ b/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java @@ -9,6 +9,7 @@ import thaumcraft.api.ThaumcraftApi; import thaumicbees.item.types.HiveFrameType; import thaumicbees.item.types.LiquidType; import thaumicbees.main.CommonProxy; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -60,36 +61,43 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame int damage = wear; int fluxMod = 1; - // This throttles back the amount of aura consumed by the frame by storing a smidge of data on the item stack. - if (this.type.auraPerUse > 0) + if (ThaumcraftHelper.isActive()) { - NBTTagCompound tag; - if (frame.hasTagCompound()) + // This throttles back the amount of aura consumed by the frame by storing a smidge of data on the item stack. + if (this.type.auraPerUse > 0) { - tag = frame.getTagCompound(); - } - else - { - tag = new NBTTagCompound(); - tag.setByte("wearTicks", (byte)0); - frame.setTagCompound(tag); - } - - int wearTicks = tag.getByte("wearTicks") + 1; - - if (wearTicks == this.type.wearTicksPerAura) - { - // Attempt to use aura for the frame. - if (!ThaumcraftApi.decreaseClosestAura(w, x, y, z, this.type.auraPerUse, true)) + NBTTagCompound tag; + if (frame.hasTagCompound()) { - // Insufficient aura, or no nearby node. - damage = wear + this.type.auraPerUse * this.type.wearTicksPerAura; - fluxMod = 1 + w.rand.nextInt(this.type.wearTicksPerAura); + tag = frame.getTagCompound(); } - wearTicks = 0; + else + { + tag = new NBTTagCompound(); + tag.setByte("wearTicks", (byte)0); + frame.setTagCompound(tag); + } + + int wearTicks = tag.getByte("wearTicks") + 1; + + if (wearTicks == this.type.wearTicksPerAura) + { + // Attempt to use aura for the frame. + if (!ThaumcraftApi.decreaseClosestAura(w, x, y, z, this.type.auraPerUse, true)) + { + // Insufficient aura, or no nearby node. + damage = wear + this.type.auraPerUse * this.type.wearTicksPerAura; + fluxMod = 1 + w.rand.nextInt(this.type.wearTicksPerAura); + } + wearTicks = 0; + } + + tag.setByte("wearTicks", (byte)wearTicks); } - - tag.setByte("wearTicks", (byte)wearTicks); + } + else + { + damage += 2; } frame.setItemDamage(frame.getItemDamage() + damage); diff --git a/thaumicbees_src/thaumicbees/item/ItemNugget.java b/thaumicbees_src/thaumicbees/item/ItemNugget.java new file mode 100644 index 0000000..38e0f2b --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/ItemNugget.java @@ -0,0 +1,63 @@ +package thaumicbees.item; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.EnumTag; +import thaumicbees.item.types.NuggetType; +import thaumicbees.item.types.PollenType; +import thaumicbees.item.types.ResourceType; +import thaumicbees.main.CommonProxy; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemNugget extends Item +{ + public ItemNugget(int itemID) + { + super(itemID); + this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + this.setCreativeTab(CreativeTabs.tabMaterials); + this.setHasSubtypes(true); + } + + public ItemStack getStackForType(NuggetType type) + { + return new ItemStack(this, 1, type.ordinal()); + } + + public ItemStack getStackForType(NuggetType type, int count) + { + return new ItemStack(this, count, type.ordinal()); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int par1, CreativeTabs tab, List list) + { + for (NuggetType type : NuggetType.values()) + { + list.add(new ItemStack(this.itemID, 1, type.ordinal())); + } + } + + @Override + @SideOnly(Side.CLIENT) + public int getIconFromDamage(int meta) + { + int iconIdx = 0; + if (meta >= 0 && meta < NuggetType.values().length) + { + iconIdx = NuggetType.values()[meta].iconIdx; + } + return iconIdx; + } + + @Override + public String getItemDisplayName(ItemStack stack) + { + return NuggetType.values()[stack.getItemDamage()].getName(); + } +} diff --git a/thaumicbees_src/thaumicbees/item/types/CombType.java b/thaumicbees_src/thaumicbees/item/types/CombType.java index 7d154bb..5c8a9fb 100644 --- a/thaumicbees_src/thaumicbees/item/types/CombType.java +++ b/thaumicbees_src/thaumicbees/item/types/CombType.java @@ -16,6 +16,7 @@ public enum CombType INFUSED("magic", 0xaa32fc, 0x7A489E, false), INTELLECT("aware", 0x618fff, 0xb0092e9, false), SKULKING("furtive", 0x545454, 0xcda6cd, true), + SOUL("soul", 0x3C1E00, 0x8A4500, true), ; private CombType(String pName, int colourA, int colourB, boolean show) diff --git a/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java b/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java index be1a3d6..4018dae 100644 --- a/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java +++ b/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java @@ -19,6 +19,8 @@ public enum HiveFrameType new ObjectTags().add(EnumTag.DEATH, 3).add(EnumTag.POISON, 2)), TEMPORAL("temporal", 37, 300, 1f, 1f, 2.5f, 1f, 1, 5, new ObjectTags().add(EnumTag.TIME, 5)), + OBLIVION("oblivion", 38, 60, 1f, 1f, 0.0001f, 0f, 15, 1, + new ObjectTags().add(EnumTag.TIME, 5).add(EnumTag.DEATH, 5)), ; private HiveFrameType(String name, int icon, int damage, diff --git a/thaumicbees_src/thaumicbees/item/types/NuggetType.java b/thaumicbees_src/thaumicbees/item/types/NuggetType.java new file mode 100644 index 0000000..4e9c601 --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/types/NuggetType.java @@ -0,0 +1,27 @@ +package thaumicbees.item.types; + +import thaumicbees.main.utils.LocalizationManager; + +public enum NuggetType +{ + IRON(5), + COPPER(6), + TIN(7), + SILVER(8), + LEAD(9), + DIAMOND(10), + EMERALD(11), + ; + + public int iconIdx; + + private NuggetType(int idx) + { + this.iconIdx = idx; + } + + public String getName() + { + return LocalizationManager.getLocalizedString("tb.nugget." + this.toString().toLowerCase()); + } +} diff --git a/thaumicbees_src/thaumicbees/item/types/WaxType.java b/thaumicbees_src/thaumicbees/item/types/WaxType.java index 8120948..baf862a 100644 --- a/thaumicbees_src/thaumicbees/item/types/WaxType.java +++ b/thaumicbees_src/thaumicbees/item/types/WaxType.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; public enum WaxType { MAGIC("magic", false, 0xd242df), + SOUL("soul", true, 0x8A4500), ; private WaxType(String n, boolean sp, int c) diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index 78278f9..1cff407 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -9,6 +9,7 @@ import thaumicbees.item.ItemComb; import thaumicbees.item.ItemDrop; import thaumicbees.item.ItemMagicHiveFrame; import thaumicbees.item.ItemMiscResources; +import thaumicbees.item.ItemNugget; import thaumicbees.item.ItemPollen; import thaumicbees.item.ItemPropolis; import thaumicbees.item.ItemThaumiumGrafter; @@ -17,10 +18,12 @@ import thaumicbees.item.ItemSolidFlux; import thaumicbees.item.ItemWax; import thaumicbees.item.types.CapsuleType; import thaumicbees.item.types.HiveFrameType; +import thaumicbees.item.types.NuggetType; import thaumicbees.item.types.PlankType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; import thaumicbees.storage.BackpackDefinition; @@ -40,6 +43,8 @@ import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.Property; @@ -54,10 +59,10 @@ public class Config { public boolean DrawParticleEffects; public boolean BeeInfusionsAdded; - public boolean ExtraBeesInstalled; public boolean AddThaumcraftItemsToBackpacks; public boolean SkipUpdateCheck; public boolean AreMagicPlanksFlammable; + public boolean UseImpregnatedStickInTools; public String ThaumaturgeExtraItems; public int capsuleStackSizeMax; @@ -75,6 +80,7 @@ public class Config public static ItemFood jellyBaby; public static ItemThaumiumScoop thaumiumScoop; public static ItemThaumiumGrafter thaumiumGrafter; + public static ItemNugget nuggets; //----- Liquid Capsules -------------------- public static ItemCapsule magicCapsule; @@ -87,6 +93,7 @@ public class Config public static ItemMagicHiveFrame hiveFrameMetabolic; public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; + public static ItemMagicHiveFrame hiveFrameOblivion; //----- Backpacks ------------------------------------------ public static Item thaumaturgeBackpackT1; @@ -115,6 +122,11 @@ public class Config public static Item tcGolem; public static Item tcWispEssence; public static Item tcNuggets; + public static Item tcNuggetChicken; + public static Item tcNuggetBeef; + public static Item tcNuggetPork; + //----- Equivalent Exchange Items -------------------------- + public static Item eeMinuimShard; //----- Config State info ---------------------------------- @@ -135,32 +147,43 @@ public class Config public void setupBlocks() { - ThaumcraftHelper.getThaumcraftBlocks(); - ForestryHelper.getForestryBlocks(); + ThaumcraftHelper.getBlocks(); + ForestryHelper.getBlocks(); + EquivalentExchangeHelper.getBlocks(); int blockIdBase = 1750; - planksWood = new BlockPlanks(tbConfig.getBlock("planksTC", blockIdBase++).getInt()); - - Item item = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()) - .setItemName(planksWood.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); - Item.itemsList[planksWood.blockID] = item; - - OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); - - slabWoodFull = new BlockWoodSlab(tbConfig.getBlock("slabFull", blockIdBase++).getInt(), true); - slabWoodHalf = new BlockWoodSlab(tbConfig.getBlock("slabHalf", blockIdBase++).getInt(), false); - - item = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false) - .setItemName(slabWoodHalf.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); - Item.itemsList[slabWoodHalf.blockID] = item; - item = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true) - .setItemName(slabWoodFull.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); - Item.itemsList[slabWoodFull.blockID] = item; - - OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); - - blockIdBase++; // Stair + { + int plankId = tbConfig.getBlock("planksTC", blockIdBase++).getInt(); + int slabFullId = tbConfig.getBlock("slabFull", blockIdBase++).getInt(); + int slabHalfId = tbConfig.getBlock("slabHalf", blockIdBase++).getInt(); + + if (ThaumcraftHelper.isActive()) + { + planksWood = new BlockPlanks(plankId); + + Item item = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()) + .setItemName(planksWood.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Item.itemsList[planksWood.blockID] = item; + + OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); + FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal()); + FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal()); + + slabWoodFull = new BlockWoodSlab(slabFullId, true); + slabWoodHalf = new BlockWoodSlab(slabHalfId, false); + + item = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false) + .setItemName(slabWoodHalf.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Item.itemsList[slabWoodHalf.blockID] = item; + item = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true) + .setItemName(slabWoodFull.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Item.itemsList[slabWoodFull.blockID] = item; + + OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); + } + } + } public void registerTileEntities() @@ -170,8 +193,9 @@ public class Config public void setupItems() { - ThaumcraftHelper.getThaumcraftItems(); - ForestryHelper.getForestryItems(); + ThaumcraftHelper.getItems(); + ForestryHelper.getItems(); + EquivalentExchangeHelper.getItems(); int itemIDBase = 26090; @@ -188,35 +212,45 @@ public class Config // Make Aromatic Lumps a swarmer inducer. Chance is /1000. BeeManager.inducers.put(miscResources.getStackForType(ResourceType.AROMATIC_LUMP), 80); - try { - // 0x8700C6 = purpleish. - String backpackName = LocalizationManager.getLocalizedString("tb.backpack.thaumaturge"); - BackpackDefinition def = new BackpackDefinition("thaumaturge", backpackName, 0x8700C6); - thaumaturgeBackpackT1 = - BackpackManager.backpackInterface.addBackpack(tbConfig.getItem("thaumaturgePack1", itemIDBase++).getInt(), - def, EnumBackpackType.T1); - thaumaturgeBackpackT2 = - BackpackManager.backpackInterface.addBackpack(tbConfig.getItem("thaumaturgePack2", itemIDBase++).getInt(), - def, EnumBackpackType.T2); - // Add additional items from configs to backpack. - if (ThaumicBees.getConfig().ThaumaturgeExtraItems.length() > 0) + int tier1 = tbConfig.getItem("thaumaturgePack1", itemIDBase++).getInt(); + int tier2 = tbConfig.getItem("thaumaturgePack2", itemIDBase++).getInt(); + + if (ThaumcraftHelper.isActive()) { - FMLLog.info("Attempting to add extra items to Thaumaturge's backpack! If you get an error, check your ThaumicBees.conf."); - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ThaumicBees.getConfig().ThaumaturgeExtraItems); + try + { + // 0x8700C6 = purpleish. + String backpackName = LocalizationManager.getLocalizedString("tb.backpack.thaumaturge"); + BackpackDefinition def = new BackpackDefinition("thaumaturge", backpackName, 0x8700C6); + thaumaturgeBackpackT1 = BackpackManager.backpackInterface.addBackpack(tier1, def, EnumBackpackType.T1); + thaumaturgeBackpackT2 = BackpackManager.backpackInterface.addBackpack(tier2, def, EnumBackpackType.T2); + // Add additional items from configs to backpack. + if (ThaumicBees.getConfig().ThaumaturgeExtraItems.length() > 0) + { + FMLLog.info("Attempting to add extra items to Thaumaturge's backpack! If you get an error, check your ThaumicBees.conf."); + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ThaumicBees.getConfig().ThaumaturgeExtraItems); + } + } + catch (Exception e) + { + FMLLog.severe("ThaumicBees encountered a problem during loading!"); + FMLLog.severe("Could not register backpacks via Forestry. Check your FML Client log and see if Forestry crashed silently."); + } } } - catch (Exception e) - { - FMLLog.severe("ThaumicBees encountered a problem during loading!"); - FMLLog.severe("Could not register backpacks via Forestry. Check your FML Client log and see if Forestry crashed silently."); - } - magicCapsule = new ItemCapsule(CapsuleType.MAGIC, tbConfig.getItem("magicCapsule", itemIDBase++).getInt(), this.capsuleStackSizeMax); pollen = new ItemPollen(tbConfig.getItem("pollen", itemIDBase++).getInt()); - solidFlux = new ItemSolidFlux(tbConfig.getItem("fluxCrystal", itemIDBase++).getInt()); + + { + int crystalId = tbConfig.getItem("fluxCrystal", itemIDBase++).getInt(); + if (ThaumcraftHelper.isActive()) + { + solidFlux = new ItemSolidFlux(crystalId); + } + } hiveFrameMagic = new ItemMagicHiveFrame(tbConfig.getItem("frameMagic", itemIDBase++).getInt(), HiveFrameType.MAGIC); hiveFrameResilient = new ItemMagicHiveFrame(tbConfig.getItem("frameResilient", itemIDBase++).getInt(), HiveFrameType.RESILIENT); @@ -224,6 +258,7 @@ public class Config hiveFrameMetabolic = new ItemMagicHiveFrame(tbConfig.getItem("frameMetabolic", itemIDBase++).getInt(), HiveFrameType.METABOLIC); hiveFrameNecrotic = new ItemMagicHiveFrame(tbConfig.getItem("frameNecrotic", itemIDBase++).getInt(), HiveFrameType.NECROTIC); hiveFrameTemporal = new ItemMagicHiveFrame(tbConfig.getItem("frameTemporal", itemIDBase++).getInt(), HiveFrameType.TEMPORAL); + hiveFrameOblivion = new ItemMagicHiveFrame(tbConfig.getItem("frameOblivion", itemIDBase++).getInt(), HiveFrameType.OBLIVION); // Future frames, so they all are clumped together. itemIDBase++; itemIDBase++; @@ -233,19 +268,42 @@ public class Config itemIDBase++; itemIDBase++; itemIDBase++; - itemIDBase++; - // Jelly babies for Dr. Whoniversary. + ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 1, 18)); + ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 3, 23)); + jellyBaby = new ItemFood(tbConfig.getItem("jellyBabies", itemIDBase++).getInt(), 1, false).setAlwaysEdible() .setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f); jellyBaby.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE).setIconIndex(19).setItemName("jellyBabies"); voidCapsule = new ItemCapsule(CapsuleType.VOID, tbConfig.getItem("voidCapsule", itemIDBase++).getInt(), this.capsuleStackSizeMax); - thaumiumScoop = new ItemThaumiumScoop(tbConfig.getItem("thaumiumScoop", itemIDBase++).getInt()); - MinecraftForge.setToolClass(thaumiumScoop, "scoop", 3); + { + int scoopID = tbConfig.getItem("thaumiumScoop", itemIDBase++).getInt(); + int grafterID = tbConfig.getItem("thaumiumGrafter", itemIDBase++).getInt(); + if (ThaumcraftHelper.isActive()) + { + thaumiumScoop = new ItemThaumiumScoop(scoopID); + MinecraftForge.setToolClass(thaumiumScoop, "scoop", 3); + + thaumiumGrafter = new ItemThaumiumGrafter(grafterID); + MinecraftForge.setToolClass(thaumiumGrafter, "grafter", 3); + } + } - thaumiumGrafter = new ItemThaumiumGrafter(tbConfig.getItem("thaumiumGrafter", itemIDBase++).getInt()); + // Other tools I might need in the future + itemIDBase++; + itemIDBase++; + + nuggets = new ItemNugget(tbConfig.getItem("beeNuggets", itemIDBase++).getInt()); + + OreDictionary.registerOre("nuggetIron", nuggets.getStackForType(NuggetType.IRON)); + OreDictionary.registerOre("nuggetCopper", nuggets.getStackForType(NuggetType.COPPER)); + OreDictionary.registerOre("nuggetTin", nuggets.getStackForType(NuggetType.TIN)); + OreDictionary.registerOre("nuggetSilver", nuggets.getStackForType(NuggetType.SILVER)); + OreDictionary.registerOre("nuggetLead", nuggets.getStackForType(NuggetType.LEAD)); + OreDictionary.registerOre("shardDiamond", nuggets.getStackForType(NuggetType.DIAMOND)); + OreDictionary.registerOre("shardEmerald", nuggets.getStackForType(NuggetType.EMERALD)); } private void doMiscConfig() @@ -274,6 +332,10 @@ public class Config p = tbConfig.get("general", "areMagicPlanksFlammable", false); p.comment = "Set to true to allow Greatwood & Silverwood planks to burn in a fire."; this.AreMagicPlanksFlammable = p.getBoolean(false); + + p = tbConfig.get("general", "useImpregnatedStickInTools", false); + p.comment = "Set to true to make Thaumium Grafter & Scoop require impregnated sticks in the recipe."; + this.UseImpregnatedStickInTools = p.getBoolean(false); } } diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index 3775a67..340e049 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -3,14 +3,19 @@ package thaumicbees.main; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; +import thaumicbees.item.types.PlankType; import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.CraftingManager; import thaumicbees.main.utils.LocalizationManager; import thaumicbees.main.utils.VersionInfo; +import thaumicbees.main.utils.compat.EquivalentExchangeHelper; +import thaumicbees.main.utils.compat.ExtraBeesHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import forestry.api.core.ItemInterface; @@ -47,14 +52,15 @@ public class ThaumicBees this.configsPath = event.getModConfigurationDirectory().getAbsolutePath(); this.modConfig = new Config(event.getSuggestedConfigurationFile()); - CompatabilityManager.registerResearch(); + // Compatibility Helpers setup time. + ThaumcraftHelper.init(); + ExtraBeesHelper.init(); + EquivalentExchangeHelper.init(); } @Mod.Init public void init(FMLInitializationEvent event) { - // Check on ExtraBees & enable content. =D - this.modConfig.ExtraBeesInstalled = cpw.mods.fml.common.Loader.isModLoaded("ExtraBees"); this.proxy.preloadTextures(); try @@ -73,25 +79,24 @@ public class ThaumicBees this.modConfig.registerTileEntities(); this.modConfig.setupItems(); - CompatabilityManager.setupBuildCraftFacades(); CompatabilityManager.setupBackpacks(); } @Mod.PostInit public void postInit(FMLPostInitializationEvent event) { - this.setupBees(); + thaumicbees.bees.Allele.setupAdditionalAlleles(); + thaumicbees.bees.BeeSpecies.setupBeeSpecies(); + thaumicbees.bees.BeeMutation.setupMutations(); + this.modConfig.saveConfigs(); - CompatabilityManager.setupItemAspects(); + ThaumcraftHelper.setupItemAspects(); // Vanilla, Forestry & Thaumcraft crafting setup CraftingManager.setupCrafting(); - // Forestry has init'd by this point. - MinecraftForge.EVENT_BUS.register(this); - - CompatabilityManager.setupResearch(); + ThaumcraftHelper.setupResearch(); VersionInfo.doVersionCheck(); } @@ -100,11 +105,4 @@ public class ThaumicBees { return object.modConfig; } - - private void setupBees() - { - thaumicbees.bees.Allele.setupAdditionalAlleles(); - thaumicbees.bees.BeeSpecies.setupBeeSpecies(); - thaumicbees.bees.BeeMutation.setupMutations(); - } } diff --git a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java index 9a09c60..34218e3 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java @@ -56,475 +56,9 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; public class CompatabilityManager -{ - public static ItemStack getExtraBeeItem(String field) - { - ItemStack value = null; - try - { - Class src = Class.forName("binnie.extrabees.core.ExtraBeeItem"); - Field f = src.getDeclaredField(field); - - Item i = (Item) f.get(null); - value = new ItemStack(i); - } - catch (Exception e) { } - return value; - } - +{ public static void setupBackpacks() { - if (ThaumicBees.getConfig().AddThaumcraftItemsToBackpacks) - { - // Add all shards and Thaumium to miner's backpack - String ids = Config.tcShard.itemID + ":" + -1 + ";" - + Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.THAUMIUM.ordinal(); - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "miner@" + ids); - - // All resources go into Thaumaturge's backpack - ids = Config.tcMiscResource.itemID + ":" + -1 + ";" - + Config.tcShard.itemID + ":" + -1 + ";" - + Config.tcFilledJar.itemID + ":" + -1 + ";" - + Config.tcCrystal.blockID + ":" + -1 + ";" - + Config.tcJar.blockID + ":" + -1 + ";" - + Config.tcGolem.itemID + ":" + -1 + ";" - + Config.solidFlux.itemID + ":" + -1; - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ids); - - // Add some plants & saplings to Forester's - ids = Config.tcPlant.blockID + ":" + "-1" + ";" - + Config.tcLeaf.blockID + ":" + -1 + ";" - + Config.tcLog.blockID + ":" + "-1"; - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "forester@" + ids); - - // Add Wisp & brains to Hunter's - ids = Config.tcWispEssence.itemID + ":" + -1 + ";" - + Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal(); - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "hunter@" + ids); - - // Add Marker, warded stone, candle to builder - ids = Config.tcCandle.blockID + ":" + -1 + ";" - + Config.tcMarker.blockID + ":" + -1 + ";" - + Config.tcWarded.blockID + ":" + -1; - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "builder@" + ids); - } - } - - public static void setupItemAspects() - { - setupItemAspectsThaumicBees(); - setupItemAspectsForestry(); - if (ThaumicBees.getConfig().ExtraBeesInstalled) - { - setupItemAspectsExtraBees(); - } - } - - private static void setupItemAspectsThaumicBees() - { - ObjectTags tags; - ItemStack itemStack; - - tags = new ObjectTags().add(EnumTag.WOOD, 2); - ThaumcraftApi.registerObjectTag(Config.planksWood.blockID, -1, tags); - - tags = new ObjectTags().add(EnumTag.MAGIC, 2); - ThaumcraftApi.registerObjectTag(Config.wax.itemID, WaxType.MAGIC.ordinal(), tags); - - tags = new ObjectTags().add(EnumTag.MAGIC, 1); - ThaumcraftApi.registerObjectTag(Config.drops.itemID, DropType.ENCHANTED.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.KNOWLEDGE, 1); - ThaumcraftApi.registerObjectTag(Config.drops.itemID, DropType.INTELLECT.ordinal(), tags); - - tags = new ObjectTags().add(EnumTag.ELDRITCH, 2); - ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.UNUSUAL.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.TIME, 2); - ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.PHASED.ordinal(), tags); - - tags = new ObjectTags().add(EnumTag.CONTROL, 1); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, -1, tags); - tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.STARK.ordinal(), tags); - tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.WIND, 3); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.AIR.ordinal(), tags); - tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.FIRE, 3); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.FIRE.ordinal(), tags); - tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.WATER, 3); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.WATER.ordinal(), tags); - tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.EARTH, 3); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.EARTH.ordinal(), tags); - tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 4); - ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.INFUSED.ordinal(), tags); - - tags = new ObjectTags().add(EnumTag.KNOWLEDGE, 3); - ThaumcraftApi.registerObjectTag(Config.miscResources.itemID, ResourceType.LORE_FRAGMENT.ordinal(), tags); - - tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, -1, tags); - tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OCCULT.ordinal(), tags); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OTHERWORLDLY.ordinal(), tags); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.STARK.ordinal(), tags); - tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 4); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.INFUSED.ordinal(), tags); - tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.MOTION, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.AIRY.ordinal(), tags); - tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.POWER, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.FIREY.ordinal(), tags); - tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.COLD, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.WATERY.ordinal(), tags); - tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.ROCK, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.EARTHY.ordinal(), tags); - - // Tagging capsules. - tags = new ObjectTags().add(EnumTag.VOID, 2).add(EnumTag.MAGIC, 2); - ThaumcraftApi.registerComplexObjectTag(Config.magicCapsule.itemID, LiquidType.EMPTY.ordinal(), tags); - tags = new ObjectTags(Config.magicCapsule.itemID, LiquidType.EMPTY.ordinal()) - .add(EnumTag.WATER, 8); - ThaumcraftApi.registerObjectTag(Config.magicCapsule.itemID, LiquidType.WATER.ordinal(), tags); - tags = new ObjectTags(Config.magicCapsule.itemID, LiquidType.EMPTY.ordinal()) - .add(EnumTag.FIRE, 12).add(EnumTag.ROCK, 4); - ThaumcraftApi.registerObjectTag(Config.magicCapsule.itemID, LiquidType.LAVA.ordinal(), tags); - - for (EnumTag tag : EnumTag.values()) - { - if (tag == EnumTag.UNKNOWN) - { - continue; - } - tags = new ObjectTags().add(tag, 1); - ThaumcraftApi.registerObjectTag(Config.solidFlux.itemID, tag.id, tags); - } - } - - private static void setupItemAspectsForestry() - { - ObjectTags tags; - ItemStack itemStack; - - itemStack = BlockInterface.getBlock("candle"); - tags = new ObjectTags().add(EnumTag.LIGHT, 1).add(EnumTag.CONTROL, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = BlockInterface.getBlock("glass"); - tags = new ObjectTags(Block.glass.blockID, 0); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - - // Pulsating propolis - itemStack = ItemInterface.getItem("propolis"); - tags = new ObjectTags().add(EnumTag.CONTROL, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.ELDRITCH, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Propolis.PULSATING.ordinal(), tags); - - itemStack = ItemInterface.getItem("pollen"); - tags = new ObjectTags().add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Pollen.NORMAL.ordinal(), tags); - tags = new ObjectTags(itemStack.itemID, ForestryHelper.Pollen.NORMAL.ordinal()).add(EnumTag.COLD, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Pollen.CRYSTALLINE.ordinal(), tags); - - itemStack = ItemInterface.getItem("craftingMaterial"); - tags = new ObjectTags().add(EnumTag.ELDRITCH, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.PULSATING_MESH.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.INSECT, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.INSECT, 4).add(EnumTag.CLOTH, 5); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.WOVEN_SILK.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.COLD, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.ICE_SHARD.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.VALUABLE, 1).add(EnumTag.PLANT, 1).add(EnumTag.INSECT, 2) - .add(EnumTag.CONTROL, 2).add(EnumTag.WOOD, 5); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.SCENTED_PANELING.ordinal(), tags); - - itemStack = ItemInterface.getItem("beealyzer"); - tags = new ObjectTags().add(EnumTag.VALUABLE, 3).add(EnumTag.MECHANISM, 3).add(EnumTag.METAL, 19) - .add(EnumTag.POWER, 8).add(EnumTag.TOOL, 18); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("treealyzer"); - tags = new ObjectTags().add(EnumTag.POWER, 3).add(EnumTag.PURE, 3).add(EnumTag.LIFE, 6) - .add(EnumTag.TOOL, 12).add(EnumTag.METAL, 19); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("apatite"); - tags = new ObjectTags().add(EnumTag.CRYSTAL, 2).add(EnumTag.POWER, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("impregnatedCasing"); - tags = new ObjectTags().add(EnumTag.WOOD, 56).add(EnumTag.EXCHANGE, 8); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("stickImpregnated"); - tags = new ObjectTags().add(EnumTag.WOOD, 6).add(EnumTag.EXCHANGE, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("peat"); - tags = new ObjectTags().add(EnumTag.POWER, 2).add(EnumTag.PLANT, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("ash"); - tags = new ObjectTags().add(EnumTag.DESTRUCTION, 1).add(EnumTag.EXCHANGE, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("honeyDrop"); - tags = new ObjectTags().add(EnumTag.EXCHANGE, 2).add(EnumTag.LIFE, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("honeydew"); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("royalJelly"); - tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.POWER, 1).add(EnumTag.VALUABLE, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("honeyPot"); - tags = new ObjectTags().add(EnumTag.LIFE, 2); - ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("ambrosia"); - tags = new ObjectTags().add(EnumTag.HEAL, 4); - ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("beeswax"); - tags = new ObjectTags().add(EnumTag.CONTROL, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("refractoryWax"); - tags = new ObjectTags().add(EnumTag.FIRE, 3); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("phosphor"); - tags = new ObjectTags().add(EnumTag.FIRE, 2).add(EnumTag.DESTRUCTION, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("waxCapsule"); - tags = new ObjectTags().add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("waxCapsuleWater"); - tags = new ObjectTags().add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("refractoryEmpty"); - tags = new ObjectTags().add(EnumTag.FIRE, 1).add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("refractoryWater"); - tags = new ObjectTags().add(EnumTag.FIRE, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("refractoryLava"); - tags = new ObjectTags().add(EnumTag.VOID, 1).add(EnumTag.FIRE, 7).add(EnumTag.WATER, 1).add(EnumTag.ROCK, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("canEmpty"); - tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("canWater"); - tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - itemStack = ItemInterface.getItem("canLava"); - tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1).add(EnumTag.FIRE, 6).add(EnumTag.WATER, 1).add(EnumTag.ROCK, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); - - itemStack = ItemInterface.getItem("beeComb"); - tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.FIRE, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.SIMMERING.ordinal(), tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.COLD, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.FROZEN.ordinal(), tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.CROP, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.WHEATEN.ordinal(), tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.FUNGUS, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.MOSSY.ordinal(), tags); - - itemStack = ItemInterface.getItem("ambrosia"); - tags = new ObjectTags().add(EnumTag.LIFE, 2).add(EnumTag.HEAL, 4); - - // Forestry's wood - itemStack = BlockInterface.getBlock("log1"); - tags = new ObjectTags().add(EnumTag.WOOD, 8); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - itemStack = BlockInterface.getBlock("log2"); // Same tags - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - itemStack = BlockInterface.getBlock("log3"); // Same tags. - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - itemStack = BlockInterface.getBlock("log4"); // Still same tags. - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - - itemStack = ItemInterface.getItem("sapling"); - tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - - // BEES! - itemStack = ItemInterface.getItem("beeDroneGE"); - tags = new ObjectTags().add(EnumTag.INSECT, 1).add(EnumTag.FLIGHT, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); // All drones - - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.VALUABLE, 4); // Get drone tags & add valuable - itemStack = ItemInterface.getItem("beePrincessGE"); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); // All princesses. - - tags = new ObjectTags().add(EnumTag.VALUABLE, 8).add(EnumTag.INSECT, 2).add(EnumTag.FLIGHT, 4); - itemStack = ItemInterface.getItem("beeQueenGE"); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); //All queens. - - itemStack = ItemInterface.getItem("circuitboards"); - tags = new ObjectTags().add(EnumTag.CRYSTAL, 2).add(EnumTag.METAL, 5).add(EnumTag.MECHANISM, 10) - .add(EnumTag.POWER, 10); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.BASIC.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.MECHANISM, 10).add(EnumTag.POWER, 10).add(EnumTag.METAL, 14) - .add(EnumTag.CONTROL, 2).add(EnumTag.EXCHANGE, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.ENHANCED.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.MECHANISM, 10).add(EnumTag.POWER, 10).add(EnumTag.METAL, 14); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.REFINED.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.MECHANISM, 10).add(EnumTag.POWER, 10).add(EnumTag.METAL, 19) - .add(EnumTag.VALUABLE, 10); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.INTRICATE.ordinal(), tags); - - itemStack = ItemInterface.getItem("tubes"); - tags = new ObjectTags(ItemInterface.getItem("ingotCopper").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.COPPER.ordinal(), tags); - tags = new ObjectTags(ItemInterface.getItem("ingotTin").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.TIN.ordinal(), tags); - tags = new ObjectTags(ItemInterface.getItem("ingotBronze").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BRONZE.ordinal(), tags); - tags = new ObjectTags(Item.ingotIron.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.IRON.ordinal(), tags); - tags = new ObjectTags(Item.ingotGold.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.GOLD.ordinal(), tags); - tags = new ObjectTags(Item.diamond.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.DIAMOND.ordinal(), tags); - tags = new ObjectTags(Block.obsidian.blockID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.OBSIDIAN.ordinal(), tags); - tags = new ObjectTags(Item.blazePowder.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BLAZE.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.MOTION, 2).add(EnumTag.CONTROL, 2).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.RUBBER.ordinal(), tags); - tags = new ObjectTags(Item.emerald.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.EMERALD.ordinal(), tags); - tags = new ObjectTags(ItemInterface.getItem("apatite").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.APATITE.ordinal(), tags); - tags = new ObjectTags(Item.dyePowder.itemID, 4).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.LAPIS.ordinal(), tags); - } - - private static void setupItemAspectsExtraBees() - { - ItemStack itemStack; - ObjectTags tags; - - try // One try block suffices. If we can't get one item, it's probably safe to assume we can't get any others. - { - itemStack = getExtraBeeItem("comb"); - tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.POWER, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.OIL.ordinal(), tags); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.COAL.ordinal(), tags); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.FUEL.ordinal(), tags); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.ALCOHOL.ordinal(), tags); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.REDSTONE.ordinal(), tags); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.URANIUM.ordinal(), tags); - tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.POISON, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.VENOMOUS.ordinal(), tags); - - itemStack = getExtraBeeItem("propolis"); - tags = new ObjectTags().add(EnumTag.CONTROL, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - - itemStack = getExtraBeeItem("honeyDrop"); - tags = new ObjectTags().add(EnumTag.EXCHANGE, 2).add(EnumTag.LIFE, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - } - catch (NullPointerException e) { } - } - - private static void setupItemAspectsOreDict() - { - - } - - public static void setupBuildCraftFacades() - { - FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal()); - FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal()); - } - - public static void setupResearch() - { - ObjectTags tags; - - tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.PLANT, 10).add(EnumTag.INSECT, 10); - ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 1, Config.miscResources.getStackForType(ResourceType.RESEARCH_StartNode)) - .setParents(ResearchList.getResearch("UTFT")) - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.INSECT, 9).add(EnumTag.MAGIC, 4).add(EnumTag.FLUX, 4); - ResearchItem starkHint = new ResearchItem("STARKHINT", tags, 5, 2, ItemInterface.getItem("beeQueenGE")) - .setParents(startNode) - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.INSECT, 15).add(EnumTag.MAGIC, 5).add(EnumTag.WATER, 5).add(EnumTag.EARTH, 5) - .add(EnumTag.WIND, 5).add(EnumTag.FIRE, 5); - ResearchItem beeInfusion = new ResearchItem("BEEINFUSION", tags, 5, 3, Config.miscResources.getStackForType(ResourceType.RESEARCH_BeeInfusion)) - .setParents(starkHint).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.CROP, 20).add(EnumTag.EARTH, 20).add(EnumTag.WATER, 5); - ResearchItem fertilizer = new ResearchItem("FERTILIZER", tags, 16, 0, ItemInterface.getItem("apatite")) - .setParents(startNode) - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2) - .add(EnumTag.MAGIC, 5); - ResearchItem magicFrame = new ResearchItem("HIVEFRAME", tags, 10, -2, Config.hiveFrameMagic) - .setParents(startNode) - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 10).add(EnumTag.ARMOR, 5).add(EnumTag.EXCHANGE, 6) - .add(EnumTag.MAGIC, 8); - ResearchItem magicFrame2 = new ResearchItem("HIVEFRAME2", tags, 8, -2, Config.hiveFrameResilient) - .setParents(magicFrame).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 10).add(EnumTag.LIFE, 5).add(EnumTag.EXCHANGE, 6) - .add(EnumTag.HEAL, 2).add(EnumTag.FLOWER, 6); - ResearchItem gentleFrame = new ResearchItem("HIVEFRAMEGENTLE", tags, 12, -2, Config.hiveFrameGentle) - .setParents(magicFrame).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 10).add(EnumTag.LIFE, 6).add(EnumTag.EXCHANGE, 8) - .add(EnumTag.MAGIC, 8).add(EnumTag.MOTION, 4).add(EnumTag.FLESH, 4); - ResearchItem metabolicFrame = new ResearchItem("HIVEFRAMEMETA", tags, 9, -3, Config.hiveFrameMetabolic) - .setParents(magicFrame).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 10).add(EnumTag.DEATH, 15).add(EnumTag.EXCHANGE, 6) - .add(EnumTag.MAGIC, 8).add(EnumTag.POISON, 6); - ResearchItem necroticFrame = new ResearchItem("HIVEFRAMENECRO", tags, 11, -3, Config.hiveFrameNecrotic) - .setParents(magicFrame).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 10).add(EnumTag.TIME, 4); - ResearchItem temporalFrame = new ResearchItem("HIVEFRAMETIME", tags, 9, -5, Config.hiveFrameTemporal) - .setParents(magicFrame).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.VOID, 15).add(EnumTag.CRYSTAL, 8).add(EnumTag.ELDRITCH, 8).add(EnumTag.EXCHANGE, 15); - ResearchItem voidCapsule = new ResearchItem("VOIDCAPSULE", tags, 10, 9, Config.voidCapsule) - .setParents(startNode, ResearchList.getResearch("PORTABLEHOLE")).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.WOOD, 8).add(EnumTag.INSECT, 10).add(EnumTag.TOOL, 6).add(EnumTag.MAGIC, 6); - ResearchItem scoop = new ResearchItem("THAUMIUMSCOOP", tags, 0, -3, Config.thaumiumScoop) - .setParents(ResearchList.getResearch("THAUMIUM")) - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.WOOD, 16).add(EnumTag.PLANT, 20).add(EnumTag.TOOL, 6).add(EnumTag.MAGIC, 6); - ResearchItem grafter = new ResearchItem("THAUMIUMGRAFTER", tags, 0, -4, Config.thaumiumGrafter) - .setParents(scoop) - .registerResearchItem(); - } - - public static void registerResearch() - { - ThaumcraftApi.registerResearchXML(CommonProxy.TCBEES_RESEARCH + "research.xml"); } } diff --git a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java index c1d11b7..15dda35 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java @@ -7,6 +7,7 @@ import thaumicbees.bees.Allele; import thaumicbees.bees.BeeGenomeManager; import thaumicbees.bees.BeeSpecies; import thaumicbees.item.ItemCapsule; +import thaumicbees.item.ItemWax; import thaumicbees.item.types.CombType; import thaumicbees.item.types.DropType; import thaumicbees.item.types.HiveFrameType; @@ -16,6 +17,7 @@ import thaumicbees.item.types.PropolisType; import thaumicbees.item.types.ResourceType; import thaumicbees.item.types.WaxType; import thaumicbees.main.Config; +import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ShapelessBeeInfusionCraftingRecipe; import thaumicbees.main.utils.compat.ThaumcraftHelper; import cpw.mods.fml.common.registry.GameRegistry; @@ -43,7 +45,15 @@ public class CraftingManager setupCentrifugeRecipes(); setupSqueezerRecipes(); setupCarpenterRecipes(); - setupThaumcraftCrafting(); + + if (ThaumcraftHelper.isActive()) + { + ThaumcraftHelper.setupThaumcraftCrafting(); + } + else + { + setupThaumcraftAlternativeCrafting(); + } registerLiquidContainer(Config.magicCapsule); registerLiquidContainer(Config.voidCapsule); @@ -53,34 +63,6 @@ public class CraftingManager { ItemStack input; ItemStack output; - - // Slabs - for (int i = 0; i < PlankType.values().length; ++i) - { - input = new ItemStack(Config.planksWood, 1, i); - output = new ItemStack(Config.slabWoodHalf, 6, i); - GameRegistry.addRecipe(output, new Object[] { - "PPP", - 'P', input - }); - } - - // Essentia bottles - output = new ItemStack(Config.tcEssentiaBottle); - output.stackSize = 8; - GameRegistry.addRecipe(output, new Object[] { - " C ", "GPG", "PGP", - 'G', Config.wax, - 'C', Item.clay, - 'P', Block.thinGlass - }); - - output = new ItemStack(Config.tcEssentiaBottle); - output.stackSize = 4; - GameRegistry.addRecipe(output, new Object[] { - " W ", "W W", " W ", - 'W', Config.wax - }); // Magic capsules output = new ItemStack(Config.magicCapsule); output.stackSize = 4; @@ -89,21 +71,6 @@ public class CraftingManager 'W', Config.wax.getStackForType(WaxType.MAGIC) }); - output = new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.KNOWLEDGE_FRAGMENT.ordinal()); - GameRegistry.addRecipe(output, new Object[] { - "FF", "FF", - 'F', Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT) - }); - - // T1 Thaumaturge's backpack - GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[] { - "SWS", "NCN", "SWS", - 'S', Item.silk, - 'W', Block.cloth, - 'N', new ItemStack(Config.tcMiscResource.itemID, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), - 'C', Block.chest - }); - // Concentrated Fertilizer -> Forestry fertilizer input = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); output = ItemInterface.getItem("fertilizerCompound"); @@ -133,19 +100,78 @@ public class CraftingManager 'D', Config.drops.getStackForType(DropType.INTELLECT), 'B', Item.glassBottle }); - - // "bottling" Crystal aspects. - for (EnumTag tag : EnumTag.values()) + + GameRegistry.addRecipe(new ItemStack(Block.slowSand, 0, 4), new Object[] { + "SwS", "wDw", "SwS", + 'S', Block.sand, + 'D', Block.dirt, + 'w', Config.wax.getStackForType(WaxType.SOUL) + }); + GameRegistry.addRecipe(new ItemStack(Block.slowSand, 0, 4), new Object[] { + "wSw", "SDS", "wSw", + 'S', Block.sand, + 'D', Block.dirt, + 'w', Config.wax.getStackForType(WaxType.SOUL) + }); + + if (ThaumcraftHelper.isActive()) { - if (tag != EnumTag.UNKNOWN) + // Slabs + for (int i = 0; i < PlankType.values().length; ++i) { - output = new ItemStack(Config.tcEssentiaBottle, 1, tag.id + 1); + input = new ItemStack(Config.planksWood, 1, i); + output = new ItemStack(Config.slabWoodHalf, 6, i); GameRegistry.addRecipe(output, new Object[] { - "ccc", "cxc", "ccc", - 'c', new ItemStack(Config.solidFlux, 1, tag.id), - 'x', Config.tcEssentiaBottle + "PPP", + 'P', input }); } + + // Essentia bottles + output = new ItemStack(Config.tcEssentiaBottle); + output.stackSize = 8; + GameRegistry.addRecipe(output, new Object[] { + " C ", "GPG", "PGP", + 'G', Config.wax, + 'C', Item.clay, + 'P', Block.thinGlass + }); + + output = new ItemStack(Config.tcEssentiaBottle); + output.stackSize = 4; + GameRegistry.addRecipe(output, new Object[] { + " W ", "W W", " W ", + 'W', Config.wax + }); + + output = new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.KNOWLEDGE_FRAGMENT.ordinal()); + GameRegistry.addRecipe(output, new Object[] { + "FF", "FF", + 'F', Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT) + }); + + // T1 Thaumaturge's backpack + GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[] { + "SWS", "NCN", "SWS", + 'S', Item.silk, + 'W', Block.cloth, + 'N', new ItemStack(Config.tcMiscResource.itemID, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), + 'C', Block.chest + }); + + // "bottling" Crystal aspects. + for (EnumTag tag : EnumTag.values()) + { + if (tag != EnumTag.UNKNOWN) + { + output = new ItemStack(Config.tcEssentiaBottle, 1, tag.id + 1); + GameRegistry.addRecipe(output, new Object[] { + "ccc", "cxc", "ccc", + 'c', new ItemStack(Config.solidFlux, 1, tag.id), + 'x', Config.tcEssentiaBottle + }); + } + } } } @@ -161,77 +187,76 @@ public class CraftingManager RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.PAPERY), new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.paper) }, new int[] { 80, 20, 5 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.STARK), - new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.STARK) }, - new int[] { 10, 95, 15 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.AIRY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.AIR) }, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.FIREY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.FIRE) }, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.WATERY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.WATER)}, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.EARTHY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.EARTH) }, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.INFUSED), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.INFUSED) }, - new int[] { 100, 50, 65 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.INTELLECT), new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeydew"), Config.drops.getStackForType(DropType.INTELLECT) }, new int[] { 90, 40, 10 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SKULKING), new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("propolis"), ItemInterface.getItem("honeydew") }, new int[] { 90, 20, 35 }); - - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.STARK), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.DULL.ordinal())}, - new int[] { 13 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.AIR), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.FIRE), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.WATER), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.EARTH), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.INFUSED), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal())}, - new int[] { 10 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SOUL), + new ItemStack[] {Config.wax.getStackForType(WaxType.SOUL), ItemInterface.getItem("honeydew") }, + new int[] { 95, 26 }); + + if (ThaumcraftHelper.isActive()) + { + RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.STARK), + new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.STARK) }, + new int[] { 10, 95, 15 }); + RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.AIRY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.AIR) }, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.FIREY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.FIRE) }, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.WATERY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.WATER)}, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.EARTHY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.EARTH) }, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.INFUSED), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.INFUSED) }, + new int[] { 100, 50, 65 }); + + RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.STARK), + new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.DULL.ordinal())}, + new int[] { 10 }); + RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.AIR), + new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal())}, + new int[] { 10 }); + RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.FIRE), + new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal())}, + new int[] { 10 }); + RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.WATER), + new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal())}, + new int[] { 10 }); + RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.EARTH), + new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal())}, + new int[] { 10 }); + RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.INFUSED), + new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal())}, + new int[] { 10 }); + } } private static void setupSqueezerRecipes() { // Squeezer recipes - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.FIRE) }, - new LiquidStack(Block.lavaStill, 250), - new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 18); - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.WATER) }, - new LiquidStack(Block.waterStill, 500), - new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 18); + if (ThaumcraftHelper.isActive()) + { + RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.FIRE) }, + new LiquidStack(Block.lavaStill, 250), + new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 10); + RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.WATER) }, + new LiquidStack(Block.waterStill, 500), + new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 10); + } } private static void setupCarpenterRecipes() { ItemStack input; ItemStack output; - - // Carpenter recipes - input = ItemInterface.getItem("craftingMaterial"); - input.setItemDamage(3); // Set to Silk Mesh - output = new ItemStack(Config.thaumaturgeBackpackT2); - RecipeManagers.carpenterManager.addRecipe(200, new LiquidStack(Block.waterStill.blockID, 1000), null, output, new Object[] { - "WXW", "WTW", "WWW", - 'X', Item.diamond, - 'W', input, - 'T', new ItemStack(Config.thaumaturgeBackpackT1) - }); output = BlockInterface.getBlock("candle"); output.stackSize = 24; @@ -244,7 +269,7 @@ public class CraftingManager output = BlockInterface.getBlock("candle"); output.stackSize = 6; input = ItemInterface.getItem("craftingMaterial"); - input.setItemDamage(2); // Set to Silk Wisp + input.setItemDamage(ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()); // Set to Silk Wisp RecipeManagers.carpenterManager.addRecipe(30, new LiquidStack(Block.waterStill, 600), null, output, new Object[] { "WSW", 'W', Config.wax, @@ -266,149 +291,30 @@ public class CraftingManager 'D', Config.drops.getStackForType(DropType.ENCHANTED) }); - output = new ItemStack(Config.planksWood, 4, 0); - RecipeManagers.carpenterManager.addRecipe(8, new LiquidStack(Block.waterStill, 500), null, output, new Object[] { - "B", - 'B', new ItemStack(Config.tcLog, 1, 0) - }); - - output = new ItemStack(Config.planksWood, 6, 1); - RecipeManagers.carpenterManager.addRecipe(8, new LiquidStack(Block.waterStill, 500), null, output, new Object[] { - "B", - 'B', new ItemStack(Config.tcLog, 1, 1) - }); - } - - private static void setupThaumcraftCrafting() - { - ItemStack input; - ItemStack output; - - ThaumcraftApi.addArcaneCraftingRecipe("THAUMIUMSCOOP", "THAUMIUMSCOOP", 45, new ItemStack(Config.thaumiumScoop), new Object[] { - "sWs", "sTs", " T ", - 's', Item.stick, - 'W', Block.cloth, - 'T', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.THAUMIUM.ordinal()) - }); - - ThaumcraftApi.addArcaneCraftingRecipe("THAUMIUMGRAFTER", "THAUMIUMGRAFTER", 160, new ItemStack(Config.thaumiumGrafter), new Object[] { - " T", " T ", "s ", - 's', Item.stick, - 'T', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.THAUMIUM.ordinal()) - }); - - output = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); - input = ItemInterface.getItem("apatite"); - ObjectTags tags = (new ObjectTags()).add(EnumTag.CROP, 12); - output.stackSize = 2; - ThaumcraftApi.addShapelessInfusionCraftingRecipe("FERTILIZER", "FERTILIZER", 5, tags, output, new Object[] { - input - }); - - output = new ItemStack(Config.hiveFrameMagic); - input = ItemInterface.getItem("frameUntreated"); - tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8); - ThaumcraftApi.addShapelessInfusionCraftingRecipe("HIVEFRAME", "FRAMEMAGIC", 50, tags, output, new Object[] { - input - }); - - output = new ItemStack(Config.hiveFrameResilient); - tags = new ObjectTags().add(EnumTag.WOOD, 12).add(EnumTag.INSECT, 8).add(EnumTag.EXCHANGE, 12); - ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAME2", "FRAMERESILIENT", 50, tags, output, new Object[] { - " i ", "ifi", " i ", - 'f', Config.hiveFrameMagic, - 'i', Item.ingotIron - }); - - output = new ItemStack(Config.hiveFrameGentle); - tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.HEAL, 12); - ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAMEGENTLE", "FRAMEGENTLE", 50, tags, output, new Object[] { - "www", "wFw", "www", - 'F', input, - 'w', ItemInterface.getItem("beeswax") - - }); - - output = new ItemStack(Config.hiveFrameMetabolic); - tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.LIFE, 8).add(EnumTag.MOTION, 8) - .add(EnumTag.EXCHANGE, 8); - ThaumcraftApi.addShapelessInfusionCraftingRecipe("HIVEFRAMEMETA", "FRAMEMETABOLIC", 50, tags, output, new Object[] { - Item.magmaCream, - input - }); - - output = new ItemStack(Config.hiveFrameNecrotic); - tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.EXCHANGE, 12).add(EnumTag.DEATH, 16) - .add(EnumTag.POISON, 1); - ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAMENECRO", "FRAMENECROTIC", 50, tags, output, new Object[] { - " S ", "SxS", " S ", - 'S', Item.rottenFlesh, - 'x', input - }); - - output = new ItemStack(Config.hiveFrameTemporal); - tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.TIME, 2); - ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAMETIME", "FRAMETIME", 50, tags, output, new Object[] { - "tSt", "SFS", "tSt", - 't', Item.stick, - 'S', Block.sand, - 'F', input - }); - - output = Config.voidCapsule.getCapsuleForLiquid(LiquidType.EMPTY); - output.stackSize = 4; - tags = new ObjectTags().add(EnumTag.VOID, 16).add(EnumTag.ELDRITCH, 4).add(EnumTag.EXCHANGE, 8); - ThaumcraftApi.addInfusionCraftingRecipe("VOIDCAPSULE", "VOIDCAPSULE", 10, tags, output, new Object[] { - " G ", "GPG", "TGT", - 'G', Block.thinGlass, - 'P', Item.enderPearl, - 'T', Item.ingotIron - }); - - ItemStack drone = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.DRONE); - ItemStack princess = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.PRINCESS); - - String researchKey = "BEEINFUSION"; - - tags = (new ObjectTags()).add(EnumTag.WIND, 40).add(EnumTag.MOTION, 24); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION1", BeeSpecies.AIR.getBeeItem(EnumBeeType.DRONE), - new ItemStack[] { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal())}, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION2", BeeSpecies.AIR.getBeeItem(EnumBeeType.PRINCESS), - new ItemStack[] { princess , new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - - tags = (new ObjectTags()).add(EnumTag.FIRE, 40).add( EnumTag.POWER, 24); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION3", BeeSpecies.FIRE.getBeeItem(EnumBeeType.DRONE), new Object[] - { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION4", BeeSpecies.FIRE.getBeeItem(EnumBeeType.PRINCESS), new Object[] - { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - - tags = (new ObjectTags()).add(EnumTag.WATER, 40).add( EnumTag.COLD, 24); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION5", BeeSpecies.WATER.getBeeItem(EnumBeeType.DRONE), new Object[] - { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION6", BeeSpecies.WATER.getBeeItem(EnumBeeType.PRINCESS), new Object[] - { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - - tags = (new ObjectTags()).add(EnumTag.EARTH, 40).add( EnumTag.ROCK, 24); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION7", BeeSpecies.EARTH.getBeeItem(EnumBeeType.DRONE), new Object[] - { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION8", BeeSpecies.EARTH.getBeeItem(EnumBeeType.PRINCESS), new Object[] - { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - - tags = new ObjectTags().add(EnumTag.MAGIC, 40).add(EnumTag.FLUX, 24); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION9", BeeSpecies.INFUSED.getBeeItem(EnumBeeType.DRONE), new Object[] - { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); - ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION0", BeeSpecies.INFUSED.getBeeItem(EnumBeeType.PRINCESS), new Object[] - { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) }, - 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + if (ThaumcraftHelper.isActive()) + { + // Carpenter recipes + input = ItemInterface.getItem("craftingMaterial"); + input.setItemDamage(3); // Set to Silk Mesh + output = new ItemStack(Config.thaumaturgeBackpackT2); + RecipeManagers.carpenterManager.addRecipe(200, new LiquidStack(Block.waterStill.blockID, 1000), null, output, new Object[] { + "WXW", "WTW", "WWW", + 'X', Item.diamond, + 'W', input, + 'T', new ItemStack(Config.thaumaturgeBackpackT1) + }); + output = new ItemStack(Config.planksWood, 4, 0); + RecipeManagers.carpenterManager.addRecipe(8, new LiquidStack(Block.waterStill, 500), null, output, new Object[] { + "B", + 'B', new ItemStack(Config.tcLog, 1, 0) + }); + + output = new ItemStack(Config.planksWood, 6, 1); + RecipeManagers.carpenterManager.addRecipe(8, new LiquidStack(Block.waterStill, 500), null, output, new Object[] { + "B", + 'B', new ItemStack(Config.tcLog, 1, 1) + }); + } } private static void registerLiquidContainer(ItemCapsule baseCapsule) @@ -450,4 +356,78 @@ public class CraftingManager // Empty will be set to unavailable. Obviously, it always is. LiquidType.EMPTY.available = true; } + + private static void setupThaumcraftAlternativeCrafting() + { + ItemStack input, output; + + output = new ItemStack(Config.hiveFrameMagic); + input = ItemInterface.getItem("frameUntreated"); + GameRegistry.addRecipe(output, new Object[] { + "www", "wfw", "www", + 'w', Config.wax.getStackForType(WaxType.MAGIC), + 'f', input + }); + + output = new ItemStack(Config.hiveFrameResilient); + GameRegistry.addRecipe(output, new Object[] { + "wiw", "ifi", "wiw", + 'f', Config.hiveFrameMagic, + 'i', Item.ingotIron, + 'w', Config.wax.getStackForType(WaxType.MAGIC) + }); + + output = new ItemStack(Config.hiveFrameGentle); + GameRegistry.addRecipe(output, new Object[] { + "WwW", "wFw", "WwW", + 'F', input, + 'w', ItemInterface.getItem("beeswax"), + 'W', Config.wax.getStackForType(WaxType.MAGIC) + }); + + output = new ItemStack(Config.hiveFrameMetabolic); + GameRegistry.addShapelessRecipe(output, new Object[] { + Item.magmaCream, + input, + Config.wax.getStackForType(WaxType.MAGIC), + Config.wax.getStackForType(WaxType.MAGIC), + Config.wax.getStackForType(WaxType.MAGIC), + Config.wax.getStackForType(WaxType.MAGIC), + }); + + output = new ItemStack(Config.hiveFrameNecrotic); + GameRegistry.addRecipe(output, new Object[] { + "wSw", "SFS", "wSw", + 'S', Item.rottenFlesh, + 'F', input, + 'w', Config.wax.getStackForType(WaxType.MAGIC) + }); + + output = new ItemStack(Config.hiveFrameTemporal); + GameRegistry.addRecipe(output, new Object[] { + "wSt", "wFw", "tSw", + 't', Item.stick, + 'S', Block.sand, + 'F', input, + 'w', Config.wax.getStackForType(WaxType.MAGIC) + }); + GameRegistry.addRecipe(output, new Object[] { + "tSw", "wFw", "wSt", + 't', Item.stick, + 'S', Block.sand, + 'F', input, + 'w', Config.wax.getStackForType(WaxType.MAGIC) + }); + + output = Config.voidCapsule.getCapsuleForLiquid(LiquidType.EMPTY); + output.stackSize = 4; + GameRegistry.addRecipe(output, new Object[] { + "wDw", "GPG", "TwT", + 'G', Block.glass, + 'D', Item.diamond, + 'P', Item.eyeOfEnder, + 'T', Item.ingotGold, + 'w', Config.wax.getStackForType(WaxType.MAGIC) + }); + } } \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java index dd79843..a353dae 100644 --- a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java +++ b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java @@ -29,7 +29,7 @@ public class VersionInfo public static final String Logo = "/gfx/thaumicbees/logo.png"; - public static final String Depends = "required-after:Forestry;required-after:Thaumcraft@[3.0.3,);after:ExtraBees"; + public static final String Depends = "required-after:Forestry;after:Thaumcraft@[3.0.3,);after:ExtraBees"; boolean criticalUpdate; boolean newVersion; diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/EquivalentExchangeHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/EquivalentExchangeHelper.java new file mode 100644 index 0000000..0d9583d --- /dev/null +++ b/thaumicbees_src/thaumicbees/main/utils/compat/EquivalentExchangeHelper.java @@ -0,0 +1,47 @@ +package thaumicbees.main.utils.compat; + +import net.minecraft.item.Item; +import cpw.mods.fml.common.FMLLog; +import thaumicbees.main.Config; + +public class EquivalentExchangeHelper +{ + private static boolean isEquivalentExchangePresent = false; + + public static boolean isActive() + { + return isEquivalentExchangePresent; + } + + public static void init() + { + if (cpw.mods.fml.common.Loader.isModLoaded("Thaumcraft")) + { + isEquivalentExchangePresent = true; + } + } + + public static void getBlocks() + { + if (isActive()) + { + + } + } + + public static void getItems() + { + if (isActive()) + { + try + { + Class itemClass = Class.forName("com.pahimar.ee3.item.ModItems"); + Config.eeMinuimShard = (Item)(itemClass.getField("miniumShard").get(null)); + } + catch (Exception e) + { + FMLLog.info("Could not get Equivalent Exchange items."); + } + } + } +} diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java index 3f7d220..9b839e9 100644 --- a/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java @@ -1,7 +1,41 @@ package thaumicbees.main.utils.compat; +import java.lang.reflect.Field; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + public class ExtraBeesHelper { + private static boolean isEBPresent = false; + + public static boolean isActive() + { + return isEBPresent; + } + + public static void init() + { + if (cpw.mods.fml.common.Loader.isModLoaded("ExtraBees")) + { + isEBPresent = true; + } + } + + public static ItemStack getExtraBeeItem(String field) + { + ItemStack value = null; + try + { + Class src = Class.forName("binnie.extrabees.core.ExtraBeeItem"); + Field f = src.getDeclaredField(field); + + Item i = (Item) f.get(null); + value = new ItemStack(i); + } + catch (Exception e) { } + return value; + } public enum CombType { diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java index 94d3617..789c883 100644 --- a/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java @@ -7,19 +7,7 @@ import forestry.api.core.ItemInterface; import thaumicbees.main.Config; public class ForestryHelper -{ - public static void getForestryBlocks() - { - - } - - public static void getForestryItems() - { - Config.fBeeComb = Item.itemsList[ItemInterface.getItem("beeComb").itemID]; - Config.fPollen = Item.itemsList[ItemInterface.getItem("pollen").itemID]; - Config.fCraftingResource = Item.itemsList[ItemInterface.getItem("craftingMaterial").itemID]; - } - +{ public enum CraftingMaterial { PULSATING_DUST, // unused @@ -95,6 +83,18 @@ public class ForestryHelper ; } + public static void getBlocks() + { + + } + + public static void getItems() + { + Config.fBeeComb = Item.itemsList[ItemInterface.getItem("beeComb").itemID]; + Config.fPollen = Item.itemsList[ItemInterface.getItem("pollen").itemID]; + Config.fCraftingResource = Item.itemsList[ItemInterface.getItem("craftingMaterial").itemID]; + } + public static EnumTemperature getEnumTemperatureFromValue(float rawTemp) { EnumTemperature value = EnumTemperature.ICY; diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java index f0c6da9..bfca610 100644 --- a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java @@ -2,35 +2,34 @@ package thaumicbees.main.utils.compat; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import thaumcraft.api.EnumTag; import thaumcraft.api.ItemApi; +import thaumcraft.api.ObjectTags; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchList; +import thaumicbees.bees.BeeGenomeManager; +import thaumicbees.bees.BeeSpecies; +import thaumicbees.item.types.CombType; +import thaumicbees.item.types.DropType; +import thaumicbees.item.types.LiquidType; +import thaumicbees.item.types.PollenType; +import thaumicbees.item.types.PropolisType; +import thaumicbees.item.types.ResourceType; +import thaumicbees.item.types.WaxType; +import thaumicbees.main.CommonProxy; import thaumicbees.main.Config; +import thaumicbees.main.ThaumicBees; +import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.LanguageRegistry; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.core.BlockInterface; +import forestry.api.core.ItemInterface; public class ThaumcraftHelper { - public static void getThaumcraftBlocks() - { - Config.tcPlant = Block.blocksList[ItemApi.getItem("blockCustomPlant", 0).itemID]; - Config.tcCandle = Block.blocksList[ItemApi.getItem("blockCandle", 0).itemID]; - Config.tcCrystal = Block.blocksList[ItemApi.getItem("blockCrystal", 0).itemID]; - Config.tcMarker = Block.blocksList[ItemApi.getItem("blockMarker", 0).itemID]; - Config.tcJar = Block.blocksList[ItemApi.getItem("blockJar", 0).itemID]; - Config.tcLog = Block.blocksList[ItemApi.getItem("blockMagicalLog", 0).itemID]; - Config.tcLeaf = Block.blocksList[ItemApi.getItem("blockMagicalLeaves", 0).itemID]; - Config.tcWarded = Block.blocksList[ItemApi.getItem("blockWarded", 0).itemID]; - } - - public static void getThaumcraftItems() - { - Config.tcFilledJar = Item.itemsList[ItemApi.getItem("itemJarFilled", 0).itemID]; - Config.tcMiscResource = Item.itemsList[ItemApi.getItem("itemResource", 0).itemID]; - Config.tcEssentiaBottle = Item.itemsList[ItemApi.getItem("itemEssence", 0).itemID]; - Config.tcShard = Item.itemsList[ItemApi.getItem("itemShard", 0).itemID]; - Config.tcGolem = Item.itemsList[ItemApi.getItem("itemGolemPlacer", 0).itemID]; - Config.tcWispEssence = Item.itemsList[ItemApi.getItem("itemWispEssence", 0).itemID]; - Config.tcNuggets = Item.itemsList[ItemApi.getItem("itemNugget", 0).itemID]; - } - public enum MiscResource { ALUMENTUM, @@ -114,4 +113,647 @@ public class ThaumcraftHelper SILVERWOOD, ; } + + private static boolean isThaumcraftPresent = false; + + public static boolean isActive() + { + return isThaumcraftPresent; + } + + public static void init() + { + if (cpw.mods.fml.common.Loader.isModLoaded("Thaumcraft")) + { + isThaumcraftPresent = true; + + registerResearchXML(); + } + } + + public static void getBlocks() + { + if (isActive()) + { + Config.tcPlant = Block.blocksList[ItemApi.getItem("blockCustomPlant", 0).itemID]; + Config.tcCandle = Block.blocksList[ItemApi.getItem("blockCandle", 0).itemID]; + Config.tcCrystal = Block.blocksList[ItemApi.getItem("blockCrystal", 0).itemID]; + Config.tcMarker = Block.blocksList[ItemApi.getItem("blockMarker", 0).itemID]; + Config.tcJar = Block.blocksList[ItemApi.getItem("blockJar", 0).itemID]; + Config.tcLog = Block.blocksList[ItemApi.getItem("blockMagicalLog", 0).itemID]; + Config.tcLeaf = Block.blocksList[ItemApi.getItem("blockMagicalLeaves", 0).itemID]; + Config.tcWarded = Block.blocksList[ItemApi.getItem("blockWarded", 0).itemID]; + } + } + + public static void getItems() + { + if (isActive()) + { + Config.tcFilledJar = ItemApi.getItem("itemJarFilled", 0).getItem(); + Config.tcMiscResource = ItemApi.getItem("itemResource", 0).getItem(); + Config.tcEssentiaBottle = ItemApi.getItem("itemEssence", 0).getItem(); + Config.tcShard = ItemApi.getItem("itemShard", 0).getItem(); + Config.tcGolem = ItemApi.getItem("itemGolemPlacer", 0).getItem(); + Config.tcWispEssence = ItemApi.getItem("itemWispEssence", 0).getItem(); + Config.tcNuggets = ItemApi.getItem("itemNugget", 0).getItem(); + Config.tcNuggetChicken = ItemApi.getItem("itemNuggetChicken", 0).getItem(); + Config.tcNuggetBeef = ItemApi.getItem("itemNuggetBeef", 0).getItem(); + Config.tcNuggetPork = ItemApi.getItem("itemNuggetPork", 0).getItem(); + } + } + + public static void addItemsToBackpack() + { + if (ThaumicBees.getConfig().AddThaumcraftItemsToBackpacks) + { + // Add all shards and Thaumium to miner's backpack + String ids = Config.tcShard.itemID + ":" + -1 + ";" + + Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.THAUMIUM.ordinal(); + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "miner@" + ids); + + // All resources go into Thaumaturge's backpack + ids = Config.tcMiscResource.itemID + ":" + -1 + ";" + + Config.tcShard.itemID + ":" + -1 + ";" + + Config.tcFilledJar.itemID + ":" + -1 + ";" + + Config.tcCrystal.blockID + ":" + -1 + ";" + + Config.tcJar.blockID + ":" + -1 + ";" + + Config.tcGolem.itemID + ":" + -1 + ";"; + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ids); + + // Add some plants & saplings to Forester's + ids = Config.tcPlant.blockID + ":" + "-1" + ";" + + Config.tcLeaf.blockID + ":" + -1 + ";" + + Config.tcLog.blockID + ":" + "-1"; + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "forester@" + ids); + + // Add Wisp & brains to Hunter's + ids = Config.tcWispEssence.itemID + ":" + -1 + ";" + + Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal(); + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "hunter@" + ids); + + // Add Marker, warded stone, candle to builder + ids = Config.tcCandle.blockID + ":" + -1 + ";" + + Config.tcMarker.blockID + ":" + -1 + ";" + + Config.tcWarded.blockID + ":" + -1; + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "builder@" + ids); + } + } + + public static void setupItemAspects() + { + if (isActive()) + { + setupItemAspectsThaumicBees(); + setupItemAspectsForestry(); + if (ExtraBeesHelper.isActive()) + { + setupItemAspectsExtraBees(); + } + } + } + + private static void setupItemAspectsThaumicBees() + { + ObjectTags tags; + ItemStack itemStack; + + tags = new ObjectTags().add(EnumTag.WOOD, 2); + ThaumcraftApi.registerObjectTag(Config.planksWood.blockID, -1, tags); + + tags = new ObjectTags().add(EnumTag.MAGIC, 2); + ThaumcraftApi.registerObjectTag(Config.wax.itemID, WaxType.MAGIC.ordinal(), tags); + + tags = new ObjectTags().add(EnumTag.MAGIC, 1); + ThaumcraftApi.registerObjectTag(Config.drops.itemID, DropType.ENCHANTED.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.KNOWLEDGE, 1); + ThaumcraftApi.registerObjectTag(Config.drops.itemID, DropType.INTELLECT.ordinal(), tags); + + tags = new ObjectTags().add(EnumTag.ELDRITCH, 2); + ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.UNUSUAL.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.TIME, 2); + ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.PHASED.ordinal(), tags); + + tags = new ObjectTags().add(EnumTag.CONTROL, 1); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, -1, tags); + tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.STARK.ordinal(), tags); + tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.WIND, 3); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.AIR.ordinal(), tags); + tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.FIRE, 3); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.FIRE.ordinal(), tags); + tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.WATER, 3); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.WATER.ordinal(), tags); + tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 1).add(EnumTag.EARTH, 3); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.EARTH.ordinal(), tags); + tags = new ObjectTags(Config.propolis.itemID, -1).add(EnumTag.MAGIC, 4); + ThaumcraftApi.registerObjectTag(Config.propolis.itemID, PropolisType.INFUSED.ordinal(), tags); + + tags = new ObjectTags().add(EnumTag.KNOWLEDGE, 3); + ThaumcraftApi.registerObjectTag(Config.miscResources.itemID, ResourceType.LORE_FRAGMENT.ordinal(), tags); + + tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, -1, tags); + tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OCCULT.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OTHERWORLDLY.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.STARK.ordinal(), tags); + tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 4); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.INFUSED.ordinal(), tags); + tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.MOTION, 2); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.AIRY.ordinal(), tags); + tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.POWER, 2); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.FIREY.ordinal(), tags); + tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.COLD, 2); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.WATERY.ordinal(), tags); + tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.ROCK, 2); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.EARTHY.ordinal(), tags); + + // Tagging capsules. + tags = new ObjectTags().add(EnumTag.VOID, 2).add(EnumTag.MAGIC, 2); + ThaumcraftApi.registerComplexObjectTag(Config.magicCapsule.itemID, LiquidType.EMPTY.ordinal(), tags); + + tags = new ObjectTags(Config.magicCapsule.itemID, LiquidType.EMPTY.ordinal()) + .add(EnumTag.WATER, 8); + ThaumcraftApi.registerObjectTag(Config.magicCapsule.itemID, LiquidType.WATER.ordinal(), tags); + tags = new ObjectTags(Config.magicCapsule.itemID, LiquidType.EMPTY.ordinal()) + .add(EnumTag.FIRE, 12).add(EnumTag.ROCK, 4); + ThaumcraftApi.registerObjectTag(Config.magicCapsule.itemID, LiquidType.LAVA.ordinal(), tags); + + for (EnumTag tag : EnumTag.values()) + { + if (tag == EnumTag.UNKNOWN) + { + continue; + } + tags = new ObjectTags().add(tag, 1); + ThaumcraftApi.registerObjectTag(Config.solidFlux.itemID, tag.id, tags); + } + } + + private static void setupItemAspectsForestry() + { + ObjectTags tags; + ItemStack itemStack; + + itemStack = BlockInterface.getBlock("candle"); + tags = new ObjectTags().add(EnumTag.LIGHT, 1).add(EnumTag.CONTROL, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = BlockInterface.getBlock("glass"); + tags = new ObjectTags(Block.glass.blockID, 0); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + + // Pulsating propolis + itemStack = ItemInterface.getItem("propolis"); + tags = new ObjectTags().add(EnumTag.CONTROL, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.ELDRITCH, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Propolis.PULSATING.ordinal(), tags); + + itemStack = ItemInterface.getItem("pollen"); + tags = new ObjectTags().add(EnumTag.FLOWER, 1).add(EnumTag.PLANT, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Pollen.NORMAL.ordinal(), tags); + tags = new ObjectTags(itemStack.itemID, ForestryHelper.Pollen.NORMAL.ordinal()).add(EnumTag.COLD, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Pollen.CRYSTALLINE.ordinal(), tags); + + itemStack = ItemInterface.getItem("craftingMaterial"); + tags = new ObjectTags().add(EnumTag.ELDRITCH, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.PULSATING_MESH.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.INSECT, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.INSECT, 4).add(EnumTag.CLOTH, 5); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.WOVEN_SILK.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.COLD, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.ICE_SHARD.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.VALUABLE, 1).add(EnumTag.PLANT, 1).add(EnumTag.INSECT, 2) + .add(EnumTag.CONTROL, 2).add(EnumTag.WOOD, 5); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.SCENTED_PANELING.ordinal(), tags); + + itemStack = ItemInterface.getItem("beealyzer"); + tags = new ObjectTags().add(EnumTag.VALUABLE, 3).add(EnumTag.MECHANISM, 3).add(EnumTag.METAL, 19) + .add(EnumTag.POWER, 8).add(EnumTag.TOOL, 18); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("treealyzer"); + tags = new ObjectTags().add(EnumTag.POWER, 3).add(EnumTag.PURE, 3).add(EnumTag.LIFE, 6) + .add(EnumTag.TOOL, 12).add(EnumTag.METAL, 19); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("apatite"); + tags = new ObjectTags().add(EnumTag.CRYSTAL, 2).add(EnumTag.POWER, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("impregnatedCasing"); + tags = new ObjectTags().add(EnumTag.WOOD, 56).add(EnumTag.EXCHANGE, 8); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("stickImpregnated"); + tags = new ObjectTags().add(EnumTag.WOOD, 6).add(EnumTag.EXCHANGE, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("peat"); + tags = new ObjectTags().add(EnumTag.POWER, 2).add(EnumTag.PLANT, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("ash"); + tags = new ObjectTags().add(EnumTag.DESTRUCTION, 1).add(EnumTag.EXCHANGE, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("honeyDrop"); + tags = new ObjectTags().add(EnumTag.EXCHANGE, 2).add(EnumTag.LIFE, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("honeydew"); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("royalJelly"); + tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.POWER, 1).add(EnumTag.VALUABLE, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("honeyPot"); + tags = new ObjectTags().add(EnumTag.LIFE, 2); + ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("ambrosia"); + tags = new ObjectTags().add(EnumTag.HEAL, 4); + ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("beeswax"); + tags = new ObjectTags().add(EnumTag.CONTROL, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("refractoryWax"); + tags = new ObjectTags().add(EnumTag.FIRE, 3); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("phosphor"); + tags = new ObjectTags().add(EnumTag.FIRE, 2).add(EnumTag.DESTRUCTION, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("waxCapsule"); + tags = new ObjectTags().add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("waxCapsuleWater"); + tags = new ObjectTags().add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("refractoryEmpty"); + tags = new ObjectTags().add(EnumTag.FIRE, 1).add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("refractoryWater"); + tags = new ObjectTags().add(EnumTag.FIRE, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("refractoryLava"); + tags = new ObjectTags().add(EnumTag.VOID, 1).add(EnumTag.FIRE, 7).add(EnumTag.WATER, 1).add(EnumTag.ROCK, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("canEmpty"); + tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("canWater"); + tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + itemStack = ItemInterface.getItem("canLava"); + tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1).add(EnumTag.FIRE, 6).add(EnumTag.WATER, 1).add(EnumTag.ROCK, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags); + + itemStack = ItemInterface.getItem("beeComb"); + tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.FIRE, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.SIMMERING.ordinal(), tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.COLD, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.FROZEN.ordinal(), tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.CROP, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.WHEATEN.ordinal(), tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.FUNGUS, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Comb.MOSSY.ordinal(), tags); + + itemStack = ItemInterface.getItem("ambrosia"); + tags = new ObjectTags().add(EnumTag.LIFE, 2).add(EnumTag.HEAL, 4); + + // Forestry's wood + itemStack = BlockInterface.getBlock("log1"); + tags = new ObjectTags().add(EnumTag.WOOD, 8); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + itemStack = BlockInterface.getBlock("log2"); // Same tags + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + itemStack = BlockInterface.getBlock("log3"); // Same tags. + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + itemStack = BlockInterface.getBlock("log4"); // Still same tags. + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + + itemStack = ItemInterface.getItem("sapling"); + tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + + // BEES! + itemStack = ItemInterface.getItem("beeDroneGE"); + tags = new ObjectTags().add(EnumTag.INSECT, 1).add(EnumTag.FLIGHT, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); // All drones + + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.VALUABLE, 4); // Get drone tags & add valuable + itemStack = ItemInterface.getItem("beePrincessGE"); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); // All princesses. + + tags = new ObjectTags().add(EnumTag.VALUABLE, 8).add(EnumTag.INSECT, 2).add(EnumTag.FLIGHT, 4); + itemStack = ItemInterface.getItem("beeQueenGE"); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); //All queens. + + itemStack = ItemInterface.getItem("circuitboards"); + tags = new ObjectTags().add(EnumTag.CRYSTAL, 2).add(EnumTag.METAL, 5).add(EnumTag.MECHANISM, 10) + .add(EnumTag.POWER, 10); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.BASIC.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.MECHANISM, 10).add(EnumTag.POWER, 10).add(EnumTag.METAL, 14) + .add(EnumTag.CONTROL, 2).add(EnumTag.EXCHANGE, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.ENHANCED.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.MECHANISM, 10).add(EnumTag.POWER, 10).add(EnumTag.METAL, 14); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.REFINED.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.MECHANISM, 10).add(EnumTag.POWER, 10).add(EnumTag.METAL, 19) + .add(EnumTag.VALUABLE, 10); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CircuitBoard.INTRICATE.ordinal(), tags); + + itemStack = ItemInterface.getItem("tubes"); + tags = new ObjectTags(ItemInterface.getItem("ingotCopper").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.COPPER.ordinal(), tags); + tags = new ObjectTags(ItemInterface.getItem("ingotTin").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.TIN.ordinal(), tags); + tags = new ObjectTags(ItemInterface.getItem("ingotBronze").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BRONZE.ordinal(), tags); + tags = new ObjectTags(Item.ingotIron.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.IRON.ordinal(), tags); + tags = new ObjectTags(Item.ingotGold.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.GOLD.ordinal(), tags); + tags = new ObjectTags(Item.diamond.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.DIAMOND.ordinal(), tags); + tags = new ObjectTags(Block.obsidian.blockID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.OBSIDIAN.ordinal(), tags); + tags = new ObjectTags(Item.blazePowder.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BLAZE.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.MOTION, 2).add(EnumTag.CONTROL, 2).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.RUBBER.ordinal(), tags); + tags = new ObjectTags(Item.emerald.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.EMERALD.ordinal(), tags); + tags = new ObjectTags(ItemInterface.getItem("apatite").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.APATITE.ordinal(), tags); + tags = new ObjectTags(Item.dyePowder.itemID, 4).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.LAPIS.ordinal(), tags); + } + + private static void setupItemAspectsExtraBees() + { + ItemStack itemStack; + ObjectTags tags; + + try // One try block suffices. If we can't get one item, it's probably safe to assume we can't get any others. + { + itemStack = ExtraBeesHelper.getExtraBeeItem("comb"); + tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.POWER, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.OIL.ordinal(), tags); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.COAL.ordinal(), tags); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.FUEL.ordinal(), tags); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.ALCOHOL.ordinal(), tags); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.REDSTONE.ordinal(), tags); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.URANIUM.ordinal(), tags); + tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.POISON, 2); + ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.VENOMOUS.ordinal(), tags); + + itemStack = ExtraBeesHelper.getExtraBeeItem("propolis"); + tags = new ObjectTags().add(EnumTag.CONTROL, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + + itemStack = ExtraBeesHelper.getExtraBeeItem("honeyDrop"); + tags = new ObjectTags().add(EnumTag.EXCHANGE, 2).add(EnumTag.LIFE, 1); + ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); + } + catch (NullPointerException e) { } + } + + public static void setupResearch() + { + if (isActive()) + { + ObjectTags tags; + + tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.PLANT, 10).add(EnumTag.INSECT, 10); + ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 1, Config.miscResources.getStackForType(ResourceType.RESEARCH_StartNode)) + .setParents(ResearchList.getResearch("UTFT")) + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.INSECT, 9).add(EnumTag.MAGIC, 4).add(EnumTag.FLUX, 4); + ResearchItem starkHint = new ResearchItem("STARKHINT", tags, 5, 2, ItemInterface.getItem("beeQueenGE")) + .setParents(startNode) + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.INSECT, 15).add(EnumTag.MAGIC, 5).add(EnumTag.WATER, 5).add(EnumTag.EARTH, 5) + .add(EnumTag.WIND, 5).add(EnumTag.FIRE, 5); + ResearchItem beeInfusion = new ResearchItem("BEEINFUSION", tags, 5, 3, Config.miscResources.getStackForType(ResourceType.RESEARCH_BeeInfusion)) + .setParents(starkHint).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.CROP, 20).add(EnumTag.EARTH, 20).add(EnumTag.WATER, 5); + ResearchItem fertilizer = new ResearchItem("FERTILIZER", tags, 16, 0, ItemInterface.getItem("apatite")) + .setParents(startNode) + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2) + .add(EnumTag.MAGIC, 5); + ResearchItem magicFrame = new ResearchItem("HIVEFRAME", tags, 10, -2, Config.hiveFrameMagic) + .setParents(startNode) + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 10).add(EnumTag.ARMOR, 5).add(EnumTag.EXCHANGE, 6) + .add(EnumTag.MAGIC, 8); + ResearchItem magicFrame2 = new ResearchItem("HIVEFRAME2", tags, 8, -2, Config.hiveFrameResilient) + .setParents(magicFrame).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 10).add(EnumTag.LIFE, 5).add(EnumTag.EXCHANGE, 6) + .add(EnumTag.HEAL, 2).add(EnumTag.FLOWER, 6); + ResearchItem gentleFrame = new ResearchItem("HIVEFRAMEGENTLE", tags, 12, -2, Config.hiveFrameGentle) + .setParents(magicFrame).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 10).add(EnumTag.LIFE, 6).add(EnumTag.EXCHANGE, 8) + .add(EnumTag.MAGIC, 8).add(EnumTag.MOTION, 4).add(EnumTag.FLESH, 4); + ResearchItem metabolicFrame = new ResearchItem("HIVEFRAMEMETA", tags, 9, -3, Config.hiveFrameMetabolic) + .setParents(magicFrame).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 10).add(EnumTag.DEATH, 15).add(EnumTag.EXCHANGE, 6) + .add(EnumTag.MAGIC, 8).add(EnumTag.POISON, 6); + ResearchItem necroticFrame = new ResearchItem("HIVEFRAMENECRO", tags, 11, -3, Config.hiveFrameNecrotic) + .setParents(magicFrame).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 10).add(EnumTag.TIME, 4); + ResearchItem temporalFrame = new ResearchItem("HIVEFRAMETIME", tags, 9, -5, Config.hiveFrameTemporal) + .setParents(magicFrame).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.VOID, 15).add(EnumTag.CRYSTAL, 8).add(EnumTag.ELDRITCH, 8).add(EnumTag.EXCHANGE, 15); + ResearchItem voidCapsule = new ResearchItem("VOIDCAPSULE", tags, 10, 9, Config.voidCapsule) + .setParents(startNode, ResearchList.getResearch("PORTABLEHOLE")).setHidden() + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.WOOD, 8).add(EnumTag.INSECT, 10).add(EnumTag.TOOL, 6).add(EnumTag.MAGIC, 6); + ResearchItem scoop = new ResearchItem("THAUMIUMSCOOP", tags, 0, -3, Config.thaumiumScoop) + .setParents(ResearchList.getResearch("THAUMIUM")) + .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.WOOD, 16).add(EnumTag.PLANT, 20).add(EnumTag.TOOL, 6).add(EnumTag.MAGIC, 6); + ResearchItem grafter = new ResearchItem("THAUMIUMGRAFTER", tags, 0, -4, Config.thaumiumGrafter) + .setParents(scoop) + .registerResearchItem(); + } + } + + private static void registerResearchXML() + { + if (isActive()) + { + ThaumcraftApi.registerResearchXML(CommonProxy.TCBEES_RESEARCH + "research.xml"); + } + } + + public static void setupThaumcraftCrafting() + { + ItemStack input; + ItemStack output; + + if (ThaumicBees.getConfig().UseImpregnatedStickInTools) + { + input = ItemInterface.getItem("stickImpregnated"); + } + else + { + input = new ItemStack(Item.stick); + } + + ThaumcraftApi.addArcaneCraftingRecipe("THAUMIUMSCOOP", "THAUMIUMSCOOP", 45, new ItemStack(Config.thaumiumScoop), new Object[] { + "sWs", "sTs", " T ", + 's', input, + 'W', Block.cloth, + 'T', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.THAUMIUM.ordinal()) + }); + + ThaumcraftApi.addArcaneCraftingRecipe("THAUMIUMGRAFTER", "THAUMIUMGRAFTER", 160, new ItemStack(Config.thaumiumGrafter), new Object[] { + " T", " T ", "s ", + 's', input, + 'T', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.THAUMIUM.ordinal()) + }); + + output = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); + input = ItemInterface.getItem("apatite"); + ObjectTags tags = (new ObjectTags()).add(EnumTag.CROP, 12); + output.stackSize = 2; + ThaumcraftApi.addShapelessInfusionCraftingRecipe("FERTILIZER", "FERTILIZER", 5, tags, output, new Object[] { + input + }); + + output = new ItemStack(Config.hiveFrameMagic); + input = ItemInterface.getItem("frameUntreated"); + tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8); + ThaumcraftApi.addShapelessInfusionCraftingRecipe("HIVEFRAME", "FRAMEMAGIC", 50, tags, output, new Object[] { + input + }); + + output = new ItemStack(Config.hiveFrameResilient); + tags = new ObjectTags().add(EnumTag.WOOD, 12).add(EnumTag.INSECT, 8).add(EnumTag.EXCHANGE, 12); + ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAME2", "FRAMERESILIENT", 50, tags, output, new Object[] { + " i ", "ifi", " i ", + 'f', Config.hiveFrameMagic, + 'i', Item.ingotIron + }); + + output = new ItemStack(Config.hiveFrameGentle); + tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.HEAL, 12); + ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAMEGENTLE", "FRAMEGENTLE", 50, tags, output, new Object[] { + "www", "wFw", "www", + 'F', input, + 'w', ItemInterface.getItem("beeswax") + + }); + + output = new ItemStack(Config.hiveFrameMetabolic); + tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.LIFE, 8).add(EnumTag.MOTION, 8) + .add(EnumTag.EXCHANGE, 8); + ThaumcraftApi.addShapelessInfusionCraftingRecipe("HIVEFRAMEMETA", "FRAMEMETABOLIC", 50, tags, output, new Object[] { + Item.magmaCream, + input + }); + + output = new ItemStack(Config.hiveFrameNecrotic); + tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.EXCHANGE, 12).add(EnumTag.DEATH, 16) + .add(EnumTag.POISON, 1); + ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAMENECRO", "FRAMENECROTIC", 50, tags, output, new Object[] { + " S ", "SxS", " S ", + 'S', Item.rottenFlesh, + 'x', input + }); + + output = new ItemStack(Config.hiveFrameTemporal); + tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.TIME, 2); + ThaumcraftApi.addInfusionCraftingRecipe("HIVEFRAMETIME", "FRAMETIME", 50, tags, output, new Object[] { + "tSt", "SFS", "tSt", + 't', Item.stick, + 'S', Block.sand, + 'F', input + }); + + output = Config.voidCapsule.getCapsuleForLiquid(LiquidType.EMPTY); + output.stackSize = 4; + tags = new ObjectTags().add(EnumTag.VOID, 16).add(EnumTag.ELDRITCH, 4).add(EnumTag.EXCHANGE, 8); + ThaumcraftApi.addInfusionCraftingRecipe("VOIDCAPSULE", "VOIDCAPSULE", 10, tags, output, new Object[] { + " G ", "GPG", "TGT", + 'G', Block.thinGlass, + 'P', Item.enderPearl, + 'T', Item.ingotIron + }); + + ItemStack drone = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.DRONE); + ItemStack princess = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.PRINCESS); + + String researchKey = "BEEINFUSION"; + + tags = (new ObjectTags()).add(EnumTag.WIND, 40).add(EnumTag.MOTION, 24); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION1", BeeSpecies.AIR.getBeeItem(EnumBeeType.DRONE), + new ItemStack[] { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal())}, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION2", BeeSpecies.AIR.getBeeItem(EnumBeeType.PRINCESS), + new ItemStack[] { princess , new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + + tags = (new ObjectTags()).add(EnumTag.FIRE, 40).add( EnumTag.POWER, 24); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION3", BeeSpecies.FIRE.getBeeItem(EnumBeeType.DRONE), new Object[] + { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION4", BeeSpecies.FIRE.getBeeItem(EnumBeeType.PRINCESS), new Object[] + { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + + tags = (new ObjectTags()).add(EnumTag.WATER, 40).add( EnumTag.COLD, 24); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION5", BeeSpecies.WATER.getBeeItem(EnumBeeType.DRONE), new Object[] + { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION6", BeeSpecies.WATER.getBeeItem(EnumBeeType.PRINCESS), new Object[] + { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + + tags = (new ObjectTags()).add(EnumTag.EARTH, 40).add( EnumTag.ROCK, 24); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION7", BeeSpecies.EARTH.getBeeItem(EnumBeeType.DRONE), new Object[] + { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION8", BeeSpecies.EARTH.getBeeItem(EnumBeeType.PRINCESS), new Object[] + { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + + tags = new ObjectTags().add(EnumTag.MAGIC, 40).add(EnumTag.FLUX, 24); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION9", BeeSpecies.INFUSED.getBeeItem(EnumBeeType.DRONE), new Object[] + { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION0", BeeSpecies.INFUSED.getBeeItem(EnumBeeType.PRINCESS), new Object[] + { princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) }, + 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); + } }