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

1069 commits

Author SHA1 Message Date
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
Yulife 9a4bf8578f Demon Will Variants & Formula 2016-03-28 17:15:11 +02: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 6a40dbab0a Added (not so great) WIP textures for the crystal items 2016-03-22 17:04:46 -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 2652dea81d Updated zh_CN.lang from 1.8 branch. 2016-03-19 12:48:39 -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 9de1f6e43e Fix missing " in Demon Crystal JSON 2016-03-16 11:38:03 -07:00
Nick e8d2c523e4 Decrease teleport cooldown for non-living entities (#671) 2016-03-16 11:26:29 -07:00
Nick 599ff5ab67 Blacklist Demon Crystal from Teleposer (#671) 2016-03-16 11:23:22 -07:00
Nick 03662c0cd3 Most items done now 2016-03-16 01:10:33 -07:00
Nick ba0b24d231 Begin new model system 
Includes some examples for both ways.
 2016-03-15 22:48:01 -07:00
Nick 2700841973 Changed wills to go straight to inventory and only drop excess (#654) 2016-03-15 19:50:03 -07:00
Nick 6a6cb53d8f Bound Tools are now enchantable (#664) 2016-03-15 19:38:45 -07:00
Nick 14267656cb Fix bound tools unreliably breaking blocks 2016-03-15 18:37:34 -07:00
Nick 830a6bcc36 Fix desync with Phantom Blocks (again) (#668) 2016-03-15 12:12:15 -07:00
Nick 173fdbfb2d Make Blood Lights more visible when holding Sigil (#340) 
Spawns some extra particles to make it more noticeable
 2016-03-14 20:23:31 -07:00
Nick 6736d2cf4b Fixed Blood Light Sigil not using LP (#653) 
Also a bandaid for accidental spamming of lights. 10 tick cooldown before being able to place another.
 2016-03-14 20:18:54 -07:00
Nick 0f4e1ad4cb Fix step height being reset to incorrect value (#652) 2016-03-14 19:46:59 -07:00
Nick d9e9a4704a Debug commands 
Not fully tested. The ones tested do work, though.
 2016-03-14 19:00:03 -07:00
Nick a3b7001d55 SoulNetwork setters should automatically markDirty() 2016-03-14 18:58:44 -07:00
Nick abb58b57e5 Fix Creative dagger not filling Altar to capacity 2016-03-14 18:58:13 -07:00
Nick 399442cf62 Helper method for getting the max LP contained in a tier 
Finds the highest capacity of the orbs in a given tier
 2016-03-14 18:57:39 -07:00
Nick 0ba6ff8235 Fix orb tier never being set in SoulNetwork 
Oopsy
 2016-03-14 18:56:55 -07:00
Nick f5d02b2807 Interface cleanup 
Specifying public in an interface is redundant.
 2016-03-14 18:55:44 -07:00
Nick 76b3c14499 AddToNetworkEvent should be cancellable 2016-03-14 18:55:05 -07:00
WayofTime 22bd2f0628 Fixed WillChunks so that you should not get a null chunk when requested. 2016-03-14 20:16:31 -04:00
qianzha 8c1380662b Update zh_CN.lang 2016-03-12 20:09:38 +08:00
WayofTime cbe858e581 Fixed Hellfire Forge's GUI 2016-03-07 06:39:37 -05:00
WayofTime 4fd39b6348 Fixed altar crashing 2016-03-07 06:30:58 -05:00
Nick 126d17b55d Clean up some javadoc spam 
Still need to figure out why delombok is priting an error for every non-BM import. It was apparently fixed in `gradle-lombok` 1.5 but it seems to have returned.
 2016-03-02 12:56:57 -08:00
Nick fe18be56fd Update graphic for Altar page in docs 
Removes the Sanguimancy part and use new graphical style
 2016-03-01 13:45:45 -08:00
Nick 5cd44fd40c Change node beam texture to an internal one 
So @Yulife shuts up about it :P
 2016-03-01 09:09:21 -08:00
Nick 3f8cccf056 Config to only render routing lines while an INodeRenderer is held 
Current INodeRenderer's are the Node Router and all Routing Nodes
 2016-02-29 23:20:57 -08:00
WayofTime 507d41111d Reverted GuiButton variables to standard method. 2016-02-27 19:37:42 -05:00
WayofTime 6b52b5131b Merge pull request #649 from Arcaratus/1.8 
Routing node cleanup
 2016-02-27 19:35:03 -05:00
WayofTime 7106579201 Updated changelog and added recipes. Also created behaviour for the crystals to drop single crystals. 2016-02-27 19:34:42 -05:00
WayofTime 620023d098 Fully implemented discrete demon will, which means the demon crystals can be inserted into demon crucibles to create will. 2016-02-27 16:36:56 -05:00
Arcaratus e89451ed36 Routing node cleanup 2016-02-27 11:38:40 -05:00
Nick 83c1497609 Put the breaks on the model spam train 
OBJs are noisy
 2016-02-26 22:36:52 -08:00
Nick f21e97063a Fix formatting + tooltips 2016-02-26 21:35:41 -08:00
Nick 8d5e9c125b Initial stab at documentation 2016-02-26 21:22:34 -08:00
WayofTime 70f4c117d7 Added growth method for the crystals. 2016-02-26 22:11:28 -05:00
WayofTime ea24e7edd8 Created the proper rendering for the crystal clusters while in hand 2016-02-25 22:00:02 -05:00
WayofTime 19fec96bfd Added different types of Demon Will crystals. Obtainment method still TBD 2016-02-25 16:19:57 -05:00
WayofTime 8077962e08 Fixed brightness issue with crystals. 2016-02-25 11:29:48 -05:00
WayofTime 3fc6b5627f Testing translucent textures. 2016-02-25 10:45:00 -05:00
WayofTime da6f410394 Lots of import rearrangement due to odd "clean up" algorithm. Added Crystals, which are very WIP. 2016-02-25 08:54:18 -05:00
Nick 99c2b26c6b Durability for Inscription Tools 2016-02-23 22:48:34 -08:00
Nick 7af53ce85b Add AltarCraftedEvent 
Called after an altar has crafted an item. Not cancellable, however the output itemstack may be modified.
 2016-02-23 22:48:15 -08:00