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

888 commits

Author SHA1 Message Date
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