Did I forget some things? O wO

This commit is contained in:
WayofTime 2020-11-06 17:00:08 -05:00
parent 15e538c800
commit d8ba32c412
23 changed files with 684 additions and 437 deletions

View file

@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.16.3-3.0-3'
version = '1.16.3-3.0.0-1'
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'BloodMagic'

View file

@ -7,8 +7,8 @@ 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
b696f680545dffa4d3fbcc83b4b81ab58ac69aef assets/bloodmagic/blockstates/destructivedemoncrystal.json
d81673d78195fecd20f55daff394882c1fca18c3 assets/bloodmagic/blockstates/corrosivedemoncrystal.json
5efc11906969389596d32e159d4e973672d5ca56 assets/bloodmagic/blockstates/destructivedemoncrystal.json
6bd58d1d02a40416cec29409dee7ef80038b26d5 assets/bloodmagic/blockstates/dislocationrune.json
ba1cd8a9475212843e3b26232c8a9943fa0d2d20 assets/bloodmagic/blockstates/duskritualstone.json
bb3db171734f511fc0c259d86e869b49aa1d0c77 assets/bloodmagic/blockstates/earthritualstone.json
@ -17,15 +17,15 @@ f78ce2be09ab794bf5f5679414eee0dc85cf4fb1 assets/bloodmagic/blockstates/largebloo
002795212cc7bf2cad2a91f873d85e2204c6367d assets/bloodmagic/blockstates/lightritualstone.json
e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterritualstone.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
487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json
f1ca47098385a955155cab9c2a97219e02d390a0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json
48ed6b25a5d8d8074c38d772fdc27c1753d42c36 assets/bloodmagic/blockstates/vengefuldemoncrystal.json
52b8ed3cc54b68d5f7927d1f24cfee825b526cc0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json
3333b28d8b7411aa19394519df115c9d112836f5 assets/bloodmagic/blockstates/vengefuldemoncrystal.json
e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json
082f32e7c041f42f5043c7b860eaf410b9bea287 assets/bloodmagic/lang/en_us.json
d6115a34fd581edc2112a9b9e25bfda52468377f 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
@ -226,9 +226,12 @@ f72efc172699d43405019add97f455bd6b7f452b assets/bloodmagic/models/item/weakblood
04faf23bcb783a306c3b7a8a375ac2bf87c1072b data/bloodmagic/advancements/recipes/bloodmagictab/alchemy_table.json
e6a3ac3998653b10ee09780be9099a9d0c5b3917 data/bloodmagic/advancements/recipes/bloodmagictab/arc.json
828c0f89e747d48d37c6a86030a8ec59ca5c29cb data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json
80cf1e0f026565be99279c46306b92be06bda65c data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_acceleration.json
f77e3947a24a252c04a80d1eb26547a3fbf868e7 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_aug_capacity.json
f8b66411c96c6a7a409fb10f6888d078f1f8fa14 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json
ab5612f33028487c08e51de4b91bb786df1b1b95 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json
e59e508cdbd51f62f83559edeb5f2a89226d7694 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json
d707d48cc670ae65f224487a5012d5464c0a9760 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_displacement.json
e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json
4a53004c651901cd1245de452810161736d9b067 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json
263f7c251d2f163db5bd229f2ab8a222f23ae03a data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json
@ -339,9 +342,12 @@ f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsig
cabe693e7c714203ad708a1068f302b3ee3120b0 data/bloodmagic/recipes/array/voidsigil.json
5e68d933fff631142a8dd819aee235d343d43cff data/bloodmagic/recipes/array/watersigil.json
de8dbcf4d69bd3b47693c4631578a9b5c0e3f50c data/bloodmagic/recipes/blood_altar.json
f4de3cfc4616f762b4a87b08510153ae06733528 data/bloodmagic/recipes/blood_rune_acceleration.json
78e3f4666bc13897821abec9fa41e8b72accd007 data/bloodmagic/recipes/blood_rune_aug_capacity.json
68edddac5949c404e00b2ebe897c9fd3045cb907 data/bloodmagic/recipes/blood_rune_blank.json
5c4e4af372250a3f967666f0f97198547cfbd5e1 data/bloodmagic/recipes/blood_rune_capacity.json
f905c1a8ca4d3a9f841ca6c44caa91de327fc29d data/bloodmagic/recipes/blood_rune_charging.json
ac0ee73ab691edd09be24453bd3fe3dc1a8f1ecb data/bloodmagic/recipes/blood_rune_displacement.json
89563d5c176d465632a45005cbe5e570791fd8dd data/bloodmagic/recipes/blood_rune_orb.json
b63d77c3762f86d4a91f62e192c3e9b26e3b52ca data/bloodmagic/recipes/blood_rune_sacrifice.json
7c4e247c1df6ef594bbb2fc2196afb102f45982b data/bloodmagic/recipes/blood_rune_self_sacrifice.json
@ -401,4 +407,8 @@ af9b1a9ba1b16a85e3e1cf84b99e4cc9e12f9886 data/bloodmagic/tags/items/gravels/gold
625a1e6a3b635b2ac5176a49afbae9b476de4f71 data/forge/tags/items/dusts/iron.json
9380fe45b06787ba776af4a7d542a047c1441031 data/forge/tags/items/dusts/saltpeter.json
5c709b6444acb94ca784c33618547ba535e15db2 data/forge/tags/items/dusts/sulfur.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/iron.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/copper.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/lead.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/osmium.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/silver.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/tin.json

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -13,7 +13,7 @@
"block.bloodmagic.demoncrucible": "Demon Crucible",
"block.bloodmagic.demoncrystallizer": "Demon Crystallizer",
"block.bloodmagic.destructivedemoncrystal": "Destructive Crystal Cluster",
"block.bloodmagic.dislocationrune": "DisplacementRune",
"block.bloodmagic.dislocationrune": "Displacement Rune",
"block.bloodmagic.duskritualstone": "Dusk Ritual Stone",
"block.bloodmagic.earthritualstone": "Earth Ritual Stone",
"block.bloodmagic.fireritualstone": "Fire Ritual Stone",
@ -54,9 +54,12 @@
"item.bloodmagic.blankslate": "Blank Slate",
"item.bloodmagic.bloodlightsigil": "Sigil of the Blood Lamp",
"item.bloodmagic.coalsand": "Coal Sand",
"item.bloodmagic.corrosivecrystal": "Corrosive Will Crystal",
"item.bloodmagic.crystalline_resonator": "Crystalline Resonator",
"item.bloodmagic.daggerofsacrifice": "Dagger of Sacrifice",
"item.bloodmagic.defaultcrystal": "Demon Will Crystal",
"item.bloodmagic.demonslate": "Demonic Slate",
"item.bloodmagic.destructivecrystal": "Destructive Will Crystal",
"item.bloodmagic.divinationsigil": "Divination Sigil",
"item.bloodmagic.duskscribetool": "Inscription Tool: Dusk",
"item.bloodmagic.earthscribetool": "Inscription Tool: Earth",
@ -104,7 +107,9 @@
"item.bloodmagic.soulgempetty": "Petty Tartaric Gem",
"item.bloodmagic.soulsnare": "Soul Snare",
"item.bloodmagic.soulsword": "Sentient Sword",
"item.bloodmagic.steadfastcrystal": "Steadfast Will Crystal",
"item.bloodmagic.sulfur": "Sulfur",
"item.bloodmagic.vengefulcrystal": "Vengeful Will Crystal",
"item.bloodmagic.voidsigil": "Void Sigil",
"item.bloodmagic.waterscribetool": "Inscription Tool: Water",
"item.bloodmagic.watersigil": "Water Sigil",

