lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2042 commits 12 branches 0 tags 44 MiB
Commit graph

1706 commits

Author SHA1 Message Date
Nicholas Ignoffo c4f04b1589 Fix another null check crash (#1091) 2017-03-11 15:53:43 -08:00
Nicholas Ignoffo 7c8e9b6d8d Move some of the ritual chat lines to action bar 2017-03-08 18:00:36 -08:00
majikguy b4603a4b9a Entity Registration Fix (#1087) 
* Replaced the Entity registration code. Before, the code was manually adding entities to the GameRegistry.

Doing this prevents the engine from fully registering the added entities in all the proper places. The result was that the Client was never informed of when these entities were created or what they were doing, as all of that behavior is managed by the EntityRegistry.

Changing to the proper EntityRegistry calls fixes issue #1065.

* Changed ResourceLocation calls to the one with two arguments. Didn't know that was a thing before. :D

Also added more consistent whitespace.
 2017-03-07 16:17:18 -08:00
Nicholas Ignoffo 85a16ac075 Should fix Blood Light being collidable (#1083) 
Why did this only occur in obfuscated environments?
 2017-03-06 16:18:55 -08:00
Nicholas Ignoffo 333ad6a09e Fix null stacks in Utils class 2017-03-06 16:09:11 -08:00
Nicholas Ignoffo fceb50bd00 Initialize default altar result as empty stack (#1086) 2017-03-06 16:05:52 -08:00
Nicholas Ignoffo 52861ef7c2 Fix Cutting Fluid returning null when it empties (#1082) 2017-03-05 10:44:55 -08:00
Nicholas Ignoffo 3a707df23c Fix inability to remove gem from crucible (#1079) 2017-03-05 10:38:23 -08:00
Nicholas Ignoffo f083e4e036 Fix Sigil of Holding (#1081) 2017-03-05 10:28:06 -08:00
Nicholas Ignoffo 4e5bc46e21 Fix JEI not displaying armor tomes 2017-03-03 17:21:36 -08:00
majikguy 58db36033a Fixed a typo that made stage 4 of the Body Builder upgrade 5x as difficult as stage 5. (#1080) 
(cherry picked from commit 9540df7)
 2017-03-03 16:57:26 -08:00
Nicholas Ignoffo fd54ab0458 Fix tartaric gem returning null (#1068) 2017-03-03 16:45:53 -08:00
neconeco2 b1670cdbd5 Update ja_JP.lang (#1076) 
(cherry picked from commit 22354ea)
 2017-03-02 20:37:32 -08:00
Nicholas Ignoffo 203a2f5fc7 Fix off by 1 letter in inventory serialization (#1072) 2017-03-02 17:36:28 -08:00
Nicholas Ignoffo f3d980ee89 Rewrite Hymn of Syphoning for caps 
Needs testing and needs to be optimized.

(cherry picked from commit 3f24e46)
 2017-03-02 17:01:23 -08:00
Nicholas Ignoffo 3cbfb0a40f Sort rituals by component count to avoid conflicts (#1070) 
Large rituals can now use, for example, the Serenade of the Nether layout if wanted.

(cherry picked from commit 0b93c11)
 2017-03-02 16:59:08 -08:00
Nicholas Ignoffo 4e7f0d12f9 Fix Alchemy Table JEI compat being fundamentally wrong (#1069) 
(cherry picked from commit fedea85)
 2017-03-02 16:57:51 -08:00
Nicholas Ignoffo 8360041da2 Child mobs are now viable for sacrifice at half the rate 
(cherry picked from commit 719cff0)
 2017-03-02 16:53:29 -08:00
Nicholas Ignoffo 6ac31ba1e8 Dagger of Sacrifice should not work for FakePlayers 
(cherry picked from commit c4f9270)
 2017-03-02 16:52:53 -08:00
Nicholas Ignoffo 45faf42167 Fix OBO when getting blood tank capacity (#1066) 2017-02-25 14:07:11 -08:00
Nicholas Ignoffo 40bac68190 Break early if activation crystal isn't bound 
Fixes annoying and usually false "not configured correctly" message.

https://redd.it/5vte95

(cherry picked from commit 32668f7)
 2017-02-23 20:03:26 -08:00
Nicholas Ignoffo 72bf53f8d3 Fix crash when teleposing Demon Will Crystals (#1062) 
(cherry picked from commit 970acd4)
 2017-02-23 19:47:01 -08:00
Nicholas Ignoffo 88efd672d5 Fix crash when using newly created toggle sigils (#1059) 
(cherry picked from commit b55b453)
 2017-02-22 16:28:57 -08:00
Nicholas Ignoffo 0927fa16f6 Special case RAW will when converting enums 
(cherry picked from commit e8f0194)
 2017-02-22 16:27:44 -08:00
Nicholas Ignoffo 91aeb4bf48 Update version + changelog 2017-02-21 16:52:39 -08:00
Nicholas Ignoffo a7a6b1fddc Fix oddity with comparators on Altars (#1058) 
*shakes fist at @Arcaratus*

(cherry picked from commit 461c476)
 2017-02-21 16:13:23 -08:00
Nicholas Ignoffo da1bb01ff0 Return past functionality to canCombine 2017-02-20 14:15:41 -08:00
Nicholas Ignoffo 93d7efcb40 Fix crash when creating a tank stack with meta > 15 (#1057) 
Also finally fixes the tanks so they properly drop themselves.
 2017-02-20 13:47:36 -08:00
Nicholas Ignoffo 58d11dfbdc Fix Sigil of Holding crash when opening gui (#1056) 2017-02-20 13:13:15 -08:00
Nicholas Ignoffo 5475549c18 More null stack fixes 2017-02-19 16:06:29 -08:00
Nicholas Ignoffo 72c321acb0 Implement an inverted MRS that requires an RS signal to function (#1022) 
(cherry picked from commit ddb7542)
 2017-02-19 14:41:06 -08:00
Nicholas Ignoffo 64bc427c1c Missed a couple files 
(cherry picked from commit f0e3aa6)
 2017-02-19 14:38:28 -08:00
Nicholas Ignoffo 49b8c40e6a More proper fix for #1019 
(cherry picked from commit 2ee2cc5)
 2017-02-19 14:38:02 -08:00
Nicholas Ignoffo cdb5127598 Fix ore doubling potentially adding invalid recipes (#1051) 
(cherry picked from commit 9027f76)
 2017-02-19 14:34:19 -08:00
Nicholas Ignoffo 8259676d1b Downgrade tomes are now know that they're downgrades 
Also Disoriented is localized finally

(cherry picked from commit e092161)
 2017-02-19 14:33:56 -08:00
neconeco2 61bf9c1b08 Update ja_JP.lang (MC1.11) (#1050) 2017-02-13 12:12:45 -08:00
Nicholas Ignoffo c13be9ebce Cache the bound SoulNetwork for rituals 
Avoids looking up the map data once or more each tick
 2017-02-12 17:00:18 -08:00
Nicholas Ignoffo b0d35577a9 Fix server crash when adding categories to book (#1046) 2017-02-12 16:11:55 -08:00
Nicholas Ignoffo 1728ba7b83 Migrate alchemy table blocking to a boolean array 2017-02-12 11:09:39 -08:00
Nicholas Ignoffo 2db775346c Fix crash when unblocking slot in alchemy table 
why way why

`boolean[] blocked = new boolean[slotCount]` :I
 2017-02-12 01:59:30 -08:00
Nicholas Ignoffo ac5cf52151 Fix some model errors 2017-02-12 01:39:19 -08:00
Nicholas Ignoffo 7f50780d2f Fix modid references in API javadoc 2017-02-12 01:36:01 -08:00
Nicholas Ignoffo f135dab7ba IMC API for adding new altar components (#1039) 
CC @Drullkus

(cherry picked from commit 8a8bff8)
 2017-02-12 01:34:51 -08:00
pksiazek 9010cebc40 #1036 Fixed Living Armor sacrifical upgrade (#1037) 
(cherry picked from commit 6802bc5)
 2017-02-12 01:34:34 -08:00
Nicholas Ignoffo d0e9174446 Bound tools should drain LP (#1033) 
(cherry picked from commit 59920ef)
 2017-02-12 01:34:20 -08:00
Nicholas Ignoffo 86ea69eaca Temporarily remove item rendering for tank fluid 
You cannot bake GL stuff. This is bad. Also it got broken at one point.

I'll re-add this once I remove the need for a TESR.

(cherry picked from commit 13228f6)
 2017-02-12 01:33:48 -08:00
Nicholas Ignoffo 53afcc2fb0 No-spam messages should be handled on the main thread (#1035) 
(cherry picked from commit 305e001)
 2017-02-12 01:31:58 -08:00
Nicholas Ignoffo 930660bc30 Update Blood Tank model and texture 
Thanks @InsomniaKitten

Need to rewrite inventory model handler because you *cannot* use GL there.

(cherry picked from commit 6ff12aa)
 2017-02-12 01:31:37 -08:00
Nicholas Ignoffo 11fe41c654 Fix durability bars 2017-01-02 02:28:02 -08:00
Nicholas Ignoffo e845332846 Fix compile/model errors 2017-01-02 02:07:52 -08:00
Nicholas Ignoffo 78093631c5 Empty flasks can now be refilled (#976) 
Right click a water source (any block that uses Material.WATER, same as vanilla potions) to refill it. This removes all potion effects. The model will display without the fluid inside as a visual indicator.

(cherry picked from commit 4c614df)
 2017-01-02 01:59:24 -08:00
Nicholas Ignoffo f3f1dfb08a Fix Expulsion whitelist (#1010) 
(cherry picked from commit b6eae2f)
 2017-01-02 01:58:31 -08:00
Nicholas Ignoffo 91a900d84e Add current charge to Waila tooltip (#1013) 
(cherry picked from commit c7f2b7d)
 2017-01-02 01:58:24 -08:00
Nicholas Ignoffo 4c3938c0f9 Change meteor config NPE with EnderCore to a useful error message 
(cherry picked from commit 09007c5)
 2017-01-02 01:57:44 -08:00
Nicholas Ignoffo 1f3686720c Gold meteor only needs it's version set once 
(cherry picked from commit fffed0e)
 2017-01-02 01:57:42 -08:00
Nicholas Ignoffo e0c0d095df Fix meteor config not generating new defaults 
(cherry picked from commit 5c1b8b1)
 2017-01-02 01:57:35 -08:00
Nicholas Ignoffo bd4efb1320 Blacklist sentient spectres from WoS and Sacrifice (#1015) 
A config refresh is required for this to take effect. Needs mentioning in changelog.

(cherry picked from commit a5449d3)
 2017-01-02 01:57:29 -08:00
WayofTime e8dd07893e Added a null check for the Will getter for the Aura incase the WillChunk somehow does not generate. (#1011) 
(cherry picked from commit f083071)
 2017-01-02 01:57:23 -08:00
WayofTime 60eba2071d Made it so the book does not give the filling recipe when the Blood Orb recipe is queried. 
(cherry picked from commit afa3d1e)
 2017-01-02 01:57:17 -08:00
Nicholas Ignoffo c46ed3e648 Sigils should draw LP from the bound network, not the user 
(cherry picked from commit 082d2b8)
 2017-01-02 01:57:07 -08:00
tartaric_acid 852d32f233 Update zh_CN file (#1003) 
* Update zh_CN file

* Fix some mistakes (WIP)

* Finish all fix

* Fix some mistakes

(cherry picked from commit ae2ff03)
 2017-01-02 01:35:48 -08:00
WayofTime 65104db564 Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter. 
(cherry picked from commit a5a17f6)
 2017-01-02 01:34:33 -08:00
Nicholas Ignoffo a628adfde8 Lowercase all the tooltip strings 2017-01-02 01:18:29 -08:00
Nicholas Ignoffo 574056203d Fix JEI compat 2017-01-02 01:18:02 -08:00
Nicholas Ignoffo 4ec321aaac Annnd they're back 2017-01-02 00:19:45 -08:00
Nicholas Ignoffo c34ee90b4e Okay let's fix these the hard way. 2017-01-02 00:18:39 -08:00
Nicholas Ignoffo ed27873fbe It runs! 2017-01-02 00:10:28 -08:00
Nicholas Ignoffo 51e10eaad2 Everything else except sigils 2017-01-01 22:26:42 -08:00
Nicholas Ignoffo 128b3d29b0 Lowercase modid 2017-01-01 21:50:35 -08:00
Nicholas Ignoffo f5a68adc2e Remove all the package-info.java's 
Except the API one
 2017-01-01 21:49:52 -08:00
Nicholas Ignoffo d80afb18f0 More progress 2017-01-01 21:43:34 -08:00
Nicholas Ignoffo 00d6f8eb46 Initial stab at 1.11 
About halfway.
 2016-12-12 19:56:37 -08:00
Nicholas Ignoffo ce52aea512 Recipes for Blood Tank 2016-12-12 00:33:25 -08:00
Nicholas Ignoffo b7e2730bcc Implement the new model for the Blood Tank 
- Texture needs some tinkering. Will bother @InsomniaKitten about it
- Minor cleanup and improvements
 2016-12-11 23:54:03 -08:00
Arcaratus aac2623440 Implement a functioning Blood Tank (#969) 
Added a search bar to the Upgrade Tomes Creative Tab
Updated some Altar fluid code (remove deprecated stuff)
Moved Rendering classes into appropriate package
Fix the localization errors on the Demon Crystals
A few cleanups here and there
 2016-12-11 17:28:47 -08:00
WayofTime d1f4e95a7e Added deprecated methods for easier updating - Oops! 2016-12-07 08:14:05 -05:00
WayofTime 99f9d06659 - Fixed Phantom Bridge sigil glitch when travelling between dimensions and teleporting large distances. 2016-12-06 11:53:47 -05:00
WayofTime 89bd91197d Fixed silly dupe bug with the Zephyr ritual. (#988) 2016-11-29 22:06:43 -05:00
WayofTime efb3077fdf Fixed Ritual of Regeneration's text (#987) 2016-11-27 20:33:13 -05:00
WayofTime 9e6c8d8a43 Final push for -67. 2016-11-27 11:32:07 -05:00
WayofTime 1ad2fc0ae4 Added some placeholder recipes for the Living Armour Downgrades - they will eventually change. 2016-11-23 18:46:18 -05:00
WayofTime 82f04d4b6c Updated the book so it contains most of the rituals. 2016-11-20 10:32:13 -05:00
WayofTime a04c8af550 Did some minor bug fixes and updates with some rituals. 2016-11-19 17:06:11 -05:00
Sokratis Fotkatzikis 841eb2a1df Create bg_BG.lang (#765) 
* Create bg_BG.lang

done until L23
--------------------

* Update bg_BG.lang

DONE #L43 - #L48 ; #L66 - #L92
~~~~~~~~~~~~~~~~~~~~~~~~
TODO #L25 - #L41 ; #l50- #L64

* More Translation

Still not doe *Will finish it tomorrow* (Ping me at discord if I forget :P)

* here you go
 2016-11-16 14:40:11 -08:00
Nicholas Ignoffo 104fb855b4 Run the guide images through a PNG compressor 
Drops the jar size by quite a bit
 2016-11-13 15:24:10 -08:00
Nicholas Ignoffo bd6b181a1b Wrong @Nullable annotation 2016-11-12 11:52:38 -08:00
Nicholas Ignoffo b0007a1d36 Re-add FakePlayer check to sigils (#970) 
whar did dey go?
 2016-11-11 16:57:50 -08:00
Nicholas Ignoffo 1f31268669 Fix Mimic render ignoring meta (#965) 
Also re-implements Waila handler correctly
 2016-11-11 16:50:44 -08:00
WayofTime 3956c9f7dd Setup the .json of the Demon Will to use the new aspected textures. 2016-11-11 17:29:05 -05:00
Yulife d46a5e16ae souls 2016-11-11 23:04:46 +01:00
WayofTime fb38c2e8b8 Snares can no longer hit the thrower of the snare within 20 ticks of throwing it (#745) 
Added the "Diseased" upgrade, which vastly decreases healing potency.
 2016-11-11 10:42:56 -05:00
WayofTime 33b799723c Made it so you can view the recipes for downgrades in JEI. 2016-11-10 10:39:19 -05:00
WayofTime 1f6c4b47e2 Fixed a crash with the Ritual Diviner when attempting to replace certain blocks. (#967) 2016-11-08 06:54:39 -05:00
WayofTime 97907367a1 Made a ritual augment that makes the Ritual of Regeneration steal health from mobs to heal the player. Also tinkered with having the ritual give absorption hearts (at a slow rate) 2016-11-06 21:49:48 -05:00
WayofTime 0419800a86 Finished most of the Augments for the Ritual of the Shepherd. 2016-11-06 17:03:10 -05:00
WayofTime d1e6076cca Added some more meteors - one that uses a gold block, another that uses a diamond block. 2016-11-05 19:29:03 -04:00
WayofTime faef980e59 - Made it so peaceful animals provide more LP by default (to encourage creating your own farm). 
- Increased the effectiveness of animals for the Gathering of the Forsaken Souls ritual by a factor of 4.
- Added the framework for the Purification Altar.
 2016-11-05 11:14:56 -04:00
WayofTime da4de55c2e Finished the Augments for the Ritual of the Crusher. 2016-11-03 10:52:14 -04:00
WayofTime 655c2880dc Made the aspected Sentient Tools drop their corresponding Will type on killing enemies. #753 2016-11-02 12:16:24 -04:00
Nicholas Ignoffo 6c4fe34152 Fix Waila altar progress percent (#796) 
After rewriting half of Waila, I understand how these things should be done, now
 2016-10-31 00:07:59 -07:00