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

1935 commits

Author SHA1 Message Date
KohaiKhaos ebfd8ce9a3 Several mimic fixes, with actually cleaned up commit history. (#1379) 
* Reimplemented a lot of mimic logic and did a first run of changing how mimics store their states.

* Finished removing all metadata calls for blocks replaced by mimics.

* Update EntityMimic.java

* Update ItemBlockMimic.java

* Update TileMimic.java

* How did I even replace a semicolon with a slash.

* Changed all tabs to 4 spaces. Changed Serializer to StateUtil

* Fixed spacing again, hopefully for the last time
 2018-08-07 16:28:55 -07:00
KohaiKhaos 7954d04421 Fixed a null pointer exception with certain modded blocks with the Ritual of Magnetism (#1380) 
* Replaced a null RayTraceResult in Magnetism Ritual with a real one

* Added a fake player to the code. No more passing nulls.
 2018-08-07 16:24:41 -07:00
AEon - Tobias e8ad057662 Added RitualReader/Ritual Tinkerer to creative tab (#1393) 2018-08-07 16:02:22 -07:00
AEon - Tobias ce46de0d0a Fixed Crystal Cluster behavior. (#1390) 
* Players in creative mode can now add crystals to crystal blocks by right clicking them with an item demon crystal.
Crystal block texture now updates on the next tick. The render update is only called when a new crystal has been added (by natural or unnatural means).
Adding a crystal imitates a positive result of checkAndGrowCrystal()

closes #1151

* fixed conditional to allow harvesting crystals if not in creative and holding crystal
 2018-08-07 15:59:09 -07:00
Urey. Xue daa52f4d3d Corrections of manual translation (#1386) 
* Update zh_CN.lang of blood magic guide

* Clarification

* Clarification on Laputa Shard

* "Messagner" -> "Child"

* More fix

* Correct some misintepretations
 2018-08-07 15:52:11 -07:00
AEon - Tobias d30dcf1ae5 Sentient Sword to not attack players unless provoked/auto attack mobs (#1381) 
* Should close #1121

Not tested (yet) (because I haven't figured out how to launch the server with a fake player entity... yet).

* will close #1121

Tested.

Specters only attack players if they attack the owner or the specter.
Spectres now autoattack every instance of EntityMob in range.

//TODO: (fluff) make Bow Specter change angle based on target position (it currently always looks like it shoots into the ground)
 2018-08-07 15:48:01 -07:00
Arcaratus b441e7fc1e SoulTicket internal implementation (#1372) 
* Fix the Blood Tank BB

* Add modid to command localizations to prevent conflicts

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
Corrected localizations of other lang files

* SoulTicket internal implementation

* do what TehNut says

* implement hashCode()

* Fix toggleable sigils draining on r-click when it shouldn't
Also moved the ItemSigil and ItemSigilToggleable to the sigil package (why wasn't it there???)
 2018-08-07 15:27:12 -07:00
Nicholas Ignoffo 093cfb13ef Changelog + version 2018-07-22 07:10:00 -07:00
Arcaratus 6c5bbed348 Quick Fixes (#1362) 
* Add modid to command localizations to prevent conflicts

* Corrected localizations of other lang files

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
 2018-07-22 07:07:27 -07:00
Nicholas Ignoffo e82510d553 Fix will type serializer using lowercased names for lookups (#1369) 2018-07-22 06:56:10 -07:00
KohaiKhaos 5ac52fa8c9 Mob Sacrifice Array no longer kills bosses or players (#1371) 
This is solving the issue I raised in https://github.com/WayofTime/BloodMagic/issues/1368
Added a single check to line 123 of src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java.
The check makes sure the effective health of the currently targeted entity is above 0. So bosses and players are no longer set to -1 health when the array finishes crafting.
 2018-07-22 06:54:46 -07:00
Nicholas Ignoffo 7aadc505ab Fix Ritual of Magnetism not being registered 2018-07-22 06:51:38 -07:00
Nicholas Ignoffo fb90656335 Green Grove ritual should apply to Reeds and Cactus (#1359) 2018-07-16 16:42:10 -07:00
Nicholas Ignoffo a7fcfbd2d0 Laputa Array should not be able to move unbreakable blocks (#1360) 2018-07-16 16:05:13 -07:00
Nicholas Ignoffo 42c69eb557 Rework of ritual registration 
Moves to annotation based registration. Configs are handled for automatically
 2018-06-28 21:56:25 -07:00
Nicholas Ignoffo e3d65a9e3a Rework of HUD element system 
Allows configuration because that's probably a good thing. The values in
the json config are percentages of the screen.
 2018-06-28 20:37:53 -07:00
Nicholas Ignoffo 47b88b95b0 Base work for ticket based syphoning 
To be used for providing a history. This commit breaks any usage of the
network events.

Heads up @TeamDMan @Arcaratus
 2018-06-28 18:24:17 -07:00
Nicholas Ignoffo c8e42e3288 Fix lava crystal not syphoning LP (#1326) 2018-06-26 17:15:45 -07:00
Nicholas Ignoffo 22e8290921 Teleposition Sigil should make sure a Teleposer is the destination (#1328) 2018-06-26 17:09:18 -07:00
Nicholas Ignoffo 86f54886c5 Mending should not work on potion flasks (#1332) 2018-06-26 16:53:16 -07:00
Nicholas Ignoffo d1e77acc73 Bandaid crushing ritual to pass a valid player instance (#1345) 
This entire thing needs to be cleaned up. It's so bad right now :(
 2018-06-26 16:50:34 -07:00
Nicholas Ignoffo 954f2c87e1 Fix bound orbs not allowing JEI interactions (#1349) 2018-06-26 16:42:35 -07:00
Nicholas Ignoffo b38c3022ee Fix crafted inscription tools not having the proper durability (#1353) 2018-06-26 16:32:07 -07:00
Arcaratus 1096c697f4 Fix the Blood Tank BB (#1347) 2018-06-20 18:43:33 -07:00
Urey. Xue 8bec2f3872 Update zh_CN.lang of blood magic guide (#1327) 
* Update zh_CN.lang of blood magic guide

* Clarification

* Clarification on Laputa Shard

* "Messagner" -> "Child"

* More fix
 2018-06-12 21:49:24 -07:00
PiscesdanAT 7263e6fbc2 Update de_DE.lang (#1337) 
Someone mixed up dusk and dawn
 2018-06-09 09:01:30 -07:00
WayofTime edf4564a07 Fancied up the rendering of the Mob Sacrifice array, as well as added more behaviour 2018-05-15 12:40:00 -04:00
Nicholas Ignoffo f563da152e Fix Teleposer swapping blocks even if the event is cancelled (#1303) 2018-05-13 22:20:33 -07:00
WayofTime 389043dc64 Implemented the Mob Sacrifice Array. 
Needs some cleaning up + added visuals, but appears functional.
 2018-05-07 22:10:59 -04:00
WayofTime 32227afd9d Fixed Syntax error in the recipes, as well as annoyed Nut with another class with bracing changes. 
(Wonder when I should change all the classes...)
 2018-05-05 15:20:37 -04:00
Vegar Guldal c94af26a64 Require water potion instead of uncraftable potion (#1297) 
Fixes issue where cutting fluid is uncraftable.
 2018-05-04 13:58:39 -07:00
WayofTime 6a56a13aac Final push before 2.2.12. 2018-05-04 14:34:46 -04:00
cpw 778838e2b0 Fix light calculation to use actual visible level. Should now work on (#1295) 
surface at night as well as underground. Tweak duration to reduce
flicker.
 2018-05-03 19:26:28 -07:00
WayofTime 383be360ff Improved collision "i.e. actually made a non-retarded position update" for the Scroll of Icarus. 2018-05-01 21:39:15 -04:00
WayofTime 3f8a455b90 Made some WIP additions to the Scroll of Icarus, allowing it to pick up mobs. Lacks costs and may break. 2018-05-01 16:29:19 -04:00
WayofTime 920d105374 Needed to be more pushy. 2018-05-01 06:51:37 -04:00
Nicholas Ignoffo 29ae24b044 Fix altar double counting upgrades (#1291) 2018-04-30 19:01:54 -07:00
WayofTime d29b91a106 Fixed the Fluid filters so that they now work perfectly in the routing system. 2018-04-29 09:57:29 -04:00
WayofTime b20e1ac4d7 Fixed Cutting Fluids so they now work properly. 2018-04-29 08:40:42 -04:00
WayofTime 7cecdef6c5 Fixed the Hellfire Forge and Alchemy Table so that they now accept ingredients in any order. 2018-04-29 07:39:20 -04:00
WayofTime eb6b8a3aa5 Small bit of framework for Soul Breath items, plus testing with the "Scroll of Icarus". Crafting mechanic as well as refilling of its resource not implemented. 2018-04-28 21:56:57 -04:00
Nicholas Ignoffo 560d167765 Check the proper maps when looking up fluid priorities (#1286) 
When copypasta goes wrong.
 2018-04-26 19:12:14 -07:00
WayofTime 842c9d1411 Fixed the Alchemy Array from voiding items when broken when it shouldn't have. 2018-04-26 16:33:22 -04:00
Nicholas Ignoffo 151c1dfd67 "way pls" - TehNut 2018 (#1279) 2018-04-24 17:08:08 -07:00
Nicholas Ignoffo da8e43a8b4 Fix Blood Tank NBT transfer between item/tile form (#1283) 2018-04-24 17:06:43 -07:00
WayofTime 6522b0fa1b Fixed the Blood Altar so it can actually fill Blood Orbs (derp). 2018-04-22 20:59:29 -04:00
WayofTime f4aef16ed1 Fixed the Turret Array. 
(Deja vu)
 2018-04-22 16:14:36 -04:00
WayofTime 37f9ea2ab2 Fixed server-sided crash for the turret array (why is Vec2f not found on the server???) 2018-04-22 16:04:08 -04:00
Nicholas Ignoffo afcf1a1822 Add a recipe for the fluid filter 2018-04-21 16:53:19 -07:00
Nicholas Ignoffo ddf07acf70 "way pls" - WayofTime 2018 2018-04-21 16:42:22 -07:00
WayofTime c9319477bd Made the Blood Altar check if it had a null recipe on update while active. (Actual change on line 271) 
Potential fix for #1275.
 2018-04-20 16:11:05 -04:00
WayofTime 60c8441115 Added the "Resonance of the Faceted Crystal" 2018-04-20 13:39:05 -04:00
Nicholas Ignoffo 7e2dc3f4e7 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-04-17 16:16:14 -07:00
Nicholas Ignoffo 19cdfbfb0a This file slipped through the craks :think: 2018-04-17 16:16:03 -07:00
WayofTime 07ae96a60e Fixed Demon Crystals growing at an accelerated rate (all the time). 2018-04-17 19:12:29 -04:00
Nicholas Ignoffo 79ccd1f3bb Add inputs to crafting events + implement SF/AT events (#1270) 2018-04-15 11:21:14 -07:00
Nicholas Ignoffo 2d83e8047d Fix Blood Light not being punchable (#1272) 
Also makes it more visible while holding the sigil.
 2018-04-15 11:05:02 -07:00
WayofTime af3e1fecb6 Fixed an interaction issue between vanilla hoppers and the Alchemy Table, due to the hoppers not actually using the Forge capabilities for all of its checking methods. 2018-04-13 16:44:00 -04:00
WayofTime 2db0ce5639 Added an entry to the book that explains you can, in fact, use Sea Lanterns instead of glowstone blocks for your Tier 3 altar. 2018-04-13 12:20:39 -04:00
WayofTime ebdc66d063 Changed the Alchemy Table to use Bindable for checking the Orb's stored LP. Also fixed a crafting exploit with the table. #1269 2018-04-13 11:31:52 -04:00
Nicholas Ignoffo b63c383747 Fix Sanguine Scientium recipe (#1267) 2018-04-11 16:46:09 -07:00
Nicholas Ignoffo e64e481a11 Fix errant MRS tags displaying on fresh MRSs (#1265) 
I literally totally hate everybody who downvoted my comment in that issue
and will show them my wrath.
 2018-04-08 12:55:23 -07:00
WayofTime 9c2621e93a Fixed stupid NPE in the Furnace Array 2018-04-07 18:51:21 -04:00
Nicholas Ignoffo 6944e5e8d4 Add missing demon pylon itemblock (#1259) 2018-04-07 13:08:28 -07:00
Nicholas Ignoffo c8b394bf86 Add missing itemblock for demon crystals (#1252) 
Still need to figure out the rendering issue. Might just need to rewrite
them to store the age as meta instead of the type.
 2018-04-07 13:05:32 -07:00
Nicholas Ignoffo 234ccd4935 Fixed a null stack check in holding GUI 2018-04-07 12:47:46 -07:00
Nicholas Ignoffo 03a2904bd1 Fixed holding sigil internal interactions 
It will no longer tick unbound sigils and checks binding of stored sigil
on right click..
 2018-04-07 12:24:28 -07:00
Nicholas Ignoffo bf18c337e2 Fix of by one with altar upgrade calculation 2018-04-01 15:37:55 -07:00
Nicholas Ignoffo a5a9224f6d Merge remote-tracking branch 'origin/1.12' into 1.12 2018-04-01 15:37:07 -07:00
WayofTime 467bcb4d52 Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest. 
Also added the guide page for the Shard of Laputa.
 2018-03-30 19:42:11 -04:00
WayofTime 58ca46b6bd Disabled the added Health in the "Quick Feet" upgrade. 2018-03-30 18:03:31 -04:00
WayofTime fff793ea7d Fixed the Haste sigil and "Quick Feet" so that they work with MC's new movement method. 
Also added better looking potion effects for a few things
Enabled Shard of Laputa array - no book entry yet.
 2018-03-30 18:01:23 -04:00
WayofTime d2a84c0e7c Added in the Spike Array 2018-03-30 11:35:40 -04:00
WayofTime b7adad76e7 Added in book entries for the Teleport Array and the Turret Array. 2018-03-30 07:15:38 -04:00
WayofTime 6e7b387e6a Added additional effects to the Sentient Bow when aspected to different Will types. 2018-03-29 16:05:56 -04:00
Nicholas Ignoffo 8dce592787 Fix out of bounds on invalid enum items 2018-03-23 17:12:32 -07:00
Nicholas Ignoffo 58d9678c40 Switch some more instances of chat spam to the action bar 2018-03-23 16:50:17 -07:00
Nicholas Ignoffo 7ec27febc6 Apply same model to all alchemic vials 2018-03-23 16:42:18 -07:00
Nicholas Ignoffo cdfc77be03 Cleanup ritual events (#1256) 
Also actually fire the imperfect one ¬_¬
 2018-03-23 16:18:16 -07:00
WayofTime 25f492ef65 *Hopefully* make Nut cry a bit less. 2018-03-23 13:24:33 -04:00
WayofTime dd6b5bd3b5 Added an example item whose variants use the same textures but different colours for the layers. 2018-03-23 11:02:43 -04:00
Nicholas Ignoffo f535e331dd Removed all usages of PleaseStopUsingMe 2018-03-17 22:30:14 -07:00
Nicholas Ignoffo 77e5beb9e1 Fully remove old LogHelper usage 2018-03-17 17:18:20 -07:00
Nicholas Ignoffo 924dc7b38d Fix server crash when handling dye recipes (#1250) 2018-03-13 23:10:13 -07:00
Nicholas Ignoffo 46389368ec Fix default potion flask recipe 2018-03-12 16:20:32 -07:00
Nicholas Ignoffo c7af09a458 Fixed Master Blood Orb cost (#1248) 
This has been wrong for almost 2 years now. Neat.
 2018-03-11 12:48:49 -07:00
WayofTime bbe026dda9 Added a new (slightly WIP?) array, the Turret Array 2018-03-11 11:19:34 -04:00
Nicholas Ignoffo ecb81a7017 A bit more altar cleanup 2018-03-10 00:07:19 -08:00
Nicholas Ignoffo eada60f436 Some altar cleanup and renaming 2018-03-09 18:00:04 -08:00
Nicholas Ignoffo fefeaf26af Holding sigil can provide it's own mesh provider now 2018-03-07 19:55:32 -08:00
Nicholas Ignoffo 554993ea79 Cleanup model registration 2018-03-07 19:43:00 -08:00
WayofTime c4527d157f Worked on the Laputa array. Yes, I went there. 2018-03-07 19:58:59 -05:00
qianzha c079da7969 Update zh_CN.lang (#1240) 
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_TW.lang
 2018-03-07 16:12:52 -08:00
Nicholas Ignoffo b011623333 Switch ritual component gathering to a Consumer rather than direct list access 2018-03-05 00:10:30 -08:00
WayofTime 3a83b4ca8a Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. 2018-03-04 19:11:46 -05:00
Nicholas Ignoffo 2b86e5c8ad More removal of BlockStack usages 2018-03-04 10:47:15 -08:00
Nicholas Ignoffo 8a61741e0d Rewrite Transposition Sigil 2018-03-04 10:15:03 -08:00
Nicholas Ignoffo 3f5178dd6a A bit of Ritual cleanup 
Slowly getting rid of these BlockStack references. Slowly moving towards
a proper "API" in our internals.
 2018-03-04 09:17:24 -08:00
WayofTime 986852e265 Added the ability to set the array to no longer drop its ingredients. 
- I need to just change all of the files to my format, so Nut doesn't cry each push.
 2018-03-04 09:36:03 -05:00
WayofTime e2f7772e82 Improved the Ellipsoid effect. 2018-03-04 09:29:19 -05:00