Commit Graph
3531 Commits
Author SHA1 Message Date
Vasco Lavos e3c4d9895e Merge pull request #2702 from quat1024/retainerComparator2
Corporea retainers use richer signal strength depending on request size (but better)
2018-08-27 12:07:05 +01:00
Vasco Lavos e29c64dda2 Merge pull request #2713 from codewarrior0/patch-4
Add missing null check in PacketBotaniaEffect
2018-08-27 12:06:58 +01:00
Hubry 94721a0149 Add llamas and parrots to the cocoon's rare animal spawns
Llamas were added in 1.11, while parrots were added in 1.12.
Both of them are an exotic pet and so should be available from
the cocoon.
2018-08-26 23:52:13 +02:00
David Vierra 2c72e73d9e Add missing null check in PacketBotaniaEffect 2018-08-25 01:18:27 -10:00
Vincent Lee c3a7cc5c27 Fix #2710 2018-08-23 23:54:24 -05:00
Vincent Lee 99e8d6a70c Fix gg not responding to /kill 2018-08-22 12:15:13 -05:00
Vincent Lee c177cda9e2 Gaia guardian music now repeats, closes #2485 2018-08-22 12:15:13 -05:00
Vincent Lee 280ffe2f58 gg uses iextraspawndata instead of datawatcher for some fields 2018-08-22 12:15:13 -05:00
Matthijs van der Meulen 49638c0aa6 Removed Railcraft support for the Mana Pool with Minecart.
As the Railcraft API for 1.12.2 is highly unstable, and crashes with the current version of Botania installed, I removed the implementation of IMinecartItem and all corresponding methods. The Mana Pool with Minecart still functions fine with railcraft, but now it doesn't crash anymore
2018-08-21 19:27:28 +02:00
Hubry 8e2b09527a Update TC integration to beta 21, small tweaks to aspects (#2693)
* Formatting fixes for my previous PRs

* Bump Forge, JEI and Thaumcraft and specify some of them in mod deps

Forge to latest recommended (TC requires it)
Thaumcraft to Beta 21 (the new aspect registration)
JEI to stable 4.10.0.198 (mostly for testing purposes like Thaumic JEI)

* Move to the aspect event and tweak some item aspects
2018-08-18 14:03:25 -05:00
quat 57cec38136 Use fancy log2 2018-08-16 22:12:07 -04:00
quat 84967e4e2e Revert inventory wrap hook
This reverts commit a122253791.
2018-08-16 00:44:38 -04:00
quat 11d4926ed8 don't update comparator output level unless it actually changed 2018-08-16 00:40:31 -04:00
quat 81f33e8d74 Corporea retainers use richer signal strength depending on request size 2018-08-16 00:27:29 -04:00
Hubry 04cbee8ae7 Implement getCreatorModId on the flower item
Replaces the tooltip containing the creator mod's modid with an override
for the method returning it, allowing mods like JEI to show the mod
that actually added the flower and return it in mod searches, like
Forge's universal bucket already does with mod fluids.
2018-08-15 23:02:38 +02:00
quat 66aa3bf6b4 nice 2018-08-03 14:31:20 -04:00
quat fae9bcca75 Make wrappediinventory a bit more subclass friendly 2018-08-03 12:58:00 -04:00
quat 61e72f3cc3 Meh just use a field 2018-08-03 01:25:50 -04:00
quat 0eaab9a52c Add cancellable CorporeaIndexRequestEvent 2018-08-03 01:25:06 -04:00
quat bbbfac82f3 De-privatize WrappedIInventory for extension 2018-08-03 01:00:44 -04:00
quat a122253791 Add an inventory wrap hook 2018-08-03 00:59:55 -04:00
quat 5e7c963017 (unrelated) Fix Googly Eyes rendering inside the player's head 2018-07-19 23:11:51 -04:00
quat b9d2d78a80 Add lexicon page for the thinking hand 2018-07-19 23:07:41 -04:00
quat 1afb719782 add Thinking Hand cosmetic bauble 🤔 2018-07-19 22:54:03 -04:00
Hubry 73a1055b65 Reintroduce corporea index requesting from inventory/JEI item panel. (#2668)
* Reintroduce corporea index requesting from item panel.

This was removed in 08550cc442, during
the move from NEI to JEI. Rewritten to use JEI instead of NEI.

* Make this feature not depend on JEI to function, redo key checking

Instead, the JEI plugin will set a dummy supplier in the corporea handler to a proper one pulling from the item panel.
In addition, keyboard checks now use Keyboard's triggers instead.
2018-07-13 08:25:34 -07:00
Hubry 58346ad107 Update Thaumcraft integration (#2667)
* Pull TC6 from Curseforge's maven thing, remove API classes from repo

* Update Thaumcraft integration

* Make upgrade recipes move attached Thaumcraft item data properly
* Fix full mana inkwells pulled from creative menu not working
* Blacklist flux rifts instead of (removed) aura nodes from gravity rod
* Clean up a few TODOs around Thaumcraft integration
* Finally, assign Thaumcraft aspects to Botania items

* Add config for aspects.

Just in case of some bugs in Thaumcraft, or for modpack makers who want
to customize, so they don't have to disable everything by hand.
2018-07-12 22:58:16 -07:00
Hubry 5841466efa Clean up and update wiki providers. (#2666)
Lowercase modids, remove providers for defunct sites and mods with
no chance to come back, use HTTPS for Gamepedia, update URLS to sites
that moved.
2018-07-03 20:17:03 -07:00
Vincent Lee 7347d6df5c Fix #2662 2018-06-29 20:50:17 -07:00
ALongStringOfNumbers 483a816616 Elementium Tools now repair with Elementium (#2656)
* Elementium Tools now repair with Elementium

* Add proper parameter names

* Revert changes to armor, as I did not change it in the first place
2018-06-21 18:50:13 -07:00
TheIllusiveC4 5a148b01f3 Fixed usages of deprecated getFullDiscountForTools method (#2622) 2018-06-18 19:27:33 -07:00
David Vierra c9f8347299 Add JEI handlers for Orechid and Orechid Ignem (#2632)
* Add JEI handlers for Orechid and Orechid Ignem

* Make whitespace consistent

* Change lazy-initialized item stacks to init in constructor

* Change `doesOreExist` to take a String instead of an Entry

* Remove `oreDictKey` field since it is only ever used in the constructor

* Add `final` and change access qualifiers where appropriate

* Remove pointless accessor
2018-06-18 19:26:26 -07:00
Rafal Kolanski ba29aff21e In skyblock, use horizon height and void fade as in Void biome. (#2634) 2018-06-18 19:25:10 -07:00
Vincent Lee 0a400e2384 Fix #2641 2018-06-02 10:46:41 -07:00
Vincent Lee 5cfc6349c8 One broken boi. Closes #2630 2018-05-17 20:55:04 -05:00
Vincent Lee a172698dc9 Fix vertical spark range being inconsistent between up and down dirs. Closes #2627 2018-05-13 21:18:55 -05:00
Vincent Lee 767ecf78c2 Narrow bounds of some getEntitiesWithinAAB calls, should yield a very minor performance boost 2018-04-30 02:03:24 -05:00
Vincent Lee 24c542f31f Fix #2618 2018-04-30 01:47:53 -05:00
Vincent Lee e6e756815d Delete IRunicArmor interface as it no longer exists. Should now run with TC6 beta. Closes #2608, closes #2612 2018-04-24 10:24:48 -05:00
Vincent Lee ed72ff3d5f No longer crashes when loaded with TC6 beta. Note that this is just a crash-prevention fix, the actual integration still needs modernizing 2018-04-24 01:25:43 -05:00
Vincent Lee c3adac1c04 Mana blaster bursts now spawn off the correct hand, closes #2609 (also fixes color handler making a new entity every render tick) 2018-04-22 15:38:43 -05:00
Vincent Lee 7d48d1ffb9 Fix some flower sparkle particles not accounting for vanilla flower random shifts 2018-04-18 18:35:31 -05:00
Vincent Lee 4123a8beb3 Fix munchdews going on long cooldowns too often. Closes #2449 2018-04-18 18:24:35 -05:00
Vincent Lee 7fe66d4868 Blacklist bursts from interdiction torch properly 2018-04-17 11:25:48 -05:00
Vincent Lee 4577e17553 Bandaid for apothecary crashes. Closes #2471, closes #2555 2018-04-17 10:04:44 -05:00
QuarterAnimal 4383e8cbbc Support rotation of structures containing mana spreaders (#2599) 2018-04-11 22:09:37 -05:00
Vincent Lee 34afbd45ab Fix #2590 baubles disappearing 2018-04-09 10:28:47 -05:00
Vincent Lee 28e8a3df94 Fix accidental api dependency on botania-proper. Closes #2597 2018-04-08 14:29:55 -05:00
Vincent Lee 770d40c95b Finish move to ResLoc subtiles 2018-03-29 19:42:06 -05:00
Vincent Lee 58fa185ef4 Merge branch 'master' into flattening_test 2018-03-29 19:09:19 -05:00
Vincent Lee 01c81b9177 Partially-done migration of subtiles from strings->resource locations 2018-03-29 19:08:42 -05:00