View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"bloodmagic:blood_rune_acceleration"
]
},
"criteria": {
"has_master_orb": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "bloodmagic:masterbloodorb"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "bloodmagic:blood_rune_acceleration"
}
}
},
"requirements": [
[
"has_master_orb",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"bloodmagic:blood_rune_aug_capacity"
]
},
"criteria": {
"has_master_orb": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "bloodmagic:masterbloodorb"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "bloodmagic:blood_rune_aug_capacity"
}
}
},
"requirements": [
[
"has_master_orb",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"bloodmagic:blood_rune_displacement"
]
},
"criteria": {
"has_imbued_slate": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "bloodmagic:infusedslate"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "bloodmagic:blood_rune_displacement"
}
}
},
"requirements": [
[
"has_imbued_slate",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"aba",
"cdc",
"aea"
],
"key": {
"a": {
"item": "minecraft:bucket"
},
"b": {
"item": "bloodmagic:demonslate"
},
"c": {
"tag": "forge:ingots/gold"
},
"d": {
"item": "bloodmagic:speedrune"
},
"e": {
"type": "bloodmagic:bloodorb",
"orb_tier": 4
}
},
"result": {
"item": "bloodmagic:accelerationrune"
}
}

View file

@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"aba",
"cdc",
"aea"
],
"key": {
"a": {
"tag": "forge:obsidian"
},
"b": {
"item": "bloodmagic:demonslate"
},
"c": {
"item": "minecraft:bucket"
},
"d": {
"item": "bloodmagic:altarcapacityrune"
},
"e": {
"type": "bloodmagic:bloodorb",
"orb_tier": 4
}
},
"result": {
"item": "bloodmagic:bettercapacityrune"
}
}

