Commit graph

372 commits

Author SHA1 Message Date
AEon - Tobias
1f392721fa Reinstated Compression sigil. (#1374)
*  Reinstated Compression sigil.
- does not compress wooden planks into crafting tables
- searches for reversible 3x3/2x2 recipes with a single material type
- probably has a lot of redundant stuff and looks silly
- uses try/catch (might want to find a different approach, some people scoff at this)
- should probably have spent the night sleeping, I'm taking exams tomorrow and will probably sleep the whole day through.

* Learned how to properly handle the "NullPointerException"-situation.

* Update BaseCompressionHandler.java

* Update CompressionRegistry.java

* Removed (almost) all code comments (only a one-liner remains that serves as pointer to a completly commented-out class (StorageBlockCraftingRecipeAssimilator)).
Made methods and variables for long function calls to be more efficient.
Fixed an oversight that resulted in a NullPointerException after removing redundant checks that were made to prevent exactly that.

Rearranged and reformatted code.

* corrected something that could be considered a typo but was an oversight

* This should be it. An Array should be more efficient but you can correct me if I'm wrong. In either case it does what it is supposed to do.

* Fixed. Needed a seperate inventory for the reversible check (or clear the previously used one, but then I'd had to repopulate again and that would just have been messy)

* Forgot one of my lines.

* Fix and cleanup.
Could definitely clean more but that should suffice for now.
2018-08-26 13:05:30 -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
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
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
WayofTime
60c8441115 Added the "Resonance of the Faceted Crystal" 2018-04-20 13:39:05 -04: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
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
Nicholas Ignoffo
77e5beb9e1 Fully remove old LogHelper usage 2018-03-17 17:18:20 -07:00
WayofTime
bbe026dda9 Added a new (slightly WIP?) array, the Turret Array 2018-03-11 11:19:34 -04:00
WayofTime
c4527d157f Worked on the Laputa array. Yes, I went there. 2018-03-07 19:58:59 -05: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
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
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
70d98455b7 Cleaned up a lot of different inspections 2018-03-01 19:27:39 -08: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
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
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
49394b56d6 Coerced augmented flask recipe outputs out of hiding (#1200) 2018-02-16 17:10:00 -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
33d6cdb3a9 Fix mundane component being really really really thirsty (#1218) 2018-02-11 14:43:00 -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
57591973a3 Move Altar to new recipe API 2018-02-06 21:40:50 -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
739c1aa05f Cleaner sub-item implementation
Todo: Move more sub items to use it
2018-02-06 18:59:47 -08:00
Nicholas Ignoffo
ddaadfbe52 Swap the API packages
The new one is now built for the api jar and the old one is now internal.
It will slowly be moved around to sane places within the internal code. Most
of the features provided in the old "api" are addon specific features which
will generally rely on the main jar anyways. The new API will be specific
to compatibility features, such as blacklists, recipes, and value modification.
2018-02-05 17:04:46 -08:00
Nicholas Ignoffo
42931bcf0e JSON recipes, much to the displeasure of Elucent and shadows
feelsgoodman

(cherry picked from commit c23d577)
2018-02-04 19:09:37 -08:00
Nicholas Ignoffo
d99cf77288 Move config to annotation system
All old configs must be deleted for this to work properly. Since the rest
of the update is filled with world breaking changes, this should be fine.

Also some mapping updates

(cherry picked from commit d587a8c)
2018-02-04 19:01:27 -08:00
Nicholas Ignoffo
37ec0582eb Fixed the last of the model errors 2017-08-16 16:39:57 -07:00
Nicholas Ignoffo
08258fd6ef Run formatter 2017-08-15 21:30:56 -07:00
Nicholas Ignoffo
61c44a831b Fix some things that went missing 2017-08-15 21:24:59 -07:00
Nicholas Ignoffo
348fee1e2a It compiles. Somehow. 2017-08-15 20:21:55 -07:00
Nicholas Ignoffo
554c9852e6 Move commonly used API systems to a plugin based system
Create a class that implements IBloodMagicPlugin and annotate it with
`@BloodMagicPlugin`. The `register` method will be called during init.

Currently implemented systems:
- Blacklisting
  - Teleposer
  - Teleposer (entity)
  - Transposition
  - Well of Suffering
  - Green Grove
- Setting sacrificial values
- Adding altar components
2017-08-15 18:14:28 -07:00
Nicholas Ignoffo
5fcdd978d7 this doesn't compile yet, but have something to peek at 2017-08-14 20:53:46 -07:00
Nicholas Ignoffo
5b9bb07d8d Large Bloodstone Bricks should get 4 from crafting (#1125) 2017-05-21 12:29:52 -07:00
Nicholas Ignoffo
41c2f37042 Change lots of recipes to use oredict (#1101)
I probably missed a few
2017-03-14 19:13:08 -07:00
majikguy
b4603a4b9a Entity Registration Fix (#1087)
* Replaced the Entity registration code. Before, the code was manually adding entities to the GameRegistry.

Doing this prevents the engine from fully registering the added entities in all the proper places. The result was that the Client was never informed of when these entities were created or what they were doing, as all of that behavior is managed by the EntityRegistry.

Changing to the proper EntityRegistry calls fixes issue #1065.

* Changed ResourceLocation calls to the one with two arguments. Didn't know that was a thing before. :D

Also added more consistent whitespace.
2017-03-07 16:17:18 -08:00
Nicholas Ignoffo
72c321acb0 Implement an inverted MRS that requires an RS signal to function (#1022)
(cherry picked from commit ddb7542)
2017-02-19 14:41:06 -08:00
Nicholas Ignoffo
cdb5127598 Fix ore doubling potentially adding invalid recipes (#1051)
(cherry picked from commit 9027f76)
2017-02-19 14:34:19 -08:00
Nicholas Ignoffo
78093631c5 Empty flasks can now be refilled (#976)
Right click a water source (any block that uses Material.WATER, same as vanilla potions) to refill it. This removes all potion effects. The model will display without the fluid inside as a visual indicator.

(cherry picked from commit 4c614df)
2017-01-02 01:59:24 -08:00
WayofTime
65104db564 Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter.
(cherry picked from commit a5a17f6)
2017-01-02 01:34:33 -08:00
Nicholas Ignoffo
a628adfde8 Lowercase all the tooltip strings 2017-01-02 01:18:29 -08:00
Nicholas Ignoffo
ed27873fbe It runs! 2017-01-02 00:10:28 -08:00
Nicholas Ignoffo
f5a68adc2e Remove all the package-info.java's
Except the API one
2017-01-01 21:49:52 -08:00
Nicholas Ignoffo
00d6f8eb46 Initial stab at 1.11
About halfway.
2016-12-12 19:56:37 -08:00