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

1288 commits

Author SHA1 Message Date
WayofTime 466f26d80b Readded the Sigil of Holding key ಠ_ಠ 2016-06-17 17:37:47 -04:00
WayofTime 4b221c2e5c Made it so that the bound tools are (supposedly more so) unbreakable. Fixes #793 2016-06-17 10:15:46 -04:00
WayofTime 145d7a5bc2 Fixed an issue where the Spectral Blocks (from the Sigil of Suppression) would return the liquid on the client side before the sigil was deactivated. Fixes #803 2016-06-17 10:00:33 -04:00
WayofTime e89cb61bf9 Fixed the Routing system so that it properly eliminates the connection to the Master node when the Master node is broken. Fixes #805 2016-06-17 09:55:30 -04:00
Nicholas Ignoffo 1d8a47ce1e Begin basic HUDElement system 
Need to allow moving and such by specifying a clickable area

Will probably have the element override getClickableArea() and return a default. We'll then set that to new values after being moved.
 2016-06-16 18:12:20 -07:00
WayofTime f043eb0fde Changed the recipe of the Sanguine Scientiem 
Properly incremented the mod version...
 2016-06-16 15:40:44 -04:00
Nicholas Ignoffo eceb0eab6e HUD element for Sigil of Holding 
Needs cleaning and configurability still

TODO: Move to HUDElement system that Hemomancy had.
 2016-06-15 20:23:15 -07:00
