diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index ae38c86..b56793f 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -224,7 +224,7 @@ public class RegisteredRecipes { ItemStack result = new ItemStack(RegisteredItems.itemFamiliar); familiar.setAspect(result, aspect); - recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", result, 4, new AspectList().add(aspect, 46).add(Aspect.AURA, 34).add(Aspect.MAGIC, 51), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack[] { wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) , wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) }); + recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", result, 4, new AspectList().add(aspect, 46).add(Aspect.AURA, 34).add(Aspect.MAGIC, 51), new ItemStack(ConfigItems.itemAmuletRunic, 1, 0), new ItemStack[] { wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) , wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 1), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 1) }); } return recipes; } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 0dff42c..f309b14 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -156,7 +156,7 @@ public class RegisteredResearches { 3, -2, 2, familiarResearchStack) .setSpecial().setConcealed() .setParents(nitorResearch.key) - .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar)).registerResearchItem(); + .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar), new ResearchPage("gadomancy.research_page.FAMILIAR.3")).registerResearchItem(); ResearchItem researchTallow = PseudoResearchItem.create("TALLOW", 7, -3).registerResearchItem(); diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java index cf2c630..fe9263c 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -49,7 +49,6 @@ public class TCMazeHandler { public static final FakeWorldTCGeneration GEN = new FakeWorldTCGeneration(); - private static List scheduledWorldUnloads = new ArrayList(); private static List flaggedSessions = new ArrayList(); private static Map runningSessions = new HashMap(); @@ -189,23 +188,7 @@ public class TCMazeHandler { } } - private static void addToWorldUnloadQueue(int dimId) { - if(!scheduledWorldUnloads.contains(dimId)) { - scheduledWorldUnloads.add(dimId); - } - } - public static void scheduleTick() { - for(Integer i : scheduledWorldUnloads) { - WorldServer ws = DimensionManager.getWorld(i); - if (ws != null) { - MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(ws)); - ws.flush(); - DimensionManager.setWorld(i, null); - } - } - scheduledWorldUnloads.clear(); - Iterator it = flaggedSessions.iterator(); while(it.hasNext()) { TCMazeSession s = it.next(); diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 106fc4e..a09d248 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -11,19 +11,19 @@ gadomancy.research_page.GOLEMSILVERWOOD.1=This golem is carved from a silverwood tc.research_name.GADOMANCY.GOLEMRUNICSHIELD=Golemic Shielding tc.research_text.GADOMANCY.GOLEMRUNICSHIELD=Now available to your tiny friends! -gadomancy.research_page.GOLEMRUNICSHIELD.1=Furthering your research into protective magic, you have discovered a way to apply runic shielding to your Golems.
In the same way you yourself are protected, golems will be protected by a barrier of magical energy that wards out most types of damage until the pool of extra hit points is depleted.
Does not protect against drowning and certain other environmental hazards. +gadomancy.research_page.GOLEMRUNICSHIELD.1=After further experimenting with protective magic, you have discovered a way to apply runic shielding to your Golems.
In the same way runic shields behave when worn by yourself, a golem with this upgrade will be protected by a barrier of magical energy that wards out most types of damage until its charge is depleted.
Does not protect against drowning and certain other environmental hazards. tc.research_name.GADOMANCY.STICKYJAR=Sticky Jars tc.research_text.GADOMANCY.STICKYJAR=Stick 'em up! -gadomancy.research_page.STICKYJAR.1=Warded jars are any thaumaturge's bread and butter; however, they can be a bit difficult to arrange when large tangles of essentia tubes get involved. You decided to alleviate this minor difficulty by applying some adhesive to the bottom of the jar. Any jar that has had its base coated will stick to any surface it is placed on, even facing sideways or upside down. Breaking the jar does not remove the adhesive, allowing sticky jars to be reused. Also, many other types of essentia containing jars other than basic warded jars can accept this alteration. +gadomancy.research_page.STICKYJAR.1=Warded jars are any thaumaturge's bread and butter, but they can be a bit difficult to arrange when large tangles of essentia tubes are involved. You decided to alleviate this minor difficulty by applying some adhesive to the bottom of the jar. Any jar that has its base coated will stick to the surface it is placed on, even if that surface is facing sideways or upside down. Breaking the jar does not remove the adhesive, allowing sticky jars to be reused. Also, many other types of essentia containing jars other than basic warded jars can accept this alteration. tc.research_name.GADOMANCY.ARCANEDROPPER=Arcane Dropper tc.research_text.GADOMANCY.ARCANEDROPPER=When the pimps in the crib, ma -gadomancy.research_page.ARCANEDROPPER.1=After thinking a lot about the properties of the dropper, and how those properties can be extended, you have made a series of modifications to the dropper.The Arcane Dropper gives you the ability to extract, insert, and monitor items in a 3x3 area as if they were in an inventory.
To see this area of effect, hover over the Arcane Dropper with a wand (without focus).
Only the flat sides of the Arcane Dropper can be interacted with. +gadomancy.research_page.ARCANEDROPPER.1=After considering the properties of the dropper, and how those properties can be extended, you have made a series of modifications to the dropper.The Arcane Dropper gives you the ability to extract, insert, and monitor items in a 3x3x3 area as if they were inside of an inventory.
To see this area of effect, hover over the Arcane Dropper with a wand (without a focus).
Only the flat sides of the Arcane Dropper can be interacted with. tc.research_name.GADOMANCY.GOLEMCOREBREAK=Golem Core: Break tc.research_text.GADOMANCY.GOLEMCOREBREAK=Breaking news! -gadomancy.research_page.GOLEMCOREBREAK.1=Golems fitted with this core will monitor and break blocks specified by you.
You may specify a tool for the golem to use in its inventory.
You can add a block to the golem's inventory to specify which blocks will be broken. Breaking speed depends on tool strength and speed.
You can apply the Order Upgrade to specify which tool needs to be used on the associated marked block.
You can apply the Etropy Upgrade to ignore metadata on tools. +gadomancy.research_page.GOLEMCOREBREAK.1=Golems fitted with this core will monitor and break marked blocks.
You may specify a tool for the golem to use in its inventory.
You can add a block to the golem's inventory to specify which blocks will be broken. Breaking speed depends on tool strength and speed.
You can apply the Order Upgrade to specify which tool needs to be used on the associated marked block.
You can apply the Etropy Upgrade to ignore metadata on tools. tc.research_name.GADOMANCY.GOLEMCOREBODYGUARD=Golem Core: Bodyguard tc.research_text.GADOMANCY.GOLEMCOREBODYGUARD=One does not simply attack my Master @@ -31,8 +31,8 @@ gadomancy.research_page.GOLEMCOREBODYGUARD.1=Guard Golems are all good and fine, tc.research_name.GADOMANCY.INFUSIONCLAW=Automated Infusion tc.research_text.GADOMANCY.INFUSIONCLAW=Floating stuff! -gadomancy.research_page.INFUSIONCLAW.1=Considering there are many situations in which you would like to be able to automate an Infusion Altar without being so close, you've been fooling with the Wand Recharge Pedestal, trying to get it to do things for you. It's slightly sentient and somehow bound to your soul, but it seems to work well! Your eye has been twitching a bit recently though... i'm sure it will be fine. -gadomancy.research_page.INFUSIONCLAW.2=Place this device atop your Infusion Matrix and insert a wand or staff. They can be inserted and extracted from the top side. With the checkbox marked, only empty wands can be extracted. This process adds instability to any infusions triggered with the Infusion Claw. The amount of instability depends on how good the wand you use is. Staffs are a bit more stable, but the main factor is the amount of storage a wand has.
You can trigger infusions with a redstone signal into one of the four sides.
This device can also be used to automate production of Thaumonomicons and Crucibles, making your dream of a Thaumonomicon and Crucible factory possible! +gadomancy.research_page.INFUSIONCLAW.1=Considering there are many situations in which you would like to be able to automate an Infusion Altar without being so close, you've been fooling with the Wand Recharge Pedestal. Trying to get it to move a wand rather than just hold it has proven difficult, but not impossible. The resulting device is slightly sentient and somehow bound to your soul, but it seems to work well! Your eye has been twitching a bit recently though... you're sure everything is fine... maybe... +gadomancy.research_page.INFUSIONCLAW.2=Place this device atop your Infusion Matrix and insert a wand or staff. They can be inserted and extracted from the top side. With the checkbox marked, only empty wands can be extracted. This process adds instability to any infusions triggered with the Infusion Claw. The amount of instability depends on how good the wand you use is. Staffs are a bit more stable, but the main factor is the amount of storage a wand has.
You can trigger infusions by running a redstone signal into one of the four sides.
This device can also be used to automate production of Thaumonomicons and Crucibles, making your dream of a Thaumonomicon and Crucible factory possible! tc.research_name.GADOMANCY.REMOTEJAR=Mirrored Jars tc.research_text.GADOMANCY.REMOTEJAR=Mirrored transportation @@ -41,7 +41,8 @@ gadomancy.research_page.REMOTEJAR.2=If a network already exists, then the jar wi tc.research_name.GADOMANCY.FAMILIAR=Ethereal Familiar tc.research_text.GADOMANCY.FAMILIAR=A arcane follower -gadomancy.research_page.FAMILIAR.1=Thanks to your deep research into Wisps and arcane flames you call 'Nitor' you think you may be able to create a being just like the Wisp. Using the same Ethereal Essence and Essentia you are able to define the base aspect of your Familiar. But that's not enough! You might be able to direct its movements and actions to defend yourself with it. However, making it attack players doesn't seem so easy and it seems a bit weak too.. Let's do something about that when the time comes... +gadomancy.research_page.FAMILIAR.1=Wisps have intrigued you for some time now. Many of these sentient bits of ethereal magic seem to be passive, but when attacked, they retaliate with surprising speed and efficiency. Not only that, but sometimes just approaching a wisp too quickly will provoke an attack.This behavior gave you an unexpected inspiration. By exploiting the unusually responsive nature of a wisp, it may be possible to bend its defensive instincts to act as a personal protector. Unfortunately, wild wisps have proven to be far to unpredictable to capture. +gadomancy.research_page.FAMILIAR.3=By infusing large amounts of magic and a few binding agents into a sample of ethereal essence, an artificial wisp can be created. This Ethereal "Familiar" will anchor to its wearer's aura and act similarly to a turret when it is held in the amulet slot, shooting sparks any hostile entities that get too close. It is considerably weaker and slower than its wild counterparts, however you feel that there are definitely methods of strengthening it. tc.research_name.GADOMANCY.FAM_ATTACK_1=Attack Enhancement tc.research_text.GADOMANCY.FAM_ATTACK_1=Increasing the damage @@ -49,11 +50,11 @@ gadomancy.research_page.FAM_ATTACK_1.1=By concentrating more magic into the wisp tc.research_name.GADOMANCY.FAM_ATTACK_2=Further Attack Enhancement tc.research_text.GADOMANCY.FAM_ATTACK_2=What does the scouter say about its power level? -gadomancy.research_page.FAM_ATTACK_2.1=By adding eldritch energies and further concentrating the wisps internal magic, an even further doubling can be achieved. You occasionally hear strange whispering coming from the familiar, but the sound is so quiet that you don't think it will be an issue. +gadomancy.research_page.FAM_ATTACK_2.1=By adding eldritch energies and further concentrating the wisps internal magic, a further doubling of power can be achieved. You occasionally hear strange whispering coming from the familiar, but the sound is so quiet that you don't think it will be an issue. tc.research_name.GADOMANCY.FAM_ATTACK_3=Maximized Damage tc.research_text.GADOMANCY.FAM_ATTACK_3=ITS OVER 9000! -gadomancy.research_page.FAM_ATTACK_3.1=After observing the primordial pearl for some time, you think you can find a way to use it to enhance the familiar even further. By infusing the resonating energies of the pearl with the familiar, you found a way to double its power. The nearly inaudible whispering has become far more pronounced, leaving you with an uneasy feeling... +gadomancy.research_page.FAM_ATTACK_3.1=After observing the primordial pearl for some time, you found a way to use it to enhance the familiar even further. By infusing the resonating energies of the pearl with the familiar, you found a way to double its power yet again. The nearly inaudible whispering has become far more pronounced. You have an uneasy feeling that you are being monitored... tc.research_name.GADOMANCY.FAM_RANGE_1=Range Enhancement tc.research_text.GADOMANCY.FAM_RANGE_1=Attacking even further @@ -65,35 +66,34 @@ gadomancy.research_page.FAM_COOLDOWN_1.1=The resonance of the primordial pearl h tc.research_name.GADOMANCY.NODE_MANIPULATOR=Node Manipulator tc.research_text.GADOMANCY.NODE_MANIPULATOR=Almost like roulette -gadomancy.research_page.NODE_MANIPULATOR.1=After infusing your ordinary Wand Recharge Pedestal with a Node Stabilizer, the Paving Stone of Warding, and some ancient ingredients adept at channeling Vis in its most pure form, one of the most dangerous machines you could fathom fell into your possession: The Node Manipulator. A machine that is capable of changing the way an aura node channels Vis from the other realms. -gadomancy.research_page.NODE_MANIPULATOR.3=This doesn't seem to be enough though. Even by adding the mysterious and ancient Void Seeds, it doesn't seem to be capable of holding a Node in position...
You figure that a new focus, enhanced by Void Metal, might be strong enough to keep it in position. Still, the machine isn't capable of modifying a node on its own. Placing some manipulation pillars in a specific arrangement around the machine may help.. -gadomancy.research_page.NODE_MANIPULATOR.6=This machine doesn't work for free obviously. Once there is a node above the Node Manipulator and the pillars are formed, you need to place a wand or a staff into the Manipulator and it will drain the Vis from the wand into the manipulator. Once at least 70 of each Vis is stored, the Manipulator starts manipulating the node. However, you can store more than 70 Vis in the Manipulator. The more the better maybe...? You don't know the possible outcomes yet, but you should at least try it a few times.. What could possibly go wrong? +gadomancy.research_page.NODE_MANIPULATOR.1=Aura nodes have intrigued you for the longest time. Where do they come from? Why are there so many varieties? After some time, you found yourself asking another question entirely; would it be possible to change how a node functions? After journeying far across the world and into the depths of the ancient eldritch mazes, you found a set of materials capable of changing the way aura behaves. After carefully developing these materials, and using them to augment the only device you found to be capable of channeling pure vis directly from a node, one of the most dangerous machines you could fathom finally fell within your grasp. +gadomancy.research_page.NODE_MANIPULATOR.3=The Node Manipulator is a device that essentially works in a manner opposite to that of a wand recharge pedestal. By drawing vis from a wand or staff and channeling it back into the node, the node manipulator will force a node to destabilize slightly. The manipulator's main pedestal is not stable enough to alter nodes on its own. By adding a specially modified focus to hold the wand/staff in place for vis extraction and a set of pillars to channel the extracted vis into the node, the device is finally ready for use. Just place a wand/staff on the pedestal, and the node manipulator will start automatically. +gadomancy.research_page.NODE_MANIPULATOR.6=The Node Manipulator needs at least 70 of all six primal aspects to begin manipulating a node, but allowing more that 70 seems to yield greater effects.
Despite all of your research into node behavior, you still haven't the slightest idea what the node manipulator will actually do to aura nodes. The only way to find out seems to be testing it out... tc.research_name.GADOMANCY.GROWING=Growing Nodes tc.research_text.GADOMANCY.GROWING=Feed me Semour -gadomancy.research_page.GROWING.1=This node is something... different.
You did expect an Energized Node to be the only stable connection between us and the source of all Vis, but this Aura Node seems very stable too. Energizing an Aura Node channels Vis from its source to our end and breaks it down to the purest primal Aspects.
But... this node behaves much differently from the others. It feels like it's looking for something... it seems... restless... -gadomancy.research_page.GROWING.2=What could it be searching for? Judging from what I know so far it is similar to a hungry Aura Node, but there is just something about it that is very disconcerting. +gadomancy.research_page.GROWING.1=This node is something... different.
You did expect an Energized Node to be the only stable connection between us and the source of all Vis, but this Aura Node seems very stable too. Energizing an Aura Node channels Vis from its source into the world and breaks it down to the purest primal Aspects.
But... this node behaves much differently from others. It feels as though it's looking for something... it seems... restless. Something about this behavior is disconcerting in the extreme. tc.research_name.GADOMANCY.GROWING_AGGRESSION=Aggressive Behavior tc.research_text.GADOMANCY.GROWING_AGGRESSION=Someone call Tesla -gadomancy.research_page.GROWING_AGGRESSION.1=Terrifyingly, the Node released a huge lightning bolt. What could have caused this?
It may be the large amount of Vis flowing through the Aura Node and being released as electrical energy. It seems to be attracted to living things.
I should probably stand back a bit while researching, that was a close call. +gadomancy.research_page.GROWING_AGGRESSION.1=Suddenly, and completely out of nowhere, the Node released a huge bolt of energy.
It may be the large amount of vis flowing through the Aura Node destabilized and released as an arc of energy. These bolts seem to be attracted to anything that even closely resembles a living entity.
You should probably stand back a bit while researching to avoid any other close calls... tc.research_name.GADOMANCY.GROWING_GROWTH=Growing Behavior tc.research_text.GADOMANCY.GROWING_GROWTH=A picky one. -gadomancy.research_page.GROWING_GROWTH.1=I was right! The node has similarities to a hungry node! It has grown!
The big difference is this node only seems to attract things containing pure Vis, things such as Wisps or Ethereal Essence. As far as my research goes, it seems that the more pure the aspect is, the more likely it will fuse with the node. Aspect Orbs and Wisps are absorbed most because they are the most pure. -gadomancy.research_page.GROWING_GROWTH.2=Materialized or solid vis in forms of essentia like Mana Beans, Ethereal Essence, or Crystallized Essentia may work too, but I should be careful with what I throw in this thing...
Still it is more fascinating than a hungry node by far. In contrast to its hungry brother, this node seems to keep the complexity of its gained compound aspects instead of breaking them down to primal aspects. It seems to have something against primal aspects... +gadomancy.research_page.GROWING_GROWTH.1=The node has begun to display similarities to a hungry node, in that it has started to grow.
The big difference between this node and an average hungry node seems to be that this node only attracts things containing pure aspects, such as Wisps or Ethereal Essence. As far as your research goes, it seems that the more pure the aspect is, the more likely it will fuse with the node. Aspect Orbs and Wisps are absorbed most because they are the most pure. +gadomancy.research_page.GROWING_GROWTH.2=Materialized or solid vis in forms of essentia like Mana Beans, Ethereal Essence, or Crystallized Essentia may work too, but you feel you should take care with what you throw into this thing...
Still it is more fascinating than a hungry node by far. In contrast to its hungry brother, this node seems to keep the complexity of its gained compound aspects instead of breaking them down to primal aspects. It seems to have something against primal aspects... tc.research_name.GADOMANCY.GROWING_ATTACK=Destroying Behavior tc.research_text.GADOMANCY.GROWING_ATTACK=Stop bullying! -gadomancy.research_page.GROWING_ATTACK.1=Whoa, what an interesting sight! It seems the growing node does not only bully the other nodes as we know it - it completely destroys them! If the growing node can find another node within range it attacks it and breaks the other node into little Aspect orbs.
Further research shows that the node stabilizers cannot stop the growing node from destroying other nodes, but the growing node does not seem to attack bigger nodes than itself. +gadomancy.research_page.GROWING_ATTACK.1=It seems the growing node does not only bully the other nodes, it completely destroys them! If the growing node can find another node within range it attacks it and breaks the other node into aspect orbs.
Further research shows that the node stabilizers cannot stop the growing node from destroying other nodes, but the growing node does not seem to attack bigger nodes than itself. tc.research_name.GADOMANCY.GROWING_GROWTHCLUE=Secrets of growth tc.research_text.GADOMANCY.GROWING_GROWTHCLUE=Growing explained -gadomancy.research_page.GROWING_GROWTHCLUE.1=This is it! I think I've figured out the growth and potential dangers of a growing node! It looks so simple now: Just don't feed it the same aspects. That's what our node hates. It just wants variety and new aspects. If you feed it the same over and over it gets angry and stops growing due to becoming over saturated.
It only accepts pure aspects though. Ethereal Essence, Crystallized Essence, and Mana beans are weak forms of materialized Vis. The node doesn't seem like that... -gadomancy.research_page.GROWING_GROWTHCLUE.2=In contrast to that it really likes Wisps and Aspect Orbs. Although, one of the best things might be offering other Aura Nodes to the growing node... Expensive though.There are high risks too. The more saturated the node gets, the harder and more often the node attacks its surroundings. I wonder what happens when the node is fully saturated? +gadomancy.research_page.GROWING_GROWTHCLUE.1=At last, you have figured out the secrets of growth and potential dangers in a growing node! The node becomes much more stable when fed a variety of aspects. If it is only allowed to consume the same single aspects repeatedly, it destabilizes and stops growing due to becoming over saturated.
It only accepts pure aspects though. Ethereal Essence, Crystallized Essence, and Mana beans are weak forms of materialized Vis. The node doesn't react to them very much... +gadomancy.research_page.GROWING_GROWTHCLUE.2=Despite the fact that the node will consume ethereal essence, it seems to vastly prefer living Wisps and Aspect Orbs. One of the best things to offer the node seems to be other Aura Nodes... this method does get expensive though.There are high risks too. The more saturated the node gets, the harder and more often the node attacks its surroundings. You wonder what happens when the node becomes fully saturated... gadomancy.golemblurb.default=?? -gadomancy.golemblurb.breakcore=Master, should I break everything, or something specific? +gadomancy.golemblurb.breakcore=Master, should I break anything, or something specific? gadomancy.golem.breakcore=Break gadomancy.golem.bodyguardcore=Bodyguard