diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index 0dab0bc8..93224023 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -7,10 +7,10 @@ cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerat
904d9baa649250571bce5f965cf48fbec69c2c1a assets/bloodmagic/blockstates/bloodlight.json
5f3898cc4891f85091fe6104800d6c88d9e85e29 assets/bloodmagic/blockstates/bloodstonebrick.json
631b579c38652efbcd9e5771d09ad6e476f3ba00 assets/bloodmagic/blockstates/chargingrune.json
-a35188b0244bf9808098c7d49d0af9bd32cef297 assets/bloodmagic/blockstates/corrosivedemoncrystal.json
+d81673d78195fecd20f55daff394882c1fca18c3 assets/bloodmagic/blockstates/corrosivedemoncrystal.json
b943c6433f295c168841aec3c3f62e525c5c9cc9 assets/bloodmagic/blockstates/creeping_doubt.json
a54ab8dfd36a593829dc33644c5f9dbccaaadaf3 assets/bloodmagic/blockstates/deforester_charge.json
-b696f680545dffa4d3fbcc83b4b81ab58ac69aef assets/bloodmagic/blockstates/destructivedemoncrystal.json
+5efc11906969389596d32e159d4e973672d5ca56 assets/bloodmagic/blockstates/destructivedemoncrystal.json
6bd58d1d02a40416cec29409dee7ef80038b26d5 assets/bloodmagic/blockstates/dislocationrune.json
0b7d0241c379d0b3a8a4fa2dae79d4f998800a1f assets/bloodmagic/blockstates/dungeon_brick1.json
19d1da41c8b836a88ea7164b32e5a8525e5155cf assets/bloodmagic/blockstates/dungeon_brick2.json
@@ -43,22 +43,22 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit
95a0c9a84139cf92c2689e53408b51619db126a1 assets/bloodmagic/blockstates/obsidianbrickpath.json
8b0ea137c63cf3a658a03eee58ca4b2c3d996f87 assets/bloodmagic/blockstates/obsidiantilepath.json
372ecd737f7082a4c2c70e46745f893b1179f885 assets/bloodmagic/blockstates/orbcapacityrune.json
-a2eaa9166258d7179d9e5099200f777bb9edf613 assets/bloodmagic/blockstates/rawdemoncrystal.json
+d7a6ec187f6ba493e0cddf61f3b15d77537b1b23 assets/bloodmagic/blockstates/rawdemoncrystal.json
90daa355e528ab8a6582f796951201882f3c56da assets/bloodmagic/blockstates/ritualstone.json
285618c1a8ec36e36d479f577190579ae7616529 assets/bloodmagic/blockstates/sacrificerune.json
b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json
d2e2e78bd859c321a72f40fbb17ca79292d58031 assets/bloodmagic/blockstates/shaped_charge.json
487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json
-f1ca47098385a955155cab9c2a97219e02d390a0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json
+52b8ed3cc54b68d5f7927d1f24cfee825b526cc0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json
297bc2425f7b07b1a9dd3f7f6649c44f88dbac29 assets/bloodmagic/blockstates/stonebrickpath.json
e3256db10fc8a8ab540f6ac8d27e0f47861e817a assets/bloodmagic/blockstates/stonetilepath.json
-48ed6b25a5d8d8074c38d772fdc27c1753d42c36 assets/bloodmagic/blockstates/vengefuldemoncrystal.json
+3333b28d8b7411aa19394519df115c9d112836f5 assets/bloodmagic/blockstates/vengefuldemoncrystal.json
e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json
74c889434f46e060e8f185e8ef674312eb2f1192 assets/bloodmagic/blockstates/woodbrickpath.json
42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json
3c6ce233dae6c1307d9016406c324bbe844b4e1e assets/bloodmagic/blockstates/wornstonebrickpath.json
d59655f12d1724b73b77c373fb6864fcff69db12 assets/bloodmagic/blockstates/wornstonetilepath.json
-c3d7a74aa0c09e6064e79457eb2cc615048870fc assets/bloodmagic/lang/en_us.json
+26ec223c914757fa7922f89db0e41350240fbb42 assets/bloodmagic/lang/en_us.json
34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json
bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json
adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json
@@ -265,6 +265,8 @@ dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/fortune_a
bad504721d3bfd106869df9902bac0aa4001a1a7 assets/bloodmagic/models/item/goldsand.json
ebb91dfd0f28c439478b5f041b127aefa00ae583 assets/bloodmagic/models/item/gravel_netherite_scrap.json
44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json
+dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/hidden_knowledge_anointment.json
+dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/holy_water_anointment.json
f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json
5d151f9d9007fb7459dde9f2d5c182b9b6aa06e0 assets/bloodmagic/models/item/infusedslate.json
59940408324c0379fa791a58f4a81781d06d1257 assets/bloodmagic/models/item/ingot_hellforged.json
@@ -522,13 +524,19 @@ f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soul
c95cd70b7ca320e18618c07827add555984b0e45 data/bloodmagic/loot_tables/test.json
2df19ff659705a5408ce0819a947764673404388 data/bloodmagic/recipes/alchemy_table.json
a343604b5a75e1b3810df97d024813fb041cffb6 data/bloodmagic/recipes/alchemytable/basic_cutting_fluid.json
-f86432e8fef0d6e140e27f575063704b7e843d75 data/bloodmagic/recipes/alchemytable/bread.json
+6a93bcd65cf2636fc684276777f56630f82d710c data/bloodmagic/recipes/alchemytable/bread.json
e50009fa724173c2dcb4fab49b4f029039f69bf8 data/bloodmagic/recipes/alchemytable/clay_from_sand.json
+72f8d4afe57970d3969a9373b18f8eac86b245bc data/bloodmagic/recipes/alchemytable/cobweb.json
96cc66cdb9c5f786eaa899e1fbdd38144e44a0fe data/bloodmagic/recipes/alchemytable/explosive_powder.json
1fa964af556af521d8eaf1a686befdd9d69c63af data/bloodmagic/recipes/alchemytable/flint_from_gravel.json
+90b9431139014864558e96916eb835105f3b5a2f data/bloodmagic/recipes/alchemytable/fortune_anointment.json
aff95e4322f9e8daaffc2337964f95ab6f9d631c data/bloodmagic/recipes/alchemytable/grass_block.json
540edca1f507d366e55887b4429a9952c00f4060 data/bloodmagic/recipes/alchemytable/gunpowder.json
+9f1b37b59f8abbe419306b3eb8af59317a54483a data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json
+566352daaa6e6803df68475d964108b3f89cebd2 data/bloodmagic/recipes/alchemytable/holy_water_anointment.json
0657a60976678fdfbdf0b8ee2c178502520d194a data/bloodmagic/recipes/alchemytable/leather_from_flesh.json
+93620eaad39a46a97f3381ff5c645e59d7dddd16 data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json
+b18dde32d8a428f44437c0e53e5fdb990597498d data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json
0a5ce0f2d09a596fb47b27a60e66eceeb04e0b0d data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json
f1fd76dab242882e327b4677b95328cb3a52deee data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json
e9f5a06e4800cb03cc13480db9fdb7b9fa47f487 data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json
@@ -536,6 +544,7 @@ f41e9bf8376ffcad07752b5657e27e06e500be0a data/bloodmagic/recipes/alchemytable/pl
842713a090b5abf3ce967dbee90d7582f7414949 data/bloodmagic/recipes/alchemytable/sand_coal.json
9292733697eca52de2c2ac7325ba45ab0354bfa3 data/bloodmagic/recipes/alchemytable/sand_gold.json
06f00cce47e0d5e5d25a2587796494340f8a3278 data/bloodmagic/recipes/alchemytable/sand_iron.json
+3e3359b89a8c38c0fdeb2b4ca2920bce053082f8 data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json
f7e91d164ea5c782420ff3507a98da16c5915b73 data/bloodmagic/recipes/alchemytable/slate_vial.json
a91e81c79959b522bcd1bac901bca646184015de data/bloodmagic/recipes/alchemytable/string.json
3c9d829f7bff8a4d607c46fc3ff4f86dffa28fd5 data/bloodmagic/recipes/altar/air_tool.json
@@ -687,6 +696,7 @@ af9b1a9ba1b16a85e3e1cf84b99e4cc9e12f9886 data/bloodmagic/tags/items/gravels/gold
19547e1b8859f1e2f1ae858e74b4456fc20be53f data/bloodmagic/tags/items/gravels/iron.json
3597daeddb742612d0b7fe2d0f711251a2781ac2 data/bloodmagic/tags/items/gravels/netherite_scrap.json
04fdfff381183672d6d7b3e55ded42a0a5b89f16 data/bloodmagic/tags/items/tiny_dusts/corrupted.json
+b7b3ffae086763317f5ed70a4f857e9634932972 data/forge/tags/fluids/life.json
4f8f46a7e30fe81d36790d3ffed37efef7c87d06 data/forge/tags/items/dusts/coal.json
82f2679934e550a1188658350e52cfac7c450c4d data/forge/tags/items/dusts/gold.json
205d57b4f622a13fceda5e8062d9bba80d619e92 data/forge/tags/items/dusts/hellforged.json
@@ -701,4 +711,3 @@ ca758f49ba878f8e498fe156d4916c1e332d552c data/forge/tags/items/ingots/hellforged
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/silver.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/tin.json
2ba6f93ee0567360afa3ae9999027b839ed06532 data/minecraft/tags/blocks/walls.json
-b7b3ffae086763317f5ed70a4f857e9634932972 data/minecraft/tags/fluids/life.json
diff --git a/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json
index fb67a253..49dacfe0 100644
--- a/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json
+++ b/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json
@@ -2,8 +2,8 @@
"multipart": [
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal1",
@@ -12,8 +12,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal1"
@@ -21,8 +21,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal1",
@@ -31,8 +31,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal1",
@@ -41,8 +41,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal1",
@@ -52,8 +52,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal1",
@@ -63,8 +63,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal2",
@@ -73,8 +73,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal2"
@@ -82,8 +82,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal2",
@@ -92,8 +92,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal2",
@@ -102,8 +102,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal2",
@@ -113,8 +113,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal2",
@@ -124,8 +124,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal3",
@@ -134,8 +134,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal3"
@@ -143,8 +143,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal3",
@@ -153,8 +153,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal3",
@@ -163,8 +163,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal3",
@@ -174,8 +174,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal3",
@@ -185,8 +185,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal4",
@@ -195,8 +195,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal4"
@@ -204,8 +204,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal4",
@@ -214,8 +214,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal4",
@@ -224,8 +224,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal4",
@@ -235,8 +235,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal4",
@@ -246,8 +246,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal5",
@@ -256,8 +256,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal5"
@@ -265,8 +265,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal5",
@@ -275,8 +275,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal5",
@@ -285,8 +285,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal5",
@@ -296,8 +296,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal5",
@@ -307,8 +307,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal6",
@@ -317,8 +317,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal6"
@@ -326,8 +326,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal6",
@@ -336,8 +336,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal6",
@@ -346,8 +346,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal6",
@@ -357,8 +357,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal6",
@@ -368,8 +368,8 @@
},
{
"when": {
- "age": "6",
- "attached": "down"
+ "attached": "down",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal7",
@@ -378,8 +378,8 @@
},
{
"when": {
- "age": "6",
- "attached": "up"
+ "attached": "up",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal7"
@@ -387,8 +387,8 @@
},
{
"when": {
- "age": "6",
- "attached": "north"
+ "attached": "north",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal7",
@@ -397,8 +397,8 @@
},
{
"when": {
- "age": "6",
- "attached": "south"
+ "attached": "south",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal7",
@@ -407,8 +407,8 @@
},
{
"when": {
- "age": "6",
- "attached": "west"
+ "attached": "west",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal7",
@@ -418,8 +418,8 @@
},
{
"when": {
- "age": "6",
- "attached": "east"
+ "attached": "east",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/corrosivecrystal7",
diff --git a/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json
index b99a263f..57ec0106 100644
--- a/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json
+++ b/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json
@@ -2,8 +2,8 @@
"multipart": [
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal1",
@@ -12,8 +12,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal1"
@@ -21,8 +21,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal1",
@@ -31,8 +31,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal1",
@@ -41,8 +41,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal1",
@@ -52,8 +52,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal1",
@@ -63,8 +63,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal2",
@@ -73,8 +73,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal2"
@@ -82,8 +82,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal2",
@@ -92,8 +92,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal2",
@@ -102,8 +102,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal2",
@@ -113,8 +113,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal2",
@@ -124,8 +124,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal3",
@@ -134,8 +134,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal3"
@@ -143,8 +143,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal3",
@@ -153,8 +153,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal3",
@@ -163,8 +163,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal3",
@@ -174,8 +174,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal3",
@@ -185,8 +185,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal4",
@@ -195,8 +195,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal4"
@@ -204,8 +204,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal4",
@@ -214,8 +214,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal4",
@@ -224,8 +224,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal4",
@@ -235,8 +235,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal4",
@@ -246,8 +246,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal5",
@@ -256,8 +256,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal5"
@@ -265,8 +265,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal5",
@@ -275,8 +275,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal5",
@@ -285,8 +285,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal5",
@@ -296,8 +296,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal5",
@@ -307,8 +307,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal6",
@@ -317,8 +317,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal6"
@@ -326,8 +326,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal6",
@@ -336,8 +336,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal6",
@@ -346,8 +346,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal6",
@@ -357,8 +357,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal6",
@@ -368,8 +368,8 @@
},
{
"when": {
- "age": "6",
- "attached": "down"
+ "attached": "down",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal7",
@@ -378,8 +378,8 @@
},
{
"when": {
- "age": "6",
- "attached": "up"
+ "attached": "up",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal7"
@@ -387,8 +387,8 @@
},
{
"when": {
- "age": "6",
- "attached": "north"
+ "attached": "north",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal7",
@@ -397,8 +397,8 @@
},
{
"when": {
- "age": "6",
- "attached": "south"
+ "attached": "south",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal7",
@@ -407,8 +407,8 @@
},
{
"when": {
- "age": "6",
- "attached": "west"
+ "attached": "west",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal7",
@@ -418,8 +418,8 @@
},
{
"when": {
- "age": "6",
- "attached": "east"
+ "attached": "east",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/destructivecrystal7",
diff --git a/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json
index be9a5c2a..868a1e78 100644
--- a/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json
+++ b/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json
@@ -2,8 +2,8 @@
"multipart": [
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal1",
@@ -12,8 +12,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal1"
@@ -21,8 +21,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal1",
@@ -31,8 +31,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal1",
@@ -41,8 +41,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal1",
@@ -52,8 +52,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal1",
@@ -63,8 +63,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal2",
@@ -73,8 +73,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal2"
@@ -82,8 +82,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal2",
@@ -92,8 +92,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal2",
@@ -102,8 +102,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal2",
@@ -113,8 +113,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal2",
@@ -124,8 +124,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal3",
@@ -134,8 +134,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal3"
@@ -143,8 +143,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal3",
@@ -153,8 +153,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal3",
@@ -163,8 +163,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal3",
@@ -174,8 +174,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal3",
@@ -185,8 +185,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal4",
@@ -195,8 +195,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal4"
@@ -204,8 +204,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal4",
@@ -214,8 +214,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal4",
@@ -224,8 +224,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal4",
@@ -235,8 +235,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal4",
@@ -246,8 +246,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal5",
@@ -256,8 +256,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal5"
@@ -265,8 +265,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal5",
@@ -275,8 +275,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal5",
@@ -285,8 +285,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal5",
@@ -296,8 +296,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal5",
@@ -307,8 +307,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal6",
@@ -317,8 +317,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal6"
@@ -326,8 +326,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal6",
@@ -336,8 +336,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal6",
@@ -346,8 +346,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal6",
@@ -357,8 +357,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal6",
@@ -368,8 +368,8 @@
},
{
"when": {
- "age": "6",
- "attached": "down"
+ "attached": "down",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal7",
@@ -378,8 +378,8 @@
},
{
"when": {
- "age": "6",
- "attached": "up"
+ "attached": "up",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal7"
@@ -387,8 +387,8 @@
},
{
"when": {
- "age": "6",
- "attached": "north"
+ "attached": "north",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal7",
@@ -397,8 +397,8 @@
},
{
"when": {
- "age": "6",
- "attached": "south"
+ "attached": "south",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal7",
@@ -407,8 +407,8 @@
},
{
"when": {
- "age": "6",
- "attached": "west"
+ "attached": "west",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal7",
@@ -418,8 +418,8 @@
},
{
"when": {
- "age": "6",
- "attached": "east"
+ "attached": "east",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/defaultcrystal7",
diff --git a/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json
index f886422f..5a7bc4f4 100644
--- a/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json
+++ b/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json
@@ -2,8 +2,8 @@
"multipart": [
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal1",
@@ -12,8 +12,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal1"
@@ -21,8 +21,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal1",
@@ -31,8 +31,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal1",
@@ -41,8 +41,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal1",
@@ -52,8 +52,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal1",
@@ -63,8 +63,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal2",
@@ -73,8 +73,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal2"
@@ -82,8 +82,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal2",
@@ -92,8 +92,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal2",
@@ -102,8 +102,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal2",
@@ -113,8 +113,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal2",
@@ -124,8 +124,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal3",
@@ -134,8 +134,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal3"
@@ -143,8 +143,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal3",
@@ -153,8 +153,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal3",
@@ -163,8 +163,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal3",
@@ -174,8 +174,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal3",
@@ -185,8 +185,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal4",
@@ -195,8 +195,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal4"
@@ -204,8 +204,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal4",
@@ -214,8 +214,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal4",
@@ -224,8 +224,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal4",
@@ -235,8 +235,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal4",
@@ -246,8 +246,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal5",
@@ -256,8 +256,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal5"
@@ -265,8 +265,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal5",
@@ -275,8 +275,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal5",
@@ -285,8 +285,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal5",
@@ -296,8 +296,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal5",
@@ -307,8 +307,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal6",
@@ -317,8 +317,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal6"
@@ -326,8 +326,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal6",
@@ -336,8 +336,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal6",
@@ -346,8 +346,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal6",
@@ -357,8 +357,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal6",
@@ -368,8 +368,8 @@
},
{
"when": {
- "age": "6",
- "attached": "down"
+ "attached": "down",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal7",
@@ -378,8 +378,8 @@
},
{
"when": {
- "age": "6",
- "attached": "up"
+ "attached": "up",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal7"
@@ -387,8 +387,8 @@
},
{
"when": {
- "age": "6",
- "attached": "north"
+ "attached": "north",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal7",
@@ -397,8 +397,8 @@
},
{
"when": {
- "age": "6",
- "attached": "south"
+ "attached": "south",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal7",
@@ -407,8 +407,8 @@
},
{
"when": {
- "age": "6",
- "attached": "west"
+ "attached": "west",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal7",
@@ -418,8 +418,8 @@
},
{
"when": {
- "age": "6",
- "attached": "east"
+ "attached": "east",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/steadfastcrystal7",
diff --git a/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json
index c4f8f825..75afc7be 100644
--- a/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json
+++ b/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json
@@ -2,8 +2,8 @@
"multipart": [
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal1",
@@ -12,8 +12,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal1"
@@ -21,8 +21,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal1",
@@ -31,8 +31,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal1",
@@ -41,8 +41,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal1",
@@ -52,8 +52,8 @@
},
{
"when": {
- "age": "0|1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "0|1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal1",
@@ -63,8 +63,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal2",
@@ -73,8 +73,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal2"
@@ -82,8 +82,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal2",
@@ -92,8 +92,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal2",
@@ -102,8 +102,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal2",
@@ -113,8 +113,8 @@
},
{
"when": {
- "age": "1|2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "1|2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal2",
@@ -124,8 +124,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal3",
@@ -134,8 +134,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal3"
@@ -143,8 +143,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal3",
@@ -153,8 +153,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal3",
@@ -163,8 +163,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal3",
@@ -174,8 +174,8 @@
},
{
"when": {
- "age": "2|3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "2|3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal3",
@@ -185,8 +185,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal4",
@@ -195,8 +195,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal4"
@@ -204,8 +204,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal4",
@@ -214,8 +214,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal4",
@@ -224,8 +224,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal4",
@@ -235,8 +235,8 @@
},
{
"when": {
- "age": "3|4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "3|4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal4",
@@ -246,8 +246,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal5",
@@ -256,8 +256,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal5"
@@ -265,8 +265,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal5",
@@ -275,8 +275,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal5",
@@ -285,8 +285,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal5",
@@ -296,8 +296,8 @@
},
{
"when": {
- "age": "4|5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "4|5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal5",
@@ -307,8 +307,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "down"
+ "attached": "down",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal6",
@@ -317,8 +317,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "up"
+ "attached": "up",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal6"
@@ -326,8 +326,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "north"
+ "attached": "north",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal6",
@@ -336,8 +336,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "south"
+ "attached": "south",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal6",
@@ -346,8 +346,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "west"
+ "attached": "west",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal6",
@@ -357,8 +357,8 @@
},
{
"when": {
- "age": "5|6",
- "attached": "east"
+ "attached": "east",
+ "age": "5|6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal6",
@@ -368,8 +368,8 @@
},
{
"when": {
- "age": "6",
- "attached": "down"
+ "attached": "down",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal7",
@@ -378,8 +378,8 @@
},
{
"when": {
- "age": "6",
- "attached": "up"
+ "attached": "up",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal7"
@@ -387,8 +387,8 @@
},
{
"when": {
- "age": "6",
- "attached": "north"
+ "attached": "north",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal7",
@@ -397,8 +397,8 @@
},
{
"when": {
- "age": "6",
- "attached": "south"
+ "attached": "south",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal7",
@@ -407,8 +407,8 @@
},
{
"when": {
- "age": "6",
- "attached": "west"
+ "attached": "west",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal7",
@@ -418,8 +418,8 @@
},
{
"when": {
- "age": "6",
- "attached": "east"
+ "attached": "east",
+ "age": "6"
},
"apply": {
"model": "bloodmagic:block/crystal/vengefulcrystal7",
diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json
index beaf2487..43c3f9b6 100644
--- a/src/generated/resources/assets/bloodmagic/lang/en_us.json
+++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json
@@ -1,5 +1,7 @@
{
"anointment.bloodmagic.fortune": "Fortunate",
+ "anointment.bloodmagic.hidden_knowledge": "Hidden Knowledge",
+ "anointment.bloodmagic.holy_water": "Holy Light",
"anointment.bloodmagic.melee_damage": "Whetstone",
"anointment.bloodmagic.silk_touch": "Soft Touch",
"block.bloodmagic.accelerationrune": "Acceleration Rune",
@@ -103,6 +105,7 @@
"item.bloodmagic.experiencebook": "Tome of Peritia",
"item.bloodmagic.explosivepowder": "Explosive Powder",
"item.bloodmagic.firescribetool": "Inscription Tool: Fire",
+ "item.bloodmagic.fortune_anointment": "Fortuna Extract",
"item.bloodmagic.fragment_netherite_scrap": "Ancient Debris Fragment",
"item.bloodmagic.furnacecell_primitive": "Primitive Fuel Cell",
"item.bloodmagic.goldfragment": "Gold Ore Fragment",
@@ -110,6 +113,8 @@
"item.bloodmagic.goldsand": "Gold Sand",
"item.bloodmagic.gravel_netherite_scrap": "Ancient Debris Gravel",
"item.bloodmagic.growthsigil": "Sigil of the Green Grove",
+ "item.bloodmagic.hidden_knowledge_anointment": "Liquid Knowledge",
+ "item.bloodmagic.holy_water_anointment": "Holy Water",
"item.bloodmagic.icesigil": "Sigil of the Frozen Lake",
"item.bloodmagic.infusedslate": "Imbued Slate",
"item.bloodmagic.ironfragment": "Iron Ore Fragment",
@@ -180,11 +185,13 @@
"jei.bloodmagic.recipe.arcfurnace": "ARC Furnace Recipe",
"jei.bloodmagic.recipe.consumptionrate": "Consumption: %s LP/t",
"jei.bloodmagic.recipe.drainrate": "Drain: %s LP/t",
+ "jei.bloodmagic.recipe.lpDrained": "Drained: %s LP",
"jei.bloodmagic.recipe.minimumsouls": "Minimum: %s Will",
"jei.bloodmagic.recipe.requiredlp": "LP: %d",
"jei.bloodmagic.recipe.requiredtier": "Tier: %d",
"jei.bloodmagic.recipe.soulforge": "Hellfire Forge",
"jei.bloodmagic.recipe.soulsdrained": "Drained: %s Will",
+ "jei.bloodmagic.recipe.ticksRequired": "Time: %sTicks",
"living_upgrade.bloodmagic.arrow_protect": "Pin Cushion",
"living_upgrade.bloodmagic.arrow_shot": "Trick Shot",
"living_upgrade.bloodmagic.battleHunger": "Battle Hungry",
diff --git a/src/generated/resources/assets/bloodmagic/models/item/hidden_knowledge_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/hidden_knowledge_anointment.json
new file mode 100644
index 00000000..5d52447b
--- /dev/null
+++ b/src/generated/resources/assets/bloodmagic/models/item/hidden_knowledge_anointment.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "bloodmagic:item/alchemic_vial",
+ "layer1": "bloodmagic:item/alchemic_liquid",
+ "layer2": "bloodmagic:item/alchemic_ribbon"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/bloodmagic/models/item/holy_water_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/holy_water_anointment.json
new file mode 100644
index 00000000..5d52447b
--- /dev/null
+++ b/src/generated/resources/assets/bloodmagic/models/item/holy_water_anointment.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "bloodmagic:item/alchemic_vial",
+ "layer1": "bloodmagic:item/alchemic_liquid",
+ "layer2": "bloodmagic:item/alchemic_ribbon"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json
index 3fe65060..5e30f8ec 100644
--- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json
@@ -12,6 +12,6 @@
"item": "minecraft:bread"
},
"syphon": 100,
- "ticks": 200,
+ "ticks": 100,
"upgradeLevel": 1
}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/cobweb.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/cobweb.json
new file mode 100644
index 00000000..847b555a
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/cobweb.json
@@ -0,0 +1,20 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "tag": "forge:string"
+ },
+ {
+ "tag": "forge:string"
+ },
+ {
+ "tag": "forge:string"
+ }
+ ],
+ "output": {
+ "item": "minecraft:cobweb"
+ },
+ "syphon": 50,
+ "ticks": 50,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/fortune_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/fortune_anointment.json
new file mode 100644
index 00000000..2f66bc4e
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/fortune_anointment.json
@@ -0,0 +1,23 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "item": "bloodmagic:slate_vial"
+ },
+ {
+ "tag": "forge:crops/nether_wart"
+ },
+ {
+ "tag": "forge:dusts/redstone"
+ },
+ {
+ "tag": "forge:dusts/coal"
+ }
+ ],
+ "output": {
+ "item": "bloodmagic:fortune_anointment"
+ },
+ "syphon": 500,
+ "ticks": 100,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json
new file mode 100644
index 00000000..228e57a5
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json
@@ -0,0 +1,23 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "item": "bloodmagic:slate_vial"
+ },
+ {
+ "tag": "forge:crops/nether_wart"
+ },
+ {
+ "item": "minecraft:glass_bottle"
+ },
+ {
+ "item": "minecraft:enchanted_book"
+ }
+ ],
+ "output": {
+ "item": "bloodmagic:hidden_knowledge_anointment"
+ },
+ "syphon": 500,
+ "ticks": 100,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/holy_water_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/holy_water_anointment.json
new file mode 100644
index 00000000..126bd5aa
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/holy_water_anointment.json
@@ -0,0 +1,23 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "item": "bloodmagic:slate_vial"
+ },
+ {
+ "tag": "forge:crops/nether_wart"
+ },
+ {
+ "item": "minecraft:glistering_melon_slice"
+ },
+ {
+ "tag": "forge:gems/quartz"
+ }
+ ],
+ "output": {
+ "item": "bloodmagic:holy_water_anointment"
+ },
+ "syphon": 500,
+ "ticks": 100,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json
new file mode 100644
index 00000000..496abd4b
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json
@@ -0,0 +1,23 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "item": "bloodmagic:slate_vial"
+ },
+ {
+ "tag": "forge:crops/nether_wart"
+ },
+ {
+ "item": "minecraft:blaze_powder"
+ },
+ {
+ "tag": "forge:gems/quartz"
+ }
+ ],
+ "output": {
+ "item": "bloodmagic:melee_anointment"
+ },
+ "syphon": 500,
+ "ticks": 100,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json
new file mode 100644
index 00000000..10442cb7
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json
@@ -0,0 +1,14 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "item": "minecraft:nether_wart_block"
+ }
+ ],
+ "output": {
+ "item": "minecraft:nether_wart"
+ },
+ "syphon": 50,
+ "ticks": 40,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json
new file mode 100644
index 00000000..764753f6
--- /dev/null
+++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json
@@ -0,0 +1,23 @@
+{
+ "type": "bloodmagic:alchemytable",
+ "input": [
+ {
+ "item": "bloodmagic:slate_vial"
+ },
+ {
+ "tag": "forge:crops/nether_wart"
+ },
+ {
+ "item": "minecraft:cobweb"
+ },
+ {
+ "tag": "forge:nuggets/gold"
+ }
+ ],
+ "output": {
+ "item": "bloodmagic:silk_touch_anointment"
+ },
+ "syphon": 500,
+ "ticks": 100,
+ "upgradeLevel": 1
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/fluids/life.json b/src/generated/resources/data/forge/tags/fluids/life.json
similarity index 100%
rename from src/generated/resources/data/minecraft/tags/fluids/life.json
rename to src/generated/resources/data/forge/tags/fluids/life.json
diff --git a/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java b/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java
index 2c7e50c8..e25cebff 100644
--- a/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java
+++ b/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java
@@ -7,12 +7,14 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
+import java.util.Set;
import java.util.UUID;
import java.util.function.Consumer;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
import com.google.common.reflect.TypeToken;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
@@ -41,7 +43,7 @@ public class Anointment extends ForgeRegistryEntry<Anointment>
public static final Anointment DUMMY = new Anointment(new ResourceLocation("dummy"));
private final ResourceLocation key;
-// private final Set<ResourceLocation> incompatible;
+ private final Set<ResourceLocation> incompatible;
private String translationKey = null;
private final Map<String, Bonus> bonuses;
private IAttributeProvider attributeProvider;
@@ -52,12 +54,14 @@ public class Anointment extends ForgeRegistryEntry<Anointment>
public Anointment(ResourceLocation key)
{
this.key = key;
+ this.incompatible = Sets.newHashSet();
this.bonuses = Maps.newHashMap();
}
public Anointment withBonusSet(String id, Consumer<List<Number>> modifiers)
{
// List<Number> values = DefaultedList.of();
+
List<Number> values = new ArrayList<Number>();
modifiers.accept(values);
@@ -172,6 +176,18 @@ public class Anointment extends ForgeRegistryEntry<Anointment>
return false;
}
+ public boolean isCompatible(ResourceLocation otherUpgrade)
+ {
+ return !incompatible.contains(otherUpgrade);
+ }
+
+ public Anointment addIncompatibility(ResourceLocation key, ResourceLocation... otherKeys)
+ {
+ incompatible.add(key);
+ Collections.addAll(incompatible, otherKeys);
+ return this;
+ }
+
public String getTranslationKey()
{
return translationKey == null ? translationKey = Util.makeTranslationKey("anointment", key) : translationKey;
diff --git a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java b/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java
index a87e9aab..84b556c4 100644
--- a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java
+++ b/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java
@@ -44,13 +44,38 @@ public class AnointmentHolder
{
anointments.put(anointment, data);
anointment.applyAnointment(this, stack, data.getLevel());
+ return true;
}
- return true;
+ return false;
}
public boolean canApplyAnointment(ItemStack stack, Anointment anointment, AnointmentData data)
{
+ ResourceLocation key = anointment.getKey();
+ for (Anointment containedAnoint : anointments.keySet())
+ {
+ ResourceLocation containedKey = containedAnoint.getKey();
+ if (!anointment.isCompatible(containedKey) || !containedAnoint.isCompatible(key))
+ {
+ return false;
+ }
+ }
+
+ if (anointments.containsKey(anointment))
+ {
+ AnointmentData prevData = anointments.get(anointment);
+ int level = prevData.getLevel();
+ int remainingDur = prevData.getMaxDamage() - prevData.getDamage();
+ if (level < data.getLevel() || (level == data.getLevel() && remainingDur < (data.getMaxDamage() - data.getDamage())))
+ {
+ return true;
+ } else
+ {
+ return false;
+ }
+ }
+
return true;
}
diff --git a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java
index c7ea5155..c3c9468c 100644
--- a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java
+++ b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java
@@ -68,7 +68,7 @@ public class ClientEvents
public static void colorHandlerEvent(ColorHandlerEvent.Item event)
{
- event.getItemColors().register(new AnointmentColor(), BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get(), BloodMagicItems.SILK_TOUCH_ANOINTMENT.get(), BloodMagicItems.FORTUNE_ANOINTMENT.get());
+ event.getItemColors().register(new AnointmentColor(), BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get(), BloodMagicItems.SILK_TOUCH_ANOINTMENT.get(), BloodMagicItems.FORTUNE_ANOINTMENT.get(), BloodMagicItems.HOLY_WATER_ANOINTMENT.get(), BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT.get());
}
@SuppressWarnings("deprecation")
diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java
index 2b45d035..53be9f2e 100644
--- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java
+++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java
@@ -96,6 +96,8 @@ public class GeneratorItemModels extends ItemModelProvider
registerMultiLayerItem(BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon"));
registerMultiLayerItem(BloodMagicItems.SILK_TOUCH_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon"));
registerMultiLayerItem(BloodMagicItems.FORTUNE_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon"));
+ registerMultiLayerItem(BloodMagicItems.HOLY_WATER_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon"));
+ registerMultiLayerItem(BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon"));
}
private void registerCustomFullTexture(Block block, String texturePath)
diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
index 9765852e..fc42a594 100644
--- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
+++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
@@ -350,6 +350,8 @@ public class GeneratorLanguage extends LanguageProvider
add("anointment.bloodmagic.melee_damage", "Whetstone");
add("anointment.bloodmagic.silk_touch", "Soft Touch");
add("anointment.bloodmagic.fortune", "Fortunate");
+ add("anointment.bloodmagic.holy_water", "Holy Light");
+ add("anointment.bloodmagic.hidden_knowledge", "Hidden Knowledge");
// Guide
add("guide.bloodmagic.name", "Sanguine Scientiem");
@@ -534,6 +536,8 @@ public class GeneratorLanguage extends LanguageProvider
addItem(BloodMagicItems.MELEE_DAMAGE_ANOINTMENT, "Honing Oil");
addItem(BloodMagicItems.SILK_TOUCH_ANOINTMENT, "Soft Coating");
addItem(BloodMagicItems.FORTUNE_ANOINTMENT, "Fortuna Extract");
+ addItem(BloodMagicItems.HOLY_WATER_ANOINTMENT, "Holy Water");
+ addItem(BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT, "Liquid Knowledge");
// Alchemy Items
addItem(BloodMagicItems.PLANT_OIL, "Plant Oil");
@@ -566,6 +570,9 @@ public class GeneratorLanguage extends LanguageProvider
add("jei.bloodmagic.recipe.consumptionrate", "Consumption: %s LP/t");
add("jei.bloodmagic.recipe.drainrate", "Drain: %s LP/t");
+ add("jei.bloodmagic.recipe.lpDrained", "Drained: %s LP");
+ add("jei.bloodmagic.recipe.ticksRequired", "Time: %sTicks");
+
add("jei.bloodmagic.recipe.altar", "Blood Altar");
add("jei.bloodmagic.recipe.soulforge", "Hellfire Forge");
add("jei.bloodmagic.recipe.alchemyarraycrafting", "Alchemy Array");
diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java
index 5d5d6ef6..8f01525d 100644
--- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java
+++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java
@@ -219,9 +219,11 @@ public class BloodMagicItems
// Anointments
public static final RegistryObject<Item> SLATE_VIAL = ITEMS.register("slate_vial", () -> new ItemBase(16, "slate_vial"));
- public static final RegistryObject<Item> MELEE_DAMAGE_ANOINTMENT = ITEMS.register("melee_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("melee_damage"), 0xFF0000, 1, 128));
+ public static final RegistryObject<Item> MELEE_DAMAGE_ANOINTMENT = ITEMS.register("melee_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("melee_damage"), 0xFF0000, 1, 256));
public static final RegistryObject<Item> SILK_TOUCH_ANOINTMENT = ITEMS.register("silk_touch_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("silk_touch"), 0x00B0FF, 1, 256));
- public static final RegistryObject<Item> FORTUNE_ANOINTMENT = ITEMS.register("fortune_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("fortune"), 3381504, 1, 128));
+ public static final RegistryObject<Item> FORTUNE_ANOINTMENT = ITEMS.register("fortune_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("fortune"), 3381504, 1, 256));
+ public static final RegistryObject<Item> HOLY_WATER_ANOINTMENT = ITEMS.register("holy_water_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("holy_water"), 0xC6E6FB, 1, 256));
+ public static final RegistryObject<Item> HIDDEN_KNOWLEDGE_ANOINTMENT = ITEMS.register("hidden_knowledge_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("hidden_knowledge"), 0xC8F902, 1, 256));
// Fragments
public static final RegistryObject<Item> IRON_FRAGMENT = BASICITEMS.register("ironfragment", () -> new ItemBase());
diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java
index 26020661..ae1f0638 100644
--- a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java
+++ b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java
@@ -24,9 +24,11 @@ public class AlchemyTableRecipeProvider implements ISubRecipeProvider
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.FLINT, 2), 50, 20, 0).addIngredient(Ingredient.fromItems(Items.GRAVEL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "flint_from_gravel"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.FLINT)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "leather_from_flesh"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.EXPLOSIVE_POWDER.get()), 500, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).build(consumer, BloodMagic.rl(basePath + "explosive_powder"));
- AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.BREAD), 100, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "bread"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.BREAD), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "bread"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Blocks.GRASS_BLOCK), 200, 200, 1).addIngredient(Ingredient.fromItems(Items.DIRT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).addIngredient(Ingredient.fromItems(Items.WHEAT_SEEDS)).build(consumer, BloodMagic.rl(basePath + "grass_block"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.CLAY_BALL, 2), 50, 100, 2).addIngredient(Ingredient.fromTag(Tags.Items.SAND)).addIngredient(Ingredient.fromTag(Tags.Items.SAND)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "clay_from_sand"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.COBWEB), 50, 50, 1).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).build(consumer, BloodMagic.rl(basePath + "cobweb"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.NETHER_WART), 50, 40, 1).addIngredient(Ingredient.fromItems(Items.NETHER_WART_BLOCK)).build(consumer, BloodMagic.rl(basePath + "nether_wart_from_block"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_SULFUR)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_SALTPETER)).addIngredient(Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "gunpowder"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_carrots"));
@@ -41,7 +43,10 @@ public class AlchemyTableRecipeProvider implements ISubRecipeProvider
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.BASIC_CUTTING_FLUID.get()), 1000, 200, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.PLANT_OIL.get())).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromItems(Items.SUGAR)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).addIngredient(Ingredient.fromStacks(new ItemStack(Items.POTION))).build(consumer, BloodMagic.rl(basePath + "basic_cutting_fluid"));
AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.SLATE_VIAL.get(), 8), 500, 200, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE.get())).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).build(consumer, BloodMagic.rl(basePath + "slate_vial"));
- AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.FORTUNE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).build(consumer, BloodMagic.rl(basePath + "anointment_silk_touch"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.FORTUNE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).build(consumer, BloodMagic.rl(basePath + "fortune_anointment"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.SILK_TOUCH_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.COBWEB)).addIngredient(Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "silk_touch_anointment"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.BLAZE_POWDER)).addIngredient(Ingredient.fromTag(Tags.Items.GEMS_QUARTZ)).build(consumer, BloodMagic.rl(basePath + "melee_damage_anointment"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.HOLY_WATER_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.GLISTERING_MELON_SLICE)).addIngredient(Ingredient.fromTag(Tags.Items.GEMS_QUARTZ)).build(consumer, BloodMagic.rl(basePath + "holy_water_anointment"));
+ AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.GLASS_BOTTLE)).addIngredient(Ingredient.fromItems(Items.ENCHANTED_BOOK)).build(consumer, BloodMagic.rl(basePath + "hidden_knowledge_anointment"));
}
-
}
diff --git a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java
index 63ab06f8..a49309e5 100644
--- a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java
+++ b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java
@@ -19,7 +19,7 @@ public class BloodMagicTags
public static final ITag.INamedTag<Item> CRYSTAL_DEMON = ItemTags.makeWrapperTag("bloodmagic:crystals/demon");
- public static final ITag.INamedTag<Fluid> LIFE_ESSENCE = FluidTags.makeWrapperTag("bloodmagic:life");
+ public static final ITag.INamedTag<Fluid> LIFE_ESSENCE = FluidTags.makeWrapperTag("forge:life");
// Ores
public static final ITag.INamedTag<Item> ORE_COPPER = getForgeOreTag("copper");
diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java
index 69454311..1909e83f 100644
--- a/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java
+++ b/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java
@@ -17,10 +17,13 @@ import mezz.jei.api.recipe.category.IRecipeCategory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
import wayoftime.bloodmagic.core.registry.OrbRegistry;
+import wayoftime.bloodmagic.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.util.ChatUtil;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.TextHelper;
@@ -51,19 +54,26 @@ public class AlchemyTableRecipeCategory implements IRecipeCategory<RecipeAlchemy
return UID;
}
-// @Override
-// public List<ITextComponent> getTooltipStrings(RecipeBloodAltar recipe, double mouseX, double mouseY)
-// {
-// List<ITextComponent> tooltip = Lists.newArrayList();
-//
+ @Override
+ public List<ITextComponent> getTooltipStrings(RecipeAlchemyTable recipe, double mouseX, double mouseY)
+ {
+ List<ITextComponent> tooltip = Lists.newArrayList();
+
// if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58)
// {
// tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.consumptionrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getConsumeRate())));
// tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.drainrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getDrainRate())));
// }
-//
-// return tooltip;
-// }
+
+ if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34)
+ {
+ tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.tier", ChatUtil.DECIMAL_FORMAT.format(recipe.getMinimumTier())));
+ tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.lpDrained", ChatUtil.DECIMAL_FORMAT.format(recipe.getSyphon())));
+ tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.ticksRequired", ChatUtil.DECIMAL_FORMAT.format(recipe.getTicks())));
+ }
+
+ return tooltip;
+ }
@Nonnull
@Override
diff --git a/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java b/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java
index 135fd222..177095a0 100644
--- a/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java
+++ b/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java
@@ -24,6 +24,8 @@ public class AnointmentRegistrar
private static final Map<String, ResourceLocation> DEFINITIONS = ((Supplier<Map<String, ResourceLocation>>) () -> {
Map<String, ResourceLocation> def = new HashMap<>();
def.put("melee_damage", BloodMagic.rl("melee_damage"));
+ def.put("holy_water", BloodMagic.rl("holy_water"));
+ def.put("hidden_knowledge", BloodMagic.rl("hidden_knowledge"));
// def.put("arrow_shot", BloodMagic.rl("arrow_shot"));
// def.put("critical_strike", BloodMagic.rl("critical_strike"));
// def.put("digging", BloodMagic.rl("digging"));
@@ -49,17 +51,28 @@ public class AnointmentRegistrar
public static final AnointmentRegistryObject<Anointment> ANOINTMENT_MELEE_DAMAGE = ANOINTMENTS.register("melee_damage", () -> parseDefinition("melee_damage").withDamageProvider((player, weapon, damage, holder, attacked, anoint, level) -> {
return anoint.getBonusValue("damage", level).doubleValue();
- }).setConsumeOnAttack());
+ }).setConsumeOnAttack().addIncompatibility(BloodMagic.rl("holy_water")));
- public static final AnointmentRegistryObject<Anointment> ANOINTMENT_SILK_TOUCH = ANOINTMENTS.register("silk_touch", () -> new Anointment(BloodMagic.rl("silk_touch")).setConsumeOnHarvest());
+ public static final AnointmentRegistryObject<Anointment> ANOINTMENT_SILK_TOUCH = ANOINTMENTS.register("silk_touch", () -> new Anointment(BloodMagic.rl("silk_touch")).setConsumeOnHarvest().addIncompatibility(BloodMagic.rl("fortune")));
- public static final AnointmentRegistryObject<Anointment> ANOINTMENT_FORTUNE = ANOINTMENTS.register("fortune", () -> new Anointment(BloodMagic.rl("fortune")).setConsumeOnHarvest());
+ public static final AnointmentRegistryObject<Anointment> ANOINTMENT_FORTUNE = ANOINTMENTS.register("fortune", () -> new Anointment(BloodMagic.rl("fortune")).setConsumeOnHarvest().addIncompatibility(BloodMagic.rl("silk_touch")));
+
+ public static final AnointmentRegistryObject<Anointment> ANOINTMENT_HOLY_WATER = ANOINTMENTS.register("holy_water", () -> parseDefinition("holy_water").withDamageProvider((player, weapon, damage, holder, attacked, anoint, level) -> {
+ if (attacked.isEntityUndead())
+ return anoint.getBonusValue("damage", level).doubleValue();
+ else
+ return 0;
+ }).setConsumeOnAttack().addIncompatibility(BloodMagic.rl("melee_damage")));
+
+ public static final AnointmentRegistryObject<Anointment> ANOINTMENT_HIDDEN_KNOWLEDGE = ANOINTMENTS.register("hidden_knowledge", () -> parseDefinition("hidden_knowledge").setConsumeOnHarvest());
public static void register()
{
registerAnointment(ANOINTMENT_MELEE_DAMAGE.get());
registerAnointment(ANOINTMENT_SILK_TOUCH.get());
registerAnointment(ANOINTMENT_FORTUNE.get());
+ registerAnointment(ANOINTMENT_HOLY_WATER.get());
+ registerAnointment(ANOINTMENT_HIDDEN_KNOWLEDGE.get());
// Registry.register(UPGRADES, UPGRADE_ARROW_PROTECT.getKey(), UPGRADE_ARROW_PROTECT);
// Registry.register(UPGRADES, UPGRADE_ARROW_SHOT.getKey(), UPGRADE_ARROW_SHOT);
// Registry.register(UPGRADES, UPGRADE_CRITICAL_STRIKE.getKey(), UPGRADE_CRITICAL_STRIKE);
diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
index c2846807..a38439af 100644
--- a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
+++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
@@ -482,7 +482,7 @@ public class GenericHandler
event.setNewSpeed((1 + percentIncrease) * event.getNewSpeed());
}
- @SubscribeEvent
+ @SubscribeEvent(priority = EventPriority.HIGHEST)
public void onBreakBlock(BlockEvent.BreakEvent event)
{
PlayerEntity player = event.getPlayer();
@@ -511,6 +511,14 @@ public class GenericHandler
event.setExpToDrop(exp);
}
+ int hiddenLevel = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_HIDDEN_KNOWLEDGE.get());
+ if (hiddenLevel > 0)
+ {
+ double expBonus = AnointmentRegistrar.ANOINTMENT_HIDDEN_KNOWLEDGE.get().getBonusValue("exp", hiddenLevel).doubleValue();
+ int expAdded = (int) expBonus + (expBonus % 1 > event.getWorld().getRandom().nextDouble() ? 1 : 0);
+ event.setExpToDrop(event.getExpToDrop() + expAdded);
+ }
+
if (holder.consumeAnointmentDurabilityOnHarvest(heldStack, EquipmentSlotType.MAINHAND))
holder.toItemStack(heldStack);
}
diff --git a/src/main/resources/data/bloodmagic/anointment/hidden_knowledge.json b/src/main/resources/data/bloodmagic/anointment/hidden_knowledge.json
new file mode 100644
index 00000000..b7e2a2d6
--- /dev/null
+++ b/src/main/resources/data/bloodmagic/anointment/hidden_knowledge.json
@@ -0,0 +1,10 @@
+{
+ "id": "bloodmagic:hidden_knowledge",
+ "bonuses": {
+ "exp": [
+ 2,
+ 4,
+ 6
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/bloodmagic/anointment/holy_water.json b/src/main/resources/data/bloodmagic/anointment/holy_water.json
new file mode 100644
index 00000000..58a29778
--- /dev/null
+++ b/src/main/resources/data/bloodmagic/anointment/holy_water.json
@@ -0,0 +1,10 @@
+{
+ "id": "bloodmagic:holy_water",
+ "bonuses": {
+ "damage": [
+ 5,
+ 10,
+ 15
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/bloodmagic/anointment/melee_damage.json b/src/main/resources/data/bloodmagic/anointment/melee_damage.json
index e6805b67..e0a0f500 100644
--- a/src/main/resources/data/bloodmagic/anointment/melee_damage.json
+++ b/src/main/resources/data/bloodmagic/anointment/melee_damage.json
@@ -2,9 +2,9 @@
"id": "bloodmagic:melee_damage",
"bonuses": {
"damage": [
- 2,
3,
- 4
+ 6,
+ 9
]
}
}
\ No newline at end of file