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

212 commits

Author SHA1 Message Date
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 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 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
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 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 815faa2ced Added routing filters as well as recipes and temp textures. 2016-01-16 11:10:58 -05: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 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
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
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
WayofTime 269459c5c5 Added a lot more framework for the node routing. 2016-01-12 17:05:56 -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 7f434d7f3e Temporary (?) durability bar for will full-ness 2016-01-11 02:05:08 -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
WayofTime ebdc069563 Tweaked Sentient Sword will drop rate 2016-01-10 08:37:26 -05:00
Nick de5ca8dfee Cleanup the tooltip for the Upgrade Tomes 2016-01-09 19:46:15 -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 9eee22affc Bound tools now use BlockStack 
Clean code is happy code
 2016-01-09 17:42:48 -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 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 1d6edae50e Added infrastructure and rendering for the Soul Arrow. 2016-01-08 22:20:31 -05:00
WayofTime c5dec61351 Added Soul Bow textures and localization, as well as rudimentary function. 2016-01-08 21:05:13 -05:00
Nick be30f7d92e Fix Teleposition Focus localization 2016-01-08 16:14:45 -08: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 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
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
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 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 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 80a9380e71 Finalized more for the digging upgrade. 2016-01-04 09:15:15 -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 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
Nick a6b243e190 Altar maker notifies of creative only-ness 2016-01-02 23:58:57 -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 71421b7d88 Formatted the code - Release state for Blood Magic 1.8.9-2.0.0-1 2016-01-02 17:56:37 -05:00
Nick 0670585aa4 Water/Lava Rituals/Sigils now place flowing variants of the liquid 2016-01-02 14:21:38 -08:00
WayofTime f27ee1aeb4 Added some extra framework for Living Armour. 2016-01-02 17:07:11 -05: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
WayofTime b170654ed3 Implemented recipes and arrays for Suppression sigil. 2016-01-01 15:46:40 -05:00
Nick 7ebd59382f Javadoc warning cleanup 2016-01-01 10:52:42 -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
Vindex e8b4e6f2c0 Comment fixes 2016-01-01 10:34:17 +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 7eee77ffe1 Added Dusk and Dawn ritual diviners. Finished the majority of diviner logic. 2015-12-31 16:31:01 -05:00
WayofTime e8d1ff4997 Reformatting with Vindex's magic 2015-12-31 13:50:38 -05:00
Arcaratus 23051088da Jumping Ritual 
Patch
 2015-12-31 09:06:58 -05:00
Arcaratus 2966f93260 New AreaDescriptor tryout 2015-12-30 20:22:39 -05:00
Arcaratus 07097c00a9 Recipes commit 
Fix
 2015-12-30 17:26:40 -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 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
WayofTime 46f3e7573e Added recipes for bound weapons. Created temporary recipe for the Binding Reagent. 2015-12-29 17:47:12 -05:00
Arcaratus aa0f7d81a0 Bound tools 
Fix errors

Fix

Fix

Patch

Patch
 2015-12-29 14:56:32 -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
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
WayofTime 9ce9c66fb9 Created the base items class, for items that are mainly just used in recipes. 
Created reagents to be used in array crafting and added the array recipes for the water, lava, void, green grove, fast miner, elemental affinity, sight and air sigils.
Fixed the textures for the Sight sigil and Fast Miner sigil.
 2015-12-28 15:59:35 -05:00
Arcaratus 5dff08380d Basic sigils implementation 2015-12-27 19:38:12 -05:00
Nick 03847ad6d9 Committing the Ritual stuff 
Incomplete. Ritual detection/rotation needs to be implemented. Currently hardcoded to a test ritual
 2015-12-26 16:49:25 -08:00
Nick 42d6c4b59b Whoops, forgot EtherealSlates 2015-12-02 16:28:07 -08:00
Nick 96d94721c4 Revamp altar to only use EnumAltarComponent 
- Removes internal references in API
- Makes full use of the idea of the API
- No more special checks
 2015-12-02 16:02:18 -08:00
Nick 7dd170e5ad Inscription Tools and Slates 2015-12-02 00:55:32 -08:00
Nick 437dc1b96e Tweaks to damage. It now uses the DamageSource correctly 2015-12-01 23:35:09 -08:00
Nick 305b5e165f Stop referencing deprecated method 2015-12-01 22:58:01 -08:00
Nick b97f7d81c4 Docs for NetworkHelper 2015-12-01 21:55:56 -08:00
Nick c4e6f63ada Cleanup javadoc and make it compile correctly 2015-12-01 21:14:26 -08:00
Nick ff055a33da Some cleanup 
Changed AltarMaker chat anti-spam.
Fixed formatting for AltarMaker messages
 2015-11-29 17:12:44 -08:00
Arcaratus 225016e030 Finished the Altar 2015-11-29 19:04:50 -05:00
Nick 44a5063f0b Sigils descriptions now correctly support formatting 2015-11-29 00:00:46 -08:00
Nick 34dee6447b A whole lot of formatting cleanup 
Also changes NBTHolder to a standard Constants class with subclasses for each category
 2015-11-28 18:25:46 -08:00
Nick cbd4f8c75f First pass on Pedestal/Plinth 
I just want this out of my uncommitted file list...
 2015-11-22 14:03:51 -08:00
Nick e0b073b8b7 Cleanup the SoulNetwork a bit. 
Should work now?
 2015-11-22 13:43:15 -08:00
Nick 9a6d8d6d60 Blood Letter's Pack + Coat of Arms 2015-11-11 10:45:46 -08:00
WayofTime 94fbedd39e Created ItemLivingArmour as a replacement for the Bound armour. Initial implementation completed. 2015-11-08 17:42:02 -05:00
Arcaratus 258e9a1108 Remove unnecessary ISigil implements 2015-11-07 21:45:03 -05:00
Arcaratus 0788bbd3b2 Remove unnecessary ISigil implements 2015-11-07 21:44:44 -05:00
Arcaratus 86fcd4808b Finished Water, Lava, and Void sigils 
Also added in bloodstone
 2015-11-07 21:37:12 -05:00
Arcaratus 2fc34a5138 Sacrificial Commit 2015-11-07 11:51:41 -05:00
WayofTime bf912ae03f Created the BlockRitualStone and had it implement IRitualStone. Created .json files necessary 
Created PropertyRuneType.
 2015-11-06 21:41:15 -05:00
Nick fa1bb906d3 Cleanup 2015-11-03 08:09:16 -08:00
Nick Ignoffo 081698c6f9 Merge pull request #490 from Arcaratus/1.8-Rewrite 
Finished the Altar
 2015-11-03 07:35:50 -08:00
Arcaratus ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00
Nick ed515f5c80 Air Sigil 2015-11-02 19:57:48 -08:00
Nick ac5402df6b Cleanup 
Renders for Runes
Creative crystal renders
Formatting
Lang additions
Some attempted (not successful) fixes for SoulNetwork
 2015-11-02 19:18:53 -08:00
Arcaratus 4734f1207a Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 
Conflicts:
	src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
 2015-11-02 21:35:23 -05:00
Arcaratus 75143520ed Pre-emptive things 2015-11-02 21:30:28 -05:00
Nick b59bc9766e Fix BlockRitualController's ItemBlock name 2015-11-02 15:55:17 -08:00
Nick 096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00