Commit graph

48 commits

Author SHA1 Message Date
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
Nicholas Ignoffo 53b6030ba9 Run code formatter
🦀 Way is gone 🦀
2019-04-14 08:22:42 -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
Nicholas Ignoffo f535e331dd Removed all usages of PleaseStopUsingMe 2018-03-17 22:30:14 -07:00
Nicholas Ignoffo 554993ea79 Cleanup model registration 2018-03-07 19:43:00 -08:00
Nicholas Ignoffo 70d98455b7 Cleaned up a lot of different inspections 2018-03-01 19:27:39 -08:00
Nicholas Ignoffo 2fecb427fd Merge apibutnotreally with the main packages
Do not consider anything outside of the true API safe to use. And even then,
I'm changing things. Just wait. Please I beg you.
2018-02-15 18:49:07 -08:00
Nicholas Ignoffo 616c08094b Run formatter 2018-02-14 23:38:57 -08:00
Nicholas Ignoffo c03af41c88 Some subitem cleanup
Still lots left to do. This will help prepare for The Flattening.
2018-02-13 23:32:15 -08:00
Nicholas Ignoffo ddaadfbe52 Swap the API packages
The new one is now built for the api jar and the old one is now internal.
It will slowly be moved around to sane places within the internal code. Most
of the features provided in the old "api" are addon specific features which
will generally rely on the main jar anyways. The new API will be specific
to compatibility features, such as blacklists, recipes, and value modification.
2018-02-05 17:04:46 -08:00
Nicholas Ignoffo d99cf77288 Move config to annotation system
All old configs must be deleted for this to work properly. Since the rest
of the update is filled with world breaking changes, this should be fine.

Also some mapping updates

(cherry picked from commit d587a8c)
2018-02-04 19:01:27 -08:00
Nicholas Ignoffo 37ec0582eb Fixed the last of the model errors 2017-08-16 16:39:57 -07:00
Nicholas Ignoffo 08258fd6ef Run formatter 2017-08-15 21:30:56 -07:00
Nicholas Ignoffo 348fee1e2a It compiles. Somehow. 2017-08-15 20:21:55 -07:00
Nicholas Ignoffo 5fcdd978d7 this doesn't compile yet, but have something to peek at 2017-08-14 20:53:46 -07:00
Nicholas Ignoffo a628adfde8 Lowercase all the tooltip strings 2017-01-02 01:18:29 -08:00
Nicholas Ignoffo 51e10eaad2 Everything else except sigils 2017-01-01 22:26:42 -08:00
Nicholas Ignoffo fc57486054 Revert changes to Sacrificial Dagger
Adds a description that indicates correct usage.
2016-06-28 15:01:53 -07:00
Arcaratus 81d7cd4093 Bucket recipe fix and Creative Sacrificial Dagger fix (#827)
* Bucket recipe fix and Creative Sacrificial Dagger fix

* Do #808

* Add a Sacrificial Dagger conversion config

* Put the conversion everywhere
2016-06-28 11:55:58 -04:00
WayofTime 150ed4c6a9 Fixed separate NPE with the Sigil of Holding.
Added possible fix to an Incense glitch.
2016-06-07 21:11:21 -04:00
WayofTime 25108a5838 Formatting pass. 2016-05-02 20:56:32 -04:00
Nicholas Ignoffo d550513f0a Update Forge + mappings 2016-04-24 10:06:28 -07:00
Nick 6449da0733 Use separate texture for activated sac dagger instead of enchant overlay 2016-04-17 14:03:26 -07:00
Nick 458f8810b6 Fix Sacrificial Runes not affect sacrifice amount (#713) 2016-04-17 00:03:53 -07:00
Arcaratus 3e50dd4117 Improved the API and internal workings
Update things

Fix some more things

Update once more

Refactoring and removing unnecessary null checks

Woops

Fix

Nother fix

Moar fix

Fix imports

Update ItemBindable.java
2016-04-12 20:34:08 -04:00
Nick d48e4e5ae8 Move setRegistryName out of item/block constructors 2016-04-09 16:50:16 -07:00
WayofTime b259afc7df Updated changelog, changed Sacrificial Dagger's call to protected 2016-04-09 17:59:25 -04:00
Arcaratus 0383f0fb31 Move some base classes into the API
Add Javadocs for API classes that didn't already have them

Redo

'nother redo

Another redo

Update ItemSigil.java

Last one, I swear

Fix
2016-03-23 20:23:39 -04:00
WayofTime ac3ac8d272 Items (27 errors) 2016-03-18 16:50:33 -04:00
WayofTime dcbc1c0bc4 ModItems and random imports (114 errors) 2016-03-18 16:08:06 -04:00
Nick 6c729db70c Initial 1.9 commit
This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.
2016-03-17 13:00:46 -07:00
WayofTime 134b11f177 Normalized code formatting. 2016-03-16 18:41:06 -04:00
Nick 03662c0cd3 Most items done now 2016-03-16 01:10:33 -07:00
Nick abb58b57e5 Fix Creative dagger not filling Altar to capacity 2016-03-14 18:58:13 -07:00
WayofTime 01d4bdffa2 Fixed Sacrificial Dagger so it properly bypasses armour reduction checks. 2016-02-14 08:26:19 -05:00
WayofTime cc1e11f09f Added some rudimentary path blocks for the tranquility altar - textures pending. 2016-01-26 19:39:39 -05:00
Nick fdfcb5c5b7 Change how blocks/items are registered (desc)
tterrag is a meany face and yelled at me for using class.getSimpleName(). So here's an API-friendly re-work of the registration system. This allows all our Items/Blocks to be obtained via the API. Just add a new enum.
2016-01-18 22:34:12 -08:00
Nick 14459ddc69 This call was not as redundant as I thought hehe 2016-01-13 16:35:38 -08:00
Nick 5ac78b2dea Should fix fakePlayer lookup NPE #546
I think it's safe to say that if the player is null here, the places we use this check should probably not continue. Will see how it goes.

Also added the check to imperfect rituals and removed a redundant check from the dagger.
2016-01-13 13:13:01 -08:00
WayofTime b74ed8d431 Added self-sacrifice upgrade to living armour. 2016-01-05 12:17:05 -05:00
Arcaratus 23051088da Jumping Ritual
Patch
2015-12-31 09:06:58 -05:00
WayofTime e48eedb874 Changed formatting to have bracing on a new line 2015-12-30 15:34:40 -05:00
Nick beb85cf154 Generify 2015-12-28 14:04:34 -08:00
Nick 437dc1b96e Tweaks to damage. It now uses the DamageSource correctly 2015-12-01 23:35:09 -08:00
Nick 34dee6447b A whole lot of formatting cleanup
Also changes NBTHolder to a standard Constants class with subclasses for each category
2015-11-28 18:25:46 -08:00
Arcaratus 2fc34a5138 Sacrificial Commit 2015-11-07 11:51:41 -05:00
Arcaratus ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00