Commit graph

286 commits

Author SHA1 Message Date
Tobias
4248d04263
Merge branch '1.12' into gate-of-the-fold 2020-12-30 20:37:59 +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
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
5f31f8c69a Should fix all NPEs encountered because of nonexistant task maps (#1667) 2019-11-04 18:20:54 -08: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
Tobias
a6a5704a42 Removed overseen debug print statements from Rituals veil of evel & ward of sacrosanctity (#1639) 2019-08-11 11:49:30 -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
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
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
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
f832103386 Fix state parsing (#1573) 2019-04-14 08:23:02 -07:00
Nicholas Ignoffo
53b6030ba9 Run code formatter
🦀 Way is gone 🦀
2019-04-14 08:22:42 -07:00
Phil M. H
8845923dff Removed extra semi-colon. 2019-04-13 17:30:37 -04:00
Phil M. Harner
27a7302010 Removed unused import and method. 2019-03-10 17:46:27 -04:00
Phil M. H
d7b8c829ae Removed the null check in BlockDimensionalPortal
Neither ServerStartingEvent or ServerStartedEvent, were able to
initialized the LocationsHandler correctly, so it was placed in onWorldLoad
2019-03-08 02:27:14 -05:00
Phil
069051bf3b Modified Living Armour's Step Assist to only apply when the player is not sneaking. (#1545) 2019-02-17 13:45:57 -08:00
Phil
2d49fab893 Trickshot - Sentient Arrows Implementation (#1540)
* The onArrowFire event handler for LivingArmour now checks whether the arrows were fired from a sentient bow, and if they are it calls a getDuplicateArrows method in ItemSentientBow. Said method gets the will and potion types, without changing the bow's durability or consuming will or arrows.

* Extra line breaks removed
2019-02-13 16:27:41 -08:00
Phil
28b5caa5aa (#1415) Soft Fall / fallProtect Implementation (#1536)
* Fixed softFall / fallProtect upgrade for living armour. Previously it
relied on regular armor properties, which fall damage bypasses by being
marked is unblockable. Created a method subscribed to onPlayerFall which
applies the damage multiplier and the fallProtect stat-tracker. Removed
the armorProperties method of LivingAmourUpgradeFallProtect.java and
replaced it with getDamageMultiplier.

* Fixed formatting issues. [1+1 vs 1 + 1, 1.0F instead of 1.0f]
2019-02-08 19:34:41 -08:00
Phil
2c49be1bdd Trickshot Arrows to reset hurtresistancetime. (#1487) (#1535)
* Added a tag to arrows created through Living Armor's Trickshot Ability.
Added a subscribeevent method for the onProjectileImpact event that
removes the tag and sets the hurtresistanttime to zero.

* Formatted trickshot arrow tags to snake_case
2019-02-08 10:04:41 -08:00
Nicholas Ignoffo
83f0eefa15 Update mappings + dependencies 2019-01-31 19:10:37 -08:00
Tobias Gremeyer
95d99c0a01 Command rework (#1434)
* Network part finished.

* Should be more reasonable now

* This should be good enough.

* Orb finished, needs strings

* Bind finished. Needs strings.

* Reformat & Help subcommand

* Cleanup, strings, no negative amounts

* Removed TODOs

* Added missing MaxTier check for Blood Orbs.
Added TODO: Test with custom Blood Orbs.

* Ritual commands finished.
Check for valid placement might be optimized. (TODO)

* Access modifiers, moved TODO

* Added TODOs for localized strings

* DrainUtils postponed until the necessary functionality is available with SoulTickets (telling SoulTicket network from soul ticket, a list of all registered soul tickets per network)

* Replaced all occurrences of TextHelper with TextComponentTranslation in the commands section

* - Moved Teleports.java to teleport package
- added teleposer command
- added missing strings
- cleanup

* Fixed spelling of "Successful(ly)"

* getUsage() now returns translation keys.
getInfo() is now an explicit String

ritual creation command now has proper tab completions

help is an additional argument with "-h" or "?"

cleanup

* teleposerSet final
cleanup.

* Removed ritual removal command

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

* Check if the tile has a ritual first

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

* A bit more optimisation

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

* Cleanup part 1

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

* Cleanup part 2

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

* Part 3

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

* Part 4

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

* Updated language file to reflect cleanup & continuity changes.

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

* Change to use an abstract class that gets called instead of calling super on overriden execute() for commands

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

* Use player facing for ritual creation.

Signed-off-by: tobias <angryaeon@icloud.com>
2019-01-31 16:46:02 -08:00
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
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
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
92e3333701 Splash potions now throwable! (#1401) 2018-08-17 18:08:04 -07:00
AEon - Tobias
ecebe75f33 Third stage of "Dagger of Sacrifice"-glow (#1389)
* Added Soul Fray check.
Sacrificial dagger now glows even more if you're fully prepared!
Added NBT field for maximum incense altar bonus from the last incense altar the player has encountered.
(There is a case in which the dagger glows even if the player is not at maximum incense bonus:
 The player must have been at maximum incense bonus and then gone into the vincinity of a stronger incense altar.
 The maximum incense bonus data field only updates once the maximum bonus has been reached for efficiency.)

* Multiplayer fixed.

* Fixed weirdness that occurred during a phase I don't remember.
2018-08-07 17:51:46 -07:00
KohaiKhaos
ebfd8ce9a3 Several mimic fixes, with actually cleaned up commit history. (#1379)
* Reimplemented a lot of mimic logic and did a first run of changing how mimics store their states.

* Finished removing all metadata calls for blocks replaced by mimics.

* Update EntityMimic.java

* Update ItemBlockMimic.java

* Update TileMimic.java

* How did I even replace a semicolon with a slash.

* Changed all tabs to 4 spaces. Changed Serializer to StateUtil

* Fixed spacing again, hopefully for the last time
2018-08-07 16:28:55 -07:00
Arcaratus
b441e7fc1e SoulTicket internal implementation (#1372)
* Fix the Blood Tank BB

* Add modid to command localizations to prevent conflicts

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
Corrected localizations of other lang files

* SoulTicket internal implementation

* do what TehNut says

* implement hashCode()

* Fix toggleable sigils draining on r-click when it shouldn't
Also moved the ItemSigil and ItemSigilToggleable to the sigil package (why wasn't it there???)
2018-08-07 15:27:12 -07:00
Nicholas Ignoffo
42c69eb557 Rework of ritual registration
Moves to annotation based registration. Configs are handled for automatically
2018-06-28 21:56:25 -07:00
Nicholas Ignoffo
e3d65a9e3a Rework of HUD element system
Allows configuration because that's probably a good thing. The values in
the json config are percentages of the screen.
2018-06-28 20:37:53 -07:00
Nicholas Ignoffo
47b88b95b0 Base work for ticket based syphoning
To be used for providing a history. This commit breaks any usage of the
network events.

Heads up @TeamDMan @Arcaratus
2018-06-28 18:24:17 -07:00
Nicholas Ignoffo
c8e42e3288 Fix lava crystal not syphoning LP (#1326) 2018-06-26 17:15:45 -07:00
cpw
778838e2b0 Fix light calculation to use actual visible level. Should now work on (#1295)
surface at night as well as underground. Tweak duration to reduce
flicker.
2018-05-03 19:26:28 -07:00
WayofTime
eb6b8a3aa5 Small bit of framework for Soul Breath items, plus testing with the "Scroll of Icarus". Crafting mechanic as well as refilling of its resource not implemented. 2018-04-28 21:56:57 -04:00
WayofTime
fff793ea7d Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method.
Also added better looking potion effects for a few things
Enabled Shard of Laputa array - no book entry yet.
2018-03-30 18:01:23 -04:00
Nicholas Ignoffo
58d9678c40 Switch some more instances of chat spam to the action bar 2018-03-23 16:50:17 -07:00
Nicholas Ignoffo
f535e331dd Removed all usages of PleaseStopUsingMe 2018-03-17 22:30:14 -07:00
Nicholas Ignoffo
77e5beb9e1 Fully remove old LogHelper usage 2018-03-17 17:18:20 -07:00
Nicholas Ignoffo
924dc7b38d Fix server crash when handling dye recipes (#1250) 2018-03-13 23:10:13 -07:00
Nicholas Ignoffo
ecb81a7017 A bit more altar cleanup 2018-03-10 00:07:19 -08:00
Nicholas Ignoffo
eada60f436 Some altar cleanup and renaming 2018-03-09 18:00:04 -08:00
Nicholas Ignoffo
b011623333 Switch ritual component gathering to a Consumer rather than direct list access 2018-03-05 00:10:30 -08:00
Nicholas Ignoffo
2b86e5c8ad More removal of BlockStack usages 2018-03-04 10:47:15 -08:00
Nicholas Ignoffo
3f5178dd6a A bit of Ritual cleanup
Slowly getting rid of these BlockStack references. Slowly moving towards
a proper "API" in our internals.
2018-03-04 09:17:24 -08:00
Nicholas Ignoffo
81ad9bf764 Cleaner fuel handling 2018-03-03 19:17:06 -08:00
Nicholas Ignoffo
f025407014 Move fuel handling to new event 2018-03-01 19:40:37 -08:00
Nicholas Ignoffo
70d98455b7 Cleaned up a lot of different inspections 2018-03-01 19:27:39 -08:00