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

1156 commits

Author SHA1 Message Date
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 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
Nick 45710ebb8f Some minor cleanup 
* Hid Dimensional Portal from JEI and Creative
* Fixed stacktrace spam when invalid portal was stepped into
* Fixed tank rendering no model at all
* Fixed NBT saving for Dimensional Portal
 2016-02-23 22:47:28 -08:00
Nick Ignoffo 5c5cda1917 Merge pull request #641 from Alex-hawks/1.8 
Add Capability support to Ritual Sones, Finish TE support as well
 2016-02-23 21:33:55 -08:00
WayofTime 743af85a61 Added Demon Pylon (currently no model) which pulls demon will from surrounding chunks into its chunk. 2016-02-23 13:40:08 -05:00
alex-hawks 33f05cd819 Add Capability support to Ritual Sones, Finish TE support as well 2016-02-24 01:52:52 +08:00
WayofTime 7104138e2b Implemented Priority System for the item routing system. Lower numbers are looked at first. 2016-02-22 21:19:22 -05:00
WayofTime 2c49c49441 Started work on Demon Will Inversion system. 2016-02-21 20:10:56 -05:00
WayofTime 0524daa16c Fixed suicidal portals in SMP 2016-02-21 13:26:09 -05:00
Nick 8393cca118 Blacklist Alchemy Array from JEI 2016-02-20 15:51:44 -08:00
WayofTime 37227d42f9 Fixed path blocks so they are actually craftable. 2016-02-20 15:34:16 -05:00
WayofTime 4a1cf11f6d Merge pull request #637 from Arcaratus/1.8 
Backwards rune recipes and texture fix
 2016-02-20 14:33:22 -05:00
Arcaratus f83838c8b1 Backwards rune recipes and texture fix 2016-02-20 14:30:35 -05:00
WayofTime c364ebf6ae Fixed armour so that it properly increments the upgrade points for extended play sessions. 2016-02-20 13:46:53 -05:00
WayofTime 8e8562e5a0 Minor fix to crushing ritual. Felling ritual's upkeep cost was reduced. 2016-02-19 20:11:29 -05:00
WayofTime b3636fe12f Fixed filters so that they would send a block update to the inventories when updated. Also nerfed the bound sword. 2016-02-19 19:47:58 -05:00
WayofTime a88d7f43b8 Created fillWill method for the tartaric gem. 2016-02-19 08:03:33 -05:00
Nick a056835a31 Move last PR into single event handlers 
Also includes a var in the main class for if we're running in an obf env or not. Use this for debugging
 2016-02-18 19:44:39 -08:00
