From f01a743a3e0ec4e18b1928f9f84ee1f20fd4c467 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 28 Dec 2020 16:28:33 -0500 Subject: [PATCH] Readded Spike and Updraft Arrays. Also WIP Day Array --- src/generated/resources/.cache/cache | 13 +- .../blockstates/corrosivedemoncrystal.json | 168 +++++++++--------- .../blockstates/destructivedemoncrystal.json | 168 +++++++++--------- .../blockstates/rawdemoncrystal.json | 168 +++++++++--------- .../blockstates/steadfastdemoncrystal.json | 168 +++++++++--------- .../blockstates/vengefuldemoncrystal.json | 168 +++++++++--------- .../data/bloodmagic/recipes/array/day.json | 13 ++ .../data/bloodmagic/recipes/array/spike.json | 13 ++ .../bloodmagic/recipes/array/updraft.json | 13 ++ .../bloodmagic/client/ClientEvents.java | 5 + .../BeaconAlchemyCircleRenderer.java | 113 ++++++++++++ .../LowAlchemyCircleRenderer.java | 23 +++ .../LowStaticAlchemyCircleRenderer.java | 36 ++++ .../SingleAlchemyCircleRenderer.java | 84 +++++++++ .../alchemyarray/AlchemyArrayEffectDay.java | 53 ++++++ .../alchemyarray/AlchemyArrayEffectSpike.java | 53 ++++++ .../AlchemyArrayEffectUpdraft.java | 63 +++++++ .../recipe/AlchemyArrayRecipeProvider.java | 3 + .../core/registry/AlchemyArrayRegistry.java | 6 + .../bloodmagic/tile/TileAlchemyArray.java | 2 +- .../alchemy_array/movement_arrays.json | 5 + .../entries/alchemy_array/spike_array.json | 16 ++ 22 files changed, 928 insertions(+), 426 deletions(-) create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/day.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/spike.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/array/updraft.json create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java create mode 100644 src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java create mode 100644 src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/spike_array.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 167bdf27..db189f11 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -7,9 +7,9 @@ cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerat 904d9baa649250571bce5f965cf48fbec69c2c1a assets/bloodmagic/blockstates/bloodlight.json 5f3898cc4891f85091fe6104800d6c88d9e85e29 assets/bloodmagic/blockstates/bloodstonebrick.json 631b579c38652efbcd9e5771d09ad6e476f3ba00 assets/bloodmagic/blockstates/chargingrune.json -d81673d78195fecd20f55daff394882c1fca18c3 assets/bloodmagic/blockstates/corrosivedemoncrystal.json +a35188b0244bf9808098c7d49d0af9bd32cef297 assets/bloodmagic/blockstates/corrosivedemoncrystal.json b943c6433f295c168841aec3c3f62e525c5c9cc9 assets/bloodmagic/blockstates/creeping_doubt.json -5efc11906969389596d32e159d4e973672d5ca56 assets/bloodmagic/blockstates/destructivedemoncrystal.json +b696f680545dffa4d3fbcc83b4b81ab58ac69aef 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 @@ -42,15 +42,15 @@ e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterrit 95a0c9a84139cf92c2689e53408b51619db126a1 assets/bloodmagic/blockstates/obsidianbrickpath.json 8b0ea137c63cf3a658a03eee58ca4b2c3d996f87 assets/bloodmagic/blockstates/obsidiantilepath.json 372ecd737f7082a4c2c70e46745f893b1179f885 assets/bloodmagic/blockstates/orbcapacityrune.json -d7a6ec187f6ba493e0cddf61f3b15d77537b1b23 assets/bloodmagic/blockstates/rawdemoncrystal.json +a2eaa9166258d7179d9e5099200f777bb9edf613 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 -52b8ed3cc54b68d5f7927d1f24cfee825b526cc0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json +f1ca47098385a955155cab9c2a97219e02d390a0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json 297bc2425f7b07b1a9dd3f7f6649c44f88dbac29 assets/bloodmagic/blockstates/stonebrickpath.json e3256db10fc8a8ab540f6ac8d27e0f47861e817a assets/bloodmagic/blockstates/stonetilepath.json -3333b28d8b7411aa19394519df115c9d112836f5 assets/bloodmagic/blockstates/vengefuldemoncrystal.json +48ed6b25a5d8d8074c38d772fdc27c1753d42c36 assets/bloodmagic/blockstates/vengefuldemoncrystal.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json 74c889434f46e060e8f185e8ef674312eb2f1192 assets/bloodmagic/blockstates/woodbrickpath.json 42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json @@ -568,6 +568,7 @@ a7f51456052d0fd317164d400cdd595ae2687df8 data/bloodmagic/recipes/arc/reversion/m 1e5814caf63714b8e1ff2b2f413a86ba8c840ebb data/bloodmagic/recipes/arc/weakbloodshard.json e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json +4ea1175f7ee2ce21685edb8906c28abba7207ed2 data/bloodmagic/recipes/array/day.json 1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json 4bd220ced486f1d8fc4468ebd61dac755670d716 data/bloodmagic/recipes/array/fastminersigil.json f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsigil.json @@ -579,6 +580,8 @@ f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsig 8b1007de1b7fca5d27b54d7c9839cde9e47ab1c0 data/bloodmagic/recipes/array/magnetismsigil.json 7a674784e0d8d4f6f071a72d26ba677087976970 data/bloodmagic/recipes/array/movement.json 6fd91801759c6a7a018b9d18601fc3db4d3ee3b4 data/bloodmagic/recipes/array/seersigil.json +1921cc1cba3bcc36a6be6edd377dd44eb9b884a0 data/bloodmagic/recipes/array/spike.json +085bf564ec74060e5c0224155cefc6ba0635c2c8 data/bloodmagic/recipes/array/updraft.json cabe693e7c714203ad708a1068f302b3ee3120b0 data/bloodmagic/recipes/array/voidsigil.json 5e68d933fff631142a8dd819aee235d343d43cff data/bloodmagic/recipes/array/watersigil.json de8dbcf4d69bd3b47693c4631578a9b5c0e3f50c data/bloodmagic/recipes/blood_altar.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json index 49dacfe0..fb67a253 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": { - "attached": "down", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal1", @@ -12,8 +12,8 @@ }, { "when": { - "attached": "up", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal1" @@ -21,8 +21,8 @@ }, { "when": { - "attached": "north", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal1", @@ -31,8 +31,8 @@ }, { "when": { - "attached": "south", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal1", @@ -41,8 +41,8 @@ }, { "when": { - "attached": "west", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal1", @@ -52,8 +52,8 @@ }, { "when": { - "attached": "east", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal1", @@ -63,8 +63,8 @@ }, { "when": { - "attached": "down", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal2", @@ -73,8 +73,8 @@ }, { "when": { - "attached": "up", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal2" @@ -82,8 +82,8 @@ }, { "when": { - "attached": "north", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal2", @@ -92,8 +92,8 @@ }, { "when": { - "attached": "south", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal2", @@ -102,8 +102,8 @@ }, { "when": { - "attached": "west", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal2", @@ -113,8 +113,8 @@ }, { "when": { - "attached": "east", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal2", @@ -124,8 +124,8 @@ }, { "when": { - "attached": "down", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal3", @@ -134,8 +134,8 @@ }, { "when": { - "attached": "up", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal3" @@ -143,8 +143,8 @@ }, { "when": { - "attached": "north", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal3", @@ -153,8 +153,8 @@ }, { "when": { - "attached": "south", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal3", @@ -163,8 +163,8 @@ }, { "when": { - "attached": "west", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal3", @@ -174,8 +174,8 @@ }, { "when": { - "attached": "east", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal3", @@ -185,8 +185,8 @@ }, { "when": { - "attached": "down", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal4", @@ -195,8 +195,8 @@ }, { "when": { - "attached": "up", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal4" @@ -204,8 +204,8 @@ }, { "when": { - "attached": "north", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal4", @@ -214,8 +214,8 @@ }, { "when": { - "attached": "south", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal4", @@ -224,8 +224,8 @@ }, { "when": { - "attached": "west", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal4", @@ -235,8 +235,8 @@ }, { "when": { - "attached": "east", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal4", @@ -246,8 +246,8 @@ }, { "when": { - "attached": "down", - "age": "4|5|6" + "age": "4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal5", @@ -256,8 +256,8 @@ }, { "when": { - "attached": "up", - "age": "4|5|6" + "age": "4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal5" @@ -265,8 +265,8 @@ }, { "when": { - "attached": "north", - "age": "4|5|6" + "age": "4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal5", @@ -275,8 +275,8 @@ }, { "when": { - "attached": "south", - "age": "4|5|6" + "age": "4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal5", @@ -285,8 +285,8 @@ }, { "when": { - "attached": "west", - "age": "4|5|6" + "age": "4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal5", @@ -296,8 +296,8 @@ }, { "when": { - "attached": "east", - "age": "4|5|6" + "age": "4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal5", @@ -307,8 +307,8 @@ }, { "when": { - "attached": "down", - "age": "5|6" + "age": "5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal6", @@ -317,8 +317,8 @@ }, { "when": { - "attached": "up", - "age": "5|6" + "age": "5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal6" @@ -326,8 +326,8 @@ }, { "when": { - "attached": "north", - "age": "5|6" + "age": "5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal6", @@ -336,8 +336,8 @@ }, { "when": { - "attached": "south", - "age": "5|6" + "age": "5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal6", @@ -346,8 +346,8 @@ }, { "when": { - "attached": "west", - "age": "5|6" + "age": "5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal6", @@ -357,8 +357,8 @@ }, { "when": { - "attached": "east", - "age": "5|6" + "age": "5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal6", @@ -368,8 +368,8 @@ }, { "when": { - "attached": "down", - "age": "6" + "age": "6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal7", @@ -378,8 +378,8 @@ }, { "when": { - "attached": "up", - "age": "6" + "age": "6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal7" @@ -387,8 +387,8 @@ }, { "when": { - "attached": "north", - "age": "6" + "age": "6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal7", @@ -397,8 +397,8 @@ }, { "when": { - "attached": "south", - "age": "6" + "age": "6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal7", @@ -407,8 +407,8 @@ }, { "when": { - "attached": "west", - "age": "6" + "age": "6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/corrosivecrystal7", @@ -418,8 +418,8 @@ }, { "when": { - "attached": "east", - "age": "6" + "age": "6", + "attached": "east" }, "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 57ec0106..b99a263f 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": { - "attached": "down", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal1", @@ -12,8 +12,8 @@ }, { "when": { - "attached": "up", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal1" @@ -21,8 +21,8 @@ }, { "when": { - "attached": "north", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal1", @@ -31,8 +31,8 @@ }, { "when": { - "attached": "south", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal1", @@ -41,8 +41,8 @@ }, { "when": { - "attached": "west", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal1", @@ -52,8 +52,8 @@ }, { "when": { - "attached": "east", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal1", @@ -63,8 +63,8 @@ }, { "when": { - "attached": "down", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal2", @@ -73,8 +73,8 @@ }, { "when": { - "attached": "up", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal2" @@ -82,8 +82,8 @@ }, { "when": { - "attached": "north", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal2", @@ -92,8 +92,8 @@ }, { "when": { - "attached": "south", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal2", @@ -102,8 +102,8 @@ }, { "when": { - "attached": "west", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal2", @@ -113,8 +113,8 @@ }, { "when": { - "attached": "east", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal2", @@ -124,8 +124,8 @@ }, { "when": { - "attached": "down", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal3", @@ -134,8 +134,8 @@ }, { "when": { - "attached": "up", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal3" @@ -143,8 +143,8 @@ }, { "when": { - "attached": "north", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal3", @@ -153,8 +153,8 @@ }, { "when": { - "attached": "south", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal3", @@ -163,8 +163,8 @@ }, { "when": { - "attached": "west", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal3", @@ -174,8 +174,8 @@ }, { "when": { - "attached": "east", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal3", @@ -185,8 +185,8 @@ }, { "when": { - "attached": "down", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal4", @@ -195,8 +195,8 @@ }, { "when": { - "attached": "up", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal4" @@ -204,8 +204,8 @@ }, { "when": { - "attached": "north", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal4", @@ -214,8 +214,8 @@ }, { "when": { - "attached": "south", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal4", @@ -224,8 +224,8 @@ }, { "when": { - "attached": "west", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal4", @@ -235,8 +235,8 @@ }, { "when": { - "attached": "east", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal4", @@ -246,8 +246,8 @@ }, { "when": { - "attached": "down", - "age": "4|5|6" + "age": "4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal5", @@ -256,8 +256,8 @@ }, { "when": { - "attached": "up", - "age": "4|5|6" + "age": "4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal5" @@ -265,8 +265,8 @@ }, { "when": { - "attached": "north", - "age": "4|5|6" + "age": "4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal5", @@ -275,8 +275,8 @@ }, { "when": { - "attached": "south", - "age": "4|5|6" + "age": "4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal5", @@ -285,8 +285,8 @@ }, { "when": { - "attached": "west", - "age": "4|5|6" + "age": "4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal5", @@ -296,8 +296,8 @@ }, { "when": { - "attached": "east", - "age": "4|5|6" + "age": "4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal5", @@ -307,8 +307,8 @@ }, { "when": { - "attached": "down", - "age": "5|6" + "age": "5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal6", @@ -317,8 +317,8 @@ }, { "when": { - "attached": "up", - "age": "5|6" + "age": "5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal6" @@ -326,8 +326,8 @@ }, { "when": { - "attached": "north", - "age": "5|6" + "age": "5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal6", @@ -336,8 +336,8 @@ }, { "when": { - "attached": "south", - "age": "5|6" + "age": "5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal6", @@ -346,8 +346,8 @@ }, { "when": { - "attached": "west", - "age": "5|6" + "age": "5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal6", @@ -357,8 +357,8 @@ }, { "when": { - "attached": "east", - "age": "5|6" + "age": "5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal6", @@ -368,8 +368,8 @@ }, { "when": { - "attached": "down", - "age": "6" + "age": "6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal7", @@ -378,8 +378,8 @@ }, { "when": { - "attached": "up", - "age": "6" + "age": "6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal7" @@ -387,8 +387,8 @@ }, { "when": { - "attached": "north", - "age": "6" + "age": "6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal7", @@ -397,8 +397,8 @@ }, { "when": { - "attached": "south", - "age": "6" + "age": "6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal7", @@ -407,8 +407,8 @@ }, { "when": { - "attached": "west", - "age": "6" + "age": "6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/destructivecrystal7", @@ -418,8 +418,8 @@ }, { "when": { - "attached": "east", - "age": "6" + "age": "6", + "attached": "east" }, "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 868a1e78..be9a5c2a 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": { - "attached": "down", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal1", @@ -12,8 +12,8 @@ }, { "when": { - "attached": "up", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal1" @@ -21,8 +21,8 @@ }, { "when": { - "attached": "north", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal1", @@ -31,8 +31,8 @@ }, { "when": { - "attached": "south", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal1", @@ -41,8 +41,8 @@ }, { "when": { - "attached": "west", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal1", @@ -52,8 +52,8 @@ }, { "when": { - "attached": "east", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal1", @@ -63,8 +63,8 @@ }, { "when": { - "attached": "down", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal2", @@ -73,8 +73,8 @@ }, { "when": { - "attached": "up", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal2" @@ -82,8 +82,8 @@ }, { "when": { - "attached": "north", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal2", @@ -92,8 +92,8 @@ }, { "when": { - "attached": "south", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal2", @@ -102,8 +102,8 @@ }, { "when": { - "attached": "west", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal2", @@ -113,8 +113,8 @@ }, { "when": { - "attached": "east", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal2", @@ -124,8 +124,8 @@ }, { "when": { - "attached": "down", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal3", @@ -134,8 +134,8 @@ }, { "when": { - "attached": "up", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal3" @@ -143,8 +143,8 @@ }, { "when": { - "attached": "north", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal3", @@ -153,8 +153,8 @@ }, { "when": { - "attached": "south", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal3", @@ -163,8 +163,8 @@ }, { "when": { - "attached": "west", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal3", @@ -174,8 +174,8 @@ }, { "when": { - "attached": "east", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal3", @@ -185,8 +185,8 @@ }, { "when": { - "attached": "down", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal4", @@ -195,8 +195,8 @@ }, { "when": { - "attached": "up", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal4" @@ -204,8 +204,8 @@ }, { "when": { - "attached": "north", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal4", @@ -214,8 +214,8 @@ }, { "when": { - "attached": "south", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal4", @@ -224,8 +224,8 @@ }, { "when": { - "attached": "west", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal4", @@ -235,8 +235,8 @@ }, { "when": { - "attached": "east", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal4", @@ -246,8 +246,8 @@ }, { "when": { - "attached": "down", - "age": "4|5|6" + "age": "4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal5", @@ -256,8 +256,8 @@ }, { "when": { - "attached": "up", - "age": "4|5|6" + "age": "4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal5" @@ -265,8 +265,8 @@ }, { "when": { - "attached": "north", - "age": "4|5|6" + "age": "4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal5", @@ -275,8 +275,8 @@ }, { "when": { - "attached": "south", - "age": "4|5|6" + "age": "4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal5", @@ -285,8 +285,8 @@ }, { "when": { - "attached": "west", - "age": "4|5|6" + "age": "4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal5", @@ -296,8 +296,8 @@ }, { "when": { - "attached": "east", - "age": "4|5|6" + "age": "4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal5", @@ -307,8 +307,8 @@ }, { "when": { - "attached": "down", - "age": "5|6" + "age": "5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal6", @@ -317,8 +317,8 @@ }, { "when": { - "attached": "up", - "age": "5|6" + "age": "5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal6" @@ -326,8 +326,8 @@ }, { "when": { - "attached": "north", - "age": "5|6" + "age": "5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal6", @@ -336,8 +336,8 @@ }, { "when": { - "attached": "south", - "age": "5|6" + "age": "5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal6", @@ -346,8 +346,8 @@ }, { "when": { - "attached": "west", - "age": "5|6" + "age": "5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal6", @@ -357,8 +357,8 @@ }, { "when": { - "attached": "east", - "age": "5|6" + "age": "5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal6", @@ -368,8 +368,8 @@ }, { "when": { - "attached": "down", - "age": "6" + "age": "6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal7", @@ -378,8 +378,8 @@ }, { "when": { - "attached": "up", - "age": "6" + "age": "6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal7" @@ -387,8 +387,8 @@ }, { "when": { - "attached": "north", - "age": "6" + "age": "6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal7", @@ -397,8 +397,8 @@ }, { "when": { - "attached": "south", - "age": "6" + "age": "6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal7", @@ -407,8 +407,8 @@ }, { "when": { - "attached": "west", - "age": "6" + "age": "6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/defaultcrystal7", @@ -418,8 +418,8 @@ }, { "when": { - "attached": "east", - "age": "6" + "age": "6", + "attached": "east" }, "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 5a7bc4f4..f886422f 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": { - "attached": "down", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal1", @@ -12,8 +12,8 @@ }, { "when": { - "attached": "up", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal1" @@ -21,8 +21,8 @@ }, { "when": { - "attached": "north", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal1", @@ -31,8 +31,8 @@ }, { "when": { - "attached": "south", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal1", @@ -41,8 +41,8 @@ }, { "when": { - "attached": "west", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal1", @@ -52,8 +52,8 @@ }, { "when": { - "attached": "east", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal1", @@ -63,8 +63,8 @@ }, { "when": { - "attached": "down", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal2", @@ -73,8 +73,8 @@ }, { "when": { - "attached": "up", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal2" @@ -82,8 +82,8 @@ }, { "when": { - "attached": "north", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal2", @@ -92,8 +92,8 @@ }, { "when": { - "attached": "south", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal2", @@ -102,8 +102,8 @@ }, { "when": { - "attached": "west", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal2", @@ -113,8 +113,8 @@ }, { "when": { - "attached": "east", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal2", @@ -124,8 +124,8 @@ }, { "when": { - "attached": "down", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal3", @@ -134,8 +134,8 @@ }, { "when": { - "attached": "up", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal3" @@ -143,8 +143,8 @@ }, { "when": { - "attached": "north", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal3", @@ -153,8 +153,8 @@ }, { "when": { - "attached": "south", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal3", @@ -163,8 +163,8 @@ }, { "when": { - "attached": "west", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal3", @@ -174,8 +174,8 @@ }, { "when": { - "attached": "east", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal3", @@ -185,8 +185,8 @@ }, { "when": { - "attached": "down", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal4", @@ -195,8 +195,8 @@ }, { "when": { - "attached": "up", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal4" @@ -204,8 +204,8 @@ }, { "when": { - "attached": "north", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal4", @@ -214,8 +214,8 @@ }, { "when": { - "attached": "south", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal4", @@ -224,8 +224,8 @@ }, { "when": { - "attached": "west", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal4", @@ -235,8 +235,8 @@ }, { "when": { - "attached": "east", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal4", @@ -246,8 +246,8 @@ }, { "when": { - "attached": "down", - "age": "4|5|6" + "age": "4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal5", @@ -256,8 +256,8 @@ }, { "when": { - "attached": "up", - "age": "4|5|6" + "age": "4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal5" @@ -265,8 +265,8 @@ }, { "when": { - "attached": "north", - "age": "4|5|6" + "age": "4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal5", @@ -275,8 +275,8 @@ }, { "when": { - "attached": "south", - "age": "4|5|6" + "age": "4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal5", @@ -285,8 +285,8 @@ }, { "when": { - "attached": "west", - "age": "4|5|6" + "age": "4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal5", @@ -296,8 +296,8 @@ }, { "when": { - "attached": "east", - "age": "4|5|6" + "age": "4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal5", @@ -307,8 +307,8 @@ }, { "when": { - "attached": "down", - "age": "5|6" + "age": "5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal6", @@ -317,8 +317,8 @@ }, { "when": { - "attached": "up", - "age": "5|6" + "age": "5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal6" @@ -326,8 +326,8 @@ }, { "when": { - "attached": "north", - "age": "5|6" + "age": "5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal6", @@ -336,8 +336,8 @@ }, { "when": { - "attached": "south", - "age": "5|6" + "age": "5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal6", @@ -346,8 +346,8 @@ }, { "when": { - "attached": "west", - "age": "5|6" + "age": "5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal6", @@ -357,8 +357,8 @@ }, { "when": { - "attached": "east", - "age": "5|6" + "age": "5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal6", @@ -368,8 +368,8 @@ }, { "when": { - "attached": "down", - "age": "6" + "age": "6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal7", @@ -378,8 +378,8 @@ }, { "when": { - "attached": "up", - "age": "6" + "age": "6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal7" @@ -387,8 +387,8 @@ }, { "when": { - "attached": "north", - "age": "6" + "age": "6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal7", @@ -397,8 +397,8 @@ }, { "when": { - "attached": "south", - "age": "6" + "age": "6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal7", @@ -407,8 +407,8 @@ }, { "when": { - "attached": "west", - "age": "6" + "age": "6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/steadfastcrystal7", @@ -418,8 +418,8 @@ }, { "when": { - "attached": "east", - "age": "6" + "age": "6", + "attached": "east" }, "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 75afc7be..c4f8f825 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": { - "attached": "down", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal1", @@ -12,8 +12,8 @@ }, { "when": { - "attached": "up", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal1" @@ -21,8 +21,8 @@ }, { "when": { - "attached": "north", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal1", @@ -31,8 +31,8 @@ }, { "when": { - "attached": "south", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal1", @@ -41,8 +41,8 @@ }, { "when": { - "attached": "west", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal1", @@ -52,8 +52,8 @@ }, { "when": { - "attached": "east", - "age": "0|1|2|3|4|5|6" + "age": "0|1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal1", @@ -63,8 +63,8 @@ }, { "when": { - "attached": "down", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal2", @@ -73,8 +73,8 @@ }, { "when": { - "attached": "up", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal2" @@ -82,8 +82,8 @@ }, { "when": { - "attached": "north", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal2", @@ -92,8 +92,8 @@ }, { "when": { - "attached": "south", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal2", @@ -102,8 +102,8 @@ }, { "when": { - "attached": "west", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal2", @@ -113,8 +113,8 @@ }, { "when": { - "attached": "east", - "age": "1|2|3|4|5|6" + "age": "1|2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal2", @@ -124,8 +124,8 @@ }, { "when": { - "attached": "down", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal3", @@ -134,8 +134,8 @@ }, { "when": { - "attached": "up", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal3" @@ -143,8 +143,8 @@ }, { "when": { - "attached": "north", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal3", @@ -153,8 +153,8 @@ }, { "when": { - "attached": "south", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal3", @@ -163,8 +163,8 @@ }, { "when": { - "attached": "west", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal3", @@ -174,8 +174,8 @@ }, { "when": { - "attached": "east", - "age": "2|3|4|5|6" + "age": "2|3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal3", @@ -185,8 +185,8 @@ }, { "when": { - "attached": "down", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal4", @@ -195,8 +195,8 @@ }, { "when": { - "attached": "up", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal4" @@ -204,8 +204,8 @@ }, { "when": { - "attached": "north", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal4", @@ -214,8 +214,8 @@ }, { "when": { - "attached": "south", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal4", @@ -224,8 +224,8 @@ }, { "when": { - "attached": "west", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal4", @@ -235,8 +235,8 @@ }, { "when": { - "attached": "east", - "age": "3|4|5|6" + "age": "3|4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal4", @@ -246,8 +246,8 @@ }, { "when": { - "attached": "down", - "age": "4|5|6" + "age": "4|5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal5", @@ -256,8 +256,8 @@ }, { "when": { - "attached": "up", - "age": "4|5|6" + "age": "4|5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal5" @@ -265,8 +265,8 @@ }, { "when": { - "attached": "north", - "age": "4|5|6" + "age": "4|5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal5", @@ -275,8 +275,8 @@ }, { "when": { - "attached": "south", - "age": "4|5|6" + "age": "4|5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal5", @@ -285,8 +285,8 @@ }, { "when": { - "attached": "west", - "age": "4|5|6" + "age": "4|5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal5", @@ -296,8 +296,8 @@ }, { "when": { - "attached": "east", - "age": "4|5|6" + "age": "4|5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal5", @@ -307,8 +307,8 @@ }, { "when": { - "attached": "down", - "age": "5|6" + "age": "5|6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal6", @@ -317,8 +317,8 @@ }, { "when": { - "attached": "up", - "age": "5|6" + "age": "5|6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal6" @@ -326,8 +326,8 @@ }, { "when": { - "attached": "north", - "age": "5|6" + "age": "5|6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal6", @@ -336,8 +336,8 @@ }, { "when": { - "attached": "south", - "age": "5|6" + "age": "5|6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal6", @@ -346,8 +346,8 @@ }, { "when": { - "attached": "west", - "age": "5|6" + "age": "5|6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal6", @@ -357,8 +357,8 @@ }, { "when": { - "attached": "east", - "age": "5|6" + "age": "5|6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal6", @@ -368,8 +368,8 @@ }, { "when": { - "attached": "down", - "age": "6" + "age": "6", + "attached": "down" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal7", @@ -378,8 +378,8 @@ }, { "when": { - "attached": "up", - "age": "6" + "age": "6", + "attached": "up" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal7" @@ -387,8 +387,8 @@ }, { "when": { - "attached": "north", - "age": "6" + "age": "6", + "attached": "north" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal7", @@ -397,8 +397,8 @@ }, { "when": { - "attached": "south", - "age": "6" + "age": "6", + "attached": "south" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal7", @@ -407,8 +407,8 @@ }, { "when": { - "attached": "west", - "age": "6" + "age": "6", + "attached": "west" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal7", @@ -418,8 +418,8 @@ }, { "when": { - "attached": "east", - "age": "6" + "age": "6", + "attached": "east" }, "apply": { "model": "bloodmagic:block/crystal/vengefulcrystal7", diff --git a/src/generated/resources/data/bloodmagic/recipes/array/day.json b/src/generated/resources/data/bloodmagic/recipes/array/day.json new file mode 100644 index 00000000..938f644c --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/day.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/spikearray.png", + "baseinput": { + "item": "minecraft:coal" + }, + "addedinput": { + "item": "minecraft:coal" + }, + "output": { + "item": "minecraft:air" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/spike.json b/src/generated/resources/data/bloodmagic/recipes/array/spike.json new file mode 100644 index 00000000..88ce4ff5 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/spike.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/spikearray.png", + "baseinput": { + "item": "minecraft:cobblestone" + }, + "addedinput": { + "tag": "forge:ingots/iron" + }, + "output": { + "item": "minecraft:air" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/updraft.json b/src/generated/resources/data/bloodmagic/recipes/array/updraft.json new file mode 100644 index 00000000..700967ce --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/array/updraft.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:array", + "texture": "bloodmagic:textures/models/alchemyarrays/updraftarray.png", + "baseinput": { + "item": "minecraft:feather" + }, + "addedinput": { + "tag": "forge:dusts/glowstone" + }, + "output": { + "item": "minecraft:air" + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java index 48b09e3d..e5eafdec 100644 --- a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java +++ b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java @@ -21,6 +21,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.api.compat.IMultiWillTool; import wayoftime.bloodmagic.client.model.MimicColor; +import wayoftime.bloodmagic.client.render.alchemyarray.BeaconAlchemyCircleRenderer; +import wayoftime.bloodmagic.client.render.alchemyarray.LowStaticAlchemyCircleRenderer; import wayoftime.bloodmagic.client.render.alchemyarray.StaticAlchemyCircleRenderer; import wayoftime.bloodmagic.client.render.block.RenderAlchemyArray; import wayoftime.bloodmagic.client.render.block.RenderAltar; @@ -102,6 +104,9 @@ public class ClientEvents }); AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/movement"), new StaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/movementarray.png"))); + AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/updraft"), new BeaconAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/updraftarray.png"))); + AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/spike"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"))); + AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/day"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"))); } public static void registerItemModelProperties(FMLClientSetupEvent event) diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java new file mode 100644 index 00000000..b5021539 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java @@ -0,0 +1,113 @@ +package wayoftime.bloodmagic.client.render.alchemyarray; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Quaternion; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; +import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class BeaconAlchemyCircleRenderer extends AlchemyArrayRenderer +{ + public BeaconAlchemyCircleRenderer(ResourceLocation arrayResource) + { + super(arrayResource); + } + + @Override + public float getRotation(float craftTime) + { + float offset = 2; + if (craftTime >= offset) + { + float modifier = (craftTime - offset) * 5f; + return modifier * 1f; + } + return 0; + } + + @Override + public float getSecondaryRotation(float craftTime) + { + float offset = 50; + float secondaryOffset = 150; + if (craftTime >= offset) + { + if (craftTime < secondaryOffset) + { + float modifier = 90 * (craftTime - offset) / (secondaryOffset - offset); + return modifier; + } else + { + return 90; + } + } + return 0; + } + + public float getSizeModifier(float craftTime) + { + return 1.0f; + } + +// public float getVerticalOffset(float craftTime) +// { +// if (craftTime >= 5) +// { +// if (craftTime <= 40) +// { +// return (float) (-0.4 + (0.4) * Math.pow((craftTime - 5) / 35f, 3)); +// } else +// { +// return 0; +// } +// } +// return -0.4f; +// } + + public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) + { + matrixStack.push(); + + matrixStack.translate(0.5, 0.5, 0.5); + + float rot = getRotation(craftTime); + float secondaryRot = getSecondaryRotation(craftTime); + + float size = 1.0F * getSizeModifier(craftTime); + Direction rotation = tileArray.getRotation(); + + matrixStack.push(); + matrixStack.translate(0, getVerticalOffset(craftTime), 0); + matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); + + matrixStack.push(); + + matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rot, true)); + matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), -secondaryRot, true)); +// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); + + IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); + Model2D arrayModel = new BloodMagicRenderer.Model2D(); + arrayModel.minX = -0.5; + arrayModel.maxX = +0.5; + arrayModel.minY = -0.5; + arrayModel.maxY = +0.5; + arrayModel.resource = arrayResource; + + matrixStack.scale(size, size, size); + +// RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0x000000FF, 0xFFFFFFFF, OverlayTexture.NO_OVERLAY); + RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, combinedOverlayIn); + + matrixStack.pop(); + matrixStack.pop(); + matrixStack.pop(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java new file mode 100644 index 00000000..5e7e4724 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java @@ -0,0 +1,23 @@ +package wayoftime.bloodmagic.client.render.alchemyarray; + +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.BloodMagic; + +public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer +{ + public LowAlchemyCircleRenderer() + { + this(BloodMagic.rl("textures/models/AlchemyArrays/SkeletonTurret1.png")); + } + + public LowAlchemyCircleRenderer(ResourceLocation arrayResource) + { + super(arrayResource); + } + + @Override + public float getVerticalOffset(float craftTime) + { + return -0.4f; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java new file mode 100644 index 00000000..ce9c1668 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java @@ -0,0 +1,36 @@ +package wayoftime.bloodmagic.client.render.alchemyarray; + +import net.minecraft.util.ResourceLocation; +import wayoftime.bloodmagic.BloodMagic; + +public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer +{ + public LowStaticAlchemyCircleRenderer() + { + this(BloodMagic.rl("textures/models/AlchemyArrays/SkeletonTurret1.png")); + } + + public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) + { + super(arrayResource); + } + + @Override + public float getRotation(float craftTime) + { + + return 0; + } + + public float getSecondaryRotation(float craftTime) + { + float offset = 2; + float duration = 180; + if (craftTime >= offset && craftTime < offset + duration) + { + float modifier = (craftTime - offset) * 2f; + return modifier * 1f; + } + return 0; + } +} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java new file mode 100644 index 00000000..9187253e --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java @@ -0,0 +1,84 @@ +package wayoftime.bloodmagic.client.render.alchemyarray; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; + +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Quaternion; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer; +import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; +import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class SingleAlchemyCircleRenderer extends AlchemyArrayRenderer +{ + public SingleAlchemyCircleRenderer(ResourceLocation arrayResource) + { + super(arrayResource); + } + + @Override + public float getRotation(float craftTime) + { + float offset = 2; + if (craftTime >= offset) + { + float modifier = (craftTime - offset) * 2f; + return modifier * 1f; + } + return 0; + } + + public float getSecondaryRotation(float craftTime) + { + return 0; + } + + public float getSizeModifier(float craftTime) + { + return 1.0f; + } + + public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) + { + matrixStack.push(); + + matrixStack.translate(0.5, 0.5, 0.5); + + float rot = getRotation(craftTime); + float secondaryRot = getSecondaryRotation(craftTime); + + float size = 1.0F * getSizeModifier(craftTime); + Direction rotation = tileArray.getRotation(); + + matrixStack.push(); + matrixStack.translate(0, getVerticalOffset(craftTime), 0); + matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); + + matrixStack.push(); + + matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); + matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), secondaryRot, true)); +// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); + + IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); + Model2D arrayModel = new BloodMagicRenderer.Model2D(); + arrayModel.minX = -0.5; + arrayModel.maxX = +0.5; + arrayModel.minY = -0.5; + arrayModel.maxY = +0.5; + arrayModel.resource = arrayResource; + + matrixStack.scale(size, size, size); + + RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); + + matrixStack.pop(); + matrixStack.pop(); + matrixStack.pop(); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java new file mode 100644 index 00000000..00328283 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java @@ -0,0 +1,53 @@ +package wayoftime.bloodmagic.common.alchemyarray; + +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.world.server.ServerWorld; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class AlchemyArrayEffectDay extends AlchemyArrayEffect +{ + public AlchemyArrayEffectDay() + { + + } + + @Override + public boolean update(TileAlchemyArray tile, int ticksActive) + { + // TODO: Add recipe rechecking to verify nothing screwy is going on. + if (tile.getWorld().isRemote) + { + return false; + } + + if (tile.getWorld() instanceof ServerWorld) + { + long time = (tile.getWorld().getGameTime() / 24000) * 24000; + for (ServerWorld serverworld : tile.getWorld().getServer().getWorlds()) + { + serverworld.func_241114_a_((long) time); + } + + return true; + } + return false; + } + + @Override + public void writeToNBT(CompoundNBT tag) + { + + } + + @Override + public void readFromNBT(CompoundNBT tag) + { + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectDay(); + } +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java new file mode 100644 index 00000000..585c0f8a --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java @@ -0,0 +1,53 @@ +package wayoftime.bloodmagic.common.alchemyarray; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.DamageSource; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class AlchemyArrayEffectSpike extends AlchemyArrayEffect +{ + public AlchemyArrayEffectSpike() + { + super(); + } + + @Override + public boolean update(TileAlchemyArray tile, int ticksActive) + { + return false; + } + + @Override + public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) + { + if (entity instanceof LivingEntity) + { + entity.attackEntityFrom(DamageSource.CACTUS, 2); + } + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectSpike(); + } + + @Override + public void readFromNBT(CompoundNBT compound) + { + // TODO Auto-generated method stub + + } + + @Override + public void writeToNBT(CompoundNBT compound) + { + // TODO Auto-generated method stub + + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java new file mode 100644 index 00000000..62831113 --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java @@ -0,0 +1,63 @@ +package wayoftime.bloodmagic.common.alchemyarray; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.World; +import wayoftime.bloodmagic.tile.TileAlchemyArray; + +public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect +{ + public AlchemyArrayEffectUpdraft() + { + super(); + } + + @Override + public boolean update(TileAlchemyArray tile, int ticksActive) + { + + return false; + } + + @Override + public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) + { + double motionY = 1; + double motionYGlowstoneMod = 0.1; + double motionYFeatherMod = 0.05; + + TileAlchemyArray tileArray = (TileAlchemyArray) array; + + motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); // Glowstone Dust + motionY += motionYFeatherMod * (tileArray.getStackInSlot(1).getCount() - 1); // Feathers + +// entity.getMotion().y = motionY; + entity.fallDistance = 0; + + entity.setMotion(new Vector3d(0, motionY, 0)); + + } + + @Override + public AlchemyArrayEffect getNewCopy() + { + return new AlchemyArrayEffectUpdraft(); + } + + @Override + public void readFromNBT(CompoundNBT compound) + { + // TODO Auto-generated method stub + + } + + @Override + public void writeToNBT(CompoundNBT compound) + { + // TODO Auto-generated method stub + + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java index 8f78f4b2..d17a9ee8 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java @@ -37,6 +37,9 @@ public class AlchemyArrayRecipeProvider implements ISubRecipeProvider AlchemyArrayRecipeBuilder.array(AlchemyArrayRegistry.BINDING_ARRAY, Ingredient.fromItems(BloodMagicItems.REAGENT_BINDING.get()), Ingredient.fromItems(Items.IRON_BOOTS), new ItemStack(BloodMagicItems.LIVING_BOOTS.get())).build(consumer, BloodMagic.rl(basePath + "living_boots")); AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/movementarray.png"), Ingredient.fromItems(Items.FEATHER), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "movement")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/updraftarray.png"), Ingredient.fromItems(Items.FEATHER), Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "updraft")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"), Ingredient.fromItems(Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.INGOTS_IRON), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "spike")); + AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"), Ingredient.fromItems(Items.COAL), Ingredient.fromItems(Items.COAL), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "day")); // AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"), // Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()), // Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java index 1c0b9cc1..5a2d8812 100644 --- a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java +++ b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java @@ -12,7 +12,10 @@ import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect; import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectBinding; import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting; +import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectDay; import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectMovement; +import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectSpike; +import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectUpdraft; import wayoftime.bloodmagic.impl.BloodMagicAPI; import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; @@ -33,6 +36,9 @@ public class AlchemyArrayRegistry public static void registerBaseArrays() { registerEffect(BloodMagic.rl("array/movement"), new AlchemyArrayEffectMovement()); + registerEffect(BloodMagic.rl("array/updraft"), new AlchemyArrayEffectUpdraft()); + registerEffect(BloodMagic.rl("array/spike"), new AlchemyArrayEffectSpike()); + registerEffect(BloodMagic.rl("array/day"), new AlchemyArrayEffectDay()); } public static AlchemyArrayEffect getEffect(World world, ResourceLocation rl, RecipeAlchemyArray recipe) diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java index f5420c93..de58c737 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java @@ -118,7 +118,7 @@ public class TileAlchemyArray extends TileInventory implements ITickableTileEnti } else { AlchemyArrayEffect effect = AlchemyArrayRegistry.getEffect(world, this.getStackInSlot(0), this.getStackInSlot(1)); - System.out.println("Effect: " + effect); +// System.out.println("Effect: " + effect); if (effect == null) { // key = effect.i diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/movement_arrays.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/movement_arrays.json index e0bb12e0..8164f85a 100644 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/movement_arrays.json +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/movement_arrays.json @@ -11,6 +11,11 @@ "type": "functional_array", "recipe": "bloodmagic:array/movement", "image": "movementarray.png" + }, + { + "type": "functional_array", + "recipe": "bloodmagic:array/updraft", + "image": "updraftarray.png" } ] } diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/spike_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/spike_array.json new file mode 100644 index 00000000..b57d58d9 --- /dev/null +++ b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/spike_array.json @@ -0,0 +1,16 @@ +{ + "name": "Spike Array", + "icon": "minecraft:iron_ingot", + "category": "alchemy_array", + "pages": [ + { + "type": "text", + "text": "The Spike Array is a rather simple array with a single purpose. When a living entity steps into the array, they are hit with a full heart of damage. This is good for mob traps, or for making your base a bit spikier for players." + }, + { + "type": "functional_array", + "recipe": "bloodmagic:array/spike", + "image": "spikearray.png" + } + ] +}