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

889 commits

Author SHA1 Message Date
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
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 08e8ebf724 Fixes we can believe in! 2016-01-15 20:06:52 -05:00
WayofTime 9159ff8330 Working through Vazkii's "fixes" 2016-01-15 19:59:00 -05:00
Vasco Lavos 2a429239a1 Fix fix! 2016-01-16 00:56:59 +00:00
Vasco Lavos 09153b1742 Update beam.frag 2016-01-16 00:46:47 +00: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
Nick b70c71f7be Remove all the old model and blockstate files 2016-01-14 21:24:24 -08:00
Wilhelm Schuster 7a98074e39 Update German translation 2016-01-15 02:10:02 +01: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 Ignoffo 2d382ffaa9 Merge pull request #562 from BBoldt/1.8-Rewrite 
Blood Orb fixes, soul gems, and soul snares
 2016-01-11 01:43:18 -08:00
BBoldt 616d762150 Yulife/Inap's Blood Orb fixes, Soul Gems, and Soul Snare 2016-01-11 01:38:36 -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
WayofTime 1857f8785b Fixed localization inconsistencies 2016-01-10 07:26:50 -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 fadd87707f Fix MC version in mcmod.info 2016-01-09 18:49:19 -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 2bea6213b7 Hey look a texture 2016-01-08 17:33:18 -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
WayofTime a9feeade13 Merge pull request #552 from BBoldt/1.8-Rewrite 
Scribe tips, activation crystals, soul stuff
 2016-01-08 06:55:24 -05:00
BBoldt fbd0895436 just the tips, activation crystals, soul stuff 
-- Tips added to scribe tools
-- Spookier soul sword
-- New activation crystals
-- Spooky soul gem
 2016-01-08 01:42:35 -08: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
WayofTime 9254ffd46d Merge pull request #550 from BBoldt/1.8-Rewrite 
textures and fixes from Inap
 2016-01-07 22:26:44 -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