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

1966 commits

Author SHA1 Message Date
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
Nicholas Ignoffo 81ad9bf764 Cleaner fuel handling 2018-03-03 19:17:06 -08:00
Nicholas Ignoffo 927fc6498f Cleanup harvest handling 2018-03-03 19:16:53 -08:00
WayofTime 7a02783e31 Changed the recipe of the Teleport array. 2018-03-02 15:29:45 -05:00
WayofTime 08031e65f8 Fixed client-sided crash in the Blood Light sigil by rearranging a few arguments. 2018-03-02 15:21:51 -05:00
Nicholas Ignoffo 4a709157b8 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-02 11:52:32 -08:00
WayofTime 022fe00847 Worked on the Ellipsoid Ritual (currently disabled). No, it is not used to summon mathematical demons. 2018-03-02 14:46:59 -05:00
Nicholas Ignoffo f025407014 Move fuel handling to new event 2018-03-01 19:40:37 -08:00
Nicholas Ignoffo 70d98455b7 Cleaned up a lot of different inspections 2018-03-01 19:27:39 -08:00
Nicholas Ignoffo 0dd0854bd9 Move all SysOut references to debug logging 2018-03-01 18:23:56 -08:00
Nicholas Ignoffo 91d7f23b4f Add API method for registering recipes at proper time 
The old access to IBloodMagicRecipeRegistrar still exists, but should not
be used so mods like CraftTweaker can do their thing.

This commit also introduces @BloodMagicPlugin.Inject which will inject the
active API instance into an annotated field with the API interface as it's
type. These fields are populated during pre init.
 2018-02-28 17:53:23 -08:00
Nicholas Ignoffo 395f1188e7 Put fast miner array back up at Haste 3 
It was ~~our~~ my fault.
 2018-02-27 18:19:41 -08:00