View file

@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"aba",
"bcb",
"ada"
],
"key": {
"a": {
"tag": "forge:stone"
},
"b": {
"item": "minecraft:water_bucket"
},
"c": {
"item": "bloodmagic:blankrune"
},
"d": {
"item": "bloodmagic:infusedslate"
}
},
"result": {
"item": "bloodmagic:dislocationrune"
}
}

View file

@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}

View file

@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}

View file

@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}

View file

@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}

View file

@ -64,6 +64,10 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CAPACITY_RUNE.get()).key('a', Tags.Items.STONE).key('b', Items.BUCKET).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', BloodMagicItems.IMBUED_SLATE.get()).patternLine("aba").patternLine("bcb").patternLine("ada").addCriterion("has_imbued_slate", hasItem(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl("blood_rune_capacity"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ORB_RUNE.get()).key('a', Tags.Items.STONE).key('b', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aba").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_orb"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CHARGING_RUNE.get()).key('R', Tags.Items.DUSTS_REDSTONE).key('r', BloodMagicBlocks.BLANK_RUNE.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).key('G', Tags.Items.DUSTS_GLOWSTONE).patternLine("RsR").patternLine("GrG").patternLine("ReR").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_charging"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.DISPLACEMENT_RUNE.get()).key('a', Tags.Items.STONE).key('b', Items.WATER_BUCKET).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', BloodMagicItems.IMBUED_SLATE.get()).patternLine("aba").patternLine("bcb").patternLine("ada").addCriterion("has_imbued_slate", hasItem(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl("blood_rune_displacement"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.DEMONIC_SLATE.get()).key('c', Items.BUCKET).key('d', BloodMagicBlocks.CAPACITY_RUNE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_aug_capacity"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ACCELERATION_RUNE.get()).key('a', Items.BUCKET).key('b', BloodMagicItems.DEMONIC_SLATE.get()).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicBlocks.SPEED_RUNE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_acceleration"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), 4).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_blank"));
ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.MASTER_RITUAL_STONE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicBlocks.BLANK_RITUAL_STONE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_master"));

View file

@ -149,7 +149,7 @@ public class GeneratorLanguage extends LanguageProvider
addBlock(BloodMagicBlocks.SPEED_RUNE, "Speed Rune");
addBlock(BloodMagicBlocks.SACRIFICE_RUNE, "Rune of Sacrifice");
addBlock(BloodMagicBlocks.SELF_SACRIFICE_RUNE, "Rune of Self Sacrifice");
addBlock(BloodMagicBlocks.DISPLACEMENT_RUNE, "DisplacementRune");
addBlock(BloodMagicBlocks.DISPLACEMENT_RUNE, "Displacement Rune");
addBlock(BloodMagicBlocks.CAPACITY_RUNE, "Rune of Capacity");
addBlock(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE, "Rune of Augmented Capacity");
addBlock(BloodMagicBlocks.ORB_RUNE, "Rune of the Orb");
@ -243,6 +243,11 @@ public class GeneratorLanguage extends LanguageProvider
addItem(BloodMagicItems.DUSK_RITUAL_DIVINER, "Ritual Diviner [Dusk]");
addItem(BloodMagicItems.WEAK_BLOOD_SHARD, "Weak Blood Shard");
addItem(BloodMagicItems.RAW_CRYSTAL, "Demon Will Crystal");
addItem(BloodMagicItems.CORROSIVE_CRYSTAL, "Corrosive Will Crystal");
addItem(BloodMagicItems.DESTRUCTIVE_CRYSTAL, "Destructive Will Crystal");
addItem(BloodMagicItems.VENGEFUL_CRYSTAL, "Vengeful Will Crystal");
addItem(BloodMagicItems.STEADFAST_CRYSTAL, "Steadfast Will Crystal");
addItem(BloodMagicItems.SANGUINE_REVERTER, "Sanguine Reverter");
addItem(BloodMagicItems.PRIMITIVE_FURNACE_CELL, "Primitive Fuel Cell");

View file

@ -1,7 +1,7 @@
package wayoftime.bloodmagic.demonaura;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
import javax.annotation.Nullable;
@ -16,7 +16,7 @@ import wayoftime.bloodmagic.will.EnumDemonWillType;
public class WorldDemonWillHandler
{
public static ConcurrentHashMap<ResourceLocation, CopyOnWriteArrayList<PosXY>> dirtyChunks = new ConcurrentHashMap<>();
public static ConcurrentHashMap<ResourceLocation, ConcurrentLinkedQueue<PosXY>> dirtyChunks = new ConcurrentHashMap<>();
static ConcurrentHashMap<ResourceLocation, WillWorld> containedWills = new ConcurrentHashMap<>();
@Nullable
@ -198,9 +198,9 @@ public class WorldDemonWillHandler
PosXY pos = new PosXY(chunk.loc.x, chunk.loc.y);
if (!dirtyChunks.containsKey(resourceLocation))
{
dirtyChunks.put(resourceLocation, new CopyOnWriteArrayList<>());
dirtyChunks.put(resourceLocation, new ConcurrentLinkedQueue<>());
}
CopyOnWriteArrayList<PosXY> dc = dirtyChunks.get(resourceLocation);
ConcurrentLinkedQueue<PosXY> dc = dirtyChunks.get(resourceLocation);
if (!dc.contains(pos))
{
dc.add(pos);

View file

@ -2,7 +2,7 @@ package wayoftime.bloodmagic.util.handler.event;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
@ -17,7 +17,11 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.Difficulty;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
@ -142,11 +146,18 @@ public class WillHandler
if (ticks % 20 == 0)
{
CopyOnWriteArrayList<PosXY> dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(rl);
// CopyOnWriteArrayList<PosXY> dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(rl);
ConcurrentLinkedQueue<PosXY> dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(rl);
if ((dirtyChunks != null) && (dirtyChunks.size() > 0))
{
for (PosXY pos : dirtyChunks)
event.world.markChunkDirty(new BlockPos(pos.x * 16, 5, pos.y * 16), null);
{
IChunk chunk = event.world.getChunk(pos.x, pos.y, ChunkStatus.FULL, false);
if (chunk != null)
{
chunk.setModified(true);
}
}
dirtyChunks.clear();
}
@ -157,6 +168,23 @@ public class WillHandler
}
public static boolean isBlockLoaded(IBlockReader world, BlockPos pos)
{
if (world == null || !World.isValid(pos))
{
return false;
} else if (world instanceof IWorldReader)
{
// Note: We don't bother checking if it is a world and then isBlockPresent
// because
// all that does is also validate the y value is in bounds, and we already check
// to make
// sure the position is valid both in the y and xz directions
return ((IWorldReader) world).isBlockLoaded(pos);
}
return true;
}
@SubscribeEvent
public void chunkSave(ChunkDataEvent.Save event)
{