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

721 commits

Author SHA1 Message Date
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
Vindex 17e814785e AreaDescriptor now returns unmodifiable collection 2015-12-31 18:11:19 +01:00
WayofTime 417114b6f0 Redefined the bounding for AreaDescriptor - it is now inclusive for the minimumOffset but is exclusive for the maximumOffset. 2015-12-31 11:25:24 -05:00
WayofTime 63da257260 Fixed AreaDescriptor and edited the Jumping ritual slightly. 2015-12-31 10:05:38 -05:00
WayofTime f56261e766 Merge pull request #527 from Arcaratus/1.8-Rewrite 
Jumping Ritual
 2015-12-31 09:32:53 -05:00
Arcaratus 23051088da Jumping Ritual 
Patch
 2015-12-31 09:06:58 -05:00
WayofTime a0546c6c27 Fixed improper import. 2015-12-31 08:59:10 -05:00
WayofTime d7a96c061d Added getNewCopy() to Ritual to allow tiles to hold their own copy of a Ritual. Created caching in AreaDescriptor for faster BlockPos access. 2015-12-31 08:01:39 -05:00
Arcaratus 2966f93260 New AreaDescriptor tryout 2015-12-30 20:22:39 -05:00
WayofTime 1d42ef50c3 Merge pull request #525 from Arcaratus/1.8-Rewrite 
Recipes commit
 2015-12-30 17:46:28 -05:00
Arcaratus 07097c00a9 Recipes commit 
Fix
 2015-12-30 17:26:40 -05:00
WayofTime 8b582bc0c4 Added better method for creating a range for a ritual. 2015-12-30 16:19:50 -05:00
WayofTime e48eedb874 Changed formatting to have bracing on a new line 2015-12-30 15:34:40 -05:00
WayofTime e5eddd6c45 Finished fixing issues in the rituals. Added an initial system for setting a boundary for an effect in a ritual. 2015-12-30 15:24:25 -05:00
WayofTime 27fa98b3cd Fixed improper import. 2015-12-30 12:29:19 -05:00
WayofTime 98ca2fbd16 Implemented the Ritual Diviner and added its recipe. Added unlocalized name to rituals. Removed a few unnecessary imports. 2015-12-30 11:34:04 -05:00
Nick c815960f5e Update for 1.8.9 
Update JEI for 1.8.9 as well.

Move recipe related stuff to ModRecipes class.
 2015-12-29 21:30:48 -08:00
Nick e16017bd56 JEI support for Binding/Alchemy Array recipes 
Needs pretty-fying
 2015-12-29 16:11:34 -08:00
WayofTime 7b69251713 Added shaped/shapeless orb recipes. 2015-12-29 18:30:36 -05:00
Nick fcc8f6153a Fix NPE when checking held item 2015-12-29 15:09:56 -08:00
WayofTime 46f3e7573e Added recipes for bound weapons. Created temporary recipe for the Binding Reagent. 2015-12-29 17:47:12 -05:00
Nick f09cf5d018 Fix javadoc compile errors 2015-12-29 13:37:54 -08:00
Nick 5774703c0d Ritual docs 2015-12-29 13:00:26 -08:00
Nick 1c8d6d6986 Allow rituals to specify an update time. Default is 20 2015-12-29 12:32:06 -08:00
Arcaratus aa0f7d81a0 Bound tools 
Fix errors

Fix

Fix

Patch

Patch
 2015-12-29 14:56:32 -05:00
WayofTime 6c6d8067bf Fixed the rituals. Thanks, AlgorithmX2! 2015-12-29 14:22:33 -05:00
WayofTime 16a6333c6f Added the Ritual for Water and did some rudimentary tests. Issue: MRS does not load properly on world load. 2015-12-29 13:41:03 -05:00
WayofTime 0e1173ef5d Added directionality to rituals. 2015-12-29 09:10:03 -05:00
WayofTime 971d4c4d1e Fixed the ritual system so that it would properly validate the ritual from the list. 
Used the activation crystal's owner's LP to activate the ritual.
Removed some unnecessary imports.
 2015-12-29 08:44:34 -05:00
Nick 24058d7350 Move SoulNetwork to UUID system 
*Should* work correctly. As for all major changes, needs to be
thoroughly tested.
 2015-12-28 20:13:11 -08:00
Nick 8edb8a45e6 Fix build crash on Javadoc 2015-12-28 19:40:16 -08:00
Nick e7f5a1addf Fix @Nullable import 
@WayofTime, you want `javax.annotation.Nullable`, not
 2015-12-28 19:10:53 -08:00
Arcaratus b96725fe98 More sigils 
Deleted weird file
 2015-12-28 19:22:04 -05:00
Nick 0ec0570d1a Fix altar builder on servers 2015-12-28 14:27:59 -08:00
Nick beb85cf154 Generify 2015-12-28 14:04:34 -08:00
Nick e6354fb483 String lookup for ItemComponent 2015-12-28 13:50:32 -08:00
Nick 42c7162f3f Fix server startup crash 2015-12-28 13:43:26 -08:00