Commit Graph

2375 Commits (master)

Author SHA1 Message Date
Tobias e830736ee8
Merge pull request #1655 from qianzha/patch-24
Update zh_CN.lang
2020-12-30 20:44:29 +01:00
Tobias d4d71864cd
Merge pull request #1553 from Phil-M-H/gate-of-the-fold
Gate of the fold Fixes and minor clean up
closes #1512
2020-12-30 20:40:24 +01:00
Tobias 4248d04263
Merge branch '1.12' into gate-of-the-fold 2020-12-30 20:37:59 +01:00
Tobias f98887b05b
Merge pull request #1686 from michaelPoul/world-memleak
Fix memory leak when unloading worlds
2020-12-30 20:24:31 +01:00
michael a897b0b94b Fix memory leak when unloading worlds
The World instance wasn't freed from the forceSpawnMap and
preventSpawnMap, keeping unloaded worlds around.
2020-04-09 18:27:34 -07:00
Nicholas Ignoffo 02d9b310a4 Update changelog + version 2019-11-04 18:38:31 -08:00
Nicholas Ignoffo ffc4429b8f Fix compilation error 2019-11-04 18:29:37 -08:00
Tobias ab33ead20f Moved Boost into the class it belongs to & improved it a bit (#1669)
* Moved Boost into the class it belongs to.
Added a vertical flight amplification.
Changed the conditions to allow for negative boost.

TODO: jumping with boost still feels unnatural (too steep compared to sprint)
TODO: vertical movement seems only possible by directly modifying motionY which can escalate quickly

* Reformat
2019-11-04 18:22:40 -08:00
Tobias 268469f078 Fixes some possible NPEs in PotionEventHandler (#1668)
* Fixes some possible NPEs in PotionEventHandler

* Added Brackets for clarification

* Update PotionEventHandlers.java
2019-11-04 18:21:29 -08:00
Tobias 5f31f8c69a Should fix all NPEs encountered because of nonexistant task maps (#1667) 2019-11-04 18:20:54 -08:00
Saurabh Totey e56c0cdbb9 Removed unnecessary altar tier checks in attempt to fix #1646 (#1665)
* Removed altar tier check for altar consumption

* Removed altar tier check for altar consumption for blood orbs
2019-11-04 18:15:14 -08:00
Nicholas Ignoffo a02631d9be Fix teleposers sending entities at the target the opposite direction 2019-11-04 18:01:01 -08:00
Tobias 7759360183 Fixes Lava Crystal causing a crash when attempting to place fire when it is unbound. (#1663)
* Fixes Lava Crystal causing a crash when attempting to place fire when it is unbound.

* Update ItemLavaCrystal.java
2019-10-10 15:55:57 -07:00
qianzha b1e1a9ee2c
Fixed a sentence 2019-09-19 13:39:58 +08:00
qianzha 3c737039cc
Updated guide book 2019-09-18 20:19:17 +08:00
qianzha 9f59fb0db2
Update zh_CN.lang 2019-09-10 17:30:36 +08:00
qianzha 471f3db24c
Update zh_CN.lang
I found that there is a missing key "ritual.bloodmagic.groundingRitual.groundingRange.info" at us_en.lang.

And these keys below are been setted twice with same value:
ritual.bloodmagic.condorRitual.info=Provides flight in an area around the ritual.
(at 679 line & 767 line)
ritual.bloodmagic.eternalSoulRitual.info=Capable of transferring Life Essence from a Network back into an Altar at a cost.
(at 680 line & 768 line)
2019-09-10 13:56:51 +08:00
Nicholas Ignoffo 1caae69992 Bump version 2019-09-04 19:25:07 -07:00
Tobias 5cb3ff5af5 Tentative changelog for next version (#1610)
* Tentative changelog for next version

* Updated changelog to feature all PRs since the last changelog PR.
Added PR #s for every change.

* Added the Sentient sword sigil buffs PR to the changelog

* Added NPE World load/unload PR

* Added changes from most recent PRs

* Removed duplicate sentient sword sigil effect PR.
Moved 2 commits to "Technical stuff", as they have been committed

* Updated changelog

* Updated changelog + flavor

* Remove Gaia Transformation note
2019-09-04 19:24:43 -07:00
Tobias 39cdc0c42f Lava Crystals can now set things on fire! (#1652)
* Lava Crystals can now set things on fire!

* Remove unecessary else
2019-09-04 19:02:39 -07:00
Tobias 1155be6d6b Fixed Ritual Tinkerer & added range reset (#1636)
* Add getMinimumOffset() and getMaximumOffset to AreaDescriptor
Add the ability to reset BlockRanges to the Ritual Tinkerer

* Added copy-constructors and functions to AreaDescriptor
Added the ability to reset BlockRanges to the Ritual Tinkerer
- Mode: Define Area, with BloodOrb in offhand & sneaking, right click on MRS

Changed "addBlockRange" and "addBlockRanges" to use .putIfAbsent
Added "setBlockRange" and "setBlockRanges" to IMasterRitualStone
- reference implementation in TileMasterRitualStone is identical to old "addBlockRange" and "addBlockRanges"

Fixed range setting for good.

Tested behavior with RitualWater.

* Minor cleanup

* Remove TODO
2019-09-04 18:58:45 -07:00
Tobias a23cd35556 Implemented BloodAltar modification with redstone lamp below altar (#1635)
* Implemented BloodAltar modification with redstone lamp below altar

- strong and weak Redstone signal of power 15 (similar to BlockLever)
- activates when crafting finishes and a BlockRedstoneLight is directly below the altar
- deactivates when the next crafting cycle is about to begin

Use case:

- Redstone-controlled automatic ejection of crafted goods

* Removed Docs

* Meta to use 0 for off, 1 for on

* Syntactic sugar & storing value
2019-09-04 18:55:53 -07:00
Tobias 4f1308874d Fixes BloodAltar being able to obtain negative progress. (#1649)
* Fixes BloodAltar being able to obtain negative progress.

* Updated to use Math.max()
2019-09-04 18:51:25 -07:00
Tobias 24b3552b60 Guide capacity recipe, rearranged some entries (#1641)
* Fix meta ID's (recipes shown) in the guide book for Displacement and Capacity

* Rearranged topics to be closer to a natural progression.
2019-09-04 18:50:21 -07:00
Tobias 0cbaa13cfc Some fixes to the German translation because of the translation keys got changed. (#1640)
* Some fixes to the German translation because of the translation keys got changed.
Added chapter title translation to newly documented rituals but not the chapters itself.

* Changed Tartaric Gem translation from "Weinstein" -> "Tartarisches Juwel"
2019-09-04 18:49:04 -07:00
Tobias 845ca65cab Changed SoundType and visible Material of wooden path blocks from stone/rock to wood (#1638)
* Changed SoundType and visible Material of wooden path blocks from stone/rock to wood. Breaking wooden path blocks is now effective & faster with an axe and slow with a pickaxe type tool.

* Moved hacky to getter.

* Cleanup unneeded override

* Using Enums instead of meta IDs
2019-09-04 18:48:54 -07:00
Sam Kirby 97d4967d31 Fixes for Ritual of the Eternal Soul (#1633)
* Fixes for Ritual of the Eternal Soul

* Use the same code to determine altar location and only cache its offset as is done in Well of Suffering. This prevents keeping a TileEntity loaded after it has been removed from the world, and also means the ritual will function if there are multiple master ritual stones using it in the world.
* Use getCapability to obtain the BloodAltar which implements IFluidHandler, and fill that instead of trying to fill the tile entity.
* Change the structure to match that found in previous versions.

* Set owner HP to 2 (1 heart) if within ritual vincinity.

* Add Soul Fray to every player in the vincinity of the ritual.
2019-09-04 18:39:54 -07:00
Tobias 3cdf4517a8 Fixed some black magic that occurred when a mob was summoned in a world that was loaded but didn't have a list entry that is supposed to be generated on world load. (#1618) 2019-09-04 18:38:52 -07:00
Jonas Herzig 6587068296 Fix GLSL shader compilation with certain graphics drivers (fixes #1325) (#1624) 2019-09-04 08:39:25 -07:00
Tobias cbefc14f72 Fixes `/bloodmagic network` command permissions required for executing the command. (#1613)
Inheriting from CommandTreeBase, the required permission level was 4.
All other BloodMagic commands had a required permission level of 2.
This resulted in network command not able to be executed from a Command Block, which have a permission level of 2.
2019-09-04 08:38:42 -07:00
Tobias a6a5704a42 Removed overseen debug print statements from Rituals veil of evel & ward of sacrosanctity (#1639) 2019-08-11 11:49:30 -07:00
Tobias f34a89efa7 Level 4 StormTrooper downgrade to correctly cost -65 upgrade points (was 65) (#1631) 2019-08-07 08:29:38 -07:00
Tobias 1250f1015e Changelog. (#1601)
* Changelog.
Some stuff still pending.

* "Unbending" mod has been renamed to "Unmending"

* Clarifications & Formatting

* Update

* Added Compression Sigil PR

* Update changelog.txt

* Added Network command PR change

* Added JEI Recipes PR

* Update changelog.txt

* Removed empty bugfix category.

From V2.0.0

* Update changelog.txt

* Moved pending PR texts, added RitualJumping PR text, bumped version number

* forgot version number

* Remove pending merges
2019-05-19 10:06:01 -07:00
Tobias 1d52a137d5 Added getHeight() to AreaDescriptor, Jumping power modifyable (#1608) 2019-05-19 09:59:25 -07:00
Nicholas Ignoffo 28057bd3f6 Fix sigil of holding saving data to the wrong inventory tag (#1584) 2019-05-19 09:40:48 -07:00
Big Energy f87a63ba99 Add russian guide book (#1607)
* Create tussian guide book

* Delete English phrases
2019-05-19 09:23:49 -07:00
Nicholas Ignoffo 6420c2635e Fix tough palms being trainable without an altar nearby (#1588)
*When using an empowered sacrificial dagger
2019-05-19 09:04:20 -07:00
Tobias 39f1ac0c7d Added JEI recipes for repairing Sentient Tools & Living Armor (#1606)
* Added sentient tool repair recipes to JEI.

* Added living armor repair recipes to JEI.
2019-05-19 08:37:21 -07:00
Tobias a5a5899b7c Fixed `/bloodmagic network get` not having a network to get from, (#1604)
added translation keys for tickethistory
2019-05-19 08:36:05 -07:00
Tobias 7f5a5a24ff Veil of Evil & Ward of Sacrosanctity (#1578)
* Veil of Evil class creation

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

* Transplanted legacy code.

* VeilOfEvil and WardOfSacrosanctity base finished.
Added isActive() to IMasterRitualStone

* Renaming, commented out arimethric error

* make it static to make it work

* removed sout & renamed rituals

* Finished up base Veil of Evil & Ward of Sacrosanctity.

Temporarily removed Gaia's Transformation.
2019-05-19 08:35:38 -07:00
Tobias bf35baac77 Improved Compression Sigil performance & fixed leftover eating bug (#1603)
* Performance improvements, small cleanup

* Moved the saved stacks to class scope to have an actual effect.

* Variable scope change (no effect)

* Saving known recipes to a Map in CompressionRegistry now, allowing quick lookup as long as the server has not been restarted for all but the first compression recipe of every itemstack type encountered.

Fixed compression process consuming items even though the compression would not finish.
2019-05-19 08:34:04 -07:00
Tobias 0090ec0a56 Lava will not replaced with lava anymore unless it's flowing lava. (#1599)
* Lava will not replaced with lava anymore unless it's flowing lava.

* Fixed Flowing Liquid detection

* Removed unnecessary function arguments
2019-05-19 08:03:48 -07:00
Tobias Gremeyer 21f3b9047c Made teleposers a bit more foolproof (#1592)
Fixed an issue where a teleposer that somehow got filled with nasty items would crash on tick because the teleposer throws a fit at that nasty item.
2019-04-25 00:09:15 -07:00
Nicholas Ignoffo 73d2459c6c angery 2019-04-14 08:59:21 -07:00
Nicholas Ignoffo f997aee891 Fix crash on world unload
Don't know how to reproduce, but this will make sure we don't call clear
on null
2019-04-14 08:49:26 -07:00
Nicholas Ignoffo 59f5fe9407 Fix incompatibility with Unmending mod (#1566) 2019-04-14 08:48:47 -07:00
Nicholas Ignoffo d5834a34ba Merge remote-tracking branch 'origin/1.12' into 1.12 2019-04-14 08:42:02 -07:00
Tobias Gremeyer 572d8eff4f Possible fix to (many of the) abnormal death events concerning the sacrificial Dagger (#1554)
* Possible fix to (many of the) abnormal death events concerning the sacrifical dagger.

=> #1444

Works with Grim Reaper's Sprint, not tested for anything else.

* Being special, players can survive massive blood loss up until 1 heart remains.

(Math.floor() caused players to die when they sacrificed with 3 health remaining)
2019-04-14 08:38:17 -07:00
Phil 7c767b3bbf Stop insertions into Demon Crucible if the inventory is not empty (#1567) 2019-04-14 08:29:51 -07:00
Nicholas Ignoffo eec64695b5 Fix Blood Letter's Pack and Coat of Arms passing the wrong hand (#1582) 2019-04-14 08:28:46 -07:00