Arcaratus da711c0461 Ritual holograms! 2016-02-18 21:59:10 -05:00
WayofTime 035ba94976 Reworked Tartaric Gems so that they contain specific demon will types (work for the future) 2016-02-18 18:00:02 -05:00
WayofTime e2e1b3c50f Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8 2016-02-18 12:53:36 -05:00
WayofTime 70d0723dde Added recipes for sigils. Updated changelog for -18 release. 2016-02-18 12:53:04 -05:00
Nick a35aced93a Check if owner is set before syphoning 2016-02-18 09:51:58 -08:00
Nick 48622bf2e7 All Getter methods for lists/maps in registry now return new copies 2016-02-18 09:49:12 -08:00
Nick d997932306 Water Sigil can now fill the Cauldron (#617) 2016-02-18 09:37:31 -08:00
WayofTime 19bf728da3 Fixed rituals not correctly re-activating when taking off a redstone signal after reloading the world. 2016-02-18 12:26:42 -05:00
WayofTime 34a9b5a7ec Fixed Portal ritual. 2016-02-18 12:11:29 -05:00
Tombenpotter 7e8aec8652 Huge commit for the Pull-Request. 
Added a lot of things:
- Blood Tank
- Teleposition Sigil
- Transposition Sigil
- Cobblestone/Netherrack/Obisidian generation Ritual
- Tree Cutter Ritual
- Pump Ritual
- Altar Builder Ritual
- Block Placing Ritual
- Portal Ritual
- Teleportation System and API Components
- Cross pattern Area Descriptor
- Two reagents and their textures for the sigils’ crafting

Fixed:
- Teleposer not teleporting entities correctly

And probably other things I forgot!
 2016-02-18 17:25:11 +01:00
WayofTime d947f23696 Attempted to improve the crucible's logic. 2016-02-18 09:03:18 -05:00
Nick 29a8117771 Fix Spectral Block storing of block 2016-02-18 02:03:38 -08:00
Nick 4becdbf969 Update JEI to latest 
Fixes issue where setting "after:JEI@[1.2.3,)" would cause the blacklist to break.
 2016-02-18 00:06:25 -08:00
WayofTime c641f69809 Fixed a bit more logic of the demon crucible. 2016-02-17 21:23:13 -05:00
Nick 8a9b88d0cb Sigils now cut their description tooltip if too long 2016-02-17 16:10:16 -08:00
WayofTime ccb706f15c - Removed the FOV effect from the Quick Feet speed upgrade. 
- Minor work on the Demon Crucible.
 2016-02-17 16:31:11 -05:00
WayofTime 3e94aeae77 Added obj for WIP Demon Crucible (name pending). Fixed Floating Incense Altar syndrome. 2016-02-17 09:21:22 -05:00
Nick af193c3e5b JEI support for Blood Orb recipe type 
We can now move all the recipes over to Shape(d/less)BloodOrbRecipe
 2016-02-16 20:48:42 -08:00
Nick 65dd24b19b Move Revealing upgrade to tc compat class/package 2016-02-16 15:45:44 -08:00
Arcaratus abf54bf9af Beginning Thaumcraft compat 
Derp
 2016-02-16 18:41:59 -05:00
WayofTime 15650bac8b Amended range of Zephyr ritual 
Fixed Green Grove ritual
Fixed Crusher ritual so it didn't break everything at once.
 2016-02-16 11:46:47 -05:00
Nick 8f453f6e1e ItemBindable static methods now look for IBindable 2016-02-15 15:02:32 -08:00
Nick 58e51b9d51 Move IMC handling to it's own class 2016-02-15 15:01:03 -08:00
WayofTime 3c26dba99e Added recipe for the training bracelet. Combine in an anvil with an upgrade tome to set it as the upgrade to train 2016-02-15 17:20:33 -05:00
WayofTime db4c68e5f3 Added Ritual: Ritual of Living Evolution, which is used to set the living armour's max upgrade points to 300. 2016-02-15 17:13:50 -05:00
WayofTime 7610329d0a Added Ritual: Song of the Cleansing Soul to remove Living Armour upgrades from the armour. 2016-02-15 15:27:39 -05:00
WayofTime b5c8c2242a Fixed step height issues. 2016-02-15 13:36:47 -05:00
WayofTime 8ec653b2a7 Fixed lava crystal working even if there is no LP available. Causes a desync on server worlds. 2016-02-15 08:11:18 -05:00
WayofTime 18a36b9778 Fixed incense altar so that it checked two blocks above its level properly. 2016-02-15 07:11:02 -05:00
WayofTime 64efaf854b Implemented most of the framework required for training specific Living Armour Upgrades. 2016-02-14 21:50:32 -05:00
WayofTime 01d4bdffa2 Fixed Sacrificial Dagger so it properly bypasses armour reduction checks. 2016-02-14 08:26:19 -05:00
WayofTime 1787f50a65 Added recipes for various sigils. 2016-02-12 20:48:00 -05:00
WayofTime f195c5a486 Fixed bug where Living Armour would give its upgrades even if you didn't have the full set. 2016-02-12 20:24:20 -05:00
Nick 0828e965c6 Fix NPE when setting position of Teleposition Focus (#609) 2016-02-12 12:49:32 -08:00
WayofTime bb106e84ef Fixed tranquility check on seer sigil. 2016-02-12 06:27:44 -05:00
WayofTime 95354ad557 Added Runic Shielding upgrade to the Living Armour. 2016-02-11 17:53:20 -05:00
WayofTime 460df89e10 Fixed Blood Altar resetting when clicked with an item. 2016-02-11 15:56:08 -05:00
WayofTime c6b446faf9 Fixed uncommon error in the Seer and Divination sigils. 2016-02-11 15:44:32 -05:00
WayofTime 69eb621fc8 Finalized Solar Powered perk. Worked a bit more on Grim Reaper's Sprint. 2016-02-11 14:10:43 -05:00
WayofTime a5391840a4 Small change to docs in NetworkHelper. 2016-02-11 07:29:11 -05:00
Nick 04c0c32188 More work on moving models into ItemStates 2016-02-10 18:49:02 -08:00
Nick 325cda2f71 Begin cleaning up model registration 2016-02-09 19:07:56 -08:00
Nick f613c00970 Change Revealing upgrade to follow other upgrades 
Obtained the same way as before.
 2016-02-09 18:49:38 -08:00
Nick be0a93143d Blacklist some more NBT tags from JEI 2016-02-09 18:26:30 -08:00
WayofTime bb40cbb216 Fixed something 2016-02-09 21:08:54 -05:00
WayofTime 1d7b6febb9 Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8 2016-02-09 20:22:18 -05:00
WayofTime 2be1d50541 Attempt to implement the Living Armour upgrade for the Grim Reaper's Sprint. 2016-02-09 20:22:14 -05:00
Arcaratus a0b5571f96 Touched up Divination Sigil -> Incense Altar interaction 2016-02-09 18:13:18 -05:00
WayofTime 4e054224ac Fixed step height issues with PotionBoost. Fixed some formatting errors. Set the path blocks' max path lengths. 2016-02-09 15:53:22 -05:00
Nick 82e802e936 Update JEI compat 2016-02-08 16:23:58 -08:00
WayofTime e4b724a6e4 Fixed routing nodes so that their parts do not fight when rendering. 2016-02-08 18:42:45 -05:00
Nick 5757fab22d Alchemy Array should only store a max stack size of 1 2016-02-08 14:41:58 -08:00
Nick faf4562df9 Bound tools now follow the BreakEvent (#79) 2016-02-08 14:17:56 -08:00
Nick 64660d2d28 Comparator support for Blood Altar 
Default behavior is to check the amount of LP currently inside the Altar. To modify the behavior to check the amount of LP in a network (As it did in 1.7.10), place a Blood Stone Brick (either kind) directly underneath the altar.
 2016-02-08 13:49:40 -08:00
Nick 4e1de51cf8 Implement new path blocks 2016-02-08 00:57:02 -08:00
WayofTime 8c3019447a fixed NPE in the blood orbs. 2016-02-07 18:21:28 -05:00
WayofTime b406bb4672 Fixed melee damage, trick shot, and defense stat trackers. 2016-02-07 15:37:35 -05:00
WayofTime fa6b338a03 Fixed NPE when draining the Blood Altar while it has an empty buffer. 2016-02-07 06:45:38 -05:00
WayofTime b90f498282 Translucified the node textures and decreased the beam width. 2016-02-06 18:06:25 -05:00
WayofTime 9d64a43ee4 Go go node models~ 2016-02-06 17:36:37 -05:00
WayofTime f1621f1bce Fixed imports. 
Apparently that's important too.
 2016-02-05 22:29:22 -05:00
WayofTime 52aae56335 There were more. 2016-02-05 22:25:26 -05:00
WayofTime 22db498592 Fixed Bound Sword custom mesh definition so that it isn't registered server-side 2016-02-05 22:23:00 -05:00
Nick ca64ecfc66 Inform players if they are not using their Divination sigil 
Should lower the amount of "why isn't my network filling?" questions.
 2016-02-05 18:05:44 -08:00
Nick 10b58ee7ad Update models. Change bounding box of Hellfire Forge 2016-02-05 15:17:43 -08:00
Nick fc49dc92ed Fix imperfect rituals crashing client 
I should really, *really* stop breaking this.
 2016-02-05 14:38:32 -08:00
WayofTime 333c6d71d2 Added flame particles to the incense altar for when it is actually operating. 2016-02-04 21:20:29 -05:00
WayofTime fd671f2902 Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2016-02-04 21:12:58 -05:00
WayofTime 233f50de31 Registered item model for master routing node. 2016-02-04 21:11:51 -05:00
Nick 4a2b6e0641 Stop registering test spell block 2016-02-04 17:58:15 -08:00
Nick ff1425f773 Alchemy Array no longer has missing particles for break animation 
Also provides Arcane Ashes on pick block.
 2016-02-04 17:43:29 -08:00
Nick c0b85276e9 Alchemy Array no longer causes height change 2016-02-04 17:32:21 -08:00
Nick ef6e066d94 Waila handler for Alchemy Array 2016-02-04 17:07:53 -08:00
Nick 2bf401f1d6 Re-activating a ritual via Redstone should not consume LP 2016-02-04 13:32:59 -08:00
Nick cd794250bd Ritual Stones should always drop blanks 2016-02-04 12:31:44 -08:00
WayofTime 4260ea7a8a Fixed glitch where for altar tier >= 3 the edge runes counted twice. 2016-02-04 08:25:37 -05:00
Nick 352d2ab35c Fix Bound Tools having high damage while deactivated 2016-02-04 02:51:54 -08:00
Nick cc66af7eb1 Allow Bound Sword to be enchanted 
Also changes how the models are handled and changing activation states does not cause the "item change" animation.
 2016-02-04 02:45:19 -08:00
Nick fd16a58b6b Move getOwnerName/UUID to IBindable 
Where it should have been to begin with... hehe...

Deprecated methods will be removed after beta
 2016-02-04 00:25:37 -08:00
Nick 8c1eaddb97 Rewrite Binding system to be fully automated 
No more manual handling of binding items to players. Retains all previous functionality.

I have tested on both the Client and Server and it seems to work just fine. If any issues arise from this, do not hesitate to yell at me.

The deprecated methods will be removed after beta.
 2016-02-03 23:14:26 -08:00
Nick e219b50589 Config option for Goggles upgrade 2016-02-03 20:41:41 -08:00
Nick c1aeb2e7f6 Thaumcraft Goggles upgrade for Living Helmet 
Combine a Living Helmet with an undamaged Goggles of Revealing in an anvil (+1 level) to combine the two. Currently no way to split afterwards.

Thoughts:

- Tweak level requirement to be higher? 1 was chosen in order to make it work.
- Require full set of armor to be worn? This would keep it in line with all the other upgrades.
- I only used the full Thaumcraft jar because the uploaded API is a zip which does not work as a Gradle library.
 2016-02-03 20:31:09 -08:00
WayofTime d9f58ceb1e Added Haste Sigil array (not implemented). First attempt at making AreaDescriptor an Iterator<BlockPos> 2016-02-02 18:16:55 -05:00
Nick 271be45871 Blacklist routing nodes from Teleposer 2016-02-01 18:07:06 -08:00
Nick 7e8b469349 Allow rituals to be disabled via config (#545) 
Not automated like the old method, but works. Requires an MC restart. Might look at making it reload-able while ingame at a later date.
 2016-02-01 17:05:39 -08:00
Nick d60f07f1c0 OBJ Models for Incense Altar + Soul Forge render 
TODO -

* Fix screwy rotation
* Fix z-fighting
* HellfireForge texture is broken
 2016-02-01 13:11:33 -08:00
Nick b6bdd0740c Fix method conflict for IImperfectRitualStone 2016-01-31 15:48:49 -08:00
Nick 60d44d7f89 Completely bypass enabled ritual map 
This should work, but just in case.
 2016-01-31 15:44:07 -08:00
WayofTime 932a767ecf Added the ability for the blood altar to have its buffer tanks accessed 2016-01-31 18:30:57 -05:00
WayofTime 8d6bc20400 Added magnetism sigil array and texture for the reagent. 2016-01-31 16:23:17 -05:00
WayofTime 27d63d5df3 Added blood lamp reagent, sigil effects, and the blood lamp array. 2016-01-31 14:31:16 -05:00
WayofTime 9839dccd04 Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2016-01-31 13:57:17 -05:00
WayofTime a9dae1b0d4 Fixed the demon will so that you can actually pick it up when you have no gem. Fix #587 2016-01-31 13:56:55 -05:00
Nick 5f16ed72f8 Swing arm when imperfect ritual activation is successful 2016-01-30 19:34:26 -08:00
WayofTime d5670b5f0e Fixed the bound sword so that it now drops weak blood shards. 2016-01-30 22:22:46 -05:00
Nick 007e415c36 Add IMC support for some API methods 2016-01-30 14:58:37 -08:00
Nick 2220cc1819 Fix Living Armor check NPE. Again. (#584) 
I reversed some logic. don't code when tired, kids.
 2016-01-30 12:17:52 -08:00
WayofTime 4bb7faabb1 Added the same ability to the Seer sigil. 2016-01-30 08:47:14 -05:00
WayofTime 820418558e Fixed Blood Light particles being purple. Added ability for the Divination Sigil to look at information of the incense altar 2016-01-30 08:44:49 -05:00
WayofTime 690cf6c4f3 Added recipes and block textures to the path blocks. 2016-01-30 07:58:08 -05:00
WayofTime 8d854a5b69 Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2016-01-30 06:46:01 -05:00
Nick 608cc3d2b8 Fix Living Armor check NPE (#583) 2016-01-30 01:39:23 -08:00
WayofTime 6575c97aa5 Made it so the incense altar needs a minimum number of roads in order to reach specific tiers. Added as a bandaid measure for setting tiers. 2016-01-29 21:33:29 -05:00
WayofTime eaba4e6cc2 Made it so that Demon Will will be voided if the player's tartaric gems are all full. 2016-01-29 21:19:59 -05:00
WayofTime 219b997b24 Decreased effect of looting for the Sentient Sword. Allowed the sword to attack when deactivated. Allowed blocking with the sword. 2016-01-29 21:08:30 -05:00
Nick e0fcf10a1b Minor Living Armor cleanup 2016-01-28 22:37:19 -08:00
Nick d769ee2d37 Repackage living armor upgrades and trackers 
all the organizations
 2016-01-28 14:56:49 -08:00
Nick a408f9a959 Rituals now react to redstone 2016-01-28 14:54:32 -08:00
Nick 5b05a175bb Un-nerf Ritual Stone recipe to provide 4 again (#580) 2016-01-28 13:22:38 -08:00
WayofTime cc1e11f09f Added some rudimentary path blocks for the tranquility altar - textures pending. 2016-01-26 19:39:39 -05:00
WayofTime f4d0b18521 Added more infrastructure to the incense system. 2016-01-26 14:33:02 -05:00
WayofTime 1242fefc30 Added sentient armour gem recipe. Added ability for Tartaric gems to fill other gems. 2016-01-26 07:56:17 -05:00
Nick Ignoffo 895413f0f0 Merge pull request #567 from Arcaratus/1.8-Rewrite 
Fixed up Bound Sword
 2016-01-25 13:23:30 -08:00
Nick 58144d67eb Don't log all registered compression recipes 
The amount is fine, but avoiding spamming console is preferable.
 2016-01-24 17:50:15 -08:00
Nick 0209b3f98d Fix Imperfect Rituals not working 2016-01-24 17:47:22 -08:00
Nick ad296a8e0e Fix client always reporting 0 LP 2016-01-24 17:47:11 -08:00
WayofTime de08e5d0ac Fixed crash when activating rituals on servers. 2016-01-24 06:54:46 -05:00
WayofTime c8ded3c6dd Added more framework for the incense altar. 2016-01-23 21:18:06 -05:00
Nick fd29ac8e7f Tiles of the same type are no longer reset on telepose (#576) 2016-01-23 17:20:55 -08:00
WayofTime 574c995865 Added a bit of framework for the incense system. 2016-01-23 16:25:39 -05:00
Nick 50bd8514ee Allow mods to blacklist their blocks from Green Grove 2016-01-23 00:32:10 -08:00
Nick f7682e5c29 Forgot to blacklist the new NBT tag for bindables 2016-01-23 00:20:21 -08:00
Nick 2d6b4611ef Attempt 2 at fakeplayer lookup fix 
Removes the name checker and is now based on class names.
 2016-01-22 17:19:01 -08:00
Nick 4b9eaa90d8 Should fix the Sacrifice Pack fakeplayer lookup 2016-01-22 16:06:48 -08:00
Nick a769e9d0a7 Make sure sacrifice packs don't store more than capacity 2016-01-22 02:21:10 -08:00
Nick 3920e0926f Allow slight configuration of Coat of Arms conversion 
Gives modpacks control while still retaining a bit of balance.
 2016-01-21 12:54:46 -08:00
WayofTime b8079bb509 Added multiple router filters and made sure that they are able to work properly. Textures and localization completed. Added a recipe for a consumable "frame" - more of these gating materials to be added. 2016-01-21 15:53:37 -05:00
WayofTime 6c91865c5e Added max transfer amount to filter transfer argument. 2016-01-21 10:57:52 -05:00
WayofTime 8b6787b27c Converted the Master Routing Node so that it would use a TreeMap instead of a HashMap for sorting. Modified TestItemFilter so it actually worked without exceptions. 
Added default item filter which allows all items through.
 2016-01-21 10:45:45 -05:00
Nick 8f17953b97 Forgot to add to config GUI 2016-01-19 19:53:32 -08:00
Nick 073873960c Allow modifying of entity sacrificial values 
Done via API or Config. API values take precedence over Config values.
 2016-01-19 19:46:49 -08:00
WayofTime fa15499388 Added particles to the Blood Altar. 2016-01-19 22:03:46 -05:00
Nick 470b5fce9c Those constants shouldn't be there or used 
Also notes last commit in changelog
 2016-01-19 02:34:49 -08: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
WayofTime 2a028414b1 Temporary bandaid of bandaids. 2016-01-18 18:55:51 -05:00
Nick 780dcdf7be Additional information for Altar JEI handler 
Hover over the altar image to view Consumption and Drain rates.
 2016-01-17 18:16:17 -08:00
WayofTime 01fcec9a8c Added a GUI to the master routing node to get a feel for what the routing system will be like. It's... WIP. 2016-01-17 21:00:48 -05:00
Nick e2a766aa79 Block bounds for the nodes + cleanup 
AFAICT, the `shouldConnect` method works just fine like this.
 2016-01-17 00:58:12 -08:00
Nick a9eb6a7b3b Disable ritual checking for enabled map 
Does not work. Need to re-think. I swear I did this earlier.
 2016-01-17 00:06:53 -08:00
WayofTime 7250dc8126 Reinitialized filter after fixing iterator. 2016-01-16 20:43:40 -05:00
WayofTime f1301f65d4 Removed filter code so that the CME would not occur until fixed. 2016-01-16 20:27:26 -05:00
WayofTime 1a908d64c6 Patch fix for concurrent modification exception 2016-01-16 20:11:25 -05:00
Nick c5b48ab59f Retain order of provided wills in JEI + only display valid will containers 2016-01-16 12:48:07 -08:00
WayofTime 815faa2ced Added routing filters as well as recipes and temp textures. 2016-01-16 11:10:58 -05:00
WayofTime 76dceb3534 Tinkered with the beam a bit. Added WIP models for the routing nodes. Added basic item routing node. 2016-01-15 21:53:55 -05:00
WayofTime 9159ff8330 Working through Vazkii's "fixes" 2016-01-15 19:59:00 -05:00
WayofTime 2c666a931e Now with fancy output blocks 2016-01-15 19:36:44 -05:00
WayofTime 07c138710c Fixed beam rendering so that it doesn't call Gl11 directly unless necessary. 2016-01-15 15:44:20 -05:00
WayofTime 4fe7439a61 Attempted to add some fancy rendering for the connections between nodes. 2016-01-15 15:06:03 -05:00
WayofTime 33ba7cc38f Iiiiinnnnnnnnnntegeeerrrrrrr 2016-01-15 06:44:26 -05:00
WayofTime e888907350 Fixed the LivingArmourHandler for defense so it no longer ate armour. 2016-01-15 06:24:10 -05:00
WayofTime 6a6369d08e Got the routing working to a safe degree. 2016-01-14 15:03:13 -05:00
WayofTime 652b6a45fd Initial framework for the item routing is completed 2016-01-14 14:11:16 -05:00
Nick eaefd89287 Remove potion array extending 
It's already patched by Forge to be 256.
 2016-01-14 09:34:21 -08:00
WayofTime a895809274 Added packet handlers, guis, etc required to handle the routing nodes. Added the ability to have a different filter for each direction. 2016-01-14 11:06:50 -05:00
WayofTime ac919c7882 Implemented ghost items for the inventory - will be adjusted. 2016-01-14 08:27:09 -05:00
WayofTime ec7676a69c Potential fix for a bunch of stuff that required the use of UUID -> username lookup on servers. This fix adds an extra tag to the NBT of items so that it caches the username of the owner. The UUID is still stored on items, but is not used client-side. 2016-01-13 19:59:28 -05:00
Arcaratus 81ba1ef3e1 Fixed up Bound Sword 
Fixed Bound Items charge bar bug
 2016-01-13 19:48:34 -05:00
Nick 14459ddc69 This call was not as redundant as I thought hehe 2016-01-13 16:35:38 -08:00
WayofTime 2b9cede308 Beginning work on the Master Routing Node 2016-01-13 19:32:50 -05: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 9aac50542b Implemented a test filter - hasn't been tested! :D 2016-01-12 21:17:26 -05:00
Nick Ignoffo d4f8844660 Merge pull request #565 from Arcaratus/1.8-Rewrite 
More rituals
 2016-01-12 17:51:51 -08:00
Arcaratus 203a48d526 More rituals 
More rituals

Comment out unimplemented portion

some thing useful

Renamed to something more useful
 2016-01-12 20:51:05 -05:00
Nick 18280786d9 Add a description for the Demonic Will 
Displays when looking up a recipe in JEI.
 2016-01-12 16:50:18 -08:00
WayofTime 269459c5c5 Added a lot more framework for the node routing. 2016-01-12 17:05:56 -05:00
WayofTime 1b6e3442ae Fixed movement upgrade stat tracking. 2016-01-12 12:38:51 -05:00
WayofTime 8b0756e9da Added routing nodes and a bit of infrastructure - not even working yet. 2016-01-12 12:23:26 -05:00
Nick 9950b32d53 Fix Sigil of the Phantom Bridge 
I'm tentatively considering this fixed. I'd rather not do it this way, but it seems to work...
 2016-01-11 13:36:07 -08:00
Nick 0d70eb359e Fix spectral block NBT writing 2016-01-11 13:03:22 -08:00
Nick cf19823855 Hide upgrade tomes from JEI unless they are max level 2016-01-11 12:28:08 -08:00
Nick 7f434d7f3e Temporary (?) durability bar for will full-ness 2016-01-11 02:05:08 -08:00
Nick 20ca21a2c9 Remove loading with 1.8.8 
We are no longer compatible with 1.8.8 due to the usage of `IRenderFactory` which was added in a 1.8.9 Forge release.
 2016-01-10 17:09:18 -08:00
WayofTime 63783ed8ed Fixed upgrade localization in ItemLivingArmour 2016-01-10 19:27:13 -05:00
WayofTime 1abae8e4ee Implemented the ItemMeshDefinition for the Sentient Sword, allowing for me to make the sword enchantable while still allowing the texture to change. This may be expanded to other items. 2016-01-10 18:31:48 -05:00
Nick cb77b7821f No more mutli-line descriptions 
We have a method for this
 2016-01-10 14:37:47 -08:00
Nick 5e1a38b271 Fix calls to deprecated model registry methods 2016-01-10 14:34:01 -08:00
WayofTime ebdc069563 Tweaked Sentient Sword will drop rate 2016-01-10 08:37:26 -05:00
Nick 55b91d0083 Standardize BloodStone/Crystal variant names 2016-01-09 22:40:18 -08:00
Nick a907edca48 Cleanup proxy 2016-01-09 22:05:03 -08:00
Nick 254d9bec80 Prepare ICompatibility for phase based loading 
Some compat will need to be done at different loading phases. This should allow that to be handled fairly easily.
 2016-01-09 20:41:01 -08:00
Nick de5ca8dfee Cleanup the tooltip for the Upgrade Tomes 2016-01-09 19:46:15 -08:00
Nick e8cb3dbb7d Forge recipes now display soul info via tooltip 
Hover over the arrow
 2016-01-09 19:45:34 -08:00
WayofTime ebdf85182c Added upgrade tomes to a separate creative tab. 2016-01-09 22:20:59 -05:00
Nick cf4a02bf89 Arcane Ashes should not stack + placement fixes 
Does not place when interacting with a block anymore. IE: opening a chest

Performs the arm swing if the placement is valid.
 2016-01-09 18:54:56 -08:00
Nick 351aa3e74c Implement Entity blacklist for WoS 2016-01-09 18:05:21 -08:00
Nick 9eee22affc Bound tools now use BlockStack 
Clean code is happy code
 2016-01-09 17:42:48 -08:00
Nick cdc045f7be Fix non-wildcard stem crops not harvesting 
protip: == != .equals()

who woulda known
 2016-01-09 17:38:23 -08:00
Nick d868414f5b Sigils now don't do their effect when accessing blocks 
Should solve #557
 2016-01-09 17:30:10 -08:00
WayofTime b3f965cbe3 Added Ritual of the Satiated Stomach 2016-01-09 18:51:55 -05:00
WayofTime c3b21fa223 Added Crushing ritual 2016-01-09 18:17:38 -05:00
WayofTime 4edc30db09 Changed the snare's proc rate, because it's always bad when you frustrate yourself while testing... 2016-01-09 17:30:48 -05:00
WayofTime db8586d4b7 Fixed lit redstone ore not being picked up. 2016-01-09 16:43:32 -05:00
WayofTime 487332ff8d Forgot a class (How does THAT happen?) 2016-01-09 16:37:20 -05:00
WayofTime 6560e6ec09 Added Magnetism ritual 2016-01-09 16:35:47 -05:00
WayofTime c26b7851a8 Added rudimentary saving for rituals 2016-01-09 15:31:30 -05:00
WayofTime 3edfc3a8ac Some work on the armour 2016-01-09 15:05:41 -05:00
WayofTime 4d835257ab Added Sentient Armour - not fully implemented. 2016-01-09 13:01:05 -05:00
WayofTime 61e6cf2a14 Renamed nomenclature to Demonic Will instead of souls - still missing a few spots 2016-01-09 10:47:36 -05:00
WayofTime 9eb49dd5a9 Added the recipe for the soul bow and the descriptions for the gems 2016-01-09 07:38:48 -05:00
Nick c50f15e124 Update mappings + cleanup SoulSnare render 
Removed some (seemingly) unnecessary code from RenderEntitySoulSnare
 2016-01-09 02:12:48 -08:00
Nick 34e6350cbc Add handlers for "tall" and "stem" crops 
Documentation for all harvest-y stuff as well.
 2016-01-09 01:54:25 -08:00
Nick 4a9d37f8b3 Remove debug print from ritual activation 2016-01-09 01:42:50 -08:00
WayofTime 1d6edae50e Added infrastructure and rendering for the Soul Arrow. 2016-01-08 22:20:31 -05:00
Nick 22a0e2b8a9 Swap the order of BloodStoneBrick 
Now matches the Crystal blocks
 2016-01-08 18:59:30 -08:00
Nick 70f9b9f101 Fix Teleposer and Soul Forge dropping items on break 2016-01-08 18:30:49 -08:00
WayofTime c5dec61351 Added Soul Bow textures and localization, as well as rudimentary function. 2016-01-08 21:05:13 -05:00
Nick 9329dd12f4 All soul containers show work for lookup in JEI now 2016-01-08 17:50:12 -08:00
Nick f1f8010edc First pass at Soul Forge JEI compat 2016-01-08 17:09:44 -08:00
Nick 1171861785 Fix javadoc compile issues 2016-01-08 16:36:07 -08:00
Nick be30f7d92e Fix Teleposition Focus localization 2016-01-08 16:14:45 -08:00
Nick 92d633626e Fix Plantable harvest handler 2016-01-08 16:14:27 -08:00
WayofTime 6565dae4aa Added moar recipes for the soul forge. 2016-01-08 17:17:33 -05:00
WayofTime 0e2a3f63a2 Added filled soul gems to creative tab. 2016-01-08 16:34:43 -05:00
WayofTime 36846e8952 Tentatitively added the other soul gems 2016-01-08 16:19:24 -05:00
WayofTime fabf63b856 Fixed Soul Gem leaving monster souls with 0 charge left in them. 
Added a few recipes to the Soul Forge.
 2016-01-08 15:31:55 -05:00
WayofTime 74718f5042 Added the Soul Snare renderer and recipe and basically everything soul snare 2016-01-08 14:56:36 -05:00
WayofTime c015e3421f Fixed toggleable sigils not binding. 2016-01-08 11:06:07 -05:00
WayofTime aee58c487c Satiated Kinnison's rage 2016-01-08 10:32:55 -05:00
WayofTime 16a50f7144 Finished non-rendering components for the Soul Forge. 2016-01-08 10:27:26 -05:00
WayofTime 7b8646659a Added SoulForgeRecipe (basically a modified ShapelessOreRecipe, so is compatible with the oredictionary), and worked on the shift-clicking into the inventory. 2016-01-08 09:12:31 -05:00
Nick 5744d19ca9 Implement Harvest Ritual 
Currently only a handler for standard crops (wheat, carrots, etc) is implemented.
 2016-01-08 00:32:03 -08:00
WayofTime 39015f05a6 Changed Soul Forge Gui texture 2016-01-07 22:40:04 -05:00
Nick 3bb5172bce Fix altar rendering in altar 
...and item frames
 2016-01-07 19:00:05 -08:00
Nick b34dbfbe4e Fix and nerf Coat of Arms 
It was a bit broken. (~2000 LP for killing a zombie >.>) We'll see how it goes now.
 2016-01-07 18:15:23 -08:00
Nick 978e50a42e Cleaned up lots of localization 2016-01-07 15:52:02 -08:00
Nick 5c7af4f039 Update JEI compat 
isModLoaded() has been deprecated for quite some time and was finally removed in a recent version.
 2016-01-07 15:38:12 -08:00
WayofTime fec2236114 Worked on Soul Forge GUI and container. GUI texture is VERY WIP and the slot locations as well as the progress par will change. Don't work on it >:3 2016-01-07 18:05:23 -05:00
WayofTime 8b024e1703 Added Soul Forge block and WIP model 2016-01-07 16:36:52 -05:00
WayofTime 72ed003da1 Added a lot of soul stuff. 2016-01-07 12:59:46 -05:00
WayofTime 45870812d4 Added a few of the necessary items to start the soul system. 2016-01-07 11:01:38 -05:00
WayofTime f379351e88 Added animal growth ritual. 2016-01-07 08:04:59 -05:00
WayofTime 828edf298e Added "Trick Shot" upgrade to the armour - when trained, your bow will shoot more than one arrow. 2016-01-06 22:07:17 -05:00
WayofTime 6abffeb51a Added temp recipes for T5 orb and demonic activation crystal. 2016-01-06 21:30:57 -05:00
WayofTime 82ac4f5ae8 Added melee damage upgrade (Fierce strike) 2016-01-06 21:26:51 -05:00
WayofTime 65e0cea9af Added health boost upgrade - trained by healing. 2016-01-06 19:55:51 -05:00
WayofTime 6dedb234fb Added Physical Protection upgrade. Reorganized some of the upgrades. 2016-01-06 19:34:10 -05:00
WayofTime 72ac385861 Added necessary framework for damage reduction upgrades. 2016-01-06 07:13:56 -05:00
WayofTime b736fd3eaa Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2016-01-05 18:27:55 -05:00
WayofTime 08b6d10cb9 Work on stuff needed for damage upgrades. 2016-01-05 18:27:51 -05:00
Nick c3beb48499 Implement BlockStack in Teleposer related areas 2016-01-05 15:26:24 -08:00
WayofTime 31d41d06ab Added KB resistance upgrade 2016-01-05 18:06:07 -05:00
WayofTime 1a7ae8d99c Fixed API referencing the main mod. 2016-01-05 16:50:43 -05:00
WayofTime 35b67b6055 Temporarily removed some checks for the alchemy array 2016-01-05 14:52:04 -05:00
WayofTime f4baaedfab Fixed the life essence bucket recipe. 2016-01-05 13:48:44 -05:00
WayofTime b74ed8d431 Added self-sacrifice upgrade to living armour. 2016-01-05 12:17:05 -05:00
WayofTime dceec15750 Added the unlocalized name to upgrades, and changed it so the armour lists the upgrades. 2016-01-05 11:12:56 -05:00
WayofTime f4abee84ef Reorganized fix for the Lava Crystal 2016-01-05 10:41:23 -05:00
WayofTime fbaf5de9ab Added poison upgrade. Tweaked digging upgrade so it actually worked. 2016-01-05 10:29:50 -05:00
WayofTime 04f5b7a584 Fixed client-side issue when shift-clicking lava crystals into a furnace while on a server. 2016-01-05 09:19:26 -05:00
WayofTime 0d7f0cb6cf Added the recipe for the Air reagent and changed the recipe for the apprentice blood orb to use a redstone block. Emeralds are herd. 2016-01-04 16:09:22 -05:00
WayofTime 80a9380e71 Finalized more for the digging upgrade. 2016-01-04 09:15:15 -05:00
WayofTime cbc2dfbc6d Improved speed upgrade 2016-01-04 08:55:57 -05:00
WayofTime c18f1abbd5 Added localization and textures to the Living Armour 2016-01-04 08:27:43 -05:00
WayofTime 9a48eb9ff3 Temporarily replaced Divination Sigil recipe due to issues with it not working on the servers. 2016-01-04 08:02:10 -05:00
WayofTime 6ea5e8279f Added in rendering for LP for the Blood Altar. 2016-01-03 23:16:43 -05:00
WayofTime 10e29c56ba Added Life Essence bucket recipe 2016-01-03 22:15:48 -05:00
Nick 9c25ff38a6 Update JEI compat 2016-01-03 15:51:54 -08:00
WayofTime 52a067e845 Possible fix for Alchemy Arrays not working on servers. 2016-01-03 18:40:58 -05:00
WayofTime 00adb96931 Added digging stat tracker and upgrade to Living Armour. Added chat message for when the armour upgrades. 2016-01-03 15:39:59 -05:00
WayofTime f0331b4d4d Added speed upgrades to Living Armour 2016-01-03 14:12:55 -05:00
WayofTime 81edc58769 Fixed bound tools so multiple players can actually use them... :D 2016-01-03 09:23:13 -05:00
WayofTime dc0925c5a6 Improved Bound tools. Made them actually use LP! 2016-01-03 08:56:31 -05:00
WayofTime ae14eac769 Fully fixed teleposer offset. 2016-01-03 08:40:10 -05:00
WayofTime 14d3a1ec7e Fixed #541 
Fixed #542
 2016-01-03 08:30:59 -05:00
WayofTime 4e696bcf7b Supposedly fixed an offset error in the teleposer. 2016-01-03 07:49:29 -05:00
Nick 1cc9d3a4c8 Fix altar insta-break-ness 2016-01-03 00:00:09 -08:00
Nick a6b243e190 Altar maker notifies of creative only-ness 2016-01-02 23:58:57 -08:00
Nick 5a1de15e42 Bound items can be used for crafting 2016-01-02 23:41:26 -08:00
WayofTime 34335d66cc Added Living Armour stat tracker for movement. Implemented necessary methods for the armour. 2016-01-02 22:04:51 -05:00
WayofTime 1c75d4f648 Fixed Sided issue in PlayerHelper - caused crashes in SMP. 2016-01-02 18:52:45 -05:00
WayofTime 71421b7d88 Formatted the code - Release state for Blood Magic 1.8.9-2.0.0-1 2016-01-02 17:56:37 -05:00
WayofTime d1ff8c6d4f Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2016-01-02 17:34:49 -05:00
WayofTime 15cf8a94ae Added Master Blood Orb recipe. Tweaked drain/filling rate for orb crafting. 2016-01-02 17:34:30 -05:00
Nick ae3f5ddf3f Hide Orb filling recipes from JEI 2016-01-02 14:34:15 -08:00
Nick 5eabf5b009 Remove Test ritual and disable ImperfectRitualDay 2016-01-02 14:31:56 -08:00
WayofTime 1330b1608c Removed efficiency rune recipe for now. 2016-01-02 17:27:37 -05:00
WayofTime eda6e76250 Fixed a few tooltips. Added Teleposer recipe. 2016-01-02 17:22:42 -05:00
Nick 0670585aa4 Water/Lava Rituals/Sigils now place flowing variants of the liquid 2016-01-02 14:21:38 -08:00
WayofTime d5e28038d6 Repriced rituals. 2016-01-02 17:15:33 -05:00
WayofTime 9678260043 Removed ShapedOrb recipes temporarily. 2016-01-02 17:12:39 -05:00
WayofTime f27ee1aeb4 Added some extra framework for Living Armour. 2016-01-02 17:07:11 -05:00
Nick 5273a85711 Fix crash when Waila is not present 2016-01-02 12:46:44 -08:00
WayofTime 2a13998ed0 Fixed a few recipe issues. 2016-01-02 08:03:41 -05:00
Nick a17e9be1cf PropertyString uses generics now 2016-01-01 20:24:16 -08:00
Nick e157a68696 Orb filling recipes 2016-01-01 19:59:10 -08:00
Nick 6351fd2d3e Waila data provider for rituals 2016-01-01 19:04:53 -08:00
Nick 8b3c91d77e Sync MRS NBT to client 2016-01-01 19:04:40 -08:00
Nick fa030a1d43 Add an unlocalized name to Imperfect Rituals 2016-01-01 18:54:58 -08:00
Nick 18c1ccae80 Fix SoulNetwork lookup via UUID 2016-01-01 18:54:39 -08:00
Nick 2eaa9bf578 Hey look, the actual compat classes... >.> 2016-01-01 15:41:01 -08:00
Nick cb929a93b6 WAILA compatibility 
Currently has handlers for Teleposers and Blood Altars
 2016-01-01 15:40:04 -08:00
WayofTime 318e3a03c7 Added Charging rune and associated necessities, such as having the Seer's Sigil detect total charge. 2016-01-01 17:36:50 -05:00
Nick 142cefd9be Attempt #1 at orb recipe handlers 
They do not work, they are not initialized.

i need a break. my brain hurts
 2016-01-01 13:47:17 -08:00
WayofTime b170654ed3 Implemented recipes and arrays for Suppression sigil. 2016-01-01 15:46:40 -05:00
Nick a48e40684a Recipes now use OreDict 2016-01-01 12:33:55 -08:00
Nick e5a90c5e7f Add a way to hard blacklist Blocks from the Teleposer 
The blocks in this list cannot be changed via config file. The two lists are kept (instead just one) so that the config one can be refreshed at any point with ConfigChangedEvent.
 2016-01-01 12:33:42 -08:00
Nick ad68a89f15 React to ConfigChangedEvent 2016-01-01 12:33:26 -08:00
WayofTime d0ed994abb Added Divination sigil array. 2016-01-01 14:24:59 -05:00
WayofTime c42bc12e69 Added the Regeneration ritual. Added localization for ritual activation. Removed the cost of activating a ritual when in creative mode. 2016-01-01 13:59:56 -05:00
Nick e0111d4f7e Remove fancy render check from RenderAltar 
Not even Vanilla does those "fast" item renders anymore.
 2016-01-01 10:54:07 -08:00
Nick 7ebd59382f Javadoc warning cleanup 2016-01-01 10:52:42 -08:00
Nick d4b5d3d3e2 Add compat category to Config gui 2016-01-01 10:16:19 -08:00
WayofTime 400161f787 Potentially fixed Javadocs 2016-01-01 13:14:49 -05:00
WayofTime dc444d97ae Added base array texture. Modified Arcane Ashes recipe. 2016-01-01 12:57:51 -05:00
Nick 1ea5de0ed1 Re-implement the Teleposer Blacklist 2016-01-01 09:29:35 -08:00
Arcaratus a8a0ae6e8b Teleposers and refractoring 2016-01-01 12:08:17 -05:00
WayofTime 1b9f72b494 Added Arcane Ashes to draw alchemy arrays. 2016-01-01 11:54:44 -05:00
WayofTime adef7f1ce9 Added Item Renderer to Altar. 2016-01-01 09:03:21 -05:00
WayofTime eb18618eab Merge pull request #532 from the-vindex/1.8-Rewrite-comment-fixes 
Comment fixes
 2016-01-01 07:44:26 -05:00
WayofTime 3dbe281861 Merge pull request #530 from the-vindex/1.8-Rewrite 
Eclipse and IDEA formatting and code clean up
 2016-01-01 07:44:19 -05:00
Vindex e8b4e6f2c0 Comment fixes 2016-01-01 10:34:17 +01:00
Vindex fa24ea4118 Eclipse and IDEA formatting settings and Prevent reformatting 
EnumAltarTier so that IDEA doesn't mess with it
 2016-01-01 10:12:14 +01:00
Nick a2e77adbff Fix LavaCrystal NPE 
When attempting to place an unbound Lava Crystal into a furnace, it would crash when looking for the bound player because... well... it was unbound... :D
 2016-01-01 01:06:56 -08:00
WayofTime 65d75313cb Now causes nausea when passive operations (such as rituals or the Lava Crystal). 
Added the Lava crystal model.
 2015-12-31 20:47:01 -05:00
WayofTime 6fb409f20f Fixed the Soul Network and made sure the majority of the items worked on it. 2015-12-31 20:10:57 -05:00
WayofTime 241c0b8dda Added the Ritual of the Feathered Knife 2015-12-31 19:11:58 -05:00
WayofTime 7eee77ffe1 Added Dusk and Dawn ritual diviners. Finished the majority of diviner logic. 2015-12-31 16:31:01 -05:00
WayofTime 9a610cc023 Implemented Well of Suffering. Tweaked AreaDescriptor slightly. 2015-12-31 16:01:47 -05:00
WayofTime e8d1ff4997 Reformatting with Vindex's magic 2015-12-31 13:50:38 -05:00