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

1131 commits

Author SHA1 Message Date
WayofTime 86efa8b1a3 Updated the Alchemy Table recipe system so that it can provide better custom recipes 2016-05-04 16:44:32 -04:00
WayofTime a5dee50984 Attempted to fix the CME in the routing. 2016-05-03 09:16:56 -04:00
WayofTime 7ce9040aeb Changed Blood Altar to be stone level for the pick. 2016-05-03 07:29:35 -04:00
WayofTime 25108a5838 Formatting pass. 2016-05-02 20:56:32 -04:00
WayofTime 1e9f3dadd3 Merge pull request #723 from lazerzes/1.9 
Fixed Issue #703; Blocks with MetaData being reset to 0
 2016-05-02 20:54:22 -04:00
lazerzes 3f5fd16f87 Fixed Issue #703; Blocks with MetaData being reset to 0 2016-05-02 20:45:38 -04:00
WayofTime c80b083865 More tweaks to the alchemy table, as well as some minor recipes. 2016-05-02 20:08:25 -04:00
WayofTime ce385bd9a6 Added JEI compat for the Alchemy Table 2016-05-02 13:45:52 -04:00
WayofTime f9fc33d1ee Finished work on ISided nature of the alchemy table 2016-05-02 11:45:11 -04:00
WayofTime a03bc4d9a9 Forgot files... 2016-05-02 11:24:34 -04:00
WayofTime c32ac20936 Work on alchemy table 2016-05-02 11:24:22 -04:00
WayofTime 7116e3775e Worked on the Alchemy Table - final push for -35 2016-05-02 08:27:38 -04:00
WayofTime bc7760b11b Removed bad code from Elytra upgrade. 2016-05-01 22:33:13 -04:00
WayofTime d3379ff69b Additional work on the Alchemy Table, as well as the Elytra upgrade. 2016-05-01 22:32:15 -04:00
Nicholas Ignoffo d10d6e6275 Comment out Waila compat until Waila updates mappings 2016-05-01 13:55:15 -07:00
WayofTime f754d14927 Elytra upgrade~ (Untested) 2016-05-01 15:10:32 -04:00
Nicholas Ignoffo 08f865ba8a Fix JEI support for orb recipes with more than 1 orb 2016-05-01 09:10:12 -07:00
Nicholas Ignoffo 8283047bf1 Re-implement Waila compat 2016-05-01 09:00:49 -07:00
Nicholas Ignoffo cfa40e9bfb Update JEI compat 
Supports new category item system.
Fixes Binding category input slot cycling through input and catalyst.
 2016-05-01 08:35:07 -07:00
WayofTime 41edd86602 Work on Elytra upgrade. 
Fixed Lava Crystals again
 2016-05-01 10:01:00 -04:00
WayofTime 08de13b482 Added fall distance mitigation to the jump upgrade 2016-04-30 10:39:50 -04:00
WayofTime aba4332699 Changed it so that the Mending enchantment consumes the EXP before the Tome of Peritia does 2016-04-29 19:55:23 -04:00
WayofTime 172cf86348 - Changed Living Armour so that it is now damagable. The Living Armour Chestplate will be damaged, but will not break. If it gets to ~0 durability, it will damage your LP network heavily. 
- Living Armour is now repairable in an anvil with Binding Reagent.
- Started adding in the Alchemy Table... not really started.
 2016-04-29 19:45:45 -04:00
Nicholas Ignoffo aacb54962b Remove Compression mod bandaid 
An actual fix was implemented by the author.
 2016-04-24 11:54:05 -07:00
Nicholas Ignoffo 4a1484965c Fix spam when registering potions 2016-04-24 11:52:58 -07:00
Nicholas Ignoffo d550513f0a Update Forge + mappings 2016-04-24 10:06:28 -07:00
Nicholas Ignoffo b408234ab0 Fix formatting in compression compat 2016-04-24 08:50:10 -07:00
Nicholas Ignoffo ba17fe126e Config for ignoring Compression mod's compress recipes 
Over 3200 recipes with *just* vanilla + BM is... bad. Nobody should be adding that many...
 2016-04-24 08:30:59 -07:00
