Commit graph

2492 commits

Author SHA1 Message Date
Tobias Gremeyer 827ee85e81 Implemented Ritual of Grounding, a Ritual to change gravity behavior (#1501)
*  Implemented Ritual of Grounding, a Ritual to change gravity behavior

[x] <- x are new potion effects
 - (NoMod) moves entities towards the ground, prevents jumping [Grounded]
 - (Raw) affects players
 - (Corrosive) disables gravity [Suspension]
 - (Destructive) increases fall damage [Heavy Heart]
 - (Steadfast) affects bosses
 - (Vengeful) stronger effects, (+Corrosive) applies levitation (+Destructive) stronger effect

 [Grounded] prevents jumping and moves entities towards the ground, higher amplifiers cause a faster descend, interesting interaction with Sigil of Air

 [Suspension] disables gravity (keeps movement)

 [Heavy Heart] increases fall height and fall damage multiplier by 1 per level.

 Fixed a possible division by 0 in RitualConder.
 Saved event entity variable in PotionEventHandlers.
 Made rune configuration more readable in RitualHarvest.

Signed-off-by: tobias <angryaeon@icloud.com>

* Fixed Ritual area

* Lists are cleared on world unload.
2019-01-31 16:33:46 -08:00
Tobias Gremeyer 865968a4b8 Ported Ritual of the Feathered Earth to BM2. (#1492)
* Ported Ritual of the Feathered Earth to BM2.

* Changed maximum area

* Feathered Earth Hurt timer fall damage negation based on Set part1

* Part 2, switched to handling through potions, digging into area descriptor range bug

* Fixed Ritual area

* Update gradle.properties
2019-01-31 16:29:51 -08:00
Phillip 6b25caa06d Fixing the previous PR mess. (#1467) 2019-01-31 16:28:36 -08:00
Tobias Gremeyer 05446742ef Ported RitualDismantler (#1499)
* Ported RitualDismantler

Signed-off-by: tobias <angryaeon@icloud.com>

* Added Hellfire Forge recipe

Destructive Will Crystal, Destructive Will Crystal, Ritual Diviner (default), Weak Blood Shard

Requires a minimum of 500 will and consumes 100 will to craft

* Changed costs (lazy proposal):
 - 50 LP per normal Ritual Stone
 - discount cost of 200 LP for a whole ritual (smallest ritual has 4 ritual stones)
 - 100 LP for an MRS
2019-01-31 16:25:18 -08:00
Tobias Gremeyer 5b4e624d44 Make Movement & Updraft arrays stronger by adding more of their ingredients! (#1520)
* Make Movement & Updraft arrays stronger by adding more of their ingredients!

Reduced base motion for Movement & Updraft arrays

* Reverted Bound Tool change

* Readability & using tailored methods
2019-01-31 16:22:00 -08:00
Tobias Gremeyer 3751a51935 Fixed Ritual area (#1532) 2019-01-23 10:04:25 -08:00
Tobias Gremeyer 74436a1338 This should do it but I would like you to test it again just in case (not sure if I would have gotten the NPE to begin with) (#1522) 2019-01-22 19:34:03 -08:00
Tobias Gremeyer e001943c41 Seer Sigil can now be used in place of divination sigil in additon to it's own functions for HUD elements (#1527)
(not sure if there might be edge cases that it tries to display both the divination sigil and seer sigil information at the same time (as could be possible for the blood altar), however it doesn't seem to be the case as removing elements from blood_altar_adv removes them from the seer sigil view)
2019-01-22 10:09:08 -08:00
Nicholas Ignoffo 9af6b4fbfa Remove unnecessary field declaration from IMasterRitualStone 2019-01-21 15:18:34 -08:00
Tobias Gremeyer 415d3f1f42 Fixed RitualReader (RitualTinkerer) area setting ability. (#1505)
* Fixed RitualReader (RitualTinkerer) area setting ability.

Signed-off-by: tobias <angryaeon@icloud.com>

* Update TileMasterRitualStone.java

* Interface tidied up
2019-01-21 15:06:38 -08:00
Tobias Gremeyer 399c2723d3 Capable fluid sigils (#1517)
* Inital commit.

Water Sigil can now be used as infinite water tank item to fill machines with water (as long as you have LP) (Doesn't use LP yet).

* Should now work for all fluid sigils.

* Reverted Bound tool change

* Moved the code out of the spacey loft
IDE said it's ok... or something
2019-01-20 15:24:28 -08:00
Tobias Gremeyer 31c606495c Mark of the Falling Tower meteor costs are now configurable (#1518)
* Mark of the Falling Tower meteor costs are now configurable

 via an additonal field "cost" in the .json config files

 if BM is updated from an old version, this would require meteor configuration to be regenerated or costs to be added manually; meteors would be for free (LP-wise) otherwise.

 These are the new default costs:
 IRON: 1,000,000 (same as before)
 GOLD: 2,500,000
 DIAMOND: 5,000,000 (requires Archmage Blood Orb)

* Meteor version update

* Reverted Bound tool change

* Probably proper preconfigured power proposition
2019-01-20 15:20:03 -08:00
Tobias Gremeyer ffdf627c18 Added simple GuideBook documentation for all rituals (#1515)
* Added simple GuideBook documentation for all rituals (including coming ups from PRs) without Lore (added an info at the top of each entry that it requires lore (##REQ-LORE##)).
This should enable everyone that uses the GuideBook to use the rituals.

* Reverted Bound tool change
2019-01-20 15:17:00 -08:00
Tobias Gremeyer c6a315a51c Fixed compile-time fatal error (#1510)
Added Creative handling
2019-01-20 15:16:22 -08:00
Tobias Gremeyer 7e2251b8e5 Hymn of Syphoning (pump) tank render fix (#1521)
* Hymn of Syphoning (pump) tank render fix

Every Hymn of Syphoning (RitualPump) filling of the IFluidHandler now also triggers a block update for the block above the MRS, rerendering the tank contents to be up to date with the new fill status immediatly.

* Stonestate for replaced blocks
2019-01-20 14:50:31 -08:00
tommyTT fa87ed0e17 Bugfix attempt to remove render lag (see WayofTime#1457) (#1458)
Simplified the whole branch since it got really messed up
2019-01-05 09:34:45 -08:00
Tobias Gremeyer 4f04fde127 Optimized and updated Bound Tools (#1500)
Signed-off-by: tobias <angryaeon@icloud.com>
2019-01-02 21:59:46 -08:00
Andrew Fontaine 297771af81 Add Handlers for Ritual of Crushing (#1469)
* Add Handlers for Ritual of Crushing

Fixes the crushing ritual's corrosive will augment.

* Simplify Handler Class

Use Primitives, ensure return value is non-null

* Make the Handler Handle Draining Per Use

* Revert "Make the Handler Handle Draining Per Use"

This reverts commit bacaa610febc5a609a7a891ceed41b0e0fb2f05d.
2018-12-30 16:14:27 -08:00
iPopstop 6b1e9f4014 Update ru_RU.lang (#1473)
* Update ru_RU.lang

Minor grammar fixes

* Update ru_RU.lang

* Update

Added: 
- alchemic_vial
- baseComponent.catalyst_length_1
- baseComponent.catalyst_power_1
- bloodmagic.extraInfo (tooltip)
- commands.bloodmagic.error.*
Fixed:
- bloodmagic.blood_shard
- baseComponent.sulfur
- bloodmagic.monster_soul.raw
- bloodmagic.path.woodtile
- bloodmagic.path.stonetile
- bloodmagic.path.wornstonetile
- bloodmagic.path.obsidiantile
Updated:
- bloodmagic.sanguineBook
2018-12-30 16:13:46 -08:00
Tobias Gremeyer 03d087595f Reverence of the Condor port (#1490)
* Ported Reverence of the Condor from 1.7.10.

* Ported Reverence of the Condor from 1.7.10.

* Removed my shame
2018-12-30 16:13:13 -08:00
Tobias Gremeyer 7435d49824 Refactored Cry of Eternal Soul for BM2. (#1488)
* Refactored Cry of Eternal Soul for BM2.

* Added entries for the english translation strings

* Ticket handling fix

* Using more comprehensive `addOffsetRunes` instead of `addRune`'s

* Update src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java

Co-Authored-By: Iorce <angryAEon@icloud.com>

* Update src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java

Co-Authored-By: Iorce <angryAEon@icloud.com>

* Cleanup round 1

* cleanup round 2
2018-12-30 16:11:54 -08:00
Bunsan 8b9764036a Fix for small demon stone brick recipe so that it outputs 4 blocks as expected. (#1486) 2018-12-10 19:24:37 -08:00
TeamDman 002f23c53d Changed LavaCrystal getBinding behaviour, cleaned up JEI hiding 2018-12-06 23:33:23 -08:00
TeamDman 88e72ee013 Revert "fixed typo in readme"
This reverts commit c6980fba
2018-12-06 23:33:23 -08:00
TeamDman b8f57eca32 Fix javadoc typo 2018-12-06 23:33:23 -08:00
TeamDman 6f8741694c Reenable tier 6 with config option
Revert of fd03265764
2018-12-06 23:33:23 -08:00
TeamDman 54a2b053d0 Fix Binding::fromStack returning null on stacks with binding tags
Added Binding::toString
2018-12-06 23:33:23 -08:00
TeamDman 259b631f7d added unregisterAltarComponent method 2018-12-06 23:33:23 -08:00
TeamDman b59d5ce5b4 fixed typo in readme 2018-12-06 23:33:23 -08:00
Nicholas Ignoffo fd03265764 Fix "how do i get tier 6" questions 2018-09-16 11:13:25 -07:00
Nicholas Ignoffo d54c828fba Fix Harvest Moon not working with Pumpkins (#1432) 2018-09-03 11:35:15 -07:00
Nicholas Ignoffo 2b587e84af Update changelog + version 2018-08-28 21:51:59 -07:00
Nicholas Ignoffo 39087ccf70 Fix obo causing altars to not fill orbs of the same tier (#1423) 2018-08-27 21:30:03 -07:00
Nicholas Ignoffo 6ba4a02c48 I love when Curse breaks their API so my buildscript fai;s 2018-08-26 14:13:07 -07:00
Nicholas Ignoffo c5d3f8012c Update changelog + version 2018-08-26 14:05:41 -07:00
Nicholas Ignoffo 6d43e416e4 *Now* sentient repairing is proper 2018-08-26 14:05:25 -07:00
Nicholas Ignoffo 6062b68661 Fixed placement of chunk ticket release due to scoping
Added in missing ticket releases
2018-08-26 13:49:02 -07:00
Nicholas Ignoffo 8e16e590ea Sentient tools should use the proper material and have a repair material
crystals are used to repair
2018-08-26 13:40:40 -07:00
Nicholas Ignoffo 70cf5d2bea Low tier altars should not be able to fill high tier orbs 2018-08-26 13:12:49 -07:00
AEon - Tobias 1f392721fa Reinstated Compression sigil. (#1374)
*  Reinstated Compression sigil.
- does not compress wooden planks into crafting tables
- searches for reversible 3x3/2x2 recipes with a single material type
- probably has a lot of redundant stuff and looks silly
- uses try/catch (might want to find a different approach, some people scoff at this)
- should probably have spent the night sleeping, I'm taking exams tomorrow and will probably sleep the whole day through.

* Learned how to properly handle the "NullPointerException"-situation.

* Update BaseCompressionHandler.java

* Update CompressionRegistry.java

* Removed (almost) all code comments (only a one-liner remains that serves as pointer to a completly commented-out class (StorageBlockCraftingRecipeAssimilator)).
Made methods and variables for long function calls to be more efficient.
Fixed an oversight that resulted in a NullPointerException after removing redundant checks that were made to prevent exactly that.

Rearranged and reformatted code.

* corrected something that could be considered a typo but was an oversight

* This should be it. An Array should be more efficient but you can correct me if I'm wrong. In either case it does what it is supposed to do.

* Fixed. Needed a seperate inventory for the reversible check (or clear the previously used one, but then I'd had to repopulate again and that would just have been messy)

* Forgot one of my lines.

* Fix and cleanup.
Could definitely clean more but that should suffice for now.
2018-08-26 13:05:30 -07:00
KohaiKhaos 9440d3c0b9 This should fix a few existing issues with Teleposers, they no longer syphon from the bound player. (#1414) 2018-08-26 13:00:07 -07:00
KohaiKhaos 81047734a6 Changed the lava, water, and void sigils to work with fluid tanks better (#1406)
* Modified sigils of lava, water, and void to interact with tanks correctly.

* Fixed up some formatting errors

* Fixed?

* Reimplemented necessary fluid code as extensible functions in ItemSigilFluidBase and made the fluid sigils draw functions from there rather than FluidUtil

* Fixed up formatting and used an actual IDE for once.
2018-08-26 12:59:41 -07:00
AEon - Tobias 7942465edc Well of Suffering item drop control (#1388)
* Added a new DamageSource for the Well of Suffering
Added an event handler for death through Well of Suffering
Added a config option to enable (true) or disable (false) Well of Suffering Mob drops.

* Moved the DamageSource creation to RitualManager
Renamed the new DamageSource to "RITUAL_DAMAGE"
DamageSource "RITUAL_DAMAGE" is now used by RitualForsakenSoul and RitualWellOfSuffering
Added death message string for "RITUAL_DAMAGE" for en_US and de_DE

* Cleanup, removed the ability to damage entities in creative mode (creative mode should be considered as having infinite health, the rituals only damage mobs anyways).

* Update GenericHandler.java
2018-08-26 12:55:23 -07:00
AEon - Tobias 753958ac9c Ritual portal delay / Bound Pickaxe fix/improvement (#1387)
* Teleportation now works similar to the Nether Portal:

if teleportation is attempted before the cooldown (10 ticks) is over, the cooldown gets reset.
This way teleportation loops are prevented.

You can now:
- Stand on a loop of permanently activated (well, constantly refreshing through a high-speed redstone clock) Teleposers, only getting teleposed once per stepping on it
- AFK in the Gate of the Fold without getting teleported constantly
- and other things, I guess.

* Bound Pickaxe AoE ability now destroys blocks properly.

closes #1001

* Streamlined bound tool harvest code.

Cleanup, duplicate code for bound tools moved as method to ItemBoundTool.sharedHarvest()

Tested aoe harvest with Stone, Dirt/Grass and Oak trees. Same result as before.

* silkTouch and fortuneLvl are now passed instead of recalculated on every block
2018-08-26 12:50:02 -07:00
AEon - Tobias 72eb314da8 Ritual Stones have been nerfed to be Rocky instead of Irony. (#1417)
Their material strength has been adjusted to the one of the MRS.
2018-08-26 12:16:14 -07:00
AEon - Tobias f5282bd767 Phantom bridge (#1397)
* Rework. Desyncs for no apparent reason.
Apart from that, it works.
Desyncing started after I implemented the "diagTemplate" methods.
Can definitely be optimised, some advice for that would be good (lots of duplicated code for the "templates").

* Code cleanup.
Reverted stuff that I didn't want to commit.

* Some fine tuning for speed.
playerVel is not very accurate still but this should work out for most stuff.
Might need a lot of testing.
Might still not work properly on servers.
Diagonal templates are inconsistent, need variables switched.
Will deal with that later (maybe).
In any case, this works just fine unless you're speeding diagonally.

* The occasional stuff that should not be pushed.
Meaningless whitespaces or code reformatting.

* The occasional stuff that should not be pushed.
Meaningless whitespaces or code reformatting.
Take 2.

* MERGE ME I'M AWESOME

* removed unused import

* Refactoring, adding braces, renaming constants etc etc.

done.

* take 2

* take 2

* Removed one-liners
they grew organically because I initially created every "bridge" with a unique for loop before I removed duplicate code by passing variables/ranges
they were helpful until I found good names for the variables, now they've outlived their usefulness

* tiny bit of fine tuning

* various fluff / small fixes
more fine tuning, code reformatting, meaningful variables, for loop fix (variable mismatch), shrinking a redundant method to a call to an advanced method
2018-08-17 18:14:41 -07:00
AEon - Tobias 3d3ce53ddd Fix: Interaction Sigil of Holding + Seer/Divination Sigil (no render) (#1391)
* Seer Sigil and Sigil of Divination now work properly when placed inside the Sigil of Holding

closes #1285

* cleanup

* Cleanup.
2018-08-17 18:13:00 -07:00
AEon - Tobias 92e3333701 Splash potions now throwable! (#1401) 2018-08-17 18:08:04 -07:00
KohaiKhaos 98e474b287 Someone missed an import (#1403)
* Someone missed an import, how have you people even been compiling to test stuff since you added my commit

* Missed GameProfile too apparently
2018-08-17 18:07:29 -07:00
palaster 34cfcfedba Allows custom arrows to work with the Sentient Bow. (#1404)
- Checks if the arrow is the vanilla arrow, if it is then it continues with normal use. But, if arrow isn't the vanilla arrow it uses  their custom arrow entity.
2018-08-17 18:07:02 -07:00