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

884 commits

Author SHA1 Message Date
WayofTime c6f9c04411 Fixed global ignore list so .obj files could be pushed. 2016-02-06 17:50:33 -05:00
WayofTime ea988e3f58 Fixed mtls 2016-02-06 17:42:10 -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
Nick 34afee6dfb Better readability for large numbers 
Also updated changelog with everything I've been doing
 2016-02-04 18:31:22 -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 7532a982d4 Fix 3rd person model for tools 
+Bound Sword -> Bound Blade
 2016-02-04 18:10:48 -08: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
WayofTime 1bc36b55e5 Removed .png files that were not likely to be used. They will be readded if I ever find a need for them. 2016-02-04 07:12:38 -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
Nick 332e16a585 Fix OBJ loader spam for Hellfire Forge 2016-02-02 16:32:32 -08:00
Nick 8ab985399c Fixed Hellfire Forge + Incense Altar models 
Hellfire Forge has a bit of z-fighting on the corners, still.
 2016-02-02 16:25:15 -08:00
WayofTime d7385c9927 Fixed the Hellfire forge .obj. .mtl needs to be repaired for the Incense Altar and Hellfire Forge. 2016-02-02 18:56:25 -05:00
WayofTime ce4e69d702 Fixed BlockIncenseAltar.obj. Apparently the rotation around the x axis is inverted 2016-02-02 18:34:39 -05: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 6b6c78477c Update mcmod version 2016-02-01 14:53:29 -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
BBoldt 8344c3eba3 Yulife - Forge, Altar, Slates, small tweaks 2016-01-31 12:29:56 -08: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
BBoldt 9e44fcbaad Yulife - Sentient Armor + blood shards 2016-01-28 18:46:16 -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
BBoldt c953228585 BBoldt - Sentient Armor, soul forge gui tweaks 2016-01-26 02:31:54 -08:00
BBoldt 9aaf981092 Yulife - Sentient Bow & Arrow, Routing stuff, living armor 2016-01-25 23:56:59 -08: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 2ffd6c144a Cut down on the amount of model spam 
Just 2 bad ones left:

* AlchemyArray (need to render the TESR for item)
* Test Spell Block (this is going away I think so not a huge deal)
 2016-01-23 01:26:53 -08: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 Ignoffo 34d24c85dc Merge pull request #569 from wlhlm/update-german-translation 
Update German translation
 2016-01-17 12:35:58 -08: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