Nick 137beb4006 Add a clickable area to Soul Forge to view recipes 2016-04-18 19:23:47 -07:00
Nick 6449da0733 Use separate texture for activated sac dagger instead of enchant overlay 2016-04-17 14:03:26 -07:00
Nick a4f55d88b6 Change some int displays to Roman Numerals 
May not be 100% accurate if you somehow manage to get these really, really high, but it's good enough.
 2016-04-17 13:51:39 -07:00
Nick d71f181729 Add decoration safe tooltip to Blood Runes and Ritual Stones 2016-04-17 13:50:23 -07:00
Nick 458f8810b6 Fix Sacrificial Runes not affect sacrifice amount (#713) 2016-04-17 00:03:53 -07:00
Nick b2d1b75f49 Allow passives to drop Will in Peaceful (#711) 2016-04-15 16:46:58 -07:00
WayofTime 0e4e428f0e Fixed NPE when re-activating a ritual. 2016-04-15 13:19:32 -04:00
WayofTime f770f5eb30 Finished localization of ritual descriptions (for now). 2016-04-15 10:59:22 -04:00
WayofTime 7ca72320c5 Initial work on Capabilities usage for inventories. 2016-04-13 17:58:06 -04:00
WayofTime 744feffc54 Added the recipe for the ritual tinkerer and modified the recipe for the bloodstone blocks. 2016-04-13 14:50:42 -04:00
WayofTime 049d7c8472 Fixed shift-clicking for the routing nodes 2016-04-13 11:46:28 -04:00
WayofTime c0b39039cc Fixed the Speed and Jump rituals so that they correctly update the player's motion 2016-04-13 11:05:17 -04:00
Nick Ignoffo 81e9452a21 Merge pull request #709 from Arcaratus/1.9 
Improved the API and internal workings
 2016-04-12 18:37:05 -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
WayofTime 8571d4d264 Potential fix for routing nodes (I changed nothing, but it now works). Fixed blocks that are solid that did not block sunlight. 2016-04-12 15:25:16 -04:00
WayofTime 0a2dfb4fd4 Finished more ritual stuff 2016-04-11 17:31:14 -04:00
WayofTime 91ddb8b761 A lot more implementation work for custom areas for rituals. 2016-04-11 15:36:27 -04:00
WayofTime 51c79f15a9 Added chest ranges to the rituals that have chests, allowing the location of the chest to be assigned by the player. 2016-04-11 09:57:57 -04:00
WayofTime 9fe525b74b Did more work on the Ritual Reader. Fixed issue with the Ritual Diviner cycling its direction when you right click on the MRS. 2016-04-11 08:26:41 -04:00
WayofTime 057a951732 Did more work on the Ritual Reader - functionally, it is at about 80%. 2016-04-10 22:09:32 -04:00
WayofTime 30f233b81a Untested Ritual Reader stuff, and removing some registry shenanigans. 2016-04-10 21:19:18 -04:00
WayofTime db268b23a4 Started work on the "Ritual Reader," which will in the future give more information about rituals as well as allow you to set the custom areas of the rituals. 2016-04-10 15:05:51 -04:00
Nick f88dae6dda Add setRegistryName calls where missing 
Also fixed Teleposition Sigil having Teleposition Focus's name. Stupid auto-complete not knowing which "TELEP" I wanted.
 2016-04-09 17:06:41 -07: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
WayofTime 8b4a7d4999 Did some work on the Sentient Bow to start adding abilities to it 2016-04-09 17:57:30 -04:00
WayofTime 9768909eb8 Fixed it so the sentient bow actually shoots sentient arrows. 2016-04-09 15:35:02 -04:00
WayofTime 0b38f16672 Attempted to do a bit of rebalancing with the upgrade points 2016-04-07 21:11:25 -04:00
WayofTime 21473c12cd Added True Strike, increasing the damage of critical hits 2016-04-07 16:27:34 -04:00
WayofTime 7b94e414f8 Added Charging Strike armour upgrade 2016-04-07 15:12:57 -04:00
WayofTime bd36e95fc9 Reworked damage-modifying upgrades 2016-04-07 14:22:45 -04:00
WayofTime aa6d7bcfaa WTP, SourceTree? 2016-04-07 14:05:36 -04:00
WayofTime 2c72a27f8f Added step assist living armour upgrade tracker 2016-04-07 14:00:18 -04:00
WayofTime 832371271a Added recipe for the Tome of Peritia 2016-04-07 10:44:20 -04:00
WayofTime c3922fad63 Rebalanced Grave Digger so that it takes into account the swing cooldown 2016-04-07 10:35:00 -04:00
WayofTime 7d9312b2f8 Reverted changes to Living Armour - waiting on change to Forge's armour to balance properly. 2016-04-07 10:07:55 -04:00
WayofTime aa480af518 Updated forge, did random stuff to the armour before realizing issues with armour calculations 2016-04-06 21:04:50 -04:00
WayofTime b56bbef29e Formatting! 2016-04-05 16:16:17 -04:00
WayofTime 029091852d Fixed Water and Lava sigils placing two sources in special scenarios. 2016-04-05 16:13:49 -04:00
Nick 794ac6a7a2 Move binding back to PIE 
BM will now only load with Forge 1840+ as that is the version that PIE was re-implemented. Set dependency to avoid crashes. Also updated JEI version so it wouldn't crash with new Forge.
 2016-04-04 19:23:06 -07:00
WayofTime b0b61798fe Added "Grave Digger" living armour upgrade 2016-04-04 20:18:10 -04:00
WayofTime 1c6c7ba0a6 Fixed some minor bugs with the Living Armour 2016-04-04 19:24:43 -04:00
WayofTime 0755202a35 Fixed custom potion effects so they could be applied server-sided 2016-04-04 13:35:10 -04:00
WayofTime fa6c57091b Fixed an issue with the sentient sword having an attack speed of 4 when it did not make a will bracket. 2016-04-03 21:59:47 -04:00
WayofTime 6630e50efd Fixed the Sentient Sword so that it would use the default will type if it didn't have enough will. 2016-04-03 21:46:23 -04:00
WayofTime 02adac819d Fixed OutOfBoundsException in the Sentient Sword when you didn't have enough Will 2016-04-03 19:19:45 -04:00
WayofTime 912f1694e8 Added increase in speed for Routing nodes inside of a chunk with Demon Aura 2016-04-03 17:08:00 -04:00
WayofTime 25bfa0c969 Fixed armour calculations for unblockable sources 2016-04-03 13:44:47 -04:00
WayofTime 0afc150cc3 Rebalanced soft fall upgrade poings 2016-04-03 12:19:52 -04:00
WayofTime 96ecd73286 Added Soft Fall and Strong Legs living armour upgrades. 2016-04-03 12:17:42 -04:00
WayofTime f9bf63ccf1 Fixed NPE when using an empty bucket 2016-04-03 10:12:10 -04:00
WayofTime fe5a544e9d Finished the behaviour of the experience book. 2016-04-03 08:54:15 -04:00
WayofTime dbedcf0745 Fixed it so that the blood orb is no longer consumed in the crafting grid 2016-04-03 07:58:01 -04:00
WayofTime be87a96a5f Fixed formatting not working properly on servers. 2016-04-02 21:44:50 -04:00
WayofTime d20ad198be Working on the experience book 2016-04-02 20:09:23 -04:00
Nick 2258f7b442 Fix registered name spam 2016-04-02 16:15:22 -07:00
WayofTime 7a119adaf9 More work on the Item Experience Book. Changed the names of the Sanguimancy rituals to be more... majestic. 2016-04-02 18:45:52 -04:00
WayofTime 1d14692a93 Slowly working on an experience book for the mod. Changed Curse building to Beta 2016-04-02 16:42:04 -04:00
WayofTime 378c59d2b3 Updated to Forge 1826 2016-04-02 16:02:01 -04:00
WayofTime 39df6d5bb0 Fixed living armour's training bracelet so that it deactivates any training of upgrades not supported 
Added "Experienced" living armour upgrade, which provides more xp from picked up orbs.
 2016-04-02 10:10:49 -04:00
WayofTime cc7c594c52 - Removed health buff from Steadfast armour 
- Changed corrosive sword's effect from poison to wither
 2016-04-01 14:29:56 -04:00
WayofTime 66f3a9b581 Fixed #697 2016-03-31 21:11:58 -04:00
WayofTime b1a532950d Added damage boost and attack speed penalty for the Destructive sentient armour 2016-03-31 12:37:39 -04:00
WayofTime 92992e246b Fixed issue with Sentient Sword damage always being 12. 2016-03-30 19:32:57 -04:00
Nick 1cdcd81508 Pull teleportBlocks method into general utility class 
It's useful in other places and those other places really shouldn't be firing off the TeleposeEvent.
 2016-03-29 17:38:11 -07:00
WayofTime 63b541da06 Fixed Teh Nut derp 2016-03-29 19:56:15 -04:00
WayofTime 1b0e07cdb1 Added speed effect to Vengeful armour 2016-03-29 19:36:12 -04:00
Nick 7716e743ad Fix possible NPE on telepose (#693) 2016-03-29 16:27:59 -07:00
WayofTime eb43a7d04a Added movement speed on the Vengeful sword when in-hand. 2016-03-29 18:54:12 -04:00
WayofTime 7977fa351f FINALLY changed it so farm animals do not drop demon will 
Did work on the armour's unique effects.
 2016-03-29 18:39:52 -04:00
WayofTime 3fc5a76d53 Tweaked Tartaric Gem interactions. 2016-03-29 16:34:39 -04:00
WayofTime 39dbaea109 Finalized sentient sword effects 2016-03-29 16:11:16 -04:00
WayofTime 4f6f3860c0 Added Sentient Bow textures and models. Not the most elegant method. 2016-03-29 13:25:00 -04:00
WayofTime 4a58fc5518 Updated Forge to 1813. Worked on the SentientArmour so that it is able to use the different will types depending on what is the highest. 2016-03-29 09:22:25 -04:00
WayofTime 4ea3e0ca92 Created visual niceties when an item uses/contains a different will type. 2016-03-28 20:14:05 -04:00
WayofTime bd79afd46d Fixed the divination sigil and did a variety of other fixes. 2016-03-28 07:25:51 -04:00
Nick c2fe583496 Temporary workaround for binding 
Also fixes lots of things that went wonky when #684 was merged

I have no clue how much is still broken. Guess we'll find out :D
 2016-03-27 20:11:03 -07:00
Nick 1aaa817e65 Cleanup Alchemy Array recipe registry a bit 2016-03-27 20:09:30 -07:00
WayofTime ed42650c2e Playing with secondary effects provided by the offhand. 2016-03-27 16:53:08 -04:00
Nick Ignoffo 000ef44068 Merge pull request #687 from Arcaratus/1.9 
OreDict recipe support!
 2016-03-27 10:13:42 -07:00
Arcaratus 800ffa213b OreDict Altar Recipes! 
OreDict support for altar and alchemy array recipes!
Changed the alchemy array JEI image

Recipe modularizations

Fix

Like this?

Tehnut patch

Change to List<ItemStack>
 2016-03-27 13:12:56 -04:00
Nick 30bc020055 Localized some routing tooltips/chat 2016-03-26 12:32:51 -07:00
WayofTime 5cb39d1dbd Updated to Forge 1811 2016-03-26 14:32:06 -04:00
WayofTime f9cb1a08ba Finished the crystal automation ritual, "Gathering of the Forsaken Souls." 2016-03-24 19:10:57 -04:00
CJCutrone ba00b166aa Fix ItemBoundSword damage [1.9 branch] 
Redid this on the proper branch.
https://github.com/WayofTime/BloodMagic/pull/685
 2016-03-24 16:45:51 -05:00
WayofTime 3d2e1d911f 90% finished implementing the crystal growing ritual. 2016-03-24 16:18:39 -04:00
WayofTime f0730791f7 - Changed the growth behavior of the crystals 
- Fixed Potion getting for various methods
- Started work on crystal automation ritual
- Finished first iteration of the iterator of AreaDescriptor
 2016-03-24 14:11:05 -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 801355c051 Fixed rendering of .obj models in hand as well as a few small tweaks to attachment logic for routing nodes. 2016-03-22 11:11:11 -04:00
WayofTime 95b10f35c8 Fixed "see through world" syndrome for most blocks 2016-03-22 09:31:47 -04:00
Nick d8fe6d21bd Update Forge + Mappings 2016-03-21 12:55:36 -07:00
Nick aa48c540f5 Move armor items to IMeshProvider 
Minor change to IMeshProvider allow for this
 2016-03-20 23:21:07 -07:00
Nick 6cd993a619 Re-add localization checks to tooltips 2016-03-20 22:55:03 -07:00
WayofTime fc70319fa2 Sentient Bow now properly renders when pulling. 2016-03-20 10:06:53 -04:00
WayofTime fdbdcd56b6 Fixed armour textures 2016-03-19 10:30:01 -04:00
WayofTime 647046fd22 Fixed sentient armour gem. 2016-03-19 10:24:37 -04:00
WayofTime b86f7c24ed Fixed #677 2016-03-19 08:47:59 -04:00
WayofTime 48b3a7ce8b Fixed #676 2016-03-19 08:29:38 -04:00
Nick b9e4ac1e98 Combine TranquilityHandlers into single class 2016-03-18 21:31:18 -07:00
WayofTime fc70bcf107 Changed so items only give their "bonus" while in hand - will change for LivingArmour too. 2016-03-18 18:01:52 -04:00
WayofTime a71673a60e Fixed so that it now boots properly 2016-03-18 17:20:48 -04:00
WayofTime 239b6e5b1f Updated teleport logic (Untested) (0 errors) 2016-03-18 17:12:34 -04:00
WayofTime 966f663270 Entities (20 errors) 2016-03-18 16:57:57 -04:00
WayofTime ac3ac8d272 Items (27 errors) 2016-03-18 16:50:33 -04:00
WayofTime 000c4c5692 Bound Tools (61 errors) 2016-03-18 16:31:55 -04:00
WayofTime dcbc1c0bc4 ModItems and random imports (114 errors) 2016-03-18 16:08:06 -04:00
Nick 1bcc4e47e0 Fix a few nutderps on block updates 
Incorrect assumptions + adopting very early = mistakes were made
 2016-03-18 13:05:57 -07:00
WayofTime 26f7c874ff EventHandler (139 errors) 2016-03-18 16:05:01 -04:00
Nick 34f5753b17 More item fixes 
- Living and Sentient armor have no armor models
- (Self) Sacrifice Pack have no armor models
 2016-03-18 12:45:37 -07:00
WayofTime f95949a1c8 Sigils (257 errors) 2016-03-18 15:38:26 -04:00
Nick d05d3b90df Update BlockInteger/String 2016-03-18 12:01:58 -07:00
WayofTime 5e9454d390 Divination and Seer sigils (362 errors) 2016-03-18 15:00:23 -04:00
WayofTime 09168fa386 More error fixes (down to 381) 2016-03-18 14:54:31 -04:00
WayofTime 7706d0667a Fixed command and rendering of the sentient arrow. 2016-03-18 13:21:45 -04:00
WayofTime 10c6829482 Block fixes 2016-03-18 13:16:38 -04:00
Nick 252a4559f0 Re-add JEI compat 2016-03-18 04:07:49 -07:00
WayofTime 0c268a0bea Test push to verify everything is working 100% 2016-03-17 16:47:15 -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
Nick f896383fe6 Allow Mob Spawners to be teleposed (default blacklisted) (#671) 2016-03-16 15:47:42 -07:00
WayofTime 134b11f177 Normalized code formatting. 2016-03-16 18:41:06 -04:00
Nick b1db7c5152 Most blocks are done 2016-03-16 15:37:55 -07:00
Nick e8d2c523e4 Decrease teleport cooldown for non-living entities (#671) 2016-03-16 11:26:29 -07:00