Nicholas Ignoffo f7179f6d6a Merge remote-tracking branch 'origin/1.9' into 1.9 2016-06-15 15:38:29 -07:00
qianzha 1fad9b6c39 Update zh_CN.lang (#795) 
* Update zh_CN.lang

Added things for updates.
Deleted some untranslated keys.

* Update zh_CN.lang
 2016-06-13 22:21:47 -07:00
Nicholas Ignoffo eee24309fa Fix Ritual Stones being silk touched (#797) 2016-06-13 18:21:14 -07:00
Nicholas Ignoffo 317989a737 Mark BucketEssence enum as deprecated 2016-06-13 18:19:56 -07:00
WayofTime da060639e9 Fixed #774, a bug that caused the Tome of Peritia to be wonky again. 2016-06-13 14:40:27 -04:00
Nicholas Ignoffo f99b21cffc Rewrite LP network data saving system 
Instead of creating a new file for each player with their UUID as the name, we create a single file and store it all in a List. That List gets converted to a UUID -> SoulNetwork map when read from the file.

MigrateNetworkDataHandler is used to migrate players from the old system to the new one. It reads both data files and sets the LP of the new network to the LP of the old network (if the old network is larger). Once conversion is done, we delete the old file so that it doesn't happen again and overwrite player progress.

This is an API breaking change due to an import change.
 2016-06-12 13:41:02 -07:00
WayofTime f8859dbf56 Added the Draft of Angelus, which increases the max number of upgrade points for Living Armour. 2016-06-12 15:20:48 -04:00
WayofTime e509b4fe69 Added Will collection to the Sentient Bow. 2016-06-12 12:42:32 -04:00
WayofTime d0e81e6426 Implemented (inefficiently) the sentient tools. 2016-06-12 12:08:06 -04:00
WayofTime f097f00c55 Added recipes for all ores -> dust in the alchemy table. 2016-06-12 10:28:03 -04:00
WayofTime 4d8933b8b9 Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9 2016-06-11 11:52:14 -04:00
WayofTime fd931a06a4 Fixed an issue added by TehNut ( ;) ) and updated forge to 1957 2016-06-11 11:42:58 -04:00
qianzha 51d59f0340 Update zh_CN.lang (#789) 2016-06-10 21:50:45 -04:00
WayofTime d1bdec7113 (Possibly?) fixed Tome of Peritia bug of the Negative Speed of Light 2016-06-10 19:36:21 -04:00
WayofTime 5388dbf883 Added the dyeable recipes for the Sigil of Holding to the Alchemy Table. 2016-06-09 21:43:37 -04:00
Nicholas Ignoffo 4eda0d6caa First pass at coloring Sigil of Holding (#787) 2016-06-09 16:59:11 -07:00
Nicholas Ignoffo 513bb113e1 Add transposition blacklist to API (#790) 
Blacklist the same blocks that are blacklisted from the Teleposer.
 2016-06-09 16:01:32 -07:00
qianzha cc5f7b88c0 Update zh_CN.lang (#779) 
* Update zh_CN.lang

* Update zh_CN.lang
 2016-06-08 20:39:08 -07:00
WayofTime 8c8331eddf Updated the guide so that it had more infos 2016-06-08 15:36:47 -04:00
WayofTime 150ed4c6a9 Fixed separate NPE with the Sigil of Holding. 
Added possible fix to an Incense glitch.
 2016-06-07 21:11:21 -04:00
Nicholas Ignoffo eccf747a09 Change from bold to italics 
It's much less.. IN-YO-FAIC
 2016-06-07 17:19:35 -07:00
Nicholas Ignoffo d16144ee2c Make sure sigils are bound before allowing use 2016-06-07 16:43:24 -07:00
Nicholas Ignoffo b1d73e3383 Fix NPE when pressing keybind with no held item 2016-06-07 16:21:23 -07:00
Arcaratus 8d66575530 Backstage Sigil of Holding (#785) 
* Backstage Sigil of Holding
All Sigil of Holding features work, just need to add the aesthetics -> TehNut
Somebody might want to look at adding LP costs to the Sigil?
Also recipes need to be added
Added a keybinding system for future usage
Standardized some NBT tags

Compact classes

Fix lang stuff?

* Fancify Sigil of Holding GUI
Displays the selected sigil in the GUI now

Woops

* Quick fix

* Unused import

* Final commit I promise
 2016-06-07 15:50:41 -07:00
WayofTime 9aa2f86c88 Fixed #778 2016-06-07 10:34:36 -04:00
WayofTime f0f6af3eac Fixed #782 2016-06-07 10:15:40 -04:00
Nicholas Ignoffo 2798fb5873 EntryText should have the "hover to display full" feature 2016-06-05 17:38:23 -07:00
Nicholas Ignoffo 600ff65aa8 Fix Plantable harvest handler not replanting (#781) 
Another case of NutDerp!
 2016-06-05 16:55:01 -07:00
Nicholas Ignoffo 8edf42a5cb Add IGuideLinked for ritual controller 2016-06-05 16:29:36 -07:00
Nicholas Ignoffo 75f8bd0bda Sync ImperfectRitual data 2016-06-05 16:29:06 -07:00
Nicholas Ignoffo 4af15fc059 Move Bucket over to Forge system 2016-06-05 12:31:35 -07:00
WayofTime 9e7517459e Played around a bit more with the guide. Added a simple recipe getter for the recipe pages. 2016-06-05 14:12:28 -04:00
Nicholas Ignoffo 7c1cbb2503 Fix book model 2016-06-04 13:56:02 -07:00
WayofTime 50aa866e24 Updated Guide-API version 2016-06-04 16:19:25 -04:00
WayofTime 424d84d5ad Added a test entry for the Demon Kin 2016-06-04 15:01:25 -04:00
Nicholas Ignoffo 93623a6687 Begin GuideAPI integration 2016-06-03 16:56:13 -07:00
Nicholas Ignoffo d0c0700fda Un-hardcode block documentation 
Opens it up for all our custom blocks to be able to provide information.

Need a texture from @Yulife.
 2016-06-02 17:03:21 -07:00
WayofTime e406a4fa6f Grew a Pair 2016-06-02 19:13:50 -04:00
WayofTime cf72036ff9 Added an initial (read: rough) method to divine where a blood rune is missing for the next tier of altar 2016-06-02 19:09:02 -04:00
Nicholas Ignoffo c884c3819b Fix retention for @Handler 2016-06-01 16:01:36 -07:00
WayofTime 2ad836fa32 Fixed Demon Crucible's weird behaviour where right-clicking it with an invalid item would still put the item in the crucible and give the player an item with a stacksize of 0 2016-06-01 08:10:15 -04:00
Nicholas Ignoffo ce6c014191 Restore Java 6 compatibility 2016-05-31 17:00:55 -07:00
Nicholas Ignoffo f474c31bc9 Re-implement Waila integration 2016-05-31 16:43:11 -07:00
Nicholas Ignoffo b9464e3dbb Fix Elytra Wings in obf environments 
I forgot that obfuscation was a thing last night :D
 2016-05-31 16:14:15 -07:00
Yulife 889d943573 Elytra for Living Armour 
@TehNut , Credits to lemoncake__ for the Red Dragon Wings, I took
inspiration from those imgur.com/a/sI5cv
 2016-05-31 10:33:28 +02:00
Nicholas Ignoffo 5d96b9d2bd Add Elytra render for Elytra Upgrade 
Temporarily stole a texture for it from https://www.reddit.com/user/lemoncake__ (http://imgur.com/a/sI5cv) until @Yulife can make a real one.
 2016-05-30 19:48:28 -07:00
Nicholas Ignoffo 027787e3cd Fix logging levels of LogHelper 
Apparently this has always been wrong *shrug*
 2016-05-30 18:20:50 -07:00
Nicholas Ignoffo 512600a677 Split EventHandler into multiple different handlers 
Better organization allows for finding things easier
 2016-05-30 18:20:31 -07:00
Yulife 6e1383c6e0 Upgrade Trainer and Sheathed Tool 2016-05-30 13:49:43 +02:00
Nicholas Ignoffo 5aea7b637a Fix Green Grove Sigil destroying plants (#767) 2016-05-29 16:39:31 -07:00
WayofTime 3eb1c0f43d Updated the changelog as well as updated gradle.properties. Final commit for 2.0.1-40 2016-05-29 19:19:21 -04:00
Vexatos 6e8c05f464 Update de_DE.lang (#764) 2016-05-28 09:39:31 -04:00
Tridon343 21a69176da Update de_DE.lang (#730) 2016-05-28 08:24:29 -04:00
qianzha 9ab95320d8 Update zh_CN.lang (#734) 
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang
 2016-05-28 08:23:57 -04:00
ImmortalPharaoh7 51fce309dd Update fr_FR.lang (#761) 2016-05-28 08:23:41 -04:00
Nicholas Ignoffo 439e830105 Fix commands for usage in Command Blocks (#748) 2016-05-28 05:19:50 -07:00
Nicholas Ignoffo a37cf7d60b Fix Tile data syncing (#763) 2016-05-28 04:53:19 -07:00
WayofTime bdf540aa76 Changed it so the Sentient Sword drops will for IMob instead of EntityMob - slimes have a 33% reduction to will drop. 2016-05-28 07:27:29 -04:00
WayofTime 5e0a390f48 Fixed Sigil of Magnetism and Call of the Zephyr picking up "dead" items. 2016-05-28 07:19:43 -04:00
Nicholas Ignoffo 3ac00ce4d6 Add recipe for Vengeful Crystal Clusters (#759) 2016-05-28 04:05:16 -07:00
Nicholas Ignoffo 36a5b7f6a1 Fix bound tools working on incorrect materials (#752) 2016-05-27 23:03:32 -07:00
Nicholas Ignoffo 6302ce8133 Fix Life Essence being solid (#751) 
Forge missed some fluid changes in 1.9.4.
 2016-05-27 22:55:40 -07:00
WayofTime aa3bef31c5 Fixed the Trick Shot upgrade 2016-05-22 12:09:36 -04:00
Nicholas Ignoffo cebf71c329 Fix Gate of the Fold endless loop (#743) 2016-05-21 12:57:04 -07:00
Nicholas Ignoffo dce6bf1e93 Add rune type colors Ritual Diviner tooltip 
Fixes casing for direction as well. IE: north -> North
 2016-05-21 12:47:17 -07:00
Nicholas Ignoffo 253da93b3e Make it clearer when arrow is not able to fire (#744) 
- Now does not fire an arrow (seems kinda obvious)
- Plays the "fire extinguish" sound as further indication.
 2016-05-20 22:39:54 -07:00
Nicholas Ignoffo c66b99b535 Remove things that shouldn't be there 2016-05-19 17:46:11 -07:00
Nicholas Ignoffo de5e23e6c4 package-info upd- I mean 1.9.4 update 
These are now "required" thanks to Mojang giving us some annotations. Yay..?
 2016-05-19 17:43:33 -07:00
Nicholas Ignoffo cb05e643a3 Crusher ritual should ignore unbreakable blocks 
Also does destroy effects when removing block
 2016-05-16 19:12:33 -07:00
WayofTime 1936e2d251 Fixed bound sword stuttering 2016-05-14 15:33:05 -04:00
Nicholas Ignoffo 0855c61943 Fix bound tool attributes (#741) 2016-05-13 17:05:40 -07:00
Nicholas Ignoffo d70f423a10 Fix NPE in Crusher ritual (#739) 
Also adds a utility for spawning an itemstack at a specific block location
 2016-05-13 16:50:07 -07:00
WayofTime b684aebdaa Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources. 2016-05-12 15:44:12 -04:00
WayofTime e363ba8ffb - Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil 
- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices
 2016-05-12 14:51:42 -04:00
WayofTime 328b566064 Guesstimated the localization of the Fluid for Life Essence 2016-05-12 10:50:07 -04:00
Nicholas Ignoffo d8de125f52 Reduce debug commands perm level to support command blocks (#678) 2016-05-11 20:35:12 -07:00
Nicholas Ignoffo 3f28a9e268 Config for spectral block visible-ness 
true = Invisible (default)
false = Visible from the outside
 2016-05-11 20:30:23 -07:00
Nicholas Ignoffo 9253d6a410 Add an entity blacklist for the Teleposer (#701) 
Added event for when an entity is teleposed. Includes a Post version as well to allow modification of the entity after the fact.
 2016-05-11 20:29:16 -07:00
Nicholas Ignoffo cfce1a4a6c Fix spectral blocks being opaque (#716) 
Now you can see through the missing fluids

Also reduced the opacity slightly.
 2016-05-11 17:40:41 -07:00
Nicholas Ignoffo b2fb264108 Phantom Bridge sigil should now work while riding entities (#717) 
http://i.imgur.com/TnQRX6v.gifv
 2016-05-11 17:27:01 -07:00
Nicholas Ignoffo f3173c80a7 Fix Phantom Block rendering 2016-05-11 17:26:38 -07:00
Nicholas Ignoffo a37f3fad7b Beets should increase Tranquility (#737) 2016-05-11 16:44:52 -07:00
WayofTime 4486e03736 Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9 2016-05-11 18:39:03 -04:00
WayofTime d26b300b7b Fixed Elytra upgrade not working on servers. Oops! 2016-05-11 18:38:38 -04:00
neconeco2 bb16279497 Update ja_JP.lang (#732) 2016-05-09 19:52:03 -04:00
Nicholas Ignoffo 3ce6735920 Allow Demonic Will to drop from passive mobs in Peaceful (#733) 
Goes along with b2d1b75f49 and #711
 2016-05-09 16:38:43 -07:00
Yulife 6cd78757bf Merge remote-tracking branch 'origin/1.9' into 1.9 
# Conflicts:

#	src/main/resources/assets/bloodmagic/textures/items/ExplosivePowder.png
#	src/main/resources/assets/bloodmagic/textures/items/PlantOil.png
#	src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png
#	src/main/resources/assets/bloodmagic/textures/items/Sulfur.png
 2016-05-08 15:08:56 +02:00
Yulife 7fa03ad432 Alchemy items 💃 2016-05-08 15:07:00 +02:00
WayofTime 7434a253cf Merge pull request #726 from qianzha/patch-14 
Update zh_CN.lang
 2016-05-06 17:54:29 -04:00
WayofTime d79be6d312 Added saltpeter and sulfur, used for gunpowder creation and will be used for other things. 2016-05-06 17:51:39 -04:00
qianzha 000c8041af Update zh_CN.lang 2016-05-06 21:22:19 +08:00
qianzha 500a11a468 Update zh_CN.lang 2016-05-06 15:18:47 +08:00
qianzha be640bff95 Update zh_CN.lang 2016-05-06 14:54:40 +08:00