Commit graph

632 commits

Author SHA1 Message Date
Jared
c9dab808cf
Merge pull request #695 from duely/1.12
Improve AlchemyTable potion handling, addPotionRecipe.
2019-01-29 03:13:09 +02:00
Jon McManus
d84cd284fd Improve AlchemyTable potion handling, addPotionRecipe.
The alchemy table recipes are actually split between two locations,
including the registrar found in the API, and then the more "complex"
recipes listed in the AlchemyTableRecipeRegistry.

This means it's impossible to remove the default potions using the
current functions, and while it possible to manually add potions using
NBT, it wouldn't be possible to use lengthening or power catalysts on
them without manually adding recipes.

This commit modifies AlchemyTable.removeRecipe to, if it fails to remove
a recipe from the main API registry, consult the
AlchemyTableRecipeRegistry and remove from there if necessary.

It also adds a convenience function addPotionRecipe which allows the
specification of inputs along with a potion effect, LP cost, tier
requirement and tick time, and from this automatically adds potion
recipes.

A side-effect of this process involves limiting the number of inputs for
addPotionRecipe to 5, as the lengthening/empowering process requires all
the original ingredients (with the base flask replaced by the actual
potion flask) plus a catalyst.
2018-10-23 11:10:37 +10:00
Jared
e25784c994 version push 2018-10-19 16:44:55 +02:00
Jared
c1b2f89e22 update mods 2018-10-19 16:44:50 +02:00
Jared
c8ca9768e8
Merge pull request #693 from duely/thaumonomicon_Fix
Fix Thaumonomicon Infusion & Crucible recipes
2018-10-19 14:20:37 +02:00
Jared
967f2c4df3
Merge pull request #686 from duely/1.12-smelter
Fix vague InductionSmelter recipe removal issues.
2018-10-19 14:17:23 +02:00
Jared
92f329393b
Merge pull request #685 from duely/1.12
Resolve #672: implement TE Refinery potion recipe functions.
2018-10-19 14:16:42 +02:00
Jared
3d4171d73c
Merge pull request #678 from temp1011/forestry-charcoal-pit
add methods for forestry ICharcoalManager
2018-10-19 14:16:20 +02:00
Jon McManus
a875da1a2a Resolve #682-related issue.
Recipes registered for Infusion use no group name when creating a
ResourceLocation, while the Crucible uses MODID (modtweaker:). This
means that Crucible recipes referenced by the Thaumonomicon cannot be
edited or replaced without breaking the recipe appearing in the
Thaumonomicon.

Altering the Infusion line may cause issues with people who are already
using "thaumcraft:<name>" as their name line.
2018-10-13 14:42:44 +10:00
Jon McManus
be734c533d Tweak recipe existence checking. 2018-09-20 00:04:16 +10:00
Jon McManus
15edc5e889 Fix vague InductionSmelter recipe removal issues.
Even using getPrimaryInput() and getSecondaryInput() on a recipe is not
enough, as this order will sometimes fail to remove recipes, especially
those that use multiple items for input.

