Commit graph

1899 commits

Author SHA1 Message Date
WayofTime
7f2c40a1c4 Added most of the rest of the Anointment framework and a few more items.
Includes a Fortune, Silk Touch, and +damage Anointment.
2021-01-12 08:27:47 -05:00
WayofTime
8d9319e271 Updated the changelog book
Also fixed some chat spam for the Demon Crystal
2021-01-10 18:24:38 -05:00
WayofTime
d7b7750226 Fixed Altar crash because I am a goofy goober. 2021-01-10 18:18:41 -05:00
WayofTime
b86595beaa Initial framework for Anointments
None added yet, but the registration is working now.
2021-01-10 16:50:19 -05:00
WayofTime
b3af1b8e77 Added recipes to Shaped and Deforester charges.
Also fixed bug with Living Armour that prevented it from upgrading under certain conditions.
2021-01-10 09:00:06 -05:00
VT-14
8e6f36d2a9
Book Updates (#1740)
* Remove Living Armor Extra Recipe Mappings

They don't work, likely due to data on the JEI item.  They were also putting errors in the log due to pointing at nonexistant page 4 (starts counting from 0).

* Added more Setup info to Resonance of the Faceted Crystal Ritual.

* Updated "Use Ritual Diviner" Message on Each Ritual.

Let's correctly spell "conStruction" and add links to the Ritual Diviner's page.

I also added a link Anchor to the Ritual Diviner's Dusk version page, and linked each ritual to the appropriate one (Dusk to the Dusk page, and the normal one to the start of the entry)

* Added Error Handling to Patchouli Processors

If a recipe doesn't exist at all, this should log an error and move past it.

* Patchouli Processor Improvements

As recommended by TehNut over Discord.

* Resonance of the Faceted Crystal only needs 5 spires on the Raw Crystal Cluster

* Removed No Longer Needed Examples, Renamed Tome of Peritia Entry

The Double-Array Examles aren't needed anymore since they are actually being used now.

Renaming the Tome of Peritia entry to not end in book.json means the dev environment doesn't try to use it when setting up the book.

* Removed Duplicated Assets

These two folders were renamed to use snake_case when we initially updated the book.  I forgot to properly replace the originals and ended up just duplicating them.

* Removed a Few More Unused Assets

These are from before we put all of the Guide's Crafting GUI elements on one texture (located in the textures/gui/patchouli_book folder) to save space.

* Expanded Aspected Will Entry

Note that Sentient Tools will use the largest will type in the player's inventory.

Co-Authored-By: wrincewind <1457878+wrincewind@users.noreply.github.com>

Co-authored-by: wrincewind <1457878+wrincewind@users.noreply.github.com>
2021-01-05 17:34:22 -05:00
WayofTime
48ef87303a Fix to Lava Crystal 2021-01-05 17:33:53 -05:00
WayofTime
d719b85958 Fixed NPE in Blood Altar and added some WIP blocks
Also included is a fix for the Blood Altar not receiving piped in fluids, as well as standardizing the Blood Altar's capabilities.
2021-01-02 12:13:51 -05:00
WayofTime
a96db67381 Fixed Experienced upgrade 2021-01-01 10:52:10 -05:00
WayofTime
0354045796 Fixed the Body Builder upgrade
Yay for not setting the map correctly!
2020-12-31 20:56:56 -05:00
WayofTime
b8396a7969 Removed console spam when players pick up xp 2020-12-31 17:44:05 -05:00
WayofTime
c85a605b5a Added the Bounce Array and the temp recipe for the "Grove Array" (name pending, and NYI) 2020-12-31 15:50:14 -05:00
WayofTime
510ec5cce5 Merge branch '1.16.3' of https://github.com/WayofTime/BloodMagic into 1.16.3 2020-12-30 17:57:37 -05:00
WayofTime
dac93b7ec4 Added Day and Night alchemy arrays
- Added new alchemy arrays:
	- Two arrays, which changes the current daylight cycle to day and night.

- Fixed the JEI so that it no longer ouputs an error when loading Alchemy Array recipes without a crafting output.
2020-12-30 17:57:33 -05:00
Tobias
d63875e5d0
Merge pull request #1719 from Keraldi/patch-2
Improved capacity formula
2020-12-30 20:36:00 +01:00
wrincewind
2d4ea508c0
fixed typo - language file has ritual.notValid (#1722) 2020-12-30 13:13:33 -05:00
Victorsueca
9c1e1a7050
Fix non [a-z0-9/._-] character in path of location (#1732)
Fixes a net.minecraft.util.ResourceLocationException that happens when the mod is loaded with Actually Additions due to the third party crop integration using an old block ID with deprecated casing.
2020-12-30 13:13:00 -05:00
WayofTime
f01a743a3e Readded Spike and Updraft Arrays. Also WIP Day Array 2020-12-28 16:28:33 -05:00
VT-14
2ec58c1e60
Updated Sanguine Scientiem. (#1730)
* Initial work on Patchouli Processors

Created Processors for Blood Altar and Hellfire Forge recipes so the upcoming Patchouli Guide will be able to show the current recipes rather than having them hard coded to the mod's defaults.

Still to do: Alchemy Array, Alchemy Table, ARC, and to clean up these first-time passes.

* Improved Altar and Hellfire Forge process

Used Switch statements where possible, and made the multiple inputs on the Hellfire Forge handled under a single entry.  Changed key "LP" to lower case (also done on template file).

* Added item input Cycle.  Created Alchemy Array, and Forge + Array Processors.

* Added Alchemy Table Processor

* Various Processor Changes.

Added ARCProcessor.

Overhauled AlchemyTableProcessor.  It now only handles one recipe at a time.  The Templates were changed to use nested templates.

ForgeAndArrayProcessor was removed and replaced with similar nested templates.

* Removed uneeded comments from ARCProcessor.

* Uploaded New Book's Content

This book was written by Wrincewind and myself on #wrincewind/Blood-Magic-Manual.

Co-Authored-By: wrincewind <1457878+wrincewind@users.noreply.github.com>

* Book updates.

Co-Authored-By: wrincewind <1457878+wrincewind@users.noreply.github.com>

Co-authored-by: wrincewind <1457878+wrincewind@users.noreply.github.com>
2020-12-26 14:57:15 -05:00
WayofTime
9d18353a2e Fixed the Living Armour causing a NPE under certain conditions
In most cases where it is pertinent, changed the LivingStats calls to check if the stats actually exist on the chestpiece.
2020-12-15 18:53:33 -05:00
Tobias
8393b63344
Improved capacity formula
```
def keraldi2(cap, cap_aug):
    cap_aug = cap_aug * (0.99 ** abs(cap_aug - cap))
    return round(2000 * (cap + 5) * 1.1 ** cap_aug)
```
results:
```
assignMax(keraldi2, 6)
(6, 0, 22000)
assignMax(keraldi2, 7)
(6, 1, 24087)
assignMax(keraldi2, 8)
(5, 3, 26469)
assignMax(keraldi2, 9)
(5, 4, 29171)
assignMax(keraldi2, 10)
(5, 5, 32210)
assignMax(keraldi2, 20)
(9, 11, 78238)
assignMax(keraldi2, 30)
(12, 18, 170980)
assignMax(keraldi2, 40)
(16, 24, 346678)
assignMax(keraldi2, 50)
(21, 29, 666277)
assignMax(keraldi2, 60)
(27, 33, 1236525)
assignMax(keraldi2, 70)
(34, 36, 2252048)
assignMax(keraldi2, 80)
(40, 40, 4073333)
assignMax(keraldi2, 90)
(45, 45, 7289048)
assignMax(keraldi2, 100)
(50, 50, 12912994)
```
2020-12-09 16:52:16 +01:00
WayofTime
3d0e3c696b Fixed Augmented Capacity runes
They didn't work when you had no regular capacity runes. rooDerp
2020-12-07 19:37:36 -05:00
WayofTime
12e42438b5 Added Bloodstone Bricks as a valid altar component
Quick, before anyone notices!
2020-12-07 15:14:13 -05:00
WayofTime
7b938c28b4 Added more to the upgrades
Added a lot of the regular upgrades, as well as added the recipe for the Binding Reagent. The rituals used for upgrading/removing upgrades for the Living Armour were also added, as well as the Ellipsoid ritual. Complete for BM 3.0.2
2020-12-07 09:09:50 -05:00
WayofTime
953bac9298 Added a few more upgrades to the Living Armour
... Wait, was I supposed to put something in here?
2020-12-05 11:26:01 -05:00
WayofTime
507c541d5b Added the Binding array
Hehe lightning go brrrrrr
2020-11-28 21:41:28 -05:00
WayofTime
2075fa5be3 First stab at Living Armour reimplementation.
Added a lot of the upgrades, but there's still more testing/upgrades to be done/reimplemented.
2020-11-28 12:04:11 -05:00
WayofTime
06faa916c3 Added more rituals
Includes the Green Grove, Regen, Animal Growth, and a fix to the Feathered Knife ritual so that it... doesn't cause the damage animation.
2020-11-26 15:21:03 -05:00
WayofTime
e312e3d854 Ritual reimplementation
Reimplemented the following rituals:
	- Resonance of the Faceted Crystal
	- Crack of the Fractured Crystal
	- Reap of the Harvest Moon
2020-11-26 13:32:56 -05:00
WayofTime
907a0f27e7 Fixed the repairing for Sentient equipment.
WHoopsies, forgot that line was commented out!
2020-11-25 10:23:00 -05:00
WayofTime
69ad344aa0 Fixed Hellfire Forge Aura Consumption
Fixed the Hellfire Forge so that it actually consumes Will from the Aura.
2020-11-24 21:19:25 -05:00
WayofTime
ab9de5341e Worked on the Sentient Scythe
First stab (pun intended) on the Sentient Scythe. Still have a bit of work to do (such as balancing) but it's... usable.
2020-11-23 21:06:08 -05:00
Arcaratus
574d6a8e74
Creating a usable API (#1713)
* Initial stab at API structuring

* Throwing all the things into the API*
Eliminated all internal imports
Also added some helpful comments
*except for the ritual stuff

* Reducing the API
Threw back the altar/incense/unnecessary items to main
Added in a functional API instance

* API cleanup
Removing all the unnecessities
Smushed and vaporized some redundant recipe stuffs

* Made API dummy instances
Refactor packaging
2020-11-23 21:03:19 -05:00
WayofTime
952b6aeeb0 Added Tome of Peritia
Final push before the build.
2020-11-21 10:54:40 -05:00
WayofTime
9b79acaad6 Fixed the Lava Crystal crash
Maybe not the most elegant method? But it works.
2020-11-21 10:24:35 -05:00
WayofTime
295488f144 Finished adding the "Creeping Doubt" plant block.
Still need to do some more work, such as adding the seeds and the material you get from the plant.
2020-11-21 09:54:13 -05:00
WayofTime
032e163795 Initial work on Netherrack Soil.
Also added the processing for Ancient Debris and some of the intermediates for the new Hellforged Ingots (no uses yet).
2020-11-19 21:42:30 -05:00
Arcaratus
1ae356c886
Initial stab at API structuring (#1711) 2020-11-18 13:53:20 -05:00
WayofTime
546215ab37 Work on mimics as well as some structure tinkering. 2020-11-18 13:51:58 -05:00
WayofTime
545b50ac82 Revered API changes
Because I obviously don't know what I'm doing. Building the jar wasn't working, so reverted for now.
2020-11-15 21:34:18 -05:00
WayofTime
5e5ecfd30a Update ItemSigilGreenGrove
...Again. Fixes a server crash when using the sigil on plants.
2020-11-15 21:12:14 -05:00
WayofTime
bc2530583a Properly added API
Actually put the API in the correct spot >.>
2020-11-15 16:33:42 -05:00
WayofTime
2dafb837f1 Dungeon Fix
:rooBlank:
2020-11-15 14:17:20 -05:00
WayofTime
6f7cd030e6 Green Grove Sigil fix.
Fixed the Green Grove sigil so that it checs if a plant can grow first.
2020-11-15 12:09:18 -05:00
WayofTime
71ba0229c5 Dungeon tinkering
Nothing gameplay-affecting here.
2020-11-15 12:07:01 -05:00
WayofTime
6d07184b18 Created API framework
Very very initial framework to the API, mainly through moving the relevant files to a separate source folder.
2020-11-14 16:20:55 -05:00
WayofTime
ddadbef425 Added a bunch of the dungeon blocks to the mod.
Mainly only the "Raw" variants right now. No recipes have been added yet.
2020-11-14 16:15:26 -05:00
WayofTime
cb2db9bc50 Finished implementation of Incense Altar and associated blocks.
Also added the recipe for the Ritual Tinkerer, as well as the finalized book entry for the Incense Altar.
2020-11-13 19:44:57 -05:00
WayofTime
7634404dac Added Demon Will Gauge config.
Added some code snippets trying to add a command, but added a simple Client Config for the Demon Will Gauge instead.
2020-11-12 13:16:44 -05:00
WayofTime
b6931a3116 Initial work on DemonWillGauge
Includes the PacketHandler as well as the base system for HUDElements. Still need a replacement for the GuiConfig.
2020-11-11 21:15:58 -05:00