WayofTime d783c1419b Merge branch '1.12' of https://github.com/wayoftime/bloodmagic into 1.12 2018-02-27 21:18:07 -05:00
WayofTime f4b72bed8b Added temp recipe to try out a new Teleport array. Don't stick only your hand in it, though. 2018-02-27 21:17:31 -05:00
Nicholas Ignoffo caab4dcbef Fix rituals crashing when deserializing the owner 2018-02-27 18:17:30 -08:00
Nicholas Ignoffo eaf4bfb857 Fix Haste being... *constricted* when above level 2 (#1239) 2018-02-27 18:17:03 -08:00
Nicholas Ignoffo 2a43e53842 Rewrite IBindable to provide an object instead of storing 2 strings 2018-02-27 16:59:51 -08:00
WayofTime 941173dbf4 Added book entry for the Burning Furnace array. 2018-02-27 17:25:41 -05:00
WayofTime 57c25f0064 - Added the Furnace Array (name pending), which takes health from nearby players to power adjacent furnaces. Not covered by standard medical insurance. 2018-02-24 20:31:09 -05:00
Nicholas Ignoffo bf2fe1166e Safety for UUID check in lava crystal (#1238) 
some weird mod was doing weird tooltip things weirdly
 2018-02-23 16:47:34 -08:00
Nicholas Ignoffo 106532061d Alchemy Table now supports new recipe API 2018-02-19 15:41:18 -08:00
Nicholas Ignoffo 562e62725c Add Sulfur and Saltpeter to OreDict (#1235) 2018-02-19 14:07:44 -08:00
Nicholas Ignoffo 77bdbed8b5 Nullcheck tile in Lava/Water/Void sigils (#1236) 2018-02-19 14:06:05 -08:00
Nicholas Ignoffo 0beef19ba1 Seer Sigil should display tranquility data (#1234) 2018-02-19 14:04:32 -08:00
Nicholas Ignoffo 7a288a7292 Update changelog + version 2018-02-18 16:05:11 -08:00
Nicholas Ignoffo 37c8012741 Ignore blank inscription tools 2018-02-18 15:56:03 -08:00
Nicholas Ignoffo 64336f6f78 Sigils should only stack to 1 2018-02-18 15:55:52 -08:00
Nicholas Ignoffo c5b0b61315 Add HUD elements for tranquility (#1233) 2018-02-18 15:55:40 -08:00
Nicholas Ignoffo ea47db3e5d Wrong extenderoo 2018-02-18 14:33:50 -08:00
Nicholas Ignoffo ee42f6ddc2 Slates and inscription tools should use ItemEnum properly 2018-02-18 14:20:36 -08:00
Nicholas Ignoffo 74eaabff8e Bounce array now behaves as a pillow while sneak (#1196) 2018-02-17 16:37:04 -08:00
Nicholas Ignoffo c05336ac9f "Temporarily" disable cross-dimension entity teleports 2018-02-17 16:27:57 -08:00
Nicholas Ignoffo 539879dbd7 Mod ID filter should only be based on the modid (#1179) 
Dangit way
 2018-02-17 16:10:27 -08:00
Nicholas Ignoffo 0cb9d66c81 Satiated Stomach will now let you gorge yourself if you're really hungry (#1188) 
If the user is below 5 saturation, it will no longer ignore above-max saturation
foods.
 2018-02-17 15:50:11 -08:00
Nicholas Ignoffo 6ffe4b8f58 Fix localization for augmented capacity and self sacrifice runes 2018-02-17 15:36:50 -08:00
Nicholas Ignoffo 41baaaf28e YARTF (yet another ray trace fix) (#1228) 2018-02-17 15:07:54 -08:00
Nicholas Ignoffo 441e7b8952 Fix Lava Crystal being consumed 2018-02-17 10:38:33 -08:00
Nicholas Ignoffo 90a071ae23 Fix some logger usages 2018-02-17 09:54:29 -08:00
Nicholas Ignoffo f89b5a005a Logging for plugin gathering 
Moved spammy API stuff to a separate logger
 2018-02-17 09:48:17 -08:00
Nicholas Ignoffo f49e661eb6 Make sure we're looking at a block before doing blocky things (#1227) 2018-02-17 09:26:35 -08:00
Nicholas Ignoffo 0e986a0bdf Slightly alter the altar renderer 2018-02-16 23:58:24 -08:00
Nicholas Ignoffo b29ade63f0 Logging overhaul 2018-02-16 23:48:28 -08:00
Nicholas Ignoffo 49394b56d6 Coerced augmented flask recipe outputs out of hiding (#1200) 2018-02-16 17:10:00 -08:00
Nicholas Ignoffo 5920d9124d Blood Altar will now be less stingy without outputs 2018-02-16 16:48:21 -08:00
Nicholas Ignoffo e4e6a8c4ca Cleanup Altar Upgrade system 2018-02-16 16:37:02 -08:00
Nicholas Ignoffo 2fecb427fd Merge apibutnotreally with the main packages 
Do not consider anything outside of the true API safe to use. And even then,
I'm changing things. Just wait. Please I beg you.
 2018-02-15 18:49:07 -08:00
Nicholas Ignoffo 616c08094b Run formatter 2018-02-14 23:38:57 -08:00
Nicholas Ignoffo 2afc235af7 Move API to it's own source set 2018-02-14 23:37:23 -08:00
Nicholas Ignoffo c03af41c88 Some subitem cleanup 
Still lots left to do. This will help prepare for The Flattening.
 2018-02-13 23:32:15 -08:00
Nicholas Ignoffo 65b89795bc Remove unnecessary base bindable class 
Jarbo 8 exists
 2018-02-13 17:24:06 -08:00
Nicholas Ignoffo 3fb708d2be Fixed crafting order of decor bricks so polished is no longer a lonely boi (#1221) 2018-02-13 16:57:21 -08:00
Nicholas Ignoffo fa59e7000a Mark of the Falling Tower now demands sacrifices again (#1222) 2018-02-13 16:31:30 -08:00
Nicholas Ignoffo 7167aba23c Move Divination output to a HUD element 
RIP chat spam 2014-2018

:hype:
 2018-02-12 19:45:09 -08:00
Nicholas Ignoffo 3286849309 Nerf fast miner array which is actually a buff (#1219) 
I guess Vanilla can't handle Haste III?
 2018-02-11 15:02:55 -08:00
Nicholas Ignoffo 33d6cdb3a9 Fix mundane component being really really really thirsty (#1218) 2018-02-11 14:43:00 -08:00
Nicholas Ignoffo beb71e4c41 Include a dummied version of the alchemy table recipe method so it builds 2018-02-11 12:02:44 -08:00
Nicholas Ignoffo f974f44aeb Fixup Alchemy Array JEI compat 2018-02-11 11:53:45 -08:00
Nicholas Ignoffo 123b06c288 Alchemy arrays should mostly function now (#1202) 
Rewrites the crafting recipe portion of alchemy arrays. Currently the rewritten
portion is wrapped in the old stuff. Ideally the remaining old stuff will
be rewritten as well.

Mods who wish to do custom array effects still need to depend on internal
classes and I think this is fine.
 2018-02-11 11:40:13 -08:00
Nicholas Ignoffo 4b5f8a9685 Move entity registry to new Forge system 2018-02-11 10:16:09 -08:00
Nicholas Ignoffo 163fe864e5 Soul Snares should not trigger on players. Especially not in a weird way (#1216) 2018-02-11 10:15:16 -08:00
Nicholas Ignoffo 47482b6add Javadoc the new API 2018-02-11 00:39:04 -08:00
Nicholas Ignoffo 03fece58fa Rewrite Hwyla integration 
Now properly makes use of the API
 2018-02-08 19:01:12 -08:00
Nicholas Ignoffo 9f6a4983a6 Update JEI compat for Forge and Altar 2018-02-07 21:45:40 -08:00
Nicholas Ignoffo 2d3f86aaf8 Fixup Soul Forge crafting 2018-02-07 18:46:18 -08:00
Nicholas Ignoffo e3cef5ee76 Add support for being in the mood to run on dedicated servers (#1211) 2018-02-07 17:02:53 -08:00
Nicholas Ignoffo 80e7b50dde Move Soul Forge to new recipe API 2018-02-06 22:17:06 -08:00
Nicholas Ignoffo 57591973a3 Move Altar to new recipe API 2018-02-06 21:40:50 -08:00
Nicholas Ignoffo 50fd02b6aa Missed some value manager references 2018-02-06 21:27:23 -08:00
Nicholas Ignoffo f8c734bc96 Implemented new Tranquility value API 
For quick compat, mods can now register a static state-based tranquility
value for their blocks. More
 2018-02-06 21:24:40 -08:00
Nicholas Ignoffo d67ed054ff New recipe registration API 2018-02-06 19:18:29 -08:00