diff --git a/thaumicbees_res/gfx/thaumicbees/items/items.png b/thaumicbees_res/gfx/thaumicbees/items/items.png index 796cd17..9301e6a 100644 Binary files a/thaumicbees_res/gfx/thaumicbees/items/items.png and b/thaumicbees_res/gfx/thaumicbees/items/items.png differ diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index b89d1b3..c4cc4d0 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -5,13 +5,13 @@ 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); + } }