According to King Lemming, the correct way to remove these recipes is to
swap the order of the items.
2018-09-19 14:39:22 +10:00
Jon McManus
aeb1e9bac2 Resolve #672: implement TE Refinery potion recipe functions. 2018-09-17 23:46:04 +10:00
Jared
19a1874e37 version push 2018-09-12 21:07:40 +02:00
Jared
5be35dea00 Close #666 2018-09-12 21:05:25 +02:00
Jared
c6a08761ab Close #676 2018-09-12 20:56:41 +02:00
Jared
5dd8c03392 Close #682 2018-09-12 20:48:36 +02:00
Jared
9521e3d631 updated mods, fixed EXU2 fix #683 2018-09-12 19:35:46 +02:00
temp1011
0e31e33c52 resolve conflicts 2018-09-12 16:19:28 +01:00
temp1011
d74e5f0437 add method for converting IItemStack to Block 2018-09-12 16:16:30 +01:00
Jared
720eaf0391
Merge pull request #677 from duely/1.12
Resolve ModTweaker #670: Centrifuge morb support
2018-09-12 17:08:06 +02:00
Jared
f7cbcc2591
Merge pull request #679 from temp1011/rs-fix
refined storage compat for refined storage 1.6
2018-09-12 16:57:57 +02:00
temp1011
0432334262 remove refined storage compat for rs 1.6 2018-09-10 01:07:49 +01:00
temp1011
7ec926ca7c fix crashes and add docs 2018-09-09 14:37:53 +01:00
temp1011
69d066d25a add modtweaker methods for charcoal pit 2018-09-08 22:21:58 +01:00
Jon McManus
a328a40a03 IEntityInterface methods for addRecipeMob, removeRecipeMob
Resolve issues brought up by kindlich.
2018-09-06 20:35:36 +10:00
Jon McManus
86aa5921ab Resolve ModTweaker #670: Centrifuge morb support
https://github.com/jaredlll08/ModTweaker/issues/670
2018-09-04 14:30:54 +10:00
Jared
89397a3d2d version push 2018-07-20 01:26:59 +02:00
Jared
5f0ac9729a Added dynamo support, Close #656 2018-07-20 01:25:38 +02:00
Jared
c3c7ab4158 Fixed action priority. Close #663 2018-07-19 16:54:42 +02:00
Jared
4a8bdaa4d8 close #649 2018-07-12 20:19:33 +02:00
Jared
e69ffbdd57 update AA 2018-07-07 21:38:35 +02:00
KnightMiner
0816c57f39 Update Inspirations support (#654)
* Update Inspirations support

* Fill recipes can now specify boiling to simulate melting
* Increased maximum for recipes to 4 if bigger cauldrons are enabled
* Added support to specify levels in dye recipes

* Update Forge to work with Forestry
2018-07-07 21:18:14 +02:00
Jared
635d98b86d update mtlib 2018-07-07 21:17:14 +02:00
Jared
f117560eb3 Fixed BWM heat registry Close #641
I'll take "Who cares about backwards compat" for 100, Alex.
2018-05-17 11:23:57 +02:00
Jared
a0d10266a2 Added a way to set entity aspects. close #642 2018-05-17 11:04:47 +02:00
Jared
df5c15972a fixed botania page removal Close #643 2018-05-17 10:34:10 +02:00
Jared
8a444fce61 Added a way to remove Thaumcraft aspects, close #638 2018-05-15 14:06:34 +02:00
Jared
8eaabd4d11 version push 2018-05-06 03:30:06 +02:00
Jared
31032b7857 Added name to CTAspect 2018-05-06 03:28:13 +02:00
Jared
9b1d010eba updated test scripts 2018-05-06 03:13:54 +02:00
Jared
e697a01b3e version push 2018-05-06 01:28:23 +02:00
Jared
d7f7a195b8 updates! 2018-05-06 01:14:39 +02:00
Jared
01a7a0521e Commands! 2018-05-06 01:14:35 +02:00
Jared
450d138c7d ArcaneWorkbench! 2018-05-06 01:14:20 +02:00
Jared
0e8b8c2157 Crucible! 2018-05-06 01:07:26 +02:00
Jared
e2bf0a42e4 Infusion! 2018-05-06 01:07:22 +02:00
Jared
c30695f0f5 Aspects, on items?! 2018-05-06 01:07:12 +02:00
Jared
bc66917ca9 update botania 2018-05-05 19:34:05 +02:00
Modmuss50
fb867a3417 Fix for changes in ThermalExpansion's API (#634)
* Fix for changes in ThermalExpansion's API

* Fix crash when thaumcraft is not installed

* Revert: ThaumCraft.java
2018-05-02 21:42:14 +02:00
Jared
d052b208a0 Started work on aspects 2018-04-26 00:29:14 +02:00