diff --git a/magicbees_res/assets/magicbees/lang/de_DE.xml b/magicbees_res/assets/magicbees/lang/de_DE.xml
index 05231ea..1ec1938 100644
--- a/magicbees_res/assets/magicbees/lang/de_DE.xml
+++ b/magicbees_res/assets/magicbees/lang/de_DE.xml
@@ -20,7 +20,7 @@
Tiefer BienenstockHallender BienenstockHöllischer Bienenstock
- Vergessenheits-Bienenstock
+ Vergessenheits-BienenstockGewöhnliche Wabe
@@ -83,11 +83,11 @@
Witherskelett-SchädelfragmentDrakonischer StaubDrakonischer Klumpen
- Essenz des Falschen Lebens
- Essenz eines Flachen Grabes
- Essenz der Verlorenen Zeit
- Essenz der Immerwährenden Haltbarkeit
- Essenz der nicht endenden Gleichgültigkeit
+ Essenz des Falschen Lebens
+ Essenz eines Flachen Grabes
+ Essenz der Verlorenen Zeit
+ Essenz der Immerwährenden Haltbarkeit
+ Essenz der nicht endenden GleichgültigkeitBienen und MagieKristallisierter %s - Aspekt
@@ -251,14 +251,14 @@
Obwohl sie nicht so viel Aufmerksamkeit bekommen wir Goldene Bienen, sind sie nichtsdestotrotz wertvoll.|ApinomikonBleiernEin Favorit von Amateuralchemisten, sie glauben, sie können diese Bienen in Gold verwandeln.|Apinomikon
- Alumin
- Knittrig, glänzend und extrem geschmeidig.|Apinomikon
- Ardithin
- Lieben ein gelb-orangenes Material gefunden in höllischen Bereichen.|Apinomikon
- Cobalten
- Die instabilen Eigenschaften dieses Materials scheinen die Bienen nicht im Geringsten zu beinflussen.|Apinomikon
- Manyullyn
- "Tie tie-pa-tie pie!"
+ Alumin
+ Knittrig, glänzend und extrem geschmeidig.|Apinomikon
+ Ardithin
+ Lieben ein gelb-orangenes Material gefunden in höllischen Bereichen.|Apinomikon
+ Cobalten
+ Die instabilen Eigenschaften dieses Materials scheinen die Bienen nicht im Geringsten zu beinflussen.|Apinomikon
+ Manyullyn
+ "Tie tie-pa-tie pie!"DiamandinKristallin, glitzernd, und härter als Drachenzähne. Diese Bienen sind nichts davon.|Apinomikon
@@ -267,8 +267,6 @@
ApatinTag und Nacht summten die Weinenden. Ich verbarrikadierte die Fenster und versteckte mich im Keller, aber überall durchdrang der schrille Ton der Apatinen Bienen die Wände brachte mich zum Wahnsinn.|Beekeeping 101
- Schlicht
- "Diese Bienen fühlen sich ungewönlich stark zu Scherben hingezogen. Dies rechtfertigt weitere Untersuchungen."|Azanor, MeisterthaumaturgeAuran"Sie arbeiten so atemberaubend schnell."|Sengir, verrückter ImkerIgnis
@@ -277,8 +275,10 @@
"Ich habe mal versucht, die zu züchten, aber es lief nicht alles so gut."|MysteriousAges, Fortgeschrittener ThaumaturgeSolon"Ich muss noch mal das Rezept für diese Bienen ausgraben, aber Achtung, ihre Stacheln boren sich in deine Haut."|MysteriousAges, Anfänger in der Comedy
- Praecantation
- Bienenzucht ist Magie!|Apinomikon, Preface
+ Praecantation-
+ Bienenzucht ist Magie!|Apinomikon, Preface
+ Schlicht-
+ "Diese Bienen fühlen sich ungewönlich stark zu Scherben hingezogen. Dies rechtfertigt weitere Untersuchungen."|Azanor, MeisterthaumaturgeVis"Sie können Veränderungen in der Aura wahrnehmen, aber noch nicht verändern."|Azanors Mitschriften
diff --git a/magicbees_res/assets/magicbees/lang/en_US.xml b/magicbees_res/assets/magicbees/lang/en_US.xml
index c935f57..9ba5d58 100644
--- a/magicbees_res/assets/magicbees/lang/en_US.xml
+++ b/magicbees_res/assets/magicbees/lang/en_US.xml
@@ -25,20 +25,28 @@
Mundane CombMolten Comb
- Forgotten CombOccult CombOtherworldy Comb
+ Transmuting CombPapery CombSoul CombFurtive CombMemory CombTemporal Comb
+ Forgotten Comb
+
Windy CombFirey CombWatery CombEarthy Comb
- Ordered Comb
- Entropic Comb
+
+ Glittering Windy Comb
+ Glittering Firey Comb
+ Glittering Watery Comb
+ Glittering Earthy Comb
+ Glittering Ordered Comb
+ Glittering Entropic Comb
+
Essence CombPotent Comb
@@ -83,17 +91,19 @@
Wither Skeleton Skull FragmentDraconic DustDraconic Chunk
- Essence of False Life
- Essence of a Shallow Grave
- Essence of Lost Time
- Essence of Everlasting Durability
- Essence of Unending Disregard
+ Essence of False Life
+ Essence of a Shallow Grave
+ Essence of Lost Time
+ Essence of Everlasting Durability
+ Essence of Scornful Oblivion
+ Essence of Fickle PermanenceAir Infused DustFire Infused DustWater Infused DustEarth Infused DustOrder Infused DustChaos Infused Dust
+ Dimensional SingularityBees and MagicCrystalized %s Aspect
@@ -280,9 +290,7 @@
CrumblingThey have a corrosive effect on their surroundings, rapidly aging them.|Apinomicon
- Stark
- "These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge
- Aura
+ Aer"They work so fast it's breathtaking."|Sengir, Mad ApiaristIgnisCaution: Contents of hive extremely hot.|Warning label on Azanor's apiary
@@ -290,8 +298,10 @@
"I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice ThaumaturgeSolum"You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian
- Praecantatio
- Beekeeping is magic!|Apinomicon, Preface
+ Ordered
+ Their combs are nearly perfect, each part mirroring the pattern of the whole.|Apinomicon
+ Chaotic
+ The social structure of their hives seems to vary day by day, making it more flexible and resillient than others, but significantly more unpredictable.|ApinomiconVis"They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes
@@ -419,18 +429,65 @@
These bees have an increased affinity for aspected magic.|Apinomicon
+ Time, Moment, EternityApimancy
+
Apimancy[MB] Adding some sparkle to your buzz.
- Don't get too excited.##lineBreak##This is just a test.
+ Welcome to Apimancy! As a budding keeper of magical bees, there are a few things you should know before diving in. As your acceptance letter to the Academy of Austere Apimancers has mentioned, there are several new tools available to discover. These include some improved versions of Forestry tools, each with their own particular quirks and new frames for your apiaries. ##horizontalRule## You may also discover that there are new bee strains available to discover, if you can coax them to live in certain conditions. The Forestry Escritoire will help you discover them and become the envy
+ of your former, nonmagical colleagues. Also take note of the several new strains of wild bees that have appeared: these are the key to progressing into the magical lineages of your small winged charges.
+
+ Lore Fragments
+ [MB] Research? More like BEEsearch!
+ While experimenting with bee breeds, you may run accross a strain whose intellectual capabilities are a match for your own. Well, maybe, however unlikely that is. It's possible that they may unearth some obscure reference or a snippet of information that your great intellect may have missed while exploiting the greater mysteries of the universe. ##lineBreak## Should your helpful buzzing friends happen to locate this sort of item for you, it may be possible to combine the scraps together into something a little more cohesive.
+
+ Magic Frame
+ [MB] Putting magic into beekeeping contexts
+ The Magic Frame is a simple improvement over your regular, run-of-the-mill Untreated Frames. Still fairly simple to produce, it is capable of lasting three times longer in an apiary than Untreated Frames before becoming unuseable. The enchantable properties of the Magic Frame enable it to be used with several of the special essences involved in Apimancy where other frames would reject the infusion of magics.Thaumium Scoop[MB] Handled with care.
- Normal scoops are fragile, and prone to breakage. As an authority in Apimancy, you can do better. By adding some Thaumium to the handle, and lacing it with a measure of order, your new scoop will last up to three times longer!##lineBreak##In addition, the Thaumium in the device will accept the Repair enchantment.
+ Normal scoops are fragile, and prone to breakage. As an authority in Apimancy, you can do better. By adding some Thaumium to the handle, and lacing it with a measure of order, your new scoop will last up to three times longer! ##lineBreak## In addition, the Thaumium in the device will accept the Repair enchantment.Thaumium Grafter[MB] Saplings for every occasion.
- Simple grafters are almost uselessly fragile, and while Proven Grafters are useful, the rarity of emeralds makes them annoying to procure. The solution? Make it yourself!##lineBreak##The Thaumium Grafter, like the Thaumium Scoop, is a tougher, enchantable version of the most basic of the Arborimancer's tools. Use caution though, for although the Repair enchantment can be applied to the grafter, its unusual properties make it exhausting to use.
+ Simple grafters are almost uselessly fragile, and while Proven Grafters are useful, the rarity of emeralds makes them annoying to procure. The solution? Make it yourself! ##lineBreak## The Thaumium Grafter, like the Thaumium Scoop, is a tougher, enchantable version of the most basic of the Arborimancer's tools. Use caution though, for although the Repair enchantment can be applied to the grafter, its unusual properties make it exhausting to use.
+
+ Essence of False Life
+ [MB] A rose by any other name. . .
+ Simple to create by means of magic, this essence has unusual properties when exposed to bees. When combined with an everyday apiary frame, it has the effect of greatly extending the lifespan of a working hive.
+
+ Essence of a Shallow Grave
+ [MB] Not quite six feet under.
+ The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. ##lineBreak## The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.
+
+ Essence of Everlasting Durability
+ [MB] The rubber to your glue
+ This is the distilled essence of protection, bound to last forever, or until the magics stored within it weaken and eventually break. But until then, it's invincible. Mostly. ##lineBreak## While Magic Frames are useful, they are a tad fragile. This essence takes the enchantments you weave into Magic frames to an entirely new level. Combine the essence with a magic frame, and it should have a vastly extended lifespan.
+
+ Essence of Fickle Permanence
+ [MB] Assured in unsurity
+ Unstable by nature, the Essence of Fickle Permanence has the side effect of causing normally stable objects and systems to become somewhat unreliable. While this may mostly be a bad thing, Apimancers have discovered that exposing a hive to the essence has the duel effects of both causing the bees to work faster, and the offspring to have higher mutation rates.
+
+ Essence of Lost Time
+ [MB] No time like the unmoment
+ Time is a fickle thing. It comes and it goes, but where exactly does it go to? As a respectable thaumaturge, it has become possible to trap these wasted moments and save them in a magical form. So, now that it is possible to collect extra time from the world, it seems only appropriate that they are used in a place that would be useful. It would be too dangerous to attempt to access these moments yourself for the moment, but perhaps it would be simple to allow your bees access to this untapped lump of time. ##lineBreak## By combining the essence with a Magic Frame as usual will suffice to extend the lifespan of bees in your keeping by several times.
+
+ Dimensional Singularity
+ [MB] Quantum flux for them, unlimited storage for you
+ While it may appear similar to the Portable Hole, it serves as a two-way link with another place, which is... probably uninhabited. It should be possible to utilize these singularities to store materials outside of your dimensional understanding - which of course means that they won't clutter up your inventory. As they are now, they are not particularly useful, but there should be ways to unlock their potential.
+
+ Essence of Scornful Oblivion
+ [MB] Cast aside with malice
+ Breeding bees for mutations can be aggrivating, especially whith long-lived species. With a little cleverness and only the slightest hint of smugness, you have found a way to utilize the Dimensional Singularity in a manner that only sucks away the life force of your tiny flying friends, bit by bit. Well, maybe significant amounts all at once. It's probably not going to affect them too badly.
diff --git a/magicbees_res/assets/magicbees/lang/ru_RU.xml b/magicbees_res/assets/magicbees/lang/ru_RU.xml
index 93150bf..dd4369d 100644
--- a/magicbees_res/assets/magicbees/lang/ru_RU.xml
+++ b/magicbees_res/assets/magicbees/lang/ru_RU.xml
@@ -83,11 +83,11 @@
Фрагмент черепа скелета-иссушителяДраконья пыльДраконий кусок
- Эссенция ложной жизни
- Эссенция неглубокой могилы
- Эссенция утраченного времени
- Эссенция вечной прочности
- Эссенция бесконечного равнодушия
+ Эссенция ложной жизни
+ Эссенция неглубокой могилы
+ Эссенция утраченного времени
+ Эссенция вечной прочности
+ Эссенция бесконечного равнодушияПчёлы и магияКристаллизованный %s аспект
@@ -266,8 +266,6 @@
АпатинДень и ночь жужжат. Я забаррикадировал окна и спрятался в подвале, но пронзительный шум апатин пчёл проникал в стены и доводил меня до безумия.|Beekeeping 101
- Абсолютные
- "Их сильно привлекают осколки. Они требуют дальнейшего изучения."|Azanor, Master ThaumaturgeАура"Они работают так быстро, что это захватывает дух."|Sengir, Mad ApiaristИгнис
@@ -276,8 +274,10 @@
"Я пытался размножить их однажды, но я получил мыло."|MysteriousAges, Apprentice ThaumaturgeСолим"You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian
- Праекантатио
- Пчеловодство это магия!|Apinomicon, Preface
+ Праекантатио
+ Пчеловодство это магия!|Apinomicon, Preface
+ Абсолютные
+ "Их сильно привлекают осколки. Они требуют дальнейшего изучения."|Azanor, Master ThaumaturgeВис"Они могут чувствовать изменения в ауре, но ещё не в состоянии воздействовать на неё."|Azanor, research notes
diff --git a/magicbees_res/assets/magicbees/lang/zh_CN.xml b/magicbees_res/assets/magicbees/lang/zh_CN.xml
index 2a60f90..1771e4e 100644
--- a/magicbees_res/assets/magicbees/lang/zh_CN.xml
+++ b/magicbees_res/assets/magicbees/lang/zh_CN.xml
@@ -83,11 +83,11 @@
凋灵骷髅头骨碎片龙之尘龙之块
- 虚假之命源质
- 暗影之墓源质
- 迷失之时源质
- 恒久不灭源质
- 无尽漠视源质
+ 虚假之命源质
+ 暗影之墓源质
+ 迷失之时源质
+ 恒久不灭源质
+ 无尽漠视源质蜜蜂与魔法晶化%s要素
@@ -239,8 +239,6 @@
磷化这些东西真心是日夜牢骚不断.我关紧窗户躲进地下室，但蜜蜂尖锐的嗡嗡声却无处不在地透墙而过，乱我心绪.|养蜂入门
- 朴实
- "它们能吸引魔力的碎片，具体有待研究！"|Azanor,大神秘使灵气"工作敏捷，扣人心弦！"|Sengir,养蜂狂人灼热
@@ -249,8 +247,10 @@
"我试图养育它们，结果变成落汤鸡！"|MysteriousAges,神秘使学徒泥土"这些蜜蜂真心是挖掘专家，小心它们挖洞"|MysteriousAges,滑稽剧学徒
- 奇术
- 养蜂本身就是一种魔法!|Apinomicon,绪论
+ 奇术
+ 养蜂本身就是一种魔法!|Apinomicon,绪论
+ 朴实
+ "它们能吸引魔力的碎片，具体有待研究！"|Azanor,大神秘使魔力"它们能感知到魔力的存在，却还不能影响到魔力."|Azanor,研究笔记
@@ -259,7 +259,7 @@
咒波"我以为能解决咒波问题呢，结果情况更糟糕了!"|Kreicus,神秘使学徒吸引
- 经过古怪的突变后，这种蜜蜂能吸引魔力.|Apinomicon
+ 经过古怪的突变后，这种蜜蜂能吸引魔力.|Apinomicon复兴神奇的蜜蜂，能吸引附近的节点靠近.|Apinomicon
diff --git a/magicbees_res/assets/magicbees/textures/aspects/tempus.png b/magicbees_res/assets/magicbees/textures/aspects/tempus.png
new file mode 100644
index 0000000..d04da05
Binary files /dev/null and b/magicbees_res/assets/magicbees/textures/aspects/tempus.png differ
diff --git a/magicbees_src/magicbees/bees/BeeSpecies.java b/magicbees_src/magicbees/bees/BeeSpecies.java
index 1efc81f..e6e6c58 100644
--- a/magicbees_src/magicbees/bees/BeeSpecies.java
+++ b/magicbees_src/magicbees/bees/BeeSpecies.java
@@ -168,18 +168,18 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
BeeClassification.TRANSMUTING, 0xDBB24C, 0xDBA4A4, EnumTemperature.HOT, EnumHumidity.ARID, false, false),
// --------- Thaumcraft Bees ---------------------------------------------------------------------------------------
- TC_CHAOS("TCStark", "torridae", // Stark
- BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
- TC_AIR("TCAir", "aether", // Aura
+ TC_AIR("TCAir", "aether",
BeeClassification.THAUMIC, 0xD9D636, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
- TC_FIRE("TCFire", "praefervidus", // Ignis
+ TC_FIRE("TCFire", "praefervidus",
BeeClassification.THAUMIC, 0xE50B0B, 0x999999, EnumTemperature.HOT, EnumHumidity.ARID, true, true),
- TC_WATER("TCWater", "umidus", // Aqua
+ TC_WATER("TCWater", "umidus",
BeeClassification.THAUMIC, 0x36CFD9, 0x999999, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true),
- TC_EARTH("TCEarth", "sordida", // Solum
+ TC_EARTH("TCEarth", "sordida",
BeeClassification.THAUMIC, 0x005100, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
- TC_ORDER("TCMagic", "azanorius", //Praecantatio
+ TC_ORDER("TCOrder", "ordinatus",
BeeClassification.THAUMIC, 0xaa32fc, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
+ TC_CHAOS("TCChaos", "tenebrarum",
+ BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
TC_VIS("TCVis", "arcanus saecula",
BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
@@ -400,20 +400,17 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.setGenome(BeeGenomeManager.getTemplateEthereal())
.register();
- WINDY.addProduct(Config.combs.getStackForType(CombType.AIRY), 10)
- .addSpecialty(new ItemStack(Item.feather), 5)
+ WINDY.addProduct(Config.combs.getStackForType(CombType.AIRY), 25)
.setGenome(BeeGenomeManager.getTemplateWindy())
.register();
- FIREY.addProduct(Config.combs.getStackForType(CombType.FIREY), 10)
- .addSpecialty(new ItemStack(Item.blazePowder), 5)
+ FIREY.addProduct(Config.combs.getStackForType(CombType.FIREY), 25)
.setGenome(BeeGenomeManager.getTemplateFirey())
.register();
- EARTHY.addProduct(Config.combs.getStackForType(CombType.EARTHY), 10)
- .addSpecialty(new ItemStack(Item.clay), 9)
+ EARTHY.addProduct(Config.combs.getStackForType(CombType.EARTHY), 25)
.setGenome(BeeGenomeManager.getTemplateEarthy())
.register();
- WATERY.addProduct(Config.combs.getStackForType(CombType.WATERY), 10)
- .addSpecialty(new ItemStack(Block.ice), 4)
+ WATERY.addProduct(Config.combs.getStackForType(CombType.WATERY), 25)
+ .addSpecialty(new ItemStack(Block.ice), 2)
.setGenome(BeeGenomeManager.getTemplateWatery())
.register();
@@ -584,22 +581,23 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.register();
MUTABLE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 30)
+ .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 10)
.setGenome(BeeGenomeManager.getTemplateMutable())
.register();
TRANSMUTING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 10)
- .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 10)
- .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SIMMERING.ordinal()), 10)
+ .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 30)
+ .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 5)
+ .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SIMMERING.ordinal()), 5)
.setGenome(BeeGenomeManager.getTemplateTransmuting())
.register();
- CRUMBLING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.POWDERY.ordinal()), 20)
- .addProduct(new ItemStack(Config.fBeeComb, 1 , ForestryHelper.Comb.COCOA.ordinal()), 20)
+ CRUMBLING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 10)
+ .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 30)
+ .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.POWDERY.ordinal()), 10)
+ .addProduct(new ItemStack(Config.fBeeComb, 1 , ForestryHelper.Comb.COCOA.ordinal()), 15)
.setGenome(BeeGenomeManager.getTemplateCrumbling())
.register();
- TC_CHAOS.addProduct(Config.combs.getStackForType(CombType.CHAOS), 20)
- .setGenome(BeeGenomeManager.getTemplateTCStark())
- .register();
TC_AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 20)
.setGenome(BeeGenomeManager.getTemplateTCAir())
.register();
@@ -612,9 +610,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TC_EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 20)
.setGenome(BeeGenomeManager.getTemplateTCEarth())
.register();
- TC_ORDER.addProduct(Config.combs.getStackForType(CombType.ORDER), 20)
+ TC_ORDER.addProduct(Config.combs.getStackForType(CombType.TC_ORDER), 20)
.setGenome(BeeGenomeManager.getTemplateTCMagic())
.register();
+ TC_CHAOS.addProduct(Config.combs.getStackForType(CombType.TC_CHAOS), 20)
+ .setGenome(BeeGenomeManager.getTemplateTCStark())
+ .register();
TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 10)
.setGenome(BeeGenomeManager.getTemplateTCVis())
diff --git a/magicbees_src/magicbees/item/types/CombType.java b/magicbees_src/magicbees/item/types/CombType.java
index fc0590d..13f96ac 100644
--- a/magicbees_src/magicbees/item/types/CombType.java
+++ b/magicbees_src/magicbees/item/types/CombType.java
@@ -7,50 +7,60 @@ public enum CombType
{
MUNDANE("mundane", true),
MOLTEN("molten", true),
- FORGOTTEN("forgotten", false),
OCCULT("occult", true),
OTHERWORLDLY("otherworldly", true),
-
+ TRANSMUTED("transmuted", true),
PAPERY("paper", true),
SOUL("soul", true),
FURTIVE("furtive", true),
INTELLECT("aware", false),
TEMPORAL("time", false),
+ FORGOTTEN("forgotten", false),
AIRY("air", false),
FIREY("fire", false),
WATERY("water", false),
EARTHY("earth", false),
- ORDER("order", false),
- CHAOS("chaos", false),
+
+ TC_AIR("TCair", true),
+ TC_FIRE("TCfire", true),
+ TC_WATER("TCwater", true),
+ TC_EARTH("TCearth", true),
+ TC_ORDER("TCorder", true),
+ TC_CHAOS("TCchaos", true),
AM_ESSENCE("essence", false),
AM_POTENT("potent", false),
;
- private static int[][] colours =
- new int[][] { {0xFF9859, 0xFFC58E},
- {0xcc3333, 0x1E160E},
- {0x9872FF, 0x2D2D2D},
- {0x3EE0D8, 0x3A3820},
- {0xE5425D, 0x323291},
-
- {0xBCA664, 0x35332E},
- {0x7F7171, 0x876D53},
- {0xcda6cd, 0x545454},
- {0x0092e9, 0x618fff},
- {0x2F9381, 0x773C31},
-
- {0xffff7e, 0x606308},
- {0xff3C01, 0x5B0D10},
- {0x0090ff, 0x102F6B},
- {0x00a000, 0x043004},
- {0xDDDDFF, 0x9D9DB5},
- {0x555577, 0x2D2D56},
-
- {0xCC8604, 0x41046F},
- {0xCCCC04, 0x41046F},
- };
+ private static int[][] colours = new int[][] {
+ {0xFF9859, 0xFFC58E},
+ {0xcc3333, 0x1E160E},
+ {0x9872FF, 0x2D2D2D},
+ {0x3EE0D8, 0x3A3820},
+ {0xE5425D, 0x323291},
+
+ {0xBCA664, 0x35332E},
+ {0x7F7171, 0x876D53},
+ {0xcda6cd, 0x545454},
+ {0x0092e9, 0x618fff},
+ {0x2F9381, 0x773C31},
+
+ {0xffff7e, 0x606308},
+ {0xff3C01, 0x5B0D10},
+ {0x0090ff, 0x102F6B},
+ {0x00a000, 0x043004},
+
+ {0xFFDF14, 0x707019},
+ {0xE21802, 0x3F0E12},
+ {0x00B6FF, 0x0F373D},
+ {0x28D328, 0x333004},
+ {0xDDDDFF, 0x9D9DB5},
+ {0x555577, 0x2D2D56},
+
+ {0xCC8604, 0x41046F},
+ {0xCCCC04, 0x41046F},
+ };
private CombType(String pName, boolean show)
{
@@ -59,6 +69,11 @@ public enum CombType
this.showInList = show;
}
+ public void setHidden()
+ {
+ this.showInList = false;
+ }
+
private String name;
public boolean showInList;
@@ -68,7 +83,7 @@ public enum CombType
}
public int[] getColours()
- {
+ {
return colours[this.ordinal()];
}
}
\ No newline at end of file
diff --git a/magicbees_src/magicbees/item/types/HiveFrameType.java b/magicbees_src/magicbees/item/types/HiveFrameType.java
index de6a3dd..30009f0 100644
--- a/magicbees_src/magicbees/item/types/HiveFrameType.java
+++ b/magicbees_src/magicbees/item/types/HiveFrameType.java
@@ -7,10 +7,10 @@ public enum HiveFrameType
MAGIC("Magic", 240, 1f, 1f, 1f, 2f),
RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f),
GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f),
- METABOLIC("Metabolic", 120, 1f, 1.8f, 1f, 1.2f),
- NECROTIC("Necrotic", 290, 1f, 1f, 0.3f, 0.75f),
+ METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f),
+ NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f),
TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f),
- OBLIVION("Oblivion", 60, 1f, 1f, 0.0001f, 0f),
+ OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f),
;
private HiveFrameType(String name, int damage,
diff --git a/magicbees_src/magicbees/item/types/NuggetType.java b/magicbees_src/magicbees/item/types/NuggetType.java
index 188b687..1113caf 100644
--- a/magicbees_src/magicbees/item/types/NuggetType.java
+++ b/magicbees_src/magicbees/item/types/NuggetType.java
@@ -33,9 +33,9 @@ public enum NuggetType
return this.targetIngot;
}
- public void setActive(boolean b)
+ public void setInactive()
{
- this.active = b;
+ this.active = false;
}
public boolean isActive()
diff --git a/magicbees_src/magicbees/item/types/PropolisType.java b/magicbees_src/magicbees/item/types/PropolisType.java
index 2275d2f..458d9df 100644
--- a/magicbees_src/magicbees/item/types/PropolisType.java
+++ b/magicbees_src/magicbees/item/types/PropolisType.java
@@ -5,13 +5,14 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
public enum PropolisType
{
+ UNSTABLE("unstable", 0xEFB492),
+
AIR("air", 0xA19E10),
FIRE("fire", 0x95132F),
WATER("water", 0x1054A1),
EARTH("earth", 0x00a000),
ORDER("dull", 0xDDDDFF),
CHAOS("magic", 0x555577),
- UNSTABLE("unstable", 0xEFB492),
;
private PropolisType(String pName, int overlayColour)
diff --git a/magicbees_src/magicbees/item/types/ResourceType.java b/magicbees_src/magicbees/item/types/ResourceType.java
index 27c17e2..394d522 100644
--- a/magicbees_src/magicbees/item/types/ResourceType.java
+++ b/magicbees_src/magicbees/item/types/ResourceType.java
@@ -12,17 +12,17 @@ public enum ResourceType
SKULL_FRAGMENT("skullFragment", true),
DRAGON_DUST("dragonDust", true),
DRAGON_CHUNK("dragonChunk", true),
- ESSENCE_FALSE_LIFE("essenceFalseLife", true),
- ESSENCE_SHALLOW_GRAVE("essenceShallowGrave", true),
- ESSENCE_LOST_TIME("essenceLostTime", true),
- ESSENCE_EVERLASTING_DURABILITY("essenceEverlastingDurability", true),
- ESSENCE_UNENDING_DISREGARD("essenceUnendingDisregard", true),
- z_1("", false),
- z_2("", false),
- z_3("", false),
- z_4("", false),
- z_5("", false),
- DIMENSIONAL_SINGULARITY("dimensionalSingularity", false),
+ ESSENCE_FALSE_LIFE("essenceLife", true),//
+ ESSENCE_SHALLOW_GRAVE("essenceDeath", true),//
+ ESSENCE_LOST_TIME("essenceTime", true),
+ ESSENCE_EVERLASTING_DURABILITY("essenceDurability", true),//
+ ESSENCE_SCORNFUL_OBLIVION("essenceOblivion", true),
+ ESSENCE_FICKLE_PERMANENCE("essenceMutable", true),//
+ z_2("lump", false), // Using lump for the name to avoid missing texture warnings.
+ z_3("lump", false),
+ z_4("lump", false),
+ z_5("lump", false),
+ DIMENSIONAL_SINGULARITY("dimensionalSingularity", true),
TC_DUST_AIR("TCairDust", true),
TC_DUST_WATER("TCwaterDust", true),
TC_DUST_FIRE("TCfireDust", true),
diff --git a/magicbees_src/magicbees/main/utils/CraftingManager.java b/magicbees_src/magicbees/main/utils/CraftingManager.java
index d38946c..4a5592b 100644
--- a/magicbees_src/magicbees/main/utils/CraftingManager.java
+++ b/magicbees_src/magicbees/main/utils/CraftingManager.java
@@ -94,6 +94,14 @@ public class CraftingManager
'D', Block.dirt,
'w', Config.wax.getStackForType(WaxType.SOUL)
});
+
+ 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
+ });
GameRegistry.addRecipe(new ItemStack(Config.hiveFrameTemporal), new Object[] {
"sPs", "PfP", "sPs",
@@ -142,13 +150,13 @@ public class CraftingManager
"gwg", "wiw", "gwg",
'g', Block.glass,
'w', "waxMagical",
- 'i', Item.ingotIron
+ 'i', Block.blockIron
}));
GameRegistry.addRecipe(new ShapedOreRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), new Object[] {
"wgw", "gig", "wgw",
'g', Block.glass,
'w', "waxMagical",
- 'i', Item.ingotIron
+ 'i', Block.blockIron
}));
GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), new Object[] {
@@ -190,7 +198,15 @@ public class CraftingManager
'c', Item.pocketSundial
});
- GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_UNENDING_DISREGARD), new Object[] {
+ GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE), new Object[] {
+ "wew", "gcg", "wew",
+ 'w', Config.wax.getStackForType(WaxType.SOUL),
+ 'c', Item.magmaCream,
+ 'e', Item.egg,
+ 'g', Block.glowStone
+ });
+
+ GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), new Object[] {
"gst", "sEs", "tsg",
'g', Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE),
't', Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME),
@@ -198,87 +214,78 @@ public class CraftingManager
'E', Block.dragonEgg,
});
- GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameMagic, 2), new Object[] {
- Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY),
- ItemInterface.getItem("frameUntreated"),
- ItemInterface.getItem("frameUntreated")
- });
-
+ input = new ItemStack(Config.hiveFrameMagic);
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameResilient), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY),
- ItemInterface.getItem("frameImpregnated"),
- Item.ingotIron, Item.ingotIron,
- Item.ingotIron, Item.ingotIron
+ input
});
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameGentle), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE),
- ItemInterface.getItem("frameUntreated")
- });
-
- GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameMetabolic), new Object[] {
- Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE),
- ItemInterface.getItem("frameImpregnated"),
- Item.magmaCream
+ input
});
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameNecrotic), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE),
- ItemInterface.getItem("frameUntreated"),
- Item.rottenFlesh, Item.rottenFlesh,
- Item.rottenFlesh, Item.rottenFlesh
+ input, Item.rottenFlesh, Item.rottenFlesh, Item.rottenFlesh, Item.rottenFlesh
+ });
+
+ GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameMetabolic), new Object[] {
+ Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE),
+ input
});
GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameTemporal), new Object[] {
Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME),
- ItemInterface.getItem("frameImpregnated"),
- Config.pollen.getStackForType(PollenType.PHASED)
+ input, Config.pollen.getStackForType(PollenType.PHASED)
});
- GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] {
- Config.miscResources.getStackForType(ResourceType.ESSENCE_UNENDING_DISREGARD),
- ItemInterface.getItem("frameProven")
- });
+ if (!ThaumcraftHelper.isActive())
+ {
+ GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] {
+ Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
+ ItemInterface.getItem("frameProven")
+ });
+ }
if (OreDictionary.getOres("ingotCopper").size() <= 0)
{
- NuggetType.COPPER.setActive(false);
+ NuggetType.COPPER.setInactive();
}
- if (OreDictionary.getOres("ingotTin").size() <= 0)
- {
- NuggetType.TIN.setActive(false);
- }
- if (OreDictionary.getOres("ingotSilver").size() <= 0)
- {
- NuggetType.SILVER.setActive(false);
- }
- if (OreDictionary.getOres("ingotLead").size() <= 0)
- {
- NuggetType.LEAD.setActive(false);
- }
-
- if (NuggetType.COPPER.isActive())
+ else
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotCopper").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetCopper"
}));
}
- if (NuggetType.TIN.isActive())
+ if (OreDictionary.getOres("ingotTin").size() <= 0)
+ {
+ NuggetType.TIN.setInactive();
+ }
+ else
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotTin").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetTin"
}));
}
- if (NuggetType.SILVER.isActive())
+ if (OreDictionary.getOres("ingotSilver").size() <= 0)
+ {
+ NuggetType.SILVER.setInactive();
+ }
+ else
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotSilver").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetSilver"
}));
}
- if (NuggetType.LEAD.isActive())
+ if (OreDictionary.getOres("ingotLead").size() <= 0)
+ {
+ NuggetType.LEAD.setInactive();
+ }
+ else
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotLead").get(0), new Object[] {
"xxx", "xxx", "xxx",
@@ -354,10 +361,10 @@ public class CraftingManager
'W', Config.wax
});*/
+ input = Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT);
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)
+ GameRegistry.addShapelessRecipe(output, new Object[] {
+ input, input, input, input
});
// T1 Thaumaturge's backpack
@@ -437,54 +444,69 @@ public class CraftingManager
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TEMPORAL),
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.pollen.getStackForType(PollenType.PHASED), new ItemStack(Config.fHoneydew, 1)},
new int[] {100, 5, 60});
+
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AIRY),
- new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.AIR) },
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.feather) },
new int[] { 100, 60 });
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FIREY),
- new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.FIRE) },
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.blazePowder) },
new int[] { 100, 60 });
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.WATERY),
- new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.WATER) },
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.dyePowder) },
new int[] { 100, 60 });
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.EARTHY),
- new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.EARTH) },
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.clay) },
new int[] { 100, 60 });
- RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.ORDER),
- new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.ORDER) },
- new int[] { 100, 60 });
- RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.CHAOS),
- new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.CHAOS) },
- new int[] { 100, 60 });
-
- RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_POTENT),
- new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeydew") },
- new int[] { 50, 50, 65 } );
+ if (ThaumcraftHelper.isActive())
+ {
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_AIR),
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.feather), Config.propolis.getStackForType(PropolisType.AIR) },
+ new int[] { 100, 60, 80 });
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_FIRE),
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.blazePowder), Config.propolis.getStackForType(PropolisType.FIRE) },
+ new int[] { 100, 60, 80 });
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_WATER),
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.dyePowder), Config.propolis.getStackForType(PropolisType.WATER) },
+ new int[] { 100, 60, 80 });
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_EARTH),
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.clay), Config.propolis.getStackForType(PropolisType.EARTH) },
+ new int[] { 100, 60, 80 });
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_ORDER),
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.ORDER) },
+ new int[] { 100, 80 });
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TC_CHAOS),
+ new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.CHAOS) },
+ new int[] { 100, 80 });
- RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.AIR),
- new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_AIR) },
- new int[] { 100, 65 } );
- RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.FIRE),
- new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_FIRE) },
- new int[] { 100, 65 } );
- RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.WATER),
- new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_WATER) },
- new int[] { 100, 65 } );
- RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.EARTH),
- new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_EARTH) },
- new int[] { 100, 65 } );
- RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.ORDER),
- new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_ORDER) },
- new int[] { 100, 65 } );
- RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.CHAOS),
- new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_CHAOS) },
- new int[] { 100, 65 } );
+ RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.AIR),
+ new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_AIR) },
+ new int[] { 100, 65 } );
+ RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.FIRE),
+ new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_FIRE) },
+ new int[] { 100, 65 } );
+ RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.WATER),
+ new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_WATER) },
+ new int[] { 100, 65 } );
+ RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.EARTH),
+ new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_EARTH) },
+ new int[] { 100, 65 } );
+ RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.ORDER),
+ new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_ORDER) },
+ new int[] { 100, 65 } );
+ RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.CHAOS),
+ new ItemStack[] {propolis, Config.miscResources.getStackForType(ResourceType.TC_DUST_CHAOS) },
+ new int[] { 100, 65 } );
+ }
if (ArsMagicaHelper.isActive())
{
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_ESSENCE),
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Config.amItemResource), new ItemStack(Config.amItemResource) },
new int[] { 85, 10, 2 } );
+ RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_POTENT),
+ new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeydew") },
+ new int[] { 50, 50, 65 } );
}
}
@@ -525,14 +547,6 @@ public class CraftingManager
'J', ItemInterface.getItem("royalJelly"),
'D', Config.drops.getStackForType(DropType.ENCHANTED)
});
-
- 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
- });
if (ThaumcraftHelper.isActive())
{
diff --git a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java
index a98dfed..613fe59 100644
--- a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java
+++ b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java
@@ -1,5 +1,7 @@
package magicbees.main.utils.compat;
+import java.util.ArrayList;
+
import magicbees.item.types.PollenType;
import magicbees.item.types.PropolisType;
import magicbees.item.types.ResourceType;
@@ -11,16 +13,20 @@ import magicbees.main.utils.LocalizationManager;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.util.ResourceLocation;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.crafting.IArcaneRecipe;
+import thaumcraft.api.crafting.RecipeCrucible;
import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchItem;
import thaumcraft.api.research.ResearchPage;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.api.core.ItemInterface;
public class ThaumcraftHelper
{
@@ -220,9 +226,6 @@ public class ThaumcraftHelper
}
}
- private static IArcaneRecipe thaumScoop;
- private static IArcaneRecipe thaumGrafter;
-
private static void setupCrafting()
{
ItemStack input, output;
@@ -253,56 +256,219 @@ public class ThaumcraftHelper
thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe("MB_Scoop", new ItemStack(Config.thaumiumScoop),
new AspectList().add(Aspect.ORDER, 2), new Object[] {
- "sWs", "sTs", " T ",
- 's', Item.stick,
- 'W', Block.cloth,
- 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal())
+ "sWs", "sTs", " T ",
+ 's', Item.stick,
+ 'W', Block.cloth,
+ 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal())
});
thaumGrafter = ThaumcraftApi.addArcaneCraftingRecipe("MB_Grafter", new ItemStack(Config.thaumiumGrafter),
new AspectList().add(Aspect.ORDER, 5), new Object[] {
- " T", " s ", "s ",
- 's', Item.stick,
- 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal())
+ " T", " s ", "s ",
+ 's', Item.stick,
+ 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal())
});
+ frameMagic = ThaumcraftApi.addArcaneCraftingRecipe("MB_FrameMagic", new ItemStack(Config.hiveFrameMagic),
+ new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2).add(Aspect.EARTH, 2), new Object[] {
+ "sss", "sCs", "sss",
+ 's', Item.stick,
+ 'C', new ItemStack(Config.tcMiscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal())
+ });
+
+ frameOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", new ItemStack(Config.hiveFrameOblivion),
+ new AspectList().add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 5), new Object[] {
+ Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
+ ItemInterface.getItem("frameProven")
+ });
+
+ essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE),
+ new ItemStack(Block.plantRed), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4));
+
+ essenceDeath = ThaumcraftApi.addCrucibleRecipe("MB_EssenceDeath", Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE),
+ new ItemStack(Item.rottenFlesh), new AspectList().add(Aspect.DEATH, 4).add(Aspect.ENTROPY, 4));
+
+ essenceArmor = ThaumcraftApi.addCrucibleRecipe("MB_EssenceArmor", Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY),
+ new ItemStack(Item.leather), new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 2));
+
+ output = Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE);
+ essenceUnstableA = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output,
+ Config.propolis.getStackForType(PropolisType.UNSTABLE), new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.EXCHANGE, 1));
+
+ essenceUnstableB = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output,
+ new ItemStack(Block.netherrack), new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.EXCHANGE, 5));
+
+ essenceTime = ThaumcraftApi.addCrucibleRecipe("MB_EssenceTime", Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME),
+ new ItemStack(Item.pocketSundial), new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, 10).add(Aspect.TRAP, 4));
+
+ singularity = ThaumcraftApi.addCrucibleRecipe("MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3),
+ new ItemStack(Block.dragonEgg), new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 10));
+
+ essenceOblivion = ThaumcraftApi.addCrucibleRecipe("MB_EssenceOblivion", Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
+ Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), new AspectList().add(Aspect.DARKNESS, 5).add(Aspect.ELDRITCH, 5).add(Aspect.HUNGER, 15).add(Aspect.VOID, 10));
}
+ private static Object frameMagic;
+ private static Object frameOblivion;
+ private static Object thaumScoop;
+ private static Object thaumGrafter;
+ private static Object singularity;
+ private static Object essenceLife;
+ private static Object essenceDeath;
+ private static Object essenceArmor;
+ private static Object essenceUnstableA;
+ private static Object essenceUnstableB;
+ private static Object essenceTime;
+ private static Object essenceOblivion;
+
private static void setupResearch()
{
- ResearchCategories.registerCategory("MAGICBEES", new ResourceLocation("magicbees", CommonProxy.ITEM_TEXTURE + "beeInfusion.png"), new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"));
- ResearchItem startNode = new ResearchItem("MB_Root", "MAGICBEES", new AspectList(),
+ ArrayList